From 07f9ac2234bbc367d7203f094233867f360671f5 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 26 Apr 2024 17:25:32 +0800
Subject: [PATCH] 继续完善，开始增加阀控相关
---
Soft/system_general_para.h | 28 ++++------------------------
1 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/Soft/system_general_para.h b/Soft/system_general_para.h
index e510409..77f3ac1 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,14 +36,9 @@
DN25_TYPE,
DN32_TYPE,
DN40_TYPE,
-} CALIBER_MODEL; // �ھ�
+} CALIBER_TYPE; // �ھ�
-typedef enum
-{
- VM_NONE = 0U,
- VM_PENGSHENG, //��ʢ����
- VM_HADE, //���·���
-} VALVE_MODEL; // �����ͺ�
+
typedef enum
@@ -53,24 +48,9 @@
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; // ����״̬����
//�������ʹ�С��
--
Gitblit v1.9.3