Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rdf61c476838011a343a6930fd5b30404629379bc -r5e5c936f26d0dd06c89e9fd32de5775a37b52493
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision df61c476838011a343a6930fd5b30404629379bc)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493)
@@ -381,7 +381,59 @@
             ID_AdjustAdvancedInstitutionalRecordRsp     = 0x8900, // 137 TD -> UI response institutional record
 
             // HD reset request in service mode
-            ID_ResetHDInServiceModeReq                  = 0xB900, // 185 UI -> HD reset in service mode
+            ID_ResetHDInServiceModeReq                  = 0xB90F, // 185 //// ----- @CRAPIZED: had to change to avoid duplication
+
+            // DD Calibration
+            ID_DDCalibrationPressureReq                 = 0x1801, // 280  //// ----- @LEAHIZED
+            ID_DDCalibrationPressureRsp                 = 0x1901, // 281  //// ----- @LEAHIZED
+            ID_AdjustDDCalibrationPressureReq           = 0x1A01, // 282  //// ----- @LEAHIZED
+            ID_AdjustDDCalibrationPressureRsp           = 0x1B01, // 283  //// ----- @LEAHIZED
+
+            ID_DDCalibrationTemperatureReq              = 0x1C01, // 284  //// ----- @LEAHIZED
+            ID_DDCalibrationTemperatureRsp              = 0x1D01, // 285  //// ----- @LEAHIZED
+            ID_AdjustDDCalibrationTemperatureReq        = 0x1E01, // 286  //// ----- @LEAHIZED
+            ID_AdjustDDCalibrationTemperatureRsp        = 0x1F01, // 287  //// ----- @LEAHIZED
+
+            ID_DDCalibrationConcentratePumpReq          = 0x2001, // 288  //// ----- @LEAHIZED
+            ID_DDCalibrationConcentratePumpRsp          = 0x2101, // 289  //// ----- @LEAHIZED
+            ID_AdjustDDCalibrationConcentratePumpReq    = 0x2201, // 290  //// ----- @LEAHIZED
+            ID_AdjustDDCalibrationConcentratePumpRsp    = 0x2301, // 291  //// ----- @LEAHIZED
+
+            ID_DDCalibrationD12DialysatePumpReq         = 0x2401, // 292  //// ----- @LEAHIZED
+            ID_DDCalibrationD12DialysatePumpRsp         = 0x2501, // 293  //// ----- @LEAHIZED
+            ID_AdjustDDCalibrationD12DialysatePumpReq   = 0x2601, // 294  //// ----- @LEAHIZED
+            ID_AdjustDDCalibrationD12DialysatePumpRsp   = 0x2701, // 295  //// ----- @LEAHIZED
+
+            ID_DDCalibrationD48DialysatePumpReq         = 0x2801, // 296  //// ----- @LEAHIZED
+            ID_DDCalibrationD48DialysatePumpRsp         = 0x2901, // 297  //// ----- @LEAHIZED
+            ID_AdjustDDCalibrationD48DialysatePumpReq   = 0x2A01, // 298  //// ----- @LEAHIZED
+            ID_AdjustDDCalibrationD48DialysatePumpRsp   = 0x2B01, // 299  //// ----- @LEAHIZED
+
+            ID_DDCalibrationAcidConcentratesReq         = 0x2C01, // 300  //// ----- @LEAHIZED
+            ID_DDCalibrationAcidConcentratesRsp         = 0x2D01, // 301  //// ----- @LEAHIZED
+            ID_AdjustDDCalibrationAcidConcentratesReq   = 0x2E01, // 302  //// ----- @LEAHIZED
+            ID_AdjustDDCalibrationAcidConcentratesRsp   = 0x2F01, // 303  //// ----- @LEAHIZED
+
+            ID_DDCalibrationBicarbConcentratesReq       = 0x3001, // 304  //// ----- @LEAHIZED
+            ID_DDCalibrationBicarbConcentratesRsp       = 0x3101, // 305  //// ----- @LEAHIZED
+            ID_AdjustDDCalibrationBicarbConcentratesReq = 0x3201, // 306  //// ----- @LEAHIZED
+            ID_AdjustDDCalibrationBicarbConcentratesRsp = 0x3301, // 307  //// ----- @LEAHIZED
+
+            ID_DDCalibrationAccelerometerSensorReq      = 0x3401, // 308  //// ----- @LEAHIZED
+            ID_DDCalibrationAccelerometerSensorRsp      = 0x3501, // 309  //// ----- @LEAHIZED
+            ID_AdjustDDCalibrationAccelerometerSensorReq= 0x3601, // 310  //// ----- @LEAHIZED
+            ID_AdjustDDCalibrationAccelerometerSensorRsp= 0x3701, // 311  //// ----- @LEAHIZED
+
+            ID_DDCalibrationBloodLeakSensorReq          = 0x3801, // 312  //// ----- @LEAHIZED
+            ID_DDCalibrationBloodLeakSensorRsp          = 0x3901, // 313  //// ----- @LEAHIZED
+            ID_AdjustDDCalibrationBloodLeakSensorReq    = 0x3A01, // 314  //// ----- @LEAHIZED
+            ID_AdjustDDCalibrationBloodLeakSensorRsp    = 0x3B01, // 315  //// ----- @LEAHIZED
+
+            ID_DDCalibrationConductivitySensorReq       = 0x3C01, // 316  //// ----- @LEAHIZED
+            ID_DDCalibrationConductivitySensorRsp       = 0x3D01, // 317  //// ----- @LEAHIZED
+            ID_AdjustDDCalibrationConductivitySensorReq = 0x3E01, // 318  //// ----- @LEAHIZED
+            ID_AdjustDDCalibrationConductivitySensorRsp = 0x3F01, // 319  //// ----- @LEAHIZED
+
         };
 
         enum class GuiActionsData_Enum /*: quint8  QML does not support*/ {
@@ -470,6 +522,12 @@
         Q_ENUM(DD_Disinfect_States)
         Q_ENUM(DD_Heat_UI_States)
         Q_ENUM(DD_Valves)
+        Q_ENUM(PressureSensors)
+        Q_ENUM(TemperatureSensors)
+        Q_ENUM(ConcentratePumps)
+        Q_ENUM(dd_acid_types)
+        Q_ENUM(dd_bicarb_types)
+        Q_ENUM(Conductivity_Sensors)
 
         #include "FPDefs.h"
     };
@@ -550,6 +608,12 @@
 
     // DD Valves
     typedef GuiActions::DD_Valves                                       GuiDDValves;
+    typedef GuiActions::PressureSensors                                 GuiDDCalibrationPressure;
+    typedef GuiActions::TemperatureSensors                              GuiDDCalibrationTemperature;
+    typedef GuiActions::ConcentratePumps                                GuiDDCalibrationConcentratePump;
+    typedef GuiActions::dd_acid_types                                   GuiDDCalibrationAcidType;
+    typedef GuiActions::dd_bicarb_types                                 GuiDDCalibrationBicarbType;
+    typedef GuiActions::Conductivity_Sensors                            GuiDDCalibrationConductivitySensor;
 
     typedef QMap        <quint32, QString>                              GuiStringIndexMap;
     typedef QPair       <quint32, QString>                              GuiStringIndexMapItem;