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 |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Soft/system_general_para.h b/Soft/system_general_para.h
index 8d1579d..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,
@@ -92,6 +101,14 @@
 	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��Ļ��ʾģʽ����
 
 
 /*****************ͨ�ýṹ�����******************************/
@@ -181,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;
+
 
 
 

--
Gitblit v1.9.3