From c5be44e4c66ca59789e9ed8e63572929328e3976 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Mon, 29 Apr 2024 19:57:24 +0800
Subject: [PATCH] 完善存储参数定义

---
 Soft/system_general_para.h |  127 ++++++++++++++++++++++++++++++------------
 1 files changed, 90 insertions(+), 37 deletions(-)

diff --git a/Soft/system_general_para.h b/Soft/system_general_para.h
index d6e2459..5a0042d 100644
--- a/Soft/system_general_para.h
+++ b/Soft/system_general_para.h
@@ -23,7 +23,7 @@
 	DM_HCM_UFG220 = 0x10U,	//ȼ����
 	DM_HCM_UFG620,
 	DM_HCM_UFG630,
-} DEVICE_MODEL; // �豸�ͺ�
+} DEVICE_TYPE; // �豸�ͺ�
 
 typedef enum
 {
@@ -36,15 +36,7 @@
 	DN25_TYPE,
 	DN32_TYPE,
 	DN40_TYPE,
-} CALIBER_MODEL; // �ھ�
-
-typedef enum
-{
-	VM_NONE	= 0U,
-	VM_PENGSHENG,  //��ʢ����
-	VM_HADE,			 //���·���
-} VALVE_MODEL; // �����ͺ�
-
+} CALIBER_TYPE; // �ھ�
 
 typedef enum
 {
@@ -53,46 +45,107 @@
 	EM_IFRCT,	//һ������Զ�������ն�
 	EM_SIFRTT,  //����ʽ����Զ���ն�
 	EM_SIFRCT,	//��������Զ�������ն�
-} EQUIPMENT_MODEL; // �����ͺ�
+} EQUIPMENT_TYPE; // �����ͺ�
 
-typedef enum
-{
-  VALVE_NONE = 0U,
-  VALVE_OP,
-  VALVE_CL,
-  VALVE_OPENING,
-  VALVE_CLOSING,
-  VALVE_ERROR,
-	VALVE_MISSING = 99U
-} VALVE_STATE_T; // ����״̬����
-
-typedef enum
-{
-  VL_UNLOCK = 0U,
-	VL_LOCK
-} VALVE_LOCK_STATE_T; // ����״̬����
-
-
-
-//ͨ�ýṹ�����
-
-
-
-//�������ʹ�С��
 typedef enum
 {
   LITTLE_ENDIAN = 0U,
 	BIG_ENDIAN
-} BIG_OR_LITTLE_ENDIAN; // ����״̬����
+} BIG_OR_LITTLE_ENDIAN; //�������ʹ�С��
+
+typedef enum
+{
+  FLOW_METER_CONN_NONE = 0U,
+	FLOW_METER_CONN_PULSE,
+	FLOW_METER_CONN_RS485,
+	FLOW_METER_CONN_RS485_AND_PULSE
+} FLOW_METER_CONN_TYPE; //���������ӷ�ʽ
+
+typedef enum
+{
+  BAUDRATE_1200 = 0U,
+	BAUDRATE_2400 ,
+	BAUDRATE_4800 ,
+	BAUDRATE_9600 ,
+	BAUDRATE_19200 ,
+	BAUDRATE_38400 ,
+	BAUDRATE_56000 ,
+	BAUDRATE_57600 ,
+	BAUDRATE_115200 
+} BAUDRATE_CODE; //������
+
+typedef enum
+{
+  PARITY_NONE = 0U,
+	PARITY_ODD ,
+	PARITY_EVEN ,
+
+} PARITY_BIT; //������
+
+/*****************ͨ�ýṹ�����******************************/
+typedef struct
+{
+  __IO FlagStatus delay_flag;  // ��ʱʱ�䵽��־λ
+  __IO uint16_t delay_time; // ��ʱ����ʱ��
+} DELAY_SEC_TYPE_T;         // ��ʱʱ�����ͽṹ��
+
+typedef struct
+{
+
+  DELAY_SEC_TYPE_T gprs_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;       // ��λ������ʱ��
+} SYS_DELAY_SEC_PARA_T;
 
 
 
+
+
+
+
+/*****************ͨ�ú�******************************/
 #define	BCD_2_DECIMAL(__BCD__)	 ((__BCD__ / 16) * 10 + __BCD__ % 16)
 
 #define	DECIMAL_2_BCD(__DECIMAL__)	 ((__DECIMAL__ / 16) * 10 + __DECIMAL__ % 16)
 
 
+// ��С��ת��
+#define BSWAP_16(x) ((x & 0x00ff) << 8) | \
+                        ((x & 0xff00) >> 8)
 
+#define BSWAP_32(x) ((x & 0xff000000) >> 24) |    \
+                        ((x & 0x00ff0000) >> 8) | \
+                        ((x & 0x0000ff00) << 8) | \
+                        ((x & 0x000000ff) << 24)
+
+
+#define BSWAP_64(x) ((x & 0xff00000000000000) >> 56) |     \
+                        ((x & 0x00ff000000000000) >> 40) | \
+                        ((x & 0x0000ff0000000000) >> 24) | \
+                        ((x & 0x000000ff00000000) >> 8) |  \
+                        ((x & 0x00000000ff000000) << 8) |  \
+                        ((x & 0x0000000000ff0000) << 24) | \
+                        ((x & 0x000000000000ff00) << 40) | \
+                        ((x & 0x00000000000000ff) << 56)
+
+/*�ó��ṹ���Աƫ�����ʹ�С*/
+#define OFFSET_OF(type, member) ((size_t) & (((type *)0))->member)
+#define SIZEOF_OF(type, member) (sizeof(((type *)0))->member)
+
+
+// ϵͳͨ���ӳ�ʱ������
+#define __SYS_DELAY_SEC_TIME_SET_(__HANDLE__, __NUMBER__) ((&sys_delay_sec_para_g)->__HANDLE__.delay_time = __NUMBER__)
+
+// ϵͳͨ���ӳ�ʱ���ȡ
+#define __SYS_DELAY_SEC_TIME_GET_(__HANDLE__)	((&sys_delay_sec_para_g)->__HANDLE__.delay_time)
+
+// ϵͳͨ���ӳٱ�־λget
+#define __SYS_DELAY_SEC_FLAG_GET(__HANDLE__) ((&sys_delay_sec_para_g)->__HANDLE__.delay_flag)
+// ϵͳͨ���ӳٱ�־λ����
+#define __SYS_DELAY_SEC_FLAG_SET_(__HANDLE__) ((&sys_delay_sec_para_g)->__HANDLE__.delay_flag = SET)
+// ϵͳͨ���ӳٱ�־λ���
+#define __SYS_DELAY_SEC_FLAG_CLEAR_(__HANDLE__) ((&sys_delay_sec_para_g)->__HANDLE__.delay_flag = RESET)
 
 
 
@@ -134,7 +187,7 @@
 //extern uint8_t read_data_buf_C_l[200];
 
 extern __IO FlagStatus sys_run_period; // ϵͳ��������
-
+extern SYS_DELAY_SEC_PARA_T sys_delay_sec_para_g;
 
 
 

--
Gitblit v1.9.3