Index: sources/view/hd/data/treatment/VHDTreatmentStatesData.h
===================================================================
diff -u -rbbb970aff112f09c189986f026055bec794afbd6 -r490f8e817e5b70b63d514d378da618273dd93f57
--- sources/view/hd/data/treatment/VHDTreatmentStatesData.h	(.../VHDTreatmentStatesData.h)	(revision bbb970aff112f09c189986f026055bec794afbd6)
+++ sources/view/hd/data/treatment/VHDTreatmentStatesData.h	(.../VHDTreatmentStatesData.h)	(revision 490f8e817e5b70b63d514d378da618273dd93f57)
@@ -1,13 +1,13 @@
 /*!
  *
- * Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved.
  * \copyright
  * 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    VHDTreatmentStatesData.h
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      02-Feb-2023
+ * \date    (last)      20-Jul-2023
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  11-Apr-2021
  *
@@ -65,6 +65,7 @@
     PROPERTY( bool   , txBloodPrime             , false) ///< TREATMENT_BLOOD_PRIME_STATE     = 1 # Prime blood-side of dialyzer with gradual ramp for 1 min. while dialyzer is bypassed.  No dialysis or UF taking place.  No treatment time.
     PROPERTY( bool   , txDialysis               , false) ///< TREATMENT_DIALYSIS_STATE        = 2 # Perform dialysis.  Deliver Heparin as prescribed.  Deliver UF as prescribed.  Handle saline boluses as requested
     PROPERTY( bool   , txStop                   , false) ///< TREATMENT_STOP_STATE            = 3 # Treatment stopped.  All pumps off.  Dializer bypassed
+    PROPERTY( bool   , txTreatment              , false) ///< TREATMENT_STOP_STATE            = 3  || TREATMENT_DIALYSIS_STATE        = 2
     PROPERTY( bool   , txRinseback              , false) ///< TREATMENT_RINSEBACK_STATE       = 4 # Perform rinseback with saline.  Dialyzer bypassed. Dialysate recirculating
     PROPERTY( bool   , txRecirculate            , false) ///< TREATMENT_RECIRC_STATE          = 5 # Recirculate saline and dialysate while patient disconnected.  Blood lines open and shunted.  Dialyzer is bypassed
     PROPERTY( bool   , txEnd                    , false) ///< TREATMENT_END_STATE             = 6 # Dialysis has ended.  Blood pump slowed.  Dialyzer is bypassed.  Dialysate is recirculated.  User can rinseback
@@ -101,10 +102,13 @@
     PROPERTY( bool   , rbPaused                 , false) ///< RINSEBACK_PAUSED_STATE                    = 2 # Rinseback paused state of the rinseback sub-mode state machine
     PROPERTY( bool   , rbStop                   , false) ///< RINSEBACK_STOP_STATE                      = 3 # Rinseback stopped (done) state of the rinseback sub-mode state machine
     PROPERTY( bool   , rbAdditional             , false) ///< RINSEBACK_RUN_ADDITIONAL_STATE            = 4 # Additional rinseback volume (10 mL) state of the rinseback sub-mode state machine
+    PROPERTY( bool   , rbReconnect              , false) ///< RINSEBACK_RECONNECT_PATIENT_STATE         = 5 # Rinseback reconnect state of the rinseback sub-mode state machine
 
     // Recirculate states
-    PROPERTY( bool   , rcStarted                , true ) ///< TREATMENT_RECIRC_RECIRC_STATE             = 0 # Re-circulate state of the treatment re-circulate sub-mode state machine
-    PROPERTY( bool   , rcStopped                , false) ///< TREATMENT_RECIRC_STOPPED_STATE            = 1 # Stopped state of the treatment re-circulate sub-mode state machine
+    PROPERTY( bool   , rcDisconnect             , true ) ///< TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE = 0 # Disconnect patient state of the treatment re-circulate sub-mode state machine
+    PROPERTY( bool   , rcStarted                , false) ///< TREATMENT_RECIRC_RECIRC_STATE             = 1 # Re-circulate Dialysate state of the treatment re-circulate sub-mode state machine
+    PROPERTY( bool   , rcStopped                , false) ///< TREATMENT_RECIRC_STOPPED_STATE            = 2 # Stopped state of the treatment re-circulate sub-mode state machine
+    PROPERTY( bool   , rcReconnect              , false) ///< TREATMENT_RECIRC_RECONNECT_PATIENT_STATE  = 3 # Reconnect patient state of the treatment re-circulate sub-mode state machine
 
     // Blood Prime
     PROPERTY( bool   , bpRamp                   , true ) ///< BLOOD_PRIME_RAMP_STATE                    = 0 # Ramp state of the blood prime sub-mode state machine
@@ -118,6 +122,7 @@
     PROPERTY( bool   , tsRecirculateDialysate   , false) ///< TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE= 1, Re-circulate Dialysate only state of the treatment re-circulate sub-mode state machine
     PROPERTY( bool   , tsRecirculateBlood       , false) ///< TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE    = 2, Re-circulate Blood only state of the treatment re-circulate sub-mode state machine
     PROPERTY( bool   , tsRecirculateNo          , false) ///< TREATMENT_STOP_NO_RECIRC_STATE            = 3, No re-circulation state of the treatment stop sub-mode state machine
+    PROPERTY( bool   , tsRecoverBloodDetect     , false) ///< TREATMENT_STOP_RECOVER_BLOOD_DETECT_STATE = 4, Treatment stop recover blood detect state
 
     // class definition
     VIEW_DEC_CLASS(VHDTreatmentStates)