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 | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/Soft/system_general_para.h b/Soft/system_general_para.h index e12e8ae..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����ԭ�� @@ -133,6 +133,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) | \ @@ -219,5 +222,7 @@ 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