Index: firmware/App/Controllers/Pressures.c =================================================================== diff -u -re107dacab9f6c78574f1c26e1004e0dbdc8dba03 -r79d0c6ca5e03581ba1b4a142f5b450bf4547dded --- firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision e107dacab9f6c78574f1c26e1004e0dbdc8dba03) +++ firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision 79d0c6ca5e03581ba1b4a142f5b450bf4547dded) @@ -7,8 +7,8 @@ * * @file Pressures.c * -* @author (last) Dara Navaei -* @date (last) 11-Jan-2023 +* @author (last) Bill Bracken +* @date (last) 17-Jan-2023 * * @author (original) Sean * @date (original) 04-Apr-2020 @@ -567,14 +567,14 @@ *************************************************************************/ static void monitorPressureSensors( void ) { - U08 sensorId; - BOOL isPressureOutOfRange = FALSE; - BOOL isCurrentPressureOut = FALSE; - BOOL isBaroOutOfRange = FALSE; - F32 pressureOutID = 0.0F; - F32 pressureReading = 0.0F; + PRESSURE_SENSORS_T sensorId; + PRESSURE_SENSORS_T sensorInAlarm = PRESSURE_FIRST; + F32 pressureReading = 0.0F; + BOOL isBaroOutOfRange = FALSE; + BOOL isPressureOutOfRange = FALSE; + F32 alarmPressure = 0.0F; - for ( sensorId = 0; sensorId < NUM_OF_PRESSURE_SENSORS; sensorId++ ) + for ( sensorId = PRESSURE_FIRST; sensorId < NUM_OF_PRESSURE_SENSORS; sensorId++ ) { switch ( sensorId ) { @@ -588,9 +588,12 @@ // Remember the ID of the pressure sensor that is out of range. The ID is converted to float since the check persistent alarm function // accepts only floats. pressureReading = getMeasuredDGPressure( sensorId ) + getBaroPressurePSI(); - isCurrentPressureOut = ( ( pressureReading < MIN_VALID_PRESSURE_RANGE_PSIA ) || ( pressureReading > MAX_VALID_PRESSURE_RANGE_PSIA ) ? TRUE : FALSE ); - isPressureOutOfRange |= isCurrentPressureOut; - pressureOutID = ( TRUE == isCurrentPressureOut ? (F32)sensorId : pressureOutID ); + if ( ( pressureReading < MIN_VALID_PRESSURE_RANGE_PSIA ) || ( pressureReading > MAX_VALID_PRESSURE_RANGE_PSIA ) ) + { + isPressureOutOfRange = TRUE; + sensorInAlarm = sensorId; + alarmPressure = pressureReading; + } break; case PRESSURE_SENSOR_BAROMETRIC: @@ -612,7 +615,7 @@ } // Once the sensors were all checked to be out of range, check the persistent alarm - checkPersistentAlarm( ALARM_ID_DG_PRESSURE_OUT_OF_RANGE, isPressureOutOfRange, pressureOutID, pressureReading ); + checkPersistentAlarm( ALARM_ID_DG_PRESSURE_OUT_OF_RANGE, isPressureOutOfRange, sensorInAlarm, alarmPressure ); }