Index: denali.pro
===================================================================
diff -u -r0a4abcc41defc031ae20dd79f9550619bc6c9806 -r96854524927f212c24b9e4a253baeff2e672228f
--- denali.pro	(.../denali.pro)	(revision 0a4abcc41defc031ae20dd79f9550619bc6c9806)
+++ denali.pro	(.../denali.pro)	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -61,6 +61,7 @@
     sources/ApplicationController.h \
     \ # ---------- Models ----------
     sources/model/MModel.h \
+    sources/model/MAbstractProgressData.h \
     sources/model/MAbstract.h \
     sources/model/MPowerOff.h \
     sources/model/MStartTreatmentResponse.h \
@@ -93,6 +94,10 @@
     sources/model/hd/data/MHDOperationModeData.h \
     sources/model/hd/data/MPreTreatmentStatesData.h \
     sources/model/hd/data/MTreatmentStatesData.h \
+    \ # ---------- Models - HD - Data - Pre-Treatment - Progress
+    sources/model/hd/data/MPreTreatmentSelfTestNoCartridgeData.h \
+    sources/model/hd/data/MPreTreatmentSelfTestDryData.h \
+    sources/model/hd/data/MPreTreatmentPrimeData.h \
     \ # ---------- Models - HD - Data
     sources/model/hd/data/MHDAccelerometerData.h \
     sources/model/hd/data/MTreatmentTimeData.h \
@@ -105,9 +110,10 @@
     sources/model/hd/data/MTreatmentRinsebackData.h \
     sources/model/hd/data/MTreatmentRecirculateData.h \
     sources/model/hd/data/MTreatmentBloodPrimeData.h \
-    sources/model/hd/data/MPrimingData.h \
     \ # ---------- Models - DG - Adjustment
     sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.h \
+    \ # ---------- Models - DG - Data - Pre-Treatment - Progress
+    sources/model/dg/data/MDGFilterFlushData.h \
     \ # ---------- Models - DG - Data
     sources/model/dg/data/MDGDrainPumpData.h \
     sources/model/dg/data/MDGHeatersData.h \
@@ -138,7 +144,6 @@
     sources/view/VEventSpy.h \
     sources/view/VView.h \
     sources/view/VPowerOff.h \
-    sources/view/VPriming.h \
     \ # ---------- Views - Alarm
     sources/view/hd/alarm/VAlarmStatus.h \
     \ # ---------- Views - HD - Adjustment
@@ -158,10 +163,14 @@
     sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.h \
     sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.h \
     sources/view/hd/adjustment/VTreatmentAdjustmentEnd.h \
-    \ # ---------- Views - HD - States Data
+    \ # ---------- Views - HD - Data - States
     sources/view/hd/data/VHDOperationModeData.h \
-    sources/view/hd/data/VPreTreatmentStatesData.h \
     sources/view/hd/data/VHDTreatmentStatesData.h \
+    sources/view/hd/data/VPreTreatmentStatesData.h \
+    \ # ---------- Views - HD - Data - Pre-Treatment - Progress
+    sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.h \
+    sources/view/hd/data/VPreTreatmentSelfTestDryData.h \
+    sources/view/hd/data/VPreTreatmentPrimeData.h \
     \ # ---------- Views - HD - Data
     sources/view/hd/data/VHDAccelerometerData.h \
     sources/view/hd/data/VTreatmentTime.h \
@@ -175,6 +184,8 @@
     sources/view/hd/data/VTreatmentRinsebackData.h \
     sources/view/hd/data/VTreatmentRecirculateData.h \
     sources/view/hd/data/VTreatmentBloodPrimeData.h \
+    \ # ---------- Views - DG - Data - Pre-Treatment - Progress
+    sources/view/dg/data/VDGFilterFlushData.h \
     \ # ---------- Views - DG - Data
     sources/view/dg/data/VDGOperationModeData.h \
     sources/view/dg/data/VDGDrainPumpData.h \
@@ -212,6 +223,7 @@
     sources/ApplicationController.cpp \
     \ # ---------- Models ----------
     sources/model/MAbstract.cpp \
+    sources/model/MAbstractProgressData.cpp \
     sources/model/MPowerOff.cpp \
     sources/model/MHDDebugText.cpp \
     sources/model/MStartTreatmentResponse.cpp \
@@ -238,7 +250,11 @@
     sources/model/hd/adjustment/MTreatmentAdjustRinsebackResponse.cpp \
     sources/model/hd/adjustment/MTreatmentAdjustRecirculateResponse.cpp \
     sources/model/hd/adjustment/MTreatmentAdjustEndResponse.cpp \
-    \ # ---------- Models - HD - States Data
+    \ # ---------- Models - HD - Data - Pre-Treatment - Progress
+    sources/model/hd/data/MPreTreatmentSelfTestNoCartridgeData.cpp \
+    sources/model/hd/data/MPreTreatmentSelfTestDryData.cpp \
+    sources/model/hd/data/MPreTreatmentPrimeData.cpp \
+    \ # ---------- Models - HD - Data - States
     sources/model/hd/data/MHDOperationModeData.cpp \
     sources/model/hd/data/MPreTreatmentStatesData.cpp \
     sources/model/hd/data/MTreatmentStatesData.cpp \
@@ -254,9 +270,10 @@
     sources/model/hd/data/MTreatmentRinsebackData.cpp \
     sources/model/hd/data/MTreatmentRecirculateData.cpp \
     sources/model/hd/data/MTreatmentBloodPrimeData.cpp \
-    sources/model/hd/data/MPrimingData.cpp \
     \ # ---------- Models - DG - Adjustment
     sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.cpp \
+    \ # ---------- Models - DG - Data - Pre-Treatment - Progress
+    sources/model/dg/data/MDGFilterFlushData.cpp \
     \ # ---------- Models - DG - Data
     sources/model/dg/data/MDGDrainPumpData.cpp \
     sources/model/dg/data/MDGHeatersData.cpp \
@@ -284,7 +301,6 @@
     sources/view/VTreatmentCreate.cpp \
     sources/view/VTreatmentBegin.cpp \
     sources/view/VEventSpy.cpp \
-    sources/view/VPriming.cpp \
     sources/view/VPowerOff.cpp \
     \ # ---------- Views - Alarm
     sources/view/hd/alarm/VAlarmStatus.cpp \
@@ -305,6 +321,10 @@
     sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentEnd.cpp \
+    \ # ---------- Views - HD - Data - Pre-Treatment - Progress
+    sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.cpp \
+    sources/view/hd/data/VPreTreatmentSelfTestDryData.cpp \
+    sources/view/hd/data/VPreTreatmentPrimeData.cpp \
     \ # ---------- Views - HD - States Data
     sources/view/hd/data/VHDOperationModeData.cpp \
     sources/view/hd/data/VPreTreatmentStatesData.cpp \
@@ -322,6 +342,8 @@
     sources/view/hd/data/VTreatmentRinsebackData.cpp \
     sources/view/hd/data/VTreatmentRecirculateData.cpp \
     sources/view/hd/data/VTreatmentBloodPrimeData.cpp \
+    \ # ---------- Views - DG - Data - Pre-Treatment - Progress
+    sources/view/dg/data/VDGFilterFlushData.cpp \
     \ # ---------- Views - DG - Data
     sources/view/dg/data/VDGDrainPumpData.cpp \
     sources/view/dg/data/VDGHeatersData.cpp \
