From 1360095f8d64cf607d333d2fc7fd1dcd81d1bd7b Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 24 May 2024 16:35:10 +0800
Subject: [PATCH] 修改报警相关处理
---
Function/STORAGE/system_mem_para.c | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/Function/STORAGE/system_mem_para.c b/Function/STORAGE/system_mem_para.c
index 57bb4ed..65d7382 100644
--- a/Function/STORAGE/system_mem_para.c
+++ b/Function/STORAGE/system_mem_para.c
@@ -1,5 +1,5 @@
#include "system_mem_para.h"
-#include "mbcrc.h"
+#include "mbcrc1.h"
#include "eeprom.h"
#include "system_eep_mem_manage.h"
#include "rs485_data_analysis_pro.h"
@@ -27,6 +27,7 @@
.pulse_width = 50, \
.baudrate_code = BAUDRATE_9600, \
.parity_bit = PARITY_NONE, \
+ .output_voltage_code = RS485_V1_5V, \
.slave_address = 1, };
TEM_PRE_PARA_T tem_pre_para_g = {
@@ -63,6 +64,12 @@
.PC_manage_user_password = {0x75,0x97}, \
};
+UP_COMM_PARA_T up_comm_para_g = {
+ .slave_address = 1, \
+ .baudrate_code = BAUDRATE_115200, \
+ .parity_bit = PARITY_NONE, \
+};
+
WRC_PARA_SIZHU_T wrc_para_sizhu_g = {
.ip1 = {120,77,85,236}, \
@@ -84,13 +91,17 @@
.comm_timeout_time =120, \
.KVer_AES_128[0] ={8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0}, \
};
+WRC_DATA_NUM_CTRL_PARA_SIZHU_T wrc_data_num_ctrl_para_sizhu_g={
+ .report_data_save_num = 0,
+ .report_data_left_num = 0,
+};
BILLING_VALVE_CTRL_PATA_T billing_valve_ctrl_para_g = {
.balance_valve_ctrl_byte = {0}, \
.conditional_valve_ctrl_byte = {0}, \
.balance_small_value = {500,100,0,0,0}, \
.cumulate_flow_threshold = 0, \
- .no_wrc_days = 3, \
+ .no_wrc_days = 15, \
.no_use_gas_days = 0, \
};
@@ -244,6 +255,9 @@
//�豸������Ϣ��ʼ��д��
+ //?�������䣬����������־�洢�IJ���
+
+
//ʵʱ���ݳ�ʼ��д��
//�����ж�return_flag==FAIL�����洢�쳣�����������������Ļ�
@@ -262,6 +276,8 @@
//�豸������Ϣ��ȡ
+ //?�������䣬����������־�洢�IJ���
+
//�����ж�return_flag==FAIL�����洢�쳣�����������������Ļ�
}
--
Gitblit v1.9.3