From 71f8bdb7c63acc381d71105bb950411029f4250f Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Mon, 03 Jun 2024 20:00:58 +0800
Subject: [PATCH] 测试远传
---
Soft/system_general_para.h | 54 ++++++++++++++++++++++++++++--------------------------
1 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/Soft/system_general_para.h b/Soft/system_general_para.h
index 1d48356..8ae0146 100644
--- a/Soft/system_general_para.h
+++ b/Soft/system_general_para.h
@@ -48,6 +48,15 @@
EM_SIFRCT, //��������Զ�������ն�
} EQUIPMENT_TYPE; // �����ͺ�
+
+typedef enum
+{
+ BM_NONE = 0U,
+ BM_DEVICE, // �豸��
+ BM_PLATFORM // ƽ̨��
+} BILLING_MODE_T; // �Ʒ�ģʽ
+
+
typedef enum
{
LITTLE_ENDIAN = 0U,
@@ -88,10 +97,18 @@
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����ԭ��
+
+
+typedef enum
+{
+ LDM_KEY_AWAKEN = 0U, // ��������
+ LDM_ALWAYS_AWAKEN, // ����
+ LDM_FLOW_AWAKEN // ����������
+} LCD_DISPLAY_MODE_T; // LCD��Ļ��ʾģʽ����
/*****************ͨ�ýṹ�����******************************/
@@ -104,7 +121,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 +151,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 +179,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)
@@ -174,28 +194,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//��־���в���
-typedef struct log_sizhu_run_t
-{
- uint16_t log_count;
- uint32_t log_addr_save;
- uint32_t log_addr_begin;
-
-}LOG_SIZHU_RUN_T;
@@ -222,7 +220,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 +230,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