Index: denali.pro
===================================================================
diff -u -r2d37cfe6593a90633a9db1fa5136f8fc43b56188 -r6a9123e0ee401af34fd080ec3de0c91b6890ef5a
--- denali.pro	(.../denali.pro)	(revision 2d37cfe6593a90633a9db1fa5136f8fc43b56188)
+++ denali.pro	(.../denali.pro)	(revision 6a9123e0ee401af34fd080ec3de0c91b6890ef5a)
@@ -165,6 +165,7 @@
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.h \
+    sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.h \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.h \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.h \
@@ -424,6 +425,7 @@
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.cpp \
+    sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp \
Index: denali.pro.user
===================================================================
diff -u -r968c7861b6caf1906c6b3ac34ae13018c6f1bf2b -r6a9123e0ee401af34fd080ec3de0c91b6890ef5a
--- denali.pro.user	(.../denali.pro.user)	(revision 968c7861b6caf1906c6b3ac34ae13018c6f1bf2b)
+++ denali.pro.user	(.../denali.pro.user)	(revision 6a9123e0ee401af34fd080ec3de0c91b6890ef5a)
@@ -1213,7 +1213,7 @@
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">denali</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/denali/Projects/application/denali.pro</value>
-    <value type="QString" key="RunConfiguration.Arguments">-l -q</value>
+    <value type="QString" key="RunConfiguration.Arguments">-l -q -d</value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
@@ -1536,7 +1536,7 @@
     <value type="int" key="RemoteLinux.EnvironmentAspect.Version">1</value>
     <value type="QString" key="RemoteLinux.RunConfig.AlternateRemoteExecutable"></value>
     <value type="bool" key="RemoteLinux.RunConfig.UseAlternateRemoteExecutable">false</value>
-    <value type="QString" key="RunConfiguration.Arguments">-l -a</value>
+    <value type="QString" key="RunConfiguration.Arguments">--disable-timeout --disable-alarm-no-minimize --disable-unhandled-report</value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -red9ea343a2a22623796045d9e1229a2cbfa8c970 -r6a9123e0ee401af34fd080ec3de0c91b6890ef5a
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision ed9ea343a2a22623796045d9e1229a2cbfa8c970)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 6a9123e0ee401af34fd080ec3de0c91b6890ef5a)
@@ -72,7 +72,9 @@
     {Gui::GuiActionType::ID_Recirculate                             ,   2 * 4       }, // 2 parameters each 4bytes
     {Gui::GuiActionType::ID_BloodPrime                              ,   2 * 4       }, // 2 parameters each 4bytes
     {Gui::GuiActionType::ID_TreatmentStop                           ,   2 * 4       }, // 2 parameters each 4bytes
-
+    {Gui::GuiActionType::ID_HDAirBubbleData                         ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_HDAirTrapData                           ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_HDBloodLeakData                         ,  10 * 4       }, // 2 parameters each 4bytes
     // ----
     {Gui::GuiActionType::ID_HDOperationModeData                     ,   2 * 4       }, // 2 parameter  each 4bytes
     {Gui::GuiActionType::ID_PreTreatmentStates                      ,   9 * 4       }, // 9 parameters each 4bytes
@@ -92,6 +94,7 @@
     {Gui::GuiActionType::ID_DGLoadCellReadingsData                  ,   4 * 4       }, //  4 parameters each 4bytes
     {Gui::GuiActionType::ID_DGTemperaturesData                      ,  12 * 4       }, // 12 parameters each 4bytes
     {Gui::GuiActionType::ID_DGAccelerometerData                     ,   9 * 4       }, //  9 parameters each 4bytes
+    {Gui::GuiActionType::ID_DGConductivityData                      ,   4 * 4       }, //  9 parameters each 4bytes
     // HD Data Messages
     {Gui::GuiActionType::ID_HDAccelerometerData                     ,   9 * 4       }, // 9 parameters each 4bytes
     {Gui::GuiActionType::ID_HDSyringePumpData                       ,   9 * 4       }, // 9 parameters each 4bytes
Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -red9ea343a2a22623796045d9e1229a2cbfa8c970 -r6a9123e0ee401af34fd080ec3de0c91b6890ef5a
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision ed9ea343a2a22623796045d9e1229a2cbfa8c970)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 6a9123e0ee401af34fd080ec3de0c91b6890ef5a)
@@ -429,6 +429,9 @@
     // ----- Datum
     case Gui::GuiActionType::ID_HDAccelerometerData                 : ok = notify<Model::MHDAccelerometer                           >(vMessage, vData, Gui::GuiActionType::ID_HDAccelerometerData               ); break;
     case Gui::GuiActionType::ID_HDSyringePumpData                   : ok = notify<Model::MHDSyringePump                             >(vMessage, vData, Gui::GuiActionType::ID_HDSyringePumpData                 ); break;
