Index: firmware/App/Services/FluidBolus.h
===================================================================
diff -u -r6f876554db45a19590eaf2122ef47e33f7a7d69b -r1abc0349c736a70fb56db6895947abfbba0eee22
--- firmware/App/Services/FluidBolus.h	(.../FluidBolus.h)	(revision 6f876554db45a19590eaf2122ef47e33f7a7d69b)
+++ firmware/App/Services/FluidBolus.h	(.../FluidBolus.h)	(revision 1abc0349c736a70fb56db6895947abfbba0eee22)
@@ -22,9 +22,9 @@
 #include "TDDefs.h"
 
 /**
- *  @defgroup FluidBolus, FluidBolus
+ *  @defgroup FluidBolus FluidBolus
  *  @brief Fluid Bolus unit provides bolus service to the
- *  Blood Prime, HD/HDF, ISO UF, End states of Treatment mode.
+ *  Blood Prime, HD/HDF, ISO UF, Pause, End states of Treatment mode.
  *
  *  @addtogroup FluidBolus
  *  @{
@@ -45,29 +45,30 @@
 /// Payload record structure for a fluid bolus data broadcast message.
 typedef struct
 {
-    U32 tgtFluidVolumeMl;                          ///< Target Fluid volume in mL.
-    F32 bolFluidVolumeMl;                          ///< Bolus Fluid volume in mL.
-    F32 cumFluidVolumeMl;                          ///< Cumulative Fluid volume in mL.
-    U32 fluidBolusState;                           ///< Current Fluid Bolus state.
+    U32  tgtFluidVolumeMl;                          ///< Target Fluid volume in mL.
+    F32  bolFluidVolumeMl;                          ///< Bolus Fluid volume in mL.
+    F32  cumFluidVolumeMl;                          ///< Cumulative Fluid volume in mL.
+    U32  fluidBolusState;                           ///< Current Fluid Bolus state.
+    BOOL bolusPermitted;                            ///< True if Bolus is permitted currently.
 } FLUID_BOLUS_DATA_PAYLOAD_T;
 #pragma pack(pop)
 
 // ********** public definitions **********
 
 void initFluidBolus( void );
 void publishFluidBolusData( void );
+void setBolusPermitted( BOOL permitted );
 
 FLUID_BOLUS_STATE_T  execFluidBolus( void );
-FLUID_BOLUS_STATE_T  getFluidBolusState( void );
 FLUID_BOLUS_MEDIUM_T getFluidBolusMedium( void );
 
 BOOL isFluidBolusActive( void );
-BOOL signalStartFluidBolus( void );
+BOOL signalStartFluidBolus( U32 flowRate );
 void signalAbortFluidBolus( void );
-F32  getCurrentFluidBolusVolumeDelivered( void );
 F32  getTotalFluidBolusVolumeDelivered( void );
 
-BOOL areAllActiveAlarmsPermittedForBolus( void );
+BOOL handleFluidBolusRequest( MESSAGE_T *message );
+BOOL isBolusAllowedByActiveAlarms( void );
 
 /**@}*/