Index: denali.pro.user
===================================================================
diff -u -r0a4abcc41defc031ae20dd79f9550619bc6c9806 -r96854524927f212c24b9e4a253baeff2e672228f
--- denali.pro.user	(.../denali.pro.user)	(revision 0a4abcc41defc031ae20dd79f9550619bc6c9806)
+++ denali.pro.user	(.../denali.pro.user)	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.0, 2021-03-01T23:04:01. -->
+<!-- Written by QtCreator 4.10.0, 2021-03-04T11:44:07. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r0a4abcc41defc031ae20dd79f9550619bc6c9806 -r96854524927f212c24b9e4a253baeff2e672228f
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 0a4abcc41defc031ae20dd79f9550619bc6c9806)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -127,9 +127,13 @@
     {Gui::GuiActionType::ID_CreateTreatmentRsp              ,   18 * 4      }, // 18 parameters, each 4 bytes
 
 
-    // ----
-    {Gui::GuiActionType::ID_PrimingData                     ,   3 * 4       }, // 3 parameters each 4bytes
+    // Pre-Treatment Progress Data
+    {Gui::GuiActionType::ID_DGFilterFlush                   ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_SelfTestNoCartridge             ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_SelfTestDry                     ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_DisposablesPrime                ,   2 * 4       }, // 2 parameters each 4bytes
 
+
     // ----
     {Gui::GuiActionType::ID_AdjustSalineReq                 ,   1 * 4       }, // 1 parameter  each 4bytes
     {Gui::GuiActionType::ID_AdjustSalineRsp                 ,   3 * 4       }, // 3 parameters each 4bytes
Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r0a4abcc41defc031ae20dd79f9550619bc6c9806 -r96854524927f212c24b9e4a253baeff2e672228f
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 0a4abcc41defc031ae20dd79f9550619bc6c9806)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -333,13 +333,16 @@
     case Gui::GuiActionType::ID_DialysateOutletFlow             : ok = notify<Model::MOutletFlow                            >(vMessage, vData, Gui::GuiActionType::ID_DialysateOutletFlow           ); break;
     case Gui::GuiActionType::ID_TreatmentRanges                 : ok = notify<Model::MTreatmentRanges                       >(vMessage, vData, Gui::GuiActionType::ID_TreatmentRanges               ); break;
     case Gui::GuiActionType::ID_PressureOcclusion               : ok = notify<Model::MPressureOcclusion                     >(vMessage, vData, Gui::GuiActionType::ID_PressureOcclusion             ); break;
-    case Gui::GuiActionType::ID_PrimingData                     : ok = notify<Model::MPrimingData                           >(vMessage, vData, Gui::GuiActionType::ID_PrimingData                   ); break;
     case Gui::GuiActionType::ID_Saline                          : ok = notify<Model::MTreatmentSaline                       >(vMessage, vData, Gui::GuiActionType::ID_Saline                        ); break;
     case Gui::GuiActionType::ID_Heparin                         : ok = notify<Model::MTreatmentHeparin                      >(vMessage, vData, Gui::GuiActionType::ID_Heparin                       ); break;
     case Gui::GuiActionType::ID_Rinseback                       : ok = notify<Model::MTreatmentRinseback                    >(vMessage, vData, Gui::GuiActionType::ID_Rinseback                     ); break;
     case Gui::GuiActionType::ID_Recirculate                     : ok = notify<Model::MTreatmentRecirculate                  >(vMessage, vData, Gui::GuiActionType::ID_Recirculate                   ); break;
     case Gui::GuiActionType::ID_BloodPrime                      : ok = notify<Model::MTreatmentBloodPrime                   >(vMessage, vData, Gui::GuiActionType::ID_BloodPrime                    ); break;
     case Gui::GuiActionType::ID_HDAccelerometerData             : ok = notify<Model::MHDAccelerometer                       >(vMessage, vData, Gui::GuiActionType::ID_HDAccelerometerData           ); break;
+    // ----- Datum - Pre-Treatment progress
+    case Gui::GuiActionType::ID_SelfTestNoCartridge             : ok = notify<Model::MPreTreatmentSelfTestNoCartridge       >(vMessage, vData, Gui::GuiActionType::ID_SelfTestNoCartridge           ); break;
+    case Gui::GuiActionType::ID_SelfTestDry                     : ok = notify<Model::MPreTreatmentSelfTestDry               >(vMessage, vData, Gui::GuiActionType::ID_SelfTestDry                   ); break;
+    case Gui::GuiActionType::ID_DisposablesPrime                : ok = notify<Model::MPreTreatmentPrime                     >(vMessage, vData, Gui::GuiActionType::ID_DisposablesPrime              ); break;
 
     // ----- Events
     case Gui::GuiActionType::ID_Acknow                          : ok = true;                                                     break; // TODO : implement notify<>()
@@ -416,9 +419,11 @@
     case Gui::GuiActionType::ID_DGTemperaturesData      : ok = notify<Model::MDGTemperatures     >(vMessage, vData, Gui::GuiActionType::ID_DGTemperaturesData    ); break;
     case Gui::GuiActionType::ID_DGDebugText             : ok = notify<Model::MDGDebugText        >(vMessage, vData, Gui::GuiActionType::ID_DGDebugText           ); break;
     case Gui::GuiActionType::ID_DGAccelerometerData     : ok = notify<Model::MDGAccelerometer    >(vMessage, vData, Gui::GuiActionType::ID_DGAccelerometerData   ); break;
+    // ----- Datum - Pre-Treatment progress
+    case Gui::GuiActionType::ID_DGFilterFlush           : ok = notify<Model::MDGFilterFlush      >(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlush         ); break;
 
     // DG Response Messages
-    case Gui::GuiActionType::ID_AdjustDGVersionsRsp     : ok = notify<Model::MAdjustDGVersionsResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGVersionsRsp    ); break;
+    case Gui::GuiActionType::ID_AdjustDGVersionsRsp     : ok = notify<Model::MAdjustDGVersionsResponse  >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGVersionsRsp    ); break;
 
     // unhandled messages: these will only be logged as received message
     // there has nothing been defined for these messages.
Index: sources/gui/GuiGlobals.cpp
===================================================================
diff -u -r0a4abcc41defc031ae20dd79f9550619bc6c9806 -r96854524927f212c24b9e4a253baeff2e672228f
--- sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision 0a4abcc41defc031ae20dd79f9550619bc6c9806)
+++ sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -28,11 +28,16 @@
 
 #include "VAlarmStatus.h"
 #include "VPowerOff.h"
-
+// states data
 #include "VHDOperationModeData.h"
 #include "VPreTreatmentStatesData.h"
 #include "VHDTreatmentStatesData.h"
-
+// Pre-treatment
+#include "VDGFilterFlushData.h"
+#include "VPreTreatmentSelfTestNoCartridgeData.h"
+#include "VPreTreatmentSelfTestDryData.h"
+#include "VPreTreatmentPrimeData.h"
+// In-treatment - Data
 #include "VTreatmentBloodFlow.h"
 #include "VTreatmentDialysateFlow.h"
 #include "VTreatmentUltrafiltration.h"
@@ -45,7 +50,7 @@
 #include "VTreatmentRecirculateData.h"
 #include "VTreatmentBloodPrimeData.h"
 #include "VHDAccelerometerData.h"
-
+// DG data
 #include "VDGDrainPumpData.h"
 #include "VDGHeatersData.h"
 #include "VDGLoadCellReadingsData.h"
@@ -56,10 +61,10 @@
 #include "VDGTemperaturesData.h"
 #include "VDGValvesStatesData.h"
 #include "VDGAccelerometerData.h"
-
+// -----
 #include "VTreatmentCreate.h"
-#include "VPriming.h"
 #include "VTreatmentBegin.h"
+// ----- In-Treatment Adjustments
 #include "VTreatmentAdjustmentDuration.h"
 #include "VTreatmentAdjustmentFlows.h"
 #include "VTreatmentAdjustmentUltrafiltrationInit.h"
@@ -70,8 +75,9 @@
 #include "VTreatmentAdjustmentHeparin.h"
 #include "VTreatmentAdjustmentRinseback.h"
 #include "VTreatmentAdjustmentRecirculate.h"
