Skip to content

Commit 16626bc

Browse files
QianJiu05QianJiu05
committed
Revert "默认开启nano和终端"
This reverts commit dd7a5f2.
1 parent dd7a5f2 commit 16626bc

4 files changed

Lines changed: 128 additions & 246 deletions

File tree

‎bsp/stm32/stm32f103-blue-pill/.ci/attachconfig/ci.attachconfig.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ scons.args: &scons
55
nano:
66
<<: *scons
77
kconfig:
8-
- CONFIG_RT_USING_NANO=y
9-
- CONFIG_BSP_USING_GPIO=y
10-
- CONFIG_BSP_USING_UART=y
8+
- CONFIG_USING_NANO=y
119
# ------ peripheral ------
1210
peripheral.arduino:
1311
<<: *scons
@@ -23,6 +21,7 @@ devices.uart1:
2321
kconfig:
2422
- CONFIG_BSP_USING_GPIO=y
2523
- CONFIG_BSP_USING_UART=y
24+
- CONFIG_USING_SERIAL=y
2625
devices.i2c1:
2726
<<: *scons
2827
kconfig:

‎bsp/stm32/stm32f103-blue-pill/README_zh.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ pkgs --update
8888

8989
下载程序成功之后，系统会自动运行，LED 闪烁
9090

91-
连接开发板对应串口到 PC(PA9,PA10) , 在终端工具里打开相应的串口（115200-8-1-N），复位设备后，可以看到 RT-Thread 的输出信息:
91+
连接开发板对应串口到 PC , 在终端工具里打开相应的串口（115200-8-1-N），复位设备后，可以看到 RT-Thread 的输出信息:
9292

