Index: denali.pro =================================================================== diff -u -rb50431293b0690d6071f0fd58044880909cef01d -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- denali.pro (.../denali.pro) (revision b50431293b0690d6071f0fd58044880909cef01d) +++ denali.pro (.../denali.pro) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -147,6 +147,7 @@ sources/model/hd/adjustment/MAdjustPowerOff.h \ sources/model/hd/adjustment/settings/MAdjustHDRequests.h \ \ # ---------- Models - HD - Adjustment - Settings + sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.h \ sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \ @@ -189,6 +190,7 @@ \ # ---------- Models - HD - Data sources/model/hd/data/MHDDebugText.h \ sources/model/hd/data/MHDAccelerometerData.h \ + sources/model/hd/data/MHDSyringePumpData.h \ sources/model/hd/data/MTreatmentRangesData.h \ sources/model/hd/data/treatment/MTreatmentTimeData.h \ sources/model/hd/data/treatment/MTreatmentFlowsData.h \ @@ -302,6 +304,7 @@ sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.h \ \ # ---------- Views - HD - Data sources/view/hd/data/VHDAccelerometerData.h \ + sources/view/hd/data/VHDSyringePumpData.h \ sources/view/hd/data/VTreatmentRanges.h \ sources/view/hd/data/treatment/VTreatmentTime.h \ sources/view/hd/data/treatment/VTreatmentBloodFlow.h \ @@ -385,6 +388,7 @@ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MAdjustPowerOff.cpp \ \ # ---------- Models - HD - Adjustment - Settings + sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.cpp \ sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \ @@ -419,6 +423,7 @@ \ # ---------- Models - HD - Data sources/model/hd/data/MHDDebugText.cpp \ sources/model/hd/data/MHDAccelerometerData.cpp \ + sources/model/hd/data/MHDSyringePumpData.cpp \ sources/model/hd/data/MTreatmentRangesData.cpp \ sources/model/hd/data/treatment/MTreatmentTimeData.cpp \ sources/model/hd/data/treatment/MTreatmentFlowsData.cpp \ @@ -529,6 +534,7 @@ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp \ \ # ---------- Views - HD - Data sources/view/hd/data/VHDAccelerometerData.cpp \ + sources/view/hd/data/VHDSyringePumpData.cpp \ \ # ---------- Views - HD - Data - Pre-Treatment sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp \ sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp \ @@ -714,4 +720,5 @@ !isEmpty(target.path): INSTALLS += target DISTFILES += \ - README.md + README.md \ + ui_build_history.log Index: en_US.udic =================================================================== diff -u -rb50431293b0690d6071f0fd58044880909cef01d -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- en_US.udic (.../en_US.udic) (revision b50431293b0690d6071f0fd58044880909cef01d) +++ en_US.udic (.../en_US.udic) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -154,3 +154,8 @@ VHDPOSTData MHDPost PWM +MHDSyringe +HDSyringe +VHDSyringe +HDVersions +Bak Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r2f0d1d22a15f0ddb459c6527b4746439f66bfe1b -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 2f0d1d22a15f0ddb459c6527b4746439f66bfe1b) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -429,11 +429,28 @@ mData += QVariant::fromValue(vData.ver_micro); mData += QVariant::fromValue(vData.ver_revis); mData += QVariant::fromValue(vData.ver_comp ); - onActionTransmit(GuiActionType::ID_AdjustVersionsReq, mData); + onActionTransmit(GuiActionType::ID_AdjustVersionsUIReq, mData); } /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the HD Version Denali message. + * \param vData - Data model contains HD Version state. + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustVersionsResponseData &vData) +{ + QVariantList mData; + mData += QVariant::fromValue(vData.ver_major); + mData += QVariant::fromValue(vData.ver_minor); + mData += QVariant::fromValue(vData.ver_micro); + mData += QVariant::fromValue(vData.ver_revis); + mData += QVariant::fromValue(vData.ver_comp ); + onActionTransmit(GuiActionType::ID_AdjustVersionsUIRsp, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the DG Set Date Time Denali message. * \param vData - Data model contains the epoch time * \return void Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -r2f0d1d22a15f0ddb459c6527b4746439f66bfe1b -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 2f0d1d22a15f0ddb459c6527b4746439f66bfe1b) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -139,15 +139,15 @@ GuiActionType::ID_AdjustRinsebackReq , GuiActionType::ID_AdjustRecirculateReq , GuiActionType::ID_AdjustTreatmentEndReq , - GuiActionType::ID_AdjustVersionsReq , // Post-Treatment GuiActionType::ID_AdjustPatientDisconnectionConfirmReq , GuiActionType::ID_AdjustDisposablesRemovalConfirmReq , // Disinfect GuiActionType::ID_AdjustDisinfectReq , GuiActionType::ID_AdjustChemicalConfirmReq , // Settings - GuiActionType::ID_AdjustVersionsReq , + GuiActionType::ID_AdjustVersionsUIReq , + GuiActionType::ID_AdjustVersionsUIRsp , GuiActionType::ID_AdjustServiceReq , GuiActionType::ID_AdjustHDDateTimeReq , GuiActionType::ID_AdjustDGDateTimeReq , Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r2f0d1d22a15f0ddb459c6527b4746439f66bfe1b -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 2f0d1d22a15f0ddb459c6527b4746439f66bfe1b) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -67,9 +67,7 @@ {Gui::GuiActionType::ID_Rinseback , 5 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_Recirculate , 2 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_BloodPrime , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_HDAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes - // ---- {Gui::GuiActionType::ID_HDOperationModeData , 2 * 4 }, // 2 parameter each 4bytes {Gui::GuiActionType::ID_PreTreatmentStates , 9 * 4 }, // 9 parameters each 4bytes @@ -78,7 +76,7 @@ {Gui::GuiActionType::ID_PostTreatmentStates , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_DisinfectStates , 3 * 4 }, // 3 parameter each 4bytes - // ---- + // DG Data Messages {Gui::GuiActionType::ID_DGROPumpData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DGPressuresData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DGDrainPumpData , 4 * 4 }, // 4 parameters each 4bytes @@ -89,6 +87,9 @@ {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 + // HD Data Messages + {Gui::GuiActionType::ID_HDAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes + {Gui::GuiActionType::ID_HDSyringePumpData , 9 * 4 }, // 9 parameters each 4bytes // ---- TODO : AFTER GIVING IT SOME THOUGHT, IT SEEMS WE CAN GET THESE LEN FROM THE MODEL AND DON'T NEED TO HAVE THIS BUT NEED TO INVESTIGATE MORE. {Gui::GuiActionType::ID_AlarmStatus , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2bytes @@ -205,11 +206,14 @@ {Gui::GuiActionType::ID_TreatmentLogEventData , 3 * 4 }, // 3 parameter each 4bytes // ---- Versions - {Gui::GuiActionType::ID_AdjustVersionsReq ,1+1+1+2+4 }, // variable length parameters + {Gui::GuiActionType::ID_AdjustVersionsUIReq ,1+1+1+2+4 }, // variable length parameters {Gui::GuiActionType::ID_AdjustVersionsHDRsp ,1+1+1+2+1+1+1+1}, // variable length parameters {Gui::GuiActionType::ID_AdjustVersionsDGRsp ,1+1+1+2+1+1+1+1}, // variable length parameters {Gui::GuiActionType::ID_AdjustSerialHDRsp , 15 * 1 }, // 1 parameter 15bytes {Gui::GuiActionType::ID_AdjustSerialDGRsp , 15 * 1 }, // 1 parameter 15bytes + // ---- + {Gui::GuiActionType::ID_AdjustVersionsHDReq , 0 * 4 }, // 0 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustVersionsUIRsp ,1+1+1+2+4 }, // variable length parameters // ---- Service Information {Gui::GuiActionType::ID_AdjustServiceReq , 0 }, // 4 parameters each 4bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rb22dd46db3def5d3c36d36c319f0bea89bf018d9 -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision b22dd46db3def5d3c36d36c319f0bea89bf018d9) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -240,7 +240,8 @@ // POST case Gui::GuiActionType::ID_UIPostFinalResultData : INTERPRET_TRANSMIT_MESSAGE(AdjustUIPostFinalResultRequestData ); break; // Settings - case Gui::GuiActionType::ID_AdjustVersionsReq : INTERPRET_TRANSMIT_MESSAGE(AdjustVersionsRequestData ); break; + case Gui::GuiActionType::ID_AdjustVersionsUIRsp : INTERPRET_TRANSMIT_MESSAGE(AdjustVersionsResponseData ); break; + case Gui::GuiActionType::ID_AdjustVersionsUIReq : INTERPRET_TRANSMIT_MESSAGE(AdjustVersionsRequestData ); break; case Gui::GuiActionType::ID_AdjustHDDateTimeReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHDDateTimeRequestData ); break; case Gui::GuiActionType::ID_AdjustDGDateTimeReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDGDateTimeRequestData ); break; case Gui::GuiActionType::ID_AdjustServiceReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustServiceRequestData ); break; @@ -378,6 +379,7 @@ case Gui::GuiActionType::ID_HDPostFinalResultData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDPostFinalResultData ); break; // ----- Settings + case Gui::GuiActionType::ID_AdjustVersionsHDReq : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsHDReq ); break; case Gui::GuiActionType::ID_AdjustVersionsHDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsHDRsp ); break; case Gui::GuiActionType::ID_AdjustSerialHDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialHDRsp ); break; case Gui::GuiActionType::ID_AdjustServiceHDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceHDRsp ); break; @@ -392,6 +394,7 @@ // ----- Datum case Gui::GuiActionType::ID_HDAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDAccelerometerData ); break; + case Gui::GuiActionType::ID_HDSyringePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDSyringePumpData ); break; // ----- Datum - Treatment case Gui::GuiActionType::ID_TreatmentRanges : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentRanges ); break; Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -rb50431293b0690d6071f0fd58044880909cef01d -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision b50431293b0690d6071f0fd58044880909cef01d) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -76,6 +76,7 @@ #include "VTreatmentRecirculateData.h" #include "VTreatmentBloodPrimeData.h" #include "VHDAccelerometerData.h" +#include "VHDSyringePumpData.h" // DG data #include "VDGDrainPumpData.h" #include "VDGHeatersData.h" Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rb50431293b0690d6071f0fd58044880909cef01d -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision b50431293b0690d6071f0fd58044880909cef01d) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -84,12 +84,15 @@ // ----- Settings // Version - ID_AdjustVersionsReq = 0x1C00, // 28 + ID_AdjustVersionsUIReq = 0x1C00, // 28 + ID_AdjustVersionsUIRsp = 0x9F00, // 159 // ID_UIVersionsTxr - UI Version response transmit + ID_AdjustVersionsHDReq = 0x9E00, // 158 // ID_HDVersionsRxq - HD Version request received ID_AdjustVersionsHDRsp = 0x1D00, // 29 ID_AdjustVersionsDGRsp = 0x1E00, // 30 ID_AdjustSerialHDRsp = 0x9900, // 153 ID_AdjustSerialDGRsp = 0x8800, // 136 + // Service Information ID_AdjustServiceReq = 0x8900, // 137 ID_AdjustServiceHDRsp = 0x8A00, // 138 @@ -122,7 +125,6 @@ ID_Rinseback = 0x5600, // 86 ID_Recirculate = 0x5A00, // 90 ID_BloodPrime = 0x5900, // 89 - ID_HDAccelerometerData = 0x3300, // 51 // Alarm Messages ID_AlarmStatus = 0x0200, @@ -187,6 +189,11 @@ ID_DGTemperaturesData = 0x2D00, // 45 ID_DGAccelerometerData = 0x3400, // 52 + // HD Data Messages + ID_HDAccelerometerData = 0x3300, // 51 + ID_HDSyringePumpData = 0x6900, // 105 + + // In-Treatment Adjustables ID_AdjustDurationReq = 0x1600, // 22 ID_AdjustDurationRsp = 0x1B00, // 27 Index: sources/gui/qml/components/DebugDataColumn.qml =================================================================== diff -u -r30eab37f37822513f07948fb47a8af612d06e5f3 -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- sources/gui/qml/components/DebugDataColumn.qml (.../DebugDataColumn.qml) (revision 30eab37f37822513f07948fb47a8af612d06e5f3) +++ sources/gui/qml/components/DebugDataColumn.qml (.../DebugDataColumn.qml) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -27,7 +27,7 @@ property var model: [] property var label: [] property string title: "Title" - property int fontPixelSizeTitle: 38 + property int fontPixelSizeTitle: 30 property int fontPixelSizeText : 38 property string textObjectName: "_DebugDataColumn" Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r667baa15f6fc3a9438dae68ded8cee26c2ca7450 -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 667baa15f6fc3a9438dae68ded8cee26c2ca7450) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -204,15 +204,15 @@ // Next row DebugDataColumn { id: _DGValvesStatesColumn - x: col(1) - y: row(2) + x: col(3.8) + y: row(5.2) title: qsTr(" Valves ") model: [ vDGValvesStates.text ] textObjectName: "_DGValvesStatesData" } DebugDataColumn { id: _DGOperationModeColumn - x: col(5) + x: col(2.5) y: row(2) title: qsTr(" DG Mode ") model: [ vDGOperationMode.text ] @@ -321,8 +321,42 @@ textObjectName: "_PressureOcclusionData" } + DebugDataColumn { id: _HDSyringePumpColumn + x: col(4.6) + y: row(2) + title: qsTr(" Syringe ") + model: [ + vHDSyringePump.syringePumpState , + vHDSyringePump.heparinState , + vHDSyringePump.setRate .toFixed(2) , + vHDSyringePump.measuredRate .toFixed(2) , + vHDSyringePump.syringePumpPosition , + vHDSyringePump.volumeDelivered .toFixed(2) , + vHDSyringePump.measuredHome .toFixed(2) , + vHDSyringePump.measuredSwitch .toFixed(2) , + vHDSyringePump.measuredForce .toFixed(2) , + vHDSyringePump.safetyVol .toFixed(2) , + vHDSyringePump.status , + ] + label: [ + "srng.St", + "hprn.St", + "setRate", + "msrRate", + "srngPos", + "VolumeD", + "Msr.Hom", + "Msr.Swt", + "Msr.Frc", + "safe.Vl", + "status", + ] + + textObjectName: "_HDSyringePumpColumn" + } + DebugDataColumn { id: _HDOperationModeColumn - x: col(2.8) + x: col(0.5) y: row(2) title: qsTr(" HD Mode ") model: [ vHDOperationMode.text ] @@ -398,11 +432,20 @@ textObjectName: "_DGAccelerometerData" } + TouchRect { + x : col(6) + y : row(5.8) + width : 150 + height : 35 + text.text : "Get Version" + onClicked : vAdjustmentVersions.doAdjustment() + } + DebugDataColumn { id: _HDVersionsColumn x: col(6) - y: row(4.5) - title: qsTr(" HD Ver ") - model: [ "v%1.%2.%3-%4 %5 v%6.%7 %8" + y: row(6) + title: "" + model: [ "HD: v%1.%2.%3-%4 %5 v%6.%7 %8" .arg(vAdjustmentVersions.hdVerMajor) .arg(vAdjustmentVersions.hdVerMinor) .arg(vAdjustmentVersions.hdVerMicro) @@ -414,20 +457,11 @@ ] textObjectName: "_HDVersions" } - TouchRect { - x : col(5.2) - y : row(4.5) - width : 150 - height : 35 - text.text : "Get Version" - onClicked : vAdjustmentVersions.doAdjustment() - } - DebugDataColumn { id: _DGVersionsColumn x: col(6) - y: row(5.4) - title: qsTr(" DG Ver ") - model: [ "v%1.%2.%3-%4 %5 v%6.%7 %8" + y: row(6.5) + title: "" + model: [ "DG: v%1.%2.%3-%4 %5 v%6.%7 %8" .arg(vAdjustmentVersions.dgVerMajor) .arg(vAdjustmentVersions.dgVerMinor) .arg(vAdjustmentVersions.dgVerMicro) Index: sources/gui/qml/main.qml =================================================================== diff -u -ra1fdb6d955a07f87e0352c41cee61106eb97e59f -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- sources/gui/qml/main.qml (.../main.qml) (revision a1fdb6d955a07f87e0352c41cee61106eb97e59f) +++ sources/gui/qml/main.qml (.../main.qml) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -23,6 +23,7 @@ // View classes import VHDAccelerometer 0.1 +import VHDSyringePump 0.1 // POST import VHDPOSTData 0.1 @@ -150,6 +151,7 @@ VTreatmentRinseback { id: vTreatmentRinseback } VTreatmentRecirculate { id: vTreatmentRecirculate } VHDAccelerometer { id: vHDAccelerometer } + VHDSyringePump { id: vHDSyringePump } // ---- DG VDGDrainPump { id: vDGDrainPump } VDGHeaters { id: vDGHeaters } Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -ra1fdb6d955a07f87e0352c41cee61106eb97e59f -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision a1fdb6d955a07f87e0352c41cee61106eb97e59f) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -124,7 +124,6 @@ if (vinit) { // FIXMW : This is a temporary code for now to make the FW work. // later needs to be moved to the correct place. - vAdjustmentVersions.doAdjustment() vAdjustmentVersions.doUIPOSTFinal() } } Index: sources/model/MModel.h =================================================================== diff -u -r667baa15f6fc3a9438dae68ded8cee26c2ca7450 -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- sources/model/MModel.h (.../MModel.h) (revision 667baa15f6fc3a9438dae68ded8cee26c2ca7450) +++ sources/model/MModel.h (.../MModel.h) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -54,6 +54,7 @@ #include "MTreatmentRecirculateData.h" #include "MTreatmentBloodPrimeData.h" #include "MHDAccelerometerData.h" +#include "MHDSyringePumpData.h" // Debugging Messages #include "MHDDebugText.h" @@ -62,6 +63,7 @@ // Settings #include "MAdjustHDRequests.h" #include "MAdjustDGRequests.h" +#include "MAdjustHDVersionsRequest.h" #include "MAdjustHDVersionsResponse.h" #include "MAdjustDGVersionsResponse.h" #include "MAdjustHDSerialNumberResponse.h" @@ -278,6 +280,7 @@ REGISTER_METATYPE( TreatmentRinsebackData ) \ REGISTER_METATYPE( TreatmentRecirculateData ) \ REGISTER_METATYPE( TreatmentBloodPrimeData ) \ + REGISTER_METATYPE( HDSyringePumpData ) \ REGISTER_METATYPE( HDAccelerometerData ) \ /* Treatment Log */ \ REGISTER_METATYPE( TreatmentLogAvrgeData ) \ @@ -353,6 +356,7 @@ REGISTER_METATYPE( AdjustRecirculateRequestData ) \ REGISTER_METATYPE( AdjustTreatmentEndRequestData ) \ REGISTER_METATYPE( AdjustPressuresLimitsRequestData ) \ + REGISTER_METATYPE( AdjustVersionsResponseData ) \ REGISTER_METATYPE( AdjustVersionsRequestData ) \ REGISTER_METATYPE( AdjustServiceRequestData ) \ REGISTER_METATYPE( AdjustHDDateTimeRequestData ) \ @@ -387,6 +391,7 @@ REGISTER_METATYPE( AdjustRecirculateResponseData ) \ REGISTER_METATYPE( AdjustTreatmentEndResponseData ) \ REGISTER_METATYPE( AdjustPressuresLimitsResponseData ) \ + REGISTER_METATYPE( AdjustVersionsHDRequestData ) \ REGISTER_METATYPE( AdjustVersionsHDResponseData ) \ REGISTER_METATYPE( AdjustVersionsDGResponseData ) \ REGISTER_METATYPE( AdjustSerialNumberHDResponseData ) \ @@ -441,6 +446,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRinsebackData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRecirculateData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentBloodPrimeData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDSyringePumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAccelerometerData ) \ /* Treatment Log */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentLogAvrgeData ) \ @@ -503,6 +509,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsHDRequestData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsHDResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsDGResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberHDResponseData ) \ @@ -533,6 +540,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeRequestData ) \ @@ -607,6 +615,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRinsebackData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRecirculateData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentBloodPrimeData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( HDSyringePumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDAccelerometerData ) \ /* Treatment Log */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentLogAvrgeData ) \ @@ -669,6 +678,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRecirculateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresLimitsResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsHDRequestData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsHDResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsDGResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberHDResponseData ) \ @@ -718,6 +728,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDDateTimeRequestData ) \ @@ -767,6 +778,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDDateTimeRequestData ) \ @@ -816,6 +828,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustRinsebackRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTreatmentEndRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDDateTimeRequestData ) \ @@ -856,6 +869,7 @@ ACTION_RECEIVE_SIGNAL( TreatmentRinsebackData ) \ ACTION_RECEIVE_SIGNAL( TreatmentRecirculateData ) \ ACTION_RECEIVE_SIGNAL( TreatmentBloodPrimeData ) \ + ACTION_RECEIVE_SIGNAL( HDSyringePumpData ) \ ACTION_RECEIVE_SIGNAL( HDAccelerometerData ) \ /* Alarms */ \ ACTION_RECEIVE_SIGNAL( AlarmStatusData ) \ @@ -917,6 +931,7 @@ ACTION_RECEIVE_SIGNAL( AdjustRecirculateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustPressuresLimitsResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustVersionsHDRequestData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsHDResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsDGResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustSerialNumberHDResponseData ) \ Index: sources/model/hd/adjustment/settings/MAdjustHDRequests.h =================================================================== diff -u -r2f0d1d22a15f0ddb459c6527b4746439f66bfe1b -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision 2f0d1d22a15f0ddb459c6527b4746439f66bfe1b) +++ sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -127,13 +127,39 @@ } // coco end static QString toString(const QVariantList &vParameters) { - return MModel::toString("Version", vParameters); + return MModel::toString("VersionReq", vParameters); } static Can::Can_Id canid () { return Can::eChlid_UI_Sync; } }; + /*! + * \brief The MAdjustVersionsRsp class + * \details The UI versions response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:----:|:---:|:---:|:----:|:-----------:| + * | 0x9F00 | 0x200 | Rsp | Y | UI | HD | UI Versions/SN Response | + * + * | Payload || + * | || + * | #1:(U08) | major | + * | #2:(U08) | minor | + * | #3:(U08) | micro | + * | #4:(U16) | revision(build) | + * | #5:(U32) | compatibility | + * + */ +class MAdjustVersionsRsp : public MAdjustVersionsReq { +public: + static QString toString(const QVariantList &vParameters) { + return MModel::toString("VersionRsp", vParameters); + } + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_HD; } +}; + +/*! * \brief The MAdjustServiceReq class * \details The DG/HD versions request model * @@ -194,8 +220,8 @@ } typedef Model:: MAdjustVersionsReq AdjustVersionsRequestData; +typedef Model:: MAdjustVersionsRsp AdjustVersionsResponseData; typedef Model:: MAdjustServiceReq AdjustServiceRequestData; typedef Model:: MAdjustHDDateTimeReq AdjustHDDateTimeRequestData; typedef Model:: MAdjustHDAlarmVolumeReq AdjustHDAlarmVolumeRequestData; typedef Model::MAdjustUIPostFinalResultReq AdjustUIPostFinalResultRequestData; - Index: sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.cpp =================================================================== diff -u --- sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.cpp (revision 0) +++ sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.cpp (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -0,0 +1,31 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MAdjustHDVersionsRequest.cpp + * \author (last) Behrouz NematiPour + * \author (original) Behrouz NematiPour + * \date (last) 29-Jul-2021 + * \date (original) 29-Jul-2021 + * + */ +#include "MAdjustHDVersionsRequest.h" + +using namespace Model; + +QVariantList MAdjustVersionsHDRequest::parameters() const { + return {}; +} + +bool MAdjustVersionsHDRequest::fromByteArray(const QByteArray &, int *) { + // int index = 0; // message data start position + return true ; +} + +AdjustVersionsHDRequestData MAdjustVersionsHDRequest::data() const { + Data data; + return data; +} Index: sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.h =================================================================== diff -u --- sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.h (revision 0) +++ sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.h (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -0,0 +1,77 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MAdjustHDVersionsRequest.h + * \author (last) Behrouz NematiPour + * \author (original) Behrouz NematiPour + * \date (last) 29-Jul-2021 + * \date (original) 29-Jul-2021 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustVersionsHDRequest class + * \details The HD versions data model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:----:|:---:|:---:|:----:|:-----------:| + * | 0x9E00 | 0x020 | Req | Y | HD | UI | HD Versions Request Data | + * + * | Payload || + * | || + * + * \sa Data + * \sa MAdjustVersionsHDRequest : HD Versions Request Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | VersionReq | + * + */ +class MAdjustVersionsHDRequest : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + } _data; + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + QString infoText () const override { return QString("VersionReq") ; } + + struct Data { + }; + + MAdjustVersionsHDRequest () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustVersionsHDRequest::Data AdjustVersionsHDRequestData; Index: sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h =================================================================== diff -u -ra1fdb6d955a07f87e0352c41cee61106eb97e59f -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h (.../MAdjustHDVersionsResponse.h) (revision a1fdb6d955a07f87e0352c41cee61106eb97e59f) +++ sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h (.../MAdjustHDVersionsResponse.h) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -51,9 +51,9 @@ *

