Mercurial > public > ostc4

diff Discovery/Src/tMenuEditHardware.c @ 783:c31237d20491

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update digital O2 sensor information: In the previous version only one digital O2 sensor was supported and the additional data could be accessed via a separate menu item. Because of the intraduction of the multiplexer there are three datasets available not. Because of the existing menu structure it was not possible to add additional menu items. To solve the problem the sensor information has been moved beghind the sensor On/Off functionality. When selecting a sensor the sensor data will be shown and the de-/activation of a sensor may be done in scope of the sensor information dialog.
author Ideenmodellierer
date Mon, 29 May 2023 20:26:38 +0200
parents 45b8f3c2acce
children acf6614dc396
line wrap: on
line diff
--- a/Discovery/Src/tMenuEditHardware.c	Mon May 29 20:22:15 2023 +0200
+++ b/Discovery/Src/tMenuEditHardware.c	Mon May 29 20:26:38 2023 +0200
@@ -28,6 +28,7 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include "tMenuEditHardware.h"
+#include "tMenuEdit.h"
 
 #include "externCPU2bootloader.h"
 #include "gfx_fonts.h"
@@ -78,7 +79,6 @@
 #define O2_CALIB_FRACTION_O2	(0.98F)
 
 static uint8_t	O2_calib_gas = 21;
-static uint8_t haveSensorInfo = 0;
 
 void openEdit_Hardware(uint8_t line)
 {
@@ -426,39 +426,26 @@
 		openEdit_O2Sensors();
 	}
 
