From: SnickerSun <snickersun@163.com>
Date: Thu, 9 Jan 2025 13:23:27 +0000 (+0800)
Subject: 解决L22 GNSS不工作问题，修正HSUART与GNSS通讯问题
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=722bd5219f87ee696d6a83528d7c679e4f0cce6a;p=mirrors%2FFD230.git

解决L22 GNSS不工作问题，修正HSUART与GNSS通讯问题
---

diff --git a/code/sdk/application/wstp/at_service/app/app_at_process.c b/code/sdk/application/wstp/at_service/app/app_at_process.c
index 9231462b1..ed53269d9 100644
--- a/code/sdk/application/wstp/at_service/app/app_at_process.c
+++ b/code/sdk/application/wstp/at_service/app/app_at_process.c
@@ -1962,7 +1962,7 @@ uint32_t gps_on(uint8_t *data, uint32_t data_len)
 
     }else if (mode == 3)  {
         wstp_print("3 gnss_poweron\r\n");
-        gnss_power_on;
+        gnss_power_on();
     }else if (mode == 4)  {
         wstp_print("4 gnss_poweroff\r\n");
         gnss_power_off();
diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index 45cc7286b..556613d0f 100644
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -467,7 +467,7 @@ target = {
                     'SINGLE_USER_PARTITION',
                     'TEST_GPS_UI',
                     'BOARD_U8',
-                    'GNSS_UART0',
+                    'SUPPORT_GNSS',
                     'SUPPORT_AUTO_OTA_SERVER', 
                     'CONFIG_DFX_SUPPORT_DIAG_UP_MACHINE=1',
                     'TPTYPE_CST86XX',
@@ -578,7 +578,7 @@ target = {
                     #'ENABLE_WEBSOCKET',
                     'SINGLE_USER_PARTITION',
                     'BOARD_W9',
-                    'GNSS_UART1',
+                    'SUPPORT_GNSS',
                     'SUPPORT_AUTO_OTA_SERVER', 
                     'CONFIG_DFX_SUPPORT_DIAG_UP_MACHINE=1',
                     'TPTYPE_CST86XX',
@@ -684,10 +684,10 @@ target = {
                     #'ENABLE_WEBSOCKET',
                     'SINGLE_USER_PARTITION',
                     'BOARD_L22',
-					# 'FT_SINGLE_UART',
-                    'GNSS_UART1',
-                    # 'DISABLE_UART_LOG',
-                    # 'CONFIG_GNSS_UART_WITH_FLOWCTRL',
+					'FT_SINGLE_UART',
+                    'SUPPORT_GNSS',
+                    'DISABLE_UART_LOG',
+                    'CONFIG_GNSS_UART_WITH_FLOWCTRL',
                     'DOWNLOAD_GNSS_SWITCH',
                     'SUPPORT_AUTO_OTA_SERVER', 
                     'CONFIG_DFX_SUPPORT_DIAG_UP_MACHINE=1',
diff --git a/code/sdk/drivers/boards/brandy_evb/board_config/board_lt22.h b/code/sdk/drivers/boards/brandy_evb/board_config/board_lt22.h
index 66cb658bc..709d2dabf 100644
--- a/code/sdk/drivers/boards/brandy_evb/board_config/board_lt22.h
+++ b/code/sdk/drivers/boards/brandy_evb/board_config/board_lt22.h
@@ -142,8 +142,8 @@ const hal_pio_config_t g_pio_function_config[PIN_MAX_NUMBER] = {
 #endif
     { HAL_PIO_FUNC_UART_HS_UART, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE }, // S_MGPIO33 huart tx
     { HAL_PIO_FUNC_UART_HS_UART, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_ENBALE },   // S_MGPIO34 huart rx
-    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },  // S_MGPIO35
-    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },  // S_MGPIO36
+    { HAL_PIO_FUNC_UART_HS_UART, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },  // S_MGPIO35
+    { HAL_PIO_FUNC_UART_HS_UART, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },  // S_MGPIO36
 #if 0
     { HAL_PIO_FUNC_UART2_M2, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },     // S_MGPIO37 uart tx
     { HAL_PIO_FUNC_UART2_M2, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_ENBALE },       // S_MGPIO38 uart rx
diff --git a/code/sdk/drivers/chips/brandy/include/platform_core.h b/code/sdk/drivers/chips/brandy/include/platform_core.h
index 0a40e63b4..ca609c58d 100644
--- a/code/sdk/drivers/chips/brandy/include/platform_core.h
+++ b/code/sdk/drivers/chips/brandy/include/platform_core.h
@@ -165,8 +165,11 @@
  * Maximum UART buses
  * Defined here rather than in the uart_bus_t enum, due to needing to use it for conditional compilation
  */
+#ifdef DISABLE_UART_LOG
+#define UART_BUS_MAX_NUMBER 3  // !< Max number of UARTS available
+#else
 #define UART_BUS_MAX_NUMBER 2  // !< Max number of UARTS available
-
+#endif
 #define I2C_BUS_MAX_NUMBER  4  // !< Max number of I2C available
 #define I2C_4_IRQn I2C_0_IRQN
 #define I2C_5_IRQn I2C_0_IRQN
@@ -217,11 +220,11 @@
 #endif
 #ifdef DISABLE_UART_LOG
 
-#define SW_DEBUG_UART_BUS UART_BUS_MAX_NUMBER
+#define SW_DEBUG_UART_BUS UART_BUS_2
 #define CHIP_FIXED_TX_PIN PIN_NONE
 #define CHIP_FIXED_RX_PIN PIN_NONE
 
-#define LOG_UART_BUS UART_BUS_MAX_NUMBER
+#define LOG_UART_BUS UART_BUS_2
 #define LOG_UART_TX_PIN PIN_NONE
 #define LOG_UART_RX_PIN PIN_NONE
 #else
diff --git a/code/sdk/drivers/chips/brandy/porting/uart/uart_porting.c b/code/sdk/drivers/chips/brandy/porting/uart/uart_porting.c
index 2150f8975..50a019b42 100644
--- a/code/sdk/drivers/chips/brandy/porting/uart/uart_porting.c
+++ b/code/sdk/drivers/chips/brandy/porting/uart/uart_porting.c
@@ -96,6 +96,9 @@ uintptr_t uart_porting_base_addr_get(uart_bus_t bus)
 static bool g_sw_debug_uart_enabled = false;
 uint8_t g_uart0_rx_buffer[UART_RX_BUFFER_SIZE];
 uint8_t g_uart1_rx_buffer[UART_RX_BUFFER_SIZE];
+#ifdef DISABLE_UART_LOG
+uint8_t g_uart2_rx_buffer[UART_RX_BUFFER_SIZE];
+#endif
 #if defined(SUPPORT_AT_CMD)
 static void at_cmd_uart_rx_callback(const void *buf, uint16_t buf_len, bool remaining);
 #endif
@@ -209,23 +212,7 @@ static uart_config_t g_uart_config[UART_BUS_MAX_NUMBER] = {
     },
     /* UART_BUS_1 is used to hso uart */
     {
-        #ifdef GNSS_UART1
-        {
-            .tx_pin = PIN_NONE,
-            .rx_pin = PIN_NONE,
-            .cts_pin = PIN_NONE,
-            .rts_pin = PIN_NONE
-        },
-        {
-            .tx_pin_mode = (pin_mode_t)HAL_PIO_FUNC_MAX,
-            .rx_pin_mode = (pin_mode_t)HAL_PIO_FUNC_MAX,
-            .cts_pin_mode = (pin_mode_t)HAL_PIO_FUNC_MAX,
-            .rts_pin_mode = (pin_mode_t)HAL_PIO_FUNC_MAX
-        },
-            RESERVED_80_IRQn,
-            NULL,
-            NULL,
-        #else
+       
         {
             .tx_pin = S_MGPIO33,
             .rx_pin = S_MGPIO34,
@@ -247,7 +234,6 @@ static uart_config_t g_uart_config[UART_BUS_MAX_NUMBER] = {
 #else
         log_factory_at_callback,
 #endif
-        #endif
         {
             .baud_rate = CUSTOM_UART_RATE,
             .data_bits = UART_DATA_BIT_8,
@@ -261,6 +247,41 @@ static uart_config_t g_uart_config[UART_BUS_MAX_NUMBER] = {
         NULL,
         false
     }
+#ifdef DISABLE_UART_LOG
+    ,
+    /* UART_BUS_2 is used to hso uart */
+    {
+       
+        {
+            .tx_pin = PIN_NONE,
+            .rx_pin = PIN_NONE,
+            .cts_pin = PIN_NONE,
+            .rts_pin = PIN_NONE
+        },
+        {
+            .tx_pin_mode = (pin_mode_t)HAL_PIO_FUNC_MAX,
+            .rx_pin_mode = (pin_mode_t)HAL_PIO_FUNC_MAX,
+            .cts_pin_mode = (pin_mode_t)HAL_PIO_FUNC_MAX,
+            .rts_pin_mode = (pin_mode_t)HAL_PIO_FUNC_MAX
+        },
+        RESERVED_80_IRQn,
+        NULL,
+        NULL,
+        {
+            .baud_rate = CUSTOM_UART_RATE,
+            .data_bits = UART_DATA_BIT_8,
+            .parity = UART_PARITY_NONE,
+            .stop_bits = UART_STOP_BIT_1,
+        },
+        {
+            .rx_buffer_size = UART_RX_BUFFER_SIZE,
+            .rx_buffer = g_uart2_rx_buffer,
+        },
+        NULL,
+        false
+    }
+
+#endif
 #endif
 };
 static uart_recovery_regs_t g_uart_recovery_reg[UART_BUS_MAX_NUMBER] = { 0 };
diff --git a/code/sdk/middleware/chips/brandy/pm/service/pm_sleep.c b/code/sdk/middleware/chips/brandy/pm/service/pm_sleep.c
index fffdb5e12..52c09fdc8 100644
--- a/code/sdk/middleware/chips/brandy/pm/service/pm_sleep.c
+++ b/code/sdk/middleware/chips/brandy/pm/service/pm_sleep.c
@@ -273,7 +273,7 @@ static void pm_enter_deep_sleep(void)
     lpc_forbid_deepsleep();
 #endif
 
-#ifndef GNSS_UART1
+#ifndef SUPPORT_GNSS
 #ifndef FT_SINGLE_UART
     uint16_t status = pmu_lpm_wakeup_get_status(LPM_EVT_ACTION, PMU_LPM_MCPU_UART_H1_RX_WAKEUP);
 #else
diff --git a/code/sdk/zhihui/UI/producttest/src/testGPS.cpp b/code/sdk/zhihui/UI/producttest/src/testGPS.cpp
index f712ad6d3..bdba8a29d 100644
--- a/code/sdk/zhihui/UI/producttest/src/testGPS.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testGPS.cpp
@@ -5,7 +5,7 @@
 #include "AlarmClockModel.h"
 #include "cmsis_os2.h"
         
-#if defined(GNSS_UART1) || defined(GNSS_UART0)
+#if defined(SUPPORT_GNSS)
 
 #include "NMEA0183.h"
 // code/sdk/zhihui/services/gnss/inc/.h
diff --git a/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp b/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp
index e7e05653c..58f623ac8 100644
--- a/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp
@@ -28,7 +28,7 @@
 
 #include "custom_runtime.h"
 
-#if defined(GNSS_UART1) || defined(GNSS_UART0)
+#if defined(SUPPORT_GNSS)
 #include "gnss_ctl.h"
 #endif
 
@@ -347,7 +347,7 @@ namespace OHOS
 
         #endif
 
-        #if defined(GNSS_UART1) || defined(GNSS_UART0)
+        #if defined(SUPPORT_GNSS)
         if (strcmp(view.GetViewId(), GPS_OPEN_CONFIRM_BUTTON) == 0)
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GPS On OnClick");
diff --git a/code/sdk/zhihui/UI/producttest/src/testView.cpp b/code/sdk/zhihui/UI/producttest/src/testView.cpp
index 4a870cab6..346c9c2b2 100644
--- a/code/sdk/zhihui/UI/producttest/src/testView.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testView.cpp
@@ -44,7 +44,7 @@ namespace OHOS
         {SEChipTest,"SEChipTestbutton","SEChipTest","SEChipTestbutton_next" ,&testView::ChangeSEChipTESTView,true},
         {PingTest,"PingTestbutton","PingTest","PingTestbutton_next" ,&testView::ChangePingTESTView,true},
 
-#if defined(GNSS_UART1) || defined(GNSS_UART0)
+#if defined(SUPPORT_GNSS)
         {GPSTEST,"GPSTestbutton","GPSTest","GPSTestbutton_next" ,&testView::ChangeGPSTESTView,true},
 #endif
     #ifdef AGINGTEST
@@ -630,7 +630,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
     
     bool testView::ChangeGPSTESTView(int16_t thisView)
     {
-#if defined(GNSS_UART1) || defined(GNSS_UART0)
+#if defined(SUPPORT_GNSS)
         if (SystemScrollView[thisView] == nullptr)
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeSEChipTESTView");
@@ -819,7 +819,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 test_Ping_view = nullptr;
                 SystemScrollView[hideView]=nullptr;
                 break;
-#if defined(GNSS_UART1) || defined(GNSS_UART0)
+#if defined(SUPPORT_GNSS)
             case GPSTEST:
                 RootView::GetInstance()->Remove(SystemScrollView[hideView]);
                 delete test_GPS_view;  
diff --git a/code/sdk/zhihui/services/gnss/driver/common/interface/board_interface/board_porting/tiot_board_pin_port.h b/code/sdk/zhihui/services/gnss/driver/common/interface/board_interface/board_porting/tiot_board_pin_port.h
index 48b652869..208d32539 100644
--- a/code/sdk/zhihui/services/gnss/driver/common/interface/board_interface/board_porting/tiot_board_pin_port.h
+++ b/code/sdk/zhihui/services/gnss/driver/common/interface/board_interface/board_porting/tiot_board_pin_port.h
@@ -29,22 +29,43 @@ extern "C" {
  */
 #define TIOT_PIN_NONE        0xFFFFFFFFU
 
-#if defined(GNSS_UART1)
-#define TIOT_UART_PORT  UART_BUS_1
-#else
-#define TIOT_UART_PORT  UART_BUS_0
-#endif
-
 #ifdef BOARD_U8
-#define TIOT_PIN_UART_WAKEUP_NUM    S_AGPIO_L31    /* 用于uart rx唤醒. */
+#define TIOT_UART_PORT  UART_BUS_0
+#define TIOT_PIN_WAKEUP_HOST_NUM    TIOT_PIN_NONE    /* 用于唤醒HOST. */
+#define TIOT_PIN_WAKEUP_GNSS_NUM    S_AGPIO_L31    /* 用于 唤醒GNSS. */
 #define TIOT_PIN_POWER      S_AGPIO_L30     /* 用于开启GNSS. */
+
+#define TIOT_PIN_UART_TX    S_MGPIO19
+#define TIOT_PIN_UART_RX    S_MGPIO20
+#define TIOT_PIN_UART_CTS   S_MGPIO22
+#define TIOT_PIN_UART_RTS   S_MGPIO21
+#define TIOT_PINMUX HAL_PIO_FUNC_UART1
+
 #elif defined(BOARD_L22) || defined(BOARD_W9)
-#define TIOT_PIN_UART_WAKEUP_NUM    S_AGPIO_L15    /* 用于uart rx唤醒. */
+#define TIOT_UART_PORT  UART_BUS_1
+#define TIOT_PIN_WAKEUP_HOST_NUM    S_AGPIO_L15    /* 用于唤醒HOST. */
+#define TIOT_PIN_WAKEUP_GNSS_NUM    S_HGPIO0    /* 用于 唤醒GNSS. */
 #define TIOT_PIN_POWER      S_AGPIO_L32     /* 用于开启GNSS. */
+
+#define TIOT_PIN_UART_TX    S_MGPIO33
+#define TIOT_PIN_UART_RX    S_MGPIO34
+#define TIOT_PIN_UART_CTS   S_MGPIO36
+#define TIOT_PIN_UART_RTS   S_MGPIO35
+#define TIOT_PINMUX HAL_PIO_FUNC_UART_HS_UART
+
 #else
+#define TIOT_PIN_WAKEUP_HOST_NUM    TIOT_PIN_NONE    /* 用于唤醒HOST. */
+#define TIOT_PIN_WAKEUP_GNSS_NUM    TIOT_PIN_NONE    /* 用于 唤醒GNSS. */
 #define TIOT_PIN_POWER      TIOT_PIN_NONE     /* 用于开启GNSS. */
-#define TIOT_PIN_UART_WAKEUP_NUM    0x80000000U    /* 用于uart rx唤醒. */
+#define TIOT_UART_PORT  UART_BUS_0
+#define TIOT_PIN_UART_TX    S_MGPIO19
+#define TIOT_PIN_UART_RX    S_MGPIO20
+#define TIOT_PIN_UART_CTS   S_MGPIO22
+#define TIOT_PIN_UART_RTS   S_MGPIO21
+#define TIOT_PINMUX HAL_PIO_FUNC_UART1
+
 #endif
+#define TIOT_PIN_UART_WAKEUP_NUM    0x80000000U    /* 用于uart rx唤醒. */
 /**
  * @brief  Pin level enum.
  */
diff --git a/code/sdk/zhihui/services/gnss/driver/product_porting/porting/gnss_board_port.c b/code/sdk/zhihui/services/gnss/driver/product_porting/porting/gnss_board_port.c
index 8dbe7e5fa..fc14d54b9 100644
--- a/code/sdk/zhihui/services/gnss/driver/product_porting/porting/gnss_board_port.c
+++ b/code/sdk/zhihui/services/gnss/driver/product_porting/porting/gnss_board_port.c
@@ -34,12 +34,8 @@ U8  GPS_1V8 S_AGPIO_L28   High  默认一直拉高
       可选，如果板级未连接此管脚，必须设为TIOT_PIN_NONE宏.
        */
 
-#if defined(GNSS_UART1)
-static const gnss_board_hw_info g_gnss_board_hw_info = { UART_BUS_1, { S_AGPIO_L32, TIOT_PIN_NONE, TIOT_PIN_NONE } };
-#else
-static const gnss_board_hw_info g_gnss_board_hw_info = { UART_BUS_0, { S_AGPIO_L30, TIOT_PIN_NONE, TIOT_PIN_NONE } };
-#endif
-//static const gnss_board_hw_info g_gnss_board_hw_info = { TIOT_UART_PORT, { TIOT_PIN_POWER, TIOT_PIN_UART_WAKEUP_NUM, TIOT_PIN_NONE } };
+
+static const gnss_board_hw_info g_gnss_board_hw_info = { TIOT_UART_PORT, { TIOT_PIN_POWER,TIOT_PIN_WAKEUP_GNSS_NUM , TIOT_PIN_WAKEUP_HOST_NUM } };
 static const gnss_board_info g_gnss_board_info = {
     .cfg_path = NULL,  /* 如果使用文件系统，此处填写固件cfg文件完整路径,
                           例如 .cfg_path = "user/gnss_firmware/gnss_fw_cfg";
diff --git a/code/sdk/zhihui/services/gnss/driver/product_porting/porting/tiot_board_pin_port.c b/code/sdk/zhihui/services/gnss/driver/product_porting/porting/tiot_board_pin_port.c
index aebb1c2a1..cb0f4d6b7 100644
--- a/code/sdk/zhihui/services/gnss/driver/product_porting/porting/tiot_board_pin_port.c
+++ b/code/sdk/zhihui/services/gnss/driver/product_porting/porting/tiot_board_pin_port.c
@@ -20,7 +20,7 @@ typedef struct {
 /* TIoT驱动使用中断管脚配置，需要按实际使用的中断管脚适配修改。 */
 static tiot_int_pin_map g_tiot_int_pin_map[TIOT_INT_PIN_NUMBER] = {
     /* 例如使用XXX唤醒MCU管脚，对应GPIO ID为S_AGPIO_R0. */
-    { S_AGPIO_R0, NULL }
+    { TIOT_PIN_WAKEUP_HOST_NUM, NULL }
 };
 
 /**
diff --git a/code/sdk/zhihui/services/gnss/driver/product_porting/porting/tiot_board_uart_port.c b/code/sdk/zhihui/services/gnss/driver/product_porting/porting/tiot_board_uart_port.c
index 5bb64ed38..1717c3963 100644
--- a/code/sdk/zhihui/services/gnss/driver/product_porting/porting/tiot_board_uart_port.c
+++ b/code/sdk/zhihui/services/gnss/driver/product_porting/porting/tiot_board_uart_port.c
@@ -7,6 +7,7 @@
  * 2023-03-25, Create file. \n
  */
 #include "tiot_board_uart_port.h"
+#include "tiot_board_pin_port.h"
 #include "tiot_board_log.h"
 
 #include "uart.h"
@@ -54,39 +55,12 @@ static tiot_board_uart_port g_tiot_board_uart_port[TIOT_UART_NUM] = {
     {
         .flow_ctrl_bk = TIOT_UART_ATTR_FLOW_CTRL_ENABLE,   /* MCU UART默认是否开启流控。 */
         .rx_buff = { 0 },
-#if defined(CONFIG_GNSS_UART_WITH_FLOWCTRL)
-#if defined(GNSS_UART1)
-        .pin_config_orig = { S_MGPIO33, S_MGPIO34, S_MGPIO35, S_MGPIO36 },   /* MCU UART管脚，按实际板级情况适配。 */
+        .pin_config_orig = { TIOT_PIN_UART_TX, TIOT_PIN_UART_RX, TIOT_PIN_UART_CTS,TIOT_PIN_UART_RTS },   /* MCU UART管脚，按实际板级情况适配。 */
         /* MCU UART管脚pinmux，按实际板级情况适配。 */
         .pinmux = {
-            HAL_PIO_FUNC_UART_HS_UART, HAL_PIO_FUNC_UART_HS_UART,
-            HAL_PIO_FUNC_UART_HS_UART, HAL_PIO_FUNC_UART_HS_UART
+            TIOT_PINMUX, TIOT_PINMUX,
+            TIOT_PINMUX, TIOT_PINMUX
         },  
-#else 
-        .pin_config_orig = { S_MGPIO19, S_MGPIO20, S_MGPIO21, S_MGPIO22 },   /* MCU UART管脚，按实际板级情况适配。 */
-        /* MCU UART管脚pinmux，按实际板级情况适配。 */
-        .pinmux = {
-            HAL_PIO_FUNC_UART1, HAL_PIO_FUNC_UART1,
-            HAL_PIO_FUNC_UART1, HAL_PIO_FUNC_UART1
-        },   
-#endif
-#else
-#if defined(GNSS_UART1)
-        .pin_config_orig = { S_MGPIO33, S_MGPIO34, PIN_NONE, PIN_NONE },   /* MCU UART管脚，按实际板级情况适配。 */
-        /* MCU UART管脚pinmux，按实际板级情况适配。 */
-        .pinmux = {
-            HAL_PIO_FUNC_UART_HS_UART, HAL_PIO_FUNC_UART_HS_UART,
-            HAL_PIO_FUNC_MAX, HAL_PIO_FUNC_MAX
-        },  
-#else 
-        .pin_config_orig = { S_MGPIO19, S_MGPIO20, PIN_NONE, PIN_NONE },   /* MCU UART管脚，按实际板级情况适配。 */
-        /* MCU UART管脚pinmux，按实际板级情况适配。 */
-        .pinmux = {
-            HAL_PIO_FUNC_UART1, HAL_PIO_FUNC_UART1,
-            HAL_PIO_FUNC_MAX, HAL_PIO_FUNC_MAX
-        },   
-#endif
-#endif
         .rx_callback = tiot_board_rx_callback0             /* MCU UART管脚接收回调，按TIoT驱动使用UART个数适配增加。 */
     }
     /* TIOT_UART_PORTx... */
@@ -96,11 +70,7 @@ static tiot_board_uart_port g_tiot_board_uart_port[TIOT_UART_NUM] = {
 static inline enum tiot_uart_port tiot_board_uart_bus_convert_port(uart_bus_t bus)
 {
     /* 例如 UART_BUS_0 对应 TIoT驱动使用的第一个UART。 */
-#if defined(GNSS_UART1)
-    if (bus == UART_BUS_1)
-#else
-    if (bus == UART_BUS_0) 
-#endif
+    if (bus == TIOT_UART_PORT)
     {
         return TIOT_UART_PORT0;
     }
diff --git a/code/sdk/zhihui/services/gnss/src/uart_gnss.c b/code/sdk/zhihui/services/gnss/src/uart_gnss.c
index e69a38046..024893b5a 100644
--- a/code/sdk/zhihui/services/gnss/src/uart_gnss.c
+++ b/code/sdk/zhihui/services/gnss/src/uart_gnss.c
@@ -29,6 +29,7 @@
 #include "custom_utils.h"
 #include "uart_gnss.h"
 #include "gnss_ctl.h"
+#include "tiot_board_pin_port.h"
 // errcode_t gnss_get_next_cmd(uint8_t cmd_index,uint8_t** cmdbuf,int *cmdlen);
 // errcode_t gnss_get_current_cmd(uint8_t cmd_index,uint8_t** cmdbuf,int *cmdlen);
 // errcode_t gnss_get_nmea_cfg_cmd(uint8_t** cmdbuf,int *cmdlen);
@@ -110,23 +111,11 @@ void do_gnss_cmd(int cmd,uint8_t *buffer,uint32_t size)
 
 uint32_t gnss_write_cmd(uint8_t * cmdbuf,uint16_t cmdlen)
 {
-#if defined(GNSS_UART0)
-    return uapi_uart_write(UART_BUS_0, cmdbuf, cmdlen,0);
-#elif defined (GNSS_UART1) 
-    return uapi_uart_write(UART_BUS_1, cmdbuf, cmdlen,0);
-#else
-    return 0;
-#endif
+    return uapi_uart_write(TIOT_UART_PORT, cmdbuf, cmdlen,0);
 }
 uint32_t gnss_data_read(uint8_t * cmdbuf,uint16_t cmdlen)
 {
-#if defined(GNSS_UART0)
-    return uapi_uart_read(UART_BUS_0, cmdbuf, cmdlen,0);
-#elif defined (GNSS_UART1) 
-    return uapi_uart_read(UART_BUS_1, cmdbuf, cmdlen,0);
-#else
-    return 0;
-#endif
+    return uapi_uart_read(TIOT_UART_PORT, cmdbuf, cmdlen,0);
 }
 static void uart_event_task(void const *arg)
 {