From 6e3f1f560d618b37ee1a47fa2b0f682b70c3ef1c Mon Sep 17 00:00:00 2001 From: jinlicong <493886250@qq.com> Date: Wed, 19 Jun 2024 17:25:45 +0800 Subject: [PATCH] 增加OTA协议 --- Function/STORAGE/system_eep_mem_manage.h | 136 ++++++++++++++++++++++++++++----------------- 1 files changed, 85 insertions(+), 51 deletions(-) diff --git a/Function/STORAGE/system_eep_mem_manage.h b/Function/STORAGE/system_eep_mem_manage.h index 8c02e7f..da750cd 100644 --- a/Function/STORAGE/system_eep_mem_manage.h +++ b/Function/STORAGE/system_eep_mem_manage.h @@ -14,87 +14,121 @@ //��ͷ��256�ֽ� #define PARA_STORAGE_START_ADDR EEPROM_PHYS_START_ADDR + 256 -#define PARA_EEP_B_OFFSET_ADDR 10240 //B��ƫ�Ƶ�ַ +#define PARA_EEP_B_OFFSET_ADDR (15*1024) //B��ƫ�Ƶ�ַ //ϵͳ���ò��� #define SYSTEM_EEP_ID_ADDR PARA_STORAGE_START_ADDR -#define SYSTEM_EEP_ID_LENGTH 100 +#define SYSTEM_EEP_ID_ADDR_LENGTH 100 //�豸������Ϣ���� -#define BASIC_INFORMATION_OF_EQUIPMENT_ADDR SYSTEM_EEP_ID_ADDR + SYSTEM_EEP_ID_LENGTH -#define BASIC_INFORMATION_OF_EQUIPMENT_LENGTH 100 +#define BASIC_INFORMATION_OF_EQUIPMENT_ADDR SYSTEM_EEP_ID_ADDR + SYSTEM_EEP_ID_ADDR_LENGTH +#define BASIC_INFORMATION_OF_EQUIPMENT_ADDR_LENGTH 100 //�豸��Ӳ����Ϣ����-���� -#define MAIN_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_ADDR BASIC_INFORMATION_OF_EQUIPMENT_ADDR + BASIC_INFORMATION_OF_EQUIPMENT_LENGTH -#define MAIN_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_LENGTH 40 +#define MAIN_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_ADDR BASIC_INFORMATION_OF_EQUIPMENT_ADDR + BASIC_INFORMATION_OF_EQUIPMENT_ADDR_LENGTH +#define MAIN_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_ADDR_LENGTH 40 //�豸��Ӳ����Ϣ������LCD�壨������ -#define LCD_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_ADDR MAIN_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_ADDR + MAIN_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_LENGTH -#define LCD_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_LENGTH 40 +#define LCD_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_ADDR MAIN_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_ADDR + MAIN_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_ADDR_LENGTH +#define LCD_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_ADDR_LENGTH 40 //�豸��Ӳ����Ϣ�����߰壨������ -#define WIRELESS_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_ADDR LCD_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_ADDR + LCD_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_LENGTH -#define WIRELESS_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_LENGTH 40 +#define WIRELESS_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_ADDR LCD_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_ADDR + LCD_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_ADDR_LENGTH +#define WIRELESS_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_ADDR_LENGTH 40 //ʵʱ������ -#define REAL_TIME_DATA_ADDR WIRELESS_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_ADDR + WIRELESS_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_LENGTH -#define REAL_TIME_DATA_LENGTH 1280 +#define REAL_TIME_DATA_ADDR WIRELESS_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_ADDR + WIRELESS_EQUIPM_HARDWARE_SOFTWARE_INFO_PARAM_ADDR_LENGTH +#define REAL_TIME_DATA_ADDR_LENGTH 1280 //ͳ�Ʋ����� -#define STATISTICAL_DATA_ADDR REAL_TIME_DATA_ADDR + REAL_TIME_DATA_LENGTH -#define STATISTICAL_DATA_LENGTH 256 +#define STATISTICAL_DATA_ADDR REAL_TIME_DATA_ADDR + REAL_TIME_DATA_ADDR_LENGTH +#define STATISTICAL_DATA_ADDR_LENGTH 256 //������ز����� -#define VALVE_PARA_ADDR STATISTICAL_DATA_ADDR + STATISTICAL_DATA_LENGTH -#define VALVE_PARA_LENGTH 50 +#define VALVE_PARA_ADDR STATISTICAL_DATA_ADDR + STATISTICAL_DATA_ADDR_LENGTH +#define VALVE_PARA_ADDR_LENGTH 50 //�����Ʋ��� +#define FLOW_METER_PARA_ADDR VALVE_PARA_ADDR + VALVE_PARA_ADDR_LENGTH +#define FLOW_METER_PARA_ADDR_LENGTH 200 //��ѹ���ò��� -//����������� -//��ز������� -//��λ��\APP��¼���� -//��λ��������Ϣ���� -//����Զ��ͨѶ���ò��� -//�۸����ò��� -//��ֵ���ò��� -//�۸����ò��� -//���/�����ط����ò��� -//���� -//ϵͳ���ܿ����� -//ϵͳ����������/ϵͳ�����ϱ������� -//�ط������� +#define TEM_PRE_PARA_ADDR FLOW_METER_PARA_ADDR + FLOW_METER_PARA_ADDR_LENGTH +#define TEM_PRE_PARA_ADDR_LENGTH 60 +//����������� +#define MEASURE_FREEZE_PARA_ADDR TEM_PRE_PARA_ADDR + TEM_PRE_PARA_ADDR_LENGTH +#define MEASURE_FREEZE_PARA_ADDR_LENGTH 20 + +//��ز������� +#define BAT_PARA_ADDR MEASURE_FREEZE_PARA_ADDR + MEASURE_FREEZE_PARA_ADDR_LENGTH +#define BAT_PARA_ADDR_LENGTH 50 + +//��λ��\APP��¼���� +#define LOGIN_PASSWORD_ADDR BAT_PARA_ADDR + BAT_PARA_ADDR_LENGTH +#define LOGIN_PASSWORD_ADDR_LENGTH 24 + +//��λ��������Ϣ���� +#define UP_COMM_PARA_ADDR LOGIN_PASSWORD_ADDR + LOGIN_PASSWORD_ADDR_LENGTH +#define UP_COMM_PARA_ADDR_LENGTH 20 + +//����Զ��ͨѶ���ò��� +#define WRC_PARA_SIZHU_ADDR UP_COMM_PARA_ADDR + UP_COMM_PARA_ADDR_LENGTH +#define WRC_PARA_SIZHU_ADDR_LENGTH 300 + +//�۸����ò��� +#define PRICE_SCHEME_ADDR WRC_PARA_SIZHU_ADDR + WRC_PARA_SIZHU_ADDR_LENGTH +#define PRICE_SCHEME_ADDR_LENGTH 150 + +//��ֵ���ò��� +#define RECHARGE_INFO_ADDR PRICE_SCHEME_ADDR + PRICE_SCHEME_ADDR_LENGTH +#define RECHARGE_INFO_ADDR_LENGTH 50 + +//���/�����ط����ò��� +#define BILLING_VALVE_CTRL_PATA_ADDR RECHARGE_INFO_ADDR + RECHARGE_INFO_ADDR_LENGTH +#define BILLING_VALVE_CTRL_PATA_ADDR_LENGTH 80 + +//���� +#define OTHER_PATA_ADDR BILLING_VALVE_CTRL_PATA_ADDR + BILLING_VALVE_CTRL_PATA_ADDR_LENGTH +#define OTHER_PATA_ADDR_LENGTH 1000 + +//ϵͳ���ܿ����� +#define SYSTEM_FUNCTION_CTRL_WORD_ADDR OTHER_PATA_ADDR + OTHER_PATA_ADDR_LENGTH +#define SYSTEM_FUNCTION_CTRL_WORD_ADDR_LENGTH 20 + +//ϵͳ����������/ϵͳ�����ϱ������� +#define SYSTEM_ALARM_CTRL_WORD_ADDR SYSTEM_FUNCTION_CTRL_WORD_ADDR + SYSTEM_FUNCTION_CTRL_WORD_ADDR_LENGTH +#define SYSTEM_ALARM_CTRL_WORD_ADDR_LENGTH 56 + +//�ط������� +#define VALVE_CTL_BYTES_ADDR SYSTEM_ALARM_CTRL_WORD_ADDR + SYSTEM_ALARM_CTRL_WORD_ADDR_LENGTH +#define VALVE_CTL_BYTES_ADDR_LENGTH 56 //��־���Ʋ�������������ʷ���ݼ�¼��������¼�������ļ�¼���¼���¼�ȵȣ��ֿ�����ռ䣬�м䶼ҪԤ��һЩ�ռ�Ϊ���Ժ����ӣ� +#define LOG_CTRL_PARA_START_ADDR VALVE_CTL_BYTES_ADDR + VALVE_CTL_BYTES_ADDR_LENGTH +//��ʷ���ݼ�¼ +#define LOG_SIZHU_HISTORY_CTRL_ADDR LOG_CTRL_PARA_START_ADDR +#define LOG_SIZHU_HISTORY_CTRL_ADDR_LENGTH 22*5 +//������¼��Ԥ��1���� +#define LOG_ALARM_CTRL_ADDR LOG_SIZHU_HISTORY_CTRL_ADDR + LOG_SIZHU_HISTORY_CTRL_ADDR_LENGTH +#define LOG_ALARM_CTRL_ADDR_LENGTH 22*2 + +//�¼���¼��Ԥ��2���� +#define LOG_EVENT_CTRL_ADDR LOG_ALARM_CTRL_ADDR + LOG_ALARM_CTRL_ADDR_LENGTH +#define LOG_EVENT_CTRL_ADDR_LENGTH 22*10 + +//�����ļ�¼��Ԥ��2���� +#define LOG_PARA_MODIFY_CTRL_ADDR LOG_EVENT_CTRL_ADDR + LOG_EVENT_CTRL_ADDR_LENGTH +#define LOG_PARA_MODIFY_CTRL_ADDR_LENGTH 22*20 + + + //������ϵͳ��ز��� #define THIRD_SYSTEM_PARA_START_ADDR #define THIRD_SYSTEM_PARA_LENGTH //������ϵͳ����ϸ�֣��˲��ֹ����ڿ����������汾��ʱ����ӣ��˴��������գ� - - -//δ���...... - - - - - - - - - - - - - - - - - - - -- Gitblit v1.9.3