Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r0f68c8f7dadf2a493aed0d123a10a42474b7b7cb -r585e01a1d143a900ec37e1204a0a048ab6f86f53
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 0f68c8f7dadf2a493aed0d123a10a42474b7b7cb)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 585e01a1d143a900ec37e1204a0a048ab6f86f53)
@@ -7,8 +7,8 @@
 *
 * @file    ModePreTreat.c
 *
-* @author  (last)      Darren Cox
-* @date    (last)      17-Mar-2022
+* @author  (last)      Sean Nash
+* @date    (last)      26-Apr-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -554,16 +554,17 @@
     {
         PRE_TREATMENT_STATE_DATA_T preTreatmentData;
 
-        preTreatmentData.preTreatmentSubMode = currentPreTreatmentState;
-        preTreatmentData.sampleWaterState = getSampleWaterState();
+        preTreatmentData.preTreatmentSubMode      = currentPreTreatmentState;
+        preTreatmentData.sampleWaterState         = getSampleWaterState();
         preTreatmentData.consumableSelfTestsState = getConsumableSelfTestState();
-        preTreatmentData.noCartSelfTestsState = getNoCartSelfTestsState();
-        preTreatmentData.installState = 0;
-        preTreatmentData.drySelfTestsState = getDrySelfTestsState();
-        preTreatmentData.primeState = getPrimeState();
-        preTreatmentData.recircState = getPreTreatmentRecircState();
-        preTreatmentData.patientConnectionState = 0;
-        preTreatmentData.wetSelfTestsState = getWetSelfTestState();
+        preTreatmentData.noCartSelfTestsState     = getNoCartSelfTestsState();
+        preTreatmentData.installState             = 0;
+        preTreatmentData.drySelfTestsState        = getDrySelfTestsState();
+        preTreatmentData.primeState               = getPrimeState();
+        preTreatmentData.recircState              = getPreTreatmentRecircState();
+        preTreatmentData.patientConnectionState   = 0;
+        preTreatmentData.wetSelfTestsState        = getWetSelfTestState();
+        preTreatmentData.preTreatmentRsrvrState   = currentReservoirMgmtState;
 
         broadcastData( MSG_ID_PRE_TREATMENT_STATE, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&preTreatmentData, sizeof( PRE_TREATMENT_STATE_DATA_T ) );
         preTreatmentPublishTimerCounter = 0;
@@ -1106,12 +1107,12 @@
         }
         else
         {
-            U32 volume = FILL_RESERVOIR_TO_VOLUME_ML;
+            U32 volume = PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML;
 
 #ifndef _RELEASE_
-            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) != SW_CONFIG_ENABLE_VALUE )
+            if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) )
             {
-                volume = PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML;
+                volume = FILL_RESERVOIR_TO_VOLUME_ML;
             }
 #endif