Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r64d551143d898bf2ce79cb564e5a3389eb9be91e -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 64d551143d898bf2ce79cb564e5a3389eb9be91e) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -103,15 +103,15 @@ {Gui::GuiActionType::ID_DGAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes //DD Data Messages {Gui::GuiActionType::ID_DDValvesStatesData , 4 * 1 + 28 }, // 1 parameter 32bits & 28 parameters each 1 byte - {Gui::GuiActionType::ID_DDPressuresData , 14 * 4 }, // 14 parameters each 4bytes + {Gui::GuiActionType::ID_DDPressuresData , 6 * 4 }, // 6 parameters each 4bytes {Gui::GuiActionType::ID_DDConductivityData , 5 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::ID_DDConcentratePumpData , 25 * 4 }, // 25 parameters each 4bytes {Gui::GuiActionType::ID_DDTemperaturesData , 23 * 4 }, // 23 parameters each 4bytes {Gui::GuiActionType::ID_DDDialysatePumpData , 20 * 4 }, // 20 parameters each 4bytes {Gui::GuiActionType::ID_DDHeatersData , 8 * 4 }, // 8 parameters each 4bytes // NOTE: may contain optional 9 parameters each 4bytes - {Gui::GuiActionType::ID_DDLevelData , 3 * 4 }, // 3 parameters each 4bytes + {Gui::GuiActionType::ID_DDLevelData , 5 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::ID_DDGenDialysateData , 4 * 4 }, // 4 parameters each 4bytes - {Gui::GuiActionType::ID_DDBloodLeakData , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::ID_DDBloodLeakData , 10 * 4 }, // 10 parameters each 4bytes {Gui::GuiActionType::ID_DDOperationModeData , 2 * 4 }, // 2 parameter each 4bytes //FP Data Messages Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r64d551143d898bf2ce79cb564e5a3389eb9be91e -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 64d551143d898bf2ce79cb564e5a3389eb9be91e) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -627,16 +627,13 @@ // 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_DGDrainPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGDrainPumpData ); break; case Gui::GuiActionType::ID_DGReservoirData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGReservoirData ); break; case Gui::GuiActionType::ID_DDValvesStatesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDValvesStatesData ); break; case Gui::GuiActionType::ID_DGLoadCellReadingsData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGLoadCellReadingsData ); 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; - case Gui::GuiActionType::ID_DDLevelData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDLevelData ); break; - case Gui::GuiActionType::ID_DDBloodLeakData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDBloodLeakData ); break; // ----- Datum - Pre-Treatment progress case Gui::GuiActionType::ID_DGFilterFlushData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData ); break; // DG Response Messages @@ -661,8 +658,10 @@ case Gui::GuiActionType::ID_DDDialysatePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDDialysatePumpData ); break; case Gui::GuiActionType::ID_DDHeatersData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDHeatersData ); break; case Gui::GuiActionType::ID_DDTemperaturesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDTemperaturesData ); break; + case Gui::GuiActionType::ID_DDPressuresData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDPressuresData ); break; + case Gui::GuiActionType::ID_DDLevelData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDLevelData ); break; + case Gui::GuiActionType::ID_DDBloodLeakData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDBloodLeakData ); break; - case Gui::GuiActionType::ID_AdjustDDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp ); break; case Gui::GuiActionType::ID_DDOperationModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDOperationModeData ); break; case Gui::GuiActionType::ID_AdjustVersionsDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp ); break; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r64d551143d898bf2ce79cb564e5a3389eb9be91e -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 64d551143d898bf2ce79cb564e5a3389eb9be91e) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -172,7 +172,7 @@ // Pre-Treatment Consumables Installation Confirm ID_AdjustConsumablesConfirmReq = 0x6800, // 104 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response // Pre-Treatment SelfTest NoCartridge Progress Data - ID_SelfTestNoCartridgeData = 0x6100, // 97 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response + ID_SelfTestNoCartridgeData = 0x610F, // 97 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response // Pre-Treatment Disposables Installation Confirm ID_AdjustDisposablesConfirmReq = 0x9200, // 146 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response ID_AdjustDisposablesConfirmRsp = 0x9300, // 147 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response @@ -211,7 +211,7 @@ ID_DDHeatersData = 0x2800, // 40 //// ----- @LEAHIZED ID_DDLevelData = 0x2900, // 41 //// ----- @LEAHIZED ID_DDGenDialysateData = 0x2F00, // 47 //// ----- @LEAHIZED - ID_DDBloodLeakData = 0x6100, // 96 //// ----- TODO: Payload subject to change given FW implementation + ID_DDBloodLeakData = 0x6100, // 96 //// ----- @LEAHIZED // FP Data Messages ID_FPValvesStatesData = 0x310F, // 49 //// ----- @OBSOLETE. REMOVE? Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsBase.qml =================================================================== diff -u -r81aec0b1316a43c46f8c27c773d8f95e695ec273 -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/gui/qml/dialogs/diagnostics/DiagnosticsBase.qml (.../DiagnosticsBase.qml) (revision 81aec0b1316a43c46f8c27c773d8f95e695ec273) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsBase.qml (.../DiagnosticsBase.qml) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -27,7 +27,9 @@ property Item contentItem : null property alias contentArea : _contentArea property int spacing : Variables.defaultMargin * 1.5 + property int verticalSpacing : spacing + ContentArea { id : _contentArea anchors { top : parent.top Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml =================================================================== diff -u -r64d551143d898bf2ce79cb564e5a3389eb9be91e -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 64d551143d898bf2ce79cb564e5a3389eb9be91e) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -27,6 +27,7 @@ */ DiagnosticsBase { id: _root objectName : "_DiagnosticsDD" + verticalSpacing: Variables.defaultMargin * 0.5 contentItem : Item { id: _content @@ -257,47 +258,30 @@ DebugDataColumn { id: _DDPressureColumn textObjectName :"_DDPressureData" - title : qsTr(" Pressure ") + title : qsTr("[0x1C] Pressure ") anchors { top : parent.top left : _DDTemperatureColumn.right leftMargin : spacing } model: [ - vDDPressures.waterInletPSI .toFixed(2), - vDDPressures.waterOutletPSI .toFixed(2), - vDDPressures.hydrolicOutletPSI .toFixed(2), - vDDPressures.bicarbBagPSI .toFixed(2), - vDDPressures.spentDialysatePSI .toFixed(2), - vDDPressures.freshDialysatePSI .toFixed(2), - vDDPressures.transmembranePSI .toFixed(2), - vDDPressures.waterInletTemp .toFixed(2), - vDDPressures.waterOutletTemp .toFixed(2), - vDDPressures.hydrolicOutletTemp .toFixed(2), - vDDPressures.bicarbBagTemp .toFixed(2), - vDDPressures.spentDialysateTemp .toFixed(2), - vDDPressures.freshDialysateTemp .toFixed(2), - vDDPressures.transmembraneTemp .toFixed(2), + vDDPressures.d9Pressure .toFixed(2), + vDDPressures.d66Pressure .toFixed(2), + vDDPressures.d51Pressure .toFixed(2), + vDDPressures.d18Pressure .toFixed(2), + vDDPressures.d41Pressure .toFixed(2), + vDDPressures.d87Pressure .toFixed(2), ] label: [ - "WInPSI (M1) ", - "WOutPSI (M3) ", - "HOutPSI (D9) ", - "BBagPSI (D66) ", - "SDialPSI (D51) ", - "FDialPSI (D18) ", - "TransPSI (D41) ", - "WInTmp (M1) ", - "WOutTmp (M3) ", - "HOutTmp (D9) ", - "BBagTmp (D66) ", - "SDialTmp (D51) ", - "FDialTmp (D18) ", - "TransTmp (D41) ", + "D9 ", + "D66 ", + "D51 ", + "D18 ", + "D41 ", + "D87 ", ] } - DebugDataColumn { id: _DDOpModeColumn textObjectName :"_DDOpModeColumn" title : qsTr("[0x13] OpMode ") @@ -321,7 +305,7 @@ title : qsTr("[0x2F] GenDial ") anchors { top : _DDOpModeColumn.bottom - topMargin : spacing + topMargin : verticalSpacing left : _DDOpModeColumn.left } model: [ @@ -343,7 +327,7 @@ title : qsTr(" Hyd Valve ") anchors { top : _DDGenDialColumn.bottom - topMargin : spacing + topMargin : verticalSpacing left : _DDGenDialColumn.left } @@ -388,7 +372,7 @@ title : qsTr("[0x1F] Conductivity ") anchors { top : _DDDialysatePumpColumn.bottom - topMargin : spacing + topMargin : verticalSpacing left : _DDDialysatePumpColumn.left } model: [ @@ -409,32 +393,35 @@ DebugDataColumn { id: _DDLevelColumn textObjectName :"_DDLevelData" - title : qsTr(" Levels ") + title : qsTr("[0x29] Levels ") anchors { - top : _DDPressureColumn.bottom - topMargin : spacing - left : _DDPressureColumn.left + top : _DDTemperatureColumn.bottom + topMargin : verticalSpacing + left : _DDTemperatureColumn.left } model: [ - vDDLevel.floaterLevel , - vDDLevel.bicarbLevel , - vDDLevel.spentDialysateLevel , + vDDLevel.d46Level , + vDDLevel.d63Level , + vDDLevel.d98Level , + vDDLevel.d6Level , + vDDLevel.bicardLevel , ] label: [ - "floater (D6) ", - "bicarb (D63) ", - "sptDial (D46) ", + "D46 ", + "D63 ", + "D98 ", + "D6 ", + "bicarb ", ] } DebugDataColumn { id: _DDBCValvesColumn textObjectName :"_DDBCValvesData" title : qsTr(" BC Valves ") anchors { - top : _DDTemperatureColumn.bottom - topMargin : spacing - left : _DDHeatersColumn.right - leftMargin : spacing + top : _DDBloodLeakColumn.bottom + topMargin : verticalSpacing + left : _DDBloodLeakColumn.left } model: [ Number(vDDValvesStates.balancingChamberValve1 ) , @@ -462,9 +449,9 @@ textObjectName :"_DDIOValvesColumn" title : qsTr(" IO Valves ") anchors { - top : _DDBCValvesColumn.bottom - topMargin : spacing - left : _DDBCValvesColumn.left + top : _DDCondColumn.bottom + topMargin : verticalSpacing + left : _DDCondColumn.left } model: [ Number(vDDValvesStates.ioValve0 ) , @@ -481,7 +468,7 @@ title : qsTr(" Spare Valves ") anchors { top : _DDHeatersColumn.bottom - topMargin : spacing + topMargin : verticalSpacing left : _DDHeatersColumn.left } model: [ @@ -510,9 +497,9 @@ textObjectName :"_DDFPValvesColumn" title : qsTr(" FP Valves ") anchors { - top : _DDLevelColumn.bottom - topMargin : spacing - left : _DDPressureColumn.left + top : _DDConcentratePumpColumn.bottom + topMargin : verticalSpacing + left : _DDConcentratePumpColumn.left } model: [ Number(vDDValvesStates.fpValve0) , @@ -534,17 +521,35 @@ DebugDataColumn { id: _DDBloodLeakColumn textObjectName :"_DDBloodLeakData" - title : qsTr(" Blood Leak ") + title : qsTr("[0x61] Blood Leak ") anchors { - top : _DDConcentratePumpColumn.bottom - topMargin : spacing - left : parent.left + top : _DDPressureColumn.bottom + topMargin : verticalSpacing + left : _DDPressureColumn.left } model: [ - vDDBloodLeak.bloodLeak , + vDDBloodLeak.bloodLeakStatus , + vDDBloodLeak.bloodLeakState , + vDDBloodLeak.bloodLeakPersistentCounter , + vDDBloodLeak.bloodLeakSerialCommState , + vDDBloodLeak.bloodLeakIntensity , + vDDBloodLeak.bloodLeakDetect , + vDDBloodLeak.bloodLeakIntensityMovingAvg.toFixed(2) , + vDDBloodLeak.bloodLeakTimeSinceZeroMS , + vDDBloodLeak.driftInRangeStatus , + vDDBloodLeak.driftUpperRangeStatus , ] label: [ - "BL ", + "Status ", + "State ", + "PersistentCounter ", + "SerialCommState ", + "Intensity ", + "Detect ", + "IntensityMovingAvg ", + "TimeSinceZeroMS ", + "DriftInRangeStatus ", + "DriftUpperRangeStatus ", ] } Index: sources/model/dd/data/MDDBloodLeakData.cpp =================================================================== diff -u -r86c040b666b2544800274db2a18ba5374fbfd4e7 -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/model/dd/data/MDDBloodLeakData.cpp (.../MDDBloodLeakData.cpp) (revision 86c040b666b2544800274db2a18ba5374fbfd4e7) +++ sources/model/dd/data/MDDBloodLeakData.cpp (.../MDDBloodLeakData.cpp) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -18,13 +18,31 @@ QVariantList MDDBloodLeakData::parameters() const { return { - _data.mBloodLeak .value, + _data.mBloodLeakStatus .value, + _data.mBloodLeakState .value, + _data.mBloodLeakPersistentCounter .value, + _data.mBloodLeakSerialCommState .value, + _data.mBloodLeakIntensity .value, + _data.mBloodLeakDetect .value, + _data.mBloodLeakIntensityMovingAvg .value, + _data.mBloodLeakTimeSinceZeroMS .value, + _data.mDriftInRangeStatus .value, + _data.mDriftUpperRangeStatus .value, }; } bool MDDBloodLeakData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mBloodLeak )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodLeakStatus )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodLeakState )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodLeakPersistentCounter )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodLeakSerialCommState )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodLeakIntensity )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodLeakDetect )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodLeakIntensityMovingAvg )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodLeakTimeSinceZeroMS )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDriftInRangeStatus )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDriftUpperRangeStatus )) goto lError; return true; @@ -36,6 +54,15 @@ MDDBloodLeakData::Data MDDBloodLeakData::data() const { Data data; - data.mBloodLeak = _data.mBloodLeak .value; + data.mBloodLeakStatus = _data.mBloodLeakStatus .value; + data.mBloodLeakState = _data.mBloodLeakState .value; + data.mBloodLeakPersistentCounter = _data.mBloodLeakPersistentCounter .value; + data.mBloodLeakSerialCommState = _data.mBloodLeakSerialCommState .value; + data.mBloodLeakIntensity = _data.mBloodLeakIntensity .value; + data.mBloodLeakDetect = _data.mBloodLeakDetect .value; + data.mBloodLeakIntensityMovingAvg = _data.mBloodLeakIntensityMovingAvg .value; + data.mBloodLeakTimeSinceZeroMS = _data.mBloodLeakTimeSinceZeroMS .value; + data.mDriftInRangeStatus = _data.mDriftInRangeStatus .value; + data.mDriftUpperRangeStatus = _data.mDriftUpperRangeStatus .value; return data; } Index: sources/model/dd/data/MDDBloodLeakData.h =================================================================== diff -u -r64d551143d898bf2ce79cb564e5a3389eb9be91e -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/model/dd/data/MDDBloodLeakData.h (.../MDDBloodLeakData.h) (revision 64d551143d898bf2ce79cb564e5a3389eb9be91e) +++ sources/model/dd/data/MDDBloodLeakData.h (.../MDDBloodLeakData.h) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -36,7 +36,16 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mBloodLeak | + * | #1:(U32) | \ref Data::mBloodLeakStatus | + * | #2:(U32) | \ref Data::mBloodLeakState | + * | #3:(U32) | \ref Data::mBloodLeakPersistentCounter | + * | #4:(U32) | \ref Data::mBloodLeakSerialCommState | + * | #5:(U32) | \ref Data::mBloodLeakIntensity | + * | #6:(U32) | \ref Data::mBloodLeakDetect | + * | #7:(F32) | \ref Data::mBloodLeakIntensityMovingAvg | + * | #8:(U32) | \ref Data::mBloodLeakTimeSinceZeroMS | + * | #9:(U32) | \ref Data::mDriftInRangeStatus | + * |#10:(U32) | \ref Data::mDriftUpperRangeStatus | * * \sa Data * @@ -56,7 +65,16 @@ QVariantList parameters() const override; struct { - Types::U32 mBloodLeak ; + Types::U32 mBloodLeakStatus ; + Types::U32 mBloodLeakState ; + Types::U32 mBloodLeakPersistentCounter ; + Types::U32 mBloodLeakSerialCommState ; + Types::U32 mBloodLeakIntensity ; + Types::U32 mBloodLeakDetect ; + Types::F32 mBloodLeakIntensityMovingAvg ; + Types::U32 mBloodLeakTimeSinceZeroMS ; + Types::U32 mDriftInRangeStatus ; + Types::U32 mDriftUpperRangeStatus ; } _data; public: @@ -66,7 +84,16 @@ QString infoText () const override { return QString("BloodLeak") ; } struct Data { - quint32 mBloodLeak = 0; ///< DD Blood Leak Sensor status + quint32 mBloodLeakStatus = 0; ///< DD Blood Leak Sensor status + quint32 mBloodLeakState = 0; ///< DD Blood Leak Sensor status + quint32 mBloodLeakPersistentCounter = 0; ///< DD Blood Leak Sensor status + quint32 mBloodLeakSerialCommState = 0; ///< DD Blood Leak Sensor status + quint32 mBloodLeakIntensity = 0; ///< DD Blood Leak Sensor status + quint32 mBloodLeakDetect = 0; ///< DD Blood Leak Sensor status + float mBloodLeakIntensityMovingAvg = 0; ///< DD Blood Leak Sensor status + quint32 mBloodLeakTimeSinceZeroMS = 0; ///< DD Blood Leak Sensor status + quint32 mDriftInRangeStatus = 0; ///< DD Blood Leak Sensor status + quint32 mDriftUpperRangeStatus = 0; ///< DD Blood Leak Sensor status }; MDDBloodLeakData () { } Index: sources/model/dd/data/MDDLevelData.cpp =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/model/dd/data/MDDLevelData.cpp (.../MDDLevelData.cpp) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/model/dd/data/MDDLevelData.cpp (.../MDDLevelData.cpp) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -18,17 +18,21 @@ QVariantList MDDLevelData::parameters() const { return { - _data.d6Level .value, - _data.d63Level .value, - _data.d46Level .value, + _data.mD46Level .value, + _data.mD63Level .value, + _data.mD98Level .value, + _data.mD6Level .value, + _data.mBicardLevel .value, }; } bool MDDLevelData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.d6Level )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d63Level )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d46Level )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD46Level )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD63Level )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD98Level )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD6Level )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBicardLevel )) goto lError; return true; @@ -40,8 +44,10 @@ MDDLevelData::Data MDDLevelData::data() const { Data data; - data.mFloaterLevel = _data.d6Level .value; - data.mBicarbLevel = _data.d63Level .value; - data.mSpentDialysateLevel = _data.d46Level .value; + data.mD46Level = _data.mD46Level .value; + data.mD63Level = _data.mD63Level .value; + data.mD98Level = _data.mD98Level .value; + data.mD6Level = _data.mD6Level .value; + data.mBicardLevel = _data.mBicardLevel .value; return data; } Index: sources/model/dd/data/MDDLevelData.h =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/model/dd/data/MDDLevelData.h (.../MDDLevelData.h) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/model/dd/data/MDDLevelData.h (.../MDDLevelData.h) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -36,9 +36,11 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::d6Level | - * | #2:(U32) | \ref Data::d63Level | - * | #3:(U32) | \ref Data::d46Level | + * | #1:(U32) | \ref Data::mD46Level | + * | #2:(U32) | \ref Data::mD63Level | + * | #3:(U32) | \ref Data::mD98Level | + * | #4:(U32) | \ref Data::mD6Level | + * | #5:(U32) | \ref Data::mBicardLevel | * * \sa Data * @@ -58,9 +60,11 @@ QVariantList parameters() const override; struct { - Types::U32 d6Level ; - Types::U32 d63Level ; - Types::U32 d46Level ; + Types::U32 mD46Level ; + Types::U32 mD63Level ; + Types::U32 mD98Level ; + Types::U32 mD6Level ; + Types::U32 mBicardLevel ; } _data; public: @@ -70,9 +74,11 @@ QString infoText () const override { return QString("Level") ; } struct Data { - quint32 mFloaterLevel = 0; ///< floater switch low, medium and high status - quint32 mBicarbLevel = 0; ///< bicarb level low or high status - quint32 mSpentDialysateLevel = 0; ///< Spent dialysate air separation chamber level low or high status + quint32 mD46Level = 0; ///< floater switch low, medium and high status + quint32 mD63Level = 0; ///< bicarb level low or high status + quint32 mD98Level = 0; ///< Spent dialysate air separation chamber level low or high status + quint32 mD6Level = 0; ///< Spent dialysate air separation chamber level low or high status + quint32 mBicardLevel = 0; ///< Spent dialysate air separation chamber level low or high status }; MDDLevelData () { } Index: sources/model/dd/data/MDDPressuresData.cpp =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/model/dd/data/MDDPressuresData.cpp (.../MDDPressuresData.cpp) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/model/dd/data/MDDPressuresData.cpp (.../MDDPressuresData.cpp) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -18,39 +18,23 @@ QVariantList MDDPressures::parameters() const { return { - _data.m1Pressure .value, - _data.m3Pressure .value, - _data.d9Pressure .value, - _data.d66Pressure .value, - _data.d51Pressure .value, - _data.d18Pressure .value, - _data.d41Pressure .value, - _data.m1PresTemp .value, - _data.m3PresTemp .value, - _data.d9PresTemp .value, - _data.d66PresTemp .value, - _data.d51PresTemp .value, - _data.d18PresTemp .value, - _data.d41PresTemp .value + _data.mD9Pressure .value, + _data.mD66Pressure .value, + _data.mD51Pressure .value, + _data.mD18Pressure .value, + _data.mD41Pressure .value, + _data.mD87Pressure .value, }; } bool MDDPressures::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.m1Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.m3Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d9Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d66Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d51Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d18Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d41Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.m1PresTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.m3PresTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d9PresTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d66PresTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d51PresTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d18PresTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d41PresTemp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD9Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD66Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD51Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD18Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD41Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD87Pressure )) goto lError; return true ; @@ -67,19 +51,12 @@ */ MDDPressures::Data MDDPressures::data() const { Data data; - data.mWaterInletPSI = _data.m1Pressure .value; - data.mWaterOutletPSI = _data.m3Pressure .value; - data.mHydrolicOutletPSI = _data.d9Pressure .value; - data.mBicarbBagPSI = _data.d66Pressure .value; - data.mSpentDialysatePSI = _data.d51Pressure .value; - data.mFreshDialysatePSI = _data.d18Pressure .value; - data.mTransmembranePSI = _data.d41Pressure .value; - data.mWaterInletTemp = _data.m1PresTemp .value; - data.mWaterOutletTemp = _data.m3PresTemp .value; - data.mHydrolicOutletTemp = _data.d9PresTemp .value; - data.mBicarbBagTemp = _data.d66PresTemp .value; - data.mSpentDialysateTemp = _data.d51PresTemp .value; - data.mFreshDialysateTemp = _data.d18PresTemp .value; - data.mTransmembraneTemp = _data.d41PresTemp .value; + data.mD9Pressure = _data.mD9Pressure .value; + data.mD66Pressure = _data.mD66Pressure .value; + data.mD51Pressure = _data.mD51Pressure .value; + data.mD18Pressure = _data.mD18Pressure .value; + data.mD41Pressure = _data.mD41Pressure .value; + data.mD87Pressure = _data.mD87Pressure .value; + return data; } Index: sources/model/dd/data/MDDPressuresData.h =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/model/dd/data/MDDPressuresData.h (.../MDDPressuresData.h) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/model/dd/data/MDDPressuresData.h (.../MDDPressuresData.h) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -36,20 +36,12 @@ * * | Payload || * | || - * | #01:(F32) | \ref Data::mWaterInletPSI | - * | #02:(F32) | \ref Data::mWaterOutletPSI | - * | #03:(F32) | \ref Data::mHydrolicOutletPSI | - * | #04:(F32) | \ref Data::mBicarbBagPSI | - * | #05:(F32) | \ref Data::mSpentDialysatePSI | - * | #06:(F32) | \ref Data::mFreshDialysatePSI | - * | #07:(F32) | \ref Data::mTransmembranePSI | - * | #08:(F32) | \ref Data::mWaterInletTemp | - * | #09:(F32) | \ref Data::mWaterOutletTemp | - * | #10:(F32) | \ref Data::mHydrolicOutletTemp | - * | #11:(F32) | \ref Data::mBicarbBagTemp | - * | #12:(F32) | \ref Data::mSpentDialysateTemp | - * | #13:(F32) | \ref Data::mFreshDialysateTemp | - * | #14:(F32) | \ref Data::mTransmembraneTemp | + * | #01:(F32) | \ref Data::mD9Pressure | + * | #02:(F32) | \ref Data::mD66Pressure | + * | #03:(F32) | \ref Data::mD51Pressure | + * | #04:(F32) | \ref Data::mD18Pressure | + * | #05:(F32) | \ref Data::mD41Pressure | + * | #06:(F32) | \ref Data::mD87Pressure | * * \sa Data * @@ -65,24 +57,15 @@ // friends friend class ::tst_models; - QVariantList parameters() const override; struct { - Types::F32 m1Pressure ; ///< Water Inlet Input pressure - Types::F32 m3Pressure ; ///< Water Inlet Output pressure - Types::F32 d9Pressure ; ///< Hydraulics outlet pressure - Types::F32 d66Pressure ; ///< Bicarb bag pressure - Types::F32 d51Pressure ; ///< Spent Dialysate pressure - Types::F32 d18Pressure ; ///< Fresh Dialysate pressure - Types::F32 d41Pressure ; ///< Transmembrane pressure - Types::F32 m1PresTemp ; ///< Water Inlet Input temperature - Types::F32 m3PresTemp ; ///< Water Inlet Output temperature - Types::F32 d9PresTemp ; ///< Hydraulics outlet pressure temperature - Types::F32 d66PresTemp ; ///< Bicarb bag temperature - Types::F32 d51PresTemp ; ///< Spent Dialysate temperature - Types::F32 d18PresTemp ; ///< Fresh Dialysate temperature - Types::F32 d41PresTemp ; ///< Transmembrane temperature + Types::F32 mD9Pressure ; + Types::F32 mD66Pressure ; + Types::F32 mD51Pressure ; + Types::F32 mD18Pressure ; + Types::F32 mD41Pressure ; + Types::F32 mD87Pressure ; } _data; public: @@ -92,20 +75,12 @@ QString infoText () const override { return QString("Pressures"); } struct Data { - float mWaterInletPSI = 0; ///< Water Inlet Input pressure - float mWaterOutletPSI = 0; ///< Water Inlet Output pressure - float mHydrolicOutletPSI = 0; ///< Hydraulics outlet pressure - float mBicarbBagPSI = 0; ///< Bicarb bag pressure - float mSpentDialysatePSI = 0; ///< Spent Dialysate pressure - float mFreshDialysatePSI = 0; ///< Fresh Dialysate pressure - float mTransmembranePSI = 0; ///< Transmembrane pressure - float mWaterInletTemp = 0; ///< Water Inlet Input temperature - float mWaterOutletTemp = 0; ///< Water Inlet Output temperature - float mHydrolicOutletTemp = 0; ///< Hydraulics outlet pressure temperature - float mBicarbBagTemp = 0; ///< Bicarb bag temperature - float mSpentDialysateTemp = 0; ///< Spent Dialysate temperature - float mFreshDialysateTemp = 0; ///< Fresh Dialysate temperature - float mTransmembraneTemp = 0; ///< Transmembrane temperature + float mD9Pressure = 0; + float mD66Pressure = 0; + float mD51Pressure = 0; + float mD18Pressure = 0; + float mD41Pressure = 0; + float mD87Pressure = 0; }; MDDPressures () {} Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -re6ffa6d5d1b7820875de07cdbb15f06617400344 -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision e6ffa6d5d1b7820875de07cdbb15f06617400344) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -652,7 +652,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------: | - * |0x5200| 0x100 | Req | Y | UI | HD | Rinseback Request | + * |0x9000| 0x100 | Req | Y | UI | HD | Rinseback Request | * * | Payload || * | || Index: sources/model/hd/data/treatment/MTreatmentRinsebackData.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/model/hd/data/treatment/MTreatmentRinsebackData.h (.../MTreatmentRinsebackData.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/data/treatment/MTreatmentRinsebackData.h (.../MTreatmentRinsebackData.h) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -32,7 +32,7 @@ * * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x5600| 0x020 | 6 | 1 Hz | N | HD | UI | Rinseback Progress Data | + * |0x8F00| 0x020 | 6 | 1 Hz | N | HD | UI | Rinseback Progress Data | * * | Payload || * | || Index: sources/model/td/adjustment/treatment/MTreatmentAdjustRinsebackResponse.h =================================================================== diff -u -r07fa2cd47bf538e89c48fc7d425674f20afc9f2a -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/model/td/adjustment/treatment/MTreatmentAdjustRinsebackResponse.h (.../MTreatmentAdjustRinsebackResponse.h) (revision 07fa2cd47bf538e89c48fc7d425674f20afc9f2a) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustRinsebackResponse.h (.../MTreatmentAdjustRinsebackResponse.h) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -32,7 +32,7 @@ * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:----------------: | - * |0x5300| 0x020 | 6 | Rsp | Y | HD | UI | Rinseback Response | + * |0x9100| 0x020 | 6 | Rsp | Y | HD | UI | Rinseback Response | * * | Payload || * | || Index: sources/view/dd/data/VDDBloodLeakData.cpp =================================================================== diff -u -r86c040b666b2544800274db2a18ba5374fbfd4e7 -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/view/dd/data/VDDBloodLeakData.cpp (.../VDDBloodLeakData.cpp) (revision 86c040b666b2544800274db2a18ba5374fbfd4e7) +++ sources/view/dd/data/VDDBloodLeakData.cpp (.../VDDBloodLeakData.cpp) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -20,5 +20,14 @@ VIEW_DEF(VDDBloodLeak, DDBloodLeakData) void VDDBloodLeak::onActionReceive(const DDBloodLeakData &vData) { - bloodLeak (vData.mBloodLeak ); + bloodLeakStatus (vData.mBloodLeakStatus ); + bloodLeakState (vData.mBloodLeakState ); + bloodLeakPersistentCounter (vData.mBloodLeakPersistentCounter ); + bloodLeakSerialCommState (vData.mBloodLeakSerialCommState ); + bloodLeakIntensity (vData.mBloodLeakIntensity ); + bloodLeakDetect (vData.mBloodLeakDetect ); + bloodLeakIntensityMovingAvg (vData.mBloodLeakIntensityMovingAvg ); + bloodLeakTimeSinceZeroMS (vData.mBloodLeakTimeSinceZeroMS ); + driftInRangeStatus (vData.mDriftInRangeStatus ); + driftUpperRangeStatus (vData.mDriftUpperRangeStatus ); } Index: sources/view/dd/data/VDDBloodLeakData.h =================================================================== diff -u -r86c040b666b2544800274db2a18ba5374fbfd4e7 -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/view/dd/data/VDDBloodLeakData.h (.../VDDBloodLeakData.h) (revision 86c040b666b2544800274db2a18ba5374fbfd4e7) +++ sources/view/dd/data/VDDBloodLeakData.h (.../VDDBloodLeakData.h) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -35,7 +35,16 @@ class VDDBloodLeak : public QObject { Q_OBJECT - PROPERTY( quint32 , bloodLeak , 0) + PROPERTY( quint32 , bloodLeakStatus , 0) + PROPERTY( quint32 , bloodLeakState , 0) + PROPERTY( quint32 , bloodLeakPersistentCounter , 0) + PROPERTY( quint32 , bloodLeakSerialCommState , 0) + PROPERTY( quint32 , bloodLeakIntensity , 0) + PROPERTY( quint32 , bloodLeakDetect , 0) + PROPERTY( float , bloodLeakIntensityMovingAvg , 0) + PROPERTY( quint32 , bloodLeakTimeSinceZeroMS , 0) + PROPERTY( quint32 , driftInRangeStatus , 0) + PROPERTY( quint32 , driftUpperRangeStatus , 0) VIEW_DEC(VDDBloodLeak, DDBloodLeakData) }; Index: sources/view/dd/data/VDDLevelData.cpp =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/view/dd/data/VDDLevelData.cpp (.../VDDLevelData.cpp) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/view/dd/data/VDDLevelData.cpp (.../VDDLevelData.cpp) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -20,7 +20,9 @@ VIEW_DEF(VDDLevel, DDLevelData) void VDDLevel::onActionReceive(const DDLevelData &vData) { - floaterLevel (vData.mFloaterLevel ); - bicarbLevel (vData.mBicarbLevel ); - spentDialysateLevel (vData.mSpentDialysateLevel ); + d46Level (vData.mD46Level ); + d63Level (vData.mD63Level ); + d98Level (vData.mD98Level ); + d6Level (vData.mD6Level ); + bicardLevel (vData.mBicardLevel ); } Index: sources/view/dd/data/VDDLevelData.h =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/view/dd/data/VDDLevelData.h (.../VDDLevelData.h) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/view/dd/data/VDDLevelData.h (.../VDDLevelData.h) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -35,9 +35,11 @@ class VDDLevel : public QObject { Q_OBJECT - PROPERTY( quint32 , floaterLevel , 0) - PROPERTY( quint32 , bicarbLevel , 0) - PROPERTY( quint32 , spentDialysateLevel , 0) + PROPERTY( quint32 , d46Level , 0) + PROPERTY( quint32 , d63Level , 0) + PROPERTY( quint32 , d98Level , 0) + PROPERTY( quint32 , d6Level , 0) + PROPERTY( quint32 , bicardLevel , 0) VIEW_DEC(VDDLevel, DDLevelData) }; Index: sources/view/dd/data/VDDPressuresData.cpp =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/view/dd/data/VDDPressuresData.cpp (.../VDDPressuresData.cpp) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/view/dd/data/VDDPressuresData.cpp (.../VDDPressuresData.cpp) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -21,18 +21,10 @@ void VDDPressures::onActionReceive(const DDPressuresData &vData) { - waterInletPSI ( vData.mWaterInletPSI ); - waterOutletPSI ( vData.mWaterOutletPSI ); - hydrolicOutletPSI ( vData.mHydrolicOutletPSI ); - bicarbBagPSI ( vData.mBicarbBagPSI ); - spentDialysatePSI ( vData.mSpentDialysatePSI ); - freshDialysatePSI ( vData.mFreshDialysatePSI ); - transmembranePSI ( vData.mTransmembranePSI ); - waterInletTemp ( vData.mWaterInletTemp ); - waterOutletTemp ( vData.mWaterOutletTemp ); - hydrolicOutletTemp ( vData.mHydrolicOutletTemp ); - bicarbBagTemp ( vData.mBicarbBagTemp ); - spentDialysateTemp ( vData.mSpentDialysateTemp ); - freshDialysateTemp ( vData.mFreshDialysateTemp ); - transmembraneTemp ( vData.mTransmembraneTemp ); + d9Pressure ( vData.mD9Pressure ); + d66Pressure ( vData.mD66Pressure ); + d51Pressure ( vData.mD51Pressure ); + d18Pressure ( vData.mD18Pressure ); + d41Pressure ( vData.mD41Pressure ); + d87Pressure ( vData.mD87Pressure ); } Index: sources/view/dd/data/VDDPressuresData.h =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/view/dd/data/VDDPressuresData.h (.../VDDPressuresData.h) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/view/dd/data/VDDPressuresData.h (.../VDDPressuresData.h) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -36,20 +36,12 @@ { Q_OBJECT - PROPERTY( float , waterInletPSI , 0) - PROPERTY( float , waterOutletPSI , 0) - PROPERTY( float , hydrolicOutletPSI , 0) - PROPERTY( float , bicarbBagPSI , 0) - PROPERTY( float , spentDialysatePSI , 0) - PROPERTY( float , freshDialysatePSI , 0) - PROPERTY( float , transmembranePSI , 0) - PROPERTY( float , waterInletTemp , 0) - PROPERTY( float , waterOutletTemp , 0) - PROPERTY( float , hydrolicOutletTemp , 0) - PROPERTY( float , bicarbBagTemp , 0) - PROPERTY( float , spentDialysateTemp , 0) - PROPERTY( float , freshDialysateTemp , 0) - PROPERTY( float , transmembraneTemp , 0) + PROPERTY( float , d9Pressure , 0) + PROPERTY( float , d66Pressure , 0) + PROPERTY( float , d51Pressure , 0) + PROPERTY( float , d18Pressure , 0) + PROPERTY( float , d41Pressure , 0) + PROPERTY( float , d87Pressure , 0) VIEW_DEC(VDDPressures, DDPressuresData) };