Skip to content

Commit a3b17cc

Browse files
QianJiu05QianJiu05
committed
[bsp]修复action报错：原文件多include了main.h，已删除并重新生成工程
action编译报错： board/CubeMX_Config/Src/stm32f1xx_hal_msp.c:23:10: fatal error: main.h: No such file or directory 23 | #include "main.h" | ^~~~~~~~
1 parent d57c201 commit a3b17cc

File tree

5 files changed

+105
-127
lines changed

5 files changed

+105
-127
lines changed

‎bsp/stm32/stm32f103-keysking-learning/README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,14 @@ Keysking学习板是B站UP主Keysking推出的一块基于ARM Cortex-M3内核的
4747
| 旋转编码器 | 支持 | A相(PA8),B相(PA9),按键(PB15) |
4848
| OLED | | |
4949
| LED | 支持 | GPIO or PWM: Blue(PA6)，Green(PA7)，Red(PB0) |
50+
| 无源蜂鸣器 | 支持 | PWM4_CH4 |
5051
| **片上外设** | **支持情况** | **备注** |
5152
| GPIO | 支持 | |
5253
| UART | 支持 | UART2,3 |
5354
| PWM | 支持 | PWM3,PWM4 |
5455
| **预留外设接口** | **支持情况** | **备注** |
5556
| SERVO | 支持 | PWM4_CH3 |
56-
| 无源蜂鸣器 | 支持 | PWM4_CH4 |
57+
5758
## 使用说明
5859

5960
使用说明分为如下两个章节：

‎bsp/stm32/stm32f103-keysking-learning/board/CubeMX_Config/Src/stm32f1xx_hal_msp.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/* USER CODE END Header */
2121

2222
/* Includes ------------------------------------------------------------------*/
23-
#include "main.h"
23+
// #include "main.h"
2424
/* USER CODE BEGIN Includes */
2525
#include <drv_common.h>
2626
/* USER CODE END Includes */

‎bsp/stm32/stm32f103-keysking-learning/project.ewp‎