Logging info

* | || * | || - * | typeText | Event | - * | unitText | HD | - * | infoText | Version | + * | typeText | Event | + * | unitText | HD | + * | infoText | VersionRsp | * */ class MAdjustVersionsHDResponse : public MAbstract { @@ -76,9 +76,9 @@ public: - Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } - QString infoText () const override { return QString("Version") ; } + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + QString infoText () const override { return QString("VersionRsp") ; } struct Data { quint8 mMajor = 0; /*!< HD Versions Major value of type quint8 extracted out */ Index: sources/model/hd/data/MHDSyringePumpData.cpp =================================================================== diff -u --- sources/model/hd/data/MHDSyringePumpData.cpp (revision 0) +++ sources/model/hd/data/MHDSyringePumpData.cpp (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -0,0 +1,76 @@ +/*! + * + * Copyright (c) 2020-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MHDSyringePumpData.cpp + * \author (last) Behrouz NematiPour + * \author (original) Behrouz NematiPour + * \date (last) 29-Jul-2021 + * \date (original) 29-Jul-2021 + * + */ +#include "MHDSyringePumpData.h" + +using namespace Model; + +QVariantList MHDSyringePump::parameters() const { + return { + _data.mSyringePumpState .value, + _data.mHeparinState .value, + _data.mSetRate .value, + _data.mMeasuredRate .value, + _data.mSyringePumpPosition .value, + _data.mVolumeDelivered .value, + _data.mMeasuredHome .value, + _data.mMeasuredSwitch .value, + _data.mMeasuredForce .value, + _data.mSafetyVol .value, + _data.mStatus .value, + }; +} + +bool MHDSyringePump::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if (GetValue(vByteArray, index, _data.mSyringePumpState )) + if (GetValue(vByteArray, index, _data.mHeparinState )) + if (GetValue(vByteArray, index, _data.mSetRate )) + if (GetValue(vByteArray, index, _data.mMeasuredRate )) + if (GetValue(vByteArray, index, _data.mSyringePumpPosition )) + if (GetValue(vByteArray, index, _data.mVolumeDelivered )) + if (GetValue(vByteArray, index, _data.mMeasuredHome )) + if (GetValue(vByteArray, index, _data.mMeasuredSwitch )) + if (GetValue(vByteArray, index, _data.mMeasuredForce )) + if (GetValue(vByteArray, index, _data.mSafetyVol )) + if (GetValue(vByteArray, index, _data.mStatus )) + return true ; + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } +} + +MHDSyringePump::Data MHDSyringePump::data() const { + Data data; + data.mSyringePumpState = _data.mSyringePumpState .value; + data.mHeparinState = _data.mHeparinState .value; + data.mSetRate = _data.mSetRate .value; + data.mMeasuredRate = _data.mMeasuredRate .value; + data.mSyringePumpPosition = _data.mSyringePumpPosition.value; + data.mVolumeDelivered = _data.mVolumeDelivered .value; + data.mMeasuredHome = _data.mMeasuredHome .value; + data.mMeasuredSwitch = _data.mMeasuredSwitch .value; + data.mMeasuredForce = _data.mMeasuredForce .value; + data.mSafetyVol = _data.mSafetyVol .value; + data.mStatus = _data.mStatus .value; + return data; +} Index: sources/model/hd/data/MHDSyringePumpData.h =================================================================== diff -u --- sources/model/hd/data/MHDSyringePumpData.h (revision 0) +++ sources/model/hd/data/MHDSyringePumpData.h (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -0,0 +1,113 @@ +/*! + * + * Copyright (c) 2020-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MHDSyringePumpData.h + * \author (last) Behrouz NematiPour + * \author (original) Behrouz NematiPour + * \date (last) 29-Jul-2021 + * \date (original) 29-Jul-2021 + * + */ +#pragma once + + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MHDSyringePump class + * \details The HD SyringePump data model + * + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:----:|:---:|:---:|:----:|:---------------------:| + * | 0x6900 | 0x040 | 1 Hz | N | HD | All | HD SyringePump Data | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mSyringePumpState | + * | #2:(U32) | \ref Data::mHeparinState | + * | #3:(F32) | \ref Data::mSetRate | + * | #4:(F32) | \ref Data::mMeasuredRate | + * | #5:(S32) | \ref Data::mSyringePumpPosition | + * | #6:(F32) | \ref Data::mVolumeDelivered | + * | #7:(F32) | \ref Data::mHome | + * | #8:(F32) | \ref Data::mSwitch | + * | #9:(F32) | \ref Data::mForce | + * |#10:(F32) | \ref Data::mSafetyVol | + * |#11:(U32) | \ref Data::mStatus | + * + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | HD | + * | infoText | HDSyringeData | + * + */ +class MHDSyringePump : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mSyringePumpState ; + Types::U32 mHeparinState ; + Types::F32 mSetRate ; // (mL/hr) + Types::F32 mMeasuredRate ; // (mL/hr) + Types::S32 mSyringePumpPosition ; + Types::F32 mVolumeDelivered ; // (mL) + Types::F32 mMeasuredHome ; // (V) + Types::F32 mMeasuredSwitch ; // (V) + Types::F32 mMeasuredForce ; // (V) + Types::F32 mSafetyVol ; // (mL) + Types::U32 mStatus ; + } _data; + +public: + + Type_Enum typeText() const override { return Type_Enum::eDatum ; } + Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + QString infoText() const override { return QString("HDSyringeData"); } + + struct Data { + quint32 mSyringePumpState = 0; + quint32 mHeparinState = 0; + float mSetRate = 0; + float mMeasuredRate = 0; + qint32 mSyringePumpPosition = 0; + float mVolumeDelivered = 0; + float mMeasuredHome = 0; + float mMeasuredSwitch = 0; + float mMeasuredForce = 0; + float mSafetyVol = 0; + quint32 mStatus = 0; + }; + +public: + MHDSyringePump () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MHDSyringePump::Data HDSyringePumpData; Index: sources/view/VView.h =================================================================== diff -u -rb50431293b0690d6071f0fd58044880909cef01d -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- sources/view/VView.h (.../VView.h) (revision b50431293b0690d6071f0fd58044880909cef01d) +++ sources/view/VView.h (.../VView.h) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -141,6 +141,7 @@ REGISTER_TYPE( VTreatmentBloodPrime ) \ /* Device - Data */ \ REGISTER_TYPE( VHDAccelerometer ) \ + REGISTER_TYPE( VHDSyringePump ) \ /* DG - Data */ \ REGISTER_TYPE( VDGDrainPump ) \ REGISTER_TYPE( VDGHeaters ) \ Index: sources/view/hd/data/VHDSyringePumpData.cpp =================================================================== diff -u --- sources/view/hd/data/VHDSyringePumpData.cpp (revision 0) +++ sources/view/hd/data/VHDSyringePumpData.cpp (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -0,0 +1,34 @@ +/*! + * + * Copyright (c) 2020-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VHDSyringePumpData.cpp + * \author (last) Behrouz NematiPour + * \author (original) Behrouz NematiPour + * \date (last) 29-Jul-2021 + * \date (original) 29-Jul-2021 + * + */ +#include "VHDSyringePumpData.h" + +// Project +#include "GuiController.h" + +VIEW_DEF(VHDSyringePump, HDSyringePumpData) + +void VHDSyringePump::onActionReceive(const HDSyringePumpData &vData) { + syringePumpState (vData.mSyringePumpState ); + heparinState (vData.mHeparinState ); + setRate (vData.mSetRate ); + measuredRate (vData.mMeasuredRate ); + syringePumpPosition (vData.mSyringePumpPosition ); + volumeDelivered (vData.mVolumeDelivered ); + measuredHome (vData.mMeasuredHome ); + measuredSwitch (vData.mMeasuredSwitch ); + measuredForce (vData.mMeasuredForce ); + safetyVol (vData.mSafetyVol ); + status (vData.mStatus ); +} Index: sources/view/hd/data/VHDSyringePumpData.h =================================================================== diff -u --- sources/view/hd/data/VHDSyringePumpData.h (revision 0) +++ sources/view/hd/data/VHDSyringePumpData.h (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -0,0 +1,52 @@ +/*! + * + * Copyright (c) 2020-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VHDSyringePumpData.h + * \author (last) Peman Montazemi + * \date (last) 3-Sep-2020 + * \author (original) Peman Montazemi + * \date (original) 3-Sep-2020 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "main.h" // Doxygen : don't remove +#include "VView.h" +#include "MHDSyringePumpData.h" + +// namespace +namespace View { + +/*! + * \brief The VHDSyringePump class + * \details View for Model's Data representation. + * + * \sa Model::MHDSyringePump + * + */ +class VHDSyringePump : public QObject { + Q_OBJECT + + PROPERTY( quint32 , syringePumpState , 0) + PROPERTY( quint32 , heparinState , 0) + PROPERTY( float , setRate , 0) + PROPERTY( float , measuredRate , 0) + PROPERTY( qint32 , syringePumpPosition , 0) + PROPERTY( float , volumeDelivered , 0) + PROPERTY( float , measuredHome , 0) + PROPERTY( float , measuredSwitch , 0) + PROPERTY( float , measuredForce , 0) + PROPERTY( float , safetyVol , 0) + PROPERTY( quint32 , status , 0) + + VIEW_DEC(VHDSyringePump, HDSyringePumpData) +}; +} Index: sources/view/settings/VAdjustmentVersions.cpp =================================================================== diff -u -r1dead6ecc09639538da51e5fac5e4d0e21d9eeee -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- sources/view/settings/VAdjustmentVersions.cpp (.../VAdjustmentVersions.cpp) (revision 1dead6ecc09639538da51e5fac5e4d0e21d9eeee) +++ sources/view/settings/VAdjustmentVersions.cpp (.../VAdjustmentVersions.cpp) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -23,12 +23,21 @@ ADJUST_VIEW_CONNECTION( AdjustUIPostFinalResultRequestData); // this is only a test in here and later need to be removed ADJUST_VIEW_CONNECTION( AdjustVersionsRequestData); + ADJUST_VIEW_CONNECTION( AdjustVersionsResponseData); + + ACTION_VIEW_CONNECTION( AdjustVersionsHDRequestData); ACTION_VIEW_CONNECTION(AdjustVersionsHDResponseData); ACTION_VIEW_CONNECTION(AdjustVersionsDGResponseData); ACTION_VIEW_CONNECTION(AdjustSerialNumberHDResponseData); ACTION_VIEW_CONNECTION(AdjustSerialNumberDGResponseData); } +void VAdjustmentVersions::onActionReceive(const AdjustVersionsHDRequestData &) +{ + AdjustVersionsResponseData data; + emit didAdjustment(data); +} + void VAdjustmentVersions::onActionReceive(const AdjustVersionsHDResponseData &vData) { // HD versions data Index: sources/view/settings/VAdjustmentVersions.h =================================================================== diff -u -r1dead6ecc09639538da51e5fac5e4d0e21d9eeee -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision 1dead6ecc09639538da51e5fac5e4d0e21d9eeee) +++ sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -19,6 +19,7 @@ // Project #include "main.h" // Doxygen : don't remove #include "VAdjustmentResponseBase.h" +#include "MAdjustHDVersionsRequest.h" #include "MAdjustHDVersionsResponse.h" #include "MAdjustDGVersionsResponse.h" #include "MAdjustHDSerialNumberResponse.h" @@ -82,6 +83,7 @@ PROPERTY( QString , dgSerial ,"") VIEW_DEC_CLASS(VAdjustmentVersions) + VIEW_DEC_SLOT ( AdjustVersionsHDRequestData) VIEW_DEC_SLOT (AdjustVersionsHDResponseData) VIEW_DEC_SLOT (AdjustVersionsDGResponseData) VIEW_DEC_SLOT (AdjustSerialNumberHDResponseData) @@ -101,7 +103,8 @@ } signals: - void didAdjustment(const AdjustVersionsRequestData &vData); + void didAdjustment(const AdjustVersionsRequestData &vData); + void didAdjustment(const AdjustVersionsResponseData &vData); void didAdjustment(const AdjustUIPostFinalResultRequestData &vData); // this is only a test in here and later need to be removed }; } Index: ui_build_history.log =================================================================== diff -u -r632c35e55b8bca484b7e0d985760ce88cbc5601f -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- ui_build_history.log (.../ui_build_history.log) (revision 632c35e55b8bca484b7e0d985760ce88cbc5601f) +++ ui_build_history.log (.../ui_build_history.log) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -1,17 +1,16 @@ -Bamboo_Build_Number : v0.6.5-21 -Bamboo_Build_Date : 2021-07-28T173750.942-0700 +Bamboo_Build_Number : +Bamboo_Build_Date : Bug_Fixes : - N/A [Initial push] New_Features : - - N/A [Initial push] + - POST feature FW communication completed with two Bi-Directional new messages which allows HD Software to request anytime for the UI Software version (0x9E00, 0x9F00). Known_Bugs : - N/A [Initial push] Changes : - - N/A [Initial push] - -************************************************************************************************ + - Changes on Diagnostics screen to add Syringe Pump message. Versions and HD/DG Software Operation Mode moved to make room for that too. +************************************************************************************************