Skip to content

Commit 06fdc10

Browse files
Lim-LinYuanbolinyuanbo_breo_server
andauthored
解决无法dist问题 (#5150)
* first commit, keil test pass * feat : n32g452xx direct structure base at32 1. 重新整理目录结构 * feat : 基于AT32,将各驱动移植整改待验证 1. 部分驱动已经整改,但未验证 2. 根据AT32整改目录结构 * feat : add README document 1. 完善配置文件 2. 添加说明文档 * feat : 验证添加的驱动 1. UART 1-3 验证通过 2. ADC 1-2 CH 6-9 验证通过 3. TIM 6-7 验证通过 * feat : complete readme document * feat : format code 1. ref https://github.com/mysterywolf/formatting * feat : 完成PWM驱动移植与自测 1. 添加PWM测试代码 2. 修正PWM驱动周期与脉冲错误问题 * feat : 删除多余代码与多余的文件,修正注释与函数命名 * feat : fix tim channel comment * feat : 完成DEMO测试例子 1. 完成MAIN函数中的LED测试例子 2. 完善README文档 3. 更新添加许可文件 * feat : 根据BSP提交自查完善固件 1. 添加.ignore_format.yml文件 2. 修正main.c的注释 * feat : add last line in .ignore_format.yml * feat : delet file_path in .ignore_format.yml * fix: gPIO/ADC driver 1. add ADC temperature&vref channel. 2.add GPIO IPD/OD configration * fix: 解决告警 1. 解决告警(rt_drv_pwm.c: warning: implicit declaration of function 'atoi') * feat: add scons --dist function * fix: 解决MDK5无法编译问题 * perf: delete invalid code Co-authored-by: linyuanbo_breo_server <[email protected]>
1 parent 76a6b2c commit 06fdc10

File tree

10 files changed

+1021
-32
lines changed

10 files changed

+1021
-32
lines changed

bsp/n32g452xx/Libraries/Kconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
config SOC_FAMILY_N32
2+
bool
3+
4+
config SOC_SERIES_N32G452XX
5+
bool
6+
select ARCH_ARM_CORTEX_M4
7+
select SOC_FAMILY_N32

bsp/n32g452xx/Libraries/rt_drivers/drv_adc.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@ static rt_uint32_t n32_adc_get_channel(rt_uint32_t channel)
9898
case 17:
9999
n32_channel = ADC_CH_17;
100100
break;
101+
case 18:
102+
n32_channel = ADC_CH_18;
103+
break;
101104
}
102105

