Mercurial > public > ostc4

changeset 920:c4c9850a2039 Evo_2_23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Ideenmodellierer
date Sun, 03 Nov 2024 15:44:54 +0100
parents c0553dd70608
children eb4109d7d1e9
files Common/Inc/configuration.h Common/Inc/data_central.h Discovery/Src/data_exchange_main.c Discovery/Src/t7.c Discovery/Src/tMenuEditHardware.c
diffstat 5 files changed, 16 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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 */
 
--- 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;
--- 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;
 	}
--- 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
--- 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;