Index: firmware/App/Controllers/DrainPump.c =================================================================== diff -u -r53af4ddc318cc5299f15e3cc1ce506b166e6e156 -r2851a8bc8f6180634f47b96feb00e4c0054252d3 --- firmware/App/Controllers/DrainPump.c (.../DrainPump.c) (revision 53af4ddc318cc5299f15e3cc1ce506b166e6e156) +++ firmware/App/Controllers/DrainPump.c (.../DrainPump.c) (revision 2851a8bc8f6180634f47b96feb00e4c0054252d3) @@ -232,7 +232,7 @@ setValveState( VPI, VALVE_STATE_OPEN ); setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO ); setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO ); - setDrainPumpTargetSpeed( 1000 ); + //setDrainPumpTargetSpeed( 1000 ); } #endif #endif Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r53af4ddc318cc5299f15e3cc1ce506b166e6e156 -r2851a8bc8f6180634f47b96feb00e4c0054252d3 --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 53af4ddc318cc5299f15e3cc1ce506b166e6e156) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 2851a8bc8f6180634f47b96feb00e4c0054252d3) @@ -104,7 +104,7 @@ static PUMP_CONTROL_MODE_T roPumpControlModeSet = PUMP_CONTROL_MODE_CLOSED_LOOP; ///< currently set RO pump control mode. //static OVERRIDE_U32_T roPumpDataPublishInterval = { 0, 0, 0, 0 }; //From branch Remove ///< interval (in ms) at which to publish RO flow data to CAN bus. -static OVERRIDE_U32_T targetROPumpPressure = { 0, 0, 0, 0 }; ///< Target RO pressure (in PSI). //TODO remove +//static OVERRIDE_U32_T targetROPumpPressure = { 0, 0, 0, 0 }; //From branch ///< Target RO pressure (in PSI). //TODO remove static OVERRIDE_U32_T targetROPumpFlowRate = { 0, 0, 0, 0 }; //From Branch ///< Target RO flow rate (in LPM_) // TODO dara static OVERRIDE_U32_T roPumpDataPublishInterval = { RO_PUMP_DATA_PUB_INTERVAL, RO_PUMP_DATA_PUB_INTERVAL, 0, 0 }; ///< interval (in ms) at which to publish RO flow data to CAN bus. static OVERRIDE_U32_T targetROPumpPressure = { 0, 0, 0, 0 }; ///< Target RO pressure (in PSI). @@ -202,7 +202,7 @@ } else // requested pressure out of range { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 0, roFlowRate ) // TODO - replace 1st param with s/w fault enum + //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 0, roFlowRate ) // TODO - replace 1st param with s/w fault enum } return result;