From 142d3ebf7baf101d7443afdbfdf79c2c7cc406ec Mon Sep 17 00:00:00 2001 From: mculover666 <2412828003@qq.com> Date: Wed, 24 Jun 2020 15:46:04 +0800 Subject: [PATCH 1/5] add more ota_err_code support for ota bootloader --- .../MDK-ARM/TencentOS_tiny.uvoptx | 2 +- .../ota/ota_bootloader_recovery/Src/main.c | 14 +++---- components/ota/common/env/ota_env.c | 2 +- components/ota/common/info/ota_info.c | 9 ++--- components/ota/common/info/ota_info.h | 5 ++- .../ota/common/partition/ota_partition.c | 4 +- components/ota/recovery/include/ota_err.h | 24 +++++++++-- .../ota/recovery/include/ota_recovery.h | 3 +- components/ota/recovery/ota_recovery.c | 40 +++++++++---------- 9 files changed, 62 insertions(+), 41 deletions(-) diff --git a/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_bootloader_recovery/MDK-ARM/TencentOS_tiny.uvoptx b/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_bootloader_recovery/MDK-ARM/TencentOS_tiny.uvoptx index 649f287d..cfe53ca9 100644 --- a/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_bootloader_recovery/MDK-ARM/TencentOS_tiny.uvoptx +++ b/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_bootloader_recovery/MDK-ARM/TencentOS_tiny.uvoptx @@ -1172,7 +1172,7 @@ ota_recovery - 0 + 1 0 0 0 diff --git a/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_bootloader_recovery/Src/main.c b/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_bootloader_recovery/Src/main.c index 645f6e67..f9a4d790 100644 --- a/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_bootloader_recovery/Src/main.c +++ b/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_bootloader_recovery/Src/main.c @@ -55,17 +55,17 @@ int main(void) return -1; } -#if 1 - if (ota_recovery_xip() != 0) { - printf("recovery failed!\n"); +#if 0 + if ((ret = ota_recovery_xip()) != OTA_ERR_NONE) { + printf("recovery failed, OTA errcode = %d!\r\n", ret); } else { - printf("recovery successfully!\n"); + printf("recovery successfully!\r\n"); } #else - if (ota_recovery() != 0) { - printf("recovery failed!\n"); + if ((ret = ota_recovery()) != OTA_ERR_NONE) { + printf("recovery failed, OTA errcode = %d!\r\n", ret); } else { - printf("recovery successfully!\n"); + printf("recovery successfully!\r\n"); } #endif diff --git a/components/ota/common/env/ota_env.c b/components/ota/common/env/ota_env.c index 666e6617..54126742 100644 --- a/components/ota/common/env/ota_env.c +++ b/components/ota/common/env/ota_env.c @@ -35,7 +35,7 @@ ota_err_t ota_env_init(ota_updt_type_t updt_type, uint32_t partition_addr, ota_f ota_partition_end(OTA_PARTITION_KV), (kv_flash_drv_t *)flash_drv, (kv_flash_prop_t *)flash_prop) != KV_ERR_NONE) { - return OTA_ERR_KV_FAIL; + return OTA_ERR_KV_INIT_FAIL; } return OTA_ERR_NONE; diff --git a/components/ota/common/info/ota_info.c b/components/ota/common/info/ota_info.c index 0a1414b3..03cc0823 100644 --- a/components/ota/common/info/ota_info.c +++ b/components/ota/common/info/ota_info.c @@ -16,7 +16,6 @@ *---------------------------------------------------------------------------*/ #include "tos_kv.h" -#include "ota_image.h" #include "ota_info.h" #include "ota_partition.h" @@ -35,19 +34,19 @@ ota_img_vs_t ota_info_curr_version(void) return version; } -int ota_info_update(ota_img_vs_t new_version) +ota_err_t ota_info_update(ota_img_vs_t new_version) { kv_err_t err; err = tos_kv_del("new_version"); if (err != KV_ERR_NONE && err != KV_ERR_NOT_EXIST) { - return -1; + return OTA_ERR_KV_DEL_FAIL; } if (tos_kv_set("cur_version", &new_version, sizeof(ota_img_vs_t)) != KV_ERR_NONE) { - return -1; + return OTA_ERR_KV_SET_FAIL; } - return 0; + return OTA_ERR_NONE; } diff --git a/components/ota/common/info/ota_info.h b/components/ota/common/info/ota_info.h index 0320e916..041e96c7 100644 --- a/components/ota/common/info/ota_info.h +++ b/components/ota/common/info/ota_info.h @@ -18,9 +18,12 @@ #ifndef _OTA_INFO_H_ #define _OTA_INFO_H_ +#include "ota_err.h" +#include "ota_image.h" + ota_img_vs_t ota_info_curr_version(void); -int ota_info_update(ota_img_vs_t new_version); +ota_err_t ota_info_update(ota_img_vs_t new_version); #endif /* _OTA_INFO_H_ */ diff --git a/components/ota/common/partition/ota_partition.c b/components/ota/common/partition/ota_partition.c index 61a4def5..1b30b1b3 100644 --- a/components/ota/common/partition/ota_partition.c +++ b/components/ota/common/partition/ota_partition.c @@ -20,7 +20,7 @@ static ota_pt_ctrl_t ctrl; -static int partitions_verify(ota_pt_t *pts, int n) +static ota_err_t partitions_verify(ota_pt_t *pts, int n) { int i = 0; @@ -34,7 +34,7 @@ static int partitions_verify(ota_pt_t *pts, int n) } } - return 0; + return OTA_ERR_NONE; } ota_err_t ota_partition_load(ota_updt_type_t updt_type, uint32_t partition_addr) diff --git a/components/ota/recovery/include/ota_err.h b/components/ota/recovery/include/ota_err.h index 572ddabe..939f9c7f 100644 --- a/components/ota/recovery/include/ota_err.h +++ b/components/ota/recovery/include/ota_err.h @@ -23,15 +23,33 @@ typedef enum ota_err_en { OTA_ERR_FLASH_INIT_FAIL = 1u, - OTA_ERR_PARTITION_READ_FAIL = 2u, + OTA_ERR_PARTITION_READ_FAIL= 2u, OTA_ERR_PARTITION_MAGIC_NOT_SAME, OTA_ERR_PARTITION_ADDR_FAIL, OTA_ERR_PARTITION_NOT_ALIGN, OTA_ERR_PARTITION_CRC_FAIL, - OTA_ERR_UPDT_TYPE_UNKOWN, + OTA_ERR_UPDT_TYPE_UNKOWN = 7u, + + OTA_ERR_KV_INIT_FAIL = 8u, + OTA_ERR_KV_GET_FAIL, + OTA_ERR_KV_SET_FAIL, + OTA_ERR_KV_DEL_FAIL, + + + OTA_ERR_PATCH_READ_FAIL = 12u, + OTA_ERR_PATCH_MAGIC_NOT_SAME, + OTA_ERR_PATCH_CRC_FAIL, + + OTA_ERR_ACTIVE_APP_READ_FAIL = 15u, + OTA_ERR_ACTIVE_APP_CRC_FAIL, + + OTA_ERR_NEW_VERSION_NOT_SAME = 17u, + OTA_ERR_OLD_VERSION_NOT_SAME, + + OTA_ERR_BACK_UP_FAIL = 19u, + OTA_ERR_RECOVERRY_FAIL, - OTA_ERR_KV_FAIL } ota_err_t; #endif /* _OTA_ERR_H_ */ diff --git a/components/ota/recovery/include/ota_recovery.h b/components/ota/recovery/include/ota_recovery.h index eaba4788..1d494b9c 100644 --- a/components/ota/recovery/include/ota_recovery.h +++ b/components/ota/recovery/include/ota_recovery.h @@ -23,8 +23,9 @@ #include "ota_flash.h" #include "ota_image.h" #include "ota_patch.h" +#include "ota_err.h" -int ota_recovery(void); +ota_err_t ota_recovery(void); int ota_recovery_xip(void); diff --git a/components/ota/recovery/ota_recovery.c b/components/ota/recovery/ota_recovery.c index d74bf7c7..33abb8ec 100644 --- a/components/ota/recovery/ota_recovery.c +++ b/components/ota/recovery/ota_recovery.c @@ -29,7 +29,7 @@ #define MIN(a, b) ((a) < (b) ? (a) : (b)) -static int patch_verify(ota_img_hdr_t *img_hdr) +static ota_err_t patch_verify(ota_img_hdr_t *img_hdr) { #define BUF_SIZE 128 static uint8_t buf[BUF_SIZE]; @@ -42,29 +42,29 @@ static int patch_verify(ota_img_hdr_t *img_hdr) /* drag the ota_img_hdr out of the flash */ if (ota_flash_read(patch_start, img_hdr, sizeof(ota_img_hdr_t)) < 0) { - return -1; + return OTA_ERR_PATCH_READ_FAIL; } /* 1. check whether new version patch downloaded */ if (tos_kv_get("new_version", &new_version, sizeof(ota_img_vs_t), &version_len) != KV_ERR_NONE) { - return -1; + return OTA_ERR_KV_GET_FAIL; } if (new_version.major != img_hdr->new_version.major || new_version.minor != img_hdr->new_version.minor) { - return -1; + return OTA_ERR_NEW_VERSION_NOT_SAME; } /* 2. verify magic */ if (img_hdr->magic != OTA_IMAGE_MAGIC) { - return -1; + return OTA_ERR_PATCH_MAGIC_NOT_SAME; } /* 3. is this patch for current version? */ cur_version = ota_info_curr_version(); if (cur_version.major != img_hdr->old_version.major || cur_version.minor != img_hdr->old_version.minor) { - return -1; + return OTA_ERR_OLD_VERSION_NOT_SAME; } /* 4. verify the patch crc checksum */ @@ -75,7 +75,7 @@ static int patch_verify(ota_img_hdr_t *img_hdr) while (remain_len > 0) { read_len = MIN(sizeof(buf), remain_len); if (ota_flash_read(patch_start, buf, read_len) < 0) { - return -1; + return OTA_ERR_PATCH_READ_FAIL; } crc = crc8(crc, buf, read_len); @@ -85,7 +85,7 @@ static int patch_verify(ota_img_hdr_t *img_hdr) } if (crc != img_hdr->patch_crc) { - return -1; + return OTA_ERR_PATCH_CRC_FAIL; } /* 5. verify the old crc checksum */ @@ -95,7 +95,7 @@ static int patch_verify(ota_img_hdr_t *img_hdr) while (remain_len > 0) { read_len = MIN(sizeof(buf), remain_len); if (ota_flash_read(active_app_start, buf, read_len) < 0) { - return -1; + return OTA_ERR_ACTIVE_APP_READ_FAIL; } crc = crc8(crc, buf, read_len); @@ -105,10 +105,10 @@ static int patch_verify(ota_img_hdr_t *img_hdr) } if (crc != img_hdr->old_crc) { - return -1; + return OTA_ERR_ACTIVE_APP_CRC_FAIL; } - return 0; + return OTA_ERR_NONE; } static int do_recovery(ota_img_hdr_t *hdr) @@ -154,12 +154,13 @@ static int app_copy(uint32_t dst, uint32_t dst_size, uint32_t src, uint32_t src_ return 0; } -int ota_recovery(void) +ota_err_t ota_recovery(void) { + ota_err_t ret; ota_img_hdr_t img_hdr; - if (patch_verify(&img_hdr)) { - return -1; + if ((ret = patch_verify(&img_hdr)) != OTA_ERR_NONE) { + return ret; } /* backup */ @@ -168,11 +169,10 @@ int ota_recovery(void) ota_partition_size(OTA_PARTITION_BACKUP_APP), ota_partition_start(OTA_PARTITION_ACTIVE_APP), ota_partition_size(OTA_PARTITION_ACTIVE_APP)) < 0) { - return -1; + return OTA_ERR_BACK_UP_FAIL; } if (do_recovery(&img_hdr) != 0) { - printf("recovery failed\n"); /* restore */ if (ota_partition_is_pingpong()) { @@ -181,13 +181,13 @@ int ota_recovery(void) ota_partition_start(OTA_PARTITION_BACKUP_APP), ota_partition_size(OTA_PARTITION_BACKUP_APP)); } - return -1; + return OTA_ERR_RECOVERRY_FAIL; } - if (ota_info_update(img_hdr.new_version) != 0) { - return -1; + if ((ret = ota_info_update(img_hdr.new_version)) != OTA_ERR_NONE) { + return ret; } - return 0; + return OTA_ERR_NONE; } From 3bf5c3b6ba96d9934d8334b70d98be7280a9e071 Mon Sep 17 00:00:00 2001 From: mculover666 <2412828003@qq.com> Date: Wed, 24 Jun 2020 17:08:29 +0800 Subject: [PATCH 2/5] fix ota bug --- components/ota/common/partition/ota_partition.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/ota/common/partition/ota_partition.h b/components/ota/common/partition/ota_partition.h index b72b72b2..1124dc1c 100644 --- a/components/ota/common/partition/ota_partition.h +++ b/components/ota/common/partition/ota_partition.h @@ -109,12 +109,12 @@ typedef struct ota_ping_pong_partitions_st { } ota_pp_pts_t; typedef union ip_un { - ota_pt_t pts[3]; + ota_pt_t pts[sizeof(ota_ip_pts_t) / sizeof(ota_pt_t)]; ota_ip_pts_t ip_pts; } ip_u; typedef union pp_un { - ota_pt_t pts[4]; + ota_pt_t pts[sizeof(ota_pp_pts_t) / sizeof(ota_pt_t)]; ota_pp_pts_t pp_pts; } pp_u; From 931e8fc59925ff26201097436a6db6a109df41c4 Mon Sep 17 00:00:00 2001 From: mculover666 <2412828003@qq.com> Date: Wed, 24 Jun 2020 17:12:07 +0800 Subject: [PATCH 3/5] add at parse fifo overflow log --- net/at/src/tos_at.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/at/src/tos_at.c b/net/at/src/tos_at.c index c4a82a18..cead9cf6 100644 --- a/net/at/src/tos_at.c +++ b/net/at/src/tos_at.c @@ -298,7 +298,7 @@ __STATIC__ void at_parser(void *arg) at_parse_status = at_uart_line_parse(); if (at_parse_status == AT_PARSE_STATUS_OVERFLOW) { - // TODO: fix me + tos_kprintln("AT parse overflow!"); continue; } From 85dcdd527d85c76589b1bcfe3f85b8bdb6937315 Mon Sep 17 00:00:00 2001 From: mculover666 <2412828003@qq.com> Date: Wed, 24 Jun 2020 17:18:56 +0800 Subject: [PATCH 4/5] fix ota http demo project bug --- .../TencentOS_tiny.uvoptx | 2 +- .../TencentOS_tiny.uvprojx | 26 +++++++++++++++---- .../system_stm32l4xx.c | 2 +- .../ota_download_through_http_sample.c | 6 ++--- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_application_download_through_http/TencentOS_tiny.uvoptx b/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_application_download_through_http/TencentOS_tiny.uvoptx index bdfb1782..7ce8cd66 100644 --- a/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_application_download_through_http/TencentOS_tiny.uvoptx +++ b/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_application_download_through_http/TencentOS_tiny.uvoptx @@ -699,7 +699,7 @@ Drivers/CMSIS - 0 + 1 0 0 0 diff --git a/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_application_download_through_http/TencentOS_tiny.uvprojx b/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_application_download_through_http/TencentOS_tiny.uvprojx index 294fdafd..4a23b42a 100644 --- a/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_application_download_through_http/TencentOS_tiny.uvprojx +++ b/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_application_download_through_http/TencentOS_tiny.uvprojx @@ -10,14 +10,14 @@ TencentOS_tiny 0x4 ARM-ADS - 5060750::V5.06 update 6 (build 750)::ARMCC + 5060750::V5.06 update 6 (build 750)::.\ARMCC 0 STM32L431RCTx STMicroelectronics - Keil.STM32L4xx_DFP.2.0.0 - http://www.keil.com/pack + Keil.STM32L4xx_DFP.2.4.0 + https://www.keil.com/pack/ IRAM(0x20000000-0x2000FFFF) IROM(0x8000000-0x803FFFF) CLOCK(8000000) FPU2 CPUTYPE("Cortex-M4") @@ -185,6 +185,7 @@ 0 2 0 + 0 0 0 8 @@ -338,7 +339,7 @@ USE_HAL_DRIVER,STM32L431xx, - ..\..\..\BSP\Inc;..\..\..\..\..\platform\vendor_bsp\st\STM32L4xx_HAL_Driver\Inc;..\..\..\..\..\platform\vendor_bsp\st\STM32L4xx_HAL_Driver\Legacy;..\..\..\..\..\platform\vendor_bsp\st\CMSIS\Device\ST\STM32L4xx\Include;..\..\..\..\..\platform\vendor_bsp\st\CMSIS\Include;..\..\..\..\..\kernel\core\include;..\..\..\TOS-CONFIG;..\..\..\..\..\platform\arch\arm\cortex-m4\keil;..\..\..\..\..\kernel\pm\include;..\..\..\..\..\osal\cmsis_os;..\..\..\..\..\arch\arm\arm-v7m\common\include;..\..\..\..\..\arch\arm\arm-v7m\cortex-m4\armcc;..\..\..\BSP\Hardware\DHT11;..\..\..\BSP\Hardware\OLED;..\..\..\BSP\Hardware\BH1750;..\..\..\..\..\devices\esp8266;..\..\..\..\..\net\at\include;..\..\..\..\..\kernel\hal\include;..\..\..\..\..\net\sal_module_wrapper;..\..\..\..\..\components\ota\download\include;..\..\..\..\..\components\ota\common\crc;..\..\..\..\..\components\ota\common\image;..\..\..\..\..\components\ota\common\flash;..\..\..\..\..\components\ota\common\partition;..\..\..\..\..\components\ota\common\env;..\..\..\..\..\components\fs\kv\include;..\..\..\..\..\components\ota\common\info + ..\..\..\BSP\Inc;..\..\..\..\..\platform\vendor_bsp\st\STM32L4xx_HAL_Driver\Inc;..\..\..\..\..\platform\vendor_bsp\st\STM32L4xx_HAL_Driver\Legacy;..\..\..\..\..\platform\vendor_bsp\st\CMSIS\Device\ST\STM32L4xx\Include;..\..\..\..\..\platform\vendor_bsp\st\CMSIS\Include;..\..\..\..\..\kernel\core\include;..\..\..\TOS-CONFIG;..\..\..\..\..\platform\arch\arm\cortex-m4\keil;..\..\..\..\..\kernel\pm\include;..\..\..\..\..\osal\cmsis_os;..\..\..\..\..\arch\arm\arm-v7m\common\include;..\..\..\..\..\arch\arm\arm-v7m\cortex-m4\armcc;..\..\..\BSP\Hardware\DHT11;..\..\..\BSP\Hardware\OLED;..\..\..\BSP\Hardware\BH1750;..\..\..\..\..\devices\esp8266;..\..\..\..\..\net\at\include;..\..\..\..\..\kernel\hal\include;..\..\..\..\..\net\sal_module_wrapper;..\..\..\..\..\components\ota\download\include;..\..\..\..\..\components\ota\common\crc;..\..\..\..\..\components\ota\common\image;..\..\..\..\..\components\ota\common\flash;..\..\..\..\..\components\ota\common\partition;..\..\..\..\..\components\ota\common\env;..\..\..\..\..\components\fs\kv\include;..\..\..\..\..\components\ota\common\info;..\..\..\..\..\components\ota\recovery\include @@ -351,7 +352,7 @@ 0 0 0 - 0 + 4 @@ -919,4 +920,19 @@ + + + + <Project Info> + + + + + + 0 + 1 + + + + diff --git a/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_application_download_through_http/system_stm32l4xx.c b/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_application_download_through_http/system_stm32l4xx.c index 70e973e9..d748f570 100644 --- a/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_application_download_through_http/system_stm32l4xx.c +++ b/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_application_download_through_http/system_stm32l4xx.c @@ -123,7 +123,7 @@ /*!< Uncomment the following line if you need to relocate your vector Table in Internal SRAM. */ /* #define VECT_TAB_SRAM */ -#define VECT_TAB_OFFSET 0x8000 /*!< Vector Table base offset field. +#define VECT_TAB_OFFSET 0x7800 /*!< Vector Table base offset field. This value must be a multiple of 0x200. */ /******************************************************************************/ /** diff --git a/examples/ota_download_through_http/ota_download_through_http_sample.c b/examples/ota_download_through_http/ota_download_through_http_sample.c index 094b24b3..4bbe2cb2 100644 --- a/examples/ota_download_through_http/ota_download_through_http_sample.c +++ b/examples/ota_download_through_http/ota_download_through_http_sample.c @@ -3,7 +3,7 @@ #include "sal_module_wrapper.h" #include "cmsis_os.h" -#include "tos_ota_download.h" +#include "ota_download.h" extern ota_flash_drv_t stm32l4_norflash_onchip_drv_ota; extern ota_flash_prop_t stm32l4_norflash_onchip_prop_ota; @@ -43,12 +43,12 @@ void ota_download_task(void *arg) uint32_t partition_addr = 0x08024800; - if (tos_ota_env_init(OTA_UPDATE_IN_POSITION, partition_addr, &stm32l4_norflash_onchip_drv_ota, &stm32l4_norflash_onchip_prop_ota) < 0) { + if (ota_env_init(OTA_UPDATE_IN_POSITION, partition_addr, &stm32l4_norflash_onchip_drv_ota, &stm32l4_norflash_onchip_prop_ota) < 0) { printf("env init failed!\n"); return; } - if (!tos_ota_download_http("http://39.108.190.129:8000/patch.bin")) { + if (!ota_download_http("http://39.108.190.129:8000/patch.bin")) { printf("download successfully!\n"); } else { printf("download failed!\n"); From 43af88671435c4f1390a783b49b6532a7dbbce10 Mon Sep 17 00:00:00 2001 From: mculover666 <2412828003@qq.com> Date: Wed, 24 Jun 2020 18:13:04 +0800 Subject: [PATCH 5/5] ta http demo project test success --- .../TencentOS_tiny.uvoptx | 10 +-- .../TencentOS_tiny.uvprojx | 4 +- .../MDK-ARM/TencentOS_tiny.uvoptx | 68 +++++-------------- .../ota_download_through_http_sample.c | 8 +-- 4 files changed, 29 insertions(+), 61 deletions(-) diff --git a/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_application_download_through_http/TencentOS_tiny.uvoptx b/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_application_download_through_http/TencentOS_tiny.uvoptx index 7ce8cd66..2da926f1 100644 --- a/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_application_download_through_http/TencentOS_tiny.uvoptx +++ b/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_application_download_through_http/TencentOS_tiny.uvoptx @@ -145,7 +145,7 @@ 0 ST-LINKIII-KEIL_SWO - -U303030303030303030303031 -O10446 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L4xx_256.FLM -FS08000000 -FL040000 -FP0($$Device:STM32L431RCTx$CMSIS\Flash\STM32L4xx_256.FLM) + -U51FF68064965575333151687 -O10446 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(2BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L4xx_256.FLM -FS08007800 -FL019000 -FP0($$Device:STM32L431RCTx$CMSIS\Flash\STM32L4xx_256.FLM) @@ -213,7 +213,7 @@ 1 - 1 + 0 0 2 10000000 @@ -383,7 +383,7 @@ examples - 0 + 1 0 0 0 @@ -699,7 +699,7 @@ Drivers/CMSIS - 1 + 0 0 0 0 @@ -1283,7 +1283,7 @@ ota_download - 0 + 1 0 0 0 diff --git a/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_application_download_through_http/TencentOS_tiny.uvprojx b/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_application_download_through_http/TencentOS_tiny.uvprojx index 4a23b42a..8258754b 100644 --- a/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_application_download_through_http/TencentOS_tiny.uvprojx +++ b/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_application_download_through_http/TencentOS_tiny.uvprojx @@ -275,8 +275,8 @@ 1 - 0x8008000 - 0x40000 + 0x8007800 + 0x19000 1 diff --git a/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_bootloader_recovery/MDK-ARM/TencentOS_tiny.uvoptx b/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_bootloader_recovery/MDK-ARM/TencentOS_tiny.uvoptx index cfe53ca9..ef476d8f 100644 --- a/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_bootloader_recovery/MDK-ARM/TencentOS_tiny.uvoptx +++ b/board/TencentOS_tiny_EVB_MX_Plus/KEIL/ota/ota_bootloader_recovery/MDK-ARM/TencentOS_tiny.uvoptx @@ -184,22 +184,6 @@ 2 0 - 63 - 1 -
134240906
- 0 - 0 - 0 - 0 - 0 - 1 - ..\Src\main.c - - \\TencentOS_tiny\../Src/main.c\63 - - - 3 - 0 287 1
134243064
@@ -214,23 +198,7 @@ \\TencentOS_tiny\../../../../../../components/ota/recovery/ota_recovery.c\287 - 4 - 0 - 61 - 1 -
0
- 0 - 0 - 0 - 0 - 0 - 0 - ..\Src\main.c - - - - - 5 + 3 0 310 0 @@ -246,23 +214,7 @@ - 6 - 0 - 65 - 1 -
0
- 0 - 0 - 0 - 0 - 0 - 0 - ..\Src\main.c - - - - - 7 + 4 0 120 0 @@ -277,6 +229,22 @@ + + 5 + 0 + 63 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Src\main.c + + + diff --git a/examples/ota_download_through_http/ota_download_through_http_sample.c b/examples/ota_download_through_http/ota_download_through_http_sample.c index 4bbe2cb2..50ef4c55 100644 --- a/examples/ota_download_through_http/ota_download_through_http_sample.c +++ b/examples/ota_download_through_http/ota_download_through_http_sample.c @@ -25,7 +25,7 @@ void user_task(void *arg) while (K_TRUE) { tos_task_delay(1000); - printf("do sth(v1.1)...\n"); + printf("do sth(v0.1)...\n"); if (++iter == 2) { printf("trigger ota download\n"); @@ -39,16 +39,16 @@ void ota_download_task(void *arg) tos_sem_pend(&sem, TOS_TIME_FOREVER); esp8266_sal_init(HAL_UART_PORT_0); - esp8266_join_ap("SheldonDai", "srnr6x9xbhmb0"); + esp8266_join_ap("Mculover666", "mculover666"); - uint32_t partition_addr = 0x08024800; + uint32_t partition_addr = 0x0803f800; if (ota_env_init(OTA_UPDATE_IN_POSITION, partition_addr, &stm32l4_norflash_onchip_drv_ota, &stm32l4_norflash_onchip_prop_ota) < 0) { printf("env init failed!\n"); return; } - if (!ota_download_http("http://39.108.190.129:8000/patch.bin")) { + if (!ota_download_http("http://122.51.89.94:8000/patch.bin")) { printf("download successfully!\n"); } else { printf("download failed!\n");