Index: denali.pro.user
===================================================================
diff -u -r2d5e51a42abdf392801371aea2d2dbcb197a1da2 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- denali.pro.user	(.../denali.pro.user)	(revision 2d5e51a42abdf392801371aea2d2dbcb197a1da2)
+++ denali.pro.user	(.../denali.pro.user)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.0, 2022-03-08T11:15:12. -->
+<!-- Written by QtCreator 4.10.0, 2022-03-09T15:22:10. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
Index: en_US.udic
===================================================================
diff -u -r2d5e51a42abdf392801371aea2d2dbcb197a1da2 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- en_US.udic	(.../en_US.udic)	(revision 2d5e51a42abdf392801371aea2d2dbcb197a1da2)
+++ en_US.udic	(.../en_US.udic)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -205,3 +205,5 @@
 UIHistory
 POSTDone
 POSTItem
+VDGValves
+MHDAccelerometer
Index: sources/gui/qml/AlarmItem.qml
===================================================================
diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision 301c0a2101eb9374145ae274c8d91460fc9a6a62)
+++ sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -116,7 +116,7 @@
         minVisible          : ! vAlarmStatus.alarm_Flag_noMinimize
         titleFading         :   vHDOperationMode.fault
         countDown           :   vTreatmentStop.countDown
-        countDownVisible    :   vHDTreatmentStates.txStop && vTreatmentStop.total
+        countDownVisible    :   vHDOperationMode.inTreatment && vHDTreatmentStates.txStop && vTreatmentStop.total
 
         onMuteClicked       : vAlarmStatus.doSilence            ()
         onResumeClicked     : vAlarmStatus.doUserActionResume   ()
Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml
===================================================================
diff -u -r1b179fe77fc16bc3f4eca4824b8adb32cb558f52 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/gui/qml/dialogs/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision 1b179fe77fc16bc3f4eca4824b8adb32cb558f52)
+++ sources/gui/qml/dialogs/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -49,6 +49,7 @@
         height          : width
         radius          : width
     }
+
     CloseButton { id    : _closeButton
         anchors.left    : undefined
         anchors.right   : parent.right
@@ -71,9 +72,10 @@
         ]
         label: [
             "MaxPrs",
-            "Flow",
-            "PWM",
-            "stt"]
+            "Flow"  ,
+            "PWM"   ,
+            "stt"   ,
+        ]
     }
 
     DebugDataColumn { id: _DGDrainPumpColumn
@@ -85,13 +87,13 @@
             vDGDrainPump.rpmi   ,
             vDGDrainPump.dac    ,
             vDGDrainPump.state  ,
-            vDGDrainPump.rpmo
+            vDGDrainPump.rpmo   ,
         ]
         label: [
             "TgtSpd",
-            "DAC",
-            "stt",
-            "Spd",
+            "DAC"   ,
+            "stt"   ,
+            "Spd"   ,
         ]
     }
 
@@ -104,7 +106,7 @@
             vDGPressures.roInletPSI     .toFixed(2) ,
             vDGPressures.roOutletPSI    .toFixed(2) ,
             vDGPressures.drainInletPSI  .toFixed(2) ,
-            vDGPressures.drainOutletPSI .toFixed(2)
+            vDGPressures.drainOutletPSI .toFixed(2) ,
         ]
         label: [
             "PPi",
@@ -144,11 +146,11 @@
         label: [
             "HP1",
             "HP2",
-            "HR",
+            "HR" ,
         ]
     }
 
-    DebugDataColumn { id: _LoadCellReadingsColumn
+    DebugDataColumn { id: _DGLoadCellReadingsColumn
         textObjectName  :"_DGLoadCellReadingsData"
         title           : qsTr(" LoadCl ")
         x: col(5)
@@ -157,7 +159,7 @@
             vDGLoadCellReadings.reservoir1Prim .toFixed(2) ,
             vDGLoadCellReadings.reservoir1Bkup .toFixed(2) ,
             vDGLoadCellReadings.reservoir2Prim .toFixed(2) ,
-            vDGLoadCellReadings.reservoir2Bkup .toFixed(2)
+            vDGLoadCellReadings.reservoir2Bkup .toFixed(2) ,
         ]
         label: [
             "A1",
@@ -184,19 +186,19 @@
             vDGTemperatures.primaryHeaterColdJunction   .toFixed(2) ,
             vDGTemperatures.trimmerHeaterColdJunction   .toFixed(2) ,
             vDGTemperatures.primaryHeaterInternal       .toFixed(2) ,
-            vDGTemperatures.trimmerHeaterInternal       .toFixed(2)
+            vDGTemperatures.trimmerHeaterInternal       .toFixed(2) ,
         ]
         label: [
-            "TPi",
-            "TPo",
-            "TD1",
-            "TD2",
-            "TRo",
-            "TDi",
+            "TPi"   ,
+            "TPo"   ,
+            "TD1"   ,
+            "TD2"   ,
+            "TRo"   ,
+            "TDi"   ,
             "HP.Trm",
             "HR.Trm",
-            "HP.CJ",
-            "HR.CJ",
+            "HP.CJ" ,
+            "HR.CJ" ,
             "HP.Int",
             "HR.Int",
         ]
@@ -229,14 +231,14 @@
         x: col(6)
         y: row(4.1)
         model: [
-            vHDAirBubble    .venousAirBubbleStatus              ,
-            vHDAirTrap      .airTrapLowerLevel                  ,
-            vHDAirTrap      .airTrapUpperLevel                  ,
+            vHDAirBubble    .venousAirBubbleStatus  ,
+            vHDAirTrap      .airTrapLowerLevel      ,
+            vHDAirTrap      .airTrapUpperLevel      ,
         ]
         label: [
-            "ADV",
-            "ATll",
-            "ATul",
+            "ADV"   ,
+            "ATll"  ,
+            "ATul"  ,
         ]
     }
 
@@ -245,7 +247,9 @@
         title           : qsTr(" DG Mode ")
         x: col(2.5)
         y: row(1.7)
