Browse Source

fix: fix wrong define and warning

192.168.1.134 3 years ago
parent
commit
d6b05287bb

+ 3 - 3
bsp/n32g452xx/Libraries/rt_drivers/SConscript

@@ -12,13 +12,13 @@ src = Split("""
 src += ['drv_common.c']
 src += ['drv_clk.c']
 
-if GetDepend(['RT_USING_PIN']):
+if GetDepend(['BSP_USING_GPIO']):
     src += ['drv_gpio.c']
 
-if GetDepend(['RT_USING_WDT']):
+if GetDepend(['BSP_USING_UART']):
     src += ['drv_wdt.c']
 
-if GetDepend(['RT_USING_SERIAL']):
+if GetDepend(['BSP_USING_UART']):
     src += ['drv_usart.c']
 
 if GetDepend(['BSP_USING_PWM']):

+ 5 - 3
bsp/n32g452xx/n32g452xx-mini-system/.config

@@ -31,6 +31,7 @@ CONFIG_RT_TIMER_THREAD_STACK_SIZE=512
 # CONFIG_RT_KSERVICE_USING_STDLIB is not set
 # CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set
 # CONFIG_RT_USING_ASM_MEMCPY is not set
+# CONFIG_RT_USING_TINY_FFS is not set
 CONFIG_RT_DEBUG=y
 # CONFIG_RT_DEBUG_COLOR is not set
 # CONFIG_RT_DEBUG_INIT_CONFIG is not set
@@ -134,7 +135,7 @@ CONFIG_RT_SERIAL_RB_BUFSZ=64
 # CONFIG_RT_USING_I2C is not set
 # CONFIG_RT_USING_PHY is not set
 CONFIG_RT_USING_PIN=y
-# CONFIG_RT_USING_ADC is not set
+CONFIG_RT_USING_ADC=y
 # CONFIG_RT_USING_DAC is not set
 CONFIG_RT_USING_PWM=y
 # CONFIG_RT_USING_MTD_NOR is not set
@@ -167,6 +168,7 @@ CONFIG_RT_LIBC_USING_TIME=y
 # CONFIG_RT_LIBC_USING_FILEIO is not set
 # CONFIG_RT_USING_MODULE is not set
 CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
+# CONFIG_RT_USING_POSIX is not set
 # CONFIG_RT_USING_PTHREADS is not set
 
 #
@@ -580,14 +582,14 @@ CONFIG_SOC_N32G452XX=y
 #
 # Onboard Peripheral Drivers
 #
+CONFIG_BSP_USING_UART=y
 
 #
 # On-chip Peripheral Drivers
 #
-CONFIG_RT_USING_GPIO=y
+CONFIG_BSP_USING_GPIO=y
 # CONFIG_BSP_USING_ON_CHIP_FLASH is not set
 # CONFIG_BSP_USING_WDT is not set
-CONFIG_BSP_USING_UART=y
 CONFIG_BSP_USING_UART1=y
 # CONFIG_BSP_USING_UART2 is not set
 # CONFIG_BSP_USING_UART3 is not set

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

@@ -9,9 +9,9 @@ config SOC_N32G452XX
 
 menu "Onboard Peripheral Drivers"
 
-    config RT_USING_SERIAL
+    config BSP_USING_UART
         bool "Enable USART (uart1)"
-        select BSP_USING_UART
+        select RT_USING_SERIAL
         select BSP_USING_UART1
         default y
 
@@ -19,7 +19,7 @@ endmenu
 
 menu "On-chip Peripheral Drivers"
 
-    config RT_USING_GPIO
+    config BSP_USING_GPIO
         bool "Enable GPIO"
         select RT_USING_PIN
         default y

+ 3 - 2
bsp/n32g452xx/n32g452xx-mini-system/board/msp/n32_msp.c

@@ -8,7 +8,8 @@
  * 2021-08-20     breo.com     first version
  */
 
-
+#include <stdio.h>
+#include <string.h>
 #include <rtthread.h>
 #include <rtdevice.h>
 #include "n32g45x.h"
@@ -383,7 +384,7 @@ static void uart_test(void)
     static rt_device_t u2 = NULL;
     uart_test_rw(u2, "uart2");
 #endif
-#ifdef BSP_USING_UART2
+#ifdef BSP_USING_UART3
     static rt_device_t u3 = NULL;
     uart_test_rw(u3, "uart3");
 #endif

+ 4 - 2
bsp/n32g452xx/n32g452xx-mini-system/rtconfig.h

@@ -84,6 +84,7 @@
 #define RT_SERIAL_USING_DMA
 #define RT_SERIAL_RB_BUFSZ 64
 #define RT_USING_PIN
+#define RT_USING_ADC
 #define RT_USING_PWM
 #define RT_USING_WDT
 
@@ -175,10 +176,11 @@
 
 /* Onboard Peripheral Drivers */
 
+#define BSP_USING_UART
+
 /* On-chip Peripheral Drivers */
 
-#define RT_USING_GPIO
-#define BSP_USING_UART
+#define BSP_USING_GPIO
 #define BSP_USING_UART1
 
 #endif