-#include "VTreatmentAdjustmentEnd.h"
 #include "VTreatmentAdjustmentPressuresLimits.h"
+// -----
+#include "VTreatmentAdjustmentEnd.h"
 #include "VTreatmentAdjustmentVersions.h"
 
 namespace Gui {
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r0a4abcc41defc031ae20dd79f9550619bc6c9806 -r96854524927f212c24b9e4a253baeff2e672228f
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 0a4abcc41defc031ae20dd79f9550619bc6c9806)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -107,11 +107,16 @@
             // Pre-Treatment Parameters
             ID_CreateTreatmentReq               = 0x3500, // 53
             ID_CreateTreatmentRsp               = 0x3600, // 54
+            ID_ConfirmTreatmentReq              = 0x3B00, // 59
             ID_StartTreatmentReq                = 0x3800, // 56
             ID_StartTreatmentRsp                = 0x3900, // 57
-            ID_ConfirmTreatmentReq              = 0x3B00, // 59
-            ID_PrimingData                      = 0x4300, // 67
+            // Pre-Treatment Progress Data
+            ID_DGFilterFlush                    = 0x6000, // 96
+            ID_SelfTestNoCartridge              = 0x6100, // 97
+            ID_SelfTestDry                      = 0x6300, // 99
+            ID_DisposablesPrime                 = 0x4300, // 67
 
+
             // DG Data Messages
             ID_DGROPumpData                     = 0x1F00, // 31
             ID_DGPressuresData                  = 0x2000, // 32
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r0a4abcc41defc031ae20dd79f9550619bc6c9806 -r96854524927f212c24b9e4a253baeff2e672228f
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 0a4abcc41defc031ae20dd79f9550619bc6c9806)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -36,7 +36,12 @@
 import VTreatmentBloodPrime                         0.1
 import VTreatmentRanges                             0.1
 import VHDAccelerometer                             0.1
-
+// Pre-Treatment Progress Data
+import VDGFilterFlush                               0.1
+import VPreTreatmentSelfTestNoCartridge             0.1
+import VPreTreatmentSelfTestDry                     0.1
+import VPreTreatmentPrime                           0.1
+// ---
 import VDGDrainPump                                 0.1
 import VDGHeaters                                   0.1
 import VDGLoadCellReadings                          0.1
@@ -46,7 +51,6 @@
 import VDGReservoir                                 0.1
 import VDGTemperatures                              0.1
 import VDGValvesStates                              0.1
-import VPriming                                     0.1
 import VTreatmentBegin                              0.1
 import VTreatmentCreate                             0.1
 import VDGAccelerometer                             0.1
@@ -103,11 +107,15 @@
     VDGTemperatures                             { id: vDGTemperatures                               }
     VDGValvesStates                             { id: vDGValvesStates                               }
     VDGAccelerometer                            { id: vDGAccelerometer                              }
+    // --- Pre-Treatment Progress Data
+    VDGFilterFlush                              { id: vDGFilterFlush                                }
+    VPreTreatmentSelfTestNoCartridge            { id: vPreTreatmentSelfTestNoCartridge              }
+    VPreTreatmentSelfTestDry                    { id: vPreTreatmentSelfTestDry                      }
+    VPreTreatmentPrime                          { id: vPreTreatmentPrime                            }
     // ---
     VTreatmentAdjustmentDuration                { id: vTreatmentAdjustmentDuration                  }
     VTreatmentAdjustmentFlows                   { id: vTreatmentAdjustmentFlows                     }
     VTreatmentCreate                            { id: vTreatmentCreate                              }
-    VPriming                                    { id: vPriming                                      }
     VTreatmentBegin                             { id: vTreatmentBegin                               }
     VTreatmentAdjustmentUltrafiltrationInit     { id: vTreatmentAdjustmentUltrafiltrationInit       }
 
Index: sources/gui/qml/pages/pretreatment/prime/PreTreatmentPrime.qml
===================================================================
diff -u -rc15ce613e372838316d42c40a86953e6f0aa05d3 -r96854524927f212c24b9e4a253baeff2e672228f
--- sources/gui/qml/pages/pretreatment/prime/PreTreatmentPrime.qml	(.../PreTreatmentPrime.qml)	(revision c15ce613e372838316d42c40a86953e6f0aa05d3)
+++ sources/gui/qml/pages/pretreatment/prime/PreTreatmentPrime.qml	(.../PreTreatmentPrime.qml)	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -55,14 +55,14 @@
         anchors.top: _titleText.bottom
         anchors.topMargin: 25
         minimum: 0
-        maximum: vPriming.secondsTotal
+        maximum: vPreTreatmentPrime.total
         diameter: 100
-        value: vPriming.primingComplete ? vPriming.secondsTotal : vPriming.secondsTotal - vPriming.secondsRemaining
+        value: vPreTreatmentPrime.elapsed
 
         PrimingTimer { id: _timeText
             anchors.centerIn: parent
-            seconds : vPriming.secondsRemaining
-            completed: vPriming.primingComplete
+            seconds : vPreTreatmentPrime.remaining
+            completed: false // vPreTreatmentPrime.complete
         }
     }
 
@@ -76,21 +76,21 @@
             anchors.horizontalCenter: parent.horizontalCenter
             color   : Colors.transparent
             text: qsTr("Checking installation")
-            completed: vPriming.checkingInstallationComplete
+            completed: false //vPreTreatmentPrime.checkingInstallationComplete
         }
 
         CheckListItem { id: _creating_dialysate
             anchors.horizontalCenter: parent.horizontalCenter
             color   : Colors.transparent
             text    : qsTr("Creating dialysate")
-            completed: vPriming.creatingDialysateComplete
+            completed: false //vPreTreatmentPrime.creatingDialysateComplete
         }
 
         CheckListItem { id: _priming_lines
             anchors.horizontalCenter: parent.horizontalCenter
             color   : Colors.transparent
             text    : qsTr("Priming lines")
-            completed: vPriming.primingLinesComplete
+            completed: false //vPreTreatmentPrime.primingLinesComplete
         }
     }
 
@@ -100,7 +100,7 @@
         anchors.top: _checklist.bottom
         anchors.topMargin: 45
         text: qsTr("Priming Complete!")
-        color: vPriming.primingComplete ? Colors.textMain : Colors.transparent
+        color: Colors.textMain //vPreTreatmentPrime.primingComplete ? Colors.textMain : Colors.transparent
         font.pixelSize: Fonts.fontPixelPriming
     }
 
@@ -111,7 +111,7 @@
         anchors.topMargin: 50
         width: 490
         height: 60
-        text.text:   vPriming.continueBtnText
+        text.text: qsTr("CONTINUE TO TREATMENT")
         disabled : false  // it has not been implemeted in the FW so it is enabled always.
         // /*! vPriming.primingComplete // */vPriming.continueEnabled
         onEnabledChanged: {
Index: sources/model/MModel.h
===================================================================
diff -u -r0a4abcc41defc031ae20dd79f9550619bc6c9806 -r96854524927f212c24b9e4a253baeff2e672228f
--- sources/model/MModel.h	(.../MModel.h)	(revision 0a4abcc41defc031ae20dd79f9550619bc6c9806)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -37,7 +37,6 @@
 #include "MTreatmentRinsebackData.h"
 #include "MTreatmentRecirculateData.h"
 #include "MTreatmentBloodPrimeData.h"
-#include "MPrimingData.h"
 #include "MHDAccelerometerData.h"
 
 #include "MDGDrainPumpData.h"
@@ -50,6 +49,11 @@
 #include "MDGTemperaturesData.h"
 #include "MDGValvesStatesData.h"
 #include "MDGAccelerometerData.h"
+// Pre-Treatment progress Data
+#include "MDGFilterFlushData.h"
+#include "MPreTreatmentSelfTestNoCartridgeData.h"
+#include "MPreTreatmentSelfTestDryData.h"
+#include "MPreTreatmentPrimeData.h"
 
 #include "MTreatmentParametersResp.h"
 
@@ -229,7 +233,10 @@
                                                                                                 \
     REGISTER_METATYPE(                                                        HDDebugTextData ) \
     REGISTER_METATYPE(                                                        DGDebugTextData ) \
-    REGISTER_METATYPE(                                                            PrimingData ) \
+    REGISTER_METATYPE(                                                      DGFilterFlushData ) \
+    REGISTER_METATYPE(                                    PreTreatmentSelfTestNoCartridgeData ) \
+    REGISTER_METATYPE(                                            PreTreatmentSelfTestDryData ) \
+    REGISTER_METATYPE(                                                  PreTreatmentPrimeData ) \
                                                                                                 \
     /*   Request    */                                                                          \
     REGISTER_METATYPE(                                              StartTreatmentRequestData ) \
@@ -325,7 +332,10 @@
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 HDDebugTextData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 DGDebugTextData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                     PrimingData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                               DGFilterFlushData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,             PreTreatmentSelfTestNoCartridgeData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     PreTreatmentSelfTestDryData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                           PreTreatmentPrimeData ) \
     /*   Response   */                                                                          \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                AdjustBloodDialysateResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                      AdjustDurationResponseData ) \
