Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r51271a582fec5adf763c21c026cf29fb6796e09a -r3829c8e7071a932cf3400eace41633a03b80741e
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 51271a582fec5adf763c21c026cf29fb6796e09a)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 3829c8e7071a932cf3400eace41633a03b80741e)
@@ -1,19 +1,19 @@
 /**************************************************************************
-*
-* Copyright (c) 2019-2023 Diality Inc. - All Rights Reserved.
-*
-* THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
-* WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
-*
-* @file    ModePreTreat.c
-*
-* @author  (last)      Dara Navaei
-* @date    (last)      03-Jan-2023
-*
-* @author  (original)  Dara Navaei
-* @date    (original)  05-Nov-2019
-*
-***************************************************************************/
+ *
+ * Copyright (c) 2019-2023 Diality Inc. - All Rights Reserved.
+ *
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * @file    ModePreTreat.c
+ *
+ * @author  (last)      Dara Navaei
+ * @date    (last)      03-Jan-2023
+ *
+ * @author  (original)  Dara Navaei
+ * @date    (original)  05-Nov-2019
+ *
+ ***************************************************************************/
 
 #include "AlarmMgmt.h"
 #include "Buttons.h"
@@ -126,7 +126,7 @@
  * @details Inputs: none
  * @details Outputs: Pre-Treatment Mode module initialized.
  * @return none
-*************************************************************************/
+ *************************************************************************/
 void initPreTreatmentMode( void )
 {
     currentPreTreatmentState = HD_PRE_TREATMENT_START_STATE;
@@ -171,7 +171,7 @@
  * @details Inputs: none
  * @details Outputs: none
  * @return initial state
-*************************************************************************/
+ *************************************************************************/
 U32 transitionToPreTreatmentMode( void )
 {
     F32 trimmerHeaterTemp = getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE );
@@ -212,7 +212,7 @@
  * @details Inputs: none
  * @details Outputs: none
  * @return current state (sub-mode)
-*************************************************************************/
+ *************************************************************************/
 U32 execPreTreatmentMode( void )
 {
     BOOL stop = isStopButtonPressed();
@@ -1095,15 +1095,15 @@
 
             // not flushed and need to fill
             if ( ( TRUE != reservoirFlushedStatus[ inactiveReservoir ] ) &&
-               ( TRUE == reservoirFlags[ inactiveReservoir ].startFlushFill ) )
+                    ( TRUE == reservoirFlags[ inactiveReservoir ].startFlushFill ) )
             {
                 cmdStartDGFill( volume, DEFAULT_TARGET_FILL_FLOW_RATE_LPM );
                 state = PRE_TREATMENT_RESERVOIR_MGMT_FILL_CMD_RESP_STATE;
             }
 
             // flushed and need to fill
             if ( ( TRUE == reservoirFlushedStatus[ inactiveReservoir ] ) &&
-               ( TRUE == reservoirFlags[ inactiveReservoir ].startNormalFill ) )
+                    ( TRUE == reservoirFlags[ inactiveReservoir ].startNormalFill ) )
             {
                 cmdStartDGFill( volume, DEFAULT_TARGET_FILL_FLOW_RATE_LPM );
                 state = PRE_TREATMENT_RESERVOIR_MGMT_FILL_CMD_RESP_STATE;
@@ -1171,8 +1171,8 @@
         {
             if ( FALSE == reservoirFilledStatus[ DG_RESERVOIR_1 ] )
             {
-                state = PRE_TREATMENT_RESERVOIR_MGMT_REQUEST_RESERVOIR_SWITCH_STATE;
                 reservoirFilledStatus[ DG_RESERVOIR_1 ] = TRUE;
+                state = PRE_TREATMENT_RESERVOIR_MGMT_REQUEST_RESERVOIR_SWITCH_STATE;
             }
             else
             {
@@ -1186,39 +1186,23 @@
         else
         {
             state = PRE_TREATMENT_RESERVOIR_MGMT_WAIT_FOR_RESERVOIR_SWITCH_STATE;
+            U32 activeReservoir = (U32) getDGActiveReservoir();
 
-            if ( FALSE == reservoirFlushedStatus[ DG_RESERVOIR_1 ] )
+            if ( FALSE == reservoirFlushedStatus[ activeReservoir ] )
             {
-                {
-                    DG_SWITCH_RSRVRS_CMD_T rsrvrCmd;
-
-                    rsrvrCmd.reservoirID                     = (U32)DG_RESERVOIR_1;
-                    rsrvrCmd.useLastTrimmerHeaterDC          = FALSE;
-                    if (0 == reservoirFlushCount[ DG_RESERVOIR_1 ])
-                    {
-                        reservoirFlushedStatus[ DG_RESERVOIR_1 ] = TRUE;
-                    }
-                    else
-                    {
-                        reservoirFlushCount[ DG_RESERVOIR_1 ] -= 1;
-                    }
-                    cmdSetDGActiveReservoir( &rsrvrCmd );
-                }
-            }
-            else
-            {
                 DG_SWITCH_RSRVRS_CMD_T rsrvrCmd;
 
-                rsrvrCmd.reservoirID                     = (U32)DG_RESERVOIR_2;
-                rsrvrCmd.useLastTrimmerHeaterDC          = FALSE;
-                if (0 == reservoirFlushCount[ DG_RESERVOIR_2 ])
+                if (0 == reservoirFlushCount[ activeReservoir ])
                 {
-                    reservoirFlushedStatus[ DG_RESERVOIR_2 ] = TRUE;
+                    reservoirFlushedStatus[ activeReservoir ] = TRUE;
                 }
                 else
                 {
-                    reservoirFlushCount[ DG_RESERVOIR_2 ] -= 1;
+                    reservoirFlushCount[ activeReservoir ] -= 1;
                 }
+                //
+                rsrvrCmd.reservoirID                     = activeReservoir;
+                rsrvrCmd.useLastTrimmerHeaterDC          = FALSE;
                 cmdSetDGActiveReservoir( &rsrvrCmd );
             }
         }