Skip to content

Commit 13b0b60

Browse files
GuozhanxinGuozhanxin
authored
Merge pull request #5079 from chenyingchun0312/nrf5x_optimize2
【bsp/nrf5x】优化驱动代码，消除warning & 默认关闭libc功能 ，默认仅开启GPIO&UART驱动
2 parents 6d7ba2b + 3c8799c commit 13b0b60

File tree

5 files changed

+43
-79
lines changed

5 files changed

+43
-79
lines changed

‎bsp/nrf5x/libraries/drivers/drv_flash.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ int mcu_flash_write(rt_uint32_t addr, const uint8_t *buf, size_t size)
129129
*/
130130
int mcu_flash_erase(rt_uint32_t addr, size_t size)
131131
{
132-
nrfx_err_t result = RT_EOK;
132+
nrfx_err_t result = NRFX_SUCCESS;
133133

134134
uint32_t FirstPage = 0, NbOfPages = 0;
135135

‎bsp/nrf5x/libraries/drivers/drv_gpio.c‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -446,8 +446,6 @@ void button_4_callback(void *args)
446446

447447
void gpio_sample(void)
448448
{
449-
rt_err_t err_code;
450-
451449
rt_pin_mode(DK_BOARD_LED_1, PIN_MODE_OUTPUT);
452450
rt_pin_mode(DK_BOARD_LED_2, PIN_MODE_OUTPUT);
453451
rt_pin_mode(DK_BOARD_LED_3, PIN_MODE_OUTPUT);
@@ -458,19 +456,19 @@ void gpio_sample(void)
458456
rt_pin_write(DK_BOARD_LED_3, PIN_HIGH);
459457
rt_pin_write(DK_BOARD_LED_4, PIN_HIGH);
460458

461-
err_code = rt_pin_attach_irq(DK_BOARD_BUTTON_1, PIN_IRQ_MODE_FALLING,
459+
rt_pin_attach_irq(DK_BOARD_BUTTON_1, PIN_IRQ_MODE_FALLING,
462460
button_1_callback, (void*) true); //true: hi_accuracy(IN_EVENT),false: lo_accuracy(PORT_EVENT)
463461
rt_pin_irq_enable(DK_BOARD_BUTTON_1, PIN_IRQ_ENABLE);
464462

465-
err_code = rt_pin_attach_irq(DK_BOARD_BUTTON_2, PIN_IRQ_MODE_FALLING,
463+
rt_pin_attach_irq(DK_BOARD_BUTTON_2, PIN_IRQ_MODE_FALLING,
466464
button_2_callback, (void*) true); //true: hi_accuracy(IN_EVENT),false: lo_accuracy(PORT_EVENT)
467465
rt_pin_irq_enable(DK_BOARD_BUTTON_2, PIN_IRQ_ENABLE);
468466

469-
err_code = rt_pin_attach_irq(DK_BOARD_BUTTON_3, PIN_IRQ_MODE_FALLING,
467+
rt_pin_attach_irq(DK_BOARD_BUTTON_3, PIN_IRQ_MODE_FALLING,
470468
button_3_callback, (void*) true); //true: hi_accuracy(IN_EVENT),false: lo_accuracy(PORT_EVENT)
471469
rt_pin_irq_enable(DK_BOARD_BUTTON_3, PIN_IRQ_ENABLE);
472470

473-
err_code = rt_pin_attach_irq(DK_BOARD_BUTTON_4, PIN_IRQ_MODE_FALLING,
471+
rt_pin_attach_irq(DK_BOARD_BUTTON_4, PIN_IRQ_MODE_FALLING,
474472
button_4_callback, (void*) false); //true: hi_accuracy(IN_EVENT),false: lo_accuracy(PORT_EVENT)
475473
rt_pin_irq_enable(DK_BOARD_BUTTON_4, PIN_IRQ_ENABLE);
476474
}

‎bsp/nrf5x/libraries/drivers/drv_uart.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,14 +240,15 @@ static struct rt_uart_ops _uart_ops = {
240240
int rt_hw_uart_init(void)
241241
{
242242
struct serial_configure config = RT_SERIAL_CONFIG_DEFAULT;
243+
rt_err_t result = RT_EOK;
243244

244245
#ifdef BSP_USING_UART0
245246
_serial_0.config = config;
246247
_serial_0.ops = &_uart_ops;
247248
m_uart0_cfg.serial = &_serial_0;
248-
rt_hw_serial_register(&_serial_0, "uart0", \
249+
result = rt_hw_serial_register(&_serial_0, "uart0", \
249250
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX, &m_uart0_cfg);
250251
#endif /* BSP_USING_UART0 */
251-
252+
return result;
252253
}
253254
#endif /* BSP_USING_UART */

‎bsp/nrf5x/nrf52832/.config‎

Lines changed: 18 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ CONFIG_RT_TIMER_THREAD_STACK_SIZE=512
2929
#
3030
# CONFIG_RT_KSERVICE_USING_STDLIB is not set
3131
# CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set
32+
# CONFIG_RT_USING_ASM_MEMCPY is not set
3233
CONFIG_RT_DEBUG=y
3334
# CONFIG_RT_DEBUG_COLOR is not set
3435
# CONFIG_RT_DEBUG_INIT_CONFIG is not set
@@ -73,6 +74,7 @@ CONFIG_RT_USING_DEVICE=y
7374
CONFIG_RT_USING_CONSOLE=y
7475
CONFIG_RT_CONSOLEBUF_SIZE=128
7576
CONFIG_RT_CONSOLE_DEVICE_NAME="uart0"
77+
# CONFIG_RT_PRINTF_LONGLONG is not set
7678
CONFIG_RT_VER_NUM=0x40004
7779
# CONFIG_RT_USING_CPU_FFS is not set
7880
# CONFIG_ARCH_CPU_STACK_GROWS_UPWARD is not set
@@ -94,34 +96,25 @@ CONFIG_RT_MAIN_THREAD_PRIORITY=10
9496
# Command shell
9597
#
9698
CONFIG_RT_USING_FINSH=y
99+
CONFIG_RT_USING_MSH=y
100+
CONFIG_FINSH_USING_MSH=y
97101
CONFIG_FINSH_THREAD_NAME="tshell"
102+
CONFIG_FINSH_THREAD_PRIORITY=20
103+
CONFIG_FINSH_THREAD_STACK_SIZE=4096
98104
CONFIG_FINSH_USING_HISTORY=y
99105
CONFIG_FINSH_HISTORY_LINES=5
100106
CONFIG_FINSH_USING_SYMTAB=y
107+
CONFIG_FINSH_CMD_SIZE=80
108+
CONFIG_MSH_USING_BUILT_IN_COMMANDS=y
101109
CONFIG_FINSH_USING_DESCRIPTION=y
102110
# CONFIG_FINSH_ECHO_DISABLE_DEFAULT is not set
103-
CONFIG_FINSH_THREAD_PRIORITY=20
104-
CONFIG_FINSH_THREAD_STACK_SIZE=4096
105-
CONFIG_FINSH_CMD_SIZE=80
106111
# CONFIG_FINSH_USING_AUTH is not set
107-
CONFIG_FINSH_USING_MSH=y
108-
CONFIG_FINSH_USING_MSH_DEFAULT=y
109-
CONFIG_FINSH_USING_MSH_ONLY=y
110112
CONFIG_FINSH_ARG_MAX=10
111113

112114
#
113115
# Device virtual file system
114116
#
115-
CONFIG_RT_USING_DFS=y
116-
CONFIG_DFS_USING_WORKDIR=y
117-
CONFIG_DFS_FILESYSTEMS_MAX=4
118-
CONFIG_DFS_FILESYSTEM_TYPES_MAX=4
119-
CONFIG_DFS_FD_MAX=16
120-
# CONFIG_RT_USING_DFS_MNTTABLE is not set
121-
# CONFIG_RT_USING_DFS_ELMFAT is not set
122-
CONFIG_RT_USING_DFS_DEVFS=y
123-
# CONFIG_RT_USING_DFS_ROMFS is not set
124-
# CONFIG_RT_USING_DFS_RAMFS is not set
117+
# CONFIG_RT_USING_DFS is not set
125118

126119
#
127120
# Device Drivers
@@ -143,7 +136,7 @@ CONFIG_RT_USING_PIN=y
143136
# CONFIG_RT_USING_ADC is not set
144137
# CONFIG_RT_USING_DAC is not set
145138
# CONFIG_RT_USING_PWM is not set
146-
CONFIG_RT_USING_MTD_NOR=y
139+
# CONFIG_RT_USING_MTD_NOR is not set
147140
# CONFIG_RT_USING_MTD_NAND is not set
148141
# CONFIG_RT_USING_PM is not set
149142
# CONFIG_RT_USING_RTC is not set
@@ -167,15 +160,9 @@ CONFIG_RT_USING_MTD_NOR=y
167160
#
168161
# POSIX layer and C standard library
169162
#
170-
CONFIG_RT_USING_LIBC=y
163+
# CONFIG_RT_USING_LIBC is not set
171164
# CONFIG_RT_USING_PTHREADS is not set
172-
CONFIG_RT_USING_POSIX=y
173-
# CONFIG_RT_USING_POSIX_MMAP is not set
174-
# CONFIG_RT_USING_POSIX_TERMIOS is not set
175-
# CONFIG_RT_USING_POSIX_GETLINE is not set
176-
# CONFIG_RT_USING_POSIX_AIO is not set
177-
# CONFIG_RT_USING_MODULE is not set
178-
CONFIG_RT_LIBC_FIXED_TIMEZONE=8
165+
# CONFIG_RT_LIBC_USING_TIME is not set
179166

180167
#
181168
# Network
@@ -266,6 +253,7 @@ CONFIG_RT_LIBC_FIXED_TIMEZONE=8
266253
# CONFIG_PKG_USING_AT_DEVICE is not set
267254
# CONFIG_PKG_USING_ATSRV_SOCKET is not set
268255
# CONFIG_PKG_USING_WIZNET is not set
256+
# CONFIG_PKG_USING_ZB_COORDINATOR is not set
269257

270258
#
271259
# IoT Cloud
@@ -406,47 +394,14 @@ CONFIG_RT_LIBC_FIXED_TIMEZONE=8
406394
# CONFIG_PKG_USING_CAIRO is not set
407395
# CONFIG_PKG_USING_PIXMAN is not set
408396
# CONFIG_PKG_USING_PARTITION is not set
409-
CONFIG_PKG_USING_FAL=y
410-
CONFIG_PKG_FAL_PATH="/packages/system/fal"
411-
CONFIG_FAL_DEBUG_CONFIG=y
412-
CONFIG_FAL_DEBUG=1
413-
CONFIG_FAL_PART_HAS_TABLE_CFG=y
414-
# CONFIG_FAL_USING_SFUD_PORT is not set
415-
CONFIG_PKG_USING_FAL_V00500=y
416-
# CONFIG_PKG_USING_FAL_V00400 is not set
417-
# CONFIG_PKG_USING_FAL_V00300 is not set
418-
# CONFIG_PKG_USING_FAL_V00200 is not set
419-
# CONFIG_PKG_USING_FAL_V00100 is not set
420-
# CONFIG_PKG_USING_FAL_LATEST_VERSION is not set
421-
CONFIG_PKG_FAL_VER="v0.5.0"
422-
CONFIG_PKG_FAL_VER_NUM=0x00500
397+
# CONFIG_PKG_USING_FAL is not set
423398
# CONFIG_PKG_USING_FLASHDB is not set
424399
# CONFIG_PKG_USING_SQLITE is not set
425400
# CONFIG_PKG_USING_RTI is not set
426401
# CONFIG_PKG_USING_LITTLEVGL2RTT is not set
427402
# CONFIG_PKG_USING_CMSIS is not set
428403
# CONFIG_PKG_USING_DFS_YAFFS is not set
429-
CONFIG_PKG_USING_LITTLEFS=y
430-
CONFIG_PKG_LITTLEFS_PATH="/packages/system/littlefs"
431-
# CONFIG_PKG_USING_LITTLEFS_V090 is not set
432-
# CONFIG_PKG_USING_LITTLEFS_V170 is not set
433-
# CONFIG_PKG_USING_LITTLEFS_V172 is not set
434-
# CONFIG_PKG_USING_LITTLEFS_V201 is not set
435-
# CONFIG_PKG_USING_LITTLEFS_V205 is not set
436-
# CONFIG_PKG_USING_LITTLEFS_V214 is not set
437-
# CONFIG_PKG_USING_LITTLEFS_V220 is not set
438-
# CONFIG_PKG_USING_LITTLEFS_V221 is not set
439-
# CONFIG_PKG_USING_LITTLEFS_V230 is not set
440-
CONFIG_PKG_USING_LITTLEFS_LATEST_VERSION=y
441-
CONFIG_LFS_READ_SIZE=256
442-
CONFIG_LFS_PROG_SIZE=256
443-
CONFIG_LFS_BLOCK_SIZE=4096
444-
CONFIG_LFS_CACHE_SIZE=256
445-
CONFIG_LFS_BLOCK_CYCLES=-1
446-
# CONFIG_DFS_LFS_READONLY is not set
447-
CONFIG_LFS_THREADSAFE=y
448-
CONFIG_LFS_LOOKAHEAD_MAX=128
449-
CONFIG_PKG_LITTLEFS_VER="latest"
404+
# CONFIG_PKG_USING_LITTLEFS is not set
450405
# CONFIG_PKG_USING_DFS_JFFS2 is not set
451406
# CONFIG_PKG_USING_DFS_UFFS is not set
452407
# CONFIG_PKG_USING_LWEXT4 is not set
@@ -539,6 +494,7 @@ CONFIG_PKG_NRFX_VER="latest"
539494
# CONFIG_PKG_USING_KOBUKI is not set
540495
# CONFIG_PKG_USING_ROSSERIAL is not set
541496
# CONFIG_PKG_USING_MICRO_ROS is not set
497+
# CONFIG_PKG_USING_MCP23008 is not set
542498

543499
#
544500
# AI packages
@@ -634,8 +590,8 @@ CONFIG_BSP_UART0_RX_PIN=8
634590
CONFIG_BSP_UART0_TX_PIN=6
635591
# CONFIG_BSP_USING_I2C is not set
636592
# CONFIG_BSP_USING_SPI is not set
637-
CONFIG_BSP_USING_ON_CHIP_FLASH=y
638-
CONFIG_BSP_USING_ON_CHIP_FS=y
593+
# CONFIG_BSP_USING_ON_CHIP_FLASH is not set
594+
# CONFIG_BSP_USING_ON_CHIP_FS is not set
639595

640596
#
641597
# On-chip flash config

‎bsp/nrf5x/nrf52832/rtconfig.h‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,17 @@
5959
/* Command shell */
6060

6161
#define RT_USING_FINSH
62+
#define RT_USING_MSH
63+
#define FINSH_USING_MSH
6264
#define FINSH_THREAD_NAME "tshell"
65+
#define FINSH_THREAD_PRIORITY 20
66+
#define FINSH_THREAD_STACK_SIZE 4096
6367
#define FINSH_USING_HISTORY
6468
#define FINSH_HISTORY_LINES 5
6569
#define FINSH_USING_SYMTAB
66-
#define FINSH_USING_DESCRIPTION
67-
#define FINSH_THREAD_PRIORITY 20
68-
#define FINSH_THREAD_STACK_SIZE 4096
6970
#define FINSH_CMD_SIZE 80
70-
#define FINSH_USING_MSH
71-
#define FINSH_USING_MSH_DEFAULT
72-
#define FINSH_USING_MSH_ONLY
71+
#define MSH_USING_BUILT_IN_COMMANDS
72+
#define FINSH_USING_DESCRIPTION
7373
#define FINSH_ARG_MAX 10
7474

7575
/* Device virtual file system */
@@ -89,8 +89,6 @@
8989

9090
/* POSIX layer and C standard library */
9191

92-
#define RT_USING_LIBC
93-
#define RT_LIBC_FIXED_TIMEZONE 8
9492

9593
/* Network */
9694

@@ -145,18 +143,29 @@
145143

146144
/* system packages */
147145

146+
/* acceleration: Assembly language or algorithmic acceleration packages */
147+
148+
149+
/* Micrium: Micrium software products porting for RT-Thread */
150+
148151

149152
/* peripheral libraries and drivers */
150153

151154
#define PKG_USING_NRFX
152155
#define PKG_USING_NRFX_LATEST_VERSION
153156

157+
/* AI packages */
158+
159+
154160
/* miscellaneous packages */
155161

156162

157163
/* samples: kernel and components samples */
158164

159165

166+
/* entertainment: terminal games and other interesting software packages */
167+
168+
160169
/* Hardware Drivers Config */
161170

162171
#define SOC_NRF52832

0 commit comments

Comments
 (0)