Index: firmware/App/Controllers/BoostPump.c =================================================================== diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -ra0c144ed9f72066d7a7b1d047b01fb76ca56d667 --- firmware/App/Controllers/BoostPump.c (.../BoostPump.c) (revision 228773fa681489a62db5c47807a4794e5761d4f5) +++ firmware/App/Controllers/BoostPump.c (.../BoostPump.c) (revision a0c144ed9f72066d7a7b1d047b01fb76ca56d667) @@ -167,7 +167,7 @@ break; default: - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FP_INVALID_PUMP_DUTY_CYCLE_SELECTED, boostPumpState ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_FP_INVALID_PUMP_DUTY_CYCLE_SELECTED, boostPumpState ) boostPumpState = BOOST_PUMP_OFF_STATE; break; } @@ -360,7 +360,7 @@ BOOL result = FALSE; // First of all, the flow rate must be in range - if ( ( boostFlowRate <= MAX_BOOST_FLOWRATE_MLPM ) && ( boostFlowRate >= MIN_BOOST_FLOWRATE_MLPM ) ) + if ( boostFlowRate <= MAX_BOOST_FLOWRATE_MLPM ) { targetBoostPumpFlowRate.data = boostFlowRate; boostPumpControlMode = PUMP_CONTROL_MODE_CLOSED_LOOP; @@ -383,7 +383,7 @@ // Requested flow rate is out of range else { - SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FP_PUMP_INVALID_FLOW_RATE_SET, boostFlowRate ) + SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_FP_PUMP_INVALID_FLOW_RATE_SET, boostFlowRate ) } return result; @@ -426,7 +426,7 @@ // Requested flow rate is out of range else { - SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FP_PUMP_INVALID_PRESSURE_SELECTED, boostPressure ) + SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_FP_PUMP_INVALID_PRESSURE_SELECTED, boostPressure ) } return result; @@ -467,7 +467,7 @@ } else { - SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FP_INVALID_PUMP_DUTY_CYCLE_SELECTED, dutyCycle ) + SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_FP_INVALID_PUMP_DUTY_CYCLE_SELECTED, dutyCycle ) } return status;