Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rc253d3ca9ef234e04747565e500faf88b07fc04e -r57f4e55fd9102dce870271ec379d44aa478128fe --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision c253d3ca9ef234e04747565e500faf88b07fc04e) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 57f4e55fd9102dce870271ec379d44aa478128fe) @@ -93,14 +93,14 @@ // DG Data Messages {Gui::GuiActionType::ID_DGROPumpData , 6 * 4 }, // 6 parameters each 4bytes - {Gui::GuiActionType::ID_DDPressuresData , 5 * 4 }, // 5 parameters each 4bytes + {Gui::GuiActionType::ID_DGPressuresData , 5 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::ID_DGDrainPumpData , 8 * 4 }, // 8 parameters each 4bytes {Gui::GuiActionType::ID_DGOperationModeData , 2 * 4 }, // 2 parameter each 4bytes {Gui::GuiActionType::ID_DGReservoirData , 12 * 4 }, // 12 parameters each 4bytes {Gui::GuiActionType::ID_DGValvesStatesData , 1 * 2 + 13 }, // 1 parameter 16bits & 13 parameters each 1 byte - {Gui::GuiActionType::ID_DDHeatersData , 13 * 4 }, // 13 parameters each 4bytes + {Gui::GuiActionType::ID_DGHeatersData , 13 * 4 }, // 13 parameters each 4bytes {Gui::GuiActionType::ID_DGLoadCellReadingsData , 4 * 4 }, // 4 parameters each 4bytes - {Gui::GuiActionType::ID_DDTemperaturesData , 23 * 4 }, // 23 parameters each 4bytes + {Gui::GuiActionType::ID_DGTemperaturesData , 23 * 4 }, // 23 parameters each 4bytes {Gui::GuiActionType::ID_DGAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_DGConductivityData , 13 * 4 }, // 13 parameters each 4bytes {Gui::GuiActionType::ID_DDLevelData , 3 * 4 }, // 3 parameters each 4bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rc253d3ca9ef234e04747565e500faf88b07fc04e -r57f4e55fd9102dce870271ec379d44aa478128fe --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision c253d3ca9ef234e04747565e500faf88b07fc04e) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 57f4e55fd9102dce870271ec379d44aa478128fe) @@ -586,14 +586,14 @@ // DG data messages case Gui::GuiActionType::ID_DGROPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGROPumpData ); break; - case Gui::GuiActionType::ID_DDPressuresData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDPressuresData ); break; + case Gui::GuiActionType::ID_DGPressuresData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGPressuresData ); break; case Gui::GuiActionType::ID_DGDrainPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGDrainPumpData ); break; case Gui::GuiActionType::ID_DGOperationModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGOperationModeData ); break; case Gui::GuiActionType::ID_DGReservoirData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGReservoirData ); break; case Gui::GuiActionType::ID_DGValvesStatesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGValvesStatesData ); break; - case Gui::GuiActionType::ID_DDHeatersData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDHeatersData ); break; + case Gui::GuiActionType::ID_DGHeatersData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGHeatersData ); break; case Gui::GuiActionType::ID_DGLoadCellReadingsData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGLoadCellReadingsData ); break; - case Gui::GuiActionType::ID_DDTemperaturesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDTemperaturesData ); break; + case Gui::GuiActionType::ID_DGTemperaturesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGTemperaturesData ); break; case Gui::GuiActionType::ID_DDDebugText : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDDebugText ); break; case Gui::GuiActionType::ID_DGGeneralEvent : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGGeneralEvent ); break; case Gui::GuiActionType::ID_DGAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGAccelerometerData ); break; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r4e521c1a06ac5ba8fa125f9efba8a1b3c91c525a -r57f4e55fd9102dce870271ec379d44aa478128fe --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 4e521c1a06ac5ba8fa125f9efba8a1b3c91c525a) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 57f4e55fd9102dce870271ec379d44aa478128fe) @@ -192,16 +192,14 @@ // DG Data Messages ID_DGROPumpData = 0x1F00, // 31 - ID_DDPressuresData = 0x1C00, // 28 //// ----- @LEAHIZED + ID_DGPressuresData = 0x2000, // 32 ID_DGDrainPumpData = 0x2400, // 36 ID_DGOperationModeData = 0x2700, // 39 - ID_DGReservoirData = 0x280F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication + ID_DGReservoirData = 0x2800, // 40 ID_DGValvesStatesData = 0x2A00, // 42 + ID_DGHeatersData = 0x2C00, // 44 ID_DGLoadCellReadingsData = 0x0C00, // 12 - ID_DDConcentratePumpsData = 0x2500, // 37 //// ----- @LEAHIZED - ID_DDTemperaturesData = 0x2600, // 38 //// ----- @LEAHIZED - ID_DDDialysatePumpsData = 0x2700, // 39 //// ----- @LEAHIZED - ID_DDHeatersData = 0x2800, // 40 //// ----- @LEAHIZED + ID_DGTemperaturesData = 0x2D00, // 45 ID_DDLevelData = 0x2900, // 41 //// ----- @LEAHIZED ID_DGAccelerometerData = 0x3400, // 52 ID_DGConductivityData = 0x3100, // 49 Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsBase.qml =================================================================== diff -u -r4e521c1a06ac5ba8fa125f9efba8a1b3c91c525a -r57f4e55fd9102dce870271ec379d44aa478128fe --- sources/gui/qml/dialogs/diagnostics/DiagnosticsBase.qml (.../DiagnosticsBase.qml) (revision 4e521c1a06ac5ba8fa125f9efba8a1b3c91c525a) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsBase.qml (.../DiagnosticsBase.qml) (revision 57f4e55fd9102dce870271ec379d44aa478128fe) @@ -27,7 +27,6 @@ Item { id: _root - objectName: "_DiagnosticsBase" property string title: "Information" @@ -40,8 +39,8 @@ } Label { id: _title + objectName: "_DiagnosticsBaseTitle" text: _root.title - color: "white" font.pixelSize: 60 horizontalAlignment: Text.AlignHCenter anchors { Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml =================================================================== diff -u -rc253d3ca9ef234e04747565e500faf88b07fc04e -r57f4e55fd9102dce870271ec379d44aa478128fe --- sources/gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml (.../DiagnosticsSwipe.qml) (revision c253d3ca9ef234e04747565e500faf88b07fc04e) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml (.../DiagnosticsSwipe.qml) (revision 57f4e55fd9102dce870271ec379d44aa478128fe) @@ -26,7 +26,6 @@ * \brief the pre treatment prime stack screen */ Item { id: _root - objectName: "_DiagnosticsSwip" SwipeView { id: view currentIndex: 0 @@ -38,6 +37,7 @@ } PageIndicator { id: indicator + objectName: "_DiagnosticsSwipeIndicator" count: view.count currentIndex: view.currentIndex Index: sources/model/MModel.h =================================================================== diff -u -rc253d3ca9ef234e04747565e500faf88b07fc04e -r57f4e55fd9102dce870271ec379d44aa478128fe --- sources/model/MModel.h (.../MModel.h) (revision c253d3ca9ef234e04747565e500faf88b07fc04e) +++ sources/model/MModel.h (.../MModel.h) (revision 57f4e55fd9102dce870271ec379d44aa478128fe) @@ -365,7 +365,7 @@ REGISTER_METATYPE( DGTemperaturesData ) \ REGISTER_METATYPE( DGAccelerometerData ) \ REGISTER_METATYPE( DGConductivityData ) \ - REGISTER_METATYPE( DDLevelData ) \ + REGISTER_METATYPE( DDLevelData ) \ \ REGISTER_METATYPE( HDDebugTextData ) \ REGISTER_METATYPE( DGDebugTextData ) \ @@ -552,7 +552,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGTemperaturesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGConductivityData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDLevelData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDLevelData ) \ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDebugTextData ) \ @@ -753,7 +753,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( DGTemperaturesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGConductivityData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DDLevelData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDLevelData ) \ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDebugTextData ) \ @@ -1059,7 +1059,7 @@ ACTION_RECEIVE_SIGNAL( DGTemperaturesData ) \ ACTION_RECEIVE_SIGNAL( DGAccelerometerData ) \ ACTION_RECEIVE_SIGNAL( DGConductivityData ) \ - ACTION_RECEIVE_SIGNAL( DDLevelData ) \ + ACTION_RECEIVE_SIGNAL( DDLevelData ) \ \ ACTION_RECEIVE_SIGNAL( HDDebugTextData ) \ ACTION_RECEIVE_SIGNAL( DGDebugTextData ) \