# HG changeset patch # User Ideenmodellierer # Date 1730645094 -3600 # Node ID c4c9850a203953254879fbbbf3aa34c524759849 # Parent c0553dd706084b909c54ba57b004ad41e1897344 Added view for position data: A custom view for visualization of GPS data has been added. It may be activated using the compile switch ENABLE_GNSS_SUPPORT diff -r c0553dd70608 -r c4c9850a2039 Common/Inc/configuration.h --- a/Common/Inc/configuration.h Sun Nov 03 15:43:04 2024 +0100 +++ b/Common/Inc/configuration.h Sun Nov 03 15:44:54 2024 +0100 @@ -72,6 +72,9 @@ /* Enable to have CO2 sensor functionality available */ #define ENABLE_CO2_SUPPORT +/* Enable to have GPS sensor functionality available */ +/* #define ENABLE_GNSS_SUPPORT */ + /* Enable to have Sentinel rebreather interface available */ /* #define ENABLE_SENTINEL_MODE */ diff -r c0553dd70608 -r c4c9850a2039 Common/Inc/data_central.h --- a/Common/Inc/data_central.h Sun Nov 03 15:43:04 2024 +0100 +++ b/Common/Inc/data_central.h Sun Nov 03 15:44:54 2024 +0100 @@ -469,6 +469,8 @@ SENSOR_TYPE_O2_END, SENSOR_CO2, SENSOR_CO2M, + SENSOR_GNSS, + SENSOR_GNSSM, SENSOR_MUX, SENSOR_END } externalInterfaceSensorType; diff -r c0553dd70608 -r c4c9850a2039 Discovery/Src/data_exchange_main.c --- a/Discovery/Src/data_exchange_main.c Sun Nov 03 15:43:04 2024 +0100 +++ b/Discovery/Src/data_exchange_main.c Sun Nov 03 15:44:54 2024 +0100 @@ -411,6 +411,10 @@ break; case SENSOR_CO2: SensorActive[SENSOR_CO2] = 1; break; +#ifdef ENABLE_GNSS_SUPPORT + case SENSOR_GNSS: SensorActive[SENSOR_GNSS] = 1; + break; +#endif #ifdef ENABLE_SENTINEL_MODE case SENSOR_SENTINEL: SensorActive[SENSOR_SENTINEL] = 1; break; @@ -424,7 +428,7 @@ { externalInterface_Cmd |= EXT_INTERFACE_ADC_ON | EXT_INTERFACE_33V_ON; } - if((SensorActive[SENSOR_DIGO2]) || (SensorActive[SENSOR_CO2])) + if((SensorActive[SENSOR_DIGO2]) || (SensorActive[SENSOR_CO2])|| (SensorActive[SENSOR_GNSS])) { externalInterface_Cmd |= EXT_INTERFACE_33V_ON; } diff -r c0553dd70608 -r c4c9850a2039 Discovery/Src/t7.c --- a/Discovery/Src/t7.c Sun Nov 03 15:43:04 2024 +0100 +++ b/Discovery/Src/t7.c Sun Nov 03 15:44:54 2024 +0100 @@ -146,7 +146,7 @@ CVIEW_Charger, CVIEW_CcrSummary, CVIEW_Timer, -#ifdef ENABLE_GNSS +#ifdef ENABLE_GNSS_SUPPORT CVIEW_Position, #endif CVIEW_END diff -r c0553dd70608 -r c4c9850a2039 Discovery/Src/tMenuEditHardware.c --- a/Discovery/Src/tMenuEditHardware.c Sun Nov 03 15:43:04 2024 +0100 +++ b/Discovery/Src/tMenuEditHardware.c Sun Nov 03 15:44:54 2024 +0100 @@ -474,8 +474,12 @@ break; case SENSOR_SENTINEL: case SENSOR_SENTINELM: strSensorId[3] = 'S'; - strSensorId[4] = 'e'; + strSensorId[4] = 'e'; break; + case SENSOR_GNSS: + case SENSOR_GNSSM: strSensorId[3] = 'G'; + strSensorId[4] = 'N'; + break; default: strSensorId[5] = 0; break;