103106
return n32_channel;
@@ -124,6 +127,12 @@ static rt_err_t n32_adc_enabled(struct rt_adc_device *device, rt_uint32_t channe
124127
/* ADCx regular channels configuration */
125128
ADC_ConfigRegularChannel(n32_adc_handler, n32_adc_get_channel(channel), 1, ADC_SAMP_TIME_28CYCLES5);
126129

130+
if (((n32_adc_handler == ADC2) || (n32_adc_handler == ADC2))
131+
&& ((n32_adc_get_channel(channel) == ADC_CH_16) || (n32_adc_get_channel(channel) == ADC_CH_18)))
132+
{
133+
ADC_EnableTempSensorVrefint(ENABLE);
134+
}
135+
127136
/* Enable ADCx */
128137
ADC_Enable(n32_adc_handler, ENABLE);
129138

bsp/n32g452xx/Libraries/rt_drivers/drv_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ static void reboot(uint8_t argc, char **argv)
2525
{
2626
rt_hw_cpu_reset();
2727
}
28-
FINSH_FUNCTION_EXPORT_ALIAS(reboot, __cmd_reboot, Reboot System);
28+
MSH_CMD_EXPORT(reboot, Reboot System);
2929
#endif /* RT_USING_FINSH */
3030

3131
/**

bsp/n32g452xx/Libraries/rt_drivers/drv_gpio.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,16 @@ void n32_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
552552
/* input setting: pull up. */
553553
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU;
554554
}
555+
else if (mode == PIN_MODE_INPUT_PULLDOWN)
556+
{
557+
/* input setting: pull up. */
558+
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPD;
559+
}
560+
else if (mode == PIN_MODE_OUTPUT_OD)
561+
{
562+
/* input setting: pull up. */
563+
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_OD;
564+
}
555565
else
556566
{
557567
/* input setting:default. */

bsp/n32g452xx/n32g452xx-mini-system/.config

Lines changed: 51 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -96,19 +96,19 @@ CONFIG_RT_MAIN_THREAD_PRIORITY=10
9696
# Command shell
9797
#
9898
CONFIG_RT_USING_FINSH=y
99+
CONFIG_RT_USING_MSH=y
100+
CONFIG_FINSH_USING_MSH=y
99101
CONFIG_FINSH_THREAD_NAME="tshell"
102+
CONFIG_FINSH_THREAD_PRIORITY=20
103+
CONFIG_FINSH_THREAD_STACK_SIZE=4096
100104
CONFIG_FINSH_USING_HISTORY=y
101105
CONFIG_FINSH_HISTORY_LINES=5
102106
CONFIG_FINSH_USING_SYMTAB=y
107+
CONFIG_FINSH_CMD_SIZE=80
108+
CONFIG_MSH_USING_BUILT_IN_COMMANDS=y
103109
CONFIG_FINSH_USING_DESCRIPTION=y
104110
# CONFIG_FINSH_ECHO_DISABLE_DEFAULT is not set
105-
CONFIG_FINSH_THREAD_PRIORITY=20
106-
CONFIG_FINSH_THREAD_STACK_SIZE=4096
107-
CONFIG_FINSH_CMD_SIZE=80
108111
# CONFIG_FINSH_USING_AUTH is not set
109-
CONFIG_FINSH_USING_MSH=y
110-
CONFIG_FINSH_USING_MSH_DEFAULT=y
111-
# CONFIG_FINSH_USING_MSH_ONLY is not set
112112
CONFIG_FINSH_ARG_MAX=10
113113

114114
#
@@ -162,6 +162,7 @@ CONFIG_RT_USING_PWM=y
162162
#
163163
CONFIG_RT_USING_LIBC=y
164164
# CONFIG_RT_USING_PTHREADS is not set
165+
CONFIG_RT_LIBC_USING_TIME=y
165166
# CONFIG_RT_USING_MODULE is not set
166167
CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
167168

@@ -254,6 +255,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
254255
# CONFIG_PKG_USING_AT_DEVICE is not set
255256
# CONFIG_PKG_USING_ATSRV_SOCKET is not set
256257
# CONFIG_PKG_USING_WIZNET is not set
258+
# CONFIG_PKG_USING_ZB_COORDINATOR is not set
257259

258260
#
259261
# IoT Cloud
@@ -294,6 +296,11 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
294296
# CONFIG_PKG_USING_AGILE_MODBUS is not set
295297
# CONFIG_PKG_USING_AGILE_FTP is not set
296298
# CONFIG_PKG_USING_EMBEDDEDPROTO is not set
299+
# CONFIG_PKG_USING_RT_LINK_HW is not set
300+
# CONFIG_PKG_USING_LORA_PKT_FWD is not set
301+
# CONFIG_PKG_USING_LORA_GW_DRIVER_LIB is not set
302+
# CONFIG_PKG_USING_LORA_PKT_SNIFFER is not set
303+
# CONFIG_PKG_USING_HM is not set
297304

298305
#
299306
# security packages
@@ -310,6 +317,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
310317
# CONFIG_PKG_USING_LUA is not set
311318
# CONFIG_PKG_USING_JERRYSCRIPT is not set
312319
# CONFIG_PKG_USING_MICROPYTHON is not set
320+
# CONFIG_PKG_USING_PIKASCRIPT is not set
313321

314322
#
315323
# multimedia packages
@@ -326,6 +334,13 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
326334
# CONFIG_PKG_USING_NUEMWIN is not set
327335
# CONFIG_PKG_USING_MP3PLAYER is not set
328336
# CONFIG_PKG_USING_TINYJPEG is not set
337+
# CONFIG_PKG_USING_UGUI is not set
338+
339+
#
340+
# U8G2: a monochrome graphic library
341+
#
342+
# CONFIG_PKG_USING_U8G2_OFFICIAL is not set
343+
# CONFIG_PKG_USING_U8G2 is not set
329344

330345
#
331346
# tools packages
@@ -420,6 +435,9 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
420435
# CONFIG_PKG_USING_LPM is not set
421436
# CONFIG_PKG_USING_TLSF is not set
422437
# CONFIG_PKG_USING_EVENT_RECORDER is not set
438+
# CONFIG_PKG_USING_ARM_2D is not set
439+
# CONFIG_PKG_USING_WCWIDTH is not set
440+
# CONFIG_PKG_USING_MCUBOOT is not set
423441

424442
#
425443
# peripheral libraries and drivers
@@ -431,7 +449,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
431449
# CONFIG_PKG_USING_AS7341 is not set
432450
# CONFIG_PKG_USING_STM32_SDIO is not set
433451
# CONFIG_PKG_USING_ICM20608 is not set
434-
# CONFIG_PKG_USING_U8G2 is not set
435452
# CONFIG_PKG_USING_BUTTON is not set
436453
# CONFIG_PKG_USING_PCF8574 is not set
437454
# CONFIG_PKG_USING_SX12XX is not set
@@ -490,6 +507,11 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
490507
# CONFIG_PKG_USING_KOBUKI is not set
491508
# CONFIG_PKG_USING_ROSSERIAL is not set
492509
# CONFIG_PKG_USING_MICRO_ROS is not set
510+
# CONFIG_PKG_USING_MCP23008 is not set
511+
# CONFIG_PKG_USING_BLUETRUM_SDK is not set
512+
# CONFIG_PKG_USING_MISAKA_AT24CXX is not set
513+
# CONFIG_PKG_USING_MISAKA_RGB_BLING is not set
514+
# CONFIG_PKG_USING_BL_MCU_SDK is not set
493515

494516
#
495517
# AI packages
@@ -507,6 +529,27 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
507529
#
508530
# miscellaneous packages
509531
#
532+
533+
#
534+
# samples: kernel and components samples
535+
#
536+
# CONFIG_PKG_USING_KERNEL_SAMPLES is not set
537+
# CONFIG_PKG_USING_FILESYSTEM_SAMPLES is not set
538+
# CONFIG_PKG_USING_NETWORK_SAMPLES is not set
539+
# CONFIG_PKG_USING_PERIPHERAL_SAMPLES is not set
540+
541+
#
542+
# entertainment: terminal games and other interesting software packages
543+
#
544+
# CONFIG_PKG_USING_CMATRIX is not set
545+
# CONFIG_PKG_USING_SL is not set
546+
# CONFIG_PKG_USING_CAL is not set
547+
# CONFIG_PKG_USING_ACLOCK is not set
548+
# CONFIG_PKG_USING_THREES is not set
549+
# CONFIG_PKG_USING_2048 is not set
550+
# CONFIG_PKG_USING_SNAKE is not set
551+
# CONFIG_PKG_USING_TETRIS is not set
552+
# CONFIG_PKG_USING_DONUT is not set
510553
# CONFIG_PKG_USING_LIBCSV is not set
511554
# CONFIG_PKG_USING_OPTPARSE is not set
512555
# CONFIG_PKG_USING_FASTLZ is not set
@@ -524,35 +567,18 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
524567
# CONFIG_PKG_USING_DIGITALCTRL is not set
525568
# CONFIG_PKG_USING_UPACKER is not set
526569
# CONFIG_PKG_USING_UPARAM is not set
527-
528-
#
529-
# samples: kernel and components samples
530-
#
531-
# CONFIG_PKG_USING_KERNEL_SAMPLES is not set
532-
# CONFIG_PKG_USING_FILESYSTEM_SAMPLES is not set
533-
# CONFIG_PKG_USING_NETWORK_SAMPLES is not set
534-
# CONFIG_PKG_USING_PERIPHERAL_SAMPLES is not set
535570
# CONFIG_PKG_USING_HELLO is not set
536571
# CONFIG_PKG_USING_VI is not set
537572
# CONFIG_PKG_USING_KI is not set
538573
# CONFIG_PKG_USING_ARMv7M_DWT is not set
539574
# CONFIG_PKG_USING_VT100 is not set
540575
# CONFIG_PKG_USING_UKAL is not set
541576
# CONFIG_PKG_USING_CRCLIB is not set
542-
543-
#
544-
# entertainment: terminal games and other interesting software packages
545-
#
546-
# CONFIG_PKG_USING_THREES is not set
547-
# CONFIG_PKG_USING_2048 is not set
548-
# CONFIG_PKG_USING_SNAKE is not set
549-
# CONFIG_PKG_USING_TETRIS is not set
550-
# CONFIG_PKG_USING_DONUT is not set
551-
# CONFIG_PKG_USING_ACLOCK is not set
552577
# CONFIG_PKG_USING_LWGPS is not set
553578
# CONFIG_PKG_USING_STATE_MACHINE is not set
554579
# CONFIG_PKG_USING_MCURSES is not set
555580
# CONFIG_PKG_USING_COWSAY is not set
581+
# CONFIG_PKG_USING_TERMBOX is not set
556582

557583
#
558584
# Hardware Drivers Config

bsp/n32g452xx/n32g452xx-mini-system/applications/main.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* Date Author Notes
88
* 2015-07-29 Arda.Fu first implementation
99
*/
10+
#include <stdint.h>
1011
#include <rtthread.h>
1112
#include <rtdevice.h>
1213

bsp/n32g452xx/n32g452xx-mini-system/board/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ menu "Hardware Drivers Config"
22

33
config SOC_N32G452XX
44
bool
5+
select SOC_SERIES_N32G452XX
56
select RT_USING_COMPONENTS_INIT
67
select RT_USING_USER_MAIN
78
default y

0 commit comments

Comments
 (0)