From 66ea95dcb8fd91d29465c2f11ced4dd6153a2504 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 22 May 2024 17:15:02 +0800
Subject: [PATCH] 继续完善远传
---
Function/STORAGE/system_mem_para.h | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 156 insertions(+), 10 deletions(-)
diff --git a/Function/STORAGE/system_mem_para.h b/Function/STORAGE/system_mem_para.h
index de19ec9..2cab594 100644
--- a/Function/STORAGE/system_mem_para.h
+++ b/Function/STORAGE/system_mem_para.h
@@ -4,6 +4,9 @@
#include "system_general_para.h"
#include "extern_rtc.h"
#include "valve_control.h"
+#include "wireless_remote_comm.h"
+#include "sizhu_ctrl_word.h"
+#include "rs485_read_data.h"
#define SOFT_SERIAL_NUMBER1 0x05
#define SOFT_SERIAL_NUMBER2 0x00
@@ -23,7 +26,7 @@
#define CRC16_MODBUS_OFFSET sizeof(uint16_t)
-//ϵͳ������ʶ
+//ϵͳ���ò�����ʶ
typedef struct
{
uint16_t CRC16_MODBUS;
@@ -36,21 +39,22 @@
}SYSTEM_EEP_IDENTIFICATION_T;
#define SYSTEM_EEP_IDENTIFICATION_LENGTH sizeof(SYSTEM_EEP_IDENTIFICATION_T)
+//�豸������Ϣ
typedef struct equipment_basic_inf
{
uint16_t CRC16_MODBUS;
char specification_model[20];//����ͺ�
DEVICE_TYPE product_type; //��Ʒ����
- CALIBER_TYPE CALIBER_TYPE;//�ھ� 1/2/3/4/5/6/7/8����050/080/100/150/200/025/032/040
+ 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_TYPE valve_type;//�����ͺ�0:���ţ�1����ʢ���壻2:���·��壻������Ĭ�Ϲ��·���
- EQUIPMENT_TYPE equipment_type;//�豸����,10H��ʾ��һ��ʽ����Զ���ն�
+ EQUIPMENT_TYPE equipment_type;//�豸����
uint8_t reserve[32];
}EQUIPMENT_BASIC_INF_T;
#define EQUIPMENT_BASIC_INF_LENGTH sizeof(EQUIPMENT_BASIC_INF_T)
-
+//�豸��Ӳ����Ϣ
typedef struct main_equipment_hardware_software_inf
{
uint16_t CRC16_MODBUS;
@@ -64,6 +68,7 @@
}MAIN_EQUIPM_HARDWARE_SOFTWARE_INF_T;
#define MAIN_EQUIPM_HARDWARE_SOFTWARE_INF_LENGTH sizeof(MAIN_EQUIPM_HARDWARE_SOFTWARE_INF_T)
+//LCD����Ӳ����Ϣ
typedef struct lcd_equipment_hardware_software_inf
{
uint16_t CRC16_MODBUS;
@@ -77,6 +82,7 @@
}LCD_EQUIPM_HARDWARE_SOFTWARE_INF_T;
#define LCD_EQUIPM_HARDWARE_SOFTWARE_INF_LENGTH sizeof(LCD_EQUIPM_HARDWARE_SOFTWARE_INF_T)
+//����ͨѶ����Ӳ����Ϣ
typedef struct wireless_equipment_hardware_software_inf
{
uint16_t CRC16_MODBUS;
@@ -91,7 +97,7 @@
#define WIRELESS_EQUIPM_HARDWARE_SOFTWARE_INF_LENGTH sizeof(WIRELESS_EQUIPM_HARDWARE_SOFTWARE_INF_T)
-
+//ʵʱ����
typedef struct{
uint16_t CRC16_MODBUS;
sClockBCD record_time_BCD;
@@ -132,6 +138,7 @@
//ͳ�Ʋ�������ʱ����
+//������ز���
typedef struct
{
VALVE_STATUS valve_status ;
@@ -143,8 +150,141 @@
}SAVE_VALVE_PARA_T;
+//�����Ʋ���
+typedef struct
+{
+ FLOW_METER_CONN_TYPE flow_meter_conn_type;
+ uint16_t flow_meter_code;
+ float pulse_coe;
+ uint16_t pulse_width;
+ BAUDRATE_CODE baudrate_code;
+ PARITY_BIT parity_bit;
+ RS485_PWR_OUTPUT_SELECT output_voltage_code;
+ uint8_t slave_address;
+
+ uint8_t broken_line_multiplex; //���߸���
+
+ uint8_t sub_machine_num;
+ char flow_meter_serial_number;
+
+}FLOW_METER_PARA_T;
-//?��.....
+//��ѹ���ò���
+typedef struct
+{
+ int16_t tem_up_limit;
+ int16_t tem_up_up_limit;
+ int16_t tem_low_limit;
+ int16_t tem_low_low_limit;
+ int16_t ambient_tem_up_limit;
+ int16_t ambient_tem_low_limit;
+ float pre_up_limit;
+ float pre_up_up_limit;
+ float pre_low_limit;
+ float pre_low_low_limit;
+
+}TEM_PRE_PARA_T;
+
+//�����������
+typedef struct
+{
+ uint16_t freeze_interval;
+ uint8_t daily_freeze_time_BCD[2];
+}MEASURE_FREEZE_PARA_T;
+
+//��ز���
+typedef struct
+{
+ uint8_t lith_bat_low_v;
+ uint8_t lith_bat_under_v;
+ uint8_t alka_bat_low_v;
+ uint8_t alka_bat_under_v;
+ uint32_t lith_bat_max_hour;
+ uint32_t lith_bat_used_hour;
+ uint32_t lith_bat_used_sec;
+ uint8_t reserve[32];
+}BAT_PARA_T;
+
+//���\APP��������
+typedef struct
+{
+ uint8_t PC_general_user_password[2];
+ uint8_t PC_advanced_user_password[2];
+ uint8_t PC_manage_user_password[2];
+// uint8_t APP_general_user_password[2];
+// uint8_t APP_advanced_user_password[2];
+// uint8_t APP_manage_user_password[2];
+}LOGIN_PASSWORD_T;
+
+//��λ������������Ϣ
+typedef struct
+{
+ uint8_t slave_address;
+ BAUDRATE_CODE baudrate_code;
+ PARITY_BIT parity_bit;
+
+}UP_COMM_PARA_T;
+
+
+//����Զ��ͨѶ���ò���
+typedef struct
+{
+ uint8_t ip1[4];
+ uint16_t ip_port1;
+ LINK_TYPE ip1_connect_type; //IP����ģʽ 0��TCPֱ�� 1�����ӵ���ƽ̨ 2�������ƶ�onenetƽ̨
+ uint8_t ip2[4];
+ uint16_t ip_port2;
+ LINK_TYPE ip2_connect_type; //IP����ģʽ 0��TCPֱ�� 1�����ӵ���ƽ̨ 2�������ƶ�onenetƽ̨
+ uint16_t bat_power_data_interval; //��ع������ݼ��
+ uint16_t ext_power_data_interval; // ������ݼ��
+
+ WRC_TIME_START_TYPE time_start_type; //ʱ�䷢��ģʽ,0������ 1����� :2����ʱ 3�����+��ʱ. ��ʱֻ֧��1����2
+ uint16_t bat_power_send_interval;
+ uint16_t ext_power_send_interval;
+ uint8_t send_first_time_BCD[2]; //�״η���ʱ�䣬�����ڴ�巢�ͣ������״η���ʱ������Ϊ0��15�֣�24���ͷ���һ�Ρ� �Ǿ���ÿ��0��15��ͨѶһ��
+ uint8_t timing_send_num; //��ʱ�ϱ�����1-12
+ uint8_t timing_send_time_BCD[12][2]; //��ʱ����ʱ���1-12
+
+ uint16_t retransmission_interval; // �ط����
+ uint8_t retransmission_num; //�ط�����
+ uint16_t comm_timeout_time; //��ʱʱ�䣬��
+
+ uint8_t KVer_AES_128[9][16];
+
+}WRC_PARA_SIZHU_T;
+
+typedef struct
+{
+ uint16_t report_data_save_num;
+ uint16_t report_data_left_num;
+
+}WRC_DATA_NUM_CTRL_PARA_SIZHU_T;
+
+
+//�۸����ò���
+//��ֵ���ò���
+//���/�����ط����ò���
+typedef struct
+{
+ VALVE_BILLING_CHANGE_1_T balance_valve_ctrl_byte;
+ VALVE_BILLING_CHANGE_2_T conditional_valve_ctrl_byte;
+ int32_t balance_small_value[5];
+ uint32_t cumulate_flow_threshold;
+ uint8_t no_wrc_days;
+ uint8_t no_use_gas_days;
+ uint8_t reserve[5];
+} BILLING_VALVE_CTRL_PATA_T; // �Ʒѱ���\�������ط����Ʋ���
+
+
+
+/*****************���¼�����������sizhu_ctrl_word.h��******************************/
+//���ܿ�����
+//ϵͳ����������/ϵͳ�����ϱ�������
+//�ط�������
+/***********************************************/
+
+
+
#pragma pack()
@@ -154,10 +294,16 @@
extern MAIN_EQUIPM_HARDWARE_SOFTWARE_INF_T main_equipment_hardware_software_inf_g;
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;
-
-
+extern __IO SAVE_REALTIME_DATA_T save_realtime_data_g;
+extern __IO SAVE_VALVE_PARA_T save_valve_para_g;
+extern FLOW_METER_PARA_T flow_meter_para_g;
+extern MEASURE_FREEZE_PARA_T measure_freeze_para_g;
+extern BAT_PARA_T bat_para_g;
+extern LOGIN_PASSWORD_T login_passeord_g;
+extern UP_COMM_PARA_T up_comm_para_g;
+extern WRC_PARA_SIZHU_T wrc_para_sizhu_g;
+extern WRC_DATA_NUM_CTRL_PARA_SIZHU_T wrc_data_num_ctrl_para_sizhu_g;
+extern BILLING_VALVE_CTRL_PATA_T billing_valve_ctrl_para_g;
void allParaDefaultInit(void);
--
Gitblit v1.9.3