diff options
| author | SummerGift <[email protected]> | 2018-11-30 18:29:37 +0800 |
|---|---|---|
| committer | SummerGift <[email protected]> | 2018-11-30 18:29:59 +0800 |
| commit | 5cbe2221964b7ad346f1d7ad898abdbea5cd0011 (patch) | |
| tree | b44927468f6e0215f60834933413c4edd7322264 /bsp/stm32 | |
| parent | c40bea56b06d54a933478c6d2548836784e8bfb6 (diff) | |
[bsp][STM32] update stm32 bsp
Diffstat (limited to 'bsp/stm32')
146 files changed, 263 insertions, 127 deletions
diff --git a/bsp/stm32/README.md b/bsp/stm32/README.md index a23f5e9380..90b123c505 100644 --- a/bsp/stm32/README.md +++ b/bsp/stm32/README.md @@ -10,4 +10,11 @@ STM32 系列 BSP 目前支持情况如下表所示: | stm32f429-atk-apollo | 正点原子 F429 阿波罗开发板 | | stm32f429-fire-challenger | 野火 F429 挑战者开发板 | +了解每个 BSP 的详细情况可以阅读该 BSP 下的 readme 文件,如需使用 BSP 更多功能可参考 docs 文件夹下提供的说明文档: + +| 文档名称 | 简介 | +| -------------------- | ------------------------------------------------- | +| BSP 进阶使用指南 | 介绍如何使用 BSP 提供的高级功能以及添加更多新功能 | +| STM32系列BSP添加教程 | 介绍如何添加一个新的 STM32 系列的 BSP | +| STM32系列BSP制作规范 | 介绍一个新 STM32 系列 BSP 的制作规范 | diff --git a/bsp/stm32/docs/BSP进阶使用指南.md b/bsp/stm32/docs/BSP进阶使用指南.md new file mode 100644 index 0000000000..887aa619dd --- /dev/null +++ b/bsp/stm32/docs/BSP进阶使用指南.md @@ -0,0 +1,115 @@ +# BSP 进阶使用指南 + +## 简介 + +本文档是为需要在 RT-Thread 操作系统上使用更多开发板资源的开发者准备的。通过使用 ENV 工具对 BSP 进行配置,可以开启更多板载资源,实现更多高级功能。 + +主要包括以下内容: + +1. 如何使用开发板上更多的板载资源 +2. 如何使用更多的片上资源 +3. 如何添加更多片上资源选项 + +## 前提要求 + +- 学会如何使用 ENV 工具,参考:[RT-Thread env 工具用户手册](https://www.rt-thread.org/document/site/rtthread-development-guide/rtthread-tool-manual/env/env-user-manual/) + +## 如何使用更多的板载资源 + +开发板上一般有很多的板载资源,如 Flash、SD卡、以太网等,但是 BSP 工程默认没有添加对这些外设的支持。如何在工程里添加这些外设的支持呢?这就需要使用 ENV 工具了。下面以在正点原子阿波罗 F429 开发板上开启 SPI Flash 支持为例,一步步的展示如何使用 ENV 工具对 BSP 进行配置。 + +### 1)打开配置工具 + +在目录 `rt-thread\bsp\stm32\stm32f429-atk-apollo` 下打开 menuconfig 配置界面。 + + + +打开的配置工具界面如下所示: + + + +通过键盘上的上下键移动光标,选中 `Hardware Drivers Config`然后按回车键进入硬件驱动配置菜单。 + +### 2)进入硬件驱动配置菜单 + +在硬件配置菜单里有三个选项,分别是 **板载外设配置菜单**、**片上外设配置菜单**和**扩展模块配置菜单**,按回车键进入板载外设配置菜单。 + + + +### 3)在板载外设配置菜单里开启 SPI Flash 选项 + + + +### 4)保存退出 + +然后右移光标选中 Save 按回车键保存,然后按 Esc 键退出配置工具。 + + + +### 5)更新软件包 + +输入命令 `pkgs --update` 使软件包配置生效。 + + + +### 6)生成 MDK5 工程 + +输入命令 `scons --target=mdk5 -s` 重新生成 MDK5 的工程。 + + + +### 7)编译下载 + +打开生成的 MDK5 工程文件,编译并下载。 + + + +### 8)查看运行结果 + +程序运行后,输入命令 `list_device` 可以看到名为 W25Q256 的块设备,此时 `SPI Flash` 设备已经可以使用了。 + + + +## 如何使用更多的片上资源 + +如果想要使用除了当前支持的片上资源(GPIO 和 UART1),又不想开启板载资源的支持,可以通过直接配置 **片上外设配置菜单** 的方式,使用更多片上资源。 + +配置方法和上一章节介绍的 **如何使用更多的板载资源的配置方法** 一样,只是本次需要进入 `片上外设配置菜单`。 + + + +## 如何添加更多的片上资源选项 + +如果想使用的片上外设是 `片上外设配置菜单` 里没有的,就需要自己添加了。下面以添加 SPI3 的驱动支持为例讲解如何添加更多片上外设支持。 + +> 没有安装 stm32cubemx 软件的移步 STM32cube中文网:<http://www.stm32cube.com/> ,在 `资源下载` 里下载 stm32cubemx 软件。 + +添加 SPI3 的外设支持需要以下几步: + +### 1)打开 Cube 的工程 + + + +### 2)配置好 SPI3 的引脚,并生成代码 + +按照图中所示步骤操作: + + + +### 3)修改 Konfig 文件 + +打开board文件夹下的 Konfig 文件,拷贝 SPI2 的配置项,并重命名 SPI2 为 SPI3。 + + + +### 4)重新配置工程 + +经过上一步的修改,此时重新打开 ENV 工具,在 menuconfig 中就会出现添加的 SPI3 的配置项。 + + + +### 5)生成工程,编译下载 + +重新生成工程之后,编译下载到开发板,程序会自动开始运行。输入 `list_device` 命令可以看到 spi3 总线设备已经挂载成功了。 + + diff --git a/bsp/stm32/libraries/templates/STM32系列BSP添加教程.md b/bsp/stm32/docs/STM32系列BSP添加教程.md index f23fd40de6..2ac0f6b48e 100644 --- a/bsp/stm32/libraries/templates/STM32系列BSP添加教程.md +++ b/bsp/stm32/docs/STM32系列BSP添加教程.md @@ -112,6 +112,8 @@ STM32 BSP 由三部分组成,分别是 (1) 通用库、(2) BSP 模板和 (3) � | SOC_STM32F103RB | 芯片型号 | SOC_STM32xxx | | SOC_SERIES_STM32F1 | 芯片系列| SOC_SERIES_STM32xx | +用户可参考这个链接学习 Kconfig语法:(https://blog.csdn.net/jianwen_hi/article/details/53398141) + ### 修改工程构建相关文件 接下来需要修改用于构建工程相关的文件。 diff --git a/bsp/stm32/libraries/templates/figures/CubeMX_1.png b/bsp/stm32/docs/figures/CubeMX_1.png Binary files differindex 676238dd62..676238dd62 100644 --- a/bsp/stm32/libraries/templates/figures/CubeMX_1.png +++ b/bsp/stm32/docs/figures/CubeMX_1.png diff --git a/bsp/stm32/libraries/templates/figures/CubeMX_2.png b/bsp/stm32/docs/figures/CubeMX_2.png Binary files differindex 2a15bcb9fb..2a15bcb9fb 100644 --- a/bsp/stm32/libraries/templates/figures/CubeMX_2.png +++ b/bsp/stm32/docs/figures/CubeMX_2.png diff --git a/bsp/stm32/libraries/templates/figures/CubeMX_3.png b/bsp/stm32/docs/figures/CubeMX_3.png Binary files differindex 6926aed72d..6926aed72d 100644 --- a/bsp/stm32/libraries/templates/figures/CubeMX_3.png +++ b/bsp/stm32/docs/figures/CubeMX_3.png diff --git a/bsp/stm32/libraries/templates/figures/CubeMX_4.png b/bsp/stm32/docs/figures/CubeMX_4.png Binary files differindex 055e1a5d56..055e1a5d56 100644 --- a/bsp/stm32/libraries/templates/figures/CubeMX_4.png +++ b/bsp/stm32/docs/figures/CubeMX_4.png diff --git a/bsp/stm32/libraries/templates/figures/CubeMX_5.png b/bsp/stm32/docs/figures/CubeMX_5.png Binary files differindex ec5f929abd..ec5f929abd 100644 --- a/bsp/stm32/libraries/templates/figures/CubeMX_5.png +++ b/bsp/stm32/docs/figures/CubeMX_5.png diff --git a/bsp/stm32/docs/figures/Kconfig.png b/bsp/stm32/docs/figures/Kconfig.png Binary files differnew file mode 100644 index 0000000000..8c5748df13 --- /dev/null +++ b/bsp/stm32/docs/figures/Kconfig.png diff --git a/bsp/stm32/docs/figures/Kconfig2.png b/bsp/stm32/docs/figures/Kconfig2.png Binary files differnew file mode 100644 index 0000000000..960709f4f2 --- /dev/null +++ b/bsp/stm32/docs/figures/Kconfig2.png diff --git a/bsp/stm32/libraries/templates/figures/SConscript.png b/bsp/stm32/docs/figures/SConscript.png Binary files differindex a86b44f901..a86b44f901 100644 --- a/bsp/stm32/libraries/templates/figures/SConscript.png +++ b/bsp/stm32/docs/figures/SConscript.png diff --git a/bsp/stm32/libraries/templates/figures/board_1.png b/bsp/stm32/docs/figures/board_1.png Binary files differindex a9334e813f..a9334e813f 100644 --- a/bsp/stm32/libraries/templates/figures/board_1.png +++ b/bsp/stm32/docs/figures/board_1.png diff --git a/bsp/stm32/libraries/templates/figures/board_2.png b/bsp/stm32/docs/figures/board_2.png Binary files differindex 6f5399aa7b..6f5399aa7b 100644 --- a/bsp/stm32/libraries/templates/figures/board_2.png +++ b/bsp/stm32/docs/figures/board_2.png diff --git a/bsp/stm32/docs/figures/complise.png b/bsp/stm32/docs/figures/complise.png Binary files differnew file mode 100644 index 0000000000..283d5243af --- /dev/null +++ b/bsp/stm32/docs/figures/complise.png diff --git a/bsp/stm32/docs/figures/config.png b/bsp/stm32/docs/figures/config.png Binary files differnew file mode 100644 index 0000000000..53183c2868 --- /dev/null +++ b/bsp/stm32/docs/figures/config.png diff --git a/bsp/stm32/docs/figures/config1.png b/bsp/stm32/docs/figures/config1.png Binary files differnew file mode 100644 index 0000000000..e6ca8f5b3c --- /dev/null +++ b/bsp/stm32/docs/figures/config1.png diff --git a/bsp/stm32/docs/figures/config2.png b/bsp/stm32/docs/figures/config2.png Binary files differnew file mode 100644 index 0000000000..498b0f99c1 --- /dev/null +++ b/bsp/stm32/docs/figures/config2.png diff --git a/bsp/stm32/docs/figures/config3.png b/bsp/stm32/docs/figures/config3.png Binary files differnew file mode 100644 index 0000000000..565532e3ac --- /dev/null +++ b/bsp/stm32/docs/figures/config3.png diff --git a/bsp/stm32/docs/figures/config4.png b/bsp/stm32/docs/figures/config4.png Binary files differnew file mode 100644 index 0000000000..c2734caf6d --- /dev/null +++ b/bsp/stm32/docs/figures/config4.png diff --git a/bsp/stm32/docs/figures/config5.png b/bsp/stm32/docs/figures/config5.png Binary files differnew file mode 100644 index 0000000000..b995b52c3e --- /dev/null +++ b/bsp/stm32/docs/figures/config5.png diff --git a/bsp/stm32/libraries/templates/figures/copy.png b/bsp/stm32/docs/figures/copy.png Binary files differindex d8e6b9d0fd..d8e6b9d0fd 100644 --- a/bsp/stm32/libraries/templates/figures/copy.png +++ b/bsp/stm32/docs/figures/copy.png diff --git a/bsp/stm32/docs/figures/cube_spi3.png b/bsp/stm32/docs/figures/cube_spi3.png Binary files differnew file mode 100644 index 0000000000..a30e29bc96 --- /dev/null +++ b/bsp/stm32/docs/figures/cube_spi3.png diff --git a/bsp/stm32/docs/figures/cubemx.png b/bsp/stm32/docs/figures/cubemx.png Binary files differnew file mode 100644 index 0000000000..d339c2efb4 --- /dev/null +++ b/bsp/stm32/docs/figures/cubemx.png diff --git a/bsp/stm32/docs/figures/exit.png b/bsp/stm32/docs/figures/exit.png Binary files differnew file mode 100644 index 0000000000..a8e41300db --- /dev/null +++ b/bsp/stm32/docs/figures/exit.png diff --git a/bsp/stm32/libraries/templates/figures/frame.png b/bsp/stm32/docs/figures/frame.png Binary files differindex 6d4bdfc461..6d4bdfc461 100644 --- a/bsp/stm32/libraries/templates/figures/frame.png +++ b/bsp/stm32/docs/figures/frame.png diff --git a/bsp/stm32/libraries/templates/figures/linker_scripts.png b/bsp/stm32/docs/figures/linker_scripts.png Binary files differindex 38087b18ac..38087b18ac 100644 --- a/bsp/stm32/libraries/templates/figures/linker_scripts.png +++ b/bsp/stm32/docs/figures/linker_scripts.png diff --git a/bsp/stm32/docs/figures/menuconfig.png b/bsp/stm32/docs/figures/menuconfig.png Binary files differnew file mode 100644 index 0000000000..f272f53cd8 --- /dev/null +++ b/bsp/stm32/docs/figures/menuconfig.png diff --git a/bsp/stm32/libraries/templates/figures/menuconfig_1.png b/bsp/stm32/docs/figures/menuconfig_1.png Binary files differindex dfda5b9cab..dfda5b9cab 100644 --- a/bsp/stm32/libraries/templates/figures/menuconfig_1.png +++ b/bsp/stm32/docs/figures/menuconfig_1.png diff --git a/bsp/stm32/libraries/templates/figures/menuconfig_2.png b/bsp/stm32/docs/figures/menuconfig_2.png Binary files differindex a2bd914bc6..a2bd914bc6 100644 --- a/bsp/stm32/libraries/templates/figures/menuconfig_2.png +++ b/bsp/stm32/docs/figures/menuconfig_2.png diff --git a/bsp/stm32/libraries/templates/figures/menuconfig_3.png b/bsp/stm32/docs/figures/menuconfig_3.png Binary files differindex 6a59e34228..6a59e34228 100644 --- a/bsp/stm32/libraries/templates/figures/menuconfig_3.png +++ b/bsp/stm32/docs/figures/menuconfig_3.png diff --git a/bsp/stm32/libraries/templates/figures/menuconfig_4.png b/bsp/stm32/docs/figures/menuconfig_4.png Binary files differindex 0d52487953..0d52487953 100644 --- a/bsp/stm32/libraries/templates/figures/menuconfig_4.png +++ b/bsp/stm32/docs/figures/menuconfig_4.png diff --git a/bsp/stm32/docs/figures/menuconfig_apolo.png b/bsp/stm32/docs/figures/menuconfig_apolo.png Binary files differnew file mode 100644 index 0000000000..a5738a290e --- /dev/null +++ b/bsp/stm32/docs/figures/menuconfig_apolo.png diff --git a/bsp/stm32/docs/figures/on_chip_config.png b/bsp/stm32/docs/figures/on_chip_config.png Binary files differnew file mode 100644 index 0000000000..bc90fc747b --- /dev/null +++ b/bsp/stm32/docs/figures/on_chip_config.png diff --git a/bsp/stm32/docs/figures/run_flash.png b/bsp/stm32/docs/figures/run_flash.png Binary files differnew file mode 100644 index 0000000000..5a463c3835 --- /dev/null +++ b/bsp/stm32/docs/figures/run_flash.png diff --git a/bsp/stm32/docs/figures/run_spi3.png b/bsp/stm32/docs/figures/run_spi3.png Binary files differnew file mode 100644 index 0000000000..a73b86d47b --- /dev/null +++ b/bsp/stm32/docs/figures/run_spi3.png diff --git a/bsp/stm32/docs/figures/save.png b/bsp/stm32/docs/figures/save.png Binary files differnew file mode 100644 index 0000000000..ce905c0fe4 --- /dev/null +++ b/bsp/stm32/docs/figures/save.png diff --git a/bsp/stm32/docs/figures/scons_mdk5.png b/bsp/stm32/docs/figures/scons_mdk5.png Binary files differnew file mode 100644 index 0000000000..dbb833f028 --- /dev/null +++ b/bsp/stm32/docs/figures/scons_mdk5.png diff --git a/bsp/stm32/docs/figures/spi_flash.png b/bsp/stm32/docs/figures/spi_flash.png Binary files differnew file mode 100644 index 0000000000..b749928c2c --- /dev/null +++ b/bsp/stm32/docs/figures/spi_flash.png diff --git a/bsp/stm32/libraries/templates/figures/template_1.png b/bsp/stm32/docs/figures/template_1.png Binary files differindex eff0e62ffd..eff0e62ffd 100644 --- a/bsp/stm32/libraries/templates/figures/template_1.png +++ b/bsp/stm32/docs/figures/template_1.png diff --git a/bsp/stm32/libraries/templates/figures/template_2.png b/bsp/stm32/docs/figures/template_2.png Binary files differindex 9f8bd703ef..9f8bd703ef 100644 --- a/bsp/stm32/libraries/templates/figures/template_2.png +++ b/bsp/stm32/docs/figures/template_2.png diff --git a/bsp/stm32/libraries/templates/figures/template_3.png b/bsp/stm32/docs/figures/template_3.png Binary files differindex cd9635a133..cd9635a133 100644 --- a/bsp/stm32/libraries/templates/figures/template_3.png +++ b/bsp/stm32/docs/figures/template_3.png diff --git a/bsp/stm32/docs/figures/update.png b/bsp/stm32/docs/figures/update.png Binary files differnew file mode 100644 index 0000000000..fa1531ae85 --- /dev/null +++ b/bsp/stm32/docs/figures/update.png diff --git a/bsp/stm32/libraries/templates/figures/xCubeMX_1.png b/bsp/stm32/docs/figures/xCubeMX_1.png Binary files differindex 055d3af209..055d3af209 100644 --- a/bsp/stm32/libraries/templates/figures/xCubeMX_1.png +++ b/bsp/stm32/docs/figures/xCubeMX_1.png diff --git a/bsp/stm32/libraries/HAL_Drivers/config/f1/spi_config.h b/bsp/stm32/libraries/HAL_Drivers/config/f1/spi_config.h index 18f3190a0f..a910847e39 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/f1/spi_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/f1/spi_config.h @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-06 SummerGift change to new framework diff --git a/bsp/stm32/libraries/HAL_Drivers/config/f1/uart_config.h b/bsp/stm32/libraries/HAL_Drivers/config/f1/uart_config.h index f34bff5fc7..fd7482f4e6 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/f1/uart_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/f1/uart_config.h @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-10-30 BalanceTWK change to new framework diff --git a/bsp/stm32/libraries/HAL_Drivers/config/f4/spi_config.h b/bsp/stm32/libraries/HAL_Drivers/config/f4/spi_config.h index a3c890b858..791c51bd27 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/f4/spi_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/f4/spi_config.h @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-06 SummerGift change to new framework diff --git a/bsp/stm32/libraries/HAL_Drivers/config/f4/uart_config.h b/bsp/stm32/libraries/HAL_Drivers/config/f4/uart_config.h index a0909ad5cb..d8fab2c361 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/f4/uart_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/f4/uart_config.h @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-10-30 SummerGift change to new framework diff --git a/bsp/stm32/libraries/HAL_Drivers/config/l4/spi_config.h b/bsp/stm32/libraries/HAL_Drivers/config/l4/spi_config.h index 52bf207fd1..054f55ff77 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/l4/spi_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/l4/spi_config.h @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-06 SummerGift change to new framework diff --git a/bsp/stm32/libraries/HAL_Drivers/config/l4/uart_config.h b/bsp/stm32/libraries/HAL_Drivers/config/l4/uart_config.h index 9b430bbcce..46d5414f55 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/l4/uart_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/l4/uart_config.h @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-06 SummerGift change to new framework diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_common.c b/bsp/stm32/libraries/HAL_Drivers/drv_common.c index 5a95937ac5..1f54ebc800 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_common.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_common.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-7 SummerGift change to new framework diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_common.h b/bsp/stm32/libraries/HAL_Drivers/drv_common.h index bc052c184c..a897c178d3 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_common.h +++ b/bsp/stm32/libraries/HAL_Drivers/drv_common.h @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-7 SummerGift change to new framework diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_config.h b/bsp/stm32/libraries/HAL_Drivers/drv_config.h index 30f860f716..33b94d2829 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/drv_config.h @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-10-30 SummerGift change to new framework diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_dma.h b/bsp/stm32/libraries/HAL_Drivers/drv_dma.h index d5bd45b51a..62236ac3f8 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_dma.h +++ b/bsp/stm32/libraries/HAL_Drivers/drv_dma.h @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-10 SummerGift change to new framework diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_emac.c b/bsp/stm32/libraries/HAL_Drivers/drv_emac.c index b28d31112a..5b6c0eed99 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_emac.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_emac.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-19 SummerGift first version diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_gpio.c b/bsp/stm32/libraries/HAL_Drivers/drv_gpio.c index 9207c2d468..d35c71c0e9 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_gpio.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_gpio.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-06 balanceTWK change to new framework diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_gpio.h b/bsp/stm32/libraries/HAL_Drivers/drv_gpio.h index 8b87cf5fd5..a62370cae4 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_gpio.h +++ b/bsp/stm32/libraries/HAL_Drivers/drv_gpio.h @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-06 balanceTWK change to new framework diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_qspi.c b/bsp/stm32/libraries/HAL_Drivers/drv_qspi.c index 5aad91a2bd..5fa182899c 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_qspi.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_qspi.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-27 zylx change to new framework @@ -19,10 +18,7 @@ #define LOG_TAG "drv.qspi" #include <drv_log.h> -#if !defined(BSP_USING_QSPI) - #error "Please define at least one BSP_USING_QSPI" - /* this driver can be disabled at menuconfig ? RT-Thread Components ? Device Drivers */ -#endif +#if defined(BSP_USING_QSPI) struct stm32_hw_spi_cs { @@ -33,6 +29,9 @@ struct stm32_qspi_bus { QSPI_HandleTypeDef QSPI_Handler; char *bus_name; +#ifdef BSP_QSPI_USING_DMA + DMA_HandleTypeDef hdma_quadspi; +#endif }; struct rt_spi_bus _qspi_bus1; @@ -94,6 +93,33 @@ static int stm32_qspi_init(struct rt_qspi_device *device, struct rt_qspi_configu LOG_E("qspi init failed (%d)!", result); } +#ifdef BSP_QSPI_USING_DMA + /* QSPI interrupts must be enabled when using the HAL_QSPI_Receive_DMA */ + HAL_NVIC_SetPriority(QUADSPI_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(QUADSPI_IRQn); + HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn); + + /* init QSPI DMA */ + __HAL_RCC_DMA1_CLK_ENABLE(); + HAL_DMA_DeInit(qspi_bus->QSPI_Handler.hdma); + qspi_bus->hdma_quadspi.Instance = DMA1_Channel5; + qspi_bus->hdma_quadspi.Init.Request = DMA_REQUEST_5; + qspi_bus->hdma_quadspi.Init.Direction = DMA_PERIPH_TO_MEMORY; + qspi_bus->hdma_quadspi.Init.PeriphInc = DMA_PINC_DISABLE; + qspi_bus->hdma_quadspi.Init.MemInc = DMA_MINC_ENABLE; + qspi_bus->hdma_quadspi.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE; + qspi_bus->hdma_quadspi.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE; + qspi_bus->hdma_quadspi.Init.Mode = DMA_NORMAL; + qspi_bus->hdma_quadspi.Init.Priority = DMA_PRIORITY_LOW; + if (HAL_DMA_Init(&qspi_bus->hdma_quadspi) != HAL_OK) + { + LOG_E("qspi dma init failed (%d)!", result); + } + + __HAL_LINKDMA(&qspi_bus->QSPI_Handler,hdma,qspi_bus->hdma_quadspi); +#endif /* BSP_QSPI_USING_DMA */ + return result; } @@ -205,7 +231,6 @@ static rt_uint32_t qspixfer(struct rt_spi_device *device, struct rt_spi_message { if (HAL_QSPI_Transmit(&qspi_bus->QSPI_Handler, (rt_uint8_t *)sndb, 5000) == HAL_OK) { - len = length; } else @@ -222,12 +247,17 @@ static rt_uint32_t qspixfer(struct rt_spi_device *device, struct rt_spi_message } else if (rcvb)/* recv data */ { - qspi_send_cmd(qspi_bus, qspi_message); - +#ifdef BSP_QSPI_USING_DMA + if (HAL_QSPI_Receive_DMA(&qspi_bus->QSPI_Handler, rcvb) == HAL_OK) +#else if (HAL_QSPI_Receive(&qspi_bus->QSPI_Handler, rcvb, 5000) == HAL_OK) +#endif { len = length; +#ifdef BSP_QSPI_USING_DMA + while(qspi_bus->QSPI_Handler.RxXferCount != 0); +#endif } else { @@ -283,20 +313,22 @@ static int stm32_qspi_register_bus(struct stm32_qspi_bus *qspi_bus, const char * */ rt_err_t stm32_qspi_bus_attach_device(const char *bus_name, const char *device_name, rt_uint32_t pin, rt_uint8_t data_line_width, void (*enter_qspi_mode)(), void (*exit_qspi_mode)()) { + struct rt_qspi_device *qspi_device = RT_NULL; + struct stm32_hw_spi_cs *cs_pin = RT_NULL; rt_err_t result = RT_EOK; RT_ASSERT(bus_name != RT_NULL); RT_ASSERT(device_name != RT_NULL); RT_ASSERT(data_line_width == 1 || data_line_width == 2 || data_line_width == 4); - struct rt_qspi_device *qspi_device = (struct rt_qspi_device *)rt_malloc(sizeof(struct rt_qspi_device)); + qspi_device = (struct rt_qspi_device *)rt_malloc(sizeof(struct rt_qspi_device)); if (qspi_device == RT_NULL) { LOG_E("no memory, qspi bus attach device failed!"); result = RT_ENOMEM; goto __exit; } - struct stm32_hw_spi_cs *cs_pin = (struct stm32_hw_spi_cs *)rt_malloc(sizeof(struct stm32_hw_spi_cs)); + cs_pin = (struct stm32_hw_spi_cs *)rt_malloc(sizeof(struct stm32_hw_spi_cs)); if (qspi_device == RT_NULL) { LOG_E("no memory, qspi bus attach device failed!"); @@ -333,10 +365,35 @@ __exit: return result; } +#ifdef BSP_QSPI_USING_DMA +void QUADSPI_IRQHandler(void) +{ + /* enter interrupt */ + rt_interrupt_enter(); + + HAL_QSPI_IRQHandler(&_stm32_qspi_bus.QSPI_Handler); + + /* leave interrupt */ + rt_interrupt_leave(); +} + +void DMA1_Channel5_IRQHandler(void) +{ + /* enter interrupt */ + rt_interrupt_enter(); + + HAL_DMA_IRQHandler(&_stm32_qspi_bus.hdma_quadspi); + + /* leave interrupt */ + rt_interrupt_leave(); +} +#endif /* BSP_QSPI_USING_DMA */ + static int rt_hw_qspi_bus_init(void) { return stm32_qspi_register_bus(&_stm32_qspi_bus, "qspi1"); } INIT_BOARD_EXPORT(rt_hw_qspi_bus_init); +#endif /* BSP_USING_QSPI */ #endif /* RT_USING_QSPI */ diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_qspi.h b/bsp/stm32/libraries/HAL_Drivers/drv_qspi.h index c9d779a9bd..28dbf437d1 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_qspi.h +++ b/bsp/stm32/libraries/HAL_Drivers/drv_qspi.h @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-27 zylx change to new framework diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_spi.c b/bsp/stm32/libraries/HAL_Drivers/drv_spi.c index 45bd46b24f..a07391a095 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_spi.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_spi.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-5 SummerGift change to new framework diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_spi.h b/bsp/stm32/libraries/HAL_Drivers/drv_spi.h index 34eee8d9f0..710f3fa59c 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_spi.h +++ b/bsp/stm32/libraries/HAL_Drivers/drv_spi.h @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-5 SummerGift change to new framework diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_usart.c b/bsp/stm32/libraries/HAL_Drivers/drv_usart.c index d803f5558f..c54f304ada 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_usart.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_usart.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-10-30 SummerGift change to new framework diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_usart.h b/bsp/stm32/libraries/HAL_Drivers/drv_usart.h index 451c72ad20..1dc3b702f1 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_usart.h +++ b/bsp/stm32/libraries/HAL_Drivers/drv_usart.h @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018.10.30 SummerGift change to new framework diff --git a/bsp/stm32/libraries/templates/figures/Kconfig.png b/bsp/stm32/libraries/templates/figures/Kconfig.png Binary files differdeleted file mode 100644 index 29504e2f27..0000000000 --- a/bsp/stm32/libraries/templates/figures/Kconfig.png +++ /dev/null diff --git a/bsp/stm32/libraries/templates/stm32f10x/applications/main.c b/bsp/stm32/libraries/templates/stm32f10x/applications/main.c index 9b786fb7f1..22ff66584c 100644 --- a/bsp/stm32/libraries/templates/stm32f10x/applications/main.c +++ b/bsp/stm32/libraries/templates/stm32f10x/applications/main.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-06 SummerGift change to new framework diff --git a/bsp/stm32/libraries/templates/stm32f10x/board/board.c b/bsp/stm32/libraries/templates/stm32f10x/board/board.c index 5ffc0fe751..36c127c5b7 100644 --- a/bsp/stm32/libraries/templates/stm32f10x/board/board.c +++ b/bsp/stm32/libraries/templates/stm32f10x/board/board.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-06 SummerGift change to new framework diff --git a/bsp/stm32/libraries/templates/stm32f10x/board/board.h b/bsp/stm32/libraries/templates/stm32f10x/board/board.h index 164595a05d..2c56c5548b 100644 --- a/bsp/stm32/libraries/templates/stm32f10x/board/board.h +++ b/bsp/stm32/libraries/templates/stm32f10x/board/board.h @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-5 SummerGift change to new framework diff --git a/bsp/stm32/libraries/templates/stm32f10x/project.ewp b/bsp/stm32/libraries/templates/stm32f10x/project.ewp index 957c50b46c..1e0457c86a 100644 --- a/bsp/stm32/libraries/templates/stm32f10x/project.ewp +++ b/bsp/stm32/libraries/templates/stm32f10x/project.ewp @@ -651,7 +651,7 @@ </option>
<option>
<name>OOCOutputFile</name>
- <state>../../../rt-thread.bin</state>
+ <state>../../../rtthread.bin</state>
</option>
<option>
<name>OOCCommandLineProducer</name>
diff --git a/bsp/stm32/libraries/templates/stm32f10x/project.uvproj b/bsp/stm32/libraries/templates/stm32f10x/project.uvproj index 05ed1c0f7f..f2585c9082 100644 --- a/bsp/stm32/libraries/templates/stm32f10x/project.uvproj +++ b/bsp/stm32/libraries/templates/stm32f10x/project.uvproj @@ -73,7 +73,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name /> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/libraries/templates/stm32f10x/project.uvprojx b/bsp/stm32/libraries/templates/stm32f10x/project.uvprojx index 6be9eceb81..5833e000a4 100644 --- a/bsp/stm32/libraries/templates/stm32f10x/project.uvprojx +++ b/bsp/stm32/libraries/templates/stm32f10x/project.uvprojx @@ -79,7 +79,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name /> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/libraries/templates/stm32f10x/rtconfig.py b/bsp/stm32/libraries/templates/stm32f10x/rtconfig.py index 7854367b91..58230b0d60 100644 --- a/bsp/stm32/libraries/templates/stm32f10x/rtconfig.py +++ b/bsp/stm32/libraries/templates/stm32f10x/rtconfig.py @@ -53,7 +53,7 @@ if PLATFORM == 'gcc': else: CFLAGS += ' -O2' - POST_ACTION = OBJCPY + ' -O binary $TARGET rt-thread.bin\n' + SIZE + ' $TARGET \n' + POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n' elif PLATFORM == 'armcc': # toolchains @@ -81,7 +81,7 @@ elif PLATFORM == 'armcc': else: CFLAGS += ' -O2' - POST_ACTION = 'fromelf --bin $TARGET --output rt-thread.bin \nfromelf -z $TARGET' + POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' elif PLATFORM == 'iar': # toolchains @@ -127,4 +127,4 @@ elif PLATFORM == 'iar': LFLAGS += ' --entry __iar_program_start' EXEC_PATH = EXEC_PATH + '/arm/bin/' - POST_ACTION = 'ielftool --bin $TARGET rt-thread.bin' + POST_ACTION = 'ielftool --bin $TARGET rtthread.bin' diff --git a/bsp/stm32/libraries/templates/stm32f10x/template.ewp b/bsp/stm32/libraries/templates/stm32f10x/template.ewp index d4448f92e0..a8162b641c 100644 --- a/bsp/stm32/libraries/templates/stm32f10x/template.ewp +++ b/bsp/stm32/libraries/templates/stm32f10x/template.ewp @@ -636,7 +636,7 @@ </option>
<option>
<name>OOCOutputFile</name>
- <state>../../../rt-thread.bin</state>
+ <state>../../../rtthread.bin</state>
</option>
<option>
<name>OOCCommandLineProducer</name>
diff --git a/bsp/stm32/libraries/templates/stm32f10x/template.uvproj b/bsp/stm32/libraries/templates/stm32f10x/template.uvproj index c548012be4..a30193ec49 100644 --- a/bsp/stm32/libraries/templates/stm32f10x/template.uvproj +++ b/bsp/stm32/libraries/templates/stm32f10x/template.uvproj @@ -76,7 +76,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/libraries/templates/stm32f10x/template.uvprojx b/bsp/stm32/libraries/templates/stm32f10x/template.uvprojx index f64d1ec15e..1551b6fde4 100644 --- a/bsp/stm32/libraries/templates/stm32f10x/template.uvprojx +++ b/bsp/stm32/libraries/templates/stm32f10x/template.uvprojx @@ -82,7 +82,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/libraries/templates/stm32f4xx/applications/main.c b/bsp/stm32/libraries/templates/stm32f4xx/applications/main.c index 9b786fb7f1..22ff66584c 100644 --- a/bsp/stm32/libraries/templates/stm32f4xx/applications/main.c +++ b/bsp/stm32/libraries/templates/stm32f4xx/applications/main.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-06 SummerGift change to new framework diff --git a/bsp/stm32/libraries/templates/stm32f4xx/board/board.h b/bsp/stm32/libraries/templates/stm32f4xx/board/board.h index dedeca16bb..d9b209ac38 100644 --- a/bsp/stm32/libraries/templates/stm32f4xx/board/board.h +++ b/bsp/stm32/libraries/templates/stm32f4xx/board/board.h @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-5 SummerGift change to new framework diff --git a/bsp/stm32/libraries/templates/stm32f4xx/project.ewp b/bsp/stm32/libraries/templates/stm32f4xx/project.ewp index 8df6918af3..71dc957153 100644 --- a/bsp/stm32/libraries/templates/stm32f4xx/project.ewp +++ b/bsp/stm32/libraries/templates/stm32f4xx/project.ewp @@ -651,7 +651,7 @@ </option>
<option>
<name>OOCOutputFile</name>
- <state>../../../rt-thread.bin</state>
+ <state>../../../rtthread.bin</state>
</option>
<option>
<name>OOCCommandLineProducer</name>
diff --git a/bsp/stm32/libraries/templates/stm32f4xx/project.uvproj b/bsp/stm32/libraries/templates/stm32f4xx/project.uvproj index 0e3b41a696..f576815a04 100644 --- a/bsp/stm32/libraries/templates/stm32f4xx/project.uvproj +++ b/bsp/stm32/libraries/templates/stm32f4xx/project.uvproj @@ -73,7 +73,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name /> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/libraries/templates/stm32f4xx/project.uvprojx b/bsp/stm32/libraries/templates/stm32f4xx/project.uvprojx index 44341712b1..e056c9821f 100644 --- a/bsp/stm32/libraries/templates/stm32f4xx/project.uvprojx +++ b/bsp/stm32/libraries/templates/stm32f4xx/project.uvprojx @@ -79,7 +79,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name /> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/libraries/templates/stm32f4xx/rtconfig.py b/bsp/stm32/libraries/templates/stm32f4xx/rtconfig.py index ffe9d87935..166f7f104d 100644 --- a/bsp/stm32/libraries/templates/stm32f4xx/rtconfig.py +++ b/bsp/stm32/libraries/templates/stm32f4xx/rtconfig.py @@ -53,7 +53,7 @@ if PLATFORM == 'gcc': else: CFLAGS += ' -O2' - POST_ACTION = OBJCPY + ' -O binary $TARGET rt-thread.bin\n' + SIZE + ' $TARGET \n' + POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n' elif PLATFORM == 'armcc': # toolchains @@ -81,7 +81,7 @@ elif PLATFORM == 'armcc': else: CFLAGS += ' -O2' - POST_ACTION = 'fromelf --bin $TARGET --output rt-thread.bin \nfromelf -z $TARGET' + POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' elif PLATFORM == 'iar': # toolchains @@ -127,4 +127,4 @@ elif PLATFORM == 'iar': LFLAGS += ' --entry __iar_program_start' EXEC_PATH = EXEC_PATH + '/arm/bin/' - POST_ACTION = 'ielftool --bin $TARGET rt-thread.bin' + POST_ACTION = 'ielftool --bin $TARGET rtthread.bin' diff --git a/bsp/stm32/libraries/templates/stm32f4xx/template.ewp b/bsp/stm32/libraries/templates/stm32f4xx/template.ewp index b2d1e690b0..c5655c904f 100644 --- a/bsp/stm32/libraries/templates/stm32f4xx/template.ewp +++ b/bsp/stm32/libraries/templates/stm32f4xx/template.ewp @@ -636,7 +636,7 @@ </option>
<option>
<name>OOCOutputFile</name>
- <state>../../../rt-thread.bin</state>
+ <state>../../../rtthread.bin</state>
</option>
<option>
<name>OOCCommandLineProducer</name>
diff --git a/bsp/stm32/libraries/templates/stm32f4xx/template.uvproj b/bsp/stm32/libraries/templates/stm32f4xx/template.uvproj index 5977db05c5..9c97645aad 100644 --- a/bsp/stm32/libraries/templates/stm32f4xx/template.uvproj +++ b/bsp/stm32/libraries/templates/stm32f4xx/template.uvproj @@ -76,7 +76,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/libraries/templates/stm32f4xx/template.uvprojx b/bsp/stm32/libraries/templates/stm32f4xx/template.uvprojx index 9aee7100e1..5e25ad1a8d 100644 --- a/bsp/stm32/libraries/templates/stm32f4xx/template.uvprojx +++ b/bsp/stm32/libraries/templates/stm32f4xx/template.uvprojx @@ -16,7 +16,7 @@ <TargetCommonOption> <Device>STM32F407ZGTx</Device> <Vendor>STMicroelectronics</Vendor> - <PackID>Keil.STM32F4xx_DFP.2.11.0</PackID> + <PackID>Keil.STM32F4xx_DFP.2.13.0</PackID> <PackURL>http://www.keil.com/pack</PackURL> <Cpu>IRAM(0x20000000,0x20000) IRAM2(0x10000000,0x10000) IROM(0x08000000,0x100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu> <FlashUtilSpec></FlashUtilSpec> @@ -82,7 +82,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/libraries/templates/stm32l4xx/applications/main.c b/bsp/stm32/libraries/templates/stm32l4xx/applications/main.c index 9b786fb7f1..22ff66584c 100644 --- a/bsp/stm32/libraries/templates/stm32l4xx/applications/main.c +++ b/bsp/stm32/libraries/templates/stm32l4xx/applications/main.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-06 SummerGift change to new framework diff --git a/bsp/stm32/libraries/templates/stm32l4xx/board/board.c b/bsp/stm32/libraries/templates/stm32l4xx/board/board.c index 9da419a6ee..919b7fa941 100644 --- a/bsp/stm32/libraries/templates/stm32l4xx/board/board.c +++ b/bsp/stm32/libraries/templates/stm32l4xx/board/board.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-06 SummerGift change to new framework diff --git a/bsp/stm32/libraries/templates/stm32l4xx/board/board.h b/bsp/stm32/libraries/templates/stm32l4xx/board/board.h index 316f49af99..bd7e7a61fd 100644 --- a/bsp/stm32/libraries/templates/stm32l4xx/board/board.h +++ b/bsp/stm32/libraries/templates/stm32l4xx/board/board.h @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-5 SummerGift change to new framework diff --git a/bsp/stm32/libraries/templates/stm32l4xx/project.ewp b/bsp/stm32/libraries/templates/stm32l4xx/project.ewp index 7cb253f280..d47fbf5b4a 100644 --- a/bsp/stm32/libraries/templates/stm32l4xx/project.ewp +++ b/bsp/stm32/libraries/templates/stm32l4xx/project.ewp @@ -651,7 +651,7 @@ </option>
<option>
<name>OOCOutputFile</name>
- <state>../../../rt-thread.bin</state>
+ <state>../../../rtthread.bin</state>
</option>
<option>
<name>OOCCommandLineProducer</name>
diff --git a/bsp/stm32/libraries/templates/stm32l4xx/project.uvprojx b/bsp/stm32/libraries/templates/stm32l4xx/project.uvprojx index a40ad56351..e351e92554 100644 --- a/bsp/stm32/libraries/templates/stm32l4xx/project.uvprojx +++ b/bsp/stm32/libraries/templates/stm32l4xx/project.uvprojx @@ -79,7 +79,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name /> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/libraries/templates/stm32l4xx/rtconfig.py b/bsp/stm32/libraries/templates/stm32l4xx/rtconfig.py index 746ad58f87..148f3e1d03 100644 --- a/bsp/stm32/libraries/templates/stm32l4xx/rtconfig.py +++ b/bsp/stm32/libraries/templates/stm32l4xx/rtconfig.py @@ -53,7 +53,7 @@ if PLATFORM == 'gcc': else: CFLAGS += ' -O2' - POST_ACTION = OBJCPY + ' -O binary $TARGET rt-thread.bin\n' + SIZE + ' $TARGET \n' + POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n' elif PLATFORM == 'armcc': # toolchains @@ -81,7 +81,7 @@ elif PLATFORM == 'armcc': else: CFLAGS += ' -O2' - POST_ACTION = 'fromelf --bin $TARGET --output rt-thread.bin \nfromelf -z $TARGET' + POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' elif PLATFORM == 'iar': # toolchains @@ -127,4 +127,4 @@ elif PLATFORM == 'iar': LFLAGS += ' --entry __iar_program_start' EXEC_PATH = EXEC_PATH + '/arm/bin/' - POST_ACTION = 'ielftool --bin $TARGET rt-thread.bin' + POST_ACTION = 'ielftool --bin $TARGET rtthread.bin' diff --git a/bsp/stm32/libraries/templates/stm32l4xx/template.ewp b/bsp/stm32/libraries/templates/stm32l4xx/template.ewp index 820cff7cb8..3c391937ff 100644 --- a/bsp/stm32/libraries/templates/stm32l4xx/template.ewp +++ b/bsp/stm32/libraries/templates/stm32l4xx/template.ewp @@ -636,7 +636,7 @@ </option>
<option>
<name>OOCOutputFile</name>
- <state>../../../rt-thread.bin</state>
+ <state>../../../rtthread.bin</state>
</option>
<option>
<name>OOCCommandLineProducer</name>
diff --git a/bsp/stm32/libraries/templates/stm32l4xx/template.uvprojx b/bsp/stm32/libraries/templates/stm32l4xx/template.uvprojx index 34f091f052..87c91117e4 100644 --- a/bsp/stm32/libraries/templates/stm32l4xx/template.uvprojx +++ b/bsp/stm32/libraries/templates/stm32l4xx/template.uvprojx @@ -82,7 +82,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/stm32f103-atk-nano/applications/main.c b/bsp/stm32/stm32f103-atk-nano/applications/main.c index 6f62f2c642..e5de8d7d2e 100644 --- a/bsp/stm32/stm32f103-atk-nano/applications/main.c +++ b/bsp/stm32/stm32f103-atk-nano/applications/main.c @@ -7,6 +7,7 @@ * Date Author Notes * 2018-11-27 balanceTWK change to new framework */ + #include <rtthread.h> #include <rtdevice.h> #include <board.h> diff --git a/bsp/stm32/stm32f103-atk-nano/board/board.c b/bsp/stm32/stm32f103-atk-nano/board/board.c index 6234bfa2b8..b0db19b1ec 100644 --- a/bsp/stm32/stm32f103-atk-nano/board/board.c +++ b/bsp/stm32/stm32f103-atk-nano/board/board.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-06 balanceTWK change to new framework diff --git a/bsp/stm32/stm32f103-atk-nano/board/board.h b/bsp/stm32/stm32f103-atk-nano/board/board.h index 37dba5f50a..ce8648c50c 100644 --- a/bsp/stm32/stm32f103-atk-nano/board/board.h +++ b/bsp/stm32/stm32f103-atk-nano/board/board.h @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-5 SummerGift change to new framework diff --git a/bsp/stm32/stm32f103-atk-nano/board/ports/spi_flash_init.c b/bsp/stm32/stm32f103-atk-nano/board/ports/spi_flash_init.c index 420d852995..43f726525b 100644 --- a/bsp/stm32/stm32f103-atk-nano/board/ports/spi_flash_init.c +++ b/bsp/stm32/stm32f103-atk-nano/board/ports/spi_flash_init.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-27 SummerGift add spi flash port file diff --git a/bsp/stm32/stm32f103-atk-nano/project.ewp b/bsp/stm32/stm32f103-atk-nano/project.ewp index 3e4ba56d19..bf22ca2300 100644 --- a/bsp/stm32/stm32f103-atk-nano/project.ewp +++ b/bsp/stm32/stm32f103-atk-nano/project.ewp @@ -651,7 +651,7 @@ </option> <option> <name>OOCOutputFile</name> - <state>../../../rt-thread.bin</state> + <state>../../../rtthread.bin</state> </option> <option> <name>OOCCommandLineProducer</name> diff --git a/bsp/stm32/stm32f103-atk-nano/project.uvproj b/bsp/stm32/stm32f103-atk-nano/project.uvproj index 36ea8dd5e4..9ac2dd2061 100644 --- a/bsp/stm32/stm32f103-atk-nano/project.uvproj +++ b/bsp/stm32/stm32f103-atk-nano/project.uvproj @@ -73,7 +73,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name /> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/stm32f103-atk-nano/project.uvprojx b/bsp/stm32/stm32f103-atk-nano/project.uvprojx index 5e6fe9e0e1..7bac6b85cb 100644 --- a/bsp/stm32/stm32f103-atk-nano/project.uvprojx +++ b/bsp/stm32/stm32f103-atk-nano/project.uvprojx @@ -79,7 +79,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name /> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/stm32f103-atk-nano/rtconfig.py b/bsp/stm32/stm32f103-atk-nano/rtconfig.py index 7854367b91..58230b0d60 100644 --- a/bsp/stm32/stm32f103-atk-nano/rtconfig.py +++ b/bsp/stm32/stm32f103-atk-nano/rtconfig.py @@ -53,7 +53,7 @@ if PLATFORM == 'gcc': else: CFLAGS += ' -O2' - POST_ACTION = OBJCPY + ' -O binary $TARGET rt-thread.bin\n' + SIZE + ' $TARGET \n' + POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n' elif PLATFORM == 'armcc': # toolchains @@ -81,7 +81,7 @@ elif PLATFORM == 'armcc': else: CFLAGS += ' -O2' - POST_ACTION = 'fromelf --bin $TARGET --output rt-thread.bin \nfromelf -z $TARGET' + POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' elif PLATFORM == 'iar': # toolchains @@ -127,4 +127,4 @@ elif PLATFORM == 'iar': LFLAGS += ' --entry __iar_program_start' EXEC_PATH = EXEC_PATH + '/arm/bin/' - POST_ACTION = 'ielftool --bin $TARGET rt-thread.bin' + POST_ACTION = 'ielftool --bin $TARGET rtthread.bin' diff --git a/bsp/stm32/stm32f103-atk-nano/template.ewp b/bsp/stm32/stm32f103-atk-nano/template.ewp index d4448f92e0..a8162b641c 100644 --- a/bsp/stm32/stm32f103-atk-nano/template.ewp +++ b/bsp/stm32/stm32f103-atk-nano/template.ewp @@ -636,7 +636,7 @@ </option>
<option>
<name>OOCOutputFile</name>
- <state>../../../rt-thread.bin</state>
+ <state>../../../rtthread.bin</state>
</option>
<option>
<name>OOCCommandLineProducer</name>
diff --git a/bsp/stm32/stm32f103-atk-nano/template.uvproj b/bsp/stm32/stm32f103-atk-nano/template.uvproj index c548012be4..a30193ec49 100644 --- a/bsp/stm32/stm32f103-atk-nano/template.uvproj +++ b/bsp/stm32/stm32f103-atk-nano/template.uvproj @@ -76,7 +76,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/stm32f103-atk-nano/template.uvprojx b/bsp/stm32/stm32f103-atk-nano/template.uvprojx index f64d1ec15e..1551b6fde4 100644 --- a/bsp/stm32/stm32f103-atk-nano/template.uvprojx +++ b/bsp/stm32/stm32f103-atk-nano/template.uvprojx @@ -82,7 +82,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/stm32f103-fire-arbitrary/applications/main.c b/bsp/stm32/stm32f103-fire-arbitrary/applications/main.c index 6abe4fb8ce..76156d734c 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/applications/main.c +++ b/bsp/stm32/stm32f103-fire-arbitrary/applications/main.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-5 SummerGift change to new framework diff --git a/bsp/stm32/stm32f103-fire-arbitrary/board/board.c b/bsp/stm32/stm32f103-fire-arbitrary/board/board.c index 2f27c7094c..2d4ad3f5db 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/board/board.c +++ b/bsp/stm32/stm32f103-fire-arbitrary/board/board.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-06 balanceTWK change to new framework diff --git a/bsp/stm32/stm32f103-fire-arbitrary/board/board.h b/bsp/stm32/stm32f103-fire-arbitrary/board/board.h index 8773564cc8..241f96bec8 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/board/board.h +++ b/bsp/stm32/stm32f103-fire-arbitrary/board/board.h @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-06 balanceTWK change to new framework diff --git a/bsp/stm32/stm32f103-fire-arbitrary/board/ports/spi_flash_init.c b/bsp/stm32/stm32f103-fire-arbitrary/board/ports/spi_flash_init.c index 98ed856660..96b2034f24 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/board/ports/spi_flash_init.c +++ b/bsp/stm32/stm32f103-fire-arbitrary/board/ports/spi_flash_init.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-27 SummerGift add spi flash port file diff --git a/bsp/stm32/stm32f103-fire-arbitrary/board/ports/w5500_device.c b/bsp/stm32/stm32f103-fire-arbitrary/board/ports/w5500_device.c index fcb67c29cf..68348d2bac 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/board/ports/w5500_device.c +++ b/bsp/stm32/stm32f103-fire-arbitrary/board/ports/w5500_device.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-26 BalanceTWK add port file diff --git a/bsp/stm32/stm32f103-fire-arbitrary/project.ewp b/bsp/stm32/stm32f103-fire-arbitrary/project.ewp index cab603fb9a..0fbc0da00b 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/project.ewp +++ b/bsp/stm32/stm32f103-fire-arbitrary/project.ewp @@ -653,7 +653,7 @@ </option> <option> <name>OOCOutputFile</name> - <state>../../../rt-thread.bin</state> + <state>../../../rtthread.bin</state> </option> <option> <name>OOCCommandLineProducer</name> diff --git a/bsp/stm32/stm32f103-fire-arbitrary/project.uvproj b/bsp/stm32/stm32f103-fire-arbitrary/project.uvproj index 55aa3f8920..2e915ce657 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/project.uvproj +++ b/bsp/stm32/stm32f103-fire-arbitrary/project.uvproj @@ -73,7 +73,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name /> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/stm32f103-fire-arbitrary/project.uvprojx b/bsp/stm32/stm32f103-fire-arbitrary/project.uvprojx index 004eb22827..7e24b63f5d 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/project.uvprojx +++ b/bsp/stm32/stm32f103-fire-arbitrary/project.uvprojx @@ -79,7 +79,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name /> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/stm32f103-fire-arbitrary/rtconfig.py b/bsp/stm32/stm32f103-fire-arbitrary/rtconfig.py index 7854367b91..58230b0d60 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/rtconfig.py +++ b/bsp/stm32/stm32f103-fire-arbitrary/rtconfig.py @@ -53,7 +53,7 @@ if PLATFORM == 'gcc': else: CFLAGS += ' -O2' - POST_ACTION = OBJCPY + ' -O binary $TARGET rt-thread.bin\n' + SIZE + ' $TARGET \n' + POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n' elif PLATFORM == 'armcc': # toolchains @@ -81,7 +81,7 @@ elif PLATFORM == 'armcc': else: CFLAGS += ' -O2' - POST_ACTION = 'fromelf --bin $TARGET --output rt-thread.bin \nfromelf -z $TARGET' + POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' elif PLATFORM == 'iar': # toolchains @@ -127,4 +127,4 @@ elif PLATFORM == 'iar': LFLAGS += ' --entry __iar_program_start' EXEC_PATH = EXEC_PATH + '/arm/bin/' - POST_ACTION = 'ielftool --bin $TARGET rt-thread.bin' + POST_ACTION = 'ielftool --bin $TARGET rtthread.bin' diff --git a/bsp/stm32/stm32f103-fire-arbitrary/template.ewp b/bsp/stm32/stm32f103-fire-arbitrary/template.ewp index d5ee88ea51..254f47d8ae 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/template.ewp +++ b/bsp/stm32/stm32f103-fire-arbitrary/template.ewp @@ -636,7 +636,7 @@ </option>
<option>
<name>OOCOutputFile</name>
- <state>../../../rt-thread.bin</state>
+ <state>../../../rtthread.bin</state>
</option>
<option>
<name>OOCCommandLineProducer</name>
diff --git a/bsp/stm32/stm32f103-fire-arbitrary/template.uvproj b/bsp/stm32/stm32f103-fire-arbitrary/template.uvproj index bf3fef9cab..778b389d30 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/template.uvproj +++ b/bsp/stm32/stm32f103-fire-arbitrary/template.uvproj @@ -76,7 +76,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/stm32f103-fire-arbitrary/template.uvprojx b/bsp/stm32/stm32f103-fire-arbitrary/template.uvprojx index c6e4c50eff..045c1735f8 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/template.uvprojx +++ b/bsp/stm32/stm32f103-fire-arbitrary/template.uvprojx @@ -82,7 +82,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/stm32f407-atk-explorer/applications/main.c b/bsp/stm32/stm32f407-atk-explorer/applications/main.c index 55ef8acdee..63d9cfd70a 100644 --- a/bsp/stm32/stm32f407-atk-explorer/applications/main.c +++ b/bsp/stm32/stm32f407-atk-explorer/applications/main.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-06 SummerGift change to new framework diff --git a/bsp/stm32/stm32f407-atk-explorer/board/board.h b/bsp/stm32/stm32f407-atk-explorer/board/board.h index 8c3f803f75..49d5e8eb09 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/board.h +++ b/bsp/stm32/stm32f407-atk-explorer/board/board.h @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-5 SummerGift change to new framework diff --git a/bsp/stm32/stm32f407-atk-explorer/board/ports/phy_reset.c b/bsp/stm32/stm32f407-atk-explorer/board/ports/phy_reset.c index 5b9342c8aa..3e032649aa 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/ports/phy_reset.c +++ b/bsp/stm32/stm32f407-atk-explorer/board/ports/phy_reset.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-23 flybreak first version diff --git a/bsp/stm32/stm32f407-atk-explorer/board/ports/spi_flash_init.c b/bsp/stm32/stm32f407-atk-explorer/board/ports/spi_flash_init.c index f5bd2b0ac9..4705cc0112 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/ports/spi_flash_init.c +++ b/bsp/stm32/stm32f407-atk-explorer/board/ports/spi_flash_init.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-27 SummerGift add spi flash port file diff --git a/bsp/stm32/stm32f407-atk-explorer/project.ewp b/bsp/stm32/stm32f407-atk-explorer/project.ewp index 8df6918af3..71dc957153 100644 --- a/bsp/stm32/stm32f407-atk-explorer/project.ewp +++ b/bsp/stm32/stm32f407-atk-explorer/project.ewp @@ -651,7 +651,7 @@ </option>
<option>
<name>OOCOutputFile</name>
- <state>../../../rt-thread.bin</state>
+ <state>../../../rtthread.bin</state>
</option>
<option>
<name>OOCCommandLineProducer</name>
diff --git a/bsp/stm32/stm32f407-atk-explorer/project.uvproj b/bsp/stm32/stm32f407-atk-explorer/project.uvproj index 0e3b41a696..f576815a04 100644 --- a/bsp/stm32/stm32f407-atk-explorer/project.uvproj +++ b/bsp/stm32/stm32f407-atk-explorer/project.uvproj @@ -73,7 +73,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name /> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/stm32f407-atk-explorer/project.uvprojx b/bsp/stm32/stm32f407-atk-explorer/project.uvprojx index 44341712b1..e056c9821f 100644 --- a/bsp/stm32/stm32f407-atk-explorer/project.uvprojx +++ b/bsp/stm32/stm32f407-atk-explorer/project.uvprojx @@ -79,7 +79,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name /> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/stm32f407-atk-explorer/rtconfig.py b/bsp/stm32/stm32f407-atk-explorer/rtconfig.py index ffe9d87935..166f7f104d 100644 --- a/bsp/stm32/stm32f407-atk-explorer/rtconfig.py +++ b/bsp/stm32/stm32f407-atk-explorer/rtconfig.py @@ -53,7 +53,7 @@ if PLATFORM == 'gcc': else: CFLAGS += ' -O2' - POST_ACTION = OBJCPY + ' -O binary $TARGET rt-thread.bin\n' + SIZE + ' $TARGET \n' + POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n' elif PLATFORM == 'armcc': # toolchains @@ -81,7 +81,7 @@ elif PLATFORM == 'armcc': else: CFLAGS += ' -O2' - POST_ACTION = 'fromelf --bin $TARGET --output rt-thread.bin \nfromelf -z $TARGET' + POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' elif PLATFORM == 'iar': # toolchains @@ -127,4 +127,4 @@ elif PLATFORM == 'iar': LFLAGS += ' --entry __iar_program_start' EXEC_PATH = EXEC_PATH + '/arm/bin/' - POST_ACTION = 'ielftool --bin $TARGET rt-thread.bin' + POST_ACTION = 'ielftool --bin $TARGET rtthread.bin' diff --git a/bsp/stm32/stm32f407-atk-explorer/template.ewp b/bsp/stm32/stm32f407-atk-explorer/template.ewp index b2d1e690b0..c5655c904f 100644 --- a/bsp/stm32/stm32f407-atk-explorer/template.ewp +++ b/bsp/stm32/stm32f407-atk-explorer/template.ewp @@ -636,7 +636,7 @@ </option>
<option>
<name>OOCOutputFile</name>
- <state>../../../rt-thread.bin</state>
+ <state>../../../rtthread.bin</state>
</option>
<option>
<name>OOCCommandLineProducer</name>
diff --git a/bsp/stm32/stm32f407-atk-explorer/template.uvproj b/bsp/stm32/stm32f407-atk-explorer/template.uvproj index 5977db05c5..9c97645aad 100644 --- a/bsp/stm32/stm32f407-atk-explorer/template.uvproj +++ b/bsp/stm32/stm32f407-atk-explorer/template.uvproj @@ -76,7 +76,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/stm32f407-atk-explorer/template.uvprojx b/bsp/stm32/stm32f407-atk-explorer/template.uvprojx index 9aee7100e1..96e1854148 100644 --- a/bsp/stm32/stm32f407-atk-explorer/template.uvprojx +++ b/bsp/stm32/stm32f407-atk-explorer/template.uvprojx @@ -82,7 +82,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/stm32f429-atk-apollo/applications/main.c b/bsp/stm32/stm32f429-atk-apollo/applications/main.c index c6e84c4ca3..1dc631be52 100644 --- a/bsp/stm32/stm32f429-atk-apollo/applications/main.c +++ b/bsp/stm32/stm32f429-atk-apollo/applications/main.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-06 SummerGift change to new framework diff --git a/bsp/stm32/stm32f429-atk-apollo/board/board.c b/bsp/stm32/stm32f429-atk-apollo/board/board.c index a8b7a5e742..030926aa8e 100644 --- a/bsp/stm32/stm32f429-atk-apollo/board/board.c +++ b/bsp/stm32/stm32f429-atk-apollo/board/board.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-7 SummerGift change to new framework diff --git a/bsp/stm32/stm32f429-atk-apollo/board/ports/phy_reset.c b/bsp/stm32/stm32f429-atk-apollo/board/ports/phy_reset.c index fc8723c6b8..666d053b25 100644 --- a/bsp/stm32/stm32f429-atk-apollo/board/ports/phy_reset.c +++ b/bsp/stm32/stm32f429-atk-apollo/board/ports/phy_reset.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-21 SummerGift add port file diff --git a/bsp/stm32/stm32f429-atk-apollo/board/ports/spi_flash_init.c b/bsp/stm32/stm32f429-atk-apollo/board/ports/spi_flash_init.c index df57502eab..26a9b2d2a8 100644 --- a/bsp/stm32/stm32f429-atk-apollo/board/ports/spi_flash_init.c +++ b/bsp/stm32/stm32f429-atk-apollo/board/ports/spi_flash_init.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-27 SummerGift add spi flash port file diff --git a/bsp/stm32/stm32f429-atk-apollo/project.ewp b/bsp/stm32/stm32f429-atk-apollo/project.ewp index 09cad60d79..784fc0375c 100644 --- a/bsp/stm32/stm32f429-atk-apollo/project.ewp +++ b/bsp/stm32/stm32f429-atk-apollo/project.ewp @@ -653,7 +653,7 @@ </option> <option> <name>OOCOutputFile</name> - <state>../../../rt-thread.bin</state> + <state>../../../rtthread.bin</state> </option> <option> <name>OOCCommandLineProducer</name> diff --git a/bsp/stm32/stm32f429-atk-apollo/project.uvproj b/bsp/stm32/stm32f429-atk-apollo/project.uvproj index 81f88414d6..f23d5909f5 100644 --- a/bsp/stm32/stm32f429-atk-apollo/project.uvproj +++ b/bsp/stm32/stm32f429-atk-apollo/project.uvproj @@ -73,7 +73,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name /> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/stm32f429-atk-apollo/project.uvprojx b/bsp/stm32/stm32f429-atk-apollo/project.uvprojx index e8bf74ab0b..165878828c 100644 --- a/bsp/stm32/stm32f429-atk-apollo/project.uvprojx +++ b/bsp/stm32/stm32f429-atk-apollo/project.uvprojx @@ -79,7 +79,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name /> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/stm32f429-atk-apollo/rtconfig.py b/bsp/stm32/stm32f429-atk-apollo/rtconfig.py index ffe9d87935..166f7f104d 100644 --- a/bsp/stm32/stm32f429-atk-apollo/rtconfig.py +++ b/bsp/stm32/stm32f429-atk-apollo/rtconfig.py @@ -53,7 +53,7 @@ if PLATFORM == 'gcc': else: CFLAGS += ' -O2' - POST_ACTION = OBJCPY + ' -O binary $TARGET rt-thread.bin\n' + SIZE + ' $TARGET \n' + POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n' elif PLATFORM == 'armcc': # toolchains @@ -81,7 +81,7 @@ elif PLATFORM == 'armcc': else: CFLAGS += ' -O2' - POST_ACTION = 'fromelf --bin $TARGET --output rt-thread.bin \nfromelf -z $TARGET' + POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' elif PLATFORM == 'iar': # toolchains @@ -127,4 +127,4 @@ elif PLATFORM == 'iar': LFLAGS += ' --entry __iar_program_start' EXEC_PATH = EXEC_PATH + '/arm/bin/' - POST_ACTION = 'ielftool --bin $TARGET rt-thread.bin' + POST_ACTION = 'ielftool --bin $TARGET rtthread.bin' diff --git a/bsp/stm32/stm32f429-atk-apollo/template.ewp b/bsp/stm32/stm32f429-atk-apollo/template.ewp index 251e6dd63c..76f335fe4a 100644 --- a/bsp/stm32/stm32f429-atk-apollo/template.ewp +++ b/bsp/stm32/stm32f429-atk-apollo/template.ewp @@ -636,7 +636,7 @@ </option>
<option>
<name>OOCOutputFile</name>
- <state>../../../rt-thread.bin</state>
+ <state>../../../rtthread.bin</state>
</option>
<option>
<name>OOCCommandLineProducer</name>
diff --git a/bsp/stm32/stm32f429-atk-apollo/template.uvproj b/bsp/stm32/stm32f429-atk-apollo/template.uvproj index 1355b7e255..724316f3bf 100644 --- a/bsp/stm32/stm32f429-atk-apollo/template.uvproj +++ b/bsp/stm32/stm32f429-atk-apollo/template.uvproj @@ -76,7 +76,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/stm32f429-atk-apollo/template.uvprojx b/bsp/stm32/stm32f429-atk-apollo/template.uvprojx index c7e975179e..360943c6f0 100644 --- a/bsp/stm32/stm32f429-atk-apollo/template.uvprojx +++ b/bsp/stm32/stm32f429-atk-apollo/template.uvprojx @@ -82,7 +82,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/stm32f429-fire-challenger/applications/main.c b/bsp/stm32/stm32f429-fire-challenger/applications/main.c index 2702622c14..ae180ff98d 100644 --- a/bsp/stm32/stm32f429-fire-challenger/applications/main.c +++ b/bsp/stm32/stm32f429-fire-challenger/applications/main.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-06 SummerGift change to new framework diff --git a/bsp/stm32/stm32f429-fire-challenger/board/board.h b/bsp/stm32/stm32f429-fire-challenger/board/board.h index 4b0c82213c..2cf8f383ca 100644 --- a/bsp/stm32/stm32f429-fire-challenger/board/board.h +++ b/bsp/stm32/stm32f429-fire-challenger/board/board.h @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-5 SummerGift change to new framework diff --git a/bsp/stm32/stm32f429-fire-challenger/board/ports/phy_reset.c b/bsp/stm32/stm32f429-fire-challenger/board/ports/phy_reset.c index eaafccc6e7..298dd14e29 100644 --- a/bsp/stm32/stm32f429-fire-challenger/board/ports/phy_reset.c +++ b/bsp/stm32/stm32f429-fire-challenger/board/ports/phy_reset.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-23 flybreak first version diff --git a/bsp/stm32/stm32f429-fire-challenger/board/ports/spi_flash_init.c b/bsp/stm32/stm32f429-fire-challenger/board/ports/spi_flash_init.c index ae1c4e6e5d..5a1a4a2585 100644 --- a/bsp/stm32/stm32f429-fire-challenger/board/ports/spi_flash_init.c +++ b/bsp/stm32/stm32f429-fire-challenger/board/ports/spi_flash_init.c @@ -3,7 +3,6 @@ * * SPDX-License-Identifier: Apache-2.0 * - * * Change Logs: * Date Author Notes * 2018-11-27 SummerGift add spi flash port file diff --git a/bsp/stm32/stm32f429-fire-challenger/project.ewp b/bsp/stm32/stm32f429-fire-challenger/project.ewp index 0ef178f15e..e28734563a 100644 --- a/bsp/stm32/stm32f429-fire-challenger/project.ewp +++ b/bsp/stm32/stm32f429-fire-challenger/project.ewp @@ -651,7 +651,7 @@ </option> <option> <name>OOCOutputFile</name> - <state>../../../rt-thread.bin</state> + <state>../../../rtthread.bin</state> </option> <option> <name>OOCCommandLineProducer</name> diff --git a/bsp/stm32/stm32f429-fire-challenger/project.uvproj b/bsp/stm32/stm32f429-fire-challenger/project.uvproj index c1f15c430b..b2c7df2875 100644 --- a/bsp/stm32/stm32f429-fire-challenger/project.uvproj +++ b/bsp/stm32/stm32f429-fire-challenger/project.uvproj @@ -73,7 +73,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name /> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/stm32f429-fire-challenger/project.uvprojx b/bsp/stm32/stm32f429-fire-challenger/project.uvprojx index b9091ecacf..bd952d43c1 100644 --- a/bsp/stm32/stm32f429-fire-challenger/project.uvprojx +++ b/bsp/stm32/stm32f429-fire-challenger/project.uvprojx @@ -79,7 +79,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name /> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/stm32f429-fire-challenger/rtconfig.py b/bsp/stm32/stm32f429-fire-challenger/rtconfig.py index ffe9d87935..166f7f104d 100644 --- a/bsp/stm32/stm32f429-fire-challenger/rtconfig.py +++ b/bsp/stm32/stm32f429-fire-challenger/rtconfig.py @@ -53,7 +53,7 @@ if PLATFORM == 'gcc': else: CFLAGS += ' -O2' - POST_ACTION = OBJCPY + ' -O binary $TARGET rt-thread.bin\n' + SIZE + ' $TARGET \n' + POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n' elif PLATFORM == 'armcc': # toolchains @@ -81,7 +81,7 @@ elif PLATFORM == 'armcc': else: CFLAGS += ' -O2' - POST_ACTION = 'fromelf --bin $TARGET --output rt-thread.bin \nfromelf -z $TARGET' + POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' elif PLATFORM == 'iar': # toolchains @@ -127,4 +127,4 @@ elif PLATFORM == 'iar': LFLAGS += ' --entry __iar_program_start' EXEC_PATH = EXEC_PATH + '/arm/bin/' - POST_ACTION = 'ielftool --bin $TARGET rt-thread.bin' + POST_ACTION = 'ielftool --bin $TARGET rtthread.bin' diff --git a/bsp/stm32/stm32f429-fire-challenger/template.ewp b/bsp/stm32/stm32f429-fire-challenger/template.ewp index 251e6dd63c..76f335fe4a 100644 --- a/bsp/stm32/stm32f429-fire-challenger/template.ewp +++ b/bsp/stm32/stm32f429-fire-challenger/template.ewp @@ -636,7 +636,7 @@ </option>
<option>
<name>OOCOutputFile</name>
- <state>../../../rt-thread.bin</state>
+ <state>../../../rtthread.bin</state>
</option>
<option>
<name>OOCCommandLineProducer</name>
diff --git a/bsp/stm32/stm32f429-fire-challenger/template.uvproj b/bsp/stm32/stm32f429-fire-challenger/template.uvproj index 1355b7e255..724316f3bf 100644 --- a/bsp/stm32/stm32f429-fire-challenger/template.uvproj +++ b/bsp/stm32/stm32f429-fire-challenger/template.uvproj @@ -76,7 +76,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> diff --git a/bsp/stm32/stm32f429-fire-challenger/template.uvprojx b/bsp/stm32/stm32f429-fire-challenger/template.uvprojx index c7e975179e..360943c6f0 100644 --- a/bsp/stm32/stm32f429-fire-challenger/template.uvprojx +++ b/bsp/stm32/stm32f429-fire-challenger/template.uvprojx @@ -82,7 +82,7 @@ <AfterMake> <RunUserProg1>1</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name> + <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name> <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> |