@@ -426,7 +436,10 @@
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         HDDebugTextData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         DGDebugTextData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                                             PrimingData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                       DGFilterFlushData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                     PreTreatmentSelfTestNoCartridgeData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                             PreTreatmentSelfTestDryData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                   PreTreatmentPrimeData ) \
     /*   Response   */                                                                          \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustBloodDialysateResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                              AdjustDurationResponseData ) \
@@ -558,7 +571,10 @@
                                                                                                 \
     ACTION_RECEIVE_SIGNAL(                                                    HDDebugTextData ) \
     ACTION_RECEIVE_SIGNAL(                                                    DGDebugTextData ) \
-    ACTION_RECEIVE_SIGNAL(                                                        PrimingData ) \
+    ACTION_RECEIVE_SIGNAL(                                                  DGFilterFlushData ) \
+    ACTION_RECEIVE_SIGNAL(                                PreTreatmentSelfTestNoCartridgeData ) \
+    ACTION_RECEIVE_SIGNAL(                                        PreTreatmentSelfTestDryData ) \
+    ACTION_RECEIVE_SIGNAL(                                              PreTreatmentPrimeData ) \
     /*   Response */                                                                            \
     ACTION_RECEIVE_SIGNAL(                                         StartTreatmentResponseData ) \
                                                                                                 \
Index: sources/model/dg/data/MDGFilterFlushData.cpp
===================================================================
diff -u
--- sources/model/dg/data/MDGFilterFlushData.cpp	(revision 0)
+++ sources/model/dg/data/MDGFilterFlushData.cpp	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -0,0 +1,45 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 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    MDGFilterFlushData.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      02-Mar-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  02-Mar-2021
+ *
+ */
+#include "MDGFilterFlushData.h"
+
+using namespace Model;
+
+QVariantList MDGFilterFlush::parameters() const {
+    return {
+        _data.mTimeout   .value,
+        _data.mCountdown .value,
+    };
+}
+
+bool MDGFilterFlush::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
+    int index = 0; // message data start position
+    if (GetValue(vByteArray, index, _data.mTimeout   ))
+    if (GetValue(vByteArray, index, _data.mCountdown ))
+        return true ;
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+}
+
+/*!
+ * \brief   MDGFilterFlush::data
+ * \details Provides model's Data from the received messages data values
+ * \return  Data
+ */
+MDGFilterFlush::Data MDGFilterFlush::data() const {
+    Data data;
+    data.mTimeout   = _data.mTimeout   .value;
+    data.mCountdown = _data.mCountdown .value;
+    return data;
+}
Index: sources/model/dg/data/MDGFilterFlushData.h
===================================================================
diff -u
--- sources/model/dg/data/MDGFilterFlushData.h	(revision 0)
+++ sources/model/dg/data/MDGFilterFlushData.h	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -0,0 +1,82 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 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    MDGFilterFlush.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      02-Mar-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  02-Mar-2021
+ *
+ */
+#pragma once
+
+// Qt
+#include <QString>
+
+// Project
+#include "MAbstract.h"
+#include "types.h"
+
+// forward declarations
+class tst_models;
+
+namespace Model {
+
+/*!
+ * \brief   The MDGFilterFlush class
+ * \details The progress time data model
+ *
+ * | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description          |
+ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:         |
+ * |0x6000| 0x020  | 7   | 1 Hz   | N   | HD  | All | Filter FlushProgress |
+ *
+ * | Payload  ||
+ * |          ||
+ * | #1:(U32) | \ref Data::mTimeout     |
+ * | #2:(U32) | \ref Data::mCountDown   |
+ *
+ * \sa Data
+ *
+ * <h2 class="groupheader">Logging info</h2>
+ * |              ||
+ * |              ||
+ * | typeText     | Datum       |
+ * | unitText     | DG          |
+ * | infoText     | FilterFlush |
+ *
+ */
+class MDGFilterFlush : public MAbstract {
+
+    // friends
+    friend class ::tst_models;
+
+    QVariantList parameters() const override;
+
+    struct {
+        Types::U32 mTimeout     ;
+        Types::U32 mCountdown   ;
+    } _data;
+
+public:
+
+    Type_Enum    typeText  () const override { return Type_Enum::eDatum ; }
+    Unit_Enum    unitText  () const override { return Unit_Enum::eDG    ; }
+    QString      infoText  () const override { return QString("FilterFlush"); }
+
+    struct Data {
+        quint32    mTimeout     = 0;
+        quint32    mCountdown   = 0;
+    };
+
+    MDGFilterFlush() {}
+
+    bool    fromByteArray   (const QByteArray   &vByteArray  , int *vIndex = nullptr)       override;
+    Data    data            (                                                       ) const         ;
+};
+}
+
+typedef Model::MDGFilterFlush::Data DGFilterFlushData;
Index: sources/model/hd/data/MHDOperationModeData.cpp
===================================================================
diff -u -r6cad9b004e904200b71de7431c745795256080df -r96854524927f212c24b9e4a253baeff2e672228f
--- sources/model/hd/data/MHDOperationModeData.cpp	(.../MHDOperationModeData.cpp)	(revision 6cad9b004e904200b71de7431c745795256080df)
+++ sources/model/hd/data/MHDOperationModeData.cpp	(.../MHDOperationModeData.cpp)	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -5,11 +5,11 @@
  * 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 MHDOperationModeData.cpp
- * \author (last) Behrouz NematiPour
- * \date (last) 16-Oct-2020
- * \author (original) Behrouz NemaiPour
- * \date (original) 02-Jul-2020
+ * \file    MHDOperationModeData.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      16-Oct-2020
+ * \author  (original)  Behrouz NemaiPour
+ * \date    (original)  02-Jul-2020
  *
  */
 #include "MHDOperationModeData.h"
