Index: firmware/App/Controllers/RinsePump.c =================================================================== diff -u -re39cba3641902ed9c670f1ca7499f0b25b59bef1 -rb85c96bbdc61bfd3a3b8dfb3b538cbacd497cf6e --- firmware/App/Controllers/RinsePump.c (.../RinsePump.c) (revision e39cba3641902ed9c670f1ca7499f0b25b59bef1) +++ firmware/App/Controllers/RinsePump.c (.../RinsePump.c) (revision b85c96bbdc61bfd3a3b8dfb3b538cbacd497cf6e) @@ -62,7 +62,6 @@ // ********** private function prototypes ********** -static RINSE_PUMP_STATE_T handleRinsePumpStartState( void ); static RINSE_PUMP_STATE_T handleRinsePumpOffState( void ); static RINSE_PUMP_STATE_T handleRinsePumpOnState ( void ); static void publishRinsePumpData( void ); @@ -209,10 +208,6 @@ { switch( currentRinsePumpState ) { - case RINSE_PUMP_STATE_INIT: - currentRinsePumpState = handleRinsePumpStartState(); - break; - case RINSE_PUMP_STATE_OFF: currentRinsePumpState = handleRinsePumpOffState(); break; @@ -262,26 +257,11 @@ } //TODO: to be tested once the Beta 2 units are out - checkPersistentAlarm( ALARM_ID_DD_D79_RINSE_PUMP_SPEED_OUT_OF_RANGE, isRpSpeedOut, - (F32)rinsePumpMeasuredSpeed, (F32)rinsePumpTargetSpeedRPM ); + checkPersistentAlarm( ALARM_ID_DD_D79_RINSE_PUMP_SPEED_OUT_OF_RANGE, isRpSpeedOut, (F32)rinsePumpMeasuredSpeed, (F32)rinsePumpTargetSpeedRPM ); } /*********************************************************************//** * @brief - * The handleRinsePumpStartState function starts the rinse pump state machine. - * @details \b Inputs: none - * @details \b Outputs: none - * @return next state of the rinse pump state machine - *************************************************************************/ -static RINSE_PUMP_STATE_T handleRinsePumpStartState( void ) -{ - RINSE_PUMP_STATE_T state = RINSE_PUMP_STATE_OFF; - - return state; -} - -/*********************************************************************//** - * @brief * The handleRinsePumpOffState function stops the rinse pump * @details \b Inputs: none * @details \b Outputs: Rinse pump motor turned off