Index: denali.pro
===================================================================
diff -u -r5babb1ac6c9edda7f89bae8bb92d56fe733e8206 -r968c7861b6caf1906c6b3ac34ae13018c6f1bf2b
--- denali.pro	(.../denali.pro)	(revision 5babb1ac6c9edda7f89bae8bb92d56fe733e8206)
+++ denali.pro	(.../denali.pro)	(revision 968c7861b6caf1906c6b3ac34ae13018c6f1bf2b)
@@ -114,7 +114,6 @@
     \ # Controllers
     sources/ApplicationController.h \
     sources/device/DeviceController.h \
-    sources/model/hd/data/MHDBloodLeakData.h \
     sources/model/ui/data/MUIBloodPressureData.h \
     sources/storage/Settings.h \
     sources/storage/TreatmentLog.h \
@@ -202,6 +201,9 @@
     sources/model/hd/data/MHDGeneralEvent.h \
     sources/model/hd/data/MHDAccelerometerData.h \
     sources/model/hd/data/MHDSyringePumpData.h \
+    sources/model/hd/data/MHDAirBubbleData.h \
+    sources/model/hd/data/MHDAirTrapData.h \
+    sources/model/hd/data/MHDBloodLeakData.h \
     sources/model/hd/data/MTreatmentRangesData.h \
     sources/model/hd/data/treatment/MTreatmentTimeData.h \
     sources/model/hd/data/treatment/MTreatmentFlowsData.h \
@@ -241,6 +243,7 @@
     sources/model/dg/data/MDGTemperaturesData.h \
     sources/model/dg/data/MDGValvesStatesData.h \
     sources/model/dg/data/MDGAccelerometerData.h \
+    sources/model/dg/data/MDGConductivityData.h \
     \ # CANBus
     sources/canbus/CanInterface.h \
     sources/canbus/FrameInterface.h \
@@ -319,6 +322,9 @@
     \ # ---------- Views - HD - Data
     sources/view/hd/data/VHDAccelerometerData.h \
     sources/view/hd/data/VHDSyringePumpData.h \
+    sources/view/hd/data/VHDAirBubbleData.h \
+    sources/view/hd/data/VHDAirTrapData.h \
+    sources/view/hd/data/VHDBloodLeakData.h \
     sources/view/hd/data/VTreatmentRanges.h \
     sources/view/hd/data/treatment/VTreatmentTime.h \
     sources/view/hd/data/treatment/VTreatmentBloodFlow.h \
@@ -348,6 +354,7 @@
     sources/view/dg/data/VDGTemperaturesData.h \
     sources/view/dg/data/VDGValvesStatesData.h \
     sources/view/dg/data/VDGAccelerometerData.h \
+    sources/view/dg/data/VDGConductivityData.h \
     \ # Storage
     sources/storage/StorageGlobals.h \
     sources/storage/Logger.h \
@@ -445,6 +452,9 @@
     sources/model/hd/data/MHDGeneralEvent.cpp \
     sources/model/hd/data/MHDAccelerometerData.cpp \
     sources/model/hd/data/MHDSyringePumpData.cpp \
+    sources/model/hd/data/MHDAirBubbleData.cpp \
+    sources/model/hd/data/MHDAirTrapData.cpp \
+    sources/model/hd/data/MHDBloodLeakData.cpp \
     sources/model/hd/data/MTreatmentRangesData.cpp \
     sources/model/hd/data/treatment/MTreatmentTimeData.cpp \
     sources/model/hd/data/treatment/MTreatmentFlowsData.cpp \
@@ -487,6 +497,7 @@
     sources/model/dg/data/MDGTemperaturesData.cpp \
     sources/model/dg/data/MDGValvesStatesData.cpp \
     sources/model/dg/data/MDGAccelerometerData.cpp \
+    sources/model/dg/data/MDGConductivityData.cpp \
     \ # CANBus
     sources/canbus/CanInterface.cpp \
     sources/canbus/FrameInterface.cpp \
@@ -559,6 +570,9 @@
     \ # ---------- Views - HD - Data
     sources/view/hd/data/VHDAccelerometerData.cpp \
     sources/view/hd/data/VHDSyringePumpData.cpp \
+    sources/view/hd/data/VHDAirBubbleData.cpp \
+    sources/view/hd/data/VHDAirTrapData.cpp \
+    sources/view/hd/data/VHDBloodLeakData.cpp \
     \ # ---------- Views - HD - Data - Pre-Treatment
     sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp \
     sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp \
@@ -594,6 +608,7 @@
     sources/view/dg/data/VDGTemperaturesData.cpp \
     sources/view/dg/data/VDGValvesStatesData.cpp \
     sources/view/dg/data/VDGAccelerometerData.cpp \
+    sources/view/dg/data/VDGConductivityData.cpp \
     \ # Storage
     sources/storage/StorageGlobals.cpp \
     sources/storage/FileHandler.cpp \