Skip to content

Commit 70bd62c

Browse files
chejia12chejia12
committed
修改了L406的bsp\n32\n32l40xcl-stb\board\Kconfig文件
1 parent c727332 commit 70bd62c

File tree

6 files changed

+86
-257
lines changed

6 files changed

+86
-257
lines changed

‎bsp/n32/n32g457qel-stb/.config‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1456,7 +1456,10 @@ CONFIG_UART1_PA9_PA10=y
14561456
# CONFIG_BSP_USING_ADC is not set
14571457
# CONFIG_BSP_USING_DAC is not set
14581458
# CONFIG_BSP_USING_CAN is not set
1459-
# CONFIG_BSP_USING_PWM is not set
1459+
CONFIG_BSP_USING_PWM=y
1460+
# CONFIG_BSP_USING_TIM1_PWM is not set
1461+
# CONFIG_BSP_USING_TIM2_PWM is not set
1462+
# CONFIG_BSP_USING_TIM3_PWM is not set
14601463
# CONFIG_BSP_USING_TIM_ETR_CNT is not set
14611464
# CONFIG_BSP_USING_TIM_EXT_COUNTER is not set
14621465
CONFIG_BSP_USING_TIM_PULSE_WIDTH=y

‎bsp/n32/n32g457qel-stb/project.uvprojx‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -334,9 +334,9 @@
334334
<v6Rtti>0</v6Rtti>
335335
<VariousControls>
336336
<MiscControls />
337-
<Define>__CLK_TCK=RT_TICK_PER_SECOND, RT_USING_ARMLIBC, __STDC_LIMIT_MACROS, N32G45X, RT_USING_LIBC, __RTTHREAD__, USE_STDPERIPH_DRIVER</Define>
337+
<Define>N32G45X, RT_USING_LIBC, __RTTHREAD__, USE_STDPERIPH_DRIVER, RT_USING_ARMLIBC, __CLK_TCK=RT_TICK_PER_SECOND, __STDC_LIMIT_MACROS</Define>
338338
<Undefine />
339-
<IncludePath>..\..\..\components\drivers\include;..\..\..\libcpu\arm\common;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;..\..\..\components\drivers\smp_call;..\..\..\components\drivers\phy;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\libc\posix\ipc;..\..\..\components\drivers\include;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\spi;.;..\..\..\components\libc\compilers\common\include;..\libraries\N32G45x_Firmware_Library\CMSIS\device;..\..\..\components\net\utest;..\libraries\n32_drivers;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\eventfd;applications;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\epoll;..\libraries\N32G45x_Firmware_Library\CMSIS\core;..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\inc;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\include;..\..\..\components\drivers\include;..\libraries\n32_drivers\config</IncludePath>
339+
<IncludePath>..\libraries\N32G45x_Firmware_Library\CMSIS\core;..\..\..\components\drivers\include;..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\inc;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\libcpu\arm\common;..\..\..\components\drivers\smp_call;..\libraries\N32G45x_Firmware_Library\CMSIS\device;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;.;..\..\..\components\drivers\spi;..\libraries\n32_drivers\config;..\..\..\components\drivers\phy;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\libc\posix\io\epoll;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\net\utest;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\posix\ipc;..\..\..\components\finsh;applications;..\..\..\libcpu\arm\cortex-m4;..\libraries\n32_drivers;..\..\..\components\drivers\include</IncludePath>
340340
</VariousControls>
341341
</Cads>
342342
<Aads>
@@ -989,30 +989,30 @@
989989
<GroupName>Finsh</GroupName>
990990
<Files>
991991
<File>
992-
<FileName>cmd.c</FileName>
992+
<FileName>msh_parse.c</FileName>
993993
<FileType>1</FileType>
994-
<FilePath>..\..\..\components\finsh\cmd.c</FilePath>
994+
<FilePath>..\..\..\components\finsh\msh_parse.c</FilePath>
995995
</File>
996996
</Files>
997997
<Files>
998998
<File>
999-
<FileName>msh_parse.c</FileName>
999+
<FileName>shell.c</FileName>
10001000
<FileType>1</FileType>
1001-
<FilePath>..\..\..\components\finsh\msh_parse.c</FilePath>
1001+
<FilePath>..\..\..\components\finsh\shell.c</FilePath>
10021002
</File>
10031003
</Files>
10041004
<Files>
10051005
<File>
1006-
<FileName>msh.c</FileName>
1006+
<FileName>cmd.c</FileName>
10071007
<FileType>1</FileType>
1008-
<FilePath>..\..\..\components\finsh\msh.c</FilePath>
1008+
<FilePath>..\..\..\components\finsh\cmd.c</FilePath>
10091009
</File>
10101010
</Files>
10111011
<Files>
10121012
<File>
1013-
<FileName>shell.c</FileName>
1013+
<FileName>msh.c</FileName>
10141014
<FileType>1</FileType>
1015-
<FilePath>..\..\..\components\finsh\shell.c</FilePath>
1015+
<FilePath>..\..\..\components\finsh\msh.c</FilePath>
10161016
</File>
10171017
</Files>
10181018
</Group>
@@ -1421,121 +1421,121 @@
14211421
<GroupName>Libraries</GroupName>
14221422
<Files>
14231423
<File>
1424-
<FileName>misc.c</FileName>
1424+
<FileName>n32g45x_usart.c</FileName>
14251425
<FileType>1</FileType>
1426-
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\misc.c</FilePath>
1426+
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_usart.c</FilePath>
14271427
</File>
14281428
</Files>
14291429
<Files>
14301430
<File>
1431-
<FileName>n32g45x_rcc.c</FileName>
1431+
<FileName>n32g45x_wwdg.c</FileName>
14321432
<FileType>1</FileType>
1433-
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_rcc.c</FilePath>
1433+
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_wwdg.c</FilePath>
14341434
</File>
14351435
</Files>
14361436
<Files>
14371437
<File>
1438-
<FileName>system_n32g45x.c</FileName>
1438+
<FileName>n32g45x_gpio.c</FileName>
14391439
<FileType>1</FileType>
1440-
<FilePath>..\libraries\N32G45x_Firmware_Library\CMSIS\device\system_n32g45x.c</FilePath>
1440+
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_gpio.c</FilePath>
14411441
</File>
14421442
</Files>
14431443
<Files>
14441444
<File>
1445-
<FileName>n32g45x_usart.c</FileName>
1445+
<FileName>system_n32g45x.c</FileName>
14461446
<FileType>1</FileType>
1447-
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_usart.c</FilePath>
1447+
<FilePath>..\libraries\N32G45x_Firmware_Library\CMSIS\device\system_n32g45x.c</FilePath>
14481448
</File>
14491449
</Files>
14501450
<Files>
14511451
<File>
1452-
<FileName>n32g45x_adc.c</FileName>
1452+
<FileName>n32g45x_tim.c</FileName>
14531453
<FileType>1</FileType>
1454-
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_adc.c</FilePath>
1454+
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_tim.c</FilePath>
14551455
</File>
14561456
</Files>
14571457
<Files>
14581458
<File>
1459-
<FileName>n32g45x_gpio.c</FileName>
1459+
<FileName>n32g45x_exti.c</FileName>
14601460
<FileType>1</FileType>
1461-
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_gpio.c</FilePath>
1461+
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_exti.c</FilePath>
14621462
</File>
14631463
</Files>
14641464
<Files>
14651465
<File>
1466-
<FileName>n32g45x_dac.c</FileName>
1466+
<FileName>n32g45x_i2c.c</FileName>
14671467
<FileType>1</FileType>
1468-
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_dac.c</FilePath>
1468+
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_i2c.c</FilePath>
14691469
</File>
14701470
</Files>
14711471
<Files>
14721472
<File>
1473-
<FileName>n32g45x_can.c</FileName>
1473+
<FileName>n32g45x_spi.c</FileName>
14741474
<FileType>1</FileType>
1475-
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_can.c</FilePath>
1475+
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_spi.c</FilePath>
14761476
</File>
14771477
</Files>
14781478
<Files>
14791479
<File>
1480-
<FileName>n32g45x_pwr.c</FileName>
1480+
<FileName>n32g45x_rtc.c</FileName>
14811481
<FileType>1</FileType>
1482-
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_pwr.c</FilePath>
1482+
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_rtc.c</FilePath>
14831483
</File>
14841484
</Files>
14851485
<Files>
14861486
<File>
1487-
<FileName>n32g45x_rtc.c</FileName>
1487+
<FileName>n32g45x_dma.c</FileName>
14881488
<FileType>1</FileType>
1489-
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_rtc.c</FilePath>
1489+
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_dma.c</FilePath>
14901490
</File>
14911491
</Files>
14921492
<Files>
14931493
<File>
1494-
<FileName>n32g45x_dma.c</FileName>
1494+
<FileName>n32g45x_dac.c</FileName>
14951495
<FileType>1</FileType>
1496-
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_dma.c</FilePath>
1496+
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_dac.c</FilePath>
14971497
</File>
14981498
</Files>
14991499
<Files>
15001500
<File>
1501-
<FileName>n32g45x_i2c.c</FileName>
1501+
<FileName>misc.c</FileName>
15021502
<FileType>1</FileType>
1503-
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_i2c.c</FilePath>
1503+
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\misc.c</FilePath>
15041504
</File>
15051505
</Files>
15061506
<Files>
15071507
<File>
1508-
<FileName>n32g45x_iwdg.c</FileName>
1508+
<FileName>n32g45x_rcc.c</FileName>
15091509
<FileType>1</FileType>
1510-
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_iwdg.c</FilePath>
1510+
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_rcc.c</FilePath>
15111511
</File>
15121512
</Files>
15131513
<Files>
15141514
<File>
1515-
<FileName>n32g45x_wwdg.c</FileName>
1515+
<FileName>n32g45x_pwr.c</FileName>
15161516
<FileType>1</FileType>
1517-
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_wwdg.c</FilePath>
1517+
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_pwr.c</FilePath>
15181518
</File>
15191519
</Files>
15201520
<Files>
15211521
<File>
1522-
<FileName>n32g45x_spi.c</FileName>
1522+
<FileName>n32g45x_iwdg.c</FileName>
15231523
<FileType>1</FileType>
1524-
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_spi.c</FilePath>
1524+
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_iwdg.c</FilePath>
15251525
</File>
15261526
</Files>
15271527
<Files>
15281528
<File>
1529-
<FileName>n32g45x_tim.c</FileName>
1529+
<FileName>n32g45x_adc.c</FileName>
15301530
<FileType>1</FileType>
1531-
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_tim.c</FilePath>
1531+
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_adc.c</FilePath>
15321532
</File>
15331533
</Files>
15341534
<Files>
15351535
<File>
1536-
<FileName>n32g45x_exti.c</FileName>
1536+
<FileName>n32g45x_can.c</FileName>
15371537
<FileType>1</FileType>
1538-
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_exti.c</FilePath>
1538+
<FilePath>..\libraries\N32G45x_Firmware_Library\n32g45x_std_periph_driver\src\n32g45x_can.c</FilePath>
15391539
</File>
15401540
</Files>
15411541
</Group>

