From cf4d12fd8322cbb350dd3bc5af8c748e8790ac64 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 05 Jun 2024 17:38:06 +0800
Subject: [PATCH] 继续测试修改
---
Function/STORAGE/system_mem_para.h | 103 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 94 insertions(+), 9 deletions(-)
diff --git a/Function/STORAGE/system_mem_para.h b/Function/STORAGE/system_mem_para.h
index 20ca549..ed6ac39 100644
--- a/Function/STORAGE/system_mem_para.h
+++ b/Function/STORAGE/system_mem_para.h
@@ -6,18 +6,19 @@
#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
#define SOFT_SERIAL_NUMBER3 0x05
#define SOFT_SERIAL_NUMBER4 0x07
-#define EEP_PARA_INIT_ID 0x24041601 //BCD��ʽYYMMDDXX�����ܳ�����ĸ
+#define EEP_PARA_INIT_ID 0x24060301 //BCD��ʽYYMMDDXX�����ܳ�����ĸ
#define LAST_PATCH_ID EEP_PARA_PATCH_ID_1 //BCD��ʽYYMMDDXX�����ܳ�����ĸ��ע��˴�ָ�����һ������
/************������ʶ���������������ӣ�BCD��ʽYYMMDDXX�����ܳ�����ĸ************/
/************ÿ�����Ӻ�LAST_PATCH_IDָ�����һ������***************************/
-#define EEP_PARA_PATCH_ID_1 0x24041601
+#define EEP_PARA_PATCH_ID_1 0x24060301
/****************************************************/
@@ -48,7 +49,7 @@
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)
@@ -144,7 +145,7 @@
VALVE_LOCK_STATE_T valve_lock_state; //��������״̬
uint16_t open_times;//��������
uint16_t close_times;//�ط�����
- uint16_t valve_close_ID ;//�ط�ԭ�� ���ڱ���ID
+ uint16_t valve_close_ID ;//�ط�ԭ�� ���λΪ1����ǿֱ�Թط�������λ���ڱ���ID,���Ŵ�֮�����㡣
}SAVE_VALVE_PARA_T;
@@ -158,8 +159,11 @@
uint16_t pulse_width;
BAUDRATE_CODE baudrate_code;
PARITY_BIT parity_bit;
- uint8_t output_voltage_code;
+ 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;
@@ -212,6 +216,16 @@
// 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
{
@@ -239,18 +253,28 @@
}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;
- uint16_t valve_close_ctl[2];
int32_t balance_small_value[5];
- uint32_t cumulate_flow_value;
- uint8_t no_gprs_days;
+ 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; // �Ʒѱ���\�������ط����Ʋ���
@@ -262,6 +286,60 @@
//ϵͳ����������/ϵͳ�����ϱ�������
//�ط�������
/***********************************************/
+
+
+/*****************��־���Ʋ���******************************/
+//��־���Ʋ���
+typedef struct log_sizhu_run_t
+{
+ uint16_t log_count;
+ uint32_t log_addr_save;
+// uint32_t log_addr_begin;
+ uint8_t reserve[16];
+
+}LOG_SIZHU_RUN_T; //����ռ22�ֽ�
+
+//������ʷ��¼
+typedef struct
+{
+ LOG_SIZHU_RUN_T per_month_log;
+ LOG_SIZHU_RUN_T per_day_log;
+ LOG_SIZHU_RUN_T per_hour_log;
+ LOG_SIZHU_RUN_T per_interval_log;
+}LOG_SIZHU_HISTORY_CTRL_T;
+
+//������¼
+typedef struct
+{
+ LOG_SIZHU_RUN_T system_alarm_log;
+
+}LOG_ALARM_CTRL_T;
+
+//�¼���¼
+typedef struct LOG_EVENT_CTRL_T
+{
+ LOG_SIZHU_RUN_T valve_operation_log;
+
+ LOG_SIZHU_RUN_T factory_reset_log;
+
+ LOG_SIZHU_RUN_T set_time_log;
+
+}LOG_EVENT_CTRL_T;
+
+//�����ļ�¼
+typedef struct
+{
+ LOG_SIZHU_RUN_T basic_info_modify_log;
+ LOG_SIZHU_RUN_T cumulate_modify_log;
+ LOG_SIZHU_RUN_T balance_modify_log;
+ LOG_SIZHU_RUN_T flow_meter_para_modify_log;
+ LOG_SIZHU_RUN_T conditional_close_valve_para_modify_log;
+ LOG_SIZHU_RUN_T fun_ctrl_word_modify_log;
+ LOG_SIZHU_RUN_T alarm_ctrl_word_modify_log;
+ LOG_SIZHU_RUN_T close_valve_ctrl_word_modify_log;
+
+}LOG_PARA_MODIFY_CTRL_T;
+
@@ -279,9 +357,16 @@
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;
-
+extern LOG_SIZHU_HISTORY_CTRL_T log_sizhu_history_ctrl_g;
+extern LOG_ALARM_CTRL_T log_alarm_ctrl_g;
+extern LOG_EVENT_CTRL_T log_event_ctrl_g;
+extern LOG_PARA_MODIFY_CTRL_T log_para_modify_ctrl_g;
void allParaDefaultInit(void);
void allParaReadFromEep(void);
--
Gitblit v1.9.3