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.h | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/Function/STORAGE/sizhu_event_record.h b/Function/STORAGE/sizhu_event_record.h
index baa4247..69b58f9 100644
--- a/Function/STORAGE/sizhu_event_record.h
+++ b/Function/STORAGE/sizhu_event_record.h
@@ -3,6 +3,7 @@
#include "system_general_para.h"
#include "system_mem_para.h"
+#include "valve_control.h"
/************************�洢�ռ�滮**************************/
/*�¼���¼�洢����*/
@@ -23,16 +24,38 @@
#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)
/************************�洢�ռ�滮**************************/
+
+
+
+
+typedef enum
+{
+ FACTORY_RESET_SOURCE_UP_COMM = 1U,
+ FACTORY_RESET_SOURCE_BLE_APP,
+ FACTORY_RESET_SOURCE_WRC, //Զ��
+} FACTORY_RESET_SOURCE; // �ָ�����������Դ
+
+
+typedef enum
+{
+ SET_TIME_SOURCE_AUTO = 1U, //�Զ�Уʱ
+ SET_TIME_SOURCE_WRC_COMMAND,
+ SET_TIME_SOURCE_UP_COMM,
+ SET_TIME_SOURCE_BLE_APP,
+} SET_TIME_SOURCE; // �ָ�����������Դ
+
+
#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;
@@ -42,11 +65,12 @@
//�ָ��������ü�¼
typedef struct
{
+ uint16_t CRC16_MODBUS;
u16 serial_number;
sClockBCD record_time_BCD;
- uint8_t modify_source;
+ FACTORY_RESET_SOURCE modify_source;
u16 factory_id;
}LOG_SIZHU_FACTORY_RESET_RECORD_SAVE_T;
@@ -54,11 +78,12 @@
//Уʱ��¼
typedef struct
{
+ uint16_t CRC16_MODBUS;
u16 serial_number;
sClockBCD record_time_BCD; //��¼ʱ�䣬���Ե���Уǰʱ��
- uint8_t modify_source;
+ SET_TIME_SOURCE modify_source;
u16 factory_id;
sClockBCD set_time_BCD; //���õ�ʱ�䣬Ҳ����У���ʱ��
@@ -84,8 +109,11 @@
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);
+void sizhuFactoryResetLogHandle(FACTORY_RESET_SOURCE modify_source, uint16_t manufactuer_code);
+void sizhuSetTimeLogHandle(SET_TIME_SOURCE modify_source, uint16_t manufactuer_code,sClockBCD time_after_cali);
+
#endif
--
Gitblit v1.9.3