From 6e797b7c8ce7e71b86d67464b96c4eaa0de1f670 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Sun, 28 Apr 2024 19:59:24 +0800
Subject: [PATCH] 继续完善，开始添加远传功能
---
Function/STORAGE/system_mem_para.h | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/Function/STORAGE/system_mem_para.h b/Function/STORAGE/system_mem_para.h
index 7b5ac6c..7462fde 100644
--- a/Function/STORAGE/system_mem_para.h
+++ b/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
\ No newline at end of file
+#endif
+
+
--
Gitblit v1.9.3