Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h
===================================================================
diff -u -re699d00afc964052ec0e91ca72e101d21aa00413 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h	(.../VPreTreatmentStatesData.h)	(revision e699d00afc964052ec0e91ca72e101d21aa00413)
+++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h	(.../VPreTreatmentStatesData.h)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
@@ -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    VPreTreatmentStatesData.h
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      25-Oct-2022
+ * \date    (last)      01-Aug-2023
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  11-Apr-2021
  *
@@ -49,6 +49,8 @@
     PROPERTY( quint8 , primeState                               ,     0 ) ///< HD_PRE_TREATMENT_PRIME_STATE                     , Prime blood and dialysate circuits and run wet self-tests state
     PROPERTY( quint8 , recirculateState                         ,     0 ) ///< HD_PRE_TREATMENT_RECIRCULATE_STATE               , Re-circulate blood and dialysate circuits state
     PROPERTY( quint8 , patientConnectionState                   ,     0 ) ///< HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE        , Patient connection state
+    PROPERTY( quint8 , wetSelfTestsState                        ,     0 ) ///< ???                                              , ???
+    PROPERTY( quint8 , preTreatmentRsrvrState                   ,     0 ) ///< ???                                              , ???
 
     // Start pre-treatment mode state
     PROPERTY( bool   , waterSample                              , false ) ///< HD_PRE_TREATMENT_WATER_SAMPLE_STATE              , Water sample state
@@ -109,7 +111,7 @@
     STATE   ( bool   , prime_salineSetup                        , false ) ///< HD_PRIME_SALINE_SETUP_STATE                      , Saline setup state
     STATE   ( bool   , prime_salinePurgeAir                     , false ) ///< HD_PRIME_SALINE_PURGE_AIR_STATE                  , Saline purge air state
     STATE   ( bool   , prime_salineCirculateBloodCircuit        , false ) ///< HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE         , Circulate blood circuit state
-    STATE   ( bool   , prime_reservoiOneFillComplete            , false ) ///< HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE       , Wait for reservoir 1 fill complete
+    STATE   ( bool   , prime_reservoirOneFillComplete           , false ) ///< HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE       , Wait for reservoir 1 fill complete
     STATE   ( bool   , prime_dialysateDialyzer                  , false ) ///< HD_PRIME_DIALYSATE_DIALYZER_STATE                , Dialysate dialyzer fluid path state
     STATE   ( bool   , prime_salineDialyzerSetup                , false ) ///< HD_PRIME_SALINE_DIALYZER_SETUP_STATE             , Saline dialyzer setup state
     STATE   ( bool   , prime_salineDialyzer                     , false ) ///< HD_PRIME_SALINE_DIALYZER_STATE                   , Saline dialyzer fluid path state
@@ -119,6 +121,11 @@
     STATE   ( bool   , prime_pause                              , false ) ///< HD_PRIME_PAUSE                                   , Prime pause state, waits to be resumed
     STATE   ( bool   , prime_complete                           , false ) ///< HD_PRIME_COMPLETE                                , Prime complete state
 
+    STATE   ( bool   , prime__BloodCircuit                      , false ) ///< bundled/cobined states to be used with the corresponding States on the related UI screen.
+    STATE   ( bool   , prime__DialysateCircuit                  , false ) ///< bundled/cobined states to be used with the corresponding States on the related UI screen.
+    STATE   ( bool   , prime__WetSelfTests                      , false ) ///< bundled/cobined states to be used with the corresponding States on the related UI screen.
+
+
     // Re-circulate blood and dialysate circuits state
     PROPERTY( bool   , recirculate_start                        , false ) ///< PRE_TREATMENT_RECIRC_STATE                       , Pre-treatment recirculate state.
     PROPERTY( bool   , recirculate_stopped                      , false ) ///< PRE_TREATMENT_RECIRC_STOPPED_STATE               , Pre-treatment recirculate stopped state.