Index: sources/model/hd/data/MPreTreatmentPrimeData.cpp
===================================================================
diff -u
--- sources/model/hd/data/MPreTreatmentPrimeData.cpp	(revision 0)
+++ sources/model/hd/data/MPreTreatmentPrimeData.cpp	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -0,0 +1,45 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 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    MPreTreatmentPrime.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      02-Mar-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  02-Mar-2021
+ *
+ */
+#include "MPreTreatmentPrimeData.h"
+
+using namespace Model;
+
+QVariantList MPreTreatmentPrime::parameters() const {
+    return {
+        _data.mTimeout    .value,
+        _data.mCountdown  .value,
+    };
+}
+
+bool MPreTreatmentPrime::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
+    int index = 0; // message data start position
+    if (GetValue(vByteArray, index, _data.mTimeout   ))
+    if (GetValue(vByteArray, index, _data.mCountdown ))
+        return true ;
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+}
+
+/*!
+ * \brief   MPreTreatmentPrime::data
+ * \details Provides model's Data from the received messages data values
+ * \return  Data
+ */
+MPreTreatmentPrime::Data MPreTreatmentPrime::data() const {
+    Data data;
+    data.mTimeout   = _data.mTimeout   .value;
+    data.mCountdown = _data.mCountdown .value;
+    return data;
+}
Index: sources/model/hd/data/MPreTreatmentPrimeData.h
===================================================================
diff -u
--- sources/model/hd/data/MPreTreatmentPrimeData.h	(revision 0)
+++ sources/model/hd/data/MPreTreatmentPrimeData.h	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -0,0 +1,79 @@
+/*!
+ *
+ * Copyright (c) 2020-2020 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    MPreTreatmentPrimeData.h
+ * \author  (last)     Behrouz NematiPour
+ * \date    (last)     02-Mar-2021
+ * \author  (original) Behrouz NematiPour
+ * \date    (original) 02-Mar-2021
+ *
+ */
+
+#pragma once
+
+// Project
+#include "MAbstractProgressData.h"
+#include "types.h"
+
+// forward declarations
+class tst_models;
+namespace Model {
+
+/*!
+ * \brief   The MPreTreatmentPrime class
+ * \details The progress and state data model
+ *
+ * | MSG  | CAN ID | Box | Type   | Ack | Src | Dst |  Description                        |
+ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:--------------:                     |
+ * |0x4300| 0x020  | 9   | 1 Hz   | N   | HD  | UI  | Pre-Treatment Priming Progress Data |
+ *
+ * | Payload  ||
+ * |          ||
+ * | #1:(U32) | \ref Data::mTimeout    |
+ * | #2:(U32) | \ref Data::mCountdown  |
+ *
+ * \sa Data
+ *
+ * <h2 class="groupheader">Logging info</h2>
+ * |              ||
+ * |              ||
+ * | typeText     | Datum           |
+ * | unitText     | HD              |
+ * | infoText     | DisposablePrime |
+ *
+ */
+class MPreTreatmentPrime : public MAbstract {
+
+    // friends
+    friend class ::tst_models;
+
+    QVariantList parameters() const override;
+
+    struct {
+        Types::U32  mTimeout    ;
+        Types::U32  mCountdown  ;
+    } _data;
+
+public:
+    Type_Enum    typeText  () const override { return Type_Enum::eDatum ; }
+    Unit_Enum    unitText  () const override { return Unit_Enum::eHD    ; }
+    QString      infoText  () const override { return QString("DisposablePrime"); }
+
+    struct Data {
+        quint32     mTimeout    = 0; ///< Timeout   Total time in sec */
+        quint32     mCountdown  = 0; ///< Countdown current time countdown in sec */
+    };
+
+public:
+    MPreTreatmentPrime() { }
+
+    bool    fromByteArray   (const QByteArray   &vByteArray  , int *vIndex = nullptr)       override;
+    Data    data            (                                                       ) const         ;
+};
+}
+
+typedef Model::MPreTreatmentPrime::Data PreTreatmentPrimeData;
Index: sources/model/hd/data/MPreTreatmentSelfTestDryData.cpp
===================================================================
diff -u
--- sources/model/hd/data/MPreTreatmentSelfTestDryData.cpp	(revision 0)
+++ sources/model/hd/data/MPreTreatmentSelfTestDryData.cpp	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -0,0 +1,45 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 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    MPreTreatmentSelfTestDryData.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      02-Mar-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  02-Mar-2021
+ *
+ */
+#include "MPreTreatmentSelfTestDryData.h"
+
+using namespace Model;
+
+QVariantList MPreTreatmentSelfTestDry::parameters() const {
+    return {
+        _data.mTimeout    .value,
+        _data.mCountdown  .value,
+    };
+}
+
+bool MPreTreatmentSelfTestDry::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
+    int index = 0; // message data start position
+    if (GetValue(vByteArray, index, _data.mTimeout   ))
+    if (GetValue(vByteArray, index, _data.mCountdown ))
+        return true ;
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+}
+
+/*!
+ * \brief   MPreTreatmentSelfTestDry::data
+ * \details Provides model's Data from the received messages data values
+ * \return  Data
+ */
+MPreTreatmentSelfTestDry::Data MPreTreatmentSelfTestDry::data() const {
+    Data data;
+    data.mTimeout   = _data.mTimeout   .value;
+    data.mCountdown = _data.mCountdown .value;
+    return data;
+}
Index: sources/model/hd/data/MPreTreatmentSelfTestDryData.h
===================================================================
diff -u
--- sources/model/hd/data/MPreTreatmentSelfTestDryData.h	(revision 0)
+++ sources/model/hd/data/MPreTreatmentSelfTestDryData.h	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -0,0 +1,82 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 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    MPreTreatmentSelfTestDryData.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      02-Mar-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  02-Mar-2021
+ *
+ */
+#pragma once
+
+// Qt
+#include <QString>
+
+// Project
+#include "MAbstract.h"
+#include "types.h"
+
+// forward declarations
+class tst_models;
+
+namespace Model {
+
+/*!
+ * \brief   The MPreTreatmentSelfTestDry class
+ * \details The progress time data model
+ *
+ * | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description                               |
+ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:                              |
+ * |0x6300| 0x020  | 9   | 1 Hz   | N   | HD  | All | Pre-Treatment Self Test Dry Progress Data |
+ *
+ * | Payload  ||
+ * |          ||
+ * | #1:(U32) | \ref Data::mTimeout     |
+ * | #2:(U32) | \ref Data::mCountDown   |
+ *
+ * \sa Data
+ *
+ * <h2 class="groupheader">Logging info</h2>
+ * |              ||
+ * |              ||
+ * | typeText     | Datum       |
+ * | unitText     | HD          |
+ * | infoText     | SelfTestDry |
+ *
+ */
+class MPreTreatmentSelfTestDry : public MAbstract {
+
+    // friends
+    friend class ::tst_models;
+
+    QVariantList parameters() const override;
+
+    struct {
+        Types::U32  mTimeout    ;
+        Types::U32  mCountdown  ;
+    } _data;
+
+public:
+    Type_Enum    typeText  () const override { return Type_Enum::eDatum     ; }
+    Unit_Enum    unitText  () const override { return Unit_Enum::eHD        ; }
+    QString      infoText  () const override { return QString("SelfTestDry"); }
+
+    struct Data {
+        quint32     mTimeout    = 0; ///< Timeout   Total time in sec */
+        quint32     mCountdown  = 0; ///< Countdown current time countdown in sec */
+    };
+
+public:
+    MPreTreatmentSelfTestDry() { }
+
+    bool    fromByteArray   (const QByteArray   &vByteArray  , int *vIndex = nullptr)       override;
+    Data    data            (                                                       ) const         ;
+};
+}
+
+typedef Model::MPreTreatmentSelfTestDry::Data PreTreatmentSelfTestDryData;
Index: sources/model/hd/data/MPreTreatmentSelfTestNoCartridgeData.cpp
===================================================================
diff -u
--- sources/model/hd/data/MPreTreatmentSelfTestNoCartridgeData.cpp	(revision 0)
+++ sources/model/hd/data/MPreTreatmentSelfTestNoCartridgeData.cpp	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -0,0 +1,45 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 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    MPreTreatmentSelfTestNoCartridgeData.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      02-Mar-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  02-Mar-2021
+ *
+ */
+#include "MPreTreatmentSelfTestNoCartridgeData.h"
+
+using namespace Model;
+
+QVariantList MPreTreatmentSelfTestNoCartridge::parameters() const {
+    return {
+        _data.mTimeout    .value,
+        _data.mCountdown  .value,
+    };
+}
+
+bool MPreTreatmentSelfTestNoCartridge::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
+    int index = 0; // message data start position
+    if (GetValue(vByteArray, index, _data.mTimeout   ))
+    if (GetValue(vByteArray, index, _data.mCountdown ))
+        return true ;
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+}
+
+/*!
+ * \brief   MPreTreatmentSelfTestNoCartridge::data
+ * \details Provides model's Data from the received messages data values
+ * \return  Data
+ */
+MPreTreatmentSelfTestNoCartridge::Data MPreTreatmentSelfTestNoCartridge::data() const {
+    Data data;
+    data.mTimeout   = _data.mTimeout   .value;
+    data.mCountdown = _data.mCountdown .value;
+    return data;
+}
Index: sources/model/hd/data/MPreTreatmentSelfTestNoCartridgeData.h
===================================================================
diff -u
--- sources/model/hd/data/MPreTreatmentSelfTestNoCartridgeData.h	(revision 0)
+++ sources/model/hd/data/MPreTreatmentSelfTestNoCartridgeData.h	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -0,0 +1,82 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 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    MPreTreatmentSelfTestNoCartridgeData.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      02-Mar-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  02-Mar-2021
+ *
+ */
+#pragma once
+
+// Qt
+#include <QString>
+
+// Project
+#include "MAbstract.h"
+#include "types.h"
+
+// forward declarations
+class tst_models;
+
+namespace Model {
+
+/*!
+ * \brief   The MPreTreatmentSelfTestNoCartridge class
+ * \details The progress time data model
+ *
+ * | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description                                        |
+ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:                                       |
+ * |0x6100| 0x020  | 9   | 1 Hz   | N   | HD  | All | Pre-Treatment Self Test No Cartridge Progress Data |
+ *
+ * | Payload  ||
+ * |          ||
+ * | #1:(U32) | \ref Data::mTimeout     |
+ * | #2:(U32) | \ref Data::mCountDown   |
+ *
+ * \sa Data
+ *
+ * <h2 class="groupheader">Logging info</h2>
+ * |              ||
+ * |              ||
+ * | typeText     | Datum               |
+ * | unitText     | HD                  |
+ * | infoText     | SelfTestNoCartridge |
+ *
+ */
+class MPreTreatmentSelfTestNoCartridge : public MAbstract {
+
+    // friends
+    friend class ::tst_models;
+
+    QVariantList parameters() const override;
+
+    struct {
+        Types::U32  mTimeout    ;
+        Types::U32  mCountdown  ;
+    } _data;
+
+public:
+    Type_Enum    typeText  () const override { return Type_Enum::eDatum             ; }
+    Unit_Enum    unitText  () const override { return Unit_Enum::eHD                ; }
+    QString      infoText  () const override { return QString("SelfTestNoCartridge"); }
+
+    struct Data {
+        quint32     mTimeout    = 0; ///< Timeout   Total time in sec */
+        quint32     mCountdown  = 0; ///< Countdown current time countdown in sec */
+    };
+
+public:
+    MPreTreatmentSelfTestNoCartridge () { }
+
+    bool    fromByteArray   (const QByteArray   &vByteArray  , int *vIndex = nullptr)       override;
+    Data    data            (                                                       ) const         ;
+};
+}
+
+typedef Model::MPreTreatmentSelfTestNoCartridge::Data PreTreatmentSelfTestNoCartridgeData;
Fisheye: Tag 96854524927f212c24b9e4a253baeff2e672228f refers to a dead (removed) revision in file `sources/model/hd/data/MPrimingData.cpp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 96854524927f212c24b9e4a253baeff2e672228f refers to a dead (removed) revision in file `sources/model/hd/data/MPrimingData.h'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 96854524927f212c24b9e4a253baeff2e672228f refers to a dead (removed) revision in file `sources/view/VPriming.cpp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 96854524927f212c24b9e4a253baeff2e672228f refers to a dead (removed) revision in file `sources/view/VPriming.h'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: sources/view/VView.h
===================================================================
diff -u -r0a4abcc41defc031ae20dd79f9550619bc6c9806 -r96854524927f212c24b9e4a253baeff2e672228f
--- sources/view/VView.h	(.../VView.h)	(revision 0a4abcc41defc031ae20dd79f9550619bc6c9806)
+++ sources/view/VView.h	(.../VView.h)	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -104,11 +104,11 @@
                                                                   \
     REGISTER_TYPE( VAlarmStatus                                 ) \
     REGISTER_TYPE( VPowerOff                                    ) \
