From cf4d12fd8322cbb350dd3bc5af8c748e8790ac64 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 05 Jun 2024 17:38:06 +0800
Subject: [PATCH] 继续测试修改
---
Function/STORAGE/system_mem_para.c | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/Function/STORAGE/system_mem_para.c b/Function/STORAGE/system_mem_para.c
index 82cc18b..34b607f 100644
--- a/Function/STORAGE/system_mem_para.c
+++ b/Function/STORAGE/system_mem_para.c
@@ -3,6 +3,9 @@
#include "eeprom.h"
#include "system_eep_mem_manage.h"
#include "rs485_data_analysis_pro.h"
+#include "pulse_and_alarm_line.h"
+#include "system_flash_mem_manage.h"
+
SYSTEM_EEP_IDENTIFICATION_T system_eep_id_g = { \
.eep_para_init_config_id = EEP_PARA_INIT_ID, \
@@ -26,13 +29,16 @@
FLOW_METER_PARA_T flow_meter_para_g ={ \
- .flow_meter_conn_type = FLOW_METER_CONN_RS485, \
+ .flow_meter_conn_type = FLOW_METER_CONN_RS485_AND_PULSE, \
.flow_meter_code = SIZHUMODBUSV2_0, \
+ .pulse_coe = 1.0, \
.pulse_width = 50, \
.baudrate_code = BAUDRATE_9600, \
.parity_bit = PARITY_NONE, \
.output_voltage_code = RS485_V1_5V, \
- .slave_address = 1, };
+ .slave_address = 1, \
+ .broken_line_multiplex = BROKEN_LINE_MUTIPLEX_NONE, \
+};
TEM_PRE_PARA_T tem_pre_para_g = { \
.tem_up_limit = 70, \
@@ -108,6 +114,20 @@
.no_use_gas_days = 0, \
};
+
+LOG_SIZHU_HISTORY_CTRL_T log_sizhu_history_ctrl_g = {
+ .per_month_log.log_addr_save = MONTH_HISTORY_RECORD_STORAGE_START_ADDR, \
+ .per_day_log.log_addr_save = DAY_HISTORY_RECORD_STORAGE_START_ADDR, \
+ .per_hour_log.log_addr_save = HOUR_HISTORY_RECORD_STORAGE_START_ADDR, \
+ .per_interval_log.log_addr_save = INTERVAL_HISTORY_RECORD_STORAGE_START_ADDR, \
+};
+LOG_ALARM_CTRL_T log_alarm_ctrl_g ={
+ .system_alarm_log.log_addr_save = SYSTEM_ALARM_STORAGE_START_ADDR, \
+};
+LOG_EVENT_CTRL_T log_event_ctrl_g ={
+
+};
+LOG_PARA_MODIFY_CTRL_T log_para_modify_ctrl_g;
//EEPROM����д��Ͷ�ȡ���,ֻ֧��1024���ֽڵ�д�����ȡ���
ErrorStatus eepWriteAndReadCheck(uint8_t * write_data,uint32_t addr,uint16_t length)
@@ -270,6 +290,25 @@
+
+
+
+
+
+
+
+//��־���Ʋ�����ʼ��д��
+ErrorStatus LogCtrlParaDefaultInit(void)
+{
+ ErrorStatus return_flag = FAIL;
+ log_sizhu_history_ctrl_g.per_day_log.log_count =
+
+ return_flag = paraCalcCrcAndWriteEepAB((uint8_t * )&equipment_basic_inf_g,BASIC_INFORMATION_OF_EQUIPMENT_ADDR,BASIC_INFORMATION_OF_EQUIPMENT_ADDR + PARA_EEP_B_OFFSET_ADDR,EQUIPMENT_BASIC_INF_LENGTH);
+}
+
+
+
+
//?���в�����ʼ��ΪĬ��ֵ��д��EEPROM
void allParaDefaultInit(void)
{
--
Gitblit v1.9.3