继续完善，开始增加阀控相关

jinlicong

2024-04-26 07f9ac2234bbc367d7203f094233867f360671f5

 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; // ·§ÃÅ״̬ÀàÐÍ


//Êý¾ÝÀàÐÍ´óС¶Ë
@@ -128,6 +108,10 @@
                        ((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__)