-                                                                  \
+    /* Data - States */                                           \
     REGISTER_TYPE( VHDOperationMode                             ) \
     REGISTER_TYPE( VPreTreatmentStates                          ) \
     REGISTER_TYPE( VHDTreatmentStates                           ) \
-                                                                  \
+    /* In-Treatment - Data */                                     \
     REGISTER_TYPE( VTreatmentBloodFlow                          ) \
     REGISTER_TYPE( VTreatmentDialysateFlow                      ) \
     REGISTER_TYPE( VTreatmentUltrafiltration                    ) \
@@ -117,11 +117,13 @@
     REGISTER_TYPE( VTreatmentRanges                             ) \
     REGISTER_TYPE( VTreatmentSaline                             ) \
     REGISTER_TYPE( VTreatmentHeparin                            ) \
+    /* Post-Treatment */                                          \
     REGISTER_TYPE( VTreatmentRinseback                          ) \
     REGISTER_TYPE( VTreatmentRecirculate                        ) \
     REGISTER_TYPE( VTreatmentBloodPrime                         ) \
+    /* Device - Data */                                           \
     REGISTER_TYPE( VHDAccelerometer                             ) \
-                                                                  \
+    /* DG - Data */                                               \
     REGISTER_TYPE( VDGDrainPump                                 ) \
     REGISTER_TYPE( VDGHeaters                                   ) \
     REGISTER_TYPE( VDGLoadCellReadings                          ) \
@@ -132,7 +134,12 @@
     REGISTER_TYPE( VDGTemperatures                              ) \
     REGISTER_TYPE( VDGValvesStates                              ) \
     REGISTER_TYPE( VDGAccelerometer                             ) \
-                                                                  \
+    /* Pre-Treatment */                                           \
+    REGISTER_TYPE( VDGFilterFlush                               ) \
+    REGISTER_TYPE( VPreTreatmentSelfTestNoCartridge             ) \
+    REGISTER_TYPE( VPreTreatmentSelfTestDry                     ) \
+    REGISTER_TYPE( VPreTreatmentPrime                           ) \
+    /* In-Treatment */                                            \
     REGISTER_TYPE( VTreatmentAdjustmentDuration                 ) \
     REGISTER_TYPE( VTreatmentAdjustmentFlows                    ) \
     REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationInit      ) \
@@ -146,7 +153,6 @@
     REGISTER_TYPE( VTreatmentAdjustmentEnd                      ) \
     REGISTER_TYPE( VTreatmentAdjustmentPressuresLimits          ) \
     REGISTER_TYPE( VTreatmentCreate                             ) \
-    REGISTER_TYPE( VPriming                                     ) \
     REGISTER_TYPE( VTreatmentBegin                              ) \
     REGISTER_TYPE( VTreatmentAdjustmentVersions                 ) \
 
