Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -re9e339870c5ed01230963f00d400331ab879c91f -r6f876554db45a19590eaf2122ef47e33f7a7d69b
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision e9e339870c5ed01230963f00d400331ab879c91f)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 6f876554db45a19590eaf2122ef47e33f7a7d69b)
@@ -20,6 +20,7 @@
 #include "Bubbles.h"
 #include "Buttons.h"
 #include "DDInterface.h"
+#include "FluidBolus.h"
 #include "Messaging.h"
 #include "ModeService.h"
 #include "ModeTreatment.h"
@@ -53,8 +54,6 @@
 #define TREATMENT_SETTINGS_RANGES_PUB_INTERVAL  ( ( 60 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )
 /// Ultrafiltration data broadcast interval (ms/task time) count.
 #define ULTRAFILTRATION_DATA_PUB_INTERVAL       ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )
-/// Saline bolus data broadcast interval (ms/task time) count.  // TODO - move to StateTxSalineBolus.c when implemented
-#define SALINE_BOLUS_DATA_PUB_INTERVAL          ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )
 
 /// Macro to calculate the elapsed treatment time in seconds.
 #define CALC_ELAPSED_TREAT_TIME_IN_SECS()       ( treatmentTimeMS / MS_PER_SECOND )
@@ -81,7 +80,6 @@
 static U32  treatmentStateBroadcastTimerCtr;                    ///< Treatment state data broadcast timer counter used to schedule when to transmit data.
 static U32  treatmentParamsRangesBroadcastTimerCtr;             ///< Treatment parameter ranges broadcast timer counter used to schedule when to transmit updated ranges.
 static U32  ultrafiltrationBroadcastTimerCtr;                   ///< Ultrafiltration data broadcast timer counter used to schedule when to transmit data.
-static U32  salineBolusBroadcastTimerCtr;                       ///< Saline bolus data broadcast timer counter used to schedule when to transmit data.
 
 /// Interval (in task intervals) at which to publish alarm status to CAN bus.
 static OVERRIDE_U32_T treatmentTimePublishInterval;
@@ -104,7 +102,6 @@
 
 static void broadcastTreatmentSettingsRanges( void );
 static void broadcastTreatmentPeriodicData();
-static void publishSalineBolusData( void );  // TODO - move to StateTxSalineBolus.c when implemented
 static void publishUltrafiltrationData( void );
 static U32 getMinTreatmentTimeInMinutes( void );
 static TREATMENT_STATE_T handleTreatmentStartState( void );
@@ -155,7 +152,6 @@
     treatmentStateBroadcastTimerCtr = TREATMENT_STATE_DATA_PUB_INTERVAL;              // So we send state data immediately when we begin treatment mode
     treatmentParamsRangesBroadcastTimerCtr = TREATMENT_SETTINGS_RANGES_PUB_INTERVAL;  // So we send ranges immediately when we begin treatment mode
     ultrafiltrationBroadcastTimerCtr = ULTRAFILTRATION_DATA_PUB_INTERVAL;             // So we send ultrafiltration immediately when we begin treatment mode
-    salineBolusBroadcastTimerCtr = SALINE_BOLUS_DATA_PUB_INTERVAL;                    // So we send saline bolus data immediately when we begin treatment mode
 
     presTreatmentTimeSecs = 0;
     presUFVolumeL = 0.0F;
@@ -193,6 +189,7 @@
 //        initRinseback();
 //        initTreatmentRecirc();
 //        initTreatmentEnd();
+        initFluidBolus();
 
         // Started the treatment - set the start time in epoch
 //        setTxLastStartTimeEpoch( getRTCTimestamp() );
@@ -436,6 +433,13 @@
         activateAlarmNoData( ALARM_ID_TD_TREATMENT_STOPPED_BY_USER );
     }
 
+    // If alarm fires while bolus is active, abort the bolus
+    if ( ( TRUE == doesAlarmStatusIndicateStop() ) && ( TRUE == isFluidBolusActive() ) )
+    {
+        signalAbortFluidBolus();
+        execFluidBolus();
+    }
+
     // Check if resume treatment blocked by alarm
     if ( TRUE == doesAlarmIndicateNoResume() )
     {
@@ -507,8 +511,8 @@
     broadcastTreatmentPeriodicData();
     // Publish ultrafiltration data at set interval (whether we are performing UF or not)
     publishUltrafiltrationData();
-    // Publish saline bolus data at set interval (whether we are delivering one or not)
-    publishSalineBolusData();
+    // Publish fluid bolus data at set interval (whether we are delivering one or not)
+    publishFluidBolusData();
 
     // Manage air trap control
     execAirTrapMonitorTreatment();
@@ -1102,30 +1106,6 @@
 
 /*********************************************************************//**
  * @brief
- * The publishSalineBolusData function publishes the saline bolus data
- * at the set time interval.
- * @details \b Inputs: none
- * @details \b Outputs: none
- * @param dialysisState next dialysis state
- * @return next saline bolus state
- *************************************************************************/
-static void publishSalineBolusData( void )
-{
-    if ( ++salineBolusBroadcastTimerCtr >= SALINE_BOLUS_DATA_PUB_INTERVAL )
-    {
-        SALINE_BOLUS_DATA_PAYLOAD_T data;
-
-        data.tgtSalineVolumeMl = getTreatmentParameterU32( TREATMENT_PARAM_FLUID_BOLUS_VOLUME );
-        data.cumSalineVolumeMl = 0.0F;  // TODO
-        data.bolSalineVolumeMl = 0.0F;  // TODO
-
-        sendMessage( MSG_ID_TD_SALINE_BOLUS_DATA, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)(&data), sizeof( SALINE_BOLUS_DATA_PAYLOAD_T ) );
-        salineBolusBroadcastTimerCtr = 0;
-    }
-}
-
-/*********************************************************************//**
- * @brief
  * The publishUltrafiltrationData function publishes the ultrafiltration data
  * at the set time interval.
  * @details \b Inputs: presUFVolumeL, presUFRate