Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r9944e4f766d9eb4cdf7a5ca7587e3ceca556e106
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 9944e4f766d9eb4cdf7a5ca7587e3ceca556e106)
@@ -7,8 +7,8 @@
 *
 * @file    Dialysis.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      22-Feb-2022
+* @author  (last)      Darren Cox
+* @date    (last)      13-May-2022
 *
 * @author  (original)  Sean
 * @date    (original)  15-Jan-2020
@@ -39,18 +39,18 @@
 
 // ********** private definitions **********
 
-#define MAX_UF_RATE_ML_PER_HOUR                 2750.0                          ///< Maximum ultrafiltration rate in mL/hour
-#define MAX_UF_ACCURACY_ERROR_ML                250.0                           ///< Maximum ultrafiltration accuracy error in mL over the entire treatment.
+#define MAX_UF_RATE_ML_PER_HOUR                 2750.0F                         ///< Maximum ultrafiltration rate in mL/hour
+#define MAX_UF_ACCURACY_ERROR_ML                250.0F                          ///< Maximum ultrafiltration accuracy error in mL over the entire treatment.
 /// Saline bolus data broadcast interval (ms/task time) count.
 static const U32 SALINE_BOLUS_DATA_PUB_INTERVAL = ( MS_PER_SECOND / TASK_GENERAL_INTERVAL );
 /// Ultrafiltration rate accuracy check interval count.
 static const U32 UF_ACCURACY_CHECK_INTERVAL     = ((1 * MIN_PER_HOUR * SEC_PER_MIN * MS_PER_SECOND) / TASK_GENERAL_INTERVAL);
 
 #define MAX_SALINE_VOLUME_DELIVERED             800                             ///< Maximum saline volume delivered for a treatment.
 #define SALINE_BOLUS_RATE_ML_MIN                300                             ///< Fixed rate for saline bolus delivery.
-#define MAX_BOLUS_ERROR_PCT                     0.2                             ///< Maximum error in saline bolus volume delivered (as a percentage of target).
+#define MAX_BOLUS_ERROR_PCT                     0.2F                            ///< Maximum error in saline bolus volume delivered (as a percentage of target).
 
-#define MAX_ACTIVE_LOAD_CELL_CHANGE_G           50.0                            ///< Maximum delta between new and previous measured UF volume.
+#define MAX_ACTIVE_LOAD_CELL_CHANGE_G           50.0F                           ///< Maximum delta between new and previous measured UF volume.
 
 // ********** private data **********
 
@@ -511,11 +511,12 @@
          ( DIALYSIS_UF_STATE == currentDialysisState ) && ( UF_RUNNING_STATE == currentUFState ) )
     {
         result = TRUE;
+        sendTreatmentLogEventData( UF_PAUSE_EVENT, setUFRate, 0.0 );
         // Set outlet pump to dialysate rate
         setDialOutPumpTargetRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
         // Go to UF paused state
         currentUFState = UF_PAUSED_STATE;
-        sendTreatmentLogEventData( UF_PAUSE_RESUME_EVENT, UF_RUNNING_STATE, UF_PAUSED_STATE );
+        sendTreatmentLogEventData( UF_START_RESUME_EVENT, UF_RUNNING_STATE, UF_PAUSED_STATE );
     }
     else
     {
@@ -561,13 +562,14 @@
          ( DIALYSIS_UF_STATE == currentDialysisState ) && ( UF_PAUSED_STATE == currentUFState ) )
     {
         result = TRUE;
+        sendTreatmentLogEventData( UF_START_RESUME_EVENT, 0.0, setUFRate );
         // Set outlet pump to dialysate rate + set UF rate
         setDialOutPumpTargetRate( setDialysateFlowRate + (S32)setUFRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
         // Restart UF time accumulation for reference volume calculation
         lastUFTimeStamp = getMSTimerCount();
         // Go to UF running state
         currentUFState = UF_RUNNING_STATE;
-        sendTreatmentLogEventData( UF_PAUSE_RESUME_EVENT, UF_PAUSED_STATE, UF_RUNNING_STATE );
+        sendTreatmentLogEventData( UF_START_RESUME_EVENT, UF_PAUSED_STATE, UF_RUNNING_STATE );
     }
     else
     {
@@ -952,12 +954,16 @@
             result = SALINE_BOLUS_STATE_IDLE;
         }
         // Determine if saline bolus is under/over delivering
-        else if ( ( fabs( expectedSalineBolusVolume_mL - bolusSalineVolumeDelivered_mL ) > maxBolusErrorMl ) &&
-                  ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
+        else if ( fabs( expectedSalineBolusVolume_mL - bolusSalineVolumeDelivered_mL ) > maxBolusErrorMl )
         {
-            activateAlarmNoData( ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE );
-            errorFound = TRUE;
-            result = SALINE_BOLUS_STATE_IDLE;
+#ifndef _RELEASE_
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+            {
+                activateAlarmNoData( ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE );
+                errorFound = TRUE;
+                result = SALINE_BOLUS_STATE_IDLE;
+            }
         }
     }