From e61d1595ebb1fa76b499cddec2df4bd66ec92b97 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Mon, 20 May 2024 20:02:47 +0800
Subject: [PATCH] 继续完善
---
Function/STORAGE/system_mem_para.c | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/Function/STORAGE/system_mem_para.c b/Function/STORAGE/system_mem_para.c
index 1fb770d..0a66459 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 = {
@@ -61,6 +62,12 @@
.PC_general_user_password = {0x68,0x68}, \
.PC_advanced_user_password = {0x52,0x86}, \
.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 = {
@@ -233,7 +240,7 @@
}
-//���в�����ʼ��ΪĬ��ֵ��д��EEPROM
+//?���в�����ʼ��ΪĬ��ֵ��д��EEPROM
void allParaDefaultInit(void)
{
ErrorStatus return_flag = PASS;
@@ -242,6 +249,9 @@
//�豸������Ϣ��ʼ��д��
+
+
+ //?�������䣬����������־�洢�IJ���
//ʵʱ���ݳ�ʼ��д��
@@ -253,7 +263,7 @@
-//���в���ֱ�Ӷ�ȡ
+//?���в���ֱ�Ӷ�ȡ
void allParaReadFromEep(void)
{
ErrorStatus return_flag = PASS;
@@ -262,6 +272,8 @@
//�豸������Ϣ��ȡ
+ //?�������䣬����������־�洢�IJ���
+
//�����ж�return_flag==FAIL�����洢�쳣�����������������Ļ�
}
--
Gitblit v1.9.3