Index: firmware/App/Modes/StateTxDialysis.c =================================================================== diff -u -r6b9b882169f108f9a5072dc60cdabbc1687aafcc -r83163b27c604072469c28623ba0e4ed9786e294a --- firmware/App/Modes/StateTxDialysis.c (.../StateTxDialysis.c) (revision 6b9b882169f108f9a5072dc60cdabbc1687aafcc) +++ firmware/App/Modes/StateTxDialysis.c (.../StateTxDialysis.c) (revision 83163b27c604072469c28623ba0e4ed9786e294a) @@ -440,8 +440,8 @@ * @brief * The handleDialysisUltrafiltrationPausedState function handles the * ultrafiltration paused state of the Dialysis state machine. - * @details \b Inputs: ufResumeRequested - * @details \b Outputs: ufResumeRequested + * @details \b Inputs: ufResumeRequested, fluidBolusRequested + * @details \b Outputs: ufResumeRequested, fluidBolusRequested * @return next Dialysis state. *************************************************************************/ static DIALYSIS_STATE_T handleDialysisUltrafiltrationPausedState( void ) @@ -454,6 +454,17 @@ transitionToDialysisState( DIALYSIS_UF_STATE ); result = DIALYSIS_UF_STATE; } + // When UI requests fluid bolus + else if ( TRUE == fluidBolusRequested ) + { + fluidBolusRequested = FALSE; + transitionToDialysisState( DIALYSIS_UF_FLUID_BOLUS_STATE ); + result = DIALYSIS_UF_FLUID_BOLUS_STATE; + } + else + { + // No action required. + } return result; } @@ -501,20 +512,17 @@ * @brief * The signalDialysisFluidBolusRequest function signals a fluid bolus * request to the Dialysis sub-mode. - * @details \b Inputs: currentDialysisState + * @details \b Inputs: none * @details \b Outputs: fluidBolusRequested * @return TRUE if request is accepted, FALSE if rejected. *************************************************************************/ BOOL signalDialysisFluidBolusRequest( void ) { BOOL result = FALSE; - // Only allow from UF state - if ( DIALYSIS_UF_STATE == currentDialysisState ) - { - fluidBolusRequested = TRUE; - result = TRUE; - } + // Only allow from both UF & UF pause states + fluidBolusRequested = TRUE; + result = TRUE; return result; }