‎bsp/n32/n32g457qel-stb/rtconfig.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,7 @@
432432
#define BSP_USING_UART
433433
#define BSP_USING_USART1
434434
#define UART1_PA9_PA10
435+
#define BSP_USING_PWM
435436
#define BSP_USING_TIM_PULSE_WIDTH
436437
#define BSP_USING_PULSE_WIDTH_DEMO
437438
#define BSP_USING_TIM1_PULSE_WIDTH

‎bsp/n32/n32l40xcl-stb/.config‎

Lines changed: 8 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,6 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0
644644
# CONFIG_PKG_USING_RVBACKTRACE is not set
645645
# CONFIG_PKG_USING_HPATCHLITE is not set
646646
# CONFIG_PKG_USING_THREAD_METRIC is not set
647-
# CONFIG_PKG_USING_UORB is not set
648647
# end of tools packages
649648

650649
#
@@ -1443,50 +1442,25 @@ CONFIG_UART1_PA9_PA10=y
14431442
# CONFIG_BSP_USING_ADC is not set
14441443
# CONFIG_BSP_USING_DAC is not set
14451444
# CONFIG_BSP_USING_CAN is not set
1446-
<<<<<<< HEAD
1447-
CONFIG_BSP_USING_PWM=y
1448-
# CONFIG_BSP_USING_TIM1_PWM is not set
1449-
CONFIG_BSP_USING_TIM2_PWM=y
1450-
CONFIG_BSP_USING_TIM2_PWM_CH1=y
1451-
CONFIG_TIM2_CH1_PA0=y
1452-
# CONFIG_TIM2_CH1_PA15 is not set
1453-
# CONFIG_BSP_USING_TIM2_PWM_CH2 is not set
1454-
# CONFIG_BSP_USING_TIM2_PWM_CH3 is not set
1455-
# CONFIG_BSP_USING_TIM2_PWM_CH4 is not set
1456-
# CONFIG_BSP_USING_TIM3_PWM is not set
1457-
CONFIG_BSP_USING_TIM_ETR_CNT=y
1458-
# CONFIG_BSP_USING_TIM_ETR_CNT_DEBUG is not set
1459-
# CONFIG_BSP_USING_TIM1_ETR_CNT is not set
1460-
# CONFIG_BSP_USING_TIM2_ETR_CNT is not set
1461-
CONFIG_TIM2_ETR_PIN_PA0=y
1462-
# CONFIG_TIM1_ETR_PIN_PA15 is not set
1463-
CONFIG_BSP_USING_TIM3_ETR_CNT=y
1464-
# CONFIG_BSP_USING_TIM9_ETR_CNT is not set
1465-
CONFIG_BSP_USING_TIM_EXT_COUNTER=y
1466-
CONFIG_BSP_USING_TIM1_EXT_COUNTER=y
1467-
CONFIG_TIM1_CH1_PA8=y
1468-
# CONFIG_TIM1_CH2_PA9 is not set
1469-
=======
14701445
# CONFIG_BSP_USING_PWM is not set
1471-
# CONFIG_BSP_USING_TIM_ETR_CNT is not set
1472-
CONFIG_BSP_USING_TIM_EXT_COUNTER=y
1473-
CONFIG_BSP_USING_EXT_COUNTER_DEMO=y
1474-
CONFIG_BSP_USING_TIM1_EXT_COUNTER=y
1475-
CONFIG_TIM1_CH1_PA8=y
1476-
# CONFIG_TIM1_CH2_PA9 is not set
1477-
# CONFIG_BSP_USING_TIM2_EXT_COUNTER is not set
14781446
CONFIG_TIM2_CH1_PA0=y
14791447
# CONFIG_TIM2_CH1_PA15 is not set
14801448
# CONFIG_TIM2_CH2_PA1 is not set
14811449
# CONFIG_TIM2_CH2_PB3 is not set
1482-
# CONFIG_BSP_USING_TIM3_EXT_COUNTER is not set
14831450
CONFIG_TIM3_CH1_PA6=y
14841451
# CONFIG_TIM3_CH1_PB4 is not set
14851452
# CONFIG_TIM3_CH1_PC6 is not set
14861453
# CONFIG_TIM3_CH2_PA7 is not set
14871454
# CONFIG_TIM3_CH2_PB5 is not set
14881455
# CONFIG_TIM3_CH2_PC7 is not set
1489-
>>>>>>> N32
1456+
# CONFIG_BSP_USING_TIM_ETR_CNT is not set
1457+
CONFIG_BSP_USING_TIM_EXT_COUNTER=y
1458+
CONFIG_BSP_USING_TIM1_EXT_COUNTER=y
1459+
CONFIG_TIM1_CH1_PA8=y
1460+
# CONFIG_TIM1_CH2_PA9 is not set
1461+
CONFIG_BSP_USING_EXT_COUNTER_DEMO=y
1462+
# CONFIG_BSP_USING_TIM2_EXT_COUNTER is not set
1463+
# CONFIG_BSP_USING_TIM3_EXT_COUNTER is not set
14901464
# end of On-chip Peripheral Drivers
14911465

14921466
#

0 commit comments

Comments
 (0)