9393
```bash
9494
\ | /
@@ -121,10 +121,7 @@ msh >
121121
STM32F103C8T6和STM32F103CBT6（128KB Flash）是基于同一芯片制造的，但在出厂时，STM32F103C8T6仅对前64KB进行了测试和认证，因此官方文档中仅标注为64KB。链接脚本故意改成128kb的，解锁高64kb。
122122
注意：高64kb并不完全可靠，若是烧录超过64kb代码后运行出错，可能是硬件flash问题。
123123

124-
默认开启nano版本，其余配置可通过以下命令查看
125-
```bash
126-
scons --attach=?
127-
```
124+
128125
## 感谢 & 维护
129126

130127
- 感谢[obito0](https://github.com/obito0)提供的[原始工程](../stm32f103-mini-system)

‎bsp/stm32/stm32f103-blue-pill/project.ewp‎

Lines changed: 67 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@
219219
<state>RT_USING_DLIBC</state>
220220
<state>RT_USING_LIBC</state>
221221
<state>_DLIB_ADD_EXTRA_SYMBOLS=0</state>
222+
<state>STM32F103xB</state>
222223
<state>__RTTHREAD__</state>
223224
<state>USE_HAL_DRIVER</state>
224225
<state>__RT_IPC_SOURCE__</state>
@@ -348,30 +349,28 @@
348349
<option>
349350
<name>CCIncludePath2</name>
350351
<state />
351-
<state>$PROJ_DIR$\.</state>
352-
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
353-
<state>$PROJ_DIR$\..\..\..\include</state>
354-
<state>$PROJ_DIR$\board\CubeMX_Config\Inc</state>
355352
<state>$PROJ_DIR$\..\..\..\components\finsh</state>
356-
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
357-
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
358-
<state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
359-
<state>$PROJ_DIR$\..\libraries\HAL_Drivers</state>
360-
<state>$PROJ_DIR$\board</state>
361-
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
362-
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
353+
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers</state>
363354
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers\config</state>
364-
<state>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Inc</state>
365-
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
366-
<state>$PROJ_DIR$\applications</state>
367-
<state>$PROJ_DIR$\packages\CMSIS-Core-latest\Include</state>
355+
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
356+
<state>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include</state>
357+
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
358+
<state>$PROJ_DIR$\board\CubeMX_Config\Inc</state>
359+
<state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
360+
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\CMSIS\Include</state>
361+
<state>$PROJ_DIR$\.</state>
362+
<state>$PROJ_DIR$\board</state>
363+
<state>$PROJ_DIR$\..\libraries\HAL_Drivers</state>
368364
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
369-
<state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
370365
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
371-
<state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
372-
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
373-
<state>$PROJ_DIR$\packages\stm32f1_cmsis_driver-latest\Include</state>
374-
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers</state>
366+
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
367+
<state>$PROJ_DIR$\applications</state>
368+
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
369+
<state>$PROJ_DIR$\..\..\..\include</state>
370+
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
371+
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
372+
<state>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc</state>
373+
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
375374
</option>
376375
<option>
377376
<name>CCStdIncCheck</name>
@@ -1265,6 +1264,7 @@
12651264
<state>RT_USING_DLIBC</state>
12661265
<state>RT_USING_LIBC</state>
12671266
<state>_DLIB_ADD_EXTRA_SYMBOLS=0</state>
1267+
<state>STM32F103xB</state>
12681268
<state>__RTTHREAD__</state>
12691269
<state>USE_HAL_DRIVER</state>
12701270
<state>__RT_IPC_SOURCE__</state>
@@ -1394,30 +1394,28 @@
13941394
<option>
13951395
<name>CCIncludePath2</name>
13961396
<state />
1397-
<state>$PROJ_DIR$\.</state>
1398-
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
1399-
<state>$PROJ_DIR$\..\..\..\include</state>
1400-
<state>$PROJ_DIR$\board\CubeMX_Config\Inc</state>
14011397
<state>$PROJ_DIR$\..\..\..\components\finsh</state>
1402-
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
1403-
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
1404-
<state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
1405-
<state>$PROJ_DIR$\..\libraries\HAL_Drivers</state>
1406-
<state>$PROJ_DIR$\board</state>
1407-
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
1408-
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
1398+
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers</state>
14091399
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers\config</state>
1410-
<state>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Inc</state>
1411-
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
1412-
<state>$PROJ_DIR$\applications</state>
1413-
<state>$PROJ_DIR$\packages\CMSIS-Core-latest\Include</state>
1400+
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
1401+
<state>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include</state>
1402+
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
1403+
<state>$PROJ_DIR$\board\CubeMX_Config\Inc</state>
1404+
<state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
1405+
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\CMSIS\Include</state>
1406+
<state>$PROJ_DIR$\.</state>
1407+
<state>$PROJ_DIR$\board</state>
1408+
<state>$PROJ_DIR$\..\libraries\HAL_Drivers</state>
14141409
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
1415-
<state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
14161410
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
1417-
<state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
1418-
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
1419-
<state>$PROJ_DIR$\packages\stm32f1_cmsis_driver-latest\Include</state>
1420-
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers</state>
1411+
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
1412+
<state>$PROJ_DIR$\applications</state>
1413+
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
1414+
<state>$PROJ_DIR$\..\..\..\include</state>
1415+
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
1416+
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
1417+
<state>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc</state>
1418+
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
14211419
</option>
14221420
<option>
14231421
<name>CCStdIncCheck</name>
@@ -2098,9 +2096,6 @@
20982096
<name>$PROJ_DIR$\applications\main.c</name>
20992097
</file>
21002098
</group>
2101-
<group>
2102-
<name>CMSIS-Core</name>
2103-
</group>
21042099
<group>
21052100
<name>Compiler</name>
21062101
<file>
@@ -2155,13 +2150,7 @@
21552150
<name>$PROJ_DIR$\..\..\..\components\drivers\core\device.c</name>
21562151
</file>
21572152
<file>
2158-
<name>$PROJ_DIR$\..\..\..\components\drivers\ipc\completion_comm.c</name>
2159-
</file>
2160-
<file>
2161-
<name>$PROJ_DIR$\..\..\..\components\drivers\ipc\completion_up.c</name>
2162-
</file>
2163-
<file>
2164-
<name>$PROJ_DIR$\..\..\..\components\drivers\ipc\condvar.c</name>
2153+
<name>$PROJ_DIR$\..\..\..\components\drivers\ipc\completion.c</name>
21652154
</file>
21662155
<file>
21672156
<name>$PROJ_DIR$\..\..\..\components\drivers\ipc\dataqueue.c</name>
@@ -2182,10 +2171,10 @@
21822171
<name>$PROJ_DIR$\..\..\..\components\drivers\ipc\workqueue.c</name>
21832172
</file>
21842173
<file>
2185-
<name>$PROJ_DIR$\..\..\..\components\drivers\pin\dev_pin.c</name>
2174+
<name>$PROJ_DIR$\..\..\..\components\drivers\pin\pin.c</name>
21862175
</file>
21872176
<file>
2188-
<name>$PROJ_DIR$\..\..\..\components\drivers\serial\dev_serial.c</name>
2177+
<name>$PROJ_DIR$\..\..\..\components\drivers\serial\serial.c</name>
21892178
</file>
21902179
</group>
21912180
<group>
@@ -2199,6 +2188,9 @@
21992188
<file>
22002189
<name>$PROJ_DIR$\..\libraries\HAL_Drivers\drv_common.c</name>
22012190
</file>
2191+
<file>
2192+
<name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\iar\startup_stm32f103xb.s</name>
2193+
</file>
22022194
<file>
22032195
<name>$PROJ_DIR$\board\CubeMX_Config\Src\stm32f1xx_hal_msp.c</name>
22042196
</file>
@@ -2209,10 +2201,10 @@
22092201
<group>
22102202
<name>Finsh</name>
22112203
<file>
2212-
<name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
2204+
<name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
22132205
</file>
22142206
<file>
2215-
<name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
2207+
<name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
22162208
</file>
22172209
<file>
22182210
<name>$PROJ_DIR$\..\..\..\components\finsh\msh_parse.c</name>
@@ -2230,25 +2222,25 @@
22302222
<name>$PROJ_DIR$\..\..\..\src\components.c</name>
22312223
</file>
22322224
<file>
2233-
<name>$PROJ_DIR$\..\..\..\src\cpu_up.c</name>
2225+
<name>$PROJ_DIR$\..\..\..\src\idle.c</name>
22342226
</file>
22352227
<file>
2236-
<name>$PROJ_DIR$\..\..\..\src\defunct.c</name>
2228+
<name>$PROJ_DIR$\..\..\..\src\ipc.c</name>
22372229
</file>
22382230
<file>
2239-
<name>$PROJ_DIR$\..\..\..\src\idle.c</name>
2231+
<name>$PROJ_DIR$\..\..\..\src\irq.c</name>
22402232
</file>
22412233
<file>
2242-
<name>$PROJ_DIR$\..\..\..\src\ipc.c</name>
2234+
<name>$PROJ_DIR$\..\..\..\src\klibc\kstdio.c</name>
22432235
</file>
22442236
<file>
2245-
<name>$PROJ_DIR$\..\..\..\src\irq.c</name>
2237+
<name>$PROJ_DIR$\..\..\..\src\klibc\kstring.c</name>
22462238
</file>
22472239
<file>
22482240
<name>$PROJ_DIR$\..\..\..\src\kservice.c</name>
22492241
</file>
22502242
<file>
2251-
<name>$PROJ_DIR$\..\..\..\src\memheap.c</name>
2243+
<name>$PROJ_DIR$\..\..\..\src\mem.c</name>
22522244
</file>
22532245
<file>
22542246
<name>$PROJ_DIR$\..\..\..\src\mempool.c</name>
@@ -2269,24 +2261,6 @@
22692261
<name>$PROJ_DIR$\..\..\..\src\timer.c</name>
22702262
</file>
22712263
</group>
2272-
<group>
2273-
<name>klibc</name>
2274-
<file>
2275-
<name>$PROJ_DIR$\..\..\..\src\klibc\kstring.c</name>
2276-
</file>
2277-
<file>
2278-
<name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsnprintf_tiny.c</name>
2279-
</file>
2280-
<file>
2281-
<name>$PROJ_DIR$\..\..\..\src\klibc\kstdio.c</name>
2282-
</file>
2283-
<file>
2284-
<name>$PROJ_DIR$\..\..\..\src\klibc\kerrno.c</name>
2285-
</file>
2286-
<file>
2287-
<name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsscanf.c</name>
2288-
</file>
2289-
</group>
22902264
<group>
22912265
<name>libcpu</name>
22922266
<file>
@@ -2306,57 +2280,48 @@
23062280
</file>
23072281
</group>
23082282
<group>
2309-
<name>POSIX</name>
2310-
</group>
2311-
<group>
2312-
<name>STM32F1-CMSIS</name>
2313-
<file>
2314-
<name>$PROJ_DIR$\packages\stm32f1_cmsis_driver-latest\Source\Templates\iar\startup_stm32f103xb.s</name>
2315-
</file>
2283+
<name>Libraries</name>
23162284
<file>
2317-
<name>$PROJ_DIR$\packages\stm32f1_cmsis_driver-latest\Source\Templates\system_stm32f1xx.c</name>
2285+
<name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c</name>
23182286
</file>
2319-
</group>
2320-
<group>
2321-
<name>STM32F1-HAL</name>
23222287
<file>
2323-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_cec.c</name>
2288+
<name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c</name>
23242289
</file>
23252290
<file>
2326-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_gpio.c</name>
2291+
<name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c</name>
23272292
</file>
23282293
<file>
2329-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_rcc.c</name>
2294+
<name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c</name>
23302295
</file>
23312296
<file>
2332-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_uart.c</name>
2297+
<name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c</name>
23332298
</file>
23342299
<file>
2335-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_gpio_ex.c</name>
2300+
<name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c</name>
23362301
</file>
23372302
<file>
2338-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_pwr.c</name>
2303+
<name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c</name>
23392304
</file>
23402305
<file>
2341-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_dma.c</name>
2306+
<name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c</name>
23422307
</file>
23432308
<file>
2344-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_cortex.c</name>
2309+
<name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c</name>
23452310
</file>
23462311
<file>
2347-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_rcc_ex.c</name>
2312+
<name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c</name>
23482313
</file>
23492314
<file>
2350-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal.c</name>
2315+
<name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c</name>
23512316
</file>
23522317
<file>
2353-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_crc.c</name>
2318+
<name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_usart.c</name>
23542319
</file>
23552320
<file>
2356-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_usart.c</name>
2321+
<name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c</name>
23572322
</file>
23582323
</group>
23592324
<group>
2360-
<name>utestcases</name>
2325+
<name>POSIX</name>
23612326
</group>
23622327
</project>

0 commit comments

Comments
 (0)