-	if((pStateReal->lifeData.extIf_sensor_Id != 0) && (haveSensorInfo == 0)) /* the sensor is detected after the interface has been selected => add button if info become available */
-	{
-			haveSensorInfo = 1;
-		    openEdit_O2Sensors();
-	}
-	else
-	{
-		if(pStateReal->lifeData.extIf_sensor_Id == 0)
-		{
-			haveSensorInfo = 0;
-		}
-
-		strSensorId[0] = '\001';
-		strSensorId[1] = TXT_o2Sensors;
-		strSensorId[2] = 0;
-		write_topline(strSensorId);
+	strSensorId[0] = '\001';
+	strSensorId[1] = TXT_o2Sensors;
+	strSensorId[2] = 0;
+	write_topline(strSensorId);
 
+	strSensorId[0] = TXT_2BYTE;
+	strSensorId[1] = TXT2BYTE_Sensor;
+	strSensorId[2] = ' ';
+	strSensorId[3] = TXT_2BYTE;
+	strSensorId[4] = 'X';
+	strSensorId[5] = '1';
+	strSensorId[6] = 0;
 
-		strSensorId[0] = TXT_2BYTE;
-		strSensorId[1] = TXT2BYTE_Sensor;
-		strSensorId[2] = ' ';
-		strSensorId[3] = TXT_2BYTE;
+	for(index = 0; index < 3; index++)
+	{
 		strSensorId[4] = 'X';
-		strSensorId[5] = '1';
-		strSensorId[6] = 0;
+		strSensorId[5] = '1' + index;
 
-		for(index = 0; index < 3; index++)
+		switch(pSettings->ext_sensor_map[index])
 		{
-			strSensorId[4] = 'X';
-			strSensorId[5] = '1' + index;
-
-			switch(pSettings->ext_sensor_map[index])
-			{
 				case SENSOR_SEARCH: strSensorId[1] = TXT2BYTE_SensorDetect;
 									strSensorId[2] = 0;
 									strSensorId[4] = 0;
@@ -478,84 +465,73 @@
 				default:
 									  strSensorId[5] = 0;
 					break;
-			}
-			if(strSensorId[4] != 'X')
-			{
-				write_label_var(  96, 340, ME_Y_LINE1 + (index * ME_Y_LINE_STEP), &FontT48, strSensorId);
-			}
-			strSensorValue[0] = 0;
-			if((pSettings->ext_sensor_map[index] >= SENSOR_OPTIC) && (pSettings->ext_sensor_map[index] < SENSOR_TYPE_O2_END))
-			{
-				snprintf(strSensorValue, 20,"%01.2f, %01.1f mV",  pStateReal->lifeData.ppO2Sensor_bar[index], pStateReal->lifeData.sensorVoltage_mV[index]);
-			}
-			else if(pSettings->ext_sensor_map[index] == SENSOR_CO2)
-			{
-				snprintf(strSensorValue, 20,"%ld ppm",  pStateReal->lifeData.CO2_data.CO2_ppm);
-			}
-			y_line = ME_Y_LINE1 + (index * ME_Y_LINE_STEP);
-			if(strSensorValue[0] != 0)
-			{
-				write_label_var(  480, 800, y_line, &FontT48, strSensorValue);
-			}
+		}
+		if(strSensorId[4] != 'X')
+		{
+			write_label_var(  96, 340, ME_Y_LINE1 + (index * ME_Y_LINE_STEP), &FontT48, strSensorId);
+		}
+		strSensorValue[0] = 0;
+		if((pSettings->ext_sensor_map[index] >= SENSOR_OPTIC) && (pSettings->ext_sensor_map[index] < SENSOR_TYPE_O2_END))
+		{
+			snprintf(strSensorValue, 20,"%01.2f, %01.1f mV",  pStateReal->lifeData.ppO2Sensor_bar[index], pStateReal->lifeData.sensorVoltage_mV[index]);
+		}
+		else if(pSettings->ext_sensor_map[index] == SENSOR_CO2)
+		{
+			snprintf(strSensorValue, 20,"%ld ppm",  pStateReal->lifeData.CO2_data.CO2_ppm);
 		}
-
-		if(pSettings->ext_sensor_map[0] == SENSOR_OPTIC)
+		y_line = ME_Y_LINE1 + (index * ME_Y_LINE_STEP);
+		if(strSensorValue[0] != 0)
 		{
-			strSensorId[0] = TXT_2BYTE;
-			strSensorId[1] = TXT2BYTE_HUDbattery;
-			strSensorId[2] = 0;
-			write_label_var(  30, 340, ME_Y_LINE4, &FontT48, strSensorId);
+			write_label_var(  480, 800, y_line, &FontT48, strSensorValue);
+		}
+	}
 
-			snprintf(strSensorId, 20,"%01.3fV", get_HUD_battery_voltage_V());
-			write_label_var(  480, 800, ME_Y_LINE4, &FontT48, strSensorId);
-		}
-		else
-		{
-			if((pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_ANALOG) || (pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_ANADIG)
+	if(pSettings->ext_sensor_map[0] == SENSOR_OPTIC)
+	{
+		strSensorId[0] = TXT_2BYTE;
+		strSensorId[1] = TXT2BYTE_HUDbattery;
+		strSensorId[2] = 0;
+		write_label_var(  30, 340, ME_Y_LINE4, &FontT48, strSensorId);
+
+		snprintf(strSensorId, 20,"%01.3fV", get_HUD_battery_voltage_V());
+		write_label_var(  480, 800, ME_Y_LINE4, &FontT48, strSensorId);
+	}
+	else
+	{
+		if((pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_ANALOG) || (pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_ANADIG)
 #ifdef ENABLE_SENTINEL_MODE
 					|| (pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_SENTINEL)
 #endif
 					)
-			{
-				strSensorId[0] = TXT_2BYTE;
-				strSensorId[1] = TXT2BYTE_O2Calib;
-				strSensorId[2] = 0;
-				write_label_var(  30, 340, ME_Y_LINE4, &FontT48, strSensorId);
-				snprintf(strSensorId, 20,"%d%%", O2_calib_gas);
-				write_label_var(  480, 800, ME_Y_LINE4, &FontT48, strSensorId);
-			}
+		{
+			strSensorId[0] = TXT_2BYTE;
+			strSensorId[1] = TXT2BYTE_O2Calib;
+			strSensorId[2] = 0;
+			write_label_var(  30, 340, ME_Y_LINE4, &FontT48, strSensorId);
+			snprintf(strSensorId, 20,"%d%%", O2_calib_gas);
+			write_label_var(  480, 800, ME_Y_LINE4, &FontT48, strSensorId);
 		}
-
-	   	if(DataEX_external_ADC_Present())
-	   	{
-			strSensorId[0] = TXT_2BYTE;
-			strSensorId[1] = TXT2BYTE_SensorDetect;
-			strSensorId[2] = 0;
-
-			write_label_var(  30, 340, ME_Y_LINE6, &FontT48, strSensorId);
-	   	}
+	}
+   	if(DataEX_external_ADC_Present())
+   	{
+		strSensorId[0] = TXT_2BYTE;
+		strSensorId[1] = TXT2BYTE_SensorDetect;
+		strSensorId[2] = 0;
 
-		if(haveSensorInfo == 1)
-		{
-			strSensorId[0] = TXT_Sensor;
-			strSensorId[1] = ' ';
-			strSensorId[2] = TXT_Information;
-			strSensorId[3] = 0;
-			write_label_var(  30, 340, ME_Y_LINE5, &FontT48, strSensorId);
-		}
+		write_label_var(  30, 340, ME_Y_LINE6, &FontT48, strSensorId);
+   	}
 
-		if((pSettings->ext_sensor_map[0] >= SENSOR_OPTIC) && (pSettings->ext_sensor_map[0] < SENSOR_TYPE_O2_END))
-		{
-			tMenuEdit_refresh_field(StMHARD3_O2_Sensor1);
-		}
-		if((pSettings->ext_sensor_map[1] >= SENSOR_OPTIC) && (pSettings->ext_sensor_map[1] < SENSOR_TYPE_O2_END))
-		{
-			tMenuEdit_refresh_field(StMHARD3_O2_Sensor2);
-		}
-		if((pSettings->ext_sensor_map[2] >= SENSOR_OPTIC) && (pSettings->ext_sensor_map[2] < SENSOR_TYPE_O2_END))
-		{
-			tMenuEdit_refresh_field(StMHARD3_O2_Sensor3);
-		}
+	if((pSettings->ext_sensor_map[0] >= SENSOR_OPTIC) && (pSettings->ext_sensor_map[0] < SENSOR_TYPE_O2_END))
+	{
+		tMenuEdit_refresh_field(StMHARD3_O2_Sensor1);
+	}
+	if((pSettings->ext_sensor_map[1] >= SENSOR_OPTIC) && (pSettings->ext_sensor_map[1] < SENSOR_TYPE_O2_END))
+	{
+		tMenuEdit_refresh_field(StMHARD3_O2_Sensor2);
+	}
+	if((pSettings->ext_sensor_map[2] >= SENSOR_OPTIC) && (pSettings->ext_sensor_map[2] < SENSOR_TYPE_O2_END))
+	{
+		tMenuEdit_refresh_field(StMHARD3_O2_Sensor3);
 	}
 
     if(get_globalState() == StMHARD3_O2_Calibrate)
@@ -573,14 +549,23 @@
 {
 	SSettings *pSettings = settingsGetPointer();
     uint8_t sensorActive[3];
+    uint8_t index = 0;
     char text[3];
 
     set_globalState(StMHARD3_Sensors);
 	resetMenuEdit(CLUT_MenuPageHardware);
 
-    sensorActive[0] = 1;
-    sensorActive[1] = 1;
-    sensorActive[2] = 1;
+	for(index = 0; index < 3; index++ )
+	{
+		if(pSettings->ppo2sensors_deactivated & (0x01 << index))
+		{
+			sensorActive[index] = 0;
+		}
+		else
+		{
+			sensorActive[index] = 1;
+		}
+	}
 
 	if(((pSettings->ext_sensor_map[0] < SENSOR_OPTIC) || (pSettings->ext_sensor_map[0] >= SENSOR_TYPE_O2_END)))
 	{
@@ -613,11 +598,6 @@
     if(settingsGetPointer()->ppo2sensors_deactivated & 4)
         sensorActive[2] = 0;
 
-    if(pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_OPTIC)
-    {
-    	haveSensorInfo = 0;		/* as long as we do not move the HUD battery into the information page... */
-    }
-
     if((pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_ANALOG) || (pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_ANADIG)
 #ifdef ENABLE_SENTINEL_MODE
     		|| (settingsGetPointer()->ppo2sensors_source == O2_SENSOR_SOURCE_SENTINEL)
@@ -630,11 +610,6 @@
         write_field_toggle(StMHARD3_O2_Calibrate,	400, 800, ME_Y_LINE4, &FontT48, "", 21, 98);
     }
 
-   	if(haveSensorInfo != 0)
-   	{
-   		write_field_button(StMHARD3_Sensor_Info,	 30, 800, ME_Y_LINE5,  &FontT48, "");
-   	}
-
    	if(DataEX_external_ADC_Present())
    	{
 		text[0] = TXT_2BYTE;
@@ -668,11 +643,6 @@
     	setEvent(StMHARD3_O2_Calibrate, (uint32_t)OnAction_O2_Calibrate);
     }
 
-  	if(haveSensorInfo != 0)
-   	{
-   		setEvent(StMHARD3_Sensor_Info, (uint32_t)OnAction_Sensor_Info);
-   	}
-
    	if(DataEX_external_ADC_Present())
    	{
    		setEvent(StMHARD3_Sensor_Detect, (uint32_t)OnAction_Sensor_Detect);
@@ -683,16 +653,25 @@
 
 uint8_t OnAction_Sensor1(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
 {
-    if(settingsGetPointer()->ppo2sensors_deactivated & 1)
-    {
-        settingsGetPointer()->ppo2sensors_deactivated &= 4+2;
-        tMenuEdit_set_on_off(editId, 1);
-    }
-    else
-    {
-        settingsGetPointer()->ppo2sensors_deactivated |= 1;
-        tMenuEdit_set_on_off(editId, 0);
-    }
+	const SDiveState *pStateReal = stateRealGetPointer();
+
+	if(pStateReal->lifeData.extIf_sensor_map[0] == SENSOR_DIGO2)
+	{
+		return EXIT_TO_INFO_SENSOR;
+	}
+	else
+	{
+		if(settingsGetPointer()->ppo2sensors_deactivated & 1)
+		{
+			settingsGetPointer()->ppo2sensors_deactivated &= 4+2;
+			tMenuEdit_set_on_off(editId, 1);
+		}
+		else
+		{
+			settingsGetPointer()->ppo2sensors_deactivated |= 1;
+			tMenuEdit_set_on_off(editId, 0);
+		}
+	}
 
     return UPDATE_DIVESETTINGS;
 }
@@ -700,34 +679,51 @@
 
 uint8_t OnAction_Sensor2(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
 {
-    if(settingsGetPointer()->ppo2sensors_deactivated & 2)
-    {
-        settingsGetPointer()->ppo2sensors_deactivated &= 4+1;
-        tMenuEdit_set_on_off(editId, 1);
-    }
-    else
-    {
-        settingsGetPointer()->ppo2sensors_deactivated |= 2;
-        tMenuEdit_set_on_off(editId, 0);
-    }
+	const SDiveState *pStateReal = stateRealGetPointer();
 
+	if(pStateReal->lifeData.extIf_sensor_map[1] == SENSOR_DIGO2)
+	{
+		return EXIT_TO_INFO_SENSOR;
+	}
+	else
+	{
+		if(settingsGetPointer()->ppo2sensors_deactivated & 2)
+		{
+			settingsGetPointer()->ppo2sensors_deactivated &= 4+1;
+			tMenuEdit_set_on_off(editId, 1);
+		}
+		else
+		{
+			settingsGetPointer()->ppo2sensors_deactivated |= 2;
+			tMenuEdit_set_on_off(editId, 0);
+		}
+	}
     return UPDATE_DIVESETTINGS;
 }
 
 
 uint8_t OnAction_Sensor3(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
 {
-    if(settingsGetPointer()->ppo2sensors_deactivated & 4)
-    {
-        settingsGetPointer()->ppo2sensors_deactivated &= 2+1;
-        tMenuEdit_set_on_off(editId, 1);
-    }
-    else
-    {
-        settingsGetPointer()->ppo2sensors_deactivated |= 4;
-        tMenuEdit_set_on_off(editId, 0);
-    }
+	const SDiveState *pStateReal = stateRealGetPointer();
+
+	if(pStateReal->lifeData.extIf_sensor_map[2] == SENSOR_DIGO2)
+	{
+		return EXIT_TO_INFO_SENSOR;
+	}
+	else
+	{
 
+		if(settingsGetPointer()->ppo2sensors_deactivated & 4)
+		{
+			settingsGetPointer()->ppo2sensors_deactivated &= 2+1;
+			tMenuEdit_set_on_off(editId, 1);
+		}
+		else
+		{
+			settingsGetPointer()->ppo2sensors_deactivated |= 4;
+			tMenuEdit_set_on_off(editId, 0);
+		}
+	}
     return UPDATE_DIVESETTINGS;
 }