From f03cf3ae7a36954e64fc014e6bb7afd20c5a5247 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 12 Jun 2024 17:22:08 +0800
Subject: [PATCH] 增加IAP功能，准备测试上位机升级
---
Function/STORAGE/sizhu_event_record.c | 75 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 insertions(+), 4 deletions(-)
diff --git a/Function/STORAGE/sizhu_event_record.c b/Function/STORAGE/sizhu_event_record.c
index 742daf6..29c434b 100644
--- a/Function/STORAGE/sizhu_event_record.c
+++ b/Function/STORAGE/sizhu_event_record.c
@@ -66,6 +66,7 @@
{
}
+//���ؼ�¼
void sizhuValveActionLogHandle(VALVE_CTRL_SOURCE_T valve_ctrl_source, VALVE_CTRL_TYPE_T valve_action_type,uint16_t valve_action_ID)
{
LOG_SIZHU_VALVE_ACTION_RECORD_SAVE_T valve_ctrl_log_l;
@@ -76,7 +77,7 @@
return; //?û�������ԣ�������
arrayA_2_arrayB((uint8_t *)&sys_clockBCD_g,(uint8_t *)&valve_ctrl_log_l.record_time_BCD,sizeof(sys_clockBCD_g), LITTLE_ENDIAN);
- valve_ctrl_log_l.valve_action_source = valve_ctrl_source; // �������ۻ���
+ valve_ctrl_log_l.valve_action_source = valve_ctrl_source;
valve_ctrl_log_l.valve_action_type = valve_action_type;
valve_ctrl_log_l.valve_action_id = valve_action_ID;
valve_ctrl_log_l.open_valve_times = save_valve_para_g.open_times;
@@ -104,10 +105,76 @@
}
}
+//�ָ��������ü�¼
+void sizhuFactoryResetLogHandle(FACTORY_RESET_SOURCE modify_source, uint16_t manufactuer_code)
+{
+ LOG_SIZHU_FACTORY_RESET_RECORD_SAVE_T factory_reset_log_l;
+ LOG_SIZHU_FACTORY_RESET_RECORD_SAVE_T previous_log_l;
+ uint32_t previous_addr = 0;
+
+
+ return; //?û�������ԣ�������
+ arrayA_2_arrayB((uint8_t *)&sys_clockBCD_g,(uint8_t *)&factory_reset_log_l.record_time_BCD,sizeof(sys_clockBCD_g), LITTLE_ENDIAN);
+
+ factory_reset_log_l.modify_source = modify_source;
+ factory_reset_log_l.factory_id = manufactuer_code;
-void sizhu_factory_reset_log_data_handle(uint8_t reset_source, uint16_t factory_id)
-{
+ FLASH_LOG_ADDR_CHECK(log_event_ctrl_g.factory_reset_log,FACTORY_RESET_EVENT_LOG_START_ADDR,FACTORY_RESET_EVENT_LOG_LENGTH,FACTORY_RESET_EVENT_LOG_MAX_NUM);
+ if(log_event_ctrl_g.factory_reset_log.log_count != 0){
+ previous_addr = FlashLogPreviousAddrGet(log_event_ctrl_g.factory_reset_log.log_addr_save,FACTORY_RESET_EVENT_LOG_START_ADDR,FACTORY_RESET_EVENT_LOG_LENGTH,FACTORY_RESET_EVENT_LOG_END_ADDR);
+ if(FlashMultipleReadAndCrcCheck((uint8_t *)&previous_log_l,previous_addr,FACTORY_RESET_EVENT_LOG_LENGTH)== PASS)
+ factory_reset_log_l.serial_number = previous_log_l.serial_number +1;
+ else
+ factory_reset_log_l.serial_number = 0;
+ }else{
+ factory_reset_log_l.serial_number = 0;
+ }
+
+ //����CRC
+ factory_reset_log_l.CRC16_MODBUS = usMBCRC16(0xFFFF, (uint8_t * )&factory_reset_log_l.record_time_BCD, sizeof(LOG_SIZHU_FACTORY_RESET_RECORD_SAVE_T) - sizeof(factory_reset_log_l.CRC16_MODBUS) );
+
+ FlashMultipleWriteAndReadCheck((uint8_t *)&factory_reset_log_l,log_event_ctrl_g.factory_reset_log.log_addr_save,FACTORY_RESET_EVENT_LOG_LENGTH);
+ FLASH_LOG_CRTL_PARA_HANDLE(log_event_ctrl_g.factory_reset_log,FACTORY_RESET_EVENT_LOG_START_ADDR,FACTORY_RESET_EVENT_LOG_LENGTH,FACTORY_RESET_EVENT_LOG_MAX_NUM);
+ //?�����洢
+ if(paraCalcCrcAndWriteEepAB((uint8_t * )&log_event_ctrl_g,LOG_EVENT_CTRL_ADDR,LOG_EVENT_CTRL_ADDR + PARA_EEP_B_OFFSET_ADDR,sizeof(log_event_ctrl_g))==FAIL){
+
+ }
}
-void sizhu_calibration_time_log_data_handle(uint8_t calibration_source,uint16_t factory_id)
+
+//Уʱ��¼
+void sizhuSetTimeLogHandle(SET_TIME_SOURCE modify_source, uint16_t manufactuer_code,sClockBCD time_after_cali)
{
+ LOG_SIZHU_CALIBRATION_TIME_RECORD_SAVE_T set_time_log_l;
+ LOG_SIZHU_CALIBRATION_TIME_RECORD_SAVE_T previous_log_l;
+ uint32_t previous_addr = 0;
+
+
+ return; //?û�������ԣ�������
+ arrayA_2_arrayB((uint8_t *)&sys_clockBCD_g,(uint8_t *)&set_time_log_l.record_time_BCD,sizeof(sys_clockBCD_g), LITTLE_ENDIAN);
+ set_time_log_l.modify_source = modify_source;
+ set_time_log_l.factory_id = manufactuer_code;
+ arrayA_2_arrayB((uint8_t *)&time_after_cali,(uint8_t *)&set_time_log_l.set_time_BCD,sizeof(sys_clockBCD_g), LITTLE_ENDIAN);
+
+ FLASH_LOG_ADDR_CHECK(log_event_ctrl_g.set_time_log,SET_TIME_EVENT_LOG_START_ADDR,SET_TIME_EVENT_LOG_LENGTH,SET_TIME_EVENT_LOG_MAX_NUM);
+ if(log_event_ctrl_g.set_time_log.log_count != 0){
+ previous_addr = FlashLogPreviousAddrGet(log_event_ctrl_g.set_time_log.log_addr_save,SET_TIME_EVENT_LOG_START_ADDR,SET_TIME_EVENT_LOG_LENGTH,SET_TIME_EVENT_LOG_END_ADDR);
+ if(FlashMultipleReadAndCrcCheck((uint8_t *)&previous_log_l,previous_addr,SET_TIME_EVENT_LOG_LENGTH)== PASS)
+ set_time_log_l.serial_number = previous_log_l.serial_number +1;
+ else
+ set_time_log_l.serial_number = 0;
+ }else{
+ set_time_log_l.serial_number = 0;
+ }
+
+ //����CRC
+ set_time_log_l.CRC16_MODBUS = usMBCRC16(0xFFFF, (uint8_t * )&set_time_log_l.record_time_BCD, sizeof(LOG_SIZHU_CALIBRATION_TIME_RECORD_SAVE_T) - sizeof(set_time_log_l.CRC16_MODBUS) );
+
+ FlashMultipleWriteAndReadCheck((uint8_t *)&set_time_log_l,log_event_ctrl_g.set_time_log.log_addr_save,SET_TIME_EVENT_LOG_LENGTH);
+ FLASH_LOG_CRTL_PARA_HANDLE(log_event_ctrl_g.set_time_log,SET_TIME_EVENT_LOG_START_ADDR,SET_TIME_EVENT_LOG_LENGTH,SET_TIME_EVENT_LOG_MAX_NUM);
+ //?�����洢
+ if(paraCalcCrcAndWriteEepAB((uint8_t * )&log_event_ctrl_g,LOG_EVENT_CTRL_ADDR,LOG_EVENT_CTRL_ADDR + PARA_EEP_B_OFFSET_ADDR,sizeof(log_event_ctrl_g))==FAIL){
+
+ }
}
+
+
--
Gitblit v1.9.3