diff --git a/APP_Framework/Framework/connection/adapter_agent.c b/APP_Framework/Framework/connection/adapter_agent.c index 4e2702d15..421fcb1fb 100755 --- a/APP_Framework/Framework/connection/adapter_agent.c +++ b/APP_Framework/Framework/connection/adapter_agent.c @@ -232,7 +232,7 @@ int AtCmdConfigAndCheck(ATAgentType agent, char *cmd, char *check) #endif if (!strstr(result, check)) { - printf("%s %d check[%s] reply[%s] failed.\n", __func__, __LINE__, check, result); + printf("%s %d cmd[%s] check[%s] reply[%s] failed.\n", __func__, __LINE__, cmd, check, result); ret = -1; goto __exit; } diff --git a/Ubiquitous/XiZi_IIoT/board/ch32v208rbt6/board.c b/Ubiquitous/XiZi_IIoT/board/ch32v208rbt6/board.c index 76bf4c672..bf1eeb2c2 100644 --- a/Ubiquitous/XiZi_IIoT/board/ch32v208rbt6/board.c +++ b/Ubiquitous/XiZi_IIoT/board/ch32v208rbt6/board.c @@ -215,7 +215,8 @@ void InitBoardHardware() { #ifdef BSP_USING_UART InitHwUart(); InstallConsole("uart1", SERIAL_DRV_NAME_1, SERIAL_1_DEVICE_NAME_0); - KPrintf("console init completed.\n"); + KPrintf("\nconsole init completed.\n"); + KPrintf("compiled on: %s at %s\n", __DATE__, __TIME__); #endif readRomConfiguration(); // 读取配置信息到外部变量CFG中 diff --git a/Ubiquitous/XiZi_IIoT/board/ch32v208rbt6/third_party_driver/lte/connect_lte.c b/Ubiquitous/XiZi_IIoT/board/ch32v208rbt6/third_party_driver/lte/connect_lte.c index 43aa0822a..d158dda6f 100644 --- a/Ubiquitous/XiZi_IIoT/board/ch32v208rbt6/third_party_driver/lte/connect_lte.c +++ b/Ubiquitous/XiZi_IIoT/board/ch32v208rbt6/third_party_driver/lte/connect_lte.c @@ -315,12 +315,19 @@ int InitHwLte(void) { USART_Cmd(USART2, ENABLE); /* Enable module pin */ + GPIO_InitStructure_Lte.GPIO_Pin = GPIO_Pin_7; + GPIO_InitStructure_Lte.GPIO_Speed = GPIO_Speed_50MHz; + GPIO_InitStructure_Lte.GPIO_Mode = GPIO_Mode_Out_PP; + GPIO_Init(GPIOA, &GPIO_InitStructure_Lte); + GPIO_SetBits(GPIOA, GPIO_Pin_7); + Delay_Ms(500); // >= 300ms + GPIO_ResetBits(GPIOA, GPIO_Pin_7); GPIO_InitStructure_Lte.GPIO_Pin = GPIO_Pin_6; GPIO_InitStructure_Lte.GPIO_Speed = GPIO_Speed_50MHz; GPIO_InitStructure_Lte.GPIO_Mode = GPIO_Mode_Out_PP; GPIO_Init(GPIOA, &GPIO_InitStructure_Lte); GPIO_SetBits(GPIOA, GPIO_Pin_6); - Delay_Ms(2000); + Delay_Ms(1000); // >= 500ms GPIO_ResetBits(GPIOA, GPIO_Pin_6); return ret; diff --git a/Ubiquitous/XiZi_IIoT/tool/bootloader/ota/ota.c b/Ubiquitous/XiZi_IIoT/tool/bootloader/ota/ota.c index f69ddea61..d819c1351 100644 --- a/Ubiquitous/XiZi_IIoT/tool/bootloader/ota/ota.c +++ b/Ubiquitous/XiZi_IIoT/tool/bootloader/ota/ota.c @@ -993,9 +993,6 @@ reconnect: mcuboot.op_reset(); } #endif - - KPrintf("------Start the firmware file transfer!------\r\n"); - KPrintf("---------------------------------------------\r\n"); if(platform_ota.size > APP_FLASH_SIZE) { KPrintf("File size is larger than partition size,the partition size is %dk.\n",APP_FLASH_SIZE/1024); @@ -1006,6 +1003,7 @@ reconnect: UpdateOTAFlag(p_ota_info); break; } + KPrintf("Start erase download partition\n"); if(mcuboot.op_flash_erase(DOWN_FLAH_ADDRESS,platform_ota.size) != kStatus_Success) { KPrintf("Failed to erase download partition!\n"); @@ -1016,6 +1014,8 @@ reconnect: UpdateOTAFlag(p_ota_info); break; } + KPrintf("------Start the firmware file transfer!------\r\n"); + KPrintf("---------------------------------------------\r\n"); platform_ota.counter = (platform_ota.size%FRAME_LEN != 0)? (platform_ota.size/FRAME_LEN + 1):(platform_ota.size/FRAME_LEN); platform_ota.num = 1; //下载次数,初始值为1 platform_ota.downlen = FRAME_LEN; //记录本次下载量