Index: leahi.pro
===================================================================
diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r3428dfd1fb3372d8de9a7c1afc55e4860b70ec89
--- leahi.pro	(.../leahi.pro)	(revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8)
+++ leahi.pro	(.../leahi.pro)	(revision 3428dfd1fb3372d8de9a7c1afc55e4860b70ec89)
@@ -459,7 +459,8 @@
     sources/model/ui/data/MUIBloodPressureData.cpp \
     sources/storage/Settings.cpp \
     sources/storage/TreatmentLog.cpp \
-    sources/view/dg/data/VDDGenDialysateData.cpp \
+    sources/view/dd/data/VDDConductivityData.cpp \
+    sources/view/dd/data/VDDGenDialysateData.cpp \
     sources/view/hd/data/post/VHDPOSTData.cpp \
     sources/bluetooth/BluetoothInterface.cpp \
     sources/cloudsync/CloudSyncController.cpp \
@@ -688,7 +689,6 @@
     sources/view/dg/data/VDGTemperaturesData.cpp \
     sources/view/dg/data/VDGValvesStatesData.cpp \
     sources/view/dg/data/VDGAccelerometerData.cpp \
-    sources/view/dg/data/VDDConductivityData.cpp \
     \ # Storage
     sources/storage/StorageGlobals.cpp \
     sources/storage/FileHandler.cpp \
Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r148e4803af29502875b08875f171e284398db34e -r3428dfd1fb3372d8de9a7c1afc55e4860b70ec89
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 148e4803af29502875b08875f171e284398db34e)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 3428dfd1fb3372d8de9a7c1afc55e4860b70ec89)
@@ -116,7 +116,7 @@
     {Gui::GuiActionType::ID_TDSwitchesData                          ,   1 * 4       }, // 3 parameters each 4bytes
     {Gui::GuiActionType::ID_TDBatteryData                           ,   2 * 4       }, // 2 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items)
     {Gui::GuiActionType::ID_TDTemperatureData                       ,   1 * 4       }, // 1 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items)
-    {Gui::GuiActionType::ID_TreatmentSetPointData                 ,   3 * 4       }, // 3 parameters each 4bytes
+    {Gui::GuiActionType::ID_TreatmentSetPointData                   ,   3 * 4       }, // 3 parameters each 4bytes
 
     // ---- TODO : AFTER GIVING IT SOME THOUGHT, IT SEEMS WE CAN GET THESE LEN FROM THE MODEL AND DO NOT NEED TO HAVE THIS BUT NEED TO INVESTIGATE MORE.
     {Gui::GuiActionType::ID_AlarmStatus                             ,   4 * 3 + 2   }, // 3 parameters each 4bytes + 1 parameter 2bytes
Index: sources/gui/qml/pages/settings/SettingsInformation.qml
===================================================================
diff -u -raf9b5ee3e759ca45c4e55488f46601f30143edae -r3428dfd1fb3372d8de9a7c1afc55e4860b70ec89
--- sources/gui/qml/pages/settings/SettingsInformation.qml	(.../SettingsInformation.qml)	(revision af9b5ee3e759ca45c4e55488f46601f30143edae)
+++ sources/gui/qml/pages/settings/SettingsInformation.qml	(.../SettingsInformation.qml)	(revision 3428dfd1fb3372d8de9a7c1afc55e4860b70ec89)
@@ -67,12 +67,12 @@
             ""                                          ,
             vDevice                 .osVersion          ,
             Qt                      .application.version,
-            vAdjustmentVersions     .hdVerDevice        ,
-            vAdjustmentVersions     .hdVerFPGA          ,
+            vAdjustmentVersions     .tdVerDevice        ,
+            vAdjustmentVersions     .tdVerFPGA          ,
             vAdjustmentVersions     .tdSerial           ,
