Index: firmware/App/Drivers/PressureSensor.c =================================================================== diff -u -r69e32c52c41cfc8073a7eb59408fb30e6ac40f86 -r99498a5bab0a1f4c706376feceadc66df6d1c22e --- firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 69e32c52c41cfc8073a7eb59408fb30e6ac40f86) +++ firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 99498a5bab0a1f4c706376feceadc66df6d1c22e) @@ -139,17 +139,6 @@ lastPressureReadCounter[ X4_PRES ].data = (U32)getFPGAX4ReadCount(); lastPressureReadCounter[ X5_PRES ].data = (U32)getFPGAX5ReadCount(); - lastPressureErrorCounter[ M1_PRES ].data = (U32)getFPGAM1ErrorCount(); - lastPressureErrorCounter[ M3_PRES ].data = (U32)getFPGAM3ErrorCount(); - lastPressureErrorCounter[ P8_PRES ].data = (U32)getFPGAP8ErrorCount(); - lastPressureErrorCounter[ P13_PRES ].data = (U32)getFPGAP13ErrorCount(); - lastPressureErrorCounter[ P17_PRES ].data = (U32)getFPGAP17ErrorCount(); - lastPressureErrorCounter[ X1_PRES ].data = (U32)getFPGAX1ErrorCount(); - lastPressureErrorCounter[ X2_PRES ].data = (U32)getFPGAX2ErrorCount(); - lastPressureErrorCounter[ X3_PRES ].data = (U32)getFPGAX3ErrorCount(); - lastPressureErrorCounter[ X4_PRES ].data = (U32)getFPGAX4ErrorCount(); - lastPressureErrorCounter[ X5_PRES ].data = (U32)getFPGAX5ErrorCount(); - // // Monitor pressure sensor health // checkPressureSensors(); } @@ -196,7 +185,7 @@ } else { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR1, (U32)sensor ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR1, (U32)sensor ) } return result; @@ -226,7 +215,7 @@ } else { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR2, (U32)sensor ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR2, (U32)sensor ) } return result; @@ -256,7 +245,7 @@ } else { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR3, sensor ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR3, sensor ) } return result; @@ -286,7 +275,7 @@ } else { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR4, sensor ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR4, sensor ) } return result;