From a9e8f3c52cb1557ddf77e009ff61056f17421d97 Mon Sep 17 00:00:00 2001 From: SnickerSun Date: Mon, 16 Dec 2024 11:24:58 +0800 Subject: [PATCH] =?utf8?q?=E8=A7=A3=E5=86=B322=20W9=20gnss=E7=BC=96?= =?utf8?q?=E8=AF=91=E4=B8=8D=E8=BF=87=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- code/sdk/build/config/target_config/brandy/config.py | 6 ++++-- .../drivers/boards/brandy_evb/board_config/board_u8.h | 10 +++------- .../drivers/chips/brandy/porting/uart/uart_porting.c | 9 +++++---- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py index cf7874e4a..151b626d5 100644 --- a/code/sdk/build/config/target_config/brandy/config.py +++ b/code/sdk/build/config/target_config/brandy/config.py @@ -403,10 +403,11 @@ target = { 'SUPPORT_AUTO_OTA_SERVER', 'CONFIG_DFX_SUPPORT_DIAG_UP_MACHINE=1', 'TPTYPE_CST86XX', + 'GNSS_UART1', 'NANDFLASH_F35UQA' ], #添加自定义应用 - 'ram_component': ['custom_cmd_service'] + 'ram_component': ['custom_cmd_service','gnss','custom_utils'] }, 'brandy-native-js-w9-r': { 'base_target_name': 'brandy-native-js-r', @@ -437,10 +438,11 @@ target = { 'CONFIG_DFX_SUPPORT_DIAG_UP_MACHINE=1', 'GPS_CAT1_RESET_TEST', 'TPTYPE_CST86XX', + 'GNSS_UART1', 'NANDFLASH_F35UQA' ], #添加自定义应用 - 'ram_component': ['custom_cmd_service'] + 'ram_component': ['custom_cmd_service','gnss','custom_utils'] }, 'brandy-native-js-lt22-r': { 'base_target_name': 'brandy-native-js-r', diff --git a/code/sdk/drivers/boards/brandy_evb/board_config/board_u8.h b/code/sdk/drivers/boards/brandy_evb/board_config/board_u8.h index 73532fa62..e7dbd2ea1 100644 --- a/code/sdk/drivers/boards/brandy_evb/board_config/board_u8.h +++ b/code/sdk/drivers/boards/brandy_evb/board_config/board_u8.h @@ -111,12 +111,10 @@ const hal_pio_config_t g_pio_function_config[PIN_MAX_NUMBER] = { { HAL_PIO_FUNC_I2C2_M1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE }, // S_MGPIO16 I2C2 SDA Sensor { HAL_PIO_FUNC_I2C3_M1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE }, // S_MGPIO17 i2c3 SCL smart pa\ 预留马达控制 \安全芯片 { HAL_PIO_FUNC_I2C3_M1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE }, // S_MGPIO18 I2C3 SDA - { HAL_PIO_FUNC_UART1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE }, // S_MGPIO19 uart1 tx + { HAL_PIO_FUNC_UART1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_DISABLE }, // S_MGPIO19 uart1 tx { HAL_PIO_FUNC_UART1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_ENBALE }, // S_MGPIO20 uart1 rx - // { HAL_PIO_FUNC_UART1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE }, // S_MGPIO21 uart1 rts - // { HAL_PIO_FUNC_UART1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE }, // S_MGPIO22 uart1 cts - { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE }, // S_MGPIO21 uart1 rts - { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE }, // S_MGPIO22 uart1 cts + { HAL_PIO_FUNC_UART1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_ENBALE }, // S_MGPIO21 uart1 rts + { HAL_PIO_FUNC_UART1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_ENBALE }, // S_MGPIO22 uart1 cts { HAL_PIO_FUNC_SPI2_M1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE }, // S_MGPIO23 NC { HAL_PIO_FUNC_SPI2_M1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE }, // S_MGPIO24 NC { HAL_PIO_FUNC_SPI2_M1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE }, // S_MGPIO25 NC @@ -269,8 +267,6 @@ const hal_gpio_config_t g_gpio_function_config[PIN_MAX_NUMBER] = { { S_AGPIO_L23, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_HIGH, 0, NULL }, //GPS_BAT_ON { S_AGPIO_L28, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_HIGH, 0, NULL }, //GPS_1V8 { S_AGPIO_L30, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_HIGH, 0, NULL }, //S_AGPIO_L30 - { S_MGPIO21, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_LOW, 0, NULL }, //S_MGPIO21 - { S_MGPIO22, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_LOW, 0, NULL }, //S_MGPIO22 // S_AGPIO_L17 HX3507_INT // { S_AGPIO_L17, HAL_GPIO_DIRECTION_INPUT, HAL_GPIO_LEVEL_LOW, 0, NULL }, 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 48c87689c..543209b5a 100644 --- a/code/sdk/drivers/chips/brandy/porting/uart/uart_porting.c +++ b/code/sdk/drivers/chips/brandy/porting/uart/uart_porting.c @@ -37,6 +37,10 @@ #include "SEGGER_RTT.h" #endif +#if defined(SUPPORT_GNSS_SERVER) +#include "uart_gnss.h" +#endif + #ifdef BUILD_APPLICATION_SSB #define UART_RX_BUFFER_SIZE 1 #else @@ -261,7 +265,7 @@ void log_factory_at_callback(const void *buffer, uint16_t length, bool remaining #if defined(GNSS_UART1) && defined(SUPPORT_GNSS_SERVER) if (is_gnss_on()) { - gnss_receive_handler((uint8_t *)buf,buf_len); + gnss_receive_handler((uint8_t *)buffer,length); hal_uart_clear_pending(UART_BUS_1); }else{ #endif @@ -330,9 +334,6 @@ void irq_uart1_handler(void) #ifdef SUPPORT_AT_CMD -#if defined(SUPPORT_GNSS_SERVER) -#include "uart_gnss.h" -#endif static void at_cmd_uart_rx_callback(const void *buf, uint16_t buf_len, bool remaining) { unused(remaining); -- 2.17.1