+    case Gui::GuiActionType::ID_HDAirBubbleData                     : ok = notify<Model::MHDAirBubbleData                           >(vMessage, vData, Gui::GuiActionType::ID_HDAirBubbleData                   ); break;
+    case Gui::GuiActionType::ID_HDAirTrapData                       : ok = notify<Model::MHDAirTrapData                             >(vMessage, vData, Gui::GuiActionType::ID_HDAirTrapData                     ); break;
+    case Gui::GuiActionType::ID_HDBloodLeakData                     : ok = notify<Model::MHDBloodLeakData                           >(vMessage, vData, Gui::GuiActionType::ID_HDBloodLeakData                   ); break;
 
     // ----- Datum - Treatment
     case Gui::GuiActionType::ID_TreatmentRanges                     : ok = notify<Model::MTreatmentRanges                           >(vMessage, vData, Gui::GuiActionType::ID_TreatmentRanges                   ); break;
@@ -547,6 +550,7 @@
     case Gui::GuiActionType::ID_DGDebugText                 : ok = notify<Model::MDGDebugText                   >(vMessage, vData, Gui::GuiActionType::ID_DGDebugText                   ); break;
     case Gui::GuiActionType::ID_DGGeneralEvent              : ok = notify<Model::MDGGeneralEvent                >(vMessage, vData, Gui::GuiActionType::ID_DGGeneralEvent                ); break;
     case Gui::GuiActionType::ID_DGAccelerometerData         : ok = notify<Model::MDGAccelerometer               >(vMessage, vData, Gui::GuiActionType::ID_DGAccelerometerData           ); break;
+    case Gui::GuiActionType::ID_DGConductivityData          : ok = notify<Model::MDGConductivityData            >(vMessage, vData, Gui::GuiActionType::ID_DGConductivityData            ); break;
     // ----- Datum - Pre-Treatment progress
     case Gui::GuiActionType::ID_DGFilterFlushData           : ok = notify<Model::MDGFilterFlush                 >(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData             ); break;
     // ----- Datum - Disinfection
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -red9ea343a2a22623796045d9e1229a2cbfa8c970 -r6a9123e0ee401af34fd080ec3de0c91b6890ef5a
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision ed9ea343a2a22623796045d9e1229a2cbfa8c970)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 6a9123e0ee401af34fd080ec3de0c91b6890ef5a)
@@ -193,12 +193,14 @@
             ID_DGLoadCellReadingsData                   = 0x0C00, // 12
             ID_DGTemperaturesData                       = 0x2D00, // 45
             ID_DGAccelerometerData                      = 0x3400, // 52
-
+            ID_DGConductivityData                       = 0x3100, // 49
             // HD Data Messages
             ID_HDAccelerometerData                      = 0x3300, // 51
             ID_HDSyringePumpData                        = 0x6900, // 105
+            ID_HDBloodLeakData                          = 0x6C00, // 108
+            ID_HDAirBubbleData                          = 0x9300, // 147
+            ID_HDAirTrapData                            = 0x3E00, // 62
 
-
             // In-Treatment Adjustables
             ID_AdjustDurationReq                        = 0x1600, // 22
             ID_AdjustDurationRsp                        = 0x1B00, // 27
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r93dbee7bb0b6e799a602735d54c01aeebd0a2074 -r6a9123e0ee401af34fd080ec3de0c91b6890ef5a
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 93dbee7bb0b6e799a602735d54c01aeebd0a2074)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 6a9123e0ee401af34fd080ec3de0c91b6890ef5a)
@@ -24,7 +24,10 @@
 // View classes
 import VHDAccelerometer                                     0.1
 import VHDSyringePump                                       0.1
-
+import VHDBloodLeak                                         0.1
+import VHDAirTrap                                           0.1
+import VHDAirBubble                                         0.1
+import VAlarmStatus                                         0.1
 // POST
 import VHDPOSTData                                          0.1
 import VDGPOSTData                                          0.1
@@ -87,6 +90,7 @@
 import VDGValvesStates                                      0.1
 import VTreatmentCreate                                     0.1
 import VDGAccelerometer                                     0.1
+import VDGConductivity                                      0.1
 // In-Treatment - Adjustemnt
 import VTreatmentAdjustmentDuration                         0.1
 import VTreatmentAdjustmentFlows                            0.1
