继续完善，开始添加远传功能

jinlicong

2024-04-28 6e797b7c8ce7e71b86d67464b96c4eaa0de1f670

 Function/STORAGE/system_mem_para.h

@@ -3,6 +3,7 @@
#include "define_all.h"
#include "system_general_para.h"
#include "extern_rtc.h"
#include "valve_control.h"

#define SOFT_SERIAL_NUMBER1   0x05
#define SOFT_SERIAL_NUMBER2   0x00
@@ -39,12 +40,12 @@
{
   uint16_t   CRC16_MODBUS;
   char  specification_model[20];//¹æ¸ñÐͺÅ
   DEVICE_MODEL      product_type; //²úÆ·ÀàÐÍ
   CALIBER_MODEL      caliber_model;//¿Ú¾¶ 1/2/3/4/5/6/7/8´ú±í050/080/100/150/200/025/032/040
   DEVICE_TYPE      product_type; //²úÆ·ÀàÐÍ
   CALIBER_TYPE      caliber_type;//¿Ú¾¶ 1/2/3/4/5/6/7/8´ú±í050/080/100/150/200/025/032/040
   uint8_t       serial_number[10];//³ö³§±àºÅ£¬BCDÄ¿Ç°Ö»ÓÃÇ°8×Ö½Ú£¬16룬ºó2×Ö½Ú²¹FFH¡£
   uint8_t      manufactuer_code[2];//³§¼Ò´úÂë,×ÔÓã¬ÓÃÓÚʶ±ðÉ豸ÓÃ;£¬±ÈÈçÊÇаÂÌùÅÆ£¬Ôò³§¼Ò´úÂë±íʾΪа£¬¸Ä´úÂë¿ÉÓÃÓÚÉÏλ»úʶ±ð£¬ÉÏλ»úʹÓÃÕßҲΪа£¬Ôò¿É½øÐвÙ×÷¡£
   VALVE_MODEL    valve_type;//·§ÃÅÐͺÅ0:ÎÞ·§ÃÅ£»1£ºÅôÊ¢·§Ì壻2:¹þµÂ·§Ì壻ÆäËû£¬Ä¬ÈϹþµÂ·§Ìå
   EQUIPMENT_MODEL      equipment_type;//É豸ÀàÐÍ,10H±íʾ¡°Ò»ÌåʽÁ÷Á¿Ô¶´«ÖÕ¶Ë
   VALVE_TYPE    valve_type;//·§ÃÅÐͺÅ0:ÎÞ·§ÃÅ£»1£ºÅôÊ¢·§Ì壻2:¹þµÂ·§Ì壻ÆäËû£¬Ä¬ÈϹþµÂ·§Ìå
   EQUIPMENT_TYPE      equipment_type;//É豸ÀàÐÍ,10H±íʾ¡°Ò»ÌåʽÁ÷Á¿Ô¶´«ÖÕ¶Ë
   uint8_t   reserve[32];
}EQUIPMENT_BASIC_INF_T;
#define   EQUIPMENT_BASIC_INF_LENGTH        sizeof(EQUIPMENT_BASIC_INF_T)
@@ -98,9 +99,10 @@
   {
      double forward_cumulate_sc; // ÕýÏò±ê¿öÀÛ»ýÁ¿
      double forward_cumulate_wc;
      double cal_cumulate_reserve[2];         // ±ê¶¨ÀÛ»ýÁ¿_Ô¤Áô
      double err_forward_cumulate_reserve[2]; // ´íÎóÀÛ»ýÁ¿_Ô¤Áô

      double cal_cumulate_sc;         // ±ê¶¨ÀÛ»ýÁ¿
      double cal_cumulate_wc;        
      double err_forward_cumulate_sc; // ´íÎóÀÛ»ýÁ¿
      double err_forward_cumulate_wc; 
   }realtime_flow_data_s;
   struct realtime_billing_data
   {
@@ -132,7 +134,8 @@

typedef struct 
{
   VALVE_STATE_T      valve_state ;
   VALVE_TYPE            valve_type;
   VALVE_STATUS      valve_status ;
   VALVE_LOCK_STATE_T      valve_lock_state;  //·§ÃÅËø¶¨×´Ì¬
   uint16_t      open_times;//¿ª·§´ÎÊý
   uint16_t      close_times;//¹Ø·§´ÎÊý   
@@ -142,7 +145,7 @@
}SAVE_VALVE_PARA_T;


//δÍê³É.....
//?δÍê³É.....

#pragma pack()

@@ -153,7 +156,7 @@
extern LCD_EQUIPM_HARDWARE_SOFTWARE_INF_T         lcd_equipment_hardware_software_inf_g;
extern WIRELESS_EQUIPM_HARDWARE_SOFTWARE_INF_T    wireless_equipment_hardware_software_inf_g;
extern SAVE_REALTIME_DATA_T               save_realtime_data_g;

extern SAVE_VALVE_PARA_T                     save_valve_para_g;



@@ -162,4 +165,6 @@
void allParaReadFromEep(void);
void allParaPatchPro(void);

#endif 
#endif