Index: firmware/App/Modes/ModeGenIdle.c =================================================================== diff -u -r557f409455dde035899c9f89a8b93f57e8eb7f2b -ref46e2aa7eba74dabd99bfcd9e6b38b8ce77820c --- firmware/App/Modes/ModeGenIdle.c (.../ModeGenIdle.c) (revision 557f409455dde035899c9f89a8b93f57e8eb7f2b) +++ firmware/App/Modes/ModeGenIdle.c (.../ModeGenIdle.c) (revision ef46e2aa7eba74dabd99bfcd9e6b38b8ce77820c) @@ -219,7 +219,7 @@ { DG_GEN_IDLE_MODE_STATE_T result = DG_GEN_IDLE_MODE_STATE_START; - if ( TRUE == isAvgConductivityOutOfRange() ) // bad fill due to conductivity is out of range and assume bottles need prime + if ( TRUE == isBadFill() ) // bad fill due to conductivity is out of range and assume bottles need prime { result = DG_GEN_IDLE_MODE_STATE_HANDLE_BAD_FILL ; } @@ -250,8 +250,8 @@ * @brief * The handleBadFillState function executes the bad fill state of the * generation idle mode state machine. - * @details Inputs: - * @details Outputs: + * @details Inputs: none + * @details Outputs: badFillState * @return the next state *************************************************************************/ static DG_GEN_IDLE_MODE_STATE_T handleBadFillState( void ) @@ -298,8 +298,8 @@ * @brief * The handleFirstDrainState function executes the first drain state of the * handle bad fill state machine. - * @details Inputs: - * @details Outputs: + * @details Inputs: none + * @details Outputs: none * @return the next state *************************************************************************/ static DG_GEN_IDLE_MODE_BAD_FILL_STATE_T handleFirstDrainState( void ) @@ -316,8 +316,8 @@ * @brief * The handleFlushFillState function executes the flush fill state of the * handle bad fill state machine. - * @details Inputs: - * @details Outputs: + * @details Inputs: none + * @details Outputs: none * @return the next state *************************************************************************/ static DG_GEN_IDLE_MODE_BAD_FILL_STATE_T handleFlushFillState( void ) @@ -334,8 +334,8 @@ * @brief * The handleSecondDrainState function executes the second drain state of the * handle bad fill state machine. - * @details Inputs: - * @details Outputs: + * @details Inputs: none + * @details Outputs: none * @return the next state *************************************************************************/ static DG_GEN_IDLE_MODE_BAD_FILL_STATE_T handleSecondDrainState( void ) @@ -350,10 +350,10 @@ /*********************************************************************//** * @brief - * The handleRefillState function executes refill state of the - * handle bad fill state machine. - * @details Inputs: - * @details Outputs: + * The handleRefillState function executes refill state of the handle bad + * fill state machine. + * @details Inputs: none + * @details Outputs: none * @return the next state *************************************************************************/ static DG_GEN_IDLE_MODE_BAD_FILL_STATE_T handleRefillState( void ) @@ -370,15 +370,16 @@ * @brief * The handleClearAlarmState function executes the clear alarm state of the * handle bad fill state machine. - * @details Inputs: - * @details Outputs: + * @details Inputs: none + * @details Outputs: none * @return the next state *************************************************************************/ static DG_GEN_IDLE_MODE_BAD_FILL_STATE_T handleClearAlarmState( void ) { DG_GEN_IDLE_MODE_BAD_FILL_STATE_T result = DG_HANDLE_BAD_FILL_STATE_CLEAR_ALARM; - // clear "Wait for dialysate alarm" before resume to normal state + // clear wait for dialysate alarm condition to allow resume + clearAlarmCondition( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT ); // resume option will appear requestNewOperationMode( DG_MODE_GENE ); // go to generation idle mode return result;