Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r999abe4f616b27de63c39676b05d66e66a3fff11 -ra845adaa2966fbc6348e62ee6b2c92c209d6bf03
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 999abe4f616b27de63c39676b05d66e66a3fff11)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision a845adaa2966fbc6348e62ee6b2c92c209d6bf03)
@@ -53,12 +53,12 @@
 #define MAX_ACTIVE_LOAD_CELL_CHANGE_G           50.0F                           ///< Maximum delta between new and previous measured UF volume.
 
 /// Defined states for the Load Cell cycles.
-typedef enum Load_Cell_Cycle
+typedef enum Reservoir_Steady_Cycle
 {
-    LOAD_CELL_START = 0,                        ///< Load Cell use Start
-    LOAD_CELL_FINAL,                            ///< Load Cell use Final
-    NUM_OF_LOAD_CELL_CYCLES                     ///< Number of Load Cell Cycles
-} LOAD_CELL_CYCLE_T;
+    RESERVOIR_STEADY_CYCLE_START = 0,           ///< Reservoir steady cycle load cell reading at Start
+    RESERVOIR_STEADY_CYCLE_FINAL,               ///< Reservoir steady cycle load cell reading at Final
+    NUM_OF_RESERVOIR_STEADY_CYCLES              ///< Number of Reservoir steady cycle load cell readings
+} RESERVOIR_STEADY_CYCLE_T;
 
 // ********** private data **********
 
@@ -73,7 +73,7 @@
 static F32 resCurrVolume[ NUM_OF_DG_RESERVOIRS ];       ///< Reservoir current volume.
 static F32 resLastVolume[ NUM_OF_DG_RESERVOIRS ];       ///< Reservoir previous volume.
 static F32 measUFVolumeFromPriorReservoirs;             ///< Current total ultrafiltration volume from previous reservoirs in current treatment.
-static F32 lcLastSteadyWeight[NUM_OF_LOAD_CELL_CYCLES][NUM_OF_LOAD_CELLS];    ///< Load Cell Last Steady Weight for drift test Start/Final cycle
+static F32 lcLastSteadyWeight[NUM_OF_RESERVOIR_STEADY_CYCLES][NUM_OF_LOAD_CELLS];    ///< Load Cell Last Steady Weight for drift test Start/Final cycle
 
 static U32 uFTimeMS;                                    ///< Current elapsed ultrafiltration time (in ms).  Used for calculating UF reference volume.
 static U32 lastUFTimeStamp;                             ///< HD timer value when we last took stock of ultrafiltration time (so we can determine how much time has elapsed since).
@@ -115,7 +115,7 @@
 static void updateUFVolumes( void );
 
 static void publishSalineBolusData( void );
-static void checkLoadCellsStablePrimaryBackupDriftOutOfRange( DG_RESERVOIR_ID_T reservoirID, LOAD_CELL_CYCLE_T cycle );
+static void checkLoadCellsStablePrimaryBackupDriftOutOfRange( DG_RESERVOIR_ID_T reservoirID, RESERVOIR_STEADY_CYCLE_T cycle );
 
 /*********************************************************************//**
  * @brief
@@ -156,8 +156,8 @@
 
     for (i=0; i<NUM_OF_LOAD_CELLS; i++)
     {
-        lcLastSteadyWeight[LOAD_CELL_START][i] = LOAD_CELL_ILLEGAL_WEIGHT_VALUE;
-        lcLastSteadyWeight[LOAD_CELL_FINAL][i] = LOAD_CELL_ILLEGAL_WEIGHT_VALUE;
+        lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][i] = LOAD_CELL_ILLEGAL_WEIGHT_VALUE;
+        lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_FINAL][i] = LOAD_CELL_ILLEGAL_WEIGHT_VALUE;
     }
     resetSalineBolus();
 }
@@ -1155,7 +1155,7 @@
     resStartVolume[ reservoirID ] = resVolume;
     resFinalVolume[ reservoirID ] = resVolume;
 
-    checkLoadCellsStablePrimaryBackupDriftOutOfRange( reservoirID, LOAD_CELL_START );
+    checkLoadCellsStablePrimaryBackupDriftOutOfRange( reservoirID, RESERVOIR_STEADY_CYCLE_START );
 }
 
 /*********************************************************************//**
@@ -1194,7 +1194,7 @@
     resFinalVolume[ inactiveRes ] = resVolume;
     measUFVolumeFromPriorReservoirs += ( resFinalVolume[ inactiveRes ] - resStartVolume[ inactiveRes ] );
 
-    checkLoadCellsStablePrimaryBackupDriftOutOfRange( inactiveRes, LOAD_CELL_FINAL );
+    checkLoadCellsStablePrimaryBackupDriftOutOfRange( inactiveRes, RESERVOIR_STEADY_CYCLE_FINAL );
 }
 
 /*********************************************************************//**
@@ -1240,7 +1240,7 @@
  * @param cycle - final or start reading for reservoir
  * @return none
  *************************************************************************/
-static void checkLoadCellsStablePrimaryBackupDriftOutOfRange( DG_RESERVOIR_ID_T reservoirID, LOAD_CELL_CYCLE_T cycle )
+static void checkLoadCellsStablePrimaryBackupDriftOutOfRange( DG_RESERVOIR_ID_T reservoirID, RESERVOIR_STEADY_CYCLE_T cycle )
 {
     F32 loadCellPrimaryWeight, loadCellBackupWeight;
     F32 loadCellPreviousDrift, loadCellCurrentDrift;
@@ -1262,10 +1262,10 @@
     loadCellBackupWeight  = getReservoirBackupWeightLargeFilter( reservoirID );
     loadCellCurrentDrift  = loadCellPrimaryWeight - loadCellBackupWeight;
 
-    if ( ( TRUE == cycle ) && ( lcLastSteadyWeight[LOAD_CELL_START][lcPrimaryIndex] > (LOAD_CELL_ILLEGAL_WEIGHT_VALUE + 1) ) )
+    if ( ( RESERVOIR_STEADY_CYCLE_FINAL == cycle ) && ( lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][lcPrimaryIndex] > (LOAD_CELL_ILLEGAL_WEIGHT_VALUE + 1) ) )
     {
         // Start Weight has been previously saved, ok to test
-        loadCellPreviousDrift = lcLastSteadyWeight[LOAD_CELL_START][lcPrimaryIndex] - lcLastSteadyWeight[LOAD_CELL_START][lcBackupIndex];
+        loadCellPreviousDrift = lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][lcPrimaryIndex] - lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][lcBackupIndex];
         driftDiff = fabs ( loadCellCurrentDrift - loadCellPreviousDrift );
     }
     // Save latest reading for next test time
@@ -1277,13 +1277,6 @@
     {
         SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE, loadCellCurrentDrift, loadCellPreviousDrift )
     }
-
-        // TODO remove this debug output
-        // Send a comma delimited debug message with drift data
-        U08 tempCharBuffer[ 128 ];
-        sprintf( tempCharBuffer, "Rsvr,%d,Cycle,%d,LcOldDrift,%3.3f,LcNewDrift,%3.3f,Diff,%3.3f,Pri,%3.3f,Bak,%3.3f", reservoirID, cycle, loadCellPreviousDrift, loadCellCurrentDrift, driftDiff, loadCellPrimaryWeight, loadCellBackupWeight );
-        broadcastData( MSG_ID_HD_DEBUG_EVENT, COMM_BUFFER_OUT_CAN_HD_BROADCAST, tempCharBuffer, strlen( tempCharBuffer ) );
-
 }
 
 /**@}*/