Mercurial > public > ostc4

diff Small_CPU/Src/externalInterface.c @ 988:d9290c76b840 GasConsumption

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
OSTC4/5 joined code: In the previous version code differences between OSTC4/5 were identified using the ENABLE_GPIO_V2 compiler switch. In the new version this is done using the display version as indicator which OSTC model is in used. Since this is detected by Firmware the information is forwarded from there to the RTE. This causes a little delay in the GPIO initialization but this applies only to the cold start of the RTE which should not happen very often.
author ideenmodellierer
date Sun, 06 Apr 2025 21:02:17 +0200 (3 weeks ago)
parents 0b81ac558e89
children
line wrap: on
line diff
--- a/Small_CPU/Src/externalInterface.c	Sat Mar 29 14:56:08 2025 +0100
+++ b/Small_CPU/Src/externalInterface.c	Sun Apr 06 21:02:17 2025 +0200
@@ -401,7 +401,7 @@
 #ifdef ENABLE_CO2_SUPPORT
 					|| ((externalAutoDetect >= DETECTION_CO2_0) && (externalAutoDetect <= DETECTION_CO2_3))
 #endif
-#ifdef ENABLE_GNSS_SUPPORT
+#ifdef ENABLE_GNSS_EXTERN
 					|| ((externalAutoDetect >= DETECTION_GNSS_0) && (externalAutoDetect <= DETECTION_GNSS_3))
 #endif
 
@@ -672,7 +672,7 @@
 {
 	static uint8_t sensorIndex = 0;
 	static uint8_t uartMuxChannel = 0;
-#ifdef ENABLE_GNSS_SUPPORT
+#ifdef ENABLE_GNSS_EXTERN
 static	uint8_t detectionDelayCnt = 0;
 #endif
 	uint8_t index = 0;
@@ -829,7 +829,7 @@
 			case DETECTION_CO2_3:	if(uartCo2_isSensorConnected())
 									{
 										foundSensorMap[EXT_INTERFACE_MUX_OFFSET + activeUartChannel] = SENSOR_CO2;
-#ifdef ENABLE_GNSS_SUPPORT
+#ifdef ENABLE_GNSS_EXTERN
 										externalAutoDetect = DETECTION_GNSS_0;	/* only one CO2 sensor supported */
 #else
 										externalAutoDetect = DETECTION_DONE;	/* only one CO2 sensor supported */
@@ -852,8 +852,8 @@
 									{
 
 
-#if defined ENABLE_SENTINEL_MODE || defined ENABLE_GNSS_SUPPORT
-#ifdef ENABLE_GNSS_SUPPORT
+#if defined ENABLE_SENTINEL_MODE || defined ENABLE_GNSS_EXTERN
+#ifdef ENABLE_GNSS_EXTERN
 										externalAutoDetect = DETECTION_GNSS_0;
 										externalInterface_SwitchUART(EXT_INTERFACE_UART_GNSS);
 #else
@@ -867,7 +867,7 @@
 									}
 #endif
 
-#ifdef ENABLE_GNSS_SUPPORT
+#ifdef ENABLE_GNSS_EXTERN
 									if(externalAutoDetect == DETECTION_GNSS_0)
 									{
 										tmpSensorMap[uartMuxChannel + EXT_INTERFACE_MUX_OFFSET] = SENSOR_NONE;
@@ -1251,7 +1251,7 @@
 				case SENSOR_CO2:	uartCo2_Control();
 					break;
 #endif
-#ifdef ENABLE_GNSS_SUPPORT
+#ifdef ENABLE_GNSS_EXTERN
 				case SENSOR_GNSS:	uartGnss_Control();
 						break;
 #endif