Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r9df8618dfd95d3af354e6cbb590ebe6f6fd7ccdd -r981de1f5228152ec6877aceae3d66ebf5efc7101
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 9df8618dfd95d3af354e6cbb590ebe6f6fd7ccdd)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 981de1f5228152ec6877aceae3d66ebf5efc7101)
@@ -20,7 +20,6 @@
 #include "AirTrap.h"
 #include "BloodFlow.h"
 #include "Buttons.h"
-#include "DGInterface.h"
 #include "Dialysis.h"
 #include "DialInFlow.h"
 #include "DialOutFlow.h"
@@ -53,6 +52,8 @@
 #define MIN_SALINE_BOLUS_VOLUME_PCT             0.8                             ///< Minimum saline bolus volume measured by independent means (as % of target).
 #define MAX_SALINE_BOLUS_VOLUME_PCT             1.2                             ///< Maximum saline bolus volume measured by independent means (as % of target).
 
+#define MAX_ACTIVE_LOAD_CELL_CHANGE_G           50.0                            ///< Maximum delta between new and previous measured UF volume.
+
 // ********** private data **********
 
 static DIALYSIS_STATE_T currentDialysisState;           ///< Current state of the dialysis sub-mode state machine.
@@ -126,8 +127,6 @@
 
     refUFVolume = 0.0;
     measUFVolume = 0.0;
-    resFinalVolume[ DG_RESERVOIR_1 ] = 0.0;
-    resFinalVolume[ DG_RESERVOIR_2 ] = 0.0;
     measUFVolumeFromPriorReservoirs = 0.0;
 
     uFTimeMS = 0;
@@ -1105,11 +1104,23 @@
 {
     DG_RESERVOIR_ID_T activeRes = getDGActiveReservoir();
     F32 latestResVolume = getReservoirWeightSmallFilter( activeRes );
+#ifndef DISABLE_UF_ALARMS
+    F32 deltaVolume = latestResVolume - resFinalVolume[ activeRes ];
 
-    // Calculate UF volumes and provide to dialysate outlet pump controller
-    measUFVolume = measUFVolumeFromPriorReservoirs + ( latestResVolume - resStartVolume[ activeRes ] );
-    resFinalVolume[ activeRes ] = latestResVolume;
-    setDialOutUFVolumes( refUFVolume, measUFVolume );
+    // ensure volume change is not too excessive - indication that load cell was impacted by some kind of shock
+    if ( fabs(deltaVolume) > MAX_ACTIVE_LOAD_CELL_CHANGE_G )
+    {
+        ALARM_ID_T deltaAlarm = ( getDGActiveReservoir() == DG_RESERVOIR_1 ? ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_1_ALARM : ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_2_ALARM );
+        SET_ALARM_WITH_1_F32_DATA( deltaAlarm, deltaVolume );
+    }
+    else
+#endif
+    {
+        // Calculate UF volumes and provide to dialysate outlet pump controller
+        measUFVolume = measUFVolumeFromPriorReservoirs + ( latestResVolume - resStartVolume[ activeRes ] );
+        resFinalVolume[ activeRes ] = latestResVolume;
+        setDialOutUFVolumes( refUFVolume, measUFVolume );
+    }
 }
 
 /*********************************************************************//**
@@ -1119,15 +1130,16 @@
  * is the inactive reservoir) in order to get a more stable volume.
  * @details Inputs: active reservoir, load cell reading from inactive reservoir
  * @details Outputs: resStartVolume[]
+ * @param reservoirID reservoir ID to update the baseline volume.
  * @return none
  *************************************************************************/
-void setStartReservoirVolume( void )
+void setStartReservoirVolume( DG_RESERVOIR_ID_T reservoirID )
 {
-    DG_RESERVOIR_ID_T inactiveRes = getDGInactiveReservoir();
-    F32 resVolume = getReservoirWeightLargeFilter( inactiveRes );
+    F32 resVolume = getReservoirWeightLargeFilter( reservoirID );
 
     // Set starting baseline volume for next reservoir before we switch to it
-    resStartVolume[ inactiveRes ] = resVolume;
+    resStartVolume[ reservoirID ] = resVolume;
+    resFinalVolume[ reservoirID ] = resVolume;
 }
 
 /*********************************************************************//**
@@ -1141,8 +1153,7 @@
  *************************************************************************/
 void signalReservoirsSwitched( void )
 {
-    DG_RESERVOIR_ID_T activeRes = getDGActiveReservoir();
-    DG_RESERVOIR_ID_T inactiveRes = ( activeRes == DG_RESERVOIR_1 ? DG_RESERVOIR_2 : DG_RESERVOIR_1 );
+    DG_RESERVOIR_ID_T inactiveRes = getDGInactiveReservoir();
 
     // Update UF volume from prior reservoirs per tentative res volume for last reservoir
     measUFVolumeFromPriorReservoirs += ( resFinalVolume[ inactiveRes ] - resStartVolume[ inactiveRes ] );