Index: sources/view/dg/data/VDGFilterFlushData.cpp
===================================================================
diff -u
--- sources/view/dg/data/VDGFilterFlushData.cpp	(revision 0)
+++ sources/view/dg/data/VDGFilterFlushData.cpp	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -0,0 +1,27 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 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    VDGFilterFlush.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      02-Mar-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  02-Mar-2021
+ *
+ */
+#include "VDGFilterFlushData.h"
+
+// Project
+#include "GuiController.h"
+
+VIEW_DEF(VDGFilterFlush, DGFilterFlushData)
+
+void VDGFilterFlush::onActionReceive(const DGFilterFlushData &vData)
+{
+    total     (vData.mTimeout                       );
+    remaining (vData.mCountdown                     );
+    elapsed   (vData.mTimeout - vData.mCountdown    );
+}
Index: sources/view/dg/data/VDGFilterFlushData.h
===================================================================
diff -u
--- sources/view/dg/data/VDGFilterFlushData.h	(revision 0)
+++ sources/view/dg/data/VDGFilterFlushData.h	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -0,0 +1,45 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 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    VDGFilterFlush.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      02-Mar-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  02-Mar-2021
+ *
+ */
+#pragma once
+
+// Qt
+#include <QObject>
+
+// Project
+#include "main.h" // Doxygen : don't remove
+#include "MModel.h"
+#include "VView.h"
+
+// namespace
+namespace View {
+
+/*!
+ * \brief   The VTreatmentTime class
+ * \details View for Model's data representation.
+ *
+ * \sa Model::MTreatmentTime
+ *
+ */
+class VDGFilterFlush : public QObject
+{
+    Q_OBJECT
+
+    PROPERTY( quint32 , total     , 0)
+    PROPERTY( quint32 , remaining , 0)
+    PROPERTY( quint32 , elapsed   , 0)
+
+    VIEW_DEC(VDGFilterFlush, DGFilterFlushData)
+};
+}
Index: sources/view/hd/data/VPreTreatmentPrimeData.cpp
===================================================================
diff -u
--- sources/view/hd/data/VPreTreatmentPrimeData.cpp	(revision 0)
+++ sources/view/hd/data/VPreTreatmentPrimeData.cpp	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -0,0 +1,27 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 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    VPreTreatmentPrimeData.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      02-Mar-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  02-Mar-2021
+ *
+ */
+#include "VPreTreatmentPrimeData.h"
+
+// Project
+#include "GuiController.h"
+
+VIEW_DEF(VPreTreatmentPrime, PreTreatmentPrimeData)
+
+void VPreTreatmentPrime::onActionReceive(const PreTreatmentPrimeData &vData)
+{
+    total     (vData.mTimeout                       );
+    remaining (vData.mCountdown                     );
+    elapsed   (vData.mTimeout - vData.mCountdown    );
+}
Index: sources/view/hd/data/VPreTreatmentPrimeData.h
===================================================================
diff -u
--- sources/view/hd/data/VPreTreatmentPrimeData.h	(revision 0)
+++ sources/view/hd/data/VPreTreatmentPrimeData.h	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -0,0 +1,45 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 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    VPreTreatmentPrimeData.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      02-Mar-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  02-Mar-2021
+ *
+ */
+#pragma once
+
+// Qt
+#include <QObject>
+
+// Project
+#include "main.h" // Doxygen : don't remove
+#include "MModel.h"
+#include "VView.h"
+
+// namespace
+namespace View {
+
+/*!
+ * \brief   The VPreTreatmentPrime class
+ * \details View for Model's data representation.
+ *
+ * \sa Model::MTreatmentTime
+ *
+ */
+class VPreTreatmentPrime : public QObject
+{
+    Q_OBJECT
+
+    PROPERTY( quint32 , total     , 0)
+    PROPERTY( quint32 , remaining , 0)
+    PROPERTY( quint32 , elapsed   , 0)
+
+    VIEW_DEC(VPreTreatmentPrime, PreTreatmentPrimeData)
+};
+}
Index: sources/view/hd/data/VPreTreatmentSelfTestDryData.cpp
===================================================================
diff -u
--- sources/view/hd/data/VPreTreatmentSelfTestDryData.cpp	(revision 0)
+++ sources/view/hd/data/VPreTreatmentSelfTestDryData.cpp	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -0,0 +1,27 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 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    VPreTreatmentSelfTestDryData.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      03-Mar-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  03-Mar-2021
+ *
+ */
+#include "VPreTreatmentSelfTestDryData.h"
+
+// Project
+#include "GuiController.h"
+
+VIEW_DEF(VPreTreatmentSelfTestDry, PreTreatmentSelfTestDryData)
+
+void VPreTreatmentSelfTestDry::onActionReceive(const PreTreatmentSelfTestDryData &vData)
+{
+    total     (vData.mTimeout                       );
+    remaining (vData.mCountdown                     );
+    elapsed   (vData.mTimeout - vData.mCountdown    );
+}
Index: sources/view/hd/data/VPreTreatmentSelfTestDryData.h
===================================================================
diff -u
--- sources/view/hd/data/VPreTreatmentSelfTestDryData.h	(revision 0)
+++ sources/view/hd/data/VPreTreatmentSelfTestDryData.h	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -0,0 +1,45 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 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    VPreTreatmentSelfTestDryData.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      03-Mar-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  03-Mar-2021
+ *
+ */
+#pragma once
+
+// Qt
+#include <QObject>
+
+// Project
+#include "main.h" // Doxygen : don't remove
+#include "MModel.h"
+#include "VView.h"
+
+// namespace
+namespace View {
+
+/*!
+ * \brief   The VPreTreatmentSelfTestDry class
+ * \details View for Model's data representation.
+ *
+ * \sa Model::MPreTreatmentSelfTestDry
+ *
+ */
+class VPreTreatmentSelfTestDry : public QObject
+{
+    Q_OBJECT
+
+    PROPERTY( quint32 , total     , 0)
+    PROPERTY( quint32 , remaining , 0)
+    PROPERTY( quint32 , elapsed   , 0)
+
+    VIEW_DEC(VPreTreatmentSelfTestDry, PreTreatmentSelfTestDryData)
+};
+}
Index: sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.cpp
===================================================================
diff -u
--- sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.cpp	(revision 0)
+++ sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.cpp	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -0,0 +1,27 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 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    VPreTreatmentSelfTestNoCartridgeData.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      03-Mar-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  03-Mar-2021
+ *
+ */
+#include "VPreTreatmentSelfTestNoCartridgeData.h"
+
+// Project
+#include "GuiController.h"
+
+VIEW_DEF(VPreTreatmentSelfTestNoCartridge, PreTreatmentSelfTestNoCartridgeData)
+
+void VPreTreatmentSelfTestNoCartridge::onActionReceive(const PreTreatmentSelfTestNoCartridgeData &vData)
+{
+    total     (vData.mTimeout                       );
+    remaining (vData.mCountdown                     );
+    elapsed   (vData.mTimeout - vData.mCountdown    );
+}
Index: sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.h
===================================================================
diff -u
--- sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.h	(revision 0)
+++ sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.h	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -0,0 +1,45 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 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    VPreTreatmentSelfTestNoCartridgeData.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      03-Mar-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  03-Mar-2021
+ *
+ */
+#pragma once
+
+// Qt
+#include <QObject>
+
+// Project
+#include "main.h" // Doxygen : don't remove
+#include "MModel.h"
+#include "VView.h"
+
+// namespace
+namespace View {
+
+/*!
+ * \brief   The VTreatmentTime class
+ * \details View for Model's data representation.
+ *
+ * \sa Model::MTreatmentTime
+ *
+ */
+class VPreTreatmentSelfTestNoCartridge : public QObject
+{
+    Q_OBJECT
+
+    PROPERTY( quint32 , total     , 0)
+    PROPERTY( quint32 , remaining , 0)
+    PROPERTY( quint32 , elapsed   , 0)
+
+    VIEW_DEC(VPreTreatmentSelfTestNoCartridge, PreTreatmentSelfTestNoCartridgeData)
+};
+}
Index: unittests/tst_models.cpp
===================================================================
diff -u -r7777127f3b60d5f884cd07adc9d586353d914f69 -r96854524927f212c24b9e4a253baeff2e672228f
--- unittests/tst_models.cpp	(.../tst_models.cpp)	(revision 7777127f3b60d5f884cd07adc9d586353d914f69)
+++ unittests/tst_models.cpp	(.../tst_models.cpp)	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -39,7 +39,7 @@
 #include "MTreatmentTimeData.h"
 #include "MTreatmentPressureOcclusionData.h"
 #include "MTreatmentSalineData.h"