-        model: [ vDGOperationMode.text ]
+        model: [
+            vDGOperationMode.text ,
+        ]
         fontPixelSizeText: 30
     }
 
@@ -263,22 +267,22 @@
             vTreatmentBloodFlow.bloodFlow_MotorCtlSpeed    .toFixed(2) ,
             vTreatmentBloodFlow.bloodFlow_MotorCtlCurrent  .toFixed(2) ,
       "%" + vTreatmentBloodFlow.bloodFlow_PWMDutyCycle     .toFixed(2) ,
-            vTreatmentBloodFlow.bloodFlow_RotorCount       .toFixed(2)
+            vTreatmentBloodFlow.bloodFlow_RotorCount       .toFixed(2) ,
         ]
         label: [
-            "Tgt.Flow",
-            "Msr.Flow",
-            "Rot.Spd",
-            "Mot.Spd",
-            "MC.Spd",
-            "MC.Cur",
-            "PWM",
-            "Rtr.Cnt",
+            "Tgt.Flow"  ,
+            "Msr.Flow"  ,
+            "Rot.Spd"   ,
+            "Mot.Spd"   ,
+            "MC.Spd"    ,
+            "MC.Cur"    ,
+            "PWM"       ,
+            "Rtr.Cnt"   ,
         ]
     }
 
     DebugDataColumn { id: _HDDialysateInletFlowColumn
-        textObjectName  :"_HDInletFlowData"
+        textObjectName  :"_HDDialysateInletFlowData"
         title           : qsTr(" DPi ")
         x: col(1.2)
         y: row(2.4)
@@ -292,18 +296,18 @@
       "%" + vTreatmentDialysateFlow.dialysateFlow_PWMDutyCycle   .toFixed(2) ,
         ]
         label: [
-            "Tgt.Flow",
-            "Msr.Flow",
-            "Rot.Spd",
-            "Mot.Spd",
-            "MC.Spd",
-            "MC.Cur",
-            "PWM",
+            "Tgt.Flow"  ,
+            "Msr.Flow"  ,
+            "Rot.Spd"   ,
+            "Mot.Spd"   ,
+            "MC.Spd"    ,
+            "MC.Cur"    ,
+            "PWM"       ,
         ]
     }
 
     DebugDataColumn { id: _HDDialysateOutletFlowColumn
-        textObjectName  :"_HDOutletFlowData"
+        textObjectName  :"_HDDialysateOutletFlowData"
         title           : qsTr(" UF/DPo ")
         x: col(2.4)
         y: row(2.4)
@@ -314,28 +318,28 @@
             vTreatmentUltrafiltration.ultrafiltration_MotorSpeed     .toFixed(2) ,
             vTreatmentUltrafiltration.ultrafiltration_MotorCtlSpeed  .toFixed(2) ,
             vTreatmentUltrafiltration.ultrafiltration_MotorCtlCurrent.toFixed(2) ,
-      "%" + vTreatmentUltrafiltration.ultrafiltration_PWMDtCycle     .toFixed(2)
+      "%" + vTreatmentUltrafiltration.ultrafiltration_PWMDtCycle     .toFixed(2) ,
         ]
         label: [
-            "UFRef",
-            "UFMeas",
-            "Rot.Spd",
-            "Mot.Spd",
-            "MC.Spd",
-            "MC.Cur",
-            "PWM",
+            "UFRef"     ,
+            "UFMeas"    ,
+            "Rot.Spd"   ,
+            "Mot.Spd"   ,
+            "MC.Spd"    ,
+            "MC.Cur"    ,
+            "PWM"       ,
         ]
     }
 
     DebugDataColumn { id: _HDPressureOcclusionColumn
-        textObjectName  :"_PressureOcclusionData"
+        textObjectName  :"_HDPressureOcclusionData"
         title           : qsTr(" Prsr Oc ")
         x: col(3.7)
         y: row(1.7)
         model: [
             vTreatmentPressureOcclusion.arterialPressure             .toFixed(2) ,
             vTreatmentPressureOcclusion.venousPressure               .toFixed(2) ,
-            vTreatmentPressureOcclusion.bloodPumpOcclusion
+            vTreatmentPressureOcclusion.bloodPumpOcclusion                       ,
         ]
         label: [
             "PBA" ,
@@ -373,25 +377,27 @@
             "Msr.Swt",
             "Msr.Frc",
             "safe.Vl",
-            "status",
+            "status" ,
         ]
-
     }
 
     DebugDataColumn { id: _HDOperationModeColumn
         textObjectName  :"_HDOperationModeData"
+        title           : qsTr(" HD Mode ")
         x: col(0.5)
         y: row(1.7)
-        title           : qsTr(" HD Mode ")
-        model: [ vHDOperationMode.text ]
+        model: [
+            vHDOperationMode.text ,
+        ]
         fontPixelSizeText: 30
     }
 
     DebugDataColumn { id: _DGValvesStatesColumn
         textObjectName  :"_DGValvesStatesData"
-        title           : qsTr(" DG Valves ")
-        x: col(7)
-        y: row(0)
+        title           : qsTr("Vlv")
+        x: col(7.65) // pleae don't use 2 digits, this one is an exception
+        y: row(0.0)
+        width: 50
         model: [
             vDGValvesStates.valveStates_01,
             vDGValvesStates.valveStates_02,
@@ -430,16 +436,16 @@
         x: col(7)
         y: row(4.5)
         model: [
-            vHDBloodLeak.bloodLeakDetectSetPoint                        ,
-            vHDBloodLeak.bloodLeakZeroedStatus                          ,
-            vHDBloodLeak.bloodLeakState                                 ,
-            vHDBloodLeak.bloodLeakDetectLevel                           ,
+            vHDBloodLeak.bloodLeakDetectSetPoint    ,
+            vHDBloodLeak.bloodLeakZeroedStatus      ,
+            vHDBloodLeak.bloodLeakState             ,
+            vHDBloodLeak.bloodLeakDetectLevel       ,
         ]
         label: [
             "SetPt" ,
-            "0Stat"  ,
-            "State"  ,
-            "DtLvl"  ,
+            "0Stat" ,
+            "State" ,
+            "DtLvl" ,
 
         ]
     }
@@ -449,15 +455,19 @@
         title           : qsTr(" Alarms ")
         x: col(6)
         y: row(5.5)
-        model: [ _alarmItem.alarm_AlarmID ]
-        label: [ "Top"                    ]
+        model: [
+            _alarmItem.alarm_AlarmID ,
+        ]
+        label: [
+            "Top" ,
+        ]
     }
 