@@ -147,6 +151,7 @@
         interval    : vTreatmentCreate.bloodPressureMeasureInterval
     }
 
+    VAlarmStatus                                        { id: vAlarmStatus                                          }
     VTreatmentDialysateFlow                             { id: vTreatmentDialysateFlow                               }
     VTreatmentPressureOcclusion                         { id: vTreatmentPressureOcclusion                           }
     VTreatmentUltrafiltration                           { id: vTreatmentUltrafiltration                             }
@@ -157,6 +162,9 @@
     VTreatmentStop                                      { id: vTreatmentStop                                        }
     VHDAccelerometer                                    { id: vHDAccelerometer                                      }
     VHDSyringePump                                      { id: vHDSyringePump                                        }
+    VHDAirBubble                                        { id: vHDAirBubble                                          }
+    VHDBloodLeak                                        { id: vHDBloodLeak                                          }
+    VHDAirTrap                                          { id: vHDAirTrap                                            }
     // ---- DG
     VDGDrainPump                                        { id: vDGDrainPump                                          }
     VDGHeaters                                          { id: vDGHeaters                                            }
@@ -168,7 +176,7 @@
     VDGTemperatures                                     { id: vDGTemperatures                                       }
     VDGValvesStates                                     { id: vDGValvesStates                                       }
     VDGAccelerometer                                    { id: vDGAccelerometer                                      }
-
+    VDGConductivity                                     { id: vDGConductivity                                       }
     // --- Pre-Treatment Progress Data
     VPreTreatmentAdjustmentInitTreatment                { id: vPreTreatmentAdjustmentInitTreatment                  }
     VDGFilterFlush                                      { id: vDGFilterFlush                                        }
Index: sources/model/MModel.h
===================================================================
diff -u -rb6d23ac9f339d36f9c68000ecc59dcc07fec8838 -r6a9123e0ee401af34fd080ec3de0c91b6890ef5a
--- sources/model/MModel.h	(.../MModel.h)	(revision b6d23ac9f339d36f9c68000ecc59dcc07fec8838)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 6a9123e0ee401af34fd080ec3de0c91b6890ef5a)
@@ -102,6 +102,7 @@
 #include "MPreTreatmentAdjustWaterSampleResponse.h"
 #include "MPreTreatmentSelfTestNoCartridgeData.h"
 #include "MPreTreatmentSelfTestDryData.h"
+#include "MPreTreatmentAdjustDisposablesConfirmResponse.h"
 #include "MPreTreatmentAdjustDisposablesPrimeResponse.h"
 #include "MPreTreatmentDisposablesPrimeData.h"
 #include "MPreTreatmentAdjustPatientConnectionBeginResponse.h"
@@ -394,6 +395,7 @@
     REGISTER_METATYPE(                                        AdjustInitTreatmentResponseData ) \
     REGISTER_METATYPE(                                 AdjustParametersValidationResponseData ) \
     REGISTER_METATYPE(                                          AdjustWaterSampleResponseData ) \
+    REGISTER_METATYPE(                                   AdjustDisposablesConfirmResponseData ) \
     REGISTER_METATYPE(                                     AdjustDisposablesPrimeResponseData ) \
     REGISTER_METATYPE(                               AdjustPatientConnectionBeginResponseData ) \
     REGISTER_METATYPE(                                  AdjustUltrafiltrationInitResponseData ) \
@@ -519,6 +521,7 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                 AdjustInitTreatmentResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,          AdjustParametersValidationResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                   AdjustWaterSampleResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,            AdjustDisposablesConfirmResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,              AdjustDisposablesPrimeResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,        AdjustPatientConnectionBeginResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,           AdjustUltrafiltrationInitResponseData ) \
@@ -695,6 +698,7 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                         AdjustInitTreatmentResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                  AdjustParametersValidationResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                           AdjustWaterSampleResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                    AdjustDisposablesConfirmResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                      AdjustDisposablesPrimeResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                AdjustPatientConnectionBeginResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                   AdjustUltrafiltrationInitResponseData ) \
@@ -955,6 +959,7 @@
     ACTION_RECEIVE_SIGNAL(                                    AdjustInitTreatmentResponseData ) \
     ACTION_RECEIVE_SIGNAL(                             AdjustParametersValidationResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                      AdjustWaterSampleResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                               AdjustDisposablesConfirmResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                 AdjustDisposablesPrimeResponseData ) \
     ACTION_RECEIVE_SIGNAL(                           AdjustPatientConnectionBeginResponseData ) \
     ACTION_RECEIVE_SIGNAL(                              AdjustUltrafiltrationInitResponseData ) \