From e5ec6ffc2fa0c07785c9d797c3fd74fd3031059f Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 23 May 2024 20:06:25 +0800
Subject: [PATCH] 加了几个远传接收数据处理
---
Soft/system_general_para.h | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Soft/system_general_para.h b/Soft/system_general_para.h
index 014e027..c12aa50 100644
--- a/Soft/system_general_para.h
+++ b/Soft/system_general_para.h
@@ -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)
@@ -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