From c47aaa6cbafae052554f6675687dd6043283df91 Mon Sep 17 00:00:00 2001
From: wgzAIIT <820906721@qq.com>
Date: Wed, 29 Jun 2022 17:04:02 +0800
Subject: [PATCH] e22lora branch update nuttx10.3

---
 APP_Framework/Framework/connection/lora/e22/Kconfig       | 4 ++--
 .../arm/stm32/stm32f4discovery/configs/loransh/defconfig  | 4 ++--
 .../nuttx/boards/arm/stm32/stm32f4discovery/src/Make.defs | 8 ++------
 .../boards/arm/stm32/stm32f4discovery/src/stm32_gpio.c    | 2 +-
 .../arm/stm32/stm32f4discovery/src/stm32f4discovery.h     | 4 ++--
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/APP_Framework/Framework/connection/lora/e22/Kconfig b/APP_Framework/Framework/connection/lora/e22/Kconfig
index 1d14e5614..093d3ecd0 100644
--- a/APP_Framework/Framework/connection/lora/e22/Kconfig
+++ b/APP_Framework/Framework/connection/lora/e22/Kconfig
@@ -10,11 +10,11 @@ if ADD_NUTTX_FETURES
 
     config ADAPTER_E22_M0_PATH
         string "E22 M0 pin device"
-        default "/dev/gpout0"
+        default "/dev/gpio0"
 
     config ADAPTER_E22_M1_PATH
         string "E22 M1 pin device"
-        default "/dev/gpout1"
+        default "/dev/gpio1"
     
 
     config ADAPTER_E22_DRIVER
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/configs/loransh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/configs/loransh/defconfig
index 70977dbae..28cee0bd3 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/configs/loransh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/configs/loransh/defconfig
@@ -64,7 +64,7 @@ CONFIG_CONNECTION_FRAMEWORK_DEBUG=y
 CONFIG_CONNECTION_ADAPTER_LORA=y
 CONFIG_ADAPTER_E22=y
 CONFIG_ADAPTER_LORA_E22="e22"
-CONFIG_ADAPTER_E22_M0_PATH="/dev/gpout0"
-CONFIG_ADAPTER_E22_M1_PATH="/dev/gpout1"
+CONFIG_ADAPTER_E22_M0_PATH="/dev/gpio0"
+CONFIG_ADAPTER_E22_M1_PATH="/dev/gpio1"
 CONFIG_ADAPTER_E22_DRIVER="/dev/ttyS3"
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/src/Make.defs b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/src/Make.defs
index 8d443706a..0261b1ddb 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/src/Make.defs
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/src/Make.defs
@@ -20,7 +20,7 @@
 
 include $(TOPDIR)/Make.defs
 
-CSRCS = stm32_boot.c stm32_bringup.c stm32_spi.c
+CSRCS = stm32_boot.c stm32_bringup.c stm32_spi.c stm32_perfcount.c
 
 ifeq ($(CONFIG_ARCH_LEDS),y)
 CSRCS += stm32_autoleds.c
@@ -28,10 +28,6 @@ else
 CSRCS += stm32_userleds.c
 endif
 
-ifeq ($(CONFIG_SCHED_CRITMONITOR),y)
-CSRCS += stm32_critmon.c
-endif
-
 ifeq ($(CONFIG_AUDIO_CS43L22),y)
 CSRCS += stm32_cs43l22.c
 endif
@@ -40,7 +36,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS +=  stm32_buttons.c
 endif
 
-ifeq ($(CONFIG_CAN),y)
+ifeq ($(CONFIG_STM32_CAN_CHARDRIVER),y)
 CSRCS += stm32_can.c
 endif
 
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/src/stm32_gpio.c b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/src/stm32_gpio.c
index b537e8641..44125a346 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/src/stm32_gpio.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/src/stm32_gpio.c
@@ -22,7 +22,7 @@
 * @file stm32_goio.c
 * @brief nuttx source code
 *                https://github.com/apache/incubator-nuttx.git
-* @version 10.2.0 
+* @version 10.3.0 
 * @author AIIT XUOS Lab
 * @date 2022-05-19
 */
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h
index 1a268f7fb..3ab4daac2 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h
@@ -22,7 +22,7 @@
 * @file stm32f4discovery.h
 * @brief nuttx source code
 *                https://github.com/apache/incubator-nuttx.git
-* @version 10.2.0 
+* @version 10.3.0 
 * @author AIIT XUOS Lab
 * @date 2022-05-19
 */
@@ -583,7 +583,7 @@ int stm32_pwm_setup(void);
  *
  ****************************************************************************/
 
-#ifdef CONFIG_CAN
+#ifdef CONFIG_STM32_CAN_CHARDRIVER
 int stm32_can_setup(void);
 #endif