ostc4: Discovery/Src/tCCR.c comparison

comparison Discovery/Src/tCCR.c @ 744:dd5db6e2c9a4

Added DiveO2 fatal error detection: The digital sensor provides status information which are now considered in the sanity check for sensor values. The behavior in case of an error is the same as if an analog sensor would provide a out of bounce voltage.

author	Ideenmodellierer
date	Sun, 19 Feb 2023 21:51:19 +0100
parents	8adf9b8fc7fa
children	39ff186b6f98

comparison

equal deleted inserted replaced

-:6871d4b586ff
+:dd5db6e2c9a4
 if(sensorNotActiveBinary & 4)
 sensorActive[2] = 0;
 }
 // test2: mV of remaining sensors
-for(int i=0;i<3;i++)
+for(index=0; index<3; index++)
 {
-	sensorState[i] = sensorOK;
+	sensorState[index] = sensorOK;
-if(sensorActive[i])
+if(sensorActive[index])
 {
-if(	(stateUsed->lifeData.sensorVoltage_mV[i] < MIN_SENSOR_VOLTAGE_MV) ||
+	if(((stateUsed->lifeData.extIf_sensor_map[index] == SENSOR_DIGO2) && (((SSensorDataDiveO2*)(stateUsed->lifeData.extIf_sensor_data))->status & DVO2_FATAL_ERROR))
-(stateUsed->lifeData.sensorVoltage_mV[i] > MAX_SENSOR_VOLTAGE_MV))
+			|| ((stateUsed->lifeData.sensorVoltage_mV[index] < MIN_SENSOR_VOLTAGE_MV) ||	(stateUsed->lifeData.sensorVoltage_mV[index] > MAX_SENSOR_VOLTAGE_MV)))
-{
+			{
-sensorActive[i] = 0;
+				sensorActive[index] = 0;
-switch(i)
+				switch(index)
-{
+				{
-case 0:
+						case 0:
-sensorNotActiveBinary |= 1;
+							sensorNotActiveBinary |= 1;
-break;
+						break;
-case 1:
+						case 1:
-sensorNotActiveBinary |= 2;
+							sensorNotActiveBinary |= 2;
-break;
+						break;
-case 2:
+						case 2:
-sensorNotActiveBinary |= 4;
+							sensorNotActiveBinary |= 4;
-break;
+						break;
-}
+				}
-}
+	}
 }
 }
 *outOfBouds1 = 0;
 *outOfBouds2 = 0;

Mercurial > public > ostc4

comparison Discovery/Src/tCCR.c @ 744:dd5db6e2c9a4