Index: sources/drydemo/StateControllerRinseback.cpp
===================================================================
diff -u -ra271469db538bfc35eba9a56308760893ecbc68e -rbb80bbccaf1c911be48493868c18c656d84b2ec1
--- sources/drydemo/StateControllerRinseback.cpp	(.../StateControllerRinseback.cpp)	(revision a271469db538bfc35eba9a56308760893ecbc68e)
+++ sources/drydemo/StateControllerRinseback.cpp	(.../StateControllerRinseback.cpp)	(revision bb80bbccaf1c911be48493868c18c656d84b2ec1)
@@ -31,17 +31,17 @@
 
     switch (rinsebackCmd) {
         case REQUESTED_USER_ACTION_RINSEBACK_CONFIRM_START:
-            if (_treatmentStatus.rinsebackState == RINSEBACK_STOP_INIT_STATE) {
-                acceptReject                     = ACCEPT_VALUE;
-                _treatmentStatus.rinsebackState = RINSEBACK_RUN_STATE;
+            if (_treatmentSubStates.rinsebackState == RINSEBACK_STOP_INIT_STATE) {
+                acceptReject                       = ACCEPT_VALUE;
+                _treatmentSubStates.rinsebackState = RINSEBACK_RUN_STATE;
             }
             else { reason.append(REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE); }
             break;
 
         case REQUESTED_USER_ACTION_RINSEBACK_INCREASE_RATE:
             if ((_treatmentStatus.rinsebackFlowMLPM + RINSEBACK_ADJ_FLOW_RATE_MLPM) <= RINSEBACK_MAX_RLOW_RATE_MLPM) {
-                if (_treatmentStatus.rinsebackState == RINSEBACK_RUN_STATE) {
-                    acceptReject                        = ACCEPT_VALUE;
+                if (_treatmentSubStates.rinsebackState == RINSEBACK_RUN_STATE) {
+                    acceptReject                           = ACCEPT_VALUE;
                     _treatmentStatus.rinsebackFlowMLPM += RINSEBACK_ADJ_FLOW_RATE_MLPM;
                 }
                 else { reason.append(REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE); }
@@ -51,7 +51,7 @@
 
         case REQUESTED_USER_ACTION_RINSEBACK_DECREASE_RATE:
             if ((_treatmentStatus.rinsebackFlowMLPM - RINSEBACK_ADJ_FLOW_RATE_MLPM) >= RINSEBACK_MIN_FLOW_RATE_MLPM) {
-                if (_treatmentStatus.rinsebackState == RINSEBACK_RUN_STATE) {
+                if (_treatmentSubStates.rinsebackState == RINSEBACK_RUN_STATE) {
                     acceptReject                        = ACCEPT_VALUE;
                     _treatmentStatus.rinsebackFlowMLPM -= RINSEBACK_ADJ_FLOW_RATE_MLPM;
                 }
@@ -61,25 +61,25 @@
             break;
 
         case REQUESTED_USER_ACTION_RINSEBACK_PAUSE:
-            if (_treatmentStatus.rinsebackState == RINSEBACK_RUN_STATE) {
-                acceptReject                    = ACCEPT_VALUE;
-                _treatmentStatus.rinsebackState = RINSEBACK_PAUSED_STATE;
+            if (_treatmentSubStates.rinsebackState == RINSEBACK_RUN_STATE) {
+                acceptReject                       = ACCEPT_VALUE;
+                _treatmentSubStates.rinsebackState = RINSEBACK_PAUSED_STATE;
             }
             else { reason.append(REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE); }
             break;
 
         case REQUESTED_USER_ACTION_RINSEBACK_RESUME:
-            if (_treatmentStatus.rinsebackState == RINSEBACK_PAUSED_STATE) {
-                acceptReject                    = ACCEPT_VALUE;
-                _treatmentStatus.rinsebackState = RINSEBACK_RUN_STATE;
+            if (_treatmentSubStates.rinsebackState == RINSEBACK_PAUSED_STATE) {
+                acceptReject                       = ACCEPT_VALUE;
+                _treatmentSubStates.rinsebackState = RINSEBACK_RUN_STATE;
             }
             else { reason.append(REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE); }
             break;
 
         case REQUESTED_USER_ACTION_RINSEBACK_ADDITIONAL:
-            if (_treatmentStatus.rinsebackState == RINSEBACK_STOP_STATE) {
-                acceptReject                    = ACCEPT_VALUE;
-                _treatmentStatus.rinsebackState = RINSEBACK_RUN_ADDITIONAL_STATE;
+            if (_treatmentSubStates.rinsebackState == RINSEBACK_STOP_STATE) {
+                acceptReject                       = ACCEPT_VALUE;
+                _treatmentSubStates.rinsebackState = RINSEBACK_RUN_ADDITIONAL_STATE;
             }
             else { reason.append(REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE); }
             break;
@@ -88,7 +88,7 @@
             if(_treatmentStatus.isTreatmentComplete) {
                 reason.append(REQUEST_REJECT_REASON_TREATMENT_IS_COMPLETED);
             }
-            else if (_treatmentStatus.rinsebackState != RINSEBACK_STOP_STATE) {
+            else if (_treatmentSubStates.rinsebackState != RINSEBACK_STOP_STATE) {
                 reason.append(REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE);
             }
             // TODO implement recirc allowed too
@@ -116,12 +116,12 @@
 
     // TODO should we alarm if we timedout?
 
-    switch (_treatmentStatus.rinsebackState) {
+    switch (_treatmentSubStates.rinsebackState) {
         case RINSEBACK_RUN_STATE:
             _treatmentStatus.rinsebackAccumVolML  += _treatmentStatus.rinsebackFlowMLPM * RINSEBACK_FLOW_INTEGRATOR;
             _treatmentStatus.rinsebackTimerCounter = 0;
             if (_treatmentStatus.rinsebackAccumVolML >= _treatmentParams.rinsebackVolumeML) {
-                _treatmentStatus.rinsebackState              = RINSEBACK_STOP_STATE;
+                _treatmentSubStates.rinsebackState           = RINSEBACK_STOP_STATE;
                 _treatmentStatus.rinsebackTgtVolPlusAddVolML = _treatmentStatus.rinsebackAccumVolML;
             }
             break;
@@ -141,11 +141,11 @@
             _treatmentStatus.rinsebackAccumVolML      += _treatmentStatus.rinsebackFlowMLPM * RINSEBACK_FLOW_INTEGRATOR;
             _treatmentStatus.rinsebackAdditionalVolML += _treatmentStatus.rinsebackFlowMLPM * RINSEBACK_FLOW_INTEGRATOR;
             if (_treatmentStatus.rinsebackAdditionalVolML >= RINSEBACK_ADDITION_VOL_ML) {
-                _treatmentStatus.rinsebackState = RINSEBACK_STOP_STATE;
+                _treatmentSubStates.rinsebackState = RINSEBACK_STOP_STATE;
             }
             // TODO add alarm?
             if (_treatmentStatus.rinsebackAdditionalTimerCounter * QOBJECT_TIMER_TIMEOUT_MS > RINSEBACK_MAX_ADDITION_TIME_MS) {
-                _treatmentStatus.rinsebackState = RINSEBACK_STOP_STATE;
+                _treatmentSubStates.rinsebackState = RINSEBACK_STOP_STATE;
             }
             break;