From 7c32dae0738873814130c2e721d19983404611f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B7=E5=BA=8A=E5=B0=B1=E7=8A=AF=E5=9B=B0?= <11730503+psx123456@user.noreply.gitee.com> Date: Sat, 14 Dec 2024 20:32:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APP/businessLogic/Src/cfg_protocol.c | 4 ++-- APP/businessLogic/Src/inFlash.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/APP/businessLogic/Src/cfg_protocol.c b/APP/businessLogic/Src/cfg_protocol.c index 2259da7..e5b99ff 100644 --- a/APP/businessLogic/Src/cfg_protocol.c +++ b/APP/businessLogic/Src/cfg_protocol.c @@ -253,8 +253,8 @@ void read_and_process_config_data(void) /* 判断出现短路保护后延长该段时间再次检测是否短路，仍然短路则关闭输出的间隔是否正确 */ save_configInfo.outputAgainFlagTime = pack->outputAgainFlagTime[0] << 8 | pack->outputAgainFlagTime[1]; - if (!((save_configInfo.sensorEnableBroadcastTime < 30 && save_configInfo.sensorEnableBroadcastTime > 5) - || saveConfigInfo.sensorEnableBroadcastTime == 0)) { + if (!((save_configInfo.outputAgainFlagTime < 30 && save_configInfo.outputAgainFlagTime > 5) + || save_configInfo.outputAgainFlagTime == 0)) { // debug(" outputAgainFlagTime : %d \n", save_configInfo.outputAgainFlagTime); goto err; } diff --git a/APP/businessLogic/Src/inFlash.c b/APP/businessLogic/Src/inFlash.c index 029f2f2..d7498d2 100644 --- a/APP/businessLogic/Src/inFlash.c +++ b/APP/businessLogic/Src/inFlash.c @@ -2,6 +2,7 @@ #include "inFlash.h" #include "parameter.h" #include "pDebug.h" +#include "cfg_protocol.h" static void save_config_info(config_info *save_config_info); @@ -61,7 +62,7 @@ static void readFlashContent(config_info *config_info) { read_config_info(config_info); /* 配置文件正确就返回 */ - if (config_info->crc == configCheckFunc((uint8_t *)config_info, CONFIG_INFO_SIZE - 2)) { + if (config_info->crc == checkModebusCrc((uint8_t *)config_info, CONFIG_INFO_SIZE - 2)) { return; }