-#include "MPrimingData.h"
+#include "MPreTreatmentPrimeData.h"
 
 #include "MTreatmentAdjustUltrafiltrationStateResponse.h"
 #include "MTreatmentAdjustUltrafiltrationEditResponse.h"
@@ -54,7 +54,6 @@
 
 #include "MTreatmentParametersResp.h"
 #include "MStartTreatmentResponse.h"
-#include "MEndTreatmentResponse.h"
 
 #include "MessageInterpreter.h"
 
@@ -1726,29 +1725,25 @@
     }
 }
 
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MPrimingData ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MPrimingData data definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
-void tst_models::tst_MPrimingData_data () {
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MPreTreatmentPrime ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MPreTreatmentPrime data definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
+void tst_models::tst_MPreTreatmentPrime_data () {
     QTest::addColumn<int        >("errorIndex");
     QTest::addColumn<QByteArray >("data");
     QTest::newRow("msg complete     ") <<  0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B"));
-    QTest::newRow("currentState     ") <<  1 << QByteArray::fromHex(QByteArray());
-    QTest::newRow("currentState     ") <<  1 << QByteArray::fromHex(QByteArray("00"));
-    QTest::newRow("currentState     ") <<  1 << QByteArray::fromHex(QByteArray("00" "01"));
-    QTest::newRow("currentState     ") <<  1 << QByteArray::fromHex(QByteArray("00" "01" "02"));
-    QTest::newRow("secondsRemaining ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03"));
-    QTest::newRow("secondsRemaining ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04"));
-    QTest::newRow("secondsRemaining ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05"));
-    QTest::newRow("secondsRemaining ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06"));
-    QTest::newRow("secondsTotal     ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07"));
-    QTest::newRow("secondsTotal     ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08"));
-    QTest::newRow("secondsTotal     ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09"));
-    QTest::newRow("secondsTotal     ") <<  3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A"));
+    QTest::newRow("timeout          ") <<  1 << QByteArray::fromHex(QByteArray());
+    QTest::newRow("timeout          ") <<  1 << QByteArray::fromHex(QByteArray("00"));
+    QTest::newRow("timeout          ") <<  1 << QByteArray::fromHex(QByteArray("00" "01"));
+    QTest::newRow("timeout          ") <<  1 << QByteArray::fromHex(QByteArray("00" "01" "02"));
+    QTest::newRow("countdown        ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03"));
+    QTest::newRow("countdown        ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04"));
+    QTest::newRow("countdown        ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05"));
+    QTest::newRow("countdown        ") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06"));
 }
 
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MPrimingData test definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
-void tst_models::tst_MPrimingData() {
-    Model::MPrimingData mData;
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MPreTreatmentPrime test definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
+void tst_models::tst_MPreTreatmentPrime() {
+    Model::MPreTreatmentPrime mData;
 
     QFETCH(int       , errorIndex );
     QFETCH(QByteArray, data       );
@@ -1763,10 +1758,9 @@
 #endif
 
     switch (errorIndex) {
-    case  0: { index = 0                                           ; QVERIFY (  mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
-    case  1: { index = index * sizeof mData._data.currentState     ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
-    case  2: { index = index * sizeof mData._data.secondsRemaining ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
-    case  3: { index = index * sizeof mData._data.secondsTotal     ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    case  0: { index = 0                                        ; QVERIFY (  mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    case  1: { index = index * sizeof mData._data.mTimeout      ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    case  2: { index = index * sizeof mData._data.mCountdown    ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
     default:
         QVERIFY2(false, "Incorrect Test");
         break;
Index: unittests/tst_models.h
===================================================================
diff -u -r7777127f3b60d5f884cd07adc9d586353d914f69 -r96854524927f212c24b9e4a253baeff2e672228f
--- unittests/tst_models.h	(.../tst_models.h)	(revision 7777127f3b60d5f884cd07adc9d586353d914f69)
+++ unittests/tst_models.h	(.../tst_models.h)	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -116,8 +116,8 @@
     void tst_MTreatmentHeparinData();
     void tst_MPowerOff_data();
     void tst_MPowerOff();
-    void tst_MPrimingData_data();
-    void tst_MPrimingData();
+    void tst_MPreTreatmentPrime_data();
+    void tst_MPreTreatmentPrime();
 
     // Alarms
     void tst_MAlarmStatus_text();
Index: unittests/tst_views.cpp
===================================================================
diff -u -ra3030123e885fb9f22dea5839c4e988896a257e4 -r96854524927f212c24b9e4a253baeff2e672228f
--- unittests/tst_views.cpp	(.../tst_views.cpp)	(revision a3030123e885fb9f22dea5839c4e988896a257e4)
+++ unittests/tst_views.cpp	(.../tst_views.cpp)	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -21,7 +21,7 @@
 #include "VTreatmentAdjustmentUltrafiltrationState.h"
 #include "FileHandler.h"
 #include "VTreatmentBegin.h"
-#include "VPriming.h"
+#include "VPreTreatmentPrimeData.h"
 #include "VAlarmStatus.h"
 
 tst_views::tst_views(QObject *parent) : QObject(parent) { }
@@ -825,41 +825,3 @@
     view.doUserModifiedParameters();
     QCOMPARE(view.continueEnabled(), true);
 }
-
-void tst_views::VTreatmentPriming_properties()
-{
-    View::VPriming view;
-    PrimingData primingData;
-    primingData.currentState = View::VPriming::PRIMING_COMPLETE+1;
-
-    view.checkingInstallationComplete(true);
-    QCOMPARE(view.checkingInstallationComplete(), true);
-    view.creatingDialysateComplete(true);
-    QCOMPARE(view.creatingDialysateComplete(), true);
-    view.primingLinesComplete(true);
-    QCOMPARE(view.primingLinesComplete(), true);
-    view.primingLinesComplete(false);
-    QCOMPARE(view.primingLinesComplete(), false);
-    view.primingComplete(true);
-    QCOMPARE(view.primingComplete(), true);
-    view.primingComplete(false);
-    QCOMPARE(view.primingComplete(), false);
-    view.primingComplete(false);
-    QCOMPARE(view.primingComplete(), false);
-    view.continueEnabled(true);
-    QCOMPARE(view.continueEnabled(), true);
-    view.onActionReceive(primingData);
-    QCOMPARE(view.currentState(), (quint32)View::VPriming::PRIMING_COMPLETE+1);
-    view.primingLinesComplete(false);
-    QVERIFY(!view.primingLinesComplete());
-    view.secondsRemaining(quint32(10));
-    QCOMPARE(view.secondsRemaining(), quint32(10));
-    view.secondsRemaining(quint32(1));
-    QCOMPARE(view.secondsRemaining(), quint32(1));
-    view.secondsRemaining(quint32(1));
-    QCOMPARE(view.secondsRemaining(), quint32(1));
-    view.secondsTotal(quint32(50));
-    QCOMPARE(view.secondsTotal(), quint32(50));
-    view.continueEnabled(false);
-    QCOMPARE(view.continueEnabled(), false);
-}
Index: unittests/tst_views.h
===================================================================
diff -u -r0d59385f134f65a19dace1e2b46eb2631924396e -r96854524927f212c24b9e4a253baeff2e672228f
--- unittests/tst_views.h	(.../tst_views.h)	(revision 0d59385f134f65a19dace1e2b46eb2631924396e)
+++ unittests/tst_views.h	(.../tst_views.h)	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -49,5 +49,4 @@
     void VCreateTreatment_check_init();
 
     void VTreatmentBegin_continue();
-    void VTreatmentPriming_properties();
 };