innov
/
xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a compilation issue

This commit is contained in:
songyanguang 2025-05-09 16:48:40 +08:00
parent 07126e6bd1
commit a3771bed07
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Ubiquitous/XiZi_IIoT/board/ch32v208rbt6/board.c
View File

@ -72,12 +72,14 @@ void readRomConfiguration(void) {
extern pmodule_cfg CFG; // 指向配置信息的指针 extern pmodule_cfg CFG; // 指向配置信息的指针
/* 从EEPROM中读取网络配置信息 */ /* 从EEPROM中读取网络配置信息 */
KPrintf("%s PAGE_WRITE_START_ADDR=%08x\n", __func__, PAGE_WRITE_START_ADDR);
CFG_READ(PAGE_WRITE_START_ADDR, Configbuf, MODULE_CFG_LEN); CFG_READ(PAGE_WRITE_START_ADDR, Configbuf, MODULE_CFG_LEN);
/* 如果存储在EEPROM中的网络配置信息无效，或者WCHNET还没有被主机配置过，通过默认配置信息初始化WCHNET */ /* 如果存储在EEPROM中的网络配置信息无效，或者WCHNET还没有被主机配置过，通过默认配置信息初始化WCHNET */
if ((CFG->cfgFlag[0] != checkcode1) || (CFG->cfgFlag[1] != checkcode2)) { if ((CFG->cfgFlag[0] != checkcode1) || (CFG->cfgFlag[1] != checkcode2)) {
CFG_ERASE(PAGE_WRITE_START_ADDR, FLASH_PAGE_SIZE); CFG_ERASE(PAGE_WRITE_START_ADDR, FLASH_PAGE_SIZE);
CFG_WRITE(PAGE_WRITE_START_ADDR, (u8 *)&defaultConfiguration, MODULE_CFG_LEN); CFG_WRITE(PAGE_WRITE_START_ADDR, (u8 *)&defaultConfiguration, MODULE_CFG_LEN);
KPrintf("%s NVIC_SystemReset\n", __func__);
NVIC_SystemReset(); // 复位ch32v208 NVIC_SystemReset(); // 复位ch32v208
} }

3
Ubiquitous/XiZi_IIoT/tool/bootloader/ota/ota.c
View File

@ -22,7 +22,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h> #include <stdbool.h>
#include <transform.h> #include <transform.h>
#include "shell.h"
#include "boot_for_ota.h" #include "boot_for_ota.h"
#include "ymodem.h" #include "ymodem.h"
#include "ota.h" #include "ota.h"
@ -1451,4 +1450,4 @@ void ota_entry(void)
BootLoaderJumpApp(); BootLoaderJumpApp();
} }
} }
} }