From 1360095f8d64cf607d333d2fc7fd1dcd81d1bd7b Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 24 May 2024 16:35:10 +0800
Subject: [PATCH] 修改报警相关处理
---
Soft/system_general_para.h | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/Soft/system_general_para.h b/Soft/system_general_para.h
index 1d48356..8d1579d 100644
--- a/Soft/system_general_para.h
+++ b/Soft/system_general_para.h
@@ -88,7 +88,7 @@
RS485_START_REASON_NONE = 0U, //����������Ҫִ��
RS485_START_REASON_KEY , //����
RS485_START_REASON_TIMING, //��ʱ
- RS485_START_REASON_REPORT, //ʵʱ�ϱ���Ҫ
+ RS485_START_REASON_REPORT, //�ϱ���Ҫ
RS485_START_REASON_RECORD, //�����¼��Ҫ���������ϱ���������
} RS485_START_REASON; //485����ԭ��
@@ -104,7 +104,7 @@
typedef struct
{
- DELAY_SEC_TYPE_T gprs_timeout_para; // GPRS��ʱʱ��
+ DELAY_SEC_TYPE_T wrc_timeout_para; // GPRS��ʱʱ��
DELAY_SEC_TYPE_T sys_active_time; // ϵͳ����ʱ��
DELAY_SEC_TYPE_T sys_restart_delay_time;// ϵͳ�������ӳ�ʱ��
DELAY_SEC_TYPE_T UC_active_time; // ��λ������ʱ��
@@ -134,6 +134,9 @@
#define DECIMAL_2_BCD(__DECIMAL__) ((__DECIMAL__ / 16) * 10 + __DECIMAL__ % 16)
+/*ÿ��0��*/
+#define DAILY_ZERO ((&sys_clockBCD_g)->hour == 0 && (&sys_clockBCD_g)->min == 0 && (&sys_clockBCD_g)->sec == 0 ? SET : RESET)
+
// ��С��ת��
#define BSWAP_16(x) ((x & 0x00ff) << 8) | \
((x & 0xff00) >> 8)
@@ -159,7 +162,7 @@
// ϵͳͨ���ӳ�ʱ������
-#define __SYS_DELAY_SEC_TIME_SET_(__HANDLE__, __NUMBER__) ((&sys_delay_sec_para_g)->__HANDLE__.delay_time = __NUMBER__)
+#define __SYS_DELAY_SEC_TIME_SET_(__HANDLE__, __NUMBER__) do{(&sys_delay_sec_para_g)->__HANDLE__.delay_time = __NUMBER__;__SYS_DELAY_SEC_FLAG_CLEAR_(__HANDLE__);}while(0);
// ϵͳͨ���ӳ�ʱ���ȡ
#define __SYS_DELAY_SEC_TIME_GET_(__HANDLE__) ((&sys_delay_sec_para_g)->__HANDLE__.delay_time)
@@ -170,16 +173,6 @@
#define __SYS_DELAY_SEC_FLAG_SET_(__HANDLE__) ((&sys_delay_sec_para_g)->__HANDLE__.delay_flag = SET)
// ϵͳͨ���ӳٱ�־λ���
#define __SYS_DELAY_SEC_FLAG_CLEAR_(__HANDLE__) ((&sys_delay_sec_para_g)->__HANDLE__.delay_flag = RESET)
-
-
-
-
-
-
-
-
-
-
@@ -201,11 +194,6 @@
-
-
-
-
-
//extern uint8_t read_data_buf_A_l[200];
//extern uint8_t read_data_buf_B_l[200];
//extern uint8_t read_data_buf_C_l[200];
@@ -222,7 +210,7 @@
-int mem_cmp_aray( const void * cs, const void * ct, u32 count );
+//int mem_cmp_aray( const void * cs, const void * ct, u32 count );
uint8_t TwoTimeCompara(uint8_t* TimeBCD1, uint8_t* TimeBCD2);//6�ֽ�BCDʱ���뵱ǰʱ��Ƚϣ���ǰʱ���0����ȷ���1����ǰʱ��С����2�� ���⣬������ʱ���ʽ��ЧҲ����0������������
@@ -232,5 +220,9 @@
FlagStatus IntervalTriggerHandle(sClockBCD sys_clockBCD_in,uint16_t IntervalTime,uint8_t IntervalFirstTimeBCD[2]);
+FlagStatus IO_JitterEliminationCheck(GPIO_Type* GPIOx, uint32_t GPIO_Pin,uint16_t delay_time_ms,BitAction bit_status);
+
+int Datecmp(const uint8_t *pDate1, const uint8_t *pDate2);
+
#endif
--
Gitblit v1.9.3