Index: leahi.pro =================================================================== diff -u -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 -rb3f0f9afa498c5892f39745c36b9762ec957a468 --- leahi.pro (.../leahi.pro) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) +++ leahi.pro (.../leahi.pro) (revision b3f0f9afa498c5892f39745c36b9762ec957a468) @@ -295,6 +295,7 @@ sources/model/dg/data/MDGTemperaturesData.h \ sources/model/dg/data/MDGValvesStatesData.h \ sources/model/dg/data/MDGAccelerometerData.h \ + sources/model/dg/data/MDDLevelData.h \ \ # CANBus sources/canbus/CanInterface.h \ sources/canbus/FrameInterface.h \ @@ -402,6 +403,7 @@ sources/view/dg/data/VDGTemperaturesData.h \ sources/view/dg/data/VDGValvesStatesData.h \ sources/view/dg/data/VDGAccelerometerData.h \ + sources/view/dg/data/VDDLevelData.h \ \ # Storage sources/storage/StorageGlobals.h \ sources/storage/Logger.h \ @@ -576,6 +578,7 @@ sources/model/dg/data/MDGTemperaturesData.cpp \ sources/model/dg/data/MDGValvesStatesData.cpp \ sources/model/dg/data/MDGAccelerometerData.cpp \ + sources/model/dg/data/MDDLevelData.cpp \ \ # CANBus sources/canbus/CanInterface.cpp \ sources/canbus/FrameInterface.cpp \ @@ -688,6 +691,7 @@ sources/view/dg/data/VDGTemperaturesData.cpp \ sources/view/dg/data/VDGValvesStatesData.cpp \ sources/view/dg/data/VDGAccelerometerData.cpp \ + sources/view/dg/data/VDDLevelData.cpp \ \ # Storage sources/storage/StorageGlobals.cpp \ sources/storage/FileHandler.cpp \ Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 -rb3f0f9afa498c5892f39745c36b9762ec957a468 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision b3f0f9afa498c5892f39745c36b9762ec957a468) @@ -105,6 +105,7 @@ {Gui::GuiActionType::ID_DGAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_DDConductivityData , 5 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::ID_DDGenDialysateData , 9 * 4 }, // 9 parameters each 4bytes + {Gui::GuiActionType::ID_DDLevelData , 3 * 4 }, // 3 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 -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 -rb3f0f9afa498c5892f39745c36b9762ec957a468 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision b3f0f9afa498c5892f39745c36b9762ec957a468) @@ -600,6 +600,7 @@ case Gui::GuiActionType::ID_DGAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGAccelerometerData ); break; case Gui::GuiActionType::ID_DDConductivityData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDConductivityData ); break; case Gui::GuiActionType::ID_DDGenDialysateData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDGenDialysateData ); break; + case Gui::GuiActionType::ID_DDLevelData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDLevelData ); break; // ----- Datum - Pre-Treatment progress case Gui::GuiActionType::ID_DGFilterFlushData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData ); break; // DG Response Messages Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 -rb3f0f9afa498c5892f39745c36b9762ec957a468 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision b3f0f9afa498c5892f39745c36b9762ec957a468) @@ -110,6 +110,7 @@ #include "VDGAccelerometerData.h" #include "VDDConductivityData.h" #include "VDDGenDialysateData.h" +#include "VDDLevelData.h" // ----- #include "VTreatmentCreate.h" // ----- In-Treatment Adjustments Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 -rb3f0f9afa498c5892f39745c36b9762ec957a468 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision b3f0f9afa498c5892f39745c36b9762ec957a468) @@ -201,6 +201,7 @@ ID_DGHeatersData = 0x2C00, // 44 ID_DGLoadCellReadingsData = 0x0C00, // 12 ID_DGTemperaturesData = 0x2D00, // 45 + ID_DDLevelData = 0x2900, // 41 //// ----- @LEAHIZED ID_DGAccelerometerData = 0x3400, // 52 ID_DDConductivityData = 0x1F00, // 31 //// ----- @LEAHIZED ID_DDGenDialysateData = 0x2F00, // 47 //// ----- @LEAHIZED Index: sources/gui/qml/main.qml =================================================================== diff -u -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 -rb3f0f9afa498c5892f39745c36b9762ec957a468 --- sources/gui/qml/main.qml (.../main.qml) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) +++ sources/gui/qml/main.qml (.../main.qml) (revision b3f0f9afa498c5892f39745c36b9762ec957a468) @@ -102,6 +102,7 @@ import VDGAccelerometer 0.1 import VDDConductivity 0.1 import VDDGenDialysate 0.1 +import VDDLevel 0.1 // In-Treatment - Adjustemnt import VTreatmentAdjustmentDuration 0.1 import VTreatmentAdjustmentFlows 0.1 @@ -131,6 +132,7 @@ import "qrc:/pages/settings" import "qrc:/components" import "qrc:/dialogs" +import "qrc:/dialogs/diagnostics" /*! * \brief Initialization and start point of the QML @@ -220,6 +222,7 @@ VDGAccelerometer { id: vDGAccelerometer } VDDConductivity { id: vDDConductivity } VDDGenDialysate { id: vDDGenDialysate } + VDDLevel { id: vDDLevel } // --- Pre-Treatment Progress Data VPreTreatmentAdjustmentInitTreatment { id: vPreTreatmentAdjustmentInitTreatment } VDGFilterFlush { id: vDGFilterFlush } Index: sources/model/MModel.h =================================================================== diff -u -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 -rb3f0f9afa498c5892f39745c36b9762ec957a468 --- sources/model/MModel.h (.../MModel.h) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) +++ sources/model/MModel.h (.../MModel.h) (revision b3f0f9afa498c5892f39745c36b9762ec957a468) @@ -109,6 +109,7 @@ #include "MDGAccelerometerData.h" #include "MDDConductivityData.h" #include "MDDGenDialysateData.h" +#include "MDDLevelData.h" // Pre-Treatment #include "MPreTreatmentAdjustRequests.h" @@ -372,6 +373,7 @@ REGISTER_METATYPE( DGAccelerometerData ) \ REGISTER_METATYPE( DDConductivityData ) \ REGISTER_METATYPE( DDGenDialysateData ) \ + REGISTER_METATYPE( DDLevelData ) \ \ REGISTER_METATYPE( HDDebugTextData ) \ REGISTER_METATYPE( DGDebugTextData ) \ @@ -560,6 +562,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDConductivityData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDGenDialysateData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDLevelData ) \ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDebugTextData ) \ @@ -762,6 +765,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( DGAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DDConductivityData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DDGenDialysateData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDLevelData ) \ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDebugTextData ) \ @@ -1069,6 +1073,7 @@ ACTION_RECEIVE_SIGNAL( DGAccelerometerData ) \ ACTION_RECEIVE_SIGNAL( DDConductivityData ) \ ACTION_RECEIVE_SIGNAL( DDGenDialysateData ) \ + ACTION_RECEIVE_SIGNAL( DDLevelData ) \ \ ACTION_RECEIVE_SIGNAL( HDDebugTextData ) \ ACTION_RECEIVE_SIGNAL( DGDebugTextData ) \ Index: sources/view/VView.h =================================================================== diff -u -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 -rb3f0f9afa498c5892f39745c36b9762ec957a468 --- sources/view/VView.h (.../VView.h) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) +++ sources/view/VView.h (.../VView.h) (revision b3f0f9afa498c5892f39745c36b9762ec957a468) @@ -191,6 +191,7 @@ REGISTER_TYPE( VDGAccelerometer ) \ REGISTER_TYPE( VDDConductivity ) \ REGISTER_TYPE( VDDGenDialysate ) \ + REGISTER_TYPE( VDDLevel ) \ /* Pre-Treatment */ \ REGISTER_TYPE( VPreTreatmentAdjustmentInitTreatment ) \ REGISTER_TYPE( VDGFilterFlush ) \