Lines changed: 56 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -348,30 +348,30 @@
348348
<option>
349349
<name>CCIncludePath2</name>
350350
<state />
351-
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
352-
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
353-
<state>$PROJ_DIR$\.</state>
354-
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers</state>
355-
<state>$PROJ_DIR$\..\libraries\HAL_Drivers</state>
356351
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
357-
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
352+
<state>$PROJ_DIR$\..\..\..\components\finsh</state>
358353
<state>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Inc</state>
354+
<state>$PROJ_DIR$\..\libraries\HAL_Drivers</state>
355+
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
356+
<state>$PROJ_DIR$\packages\stm32f1_cmsis_driver-latest\Include</state>
357+
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers\config</state>
358+
<state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
359359
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
360+
<state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
361+
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
362+
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
363+
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers</state>
364+
<state>$PROJ_DIR$\..\..\..\include</state>
360365
<state>$PROJ_DIR$\applications</state>
361-
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
362-
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers\config</state>
363-
<state>$PROJ_DIR$\..\..\..\components\finsh</state>
364-
<state>$PROJ_DIR$\packages\CMSIS-Core-latest\Include</state>
366+
<state>$PROJ_DIR$\board</state>
365367
<state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
366-
<state>$PROJ_DIR$\packages\stm32f1_cmsis_driver-latest\Include</state>
367-
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
368-
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
369-
<state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
368+
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
369+
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
370+
<state>$PROJ_DIR$\.</state>
371+
<state>$PROJ_DIR$\packages\CMSIS-Core-latest\Include</state>
370372
<state>$PROJ_DIR$\board\CubeMX_Config\Inc</state>
371-
<state>$PROJ_DIR$\board</state>
372-
<state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
373-
<state>$PROJ_DIR$\..\..\..\include</state>
374-
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
373+
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
374+
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
375375
</option>
376376
<option>
377377
<name>CCStdIncCheck</name>
@@ -1394,30 +1394,30 @@
13941394
<option>
13951395
<name>CCIncludePath2</name>
13961396
<state />
1397-
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
1398-
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
1399-
<state>$PROJ_DIR$\.</state>
1400-
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers</state>
1401-
<state>$PROJ_DIR$\..\libraries\HAL_Drivers</state>
14021397
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
1403-
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
1398+
<state>$PROJ_DIR$\..\..\..\components\finsh</state>
14041399
<state>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Inc</state>
1400+
<state>$PROJ_DIR$\..\libraries\HAL_Drivers</state>
1401+
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
1402+
<state>$PROJ_DIR$\packages\stm32f1_cmsis_driver-latest\Include</state>
1403+
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers\config</state>
1404+
<state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
14051405
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
1406+
<state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
1407+
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
1408+
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
1409+
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers</state>
1410+
<state>$PROJ_DIR$\..\..\..\include</state>
14061411
<state>$PROJ_DIR$\applications</state>
1407-
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
1408-
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers\config</state>
1409-
<state>$PROJ_DIR$\..\..\..\components\finsh</state>
1410-
<state>$PROJ_DIR$\packages\CMSIS-Core-latest\Include</state>
1412+
<state>$PROJ_DIR$\board</state>
14111413
<state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
1412-
<state>$PROJ_DIR$\packages\stm32f1_cmsis_driver-latest\Include</state>
1413-
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
1414-
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
1415-
<state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
1414+
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
1415+
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
1416+
<state>$PROJ_DIR$\.</state>
1417+
<state>$PROJ_DIR$\packages\CMSIS-Core-latest\Include</state>
14161418
<state>$PROJ_DIR$\board\CubeMX_Config\Inc</state>
1417-
<state>$PROJ_DIR$\board</state>
1418-
<state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
1419-
<state>$PROJ_DIR$\..\..\..\include</state>
1420-
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
1419+
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
1420+
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
14211421
</option>
14221422
<option>
14231423
<name>CCStdIncCheck</name>
@@ -2199,12 +2199,6 @@
21992199
<file>
22002200
<name>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers\drv_gpio.c</name>
22012201
</file>
2202-
<file>
2203-
<name>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers\drv_pwm.c</name>
2204-
</file>
2205-
<file>
2206-
<name>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers\drv_tim.c</name>
2207-
</file>
22082202
<file>
22092203
<name>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers\drv_usart.c</name>
22102204
</file>
@@ -2221,7 +2215,7 @@
22212215
<group>
22222216
<name>Finsh</name>
22232217
<file>
2224-
<name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
2218+
<name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
22252219
</file>
22262220
<file>
22272221
<name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
@@ -2230,7 +2224,7 @@
22302224
<name>$PROJ_DIR$\..\..\..\components\finsh\msh_parse.c</name>
22312225
</file>
22322226
<file>
2233-
<name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
2227+
<name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
22342228
</file>
22352229
</group>
22362230
<group>
@@ -2284,10 +2278,7 @@
22842278
<group>
22852279
<name>klibc</name>
22862280
<file>
2287-
<name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsnprintf_tiny.c</name>
2288-
</file>
2289-
<file>
2290-
<name>$PROJ_DIR$\..\..\..\src\klibc\kstring.c</name>
2281+
<name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsscanf.c</name>
22912282
</file>
22922283
<file>
22932284
<name>$PROJ_DIR$\..\..\..\src\klibc\kstdio.c</name>
@@ -2296,7 +2287,10 @@
22962287
<name>$PROJ_DIR$\..\..\..\src\klibc\kerrno.c</name>
22972288
</file>
22982289
<file>
2299-
<name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsscanf.c</name>
2290+
<name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsnprintf_tiny.c</name>
2291+
</file>
2292+
<file>
2293+
<name>$PROJ_DIR$\..\..\..\src\klibc\kstring.c</name>
23002294
</file>
23012295
</group>
23022296
<group>
@@ -2332,46 +2326,46 @@
23322326
<group>
23332327
<name>STM32F1-HAL</name>
23342328
<file>
2335-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_dma.c</name>
2329+
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_uart.c</name>
23362330
</file>
23372331
<file>
2338-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_crc.c</name>
2332+
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_tim.c</name>
23392333
</file>
23402334
<file>
23412335
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_cec.c</name>
23422336
</file>
23432337
<file>
2344-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_gpio.c</name>
2338+
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_gpio_ex.c</name>
23452339
</file>
23462340
<file>
2347-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_uart.c</name>
2341+
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_rcc_ex.c</name>
23482342
</file>
23492343
<file>
2350-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_tim_ex.c</name>
2344+
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_pwr.c</name>
23512345
</file>
23522346
<file>
2353-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal.c</name>
2347+
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_usart.c</name>
23542348
</file>
23552349
<file>
2356-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_tim.c</name>
2350+
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_cortex.c</name>
23572351
</file>
23582352
<file>
2359-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_cortex.c</name>
2353+
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal.c</name>
23602354
</file>
23612355
<file>
2362-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_gpio_ex.c</name>
2356+
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_rcc.c</name>
23632357
</file>
23642358
<file>
2365-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_usart.c</name>
2359+
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_crc.c</name>
23662360
</file>
23672361
<file>
2368-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_rcc.c</name>
2362+
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_gpio.c</name>
23692363
</file>
23702364
<file>
2371-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_pwr.c</name>
2365+
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_tim_ex.c</name>
23722366
</file>
23732367
<file>
2374-
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_rcc_ex.c</name>
2368+
<name>$PROJ_DIR$\packages\stm32f1_hal_driver-latest\Src\stm32f1xx_hal_dma.c</name>
23752369
</file>
23762370
</group>
23772371
<group>

0 commit comments

Comments
 (0)