pengsx
/
chargeController
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改报错

This commit is contained in:
起床就犯困 2024-12-14 20:32:25 +08:00
parent 1aedfdd133
commit 7c32dae073
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
APP/businessLogic/Src/cfg_protocol.c
View File

@ -253,8 +253,8 @@ void read_and_process_config_data(void)
/* 判断出现短路保护后延长该段时间再次检测是否短路，仍然短路则关闭输出的间隔是否正确 */ /* 判断出现短路保护后延长该段时间再次检测是否短路，仍然短路则关闭输出的间隔是否正确 */
save_configInfo.outputAgainFlagTime = save_configInfo.outputAgainFlagTime =
pack->outputAgainFlagTime[0] << 8 | pack->outputAgainFlagTime[1]; pack->outputAgainFlagTime[0] << 8 | pack->outputAgainFlagTime[1];
if (!((save_configInfo.sensorEnableBroadcastTime < 30 && save_configInfo.sensorEnableBroadcastTime > 5) if (!((save_configInfo.outputAgainFlagTime < 30 && save_configInfo.outputAgainFlagTime > 5)
|| saveConfigInfo.sensorEnableBroadcastTime == 0)) { || save_configInfo.outputAgainFlagTime == 0)) {
// debug(" outputAgainFlagTime : %d \n", save_configInfo.outputAgainFlagTime); // debug(" outputAgainFlagTime : %d \n", save_configInfo.outputAgainFlagTime);
goto err; goto err;
} }

3
APP/businessLogic/Src/inFlash.c
View File

@ -2,6 +2,7 @@
#include "inFlash.h" #include "inFlash.h"
#include "parameter.h" #include "parameter.h"
#include "pDebug.h" #include "pDebug.h"
#include "cfg_protocol.h"
static void save_config_info(config_info *save_config_info); 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); 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; return;
} }