-    // TODO: Should be unnecessary since the first communication message with UI/HD is the version.
+    // TODO: The TouchRect should be unnecessary since the first communication message with UI/HD is the version.
     TouchRect {
-        x           : col(4.2)
+        x           : col(4.6)
         y           : row(6.4)
-        width       : 550
+        width       : 475
         height      : 80
         onClicked   : vAdjustmentVersions.doAdjustment()
         radius      : 10
@@ -525,12 +535,11 @@
     }
 
     Text { id : _mouseEventCountText
+        text: String("Touch: %1,%2").arg(GuiEventSpy.touchCount   /*.toString().padStart(4,'0')*/ )
+                                    .arg(GuiEventSpy.touchPoints  /*.toString().padStart(4,'0')*/ )
         x: col(0.3)
         y: row(6.4)
         visible: true
-        text: String("Touch: %1,%2")
-        .arg(GuiEventSpy.touchCount   /*.toString().padStart(4,'0')*/ )
-        .arg(GuiEventSpy.touchPoints  /*.toString().padStart(4,'0')*/ )
         horizontalAlignment: Text.AlignLeft
         color: Colors.textMain
         font.pixelSize: 30
@@ -541,10 +550,10 @@
     }
 
     Text { id : _canbusFaultCountText
+        property int count: 0
         text: qsTr("CANerr: %1").arg(count)
         x: col(0.2)
         y: row(6.8)
-        property int count: 0
         visible: true
         horizontalAlignment: Text.AlignLeft
         color: Colors.textMain
@@ -579,3 +588,4 @@
         }
     }
 }
+
Index: sources/model/dg/data/MDGAccelerometerData.cpp
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/model/dg/data/MDGAccelerometerData.cpp	(.../MDGAccelerometerData.cpp)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/model/dg/data/MDGAccelerometerData.cpp	(.../MDGAccelerometerData.cpp)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -14,6 +14,10 @@
  */
 #include "MDGAccelerometerData.h"
 
+// coco begin validated:
+// FIXME: this model was only for the Diagnostic use, and has been removed,
+//        Should be removed from the UI Software if not being used anymore
+
 using namespace Model;
 
 QVariantList MDGAccelerometer::parameters() const {
@@ -66,3 +70,5 @@
     data.mZTilt = _data.mZTilt .value;
     return data;
 }
+
+// coco end
Index: sources/model/dg/data/MDGAccelerometerData.h
===================================================================
diff -u -r2d5e51a42abdf392801371aea2d2dbcb197a1da2 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/model/dg/data/MDGAccelerometerData.h	(.../MDGAccelerometerData.h)	(revision 2d5e51a42abdf392801371aea2d2dbcb197a1da2)
+++ sources/model/dg/data/MDGAccelerometerData.h	(.../MDGAccelerometerData.h)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -25,6 +25,10 @@
 // forward declarations
 class tst_models;
 
+// coco begin validated:
+// FIXME: this model was only for the Diagnostic use, and has been removed,
+//        Should be removed from the UI Software if not being used anymore
+
 namespace Model {
 
 /*!
@@ -104,3 +108,5 @@
 }
 
 typedef Model::MDGAccelerometer::Data DGAccelerometerData;
+
+// coco end
Index: sources/model/dg/data/MDGConductivityData.h
===================================================================
diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/model/dg/data/MDGConductivityData.h	(.../MDGConductivityData.h)	(revision 301c0a2101eb9374145ae274c8d91460fc9a6a62)
+++ sources/model/dg/data/MDGConductivityData.h	(.../MDGConductivityData.h)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -47,9 +47,9 @@
  * <h2 class="groupheader">Logging info</h2>
  * |              ||
  * |              ||
- * | typeText     | Datum               |
- * | unitText     | DG                  |
- * | infoText     | ConductivityData    |
+ * | typeText     | Datum        |
+ * | unitText     | DG           |
+ * | infoText     | Conductivity |
  *
  */
 class MDGConductivityData : public MAbstract {
@@ -68,9 +68,9 @@
     } _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("ConductivityData")   ; }
