From cf4d12fd8322cbb350dd3bc5af8c748e8790ac64 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 05 Jun 2024 17:38:06 +0800
Subject: [PATCH] 继续测试修改
---
Soft/system_general_para.c | 146 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 140 insertions(+), 6 deletions(-)
diff --git a/Soft/system_general_para.c b/Soft/system_general_para.c
index 0ad8d5b..bffb7fe 100644
--- a/Soft/system_general_para.c
+++ b/Soft/system_general_para.c
@@ -1,5 +1,7 @@
#include "system_general_para.h"
#include "main.h"
+#include "extern_rtc.h"
+#include "time.h"
//uint8_t read_data_buf_A_l[200] ={0};
//uint8_t read_data_buf_B_l[200] ={0};
@@ -7,14 +9,17 @@
__IO FlagStatus sys_run_period = RESET; // ϵͳ��������
-SYS_DELAY_SEC_PARA_T sys_delay_sec_para_g = { .gprs_timeout_para.delay_flag = RESET, \
- .gprs_timeout_para.delay_time = 0, \
+SYS_DELAY_SEC_PARA_T sys_delay_sec_para_g = { .wrc_timeout_para.delay_flag = RESET, \
+ .wrc_timeout_para.delay_time = 0, \
.sys_active_time.delay_flag = RESET, \
.sys_active_time.delay_time = SYS_WAKE_UP_TIME, \
.sys_restart_delay_time.delay_flag = RESET, \
.sys_restart_delay_time.delay_time = 180, \
};
+
+FUN_START_CTRL_PARA_T sys_fun_run_ctrl_g;
+
/*******************���õĴ��빤��********************************/
/******************************************
@@ -24,9 +29,9 @@
* output: none
* return: none
*****************************************/
-ErrorStatus ucharcmp(uint8_t *dataA,uint8_t *dataB,u16 data_length)
+ErrorStatus ucharcmp(uint8_t *dataA,uint8_t *dataB,uint16_t data_length)
{
- u16 index_i=0;
+ uint16_t index_i=0;
ErrorStatus return_flag=FAIL;
for(index_i=0;index_i<data_length;index_i++)
{
@@ -58,9 +63,9 @@
* output: none
* return: none
*****************************************/
-void arrayA_2_arrayB(uint8_t * aA , uint8_t * aB, u16 len, BIG_OR_LITTLE_ENDIAN mode)
+void arrayA_2_arrayB(uint8_t * aA , uint8_t * aB, uint16_t len, BIG_OR_LITTLE_ENDIAN mode)
{
- u16 index;
+ uint16_t index;
uint8_t *ptra,*ptrb;
if(mode==LITTLE_ENDIAN)
@@ -87,3 +92,132 @@
}
}
+
+
+
+/******************************************
+ * func: IntervalTriggerHandle
+ * desc: ���������ֻ����1���ڵģ����ʱ������1��IJ����ǣ�����1���ڵļ��60���Ӵ���һ��
+ * input: IntervalTime���ʱ�䣬��λ�� ; IntervalFirstTimeBCD�״�ʱ��,ʱ���֣�ʱ��ǰ
+ * output: FlagStatus SET��ʾ��Ч
+ * return: none
+ *****************************************/
+FlagStatus IntervalTriggerHandle(sClockBCD sys_clockBCD_in,uint16_t IntervalTime,uint8_t *IntervalFirstTimeBCD)
+{
+ //����ϱ���ʱ�����Ǽ������1440���ӣ�Ҳ���dz���1�졣
+ uint16_t FirstTime; //�״��ϱ�ʱ�䣬����ɷ���
+ uint16_t NextTime; //�´��ϱ�ʱ�䣬����
+ uint16_t CurrentTime;//��ǰʱ�䣬����ɷ���
+ uint16_t Count_i=0;
+ uint16_t ComparisonsNumber;
+
+
+ if(IntervalTime==0)
+ {
+ return RESET;
+ }
+
+ FirstTime = (uint16_t)BCD_2_DECIMAL(IntervalFirstTimeBCD[0]) * 60 + BCD_2_DECIMAL(IntervalFirstTimeBCD[1]);
+
+ CurrentTime = (uint16_t)BCD_2_DECIMAL(sys_clockBCD_in.hour) *60 + BCD_2_DECIMAL(sys_clockBCD_in.min);
+ NextTime = FirstTime;
+
+ ComparisonsNumber = (IntervalTime !=0)? 1440/IntervalTime +1 : 1;
+
+ if(sys_clockBCD_in.sec == 0) //Ϊ�˼�����Դ�˷ѣ�ֻ��������=0ʱ�ж�
+ {
+ for(Count_i =0;Count_i<ComparisonsNumber;Count_i++)
+ {
+ if(NextTime == CurrentTime )
+ {
+ return SET;
+ }
+ else
+ {
+ NextTime = NextTime + IntervalTime; //�´��ϱ�ʱ���
+ if(NextTime>=1440)
+ {
+ NextTime -=1440;
+ }
+ }
+ }
+ }
+
+ return RESET;
+}
+
+//IO���ӳ��������
+FlagStatus IO_JitterEliminationCheck(GPIO_Type* GPIOx, uint32_t GPIO_Pin,uint16_t delay_time_ms,BitAction bit_status)
+{
+ if(delay_time_ms>1000) //Ŀǰ�����1000ms��ʱ��̫����ϵͳ���Ӱ��
+ return RESET;
+
+ if(GPIO_ReadInputDataBit(GPIOx, GPIO_Pin) == bit_status){
+ if(delay_time_ms > 0)
+ delay_ms(delay_time_ms);
+ if(GPIO_ReadInputDataBit(GPIOx, GPIO_Pin) == bit_status){
+ return SET;
+ }else{
+ return RESET;
+ }
+
+ }else{
+ return RESET;
+ }
+
+}
+
+
+
+
+
+/******************************************
+ * func: Time_Compare
+ * desc: �����ڱȽϣ���ֵ��
+ * input:
+ pDate1 ʱ��1 BCD
+ pDate2 ʱ��2 BCD
+ * output: none
+ * return: ��ʱ���ֵ ʱ��1����ʱ��2��������������ȷ���0��С���ظ���
+ *****************************************/
+int Datecmp(const uint8_t *pDate1, const uint8_t *pDate2)
+{
+ uint16_t temp_year[2];
+ time_t date_time1, date_time2;
+ struct tm date_tm1 = {0}, date_tm2 = {0};
+ /*����ݲ����� Hex*/
+ temp_year[0] = 2000 + BCD_2_DECIMAL(pDate1[0]);
+ temp_year[1] = 2000 + BCD_2_DECIMAL(pDate2[0]);
+ /*ʱ��ṹ�帳ֵ*/
+ date_tm1.tm_year = temp_year[0] - 1900;
+ date_tm1.tm_mon = BCD_2_DECIMAL(pDate1[1]) - 1;
+ date_tm1.tm_mday = BCD_2_DECIMAL(pDate1[2]);
+ date_tm1.tm_hour = BCD_2_DECIMAL(pDate1[3]);
+ date_tm1.tm_min = BCD_2_DECIMAL(pDate1[4]);
+ date_tm1.tm_sec = BCD_2_DECIMAL(pDate1[5]);
+
+ date_tm2.tm_year = temp_year[1] - 1900;
+ date_tm2.tm_mon = BCD_2_DECIMAL(pDate2[1]) - 1;
+ date_tm2.tm_mday = BCD_2_DECIMAL(pDate2[2]);
+ date_tm2.tm_hour = BCD_2_DECIMAL(pDate2[3]);
+ date_tm2.tm_min = BCD_2_DECIMAL(pDate2[4]);
+ date_tm2.tm_sec = BCD_2_DECIMAL(pDate2[5]);
+ /*��ô�1900��1��1��0ʱ0��0�����������*/
+ date_time1 = mktime(&date_tm1);
+ date_time2 = mktime(&date_tm2);
+
+ // if (date_time1 > date_time2)
+ // {
+ // *diff_value = date_time1 - date_time2;
+ // return 1;
+ // }
+ // else if (date_time1 < date_time2)
+ // {
+ // *diff_value = date_time2 - date_time1;
+ // return -1;
+ // }
+ return (int)(date_time1 - date_time2);
+}
+
+
+
--
Gitblit v1.9.3