From fa6053f85287163f6e2d5dba690bec05cbc95f4a Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 07 Jun 2024 17:00:49 +0800
Subject: [PATCH] 增加阀控事件记录及修改阀控命令
---
Function/STORAGE/sizhu_event_record.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/Function/STORAGE/sizhu_event_record.c b/Function/STORAGE/sizhu_event_record.c
index bd5097a..742daf6 100644
--- a/Function/STORAGE/sizhu_event_record.c
+++ b/Function/STORAGE/sizhu_event_record.c
@@ -1,6 +1,16 @@
#include "sizhu_event_record.h"
+#include "sizhu_ctrl_word.h"
+#include "system_mem_para.h"
+//#include "rs485_data_analysis_pro.h"
+//#include "power_manage.h"
+#include "mbcrc1.h"
+#include "system_flash_mem_manage.h"
+#include "system_eep_mem_manage.h"
-LOG_EVENT_CTRL_T log_event_para_g;
+
+
+
+
void sizhu_event_log_eeprom_default_init(void)
{
sizhu_valve_action_log_eeprom_default_init();
@@ -56,9 +66,45 @@
{
}
-void sizhu_valve_action_log_data_handle(uint8_t valve_action_source, uint16_t valve_action_type,uint16_t valve_action_ID)
+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;
+ LOG_SIZHU_VALVE_ACTION_RECORD_SAVE_T previous_log_l;
+ uint32_t previous_addr = 0;
+
+
+ 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_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;
+ valve_ctrl_log_l.close_valve_times = save_valve_para_g.close_times;
+
+ FLASH_LOG_ADDR_CHECK(log_event_ctrl_g.valve_operation_log,VALVE_OPERATION_EVENT_LOG_START_ADDR,VALVE_OPERATION_EVENT_LOG_LENGTH,VALVE_OPERATION_EVENT_LOG_MAX_NUM);
+ if(log_event_ctrl_g.valve_operation_log.log_count != 0){
+ previous_addr = FlashLogPreviousAddrGet(log_event_ctrl_g.valve_operation_log.log_addr_save,VALVE_OPERATION_EVENT_LOG_START_ADDR,VALVE_OPERATION_EVENT_LOG_LENGTH,VALVE_OPERATION_EVENT_LOG_END_ADDR);
+ if(FlashMultipleReadAndCrcCheck((uint8_t *)&previous_log_l,previous_addr,VALVE_OPERATION_EVENT_LOG_LENGTH)== PASS)
+ valve_ctrl_log_l.serial_number = previous_log_l.serial_number +1;
+ else
+ valve_ctrl_log_l.serial_number = 0;
+ }else{
+ valve_ctrl_log_l.serial_number = 0;
+ }
+
+ //����CRC
+ valve_ctrl_log_l.CRC16_MODBUS = usMBCRC16(0xFFFF, (uint8_t * )&valve_ctrl_log_l.record_time_BCD, sizeof(LOG_SIZHU_VALVE_ACTION_RECORD_SAVE_T) - sizeof(valve_ctrl_log_l.CRC16_MODBUS) );
+
+ FlashMultipleWriteAndReadCheck((uint8_t *)&valve_ctrl_log_l,log_event_ctrl_g.valve_operation_log.log_addr_save,VALVE_OPERATION_EVENT_LOG_LENGTH);
+ FLASH_LOG_CRTL_PARA_HANDLE(log_event_ctrl_g.valve_operation_log,VALVE_OPERATION_EVENT_LOG_START_ADDR,VALVE_OPERATION_EVENT_LOG_LENGTH,VALVE_OPERATION_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_factory_reset_log_data_handle(uint8_t reset_source, uint16_t factory_id)
{
}
--
Gitblit v1.9.3