-            vAdjustmentVersions     .dgVerDevice        ,
-            vAdjustmentVersions     .dgVerFPGA          ,
-            vAdjustmentVersions     .dgSerial           ,
+            vAdjustmentVersions     .ddVerDevice        ,
+            vAdjustmentVersions     .ddVerFPGA          ,
+            vAdjustmentVersions     .ddSerial           ,
             "", "", "", "", // Space and title
             vAdjustmentServiceDates .hdLastServiceDate  ,
             vAdjustmentServiceDates .hdNextServiceDate  ,
@@ -88,12 +88,12 @@
             qsTr("Versions"             ), // col1 title
             qsTr("OS Version"           ),
             qsTr("UI Version"           ),
-            qsTr("HD Version"           ),
-            qsTr("HD FPGA Version"      ),
-            qsTr("HD Serial Number"     ),
-            qsTr("DG Version"           ),
-            qsTr("DG FPGA Version"      ),
-            qsTr("DG Serial Number"     ),
+            qsTr("TD Version"           ),
+            qsTr("TD FPGA Version"      ),
+            qsTr("TD Serial Number"     ),
+            qsTr("DD Version"           ),
+            qsTr("DD FPGA Version"      ),
+            qsTr("DD Serial Number"     ),
             "", "", "", // Holders for last elements
 
             qsTr("Service"              ), // col2 title
Index: sources/view/dd/data/VDDConductivityData.cpp
===================================================================
diff -u
--- sources/view/dd/data/VDDConductivityData.cpp	(revision 0)
+++ sources/view/dd/data/VDDConductivityData.cpp	(revision 3428dfd1fb3372d8de9a7c1afc55e4860b70ec89)
@@ -0,0 +1,29 @@
+/*!
+ *
+ * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    VDDConductivityData.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      27-Mar-2023
+ * \author  (original)  Behrouz NemaiPour
+ * \date    (original)  02-Jul-2020
+ *
+ */
+#include "VDDConductivityData.h"
+
+// Project
+#include "GuiController.h"
+
+VIEW_DEF(VDDConductivity, DDConductivityData)
+
+void VDDConductivity::onActionReceive(const DDConductivityData &vData)
+{
+    CD1          ( vData. mCD1            );
+    CD2          ( vData. mCD2            );
+    CD3          ( vData. mCD3            );
+    CD4          ( vData. mCD4            );
+    CD5          ( vData. mCD5            );
+}
Index: sources/view/dd/data/VDDGenDialysateData.cpp
===================================================================
diff -u
--- sources/view/dd/data/VDDGenDialysateData.cpp	(revision 0)
+++ sources/view/dd/data/VDDGenDialysateData.cpp	(revision 3428dfd1fb3372d8de9a7c1afc55e4860b70ec89)
@@ -0,0 +1,33 @@
+/*!
+ *
+ * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file    VDDGenDialysateData.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      27-Mar-2023
+ * \author  (original)  Behrouz NemaiPour
+ * \date    (original)  02-Jul-2020
+ *
+ */
+#include "VDDGenDialysateData.h"
+
+// Project
+#include "GuiController.h"
+
+VIEW_DEF(VDDGenDialysate, DDGenDialysateData)
+
+void VDDGenDialysate::onActionReceive(const DDGenDialysateData &vData)
+{
+    genDialysateExec     ( vData. mGenDialysateExec     );
+    ddInProgress         ( vData. mDDInProgress         );
+    fltLevel1            ( vData. mFltLevel1            );
+    bicarbLevel          ( vData. mBicarbLevel          );
+    spentLevel           ( vData. mSpentLevel           );
+    hydNegativePressure  ( vData. mHydNegativePressure  );
+    hydPositivePressure  ( vData. mHydPositivePressure  );
+    spendPressure        ( vData. mSpendPressure        );
+    dialGood             ( vData. mDialGood             );
+}
Fisheye: Tag 3428dfd1fb3372d8de9a7c1afc55e4860b70ec89 refers to a dead (removed) revision in file `sources/view/dg/data/VDDConductivityData.cpp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3428dfd1fb3372d8de9a7c1afc55e4860b70ec89 refers to a dead (removed) revision in file `sources/view/dg/data/VDDGenDialysateData.cpp'.
Fisheye: No comparison available.  Pass `N' to diff?