From a1810b89e66f184c62a0588ae7d57c91d0c376e8 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 30 May 2024 20:06:09 +0800
Subject: [PATCH] 继续测试修改
---
Soft/system_general_para.h | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/Soft/system_general_para.h b/Soft/system_general_para.h
index e12e8ae..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��Ļ��ʾģʽ����
/*****************ͨ�ýṹ�����******************************/
@@ -133,6 +150,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) | \
@@ -178,14 +198,7 @@
-//��־���в���
-typedef struct log_sizhu_run_t
-{
- uint16_t log_count;
- uint32_t log_addr_save;
- uint32_t log_addr_begin;
-
-}LOG_SIZHU_RUN_T;
+
@@ -219,5 +232,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