+    Type_Enum    typeText  () const override { return Type_Enum::eDatum      ; }
+    Unit_Enum    unitText  () const override { return Unit_Enum::eDG         ; }
+    QString      infoText  () const override { return QString("Conductivity"); }
 
     struct Data{
         float mRORejectionRatio = 0;    ///< RO Rejection Ratio
Index: sources/model/hd/data/MHDAccelerometerData.cpp
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/model/hd/data/MHDAccelerometerData.cpp	(.../MHDAccelerometerData.cpp)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/model/hd/data/MHDAccelerometerData.cpp	(.../MHDAccelerometerData.cpp)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -14,6 +14,10 @@
  */
 #include "MHDAccelerometerData.h"
 
+// coco begin validated:
+// FIXME: this model was only for the Diagnostic use, and has been removed,
+//        Should be removed from the UI Software if not being used anymore
+
 using namespace Model;
 
 QVariantList MHDAccelerometer::parameters() const {
@@ -66,3 +70,5 @@
     data.mZTilt = _data.mZTilt .value;
     return data;
 }
+
+// coco end
Index: sources/model/hd/data/MHDAccelerometerData.h
===================================================================
diff -u -r2d5e51a42abdf392801371aea2d2dbcb197a1da2 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/model/hd/data/MHDAccelerometerData.h	(.../MHDAccelerometerData.h)	(revision 2d5e51a42abdf392801371aea2d2dbcb197a1da2)
+++ sources/model/hd/data/MHDAccelerometerData.h	(.../MHDAccelerometerData.h)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -25,6 +25,10 @@
 // forward declarations
 class tst_models;
 
+// coco begin validated:
+// FIXME: this model was only for the Diagnostic use, and has been removed,
+//        Should be removed from the UI Software if not being used anymore
+
 namespace Model {
 
 /*!
@@ -104,3 +108,5 @@
 }
 
 typedef Model::MHDAccelerometer::Data HDAccelerometerData;
+
+// coco end
Index: sources/model/hd/data/MHDAirBubbleData.h
===================================================================
diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/model/hd/data/MHDAirBubbleData.h	(.../MHDAirBubbleData.h)	(revision 301c0a2101eb9374145ae274c8d91460fc9a6a62)
+++ sources/model/hd/data/MHDAirBubbleData.h	(.../MHDAirBubbleData.h)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -31,9 +31,9 @@
  * \brief   The MHDAirBubbleData class
  * \details The HD Air Bubble data model
  *
- * | MSG  | CAN ID | Type   | Ack | Src | Dst | Description           |
- * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:          |
- * |0x9300| 0x080  | 1 Hz   | N   | DG  | All | HD Air Bubble Data    |
+ * | MSG  | CAN ID | Type   | Ack | Src | Dst | Description  |
+ * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: |
+ * |0x9300| 0x040  | 1 Hz   | N   | HD  | All | HD Air Bubble Data |
  *
  * | Payload  ||
  * |          ||
@@ -45,9 +45,9 @@
  * <h2 class="groupheader">Logging info</h2>
  * |              ||
  * |              ||
- * | typeText     | Datum           |
- * | unitText     | HD              |
- * | infoText     | AirBubbleData   |
+ * | typeText     | Datum     |
+ * | unitText     | HD        |
+ * | infoText     | AirBubble |
  *
  */
 class MHDAirBubbleData : public MAbstract {
@@ -64,9 +64,9 @@
 
 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("AirBubbleData")    ; }
+    Type_Enum    typeText() const override { return Type_Enum::eDatum   ; }
+    Unit_Enum    unitText() const override { return Unit_Enum::eHD      ; }
+    QString      infoText() const override { return QString("AirBubble"); }
 
 
     struct Data {
Index: sources/model/hd/data/MHDAirTrapData.h
===================================================================
diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/model/hd/data/MHDAirTrapData.h	(.../MHDAirTrapData.h)	(revision 301c0a2101eb9374145ae274c8d91460fc9a6a62)
+++ sources/model/hd/data/MHDAirTrapData.h	(.../MHDAirTrapData.h)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -31,9 +31,9 @@
  * \brief   The MHDAirTrapData class
  * \details The HD Air Trap data model
  *
- * | MSG  | CAN ID | Type   | Ack | Src | Dst | Description        |
- * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:       |
- * |0x3E00| 0x080  | 1 Hz   | N   | DG  | All | HD Air Trap Data   |
+ * | MSG  | CAN ID | Type   | Ack | Src | Dst | Description  |
+ * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: |
+ * |0x3E00| 0x040  | 1 Hz   | N   | HD  | All | HD Air Trap Data |
  *
  * | Payload  ||
  * |          ||
@@ -45,9 +45,9 @@
  * <h2 class="groupheader">Logging info</h2>
  * |              ||
  * |              ||
- * | typeText     | Datum       |
- * | unitText     | HD          |
- * | infoText     | AirTrapData |
+ * | typeText     | Datum   |
+ * | unitText     | HD      |
+ * | infoText     | AirTrap |
  *
  */
 class MHDAirTrapData : public MAbstract {
@@ -64,9 +64,9 @@
 
 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("AirTrapData")   ; }
+    Type_Enum    typeText() const override { return Type_Enum::eDatum    ; }
+    Unit_Enum    unitText() const override { return Unit_Enum::eHD       ; }
+    QString      infoText() const override { return QString("AirTrap")   ; }
 
 
     struct Data {
Index: sources/model/hd/data/MHDBloodLeakData.h
===================================================================
diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/model/hd/data/MHDBloodLeakData.h	(.../MHDBloodLeakData.h)	(revision 301c0a2101eb9374145ae274c8d91460fc9a6a62)
+++ sources/model/hd/data/MHDBloodLeakData.h	(.../MHDBloodLeakData.h)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -38,25 +38,25 @@
  *
  * | Payload  ||
  * |          ||
- * | #1:(U32) | \ref Data::mBloodLeakStatus             |
- * | #2:(U32) | \ref Data::mBloodLeakState              |
- * | #3:(U32) | \ref Data::mBloodLeakZeroStatusCounter  |
- * | #4:(U32) | \ref Data::mBloodLeakCounter            |
- * | #5:(u32) | \ref Data::mBloodLeakZeroedStatus       |
- * | #6:(U32) | \ref Data::mBloodLeakDetectSetPoint     |
- * | #7:(U32) | \ref Data::mBloodLeakDetectLevel        |
- * | #8:(U32) | \ref Data::mBloodLeakStatusCount        |
- * | #9:(U32) | \ref Data::mBloodLeakLEDIntensity       |
- * | #9:(U32) | \ref Data::mBloodLeakRegisterCounter    |
+ * | #01:(U32) | \ref Data::mBloodLeakStatus             |
+ * | #02:(U32) | \ref Data::mBloodLeakState              |
+ * | #03:(U32) | \ref Data::mBloodLeakZeroStatusCounter  |
+ * | #04:(U32) | \ref Data::mBloodLeakCounter            |
+ * | #05:(u32) | \ref Data::mBloodLeakZeroedStatus       |
+ * | #06:(U32) | \ref Data::mBloodLeakDetectSetPoint     |
+ * | #07:(U32) | \ref Data::mBloodLeakDetectLevel        |
+ * | #08:(U32) | \ref Data::mBloodLeakStatusCount        |
+ * | #09:(U32) | \ref Data::mBloodLeakLEDIntensity       |
+ * | #10:(U32) | \ref Data::mBloodLeakRegisterCounter    |
  *
  * \sa Data
  *
  * <h2 class="groupheader">Logging info</h2>
  * |              ||
  * |              ||
- * | typeText     | Datum           |
- * | unitText     | HD              |
- * | infoText     | BloodLeakData   |
+ * | typeText     | Datum       |
+ * | unitText     | HD          |
+ * | infoText     | BloodLeak   |
  *
  */
 class MHDBloodLeakData : public MAbstract {
@@ -81,9 +81,9 @@
 
 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("BloodLeakData") ; }
+    Type_Enum    typeText() const override { return Type_Enum::eDatum    ; }
+    Unit_Enum    unitText() const override { return Unit_Enum::eHD       ; }
+    QString      infoText() const override { return QString("BloodLeak") ; }
 
     struct Data {
         quint32 mBloodLeakStatus            = 0;
Index: sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h	(.../MTreatmentBloodPrimeData.h)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h	(.../MTreatmentBloodPrimeData.h)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -45,9 +45,9 @@
  * <h2 class="groupheader">Logging info</h2>
  * |              ||
  * |              ||
- * | typeText     | Datum          |
- * | unitText     | HD             |
- * | infoText     | BloodPrimeData |
+ * | typeText     | Datum      |
+ * | unitText     | HD         |
+ * | infoText     | BloodPrime |
  *
  */
 class MTreatmentBloodPrime : public MAbstract {
@@ -65,9 +65,9 @@
 
 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("BloodPrimeData") ; }
+    Type_Enum    typeText() const override { return Type_Enum::eDatum     ; }
+    Unit_Enum    unitText() const override { return Unit_Enum::eHD        ; }
+    QString      infoText() const override { return QString("BloodPrime") ; }
 
     struct Data {
         float       mTarget  = 0; ///< Target  volume    of BloodPrime delivery
Index: sources/model/hd/data/treatment/MTreatmentHeparinData.h
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/model/hd/data/treatment/MTreatmentHeparinData.h	(.../MTreatmentHeparinData.h)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/model/hd/data/treatment/MTreatmentHeparinData.h	(.../MTreatmentHeparinData.h)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -45,9 +45,9 @@
  * <h2 class="groupheader">Logging info</h2>
  * |              ||
  * |              ||
- * | typeText     | Datum       |
- * | unitText     | HD          |
- * | infoText     | HeparinData |
+ * | typeText     | Datum   |
+ * | unitText     | HD      |
+ * | infoText     | Heparin |
  *
  */
 class MTreatmentHeparin : public MAbstract {
@@ -63,9 +63,9 @@
 
 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("HeparinData") ; }
+    Type_Enum    typeText() const override { return Type_Enum::eDatum  ; }
+    Unit_Enum    unitText() const override { return Unit_Enum::eHD     ; }
+    QString      infoText() const override { return QString("Heparin") ; }
 
     struct Data {
         float       mCumulative  = 0; ///< Cumulative volume of all Heparin deliveries during current treatment
Index: sources/model/hd/data/treatment/MTreatmentRecirculateData.h
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/model/hd/data/treatment/MTreatmentRecirculateData.h	(.../MTreatmentRecirculateData.h)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/model/hd/data/treatment/MTreatmentRecirculateData.h	(.../MTreatmentRecirculateData.h)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -46,9 +46,9 @@
  * <h2 class="groupheader">Logging info</h2>
  * |              ||
  * |              ||
- * | typeText     | Datum         |
- * | unitText     | HD            |
- * | infoText     | RecirculateData |
+ * | typeText     | Datum       |
+ * | unitText     | HD          |
+ * | infoText     | Recirculate |
  *
  */
 class MTreatmentRecirculate : public MAbstract {
@@ -65,9 +65,9 @@
 
 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("RecirculateData") ; }
+    Type_Enum    typeText() const override { return Type_Enum::eDatum      ; }
+    Unit_Enum    unitText() const override { return Unit_Enum::eHD         ; }
+    QString      infoText() const override { return QString("Recirculate") ; }
 
     struct Data {
         quint32     mTimeoutTotal       = 0; ///< Total Timeout              of Recirculate delivery
Index: sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp
===================================================================
diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp	(.../MTreatmentRinsebackData.cpp)	(revision 301c0a2101eb9374145ae274c8d91460fc9a6a62)
+++ sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp	(.../MTreatmentRinsebackData.cpp)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -18,23 +18,23 @@
 
 QVariantList MTreatmentRinseback::parameters() const {
     return {
-        _data.mTarget          .value,
-        _data.mCurrent         .value,
-        _data.mRate            .value,
-        _data.mTimeoutTotal    .value,
-        _data.mTimeoutCountDown.value,
-        _data.mIsCompleted    .value,
+        _data.mTarget           .value,
+        _data.mCurrent          .value,
+        _data.mRate             .value,
+        _data.mTimeoutTotal     .value,
+        _data.mTimeoutCountDown .value,
+        _data.mIsCompleted      .value,
     };
 }
 
 bool MTreatmentRinseback::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mTarget          ))
-    if (GetValue(vByteArray, index, _data.mCurrent         ))
-    if (GetValue(vByteArray, index, _data.mRate            ))
-    if (GetValue(vByteArray, index, _data.mTimeoutTotal    ))
-    if (GetValue(vByteArray, index, _data.mTimeoutCountDown))
-    if (GetValue(vByteArray, index, _data.mIsCompleted    ))
+    if (GetValue(vByteArray, index, _data.mTarget           ))
+    if (GetValue(vByteArray, index, _data.mCurrent          ))
+    if (GetValue(vByteArray, index, _data.mRate             ))
+    if (GetValue(vByteArray, index, _data.mTimeoutTotal     ))
+    if (GetValue(vByteArray, index, _data.mTimeoutCountDown ))
+    if (GetValue(vByteArray, index, _data.mIsCompleted      ))
     return true ;
     else { if(vIndex) *vIndex = index; return false; }
     else { if(vIndex) *vIndex = index; return false; }
@@ -51,11 +51,11 @@
  */
 MTreatmentRinseback::Data MTreatmentRinseback::data() const {
     Data data;
-    data.mTarget            = _data.mTarget          .value;
-    data.mCurrent           = _data.mCurrent         .value;
-    data.mRate              = _data.mRate            .value;
-    data.mTimeoutTotal      = _data.mTimeoutTotal    .value;
-    data.mTimeoutCountDown  = _data.mTimeoutCountDown.value;
-    data.mIsCompleted       = _data.mIsCompleted     .value;
+    data.mTarget            = _data.mTarget           .value;
+    data.mCurrent           = _data.mCurrent          .value;
+    data.mRate              = _data.mRate             .value;
+    data.mTimeoutTotal      = _data.mTimeoutTotal     .value;
+    data.mTimeoutCountDown  = _data.mTimeoutCountDown .value;
+    data.mIsCompleted       = _data.mIsCompleted      .value? true : false;
     return data;
 }
Index: sources/model/hd/data/treatment/MTreatmentRinsebackData.h
===================================================================
diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/model/hd/data/treatment/MTreatmentRinsebackData.h	(.../MTreatmentRinsebackData.h)	(revision 301c0a2101eb9374145ae274c8d91460fc9a6a62)
+++ sources/model/hd/data/treatment/MTreatmentRinsebackData.h	(.../MTreatmentRinsebackData.h)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -50,9 +50,9 @@
  * <h2 class="groupheader">Logging info</h2>
  * |              ||
  * |              ||
- * | typeText     | Datum         |
- * | unitText     | HD            |
- * | infoText     | RinsebackData |
+ * | typeText     | Datum     |
+ * | unitText     | HD        |
+ * | infoText     | Rinseback |
  *
  */
 class MTreatmentRinseback : public MAbstract {
@@ -73,17 +73,17 @@
 
 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("RinsebackData") ; }
+    Type_Enum    typeText() const override { return Type_Enum::eDatum    ; }
+    Unit_Enum    unitText() const override { return Unit_Enum::eHD       ; }
+    QString      infoText() const override { return QString("Rinseback") ; }
 
     struct Data {
-        float       mTarget             = 0; ///< Target  volume             of rinseback delivery
-        float       mCurrent            = 0; ///< Current volume             of rinseback delivery
-        quint32     mRate               = 0; ///< Current flow rate          of rinseback delivery
-        quint32     mTimeoutTotal       = 0; ///< Total Timeout              of rinseback delivery
-        quint32     mTimeoutCountDown   = 0; ///< Current Timeout count down of rinseback delivery
-        quint32     mIsCompleted        = 0; ///< Safety Volume              of rinseback delivery
+        float       mTarget             = 0; ///< Target  volume
+        float       mCurrent            = 0; ///< Current volume
+        quint32     mRate               = 0; ///< Current flow rate
+        quint32     mTimeoutTotal       = 0; ///< Total Timeout
+        quint32     mTimeoutCountDown   = 0; ///< Current Timeout count down
+        bool        mIsCompleted        = 0; ///< Rinseback is complete
     };
 
 public:
Index: sources/model/hd/data/treatment/MTreatmentSalineData.h
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/model/hd/data/treatment/MTreatmentSalineData.h	(.../MTreatmentSalineData.h)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/model/hd/data/treatment/MTreatmentSalineData.h	(.../MTreatmentSalineData.h)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -47,9 +47,9 @@
  * <h2 class="groupheader">Logging info</h2>
  * |              ||
  * |              ||
- * | typeText     | Datum      |
- * | unitText     | HD         |
- * | infoText     | SalineData |
+ * | typeText     | Datum  |
+ * | unitText     | HD     |
+ * | infoText     | Saline |
  *
  */
 class MTreatmentSaline : public MAbstract {
@@ -67,9 +67,9 @@
 
 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("SalineData") ; }
+    Type_Enum    typeText() const override { return Type_Enum::eDatum ; }
+    Unit_Enum    unitText() const override { return Unit_Enum::eHD    ; }
+    QString      infoText() const override { return QString("Saline") ; }
 
     struct Data {
         quint32     mTarget      = 0; ///< Target volume for the current started saline bolus
Index: sources/model/hd/data/treatment/MTreatmentStopData.h
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/model/hd/data/treatment/MTreatmentStopData.h	(.../MTreatmentStopData.h)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/model/hd/data/treatment/MTreatmentStopData.h	(.../MTreatmentStopData.h)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -46,7 +46,7 @@
  * |              ||
  * | typeText     | Datum |
  * | unitText     | HD    |
- * | infoText     | StopData |
+ * | infoText     | Stop  |
  *
  */
 class MTreatmentStop : public MAbstract {
@@ -63,9 +63,9 @@
 
 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("StopData") ; }
+    Type_Enum    typeText() const override { return Type_Enum::eDatum ; }
+    Unit_Enum    unitText() const override { return Unit_Enum::eHD    ; }
+    QString      infoText() const override { return QString("Stop"  ) ; }
 
     struct Data {
         quint32     mTotal       = 0; ///< Total   Timeout            of Treatment Blood Stop
Index: sources/model/ui/data/MUIBloodPressureData.h
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/model/ui/data/MUIBloodPressureData.h	(.../MUIBloodPressureData.h)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/model/ui/data/MUIBloodPressureData.h	(.../MUIBloodPressureData.h)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -57,9 +57,9 @@
  * <h2 class="groupheader">Logging info</h2>
  * |              ||
  * |              ||
- * | typeText     | Datum    |
- * | unitText     | UI       |
- * | infoText     | UIBPData |
+ * | typeText     | Datum |
+ * | unitText     | UI    |
+ * | infoText     | UIBP  |
  *
  */
 class MUIBloodPressure : public MAbstract {
@@ -86,9 +86,9 @@
     } _data;
 
 public:
-    Type_Enum    typeText() const override { return Type_Enum::eDatum   ; }
-    Unit_Enum    unitText() const override { return Unit_Enum::eUI      ; }
-    QString      infoText() const override { return QString("UIBPData") ; }
+    Type_Enum    typeText() const override { return Type_Enum::eDatum; }
+    Unit_Enum    unitText() const override { return Unit_Enum::eUI   ; }
+    QString      infoText() const override { return QString("UIBP" ) ; }
 
     struct Data {
         quint16 mSystolic   ;
Index: sources/view/dg/data/VDGAccelerometerData.cpp
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/view/dg/data/VDGAccelerometerData.cpp	(.../VDGAccelerometerData.cpp)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/view/dg/data/VDGAccelerometerData.cpp	(.../VDGAccelerometerData.cpp)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -17,6 +17,10 @@
 // Project
 #include "GuiController.h"
 
+// coco begin validated:
+// FIXME: this model was only for the Diagnostic use, and has been removed,
+//        Should be removed from the UI Software if not being used anymore
+
 VIEW_DEF(VDGAccelerometer, DGAccelerometerData)
 
 void VDGAccelerometer::onActionReceive(const DGAccelerometerData &vData) {
@@ -30,3 +34,5 @@
     yTilt (vData.mYTilt );
     zTilt (vData.mZTilt );
 }
+
+// coco end
Index: sources/view/dg/data/VDGAccelerometerData.h
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/view/dg/data/VDGAccelerometerData.h	(.../VDGAccelerometerData.h)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/view/dg/data/VDGAccelerometerData.h	(.../VDGAccelerometerData.h)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -22,6 +22,10 @@
 #include "VView.h"
 #include "MDGAccelerometerData.h"
 
+// coco begin validated:
+// FIXME: this model was only for the Diagnostic use, and has been removed,
+//        Should be removed from the UI Software if not being used anymore
+
 // namespace
 namespace View {
 
@@ -48,3 +52,5 @@
     VIEW_DEC(VDGAccelerometer, DGAccelerometerData)
 };
 }
+
+// coco end
Index: sources/view/dg/data/VDGConductivityData.h
===================================================================
diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/view/dg/data/VDGConductivityData.h	(.../VDGConductivityData.h)	(revision 301c0a2101eb9374145ae274c8d91460fc9a6a62)
+++ sources/view/dg/data/VDGConductivityData.h	(.../VDGConductivityData.h)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -41,7 +41,6 @@
     PROPERTY( float   , CD1                 , 0)
     PROPERTY( float   , CD2                 , 0)
 
-
     VIEW_DEC(VDGConductivity, DGConductivityData)
 };
 }
Index: sources/view/dg/data/VDGValvesStatesData.cpp
===================================================================
diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/view/dg/data/VDGValvesStatesData.cpp	(.../VDGValvesStatesData.cpp)	(revision 301c0a2101eb9374145ae274c8d91460fc9a6a62)
+++ sources/view/dg/data/VDGValvesStatesData.cpp	(.../VDGValvesStatesData.cpp)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -43,6 +43,7 @@
 {
     // order changed in reverse by request.
     QString text = QString() +
+       (valveStates_13() ? "1" : "0" ) + "" +
        (valveStates_12() ? "1" : "0" ) + "" +
        (valveStates_11() ? "1" : "0" ) + "" +
        (valveStates_10() ? "1" : "0" ) + "" +
Index: sources/view/dg/data/VDGValvesStatesData.h
===================================================================
diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/view/dg/data/VDGValvesStatesData.h	(.../VDGValvesStatesData.h)	(revision 301c0a2101eb9374145ae274c8d91460fc9a6a62)
+++ sources/view/dg/data/VDGValvesStatesData.h	(.../VDGValvesStatesData.h)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -40,19 +40,19 @@
     TRIGGER ( bool , refresh        , false)
     // coco end
 
-    PROPERTY( quint32 , valveStates_01 , 0)
-    PROPERTY( quint32 , valveStates_02 , 0)
-    PROPERTY( quint32 , valveStates_03 , 0)
-    PROPERTY( quint32 , valveStates_04 , 0)
-    PROPERTY( quint32 , valveStates_05 , 0)
-    PROPERTY( quint32 , valveStates_06 , 0)
-    PROPERTY( quint32 , valveStates_07 , 0)
-    PROPERTY( quint32 , valveStates_08 , 0)
-    PROPERTY( quint32 , valveStates_09 , 0)
-    PROPERTY( quint32 , valveStates_10 , 0)
-    PROPERTY( quint32 , valveStates_11 , 0)
-    PROPERTY( quint32 , valveStates_12 , 0)
-    PROPERTY( quint32 , valveStates_13 , 0)
+    PROPERTY( quint8 , valveStates_01 , 0 )
+    PROPERTY( quint8 , valveStates_02 , 0 )
+    PROPERTY( quint8 , valveStates_03 , 0 )
+    PROPERTY( quint8 , valveStates_04 , 0 )
+    PROPERTY( quint8 , valveStates_05 , 0 )
+    PROPERTY( quint8 , valveStates_06 , 0 )
+    PROPERTY( quint8 , valveStates_07 , 0 )
+    PROPERTY( quint8 , valveStates_08 , 0 )
+    PROPERTY( quint8 , valveStates_09 , 0 )
+    PROPERTY( quint8 , valveStates_10 , 0 )
+    PROPERTY( quint8 , valveStates_11 , 0 )
+    PROPERTY( quint8 , valveStates_12 , 0 )
+    PROPERTY( quint8 , valveStates_13 , 0 )
 
     Q_PROPERTY(QString text READ text NOTIFY refreshTriggered)
 
Index: sources/view/hd/data/VHDAccelerometerData.cpp
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/view/hd/data/VHDAccelerometerData.cpp	(.../VHDAccelerometerData.cpp)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/view/hd/data/VHDAccelerometerData.cpp	(.../VHDAccelerometerData.cpp)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -17,6 +17,10 @@
 // Project
 #include "GuiController.h"
 
+// coco begin validated:
+// FIXME: this model was only for the Diagnostic use, and has been removed,
+//        Should be removed from the UI Software if not being used anymore
+
 VIEW_DEF(VHDAccelerometer, HDAccelerometerData)
 
 void VHDAccelerometer::onActionReceive(const HDAccelerometerData &vData) {
@@ -30,3 +34,4 @@
     yTilt (vData.mYTilt );
     zTilt (vData.mZTilt );
 }
+// coco end
Index: sources/view/hd/data/VHDAccelerometerData.h
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/view/hd/data/VHDAccelerometerData.h	(.../VHDAccelerometerData.h)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/view/hd/data/VHDAccelerometerData.h	(.../VHDAccelerometerData.h)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -22,6 +22,10 @@
 #include "VView.h"
 #include "MHDAccelerometerData.h"
 
+// coco begin validated:
+// FIXME: this model was only for the Diagnostic use, and has been removed,
+//        Should be removed from the UI Software if not being used anymore
+
 // namespace
 namespace View {
 
@@ -48,3 +52,5 @@
     VIEW_DEC(VHDAccelerometer, HDAccelerometerData)
 };
 }
+
+// coco end
Index: sources/view/hd/data/VHDAirBubbleData.cpp
===================================================================
diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/view/hd/data/VHDAirBubbleData.cpp	(.../VHDAirBubbleData.cpp)	(revision 301c0a2101eb9374145ae274c8d91460fc9a6a62)
+++ sources/view/hd/data/VHDAirBubbleData.cpp	(.../VHDAirBubbleData.cpp)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -20,7 +20,6 @@
 VIEW_DEF(VHDAirBubble, HDAirBubbleData)
 
 void VHDAirBubble::onActionReceive(const HDAirBubbleData &vData) {
-    venousAirBubbleStatus       (vData.mVenousAirBubbleStatus       );
-    venousAirBubbleState        (vData.mVenousAirBubbleState        );
-
+    venousAirBubbleStatus (vData.mVenousAirBubbleStatus);
+    venousAirBubbleState  (vData.mVenousAirBubbleState );
 }
Index: sources/view/hd/data/VHDAirBubbleData.h
===================================================================
diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/view/hd/data/VHDAirBubbleData.h	(.../VHDAirBubbleData.h)	(revision 301c0a2101eb9374145ae274c8d91460fc9a6a62)
+++ sources/view/hd/data/VHDAirBubbleData.h	(.../VHDAirBubbleData.h)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -36,9 +36,8 @@
     Q_OBJECT
 
     PROPERTY( quint32   , venousAirBubbleStatus     , 0)
-    PROPERTY( quint32   , venousAirBubbleState     , 0)
+    PROPERTY( quint32   , venousAirBubbleState      , 0)
 
-
     VIEW_DEC(VHDAirBubble, HDAirBubbleData)
 };
 }
Index: sources/view/hd/data/VHDAirTrapData.cpp
===================================================================
diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/view/hd/data/VHDAirTrapData.cpp	(.../VHDAirTrapData.cpp)	(revision 301c0a2101eb9374145ae274c8d91460fc9a6a62)
+++ sources/view/hd/data/VHDAirTrapData.cpp	(.../VHDAirTrapData.cpp)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -20,7 +20,6 @@
 VIEW_DEF(VHDAirTrap, HDAirTrapData)
 
 void VHDAirTrap::onActionReceive(const HDAirTrapData &vData) {
-    airTrapLowerLevel       (vData.mAirTrapLowerLevel       );
-    airTrapUpperLevel        (vData.mAirTrapUpperLevel        );
-
+    airTrapLowerLevel   (vData.mAirTrapLowerLevel   );
+    airTrapUpperLevel   (vData.mAirTrapUpperLevel   );
 }
Index: sources/view/hd/data/VHDAirTrapData.h
===================================================================
diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/view/hd/data/VHDAirTrapData.h	(.../VHDAirTrapData.h)	(revision 301c0a2101eb9374145ae274c8d91460fc9a6a62)
+++ sources/view/hd/data/VHDAirTrapData.h	(.../VHDAirTrapData.h)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -38,7 +38,6 @@
     PROPERTY( quint32   , airTrapLowerLevel     , 0)
     PROPERTY( quint32   , airTrapUpperLevel     , 0)
 
-
     VIEW_DEC(VHDAirTrap, HDAirTrapData)
 };
 }
Index: sources/view/hd/data/VHDBloodLeakData.h
===================================================================
diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/view/hd/data/VHDBloodLeakData.h	(.../VHDBloodLeakData.h)	(revision 301c0a2101eb9374145ae274c8d91460fc9a6a62)
+++ sources/view/hd/data/VHDBloodLeakData.h	(.../VHDBloodLeakData.h)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -46,7 +46,6 @@
     PROPERTY( quint32   , bloodLeakLEDIntensity         , 0)
     PROPERTY( quint32   , bloodLeakRegisterCounter      , 0)
 
-
     VIEW_DEC(VHDBloodLeak, HDBloodLeakData)
 };
 }
Index: sources/view/hd/data/treatment/VTreatmentRinsebackData.h
===================================================================
diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3
--- sources/view/hd/data/treatment/VTreatmentRinsebackData.h	(.../VTreatmentRinsebackData.h)	(revision 301c0a2101eb9374145ae274c8d91460fc9a6a62)
+++ sources/view/hd/data/treatment/VTreatmentRinsebackData.h	(.../VTreatmentRinsebackData.h)	(revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3)
@@ -41,7 +41,7 @@
     PROPERTY( quint32 , rate            , 0)
     PROPERTY( quint32 , timeoutTotal    , 0)
     PROPERTY( quint32 , timeoutCountDown, 0)
-    PROPERTY( quint32 , isCompleted     , 0)
+    PROPERTY( bool    , isCompleted     , 0)
 
     VIEW_DEC(VTreatmentRinseback, TreatmentRinsebackData)
 };