Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rb6d23ac9f339d36f9c68000ecc59dcc07fec8838 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision b6d23ac9f339d36f9c68000ecc59dcc07fec8838) @@ -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/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r65754e8011da96b2debb057869d41e875cb4014b -rb6d23ac9f339d36f9c68000ecc59dcc07fec8838 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 65754e8011da96b2debb057869d41e875cb4014b) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision b6d23ac9f339d36f9c68000ecc59dcc07fec8838) @@ -207,7 +207,7 @@ y: row(3.5) title: qsTr(" Conduct ") model: [ - vDGConductivity.RORejectionRatio .toFixed(1), + vDGConductivity.RORejectionRatio .toFixed(3), vDGConductivity.CPi .toFixed(1), vDGConductivity.CPo .toFixed(1), vDGConductivity.CD1 .toFixed(1), @@ -232,13 +232,11 @@ vHDAirBubble .venousAirBubbleStatus , vHDAirTrap .airTrapLowerLevel , vHDAirTrap .airTrapUpperLevel , - ] label: [ "ADV", "ATll", "ATul", - ] textObjectName: "_HDAirData" } Index: sources/model/MModel.h =================================================================== diff -u -r2d37cfe6593a90633a9db1fa5136f8fc43b56188 -rb6d23ac9f339d36f9c68000ecc59dcc07fec8838 --- sources/model/MModel.h (.../MModel.h) (revision 2d37cfe6593a90633a9db1fa5136f8fc43b56188) +++ sources/model/MModel.h (.../MModel.h) (revision b6d23ac9f339d36f9c68000ecc59dcc07fec8838) @@ -299,6 +299,9 @@ REGISTER_METATYPE( TreatmentStopData ) \ REGISTER_METATYPE( HDSyringePumpData ) \ REGISTER_METATYPE( HDAccelerometerData ) \ + REGISTER_METATYPE( HDBloodLeakData ) \ + REGISTER_METATYPE( HDAirTrapData ) \ + REGISTER_METATYPE( HDAirBubbleData ) \ /* Treatment Log */ \ REGISTER_METATYPE( TreatmentLogAvrgeData ) \ REGISTER_METATYPE( TreatmentLogAlarmData ) \ @@ -320,6 +323,7 @@ REGISTER_METATYPE( DGLoadCellReadingsData ) \ REGISTER_METATYPE( DGTemperaturesData ) \ REGISTER_METATYPE( DGAccelerometerData ) \ + REGISTER_METATYPE( DGConductivityData ) \ \ REGISTER_METATYPE( HDDebugTextData ) \ REGISTER_METATYPE( DGDebugTextData ) \ @@ -468,6 +472,9 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentStopData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDSyringePumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAccelerometerData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDBloodLeakData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAirBubbleData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAirTrapData ) \ /* Treatment Log */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentLogAvrgeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentLogAlarmData ) \ @@ -489,6 +496,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGLoadCellReadingsData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGTemperaturesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGAccelerometerData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGConductivityData ) \ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDebugTextData ) \ @@ -640,6 +648,9 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentStopData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDSyringePumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDAccelerometerData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( HDBloodLeakData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( HDAirBubbleData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( HDAirTrapData ) \ /* Treatment Log */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentLogAvrgeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentLogAlarmData ) \ @@ -661,6 +672,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( DGLoadCellReadingsData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGTemperaturesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGAccelerometerData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DGConductivityData ) \ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDebugTextData ) \