# HG changeset patch # User Ideenmodellierer # Date 1732651273 -3600 # Node ID 908d9a8e8c84657a09e99df7f4e81059362b8ca8 # Parent 87593327205679cf2644e5cabd4063eac8f5391a Cleanup Internal Uart: The internal UART was using the wrong UART RX channel. In addition the compile switches have been updated to allow GNSS data flow if new GPIO config is available or if GNSS is enabled for the external UART. diff -r 875933272056 -r 908d9a8e8c84 Common/Inc/configuration.h --- a/Common/Inc/configuration.h Thu Nov 14 20:13:18 2024 +0100 +++ b/Common/Inc/configuration.h Tue Nov 26 21:01:13 2024 +0100 @@ -73,7 +73,7 @@ #define ENABLE_CO2_SUPPORT /* Enable to have GPS sensor functionality available */ -#define ENABLE_GNSS_SUPPORT +/* #define ENABLE_GNSS_SUPPORT */ /* Enable to have Sentinel rebreather interface available */ /* #define ENABLE_SENTINEL_MODE */ diff -r 875933272056 -r 908d9a8e8c84 Discovery/Src/data_exchange_main.c --- a/Discovery/Src/data_exchange_main.c Thu Nov 14 20:13:18 2024 +0100 +++ b/Discovery/Src/data_exchange_main.c Tue Nov 26 21:01:13 2024 +0100 @@ -411,7 +411,7 @@ break; case SENSOR_CO2: SensorActive[SENSOR_CO2] = 1; break; -#ifdef ENABLE_GNSS_SUPPORT +#if defined ENABLE_GPIO_V2 || defined ENABLE_GNSS_SUPPORT case SENSOR_GNSS: SensorActive[SENSOR_GNSS] = 1; break; #endif diff -r 875933272056 -r 908d9a8e8c84 Discovery/Src/t7.c --- a/Discovery/Src/t7.c Thu Nov 14 20:13:18 2024 +0100 +++ b/Discovery/Src/t7.c Tue Nov 26 21:01:13 2024 +0100 @@ -146,7 +146,7 @@ CVIEW_Charger, CVIEW_CcrSummary, CVIEW_Timer, -#ifdef ENABLE_GNSS_SUPPORT +#if defined ENABLE_GPIO_V2 || defined ENABLE_GNSS_SUPPORT CVIEW_Position, #endif CVIEW_END diff -r 875933272056 -r 908d9a8e8c84 Small_CPU/Src/uart_Internal.c --- a/Small_CPU/Src/uart_Internal.c Thu Nov 14 20:13:18 2024 +0100 +++ b/Small_CPU/Src/uart_Internal.c Tue Nov 26 21:01:13 2024 +0100 @@ -189,7 +189,7 @@ { if(dmaRx6Active == 0) { - UART_StartDMA_Receiption(); + UART6_StartDMA_Receiption(); } memcpy(tx6Buffer, cmd, len); if(HAL_OK == HAL_UART_Transmit_DMA(&huart6,tx6Buffer,len))