From e4424eb6b50d0300583c422dfb71d58e040f4b9e Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Tue, 11 Jun 2024 19:54:37 +0800
Subject: [PATCH] 继续测试优化
---
Function/STORAGE/sizhu_event_record.h | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/Function/STORAGE/sizhu_event_record.h b/Function/STORAGE/sizhu_event_record.h
index 00207cc..f755705 100644
--- a/Function/STORAGE/sizhu_event_record.h
+++ b/Function/STORAGE/sizhu_event_record.h
@@ -3,21 +3,38 @@
#include "system_general_para.h"
#include "system_mem_para.h"
+#include "valve_control.h"
/************************�洢�ռ�滮**************************/
-
+/*�¼���¼�洢����*/
+//���Ų�����¼
+#define VALVE_OPERATION_EVENT_LOG_START_ADDR VALVE_OPERATION_EVENT_STORAGE_START_ADDR
+#define VALVE_OPERATION_EVENT_LOG_LENGTH sizeof(LOG_SIZHU_VALVE_ACTION_RECORD_SAVE_T)
+#define VALVE_OPERATION_EVENT_LOG_MAX_NUM 200U
+#define VALVE_OPERATION_EVENT_LOG_END_ADDR VALVE_OPERATION_EVENT_LOG_START_ADDR + VALVE_OPERATION_EVENT_LOG_LENGTH * (VALVE_OPERATION_EVENT_LOG_MAX_NUM -1)
+//�ָ��������ü�¼
+#define FACTORY_RESET_EVENT_LOG_START_ADDR FACTORY_RESET_EVENT_STORAGE_START_ADDR
+#define FACTORY_RESET_EVENT_LOG_LENGTH sizeof(LOG_SIZHU_FACTORY_RESET_RECORD_SAVE_T)
+#define FACTORY_RESET_EVENT_LOG_MAX_NUM 20U
+#define FACTORY_RESET_EVENT_LOG_END_ADDR FACTORY_RESET_EVENT_LOG_START_ADDR + FACTORY_RESET_EVENT_LOG_LENGTH * (FACTORY_RESET_EVENT_LOG_MAX_NUM -1)
+//Уʱ��¼
+#define SET_TIME_EVENT_LOG_START_ADDR SET_TIME_EVENT_STORAGE_START_ADDR
+#define SET_TIME_EVENT_LOG_LENGTH sizeof(LOG_SIZHU_CALIBRATION_TIME_RECORD_SAVE_T)
+#define SET_TIME_EVENT_LOG_MAX_NUM 50U
+#define SET_TIME_EVENT_LOG_END_ADDR SET_TIME_EVENT_LOG_START_ADDR + SET_TIME_EVENT_LOG_LENGTH * (SET_TIME_EVENT_LOG_MAX_NUM -1)
/************************�洢�ռ�滮**************************/
#pragma pack(1)
//���Ų�����¼
typedef struct
{
+ uint16_t CRC16_MODBUS;
u16 serial_number;
sClockBCD record_time_BCD;
- uint8_t valve_action_source;
- uint8_t valve_action_type;
+ VALVE_CTRL_SOURCE_T valve_action_source;
+ VALVE_CTRL_TYPE_T valve_action_type;
u16 valve_action_id;
u16 open_valve_times;
@@ -27,6 +44,7 @@
//�ָ��������ü�¼
typedef struct
{
+ uint16_t CRC16_MODBUS;
u16 serial_number;
sClockBCD record_time_BCD;
@@ -37,9 +55,9 @@
}LOG_SIZHU_FACTORY_RESET_RECORD_SAVE_T;
//Уʱ��¼
-//�ָ��������ü�¼
typedef struct
{
+ uint16_t CRC16_MODBUS;
u16 serial_number;
sClockBCD record_time_BCD; //��¼ʱ�䣬���Ե���Уǰʱ��
@@ -54,7 +72,7 @@
#pragma pack()
-extern LOG_EVENT_CTRL_T log_event_para_g;
+
void sizhu_event_log_eeprom_default_init(void);
uint8_t sizhu_valve_action_log_eeprom_default_init(void);
@@ -70,8 +88,12 @@
uint8_t sizhu_factory_reset_log_save(uint8_t reset_source, uint16_t factory_id,uint8_t * para_alarm_ptr);
uint8_t sizhu_calibration_time_log_save(uint8_t calibration_source,uint16_t factory_id, uint8_t * para_alarm_ptr);
-void sizhu_valve_action_log_data_handle(uint8_t valve_action_source, uint16_t valve_action_type,uint16_t valve_action_ID);
+
void sizhu_factory_reset_log_data_handle(uint8_t reset_source, uint16_t factory_id);
void sizhu_calibration_time_log_data_handle(uint8_t calibration_source,uint16_t factory_id);
+
+void sizhuValveActionLogHandle(VALVE_CTRL_SOURCE_T valve_ctrl_source, VALVE_CTRL_TYPE_T valve_action_type,uint16_t valve_action_ID);
+
+
#endif
--
Gitblit v1.9.3