Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r1a78d846d8271f39cb472f88e52f825dbd805a9c -r442616b40449e509dbfc0d1eb8cbfec18ff4ed07 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 1a78d846d8271f39cb472f88e52f825dbd805a9c) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 442616b40449e509dbfc0d1eb8cbfec18ff4ed07) @@ -71,10 +71,10 @@ // ----- {Gui::GuiActionType::ID_TreatmentTime , 3 * 4 }, // 3 parameters each 4bytes - {Gui::GuiActionType::ID_BloodFlow , 9 * 4 }, // 9 parameters each 4bytes - {Gui::GuiActionType::ID_DialysateInletFlow , 9 * 4 }, // 9 parameters each 4bytes - {Gui::GuiActionType::ID_DialysateOutletFlow , 7 * 4 }, // 7 parameters each 4bytes - {Gui::GuiActionType::ID_PressureOcclusion , 5 * 4 }, // 5 parameters each 4bytes + {Gui::GuiActionType::ID_BloodFlow , 8 * 4 }, // 8 parameters each 4bytes + {Gui::GuiActionType::ID_DialysateInletFlow , 7 * 4 }, // 7 parameters each 4bytes + {Gui::GuiActionType::ID_DialysateOutletFlow , 10 * 4 }, //10 parameters each 4bytes + {Gui::GuiActionType::ID_PressureOcclusion , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_Saline , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_Heparin , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_Rinseback , 6 * 4 }, // 6 parameters each 4bytes @@ -83,25 +83,25 @@ {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_HDBloodLeakData , 2 * 4 }, // 2 parameters each 4bytes // ---- {Gui::GuiActionType::ID_HDOperationModeData , 2 * 4 }, // 2 parameter each 4bytes {Gui::GuiActionType::ID_PreTreatmentStates , 11 * 4 }, //11 parameters each 4bytes - {Gui::GuiActionType::ID_TreatmentStates , 10 * 4 }, // 9 parameters each 4bytes - {Gui::GuiActionType::ID_PostTreatmentStates , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_TreatmentStates , 10 * 4 }, //10 parameters each 4bytes + {Gui::GuiActionType::ID_PostTreatmentStates , 2 * 4 }, // 2 parameter each 4bytes // DG Data Messages - {Gui::GuiActionType::ID_DGROPumpData , 4 * 4 }, // 4 parameters each 4bytes + {Gui::GuiActionType::ID_DGROPumpData , 6 * 4 }, // 6 parameters each 4bytes {Gui::GuiActionType::ID_DGPressuresData , 5 * 4 }, // 5 parameters each 4bytes - {Gui::GuiActionType::ID_DGDrainPumpData , 4 * 4 }, // 4 parameters each 4bytes + {Gui::GuiActionType::ID_DGDrainPumpData , 7 * 4 }, // 7 parameters each 4bytes {Gui::GuiActionType::ID_DGOperationModeData , 2 * 4 }, // 2 parameter each 4bytes - {Gui::GuiActionType::ID_DGReservoirData , 3 * 4 }, // 3 parameters each 4bytes - {Gui::GuiActionType::ID_DGValvesStatesData , 1 * 2 }, // 1 parameters each 2bytes + {Gui::GuiActionType::ID_DGReservoirData , 15 * 4 }, // 15 parameters each 4bytes + {Gui::GuiActionType::ID_DGValvesStatesData , 1 * 2 + 13 }, // 1 parameter 16bits & 13 parameters each 1 byte {Gui::GuiActionType::ID_DGHeatersData , 11 * 4 }, // 11 parameters each 4bytes {Gui::GuiActionType::ID_DGLoadCellReadingsData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DGTemperaturesData , 21 * 4 }, // 21 parameters each 4bytes {Gui::GuiActionType::ID_DGAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes - {Gui::GuiActionType::ID_DGConductivityData , 5 * 4 }, // 9 parameters each 4bytes + {Gui::GuiActionType::ID_DGConductivityData , 13 * 4 }, // 13 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 -r1a78d846d8271f39cb472f88e52f825dbd805a9c -r442616b40449e509dbfc0d1eb8cbfec18ff4ed07 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 1a78d846d8271f39cb472f88e52f825dbd805a9c) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 442616b40449e509dbfc0d1eb8cbfec18ff4ed07) @@ -84,16 +84,22 @@ x: col(1) y: row(0) model: [ - vDGDrainPump.rpmi , - vDGDrainPump.dac , - vDGDrainPump.state , - vDGDrainPump.rpmo , + vDGDrainPump.rpmi , + vDGDrainPump.dac , + vDGDrainPump.state , + vDGDrainPump.rpmo , + vDGDrainPump.targetFLPMO , + vDGDrainPump.currentA , + vDGDrainPump.direction , ] label: [ "TgtSpd", "DAC" , "stt" , "Spd" , + "tgt" , + "cur" , + "dir" , ] } @@ -235,20 +241,36 @@ vDGConductivity.CPo .toFixed(1), vDGConductivity.CD1 .toFixed(1), vDGConductivity.CD2 .toFixed(1), + vDGConductivity.CPiRaw .toFixed(1), + vDGConductivity.CPoRaw .toFixed(1), + vDGConductivity.CD1Raw .toFixed(1), + vDGConductivity.CD2Raw .toFixed(1), + vDGConductivity.CPiSensorStatus .toFixed(1), + vDGConductivity.CPoSensorStatus .toFixed(1), + vDGConductivity.CD1SensorStatus .toFixed(1), + vDGConductivity.CD2SensorStatus .toFixed(1), ] label: [ "ROrr" , "CPi" , "CPo" , "CD1" , "CD2" , + "CPir" , + "CPor" , + "CD1r" , + "CD2r" , + "CPis" , + "CPos" , + "CD1s" , + "CD2s" , ] } DebugDataColumn { id: _HDAirColumn textObjectName :"_HDAirData" - title : qsTr(" Air Status ") - x: col(3.0) + title : qsTr("Air Status") + x: col(2.4) y: row(5.5) model: [ vHDAirBubble .venousAirBubbleStatus , @@ -270,15 +292,15 @@ model: [ vDGOperationMode.text , ] - fontPixelSizeText: 30 + fontPixelSizeText: Fonts.fontPixelDebugTitle } // --- HD --- DebugDataColumn { id: _HDBloodFlowColumn textObjectName :"_HDBloodFlowData" title : qsTr(" BP ") x: col(0) - y: row(2.6) + y: row(2.5) model: [ vTreatmentBloodFlow.bloodFlow_FlowSetPoint , vTreatmentBloodFlow.bloodFlow_MeasuredFlow .toFixed(2) , @@ -307,7 +329,7 @@ textObjectName :"_HDDialysateInletFlowData" title : qsTr(" DPi ") x: col(1.2) - y: row(2.6) + y: row(2.5) model: [ vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint .toFixed(2) , vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow .toFixed(2) , @@ -336,7 +358,7 @@ textObjectName :"_HDDialysateOutletFlowData" title : qsTr(" UF/DPo ") x: col(2.4) - y: row(2.6) + y: row(2.5) model: [ vTreatmentUltrafiltration.ultrafiltration_RefUFVol .toFixed(3) , vTreatmentUltrafiltration.ultrafiltration_MeasUFVol .toFixed(3) , @@ -345,6 +367,9 @@ vTreatmentUltrafiltration.ultrafiltration_MotorCtlSpeed .toFixed(2) , vTreatmentUltrafiltration.ultrafiltration_MotorCtlCurrent.toFixed(2) , "%" + vTreatmentUltrafiltration.ultrafiltration_PWMDtCycle .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_DopCorrOffset .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_DopCalcRate .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_UfCalcRate .toFixed(2) , ] label: [ "UFRef" , @@ -354,6 +379,9 @@ "MC.Spd" , "MC.Cur" , "PWM" , + "DopOfst" , + "DopRate" , + "UFcRate" , ] } @@ -415,7 +443,7 @@ model: [ vHDOperationMode.text , ] - fontPixelSizeText: 30 + fontPixelSizeText: Fonts.fontPixelDebugTitle } DebugDataColumn { id: _DGValvesStatesColumn @@ -425,24 +453,24 @@ y: row(0.0) width: 50 model: [ - vDGValvesStates.valveStates_VRF , - vDGValvesStates.valveStates_VRI , - vDGValvesStates.valveStates_VRD , - vDGValvesStates.valveStates_VRO , - vDGValvesStates.valveStates_VPO , - vDGValvesStates.valveStates_VBF , - vDGValvesStates.valveStates_VRC , - vDGValvesStates.valveStates_VDR , - vDGValvesStates.valveStates_VPI , - vDGValvesStates.valveStates_VSP , - vDGValvesStates.valveStates_VR1 , - vDGValvesStates.valveStates_VR2 , - vDGValvesStates.valveStates_VPD , + "%1,%2".arg(vDGValvesStates.valveStatus_VRF).arg(vDGValvesStates.valveStates_VRF), + "%1,%2".arg(vDGValvesStates.valveStatus_VRI).arg(vDGValvesStates.valveStates_VRI), + "%1,%2".arg(vDGValvesStates.valveStatus_RES).arg(vDGValvesStates.valveStates_RES), + "%1,%2".arg(vDGValvesStates.valveStatus_VRO).arg(vDGValvesStates.valveStates_VRO), + "%1,%2".arg(vDGValvesStates.valveStatus_VPO).arg(vDGValvesStates.valveStates_VPO), + "%1,%2".arg(vDGValvesStates.valveStatus_VBF).arg(vDGValvesStates.valveStates_VBF), + "%1,%2".arg(vDGValvesStates.valveStatus_VRC).arg(vDGValvesStates.valveStates_VRC), + "%1,%2".arg(vDGValvesStates.valveStatus_VDR).arg(vDGValvesStates.valveStates_VDR), + "%1,%2".arg(vDGValvesStates.valveStatus_VPI).arg(vDGValvesStates.valveStates_VPI), + "%1,%2".arg(vDGValvesStates.valveStatus_VSP).arg(vDGValvesStates.valveStates_VSP), + "%1,%2".arg(vDGValvesStates.valveStatus_VR1).arg(vDGValvesStates.valveStates_VR1), + "%1,%2".arg(vDGValvesStates.valveStatus_VR2).arg(vDGValvesStates.valveStates_VR2), + "%1,%2".arg(vDGValvesStates.valveStatus_VPD).arg(vDGValvesStates.valveStates_VPD), ] label: [ "VRF", "VRI", - "VRD", + "RES", "VRO", "VPO", "VBF", @@ -462,17 +490,12 @@ x: col(7) y: row(4.5) model: [ - vHDBloodLeak.bloodLeakDetectSetPoint , - vHDBloodLeak.bloodLeakZeroedStatus , - vHDBloodLeak.bloodLeakState , - vHDBloodLeak.bloodLeakDetectLevel , + vHDBloodLeak.bloodLeakStatus , + vHDBloodLeak.bloodLeakState , ] label: [ - "SetPt" , - "0Stat" , + "Stats" , "State" , - "DtLvl" , - ] } @@ -491,9 +514,9 @@ // TODO: The TouchRect should be unnecessary since the first communication message with UI/HD is the version. TouchRect { - x : col(4.6) + x : col(5.0) y : row(6.4) - width : 475 + width : 425 height : 80 onClicked : vAdjustmentVersions.doAdjustment() radius : 10 @@ -508,7 +531,7 @@ textObjectName :"_HDVersionsData" title : "" horizontalAlignmentText: Text.AlignLeft - fontPixelSizeText: 30 + fontPixelSizeText: Fonts.fontPixelDebugTitle model: [ "HD: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9" .arg(vAdjustmentVersions.hdVerMajor ) .arg(vAdjustmentVersions.hdVerMinor ) @@ -526,7 +549,7 @@ textObjectName :"_DGVersionsData" title : "" horizontalAlignmentText: Text.AlignLeft - fontPixelSizeText: 30 + fontPixelSizeText: Fonts.fontPixelDebugTitle model: [ "DG: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9" .arg(vAdjustmentVersions.dgVerMajor ) .arg(vAdjustmentVersions.dgVerMinor ) @@ -560,7 +583,6 @@ .arg(vPreTreatmentStates.wetSelfTestsState ) .arg(vPreTreatmentStates.preTreatmentRsrvrState ) ] - fontPixelSizeText: 30 } Text { id : _mouseEventCountText @@ -571,7 +593,7 @@ visible: true horizontalAlignment: Text.AlignLeft color: Colors.textMain - font.pixelSize: 30 + font.pixelSize: Fonts.fontPixelDebugText MouseArea { anchors.fill: _mouseEventCountText onClicked: GuiEventSpy.doTouchReset() @@ -586,7 +608,7 @@ visible: true horizontalAlignment: Text.AlignLeft color: Colors.textMain - font.pixelSize: 30 + font.pixelSize: Fonts.fontPixelDebugText } Text { id : _hdResetInformation @@ -596,7 +618,7 @@ text: "HDrst:" + vGeneralEvent.hdReset horizontalAlignment: Text.AlignLeft color: Colors.textMain - font.pixelSize: 30 + font.pixelSize: Fonts.fontPixelDebugText } Text { id : _dgResetInformation @@ -606,7 +628,7 @@ text: "DGrst:" + vGeneralEvent.dgReset horizontalAlignment: Text.AlignLeft color: Colors.textMain - font.pixelSize: 30 + font.pixelSize: Fonts.fontPixelDebugText } Connections { target: _GuiView Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -r642f08650a7a88ad6a2305fdea6bd18365aab5c7 -r442616b40449e509dbfc0d1eb8cbfec18ff4ed07 --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 642f08650a7a88ad6a2305fdea6bd18365aab5c7) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 442616b40449e509dbfc0d1eb8cbfec18ff4ed07) @@ -83,4 +83,10 @@ readonly property int fontPixelCreateTreatmentTable : 24 readonly property int fontPixelCircleButtonLabel: 50 + + readonly property int fontPixelDebugTitle : 25 + readonly property int fontPixelDebugText : 28 + readonly property int fontPixelDebugLabel : 15 + readonly property string fontFamilyDebug : "Noto Sans CJK SC" + }