Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r6a06de0b01e39939cc4f6c541da88cb0c8cd2a1b -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 6a06de0b01e39939cc4f6c541da88cb0c8cd2a1b) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -841,6 +841,18 @@ QVariantList mData; onActionTransmit(GuiActionType::ID_AdjustInstitutionalRecordReq, mData); } + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the Disposables Removal Confirm Adjustment Denali message. + * \param vData - Data model contains Service Mode adjustment. + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustHDResetInSrvcRequestData &) +{ + QVariantList mData; + onActionTransmit(GuiActionType::ID_ResetHDInServiceModeReq, mData); +} // ---------------------------------------------------------------------------------------------------- /*! Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -r6a06de0b01e39939cc4f6c541da88cb0c8cd2a1b -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 6a06de0b01e39939cc4f6c541da88cb0c8cd2a1b) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -166,6 +166,9 @@ GuiActionType::ID_TreatmentLogAvrgeData , GuiActionType::ID_TreatmentLogAlarmData , GuiActionType::ID_TreatmentLogEventData , + + // HD reset request in service mode + GuiActionType::ID_ResetHDInServiceModeReq , }; public slots: Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -ra9524b7a57b19e112b18a1e4ae6a44fb9d00af90 -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision a9524b7a57b19e112b18a1e4ae6a44fb9d00af90) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -72,10 +72,10 @@ // ----- {Gui::GuiActionType::ID_TreatmentTime , 3 * 4 }, // 3 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_BloodFlow , 10 * 4 }, //10 parameters each 4bytes + {Gui::GuiActionType::ID_DialysateInletFlow , 10 * 4 }, //10 parameters each 4bytes {Gui::GuiActionType::ID_DialysateOutletFlow , 13 * 4 }, //13 parameters each 4bytes - {Gui::GuiActionType::ID_PressureOcclusion , 8 * 4 }, // 8 parameters each 4bytes + {Gui::GuiActionType::ID_PressureOcclusion , 12 * 4 }, //12 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 @@ -84,7 +84,7 @@ {Gui::GuiActionType::ID_TreatmentStop , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_HDAirBubbleData , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_HDAirTrapData , 4 * 4 }, // 4 parameters each 4bytes - {Gui::GuiActionType::ID_HDBloodLeakData , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_HDBloodLeakData , 4 * 4 }, // 4 parameters each 4bytes // ---- {Gui::GuiActionType::ID_HDOperationModeData , 2 * 4 }, // 2 parameter each 4bytes {Gui::GuiActionType::ID_PreTreatmentStates , 11 * 4 }, //11 parameters each 4bytes @@ -98,7 +98,7 @@ {Gui::GuiActionType::ID_DGOperationModeData , 2 * 4 }, // 2 parameter each 4bytes {Gui::GuiActionType::ID_DGReservoirData , 12 * 4 }, // 12 parameters each 4bytes {Gui::GuiActionType::ID_DGValvesStatesData , 1 * 2 + 13 }, // 1 parameter 16bits & 13 parameters each 1 byte - {Gui::GuiActionType::ID_DGHeatersData , 11 * 4 }, // 11 parameters each 4bytes + {Gui::GuiActionType::ID_DGHeatersData , 13 * 4 }, // 13 parameters each 4bytes {Gui::GuiActionType::ID_DGLoadCellReadingsData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DGTemperaturesData , 23 * 4 }, // 23 parameters each 4bytes {Gui::GuiActionType::ID_DGAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes @@ -258,7 +258,7 @@ // ---- RO Water {Gui::GuiActionType::ID_DuetRoWaterStatDGq , 0 * 4 }, // 0 parameter each 4bytes {Gui::GuiActionType::ID_DuetRoWaterModeUIi , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_DuetRoWaterModeDGr , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_DuetRoWaterModeDGr , 3 * 4 }, // 3 parameters each 4bytes // ---- {Gui::GuiActionType::ID_CANBusFaultCount , 1 }, {Gui::GuiActionType::ID_RawData , 255 }, @@ -273,6 +273,9 @@ {Gui::GuiActionType::ID_AdjustInstitutionalRecordReq , 0 * 4 }, // 0 parameter {Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp , 27 * 4 }, //27 parameters each 4 bytes + + // HD reset request in service mode + {Gui::GuiActionType::ID_ResetHDInServiceModeReq , 0 * 4 }, // 0 parameters each 4bytes }; /*! Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r6a06de0b01e39939cc4f6c541da88cb0c8cd2a1b -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 6a06de0b01e39939cc4f6c541da88cb0c8cd2a1b) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -285,6 +285,10 @@ case Gui::GuiActionType::ID_AlarmClearedConditionReq : INTERPRET_TRANSMIT_MESSAGE(AlarmClearedConditionRequestData ); break; case Gui::GuiActionType::ID_AlarmActiveListReq : INTERPRET_TRSMT_MT_MESSAGE(AlarmActiveListRequestData ); break; case Gui::GuiActionType::ID_AlarmTriggered : INTERPRET_TRANSMIT_MESSAGE(AlarmTriggeredRequestData ); break; + + // HD reset in service mode + case Gui::GuiActionType::ID_ResetHDInServiceModeReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustHDResetInSrvcRequestData ); break; + // disabled coco end default: QString mActionIdHexString = Format::toHexString(vActionId); Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r6a06de0b01e39939cc4f6c541da88cb0c8cd2a1b -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 6a06de0b01e39939cc4f6c541da88cb0c8cd2a1b) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -290,6 +290,8 @@ ID_AdjustInstitutionalRecordReq = 0xCF00, // 207 UI -> HD request institutional record ID_AdjustInstitutionalRecordRsp = 0xD000, // 208 HD -> UI response institutional record + // HD reset request in service mode + ID_ResetHDInServiceModeReq = 0xB900, // 185 UI -> HD reset in service mode }; enum class GuiActionsData_Enum /*: quint8 QML does not support*/ { Index: sources/model/MModel.h =================================================================== diff -u -r6a06de0b01e39939cc4f6c541da88cb0c8cd2a1b -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/model/MModel.h (.../MModel.h) (revision 6a06de0b01e39939cc4f6c541da88cb0c8cd2a1b) +++ sources/model/MModel.h (.../MModel.h) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -459,9 +459,10 @@ REGISTER_METATYPE( AdjustHDAlarmVolumeResponseData ) \ REGISTER_METATYPE( AdjustInstitutionalRequestData ) \ REGISTER_METATYPE( AdjustInstitutionalRecordResponseData ) \ + /* HD reset in service mode */ \ + REGISTER_METATYPE( AdjustHDResetInSrvcRequestData ) \ - //===============================================================================// /*! \def ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS @@ -651,7 +652,10 @@ /* Settings - HD Info */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, HDUsageInfoRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustInstitutionalRequestData ) \ + /* HD reset in service mode */ \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDResetInSrvcRequestData ) \ + /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmClearedConditionRequestData ) \ disabled coco end */ \ @@ -849,6 +853,8 @@ /* Settings - HD Info */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( HDUsageInfoRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustInstitutionalRequestData ) \ + /* HD reset in service mode */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDResetInSrvcRequestData ) \ /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmClearedConditionRequestData ) \ disabled coco end */ \ @@ -910,6 +916,8 @@ /* Settings - HD Info */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( HDUsageInfoRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustInstitutionalRequestData ) \ + /* HD reset in service mode */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDResetInSrvcRequestData ) \ /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmClearedConditionRequestData ) \ @@ -972,6 +980,8 @@ /* Settings - HD Info */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( HDUsageInfoRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustInstitutionalRequestData ) \ + /* HD reset in service mode */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDResetInSrvcRequestData ) \ /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmClearedConditionRequestData ) \ disabled coco end */ \ Index: sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp (.../MDuetRoWaterDG.cpp) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp (.../MDuetRoWaterDG.cpp) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -37,18 +37,21 @@ QVariantList Model::MDuetRoWaterModeDGr::parameters() const { return { - _data.mAccepted.value, - _data.mReason .value, + _data.mAccepted .value, + _data.mReason .value, + _data.mFirmwareValue.value, }; } bool Model::MDuetRoWaterModeDGr::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mAccepted )) - if (GetValue(vByteArray, index, _data.mReason )) + if (GetValue(vByteArray, index, _data.mAccepted )) + if (GetValue(vByteArray, index, _data.mReason )) + if (GetValue(vByteArray, index, _data.mFirmwareValue )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -58,7 +61,8 @@ */ DuetRoWaterModeDGrData Model::MDuetRoWaterModeDGr::data() const { Data data; - data.mAccepted = _data.mAccepted.value; - data.mReason = _data.mReason .value; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mFirmwareValue = _data.mFirmwareValue.value; return data; } Index: sources/model/dg/adjustment/settings/MDuetRoWaterDG.h =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/model/dg/adjustment/settings/MDuetRoWaterDG.h (.../MDuetRoWaterDG.h) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/model/dg/adjustment/settings/MDuetRoWaterDG.h (.../MDuetRoWaterDG.h) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -84,6 +84,7 @@ * | || * | #1:(U32) | \ref Data::mAccepted | * | #2:(U32) | \ref Data::mReason | + * | #3:(U32) | \ref Data::mFWValue | * * \sa Data * @@ -103,8 +104,9 @@ QVariantList parameters() const override; struct { - Types::U32 mAccepted; - Types::U32 mReason ; + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mFirmwareValue; } _data; public: @@ -113,8 +115,9 @@ QString infoText () const override { return QString("AdjustRoWater") ; } struct Data { - bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ - quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + quint32 mFirmwareValue = 0; /*!< Value in the firmware */ }; MDuetRoWaterModeDGr () { } Index: sources/model/dg/data/MDGHeatersData.cpp =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/model/dg/data/MDGHeatersData.cpp (.../MDGHeatersData.cpp) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/model/dg/data/MDGHeatersData.cpp (.../MDGHeatersData.cpp) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -29,6 +29,8 @@ _data.mPrimaryCalcTargetTemp .value, _data.mTrimmerCalcCurrentTemp .value, _data.mTrimmerUseLastDC .value, + _data.mTrimmerPreviousFlow .value, + _data.mTrimmerContolCounter .value, }; } @@ -46,6 +48,8 @@ if (GetValue(vByteArray, index, _data.mPrimaryCalcTargetTemp )) if (GetValue(vByteArray, index, _data.mTrimmerCalcCurrentTemp )) if (GetValue(vByteArray, index, _data.mTrimmerUseLastDC )) + if (GetValue(vByteArray, index, _data.mTrimmerPreviousFlow )) + if (GetValue(vByteArray, index, _data.mTrimmerContolCounter )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -58,6 +62,8 @@ 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; } } /*! @@ -78,5 +84,7 @@ data.mPrimaryCalcTargetTemp = _data.mPrimaryCalcTargetTemp .value; data.mTrimmerCalcCurrentTemp = _data.mTrimmerCalcCurrentTemp .value; data.mTrimmerUseLastDC = _data.mTrimmerUseLastDC .value; + data.mTrimmerPreviousFlow = _data.mTrimmerPreviousFlow .value; + data.mTrimmerContolCounter = _data.mTrimmerContolCounter .value; return data; } Index: sources/model/dg/data/MDGHeatersData.h =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/model/dg/data/MDGHeatersData.h (.../MDGHeatersData.h) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/model/dg/data/MDGHeatersData.h (.../MDGHeatersData.h) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -47,6 +47,8 @@ * | # 9:(F32) | \ref Data::mPrimaryCalcTargetTemp | * | #10:(F32) | \ref Data::mTrimmerCalcCurrentTemp | * | #11:(F32) | \ref Data::mTrimmerUseLastDC | + * | #12:(F32) | \ref Data::mTrimmerPreviousFlow | + * | #13:(U32) | \ref Data::mTrimmerContolCounter | * * \sa Data * @@ -77,6 +79,8 @@ Types::F32 mPrimaryCalcTargetTemp ; ///< Primary heater calculated target temperature Types::F32 mTrimmerCalcCurrentTemp ; ///< Trimmer heater calculated current temperature Types::U32 mTrimmerUseLastDC ; ///< Trimmer heater use last duty cycle + Types::F32 mTrimmerPreviousFlow ; ///< Trimmer previous flow + Types::U32 mTrimmerContolCounter ; ///< Trimmer control counter } _data; public: @@ -97,6 +101,8 @@ float mPrimaryCalcTargetTemp = 0; ///< Primary heater calculated target temperature float mTrimmerCalcCurrentTemp = 0; ///< Trimmer heater calculated current temperature quint32 mTrimmerUseLastDC = 0; ///< Trimmer heater use last duty cycle + float mTrimmerPreviousFlow = 0; ///< Trimmer previous flow + quint32 mTrimmerContolCounter = 0; ///< Trimmer control counter }; MDGHeaters () {} Index: sources/model/hd/adjustment/settings/MAdjustHDRequests.h =================================================================== diff -u -r6a06de0b01e39939cc4f6c541da88cb0c8cd2a1b -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision 6a06de0b01e39939cc4f6c541da88cb0c8cd2a1b) +++ sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -319,6 +319,35 @@ static Can::Can_Id canid () { return Can::eChlid_UI_HD; } }; + +/*! + * \brief The MAdjustHDResetReq class + * \details The DG/HD versions request model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:----:|:---:|:---:|:----:|:---------------------------:| + * | 0xB900 | 0x200 | Req | Y | UI | All | HD reset request | + * + * | Payload || + * | || + * | (N/A) || + * + */ +class MAdjustHDResetInSrvceModeReq : public MModel { +public: + + // disabled coco begin validated : Has been validated manually. + // This object is used statically for now, kept the logic for later usage. + QString toString() { + return toString({}); + } + // disabled coco end + static QString toString(const QVariantList &vParameters) { + return MModel::toString("HDResetInServiceMode", vParameters); + } + + static Can::Can_Id canid () { return Can::eChlid_UI_HD; } +}; } typedef Model:: MAdjustServiceModeReq AdjustServiceModeRequestData; @@ -330,3 +359,4 @@ typedef Model:: MAdjustUIPostFinalResultReq AdjustUIPostFinalResultRequestData; typedef Model:: MHDUsageInfoReq HDUsageInfoRequestData; typedef Model::MAdjustInstitutionalRecordReq AdjustInstitutionalRequestData; +typedef Model:: MAdjustHDResetInSrvceModeReq AdjustHDResetInSrvcRequestData; Index: sources/model/hd/data/MHDBloodLeakData.cpp =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/model/hd/data/MHDBloodLeakData.cpp (.../MHDBloodLeakData.cpp) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/model/hd/data/MHDBloodLeakData.cpp (.../MHDBloodLeakData.cpp) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -18,18 +18,24 @@ QVariantList MHDBloodLeakData::parameters() const { return { - _data.mBloodLeakStatus .value, - _data.mBloodLeakState .value, + _data.mBloodLeakStatus .value, + _data.mBloodLeakState .value, + _data.mBloodLeakPersistentCounter .value, + _data.mBloodLeakSerialCommState .value, }; } bool MHDBloodLeakData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if (GetValue(vByteArray, index, _data.mBloodLeakStatus )) if (GetValue(vByteArray, index, _data.mBloodLeakState )) + if (GetValue(vByteArray, index, _data.mBloodLeakPersistentCounter )) + if (GetValue(vByteArray, index, _data.mBloodLeakSerialCommState )) 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; } } /*! @@ -39,8 +45,10 @@ */ MHDBloodLeakData::Data MHDBloodLeakData::data() const{ Data data; - data.mBloodLeakStatus = _data.mBloodLeakStatus .value; - data.mBloodLeakState = _data.mBloodLeakState .value; + data.mBloodLeakStatus = _data.mBloodLeakStatus .value; + data.mBloodLeakState = _data.mBloodLeakState .value; + data.mBloodLeakPersistentCounter = _data.mBloodLeakPersistentCounter .value; + data.mBloodLeakSerialCommState = _data.mBloodLeakSerialCommState .value; return data; } Index: sources/model/hd/data/MHDBloodLeakData.h =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/model/hd/data/MHDBloodLeakData.h (.../MHDBloodLeakData.h) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/model/hd/data/MHDBloodLeakData.h (.../MHDBloodLeakData.h) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -40,6 +40,8 @@ * | || * | #01:(U32) | \ref Data::mBloodLeakStatus | * | #02:(U32) | \ref Data::mBloodLeakState | + * | #03:(U32) | \ref Data::mBloodLeakPersistentCounter | + * | #04:(U32) | \ref Data::mBloodLeakSerialCommState | * * \sa Data * @@ -61,6 +63,8 @@ struct { Types::U32 mBloodLeakStatus ; Types::U32 mBloodLeakState ; + Types::U32 mBloodLeakPersistentCounter ; + Types::U32 mBloodLeakSerialCommState ; } _data; public: @@ -72,6 +76,8 @@ struct Data { quint32 mBloodLeakStatus = 0; quint32 mBloodLeakState = 0; + quint32 mBloodLeakPersistentCounter = 0; + quint32 mBloodLeakSerialCommState = 0; }; MHDBloodLeakData () { } Index: sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp (.../MTreatmentBloodFlowData.cpp) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp (.../MTreatmentBloodFlowData.cpp) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -27,6 +27,7 @@ _data.mPWMDutyCycle .value, _data.mRotorCount .value, _data.mPresFlow .value, + _data.mRotorHall .value, }; } @@ -41,6 +42,7 @@ if (GetValue(vByteArray, index, _data.mPWMDutyCycle )) if (GetValue(vByteArray, index, _data.mRotorCount )) if (GetValue(vByteArray, index, _data.mPresFlow )) + if (GetValue(vByteArray, index, _data.mRotorHall )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -51,6 +53,7 @@ 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; } } /*! @@ -70,5 +73,6 @@ data.mPWMDutyCycle = _data.mPWMDutyCycle .value; data.mRotorCount = _data.mRotorCount .value; data.mPresFlow = _data.mPresFlow .value; + data.mRotorHall = _data.mRotorHall .value; return data; } Index: sources/model/hd/data/treatment/MTreatmentBloodFlowData.h =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/model/hd/data/treatment/MTreatmentBloodFlowData.h (.../MTreatmentBloodFlowData.h) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/model/hd/data/treatment/MTreatmentBloodFlowData.h (.../MTreatmentBloodFlowData.h) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -35,15 +35,16 @@ * * | Payload || * | || - * | #1:(S32) | \ref Data::mFlowSetPoint | - * | #2:(F32) | \ref Data::mMeasuredFlow | - * | #3:(F32) | \ref Data::mRotorSpeed | - * | #4:(F32) | \ref Data::mMotorSpeed | - * | #5:(F32) | \ref Data::mMotorCtlSpeed | - * | #6:(F32) | \ref Data::mMotorCtlCurrent | - * | #7:(F32) | \ref Data::mPWMDutyCycle | - * | #8:(U32) | \ref Data::mRotorCount | - * | #9:(U32) | \ref Data::mPresFlow | + * | #1 :(S32) | \ref Data::mFlowSetPoint | + * | #2 :(F32) | \ref Data::mMeasuredFlow | + * | #3 :(F32) | \ref Data::mRotorSpeed | + * | #4 :(F32) | \ref Data::mMotorSpeed | + * | #5 :(F32) | \ref Data::mMotorCtlSpeed | + * | #6 :(F32) | \ref Data::mMotorCtlCurrent | + * | #7 :(F32) | \ref Data::mPWMDutyCycle | + * | #8 :(U32) | \ref Data::mRotorCount | + * | #9 :(U32) | \ref Data::mPresFlow | + * | #10:(U32) | \ref Data::mRotorHall | * * \sa Data * @@ -70,6 +71,7 @@ Types::F32 mPWMDutyCycle ; ///< PWM Duty Cycle in % Types::U32 mRotorCount ; ///< Rotor Count Types::U32 mPresFlow ; ///< Prescribed flow rate + Types::U32 mRotorHall ; ///< Rotor hall sensor value } _data; QVariantList parameters() const override; @@ -88,6 +90,7 @@ float mPWMDutyCycle = 0; ///< PWM Duty Cycle in % quint32 mRotorCount = 0; ///< Rotor Count quint32 mPresFlow = 0; ///< Prescribed flow rate + quint32 mRotorHall = 0; ///< Rotor Hall Sensor Value }; MBloodFlow() { } Index: sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp (.../MTreatmentDialysateFlowData.cpp) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp (.../MTreatmentDialysateFlowData.cpp) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -27,6 +27,7 @@ _data.mPWMDutyCycle .value, _data.mRotorCount .value, _data.mPresFlow .value, + _data.mRotorHall .value, }; } @@ -41,6 +42,7 @@ if (GetValue(vByteArray, index, _data.mPWMDutyCycle )) if (GetValue(vByteArray, index, _data.mRotorCount )) if (GetValue(vByteArray, index, _data.mPresFlow )) + if (GetValue(vByteArray, index, _data.mRotorHall )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -51,6 +53,7 @@ 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; } } /*! @@ -70,5 +73,6 @@ data.mPWMDutyCycle = _data.mPWMDutyCycle .value; data.mRotorCount = _data.mRotorCount .value; data.mPresFlow = _data.mPresFlow .value; + data.mRotorHall = _data.mRotorHall .value; return data; } Index: sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h (.../MTreatmentDialysateFlowData.h) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h (.../MTreatmentDialysateFlowData.h) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -36,15 +36,16 @@ * * | Payload || * | || - * | #1:(S32) | \ref Data::mFlowSetPoint | - * | #2:(F32) | \ref Data::mMeasuredFlow | - * | #3:(F32) | \ref Data::mRotorSpeed | - * | #4:(F32) | \ref Data::mMotorSpeed | - * | #5:(F32) | \ref Data::mMotorCtlSpeed | - * | #6:(F32) | \ref Data::mMotorCtlCurrent | - * | #7:(F32) | \ref Data::mPWMDutyCycle | - * | #8:(U32) | \ref Data::mRotorCount | - * | #9:(U32) | \ref Data::mPresFlow | + * | #1 :(S32) | \ref Data::mFlowSetPoint | + * | #2 :(F32) | \ref Data::mMeasuredFlow | + * | #3 :(F32) | \ref Data::mRotorSpeed | + * | #4 :(F32) | \ref Data::mMotorSpeed | + * | #5 :(F32) | \ref Data::mMotorCtlSpeed | + * | #6 :(F32) | \ref Data::mMotorCtlCurrent | + * | #7 :(F32) | \ref Data::mPWMDutyCycle | + * | #8 :(U32) | \ref Data::mRotorCount | + * | #9 :(U32) | \ref Data::mPresFlow | + * | #10:(U32) | \ref Data::mRotorHall | * * \sa Data * @@ -73,6 +74,7 @@ Types::F32 mPWMDutyCycle ; ///< PWM Duty Cycle in % Types::U32 mRotorCount ; ///< Rotor Count Types::U32 mPresFlow ; ///< Prescribed flow rate + Types::U32 mRotorHall ; ///< Rotor hall sensor value } _data; public: @@ -90,6 +92,7 @@ float mPWMDutyCycle = 0; ///< PWM Duty Cycle in % quint32 mRotorCount = 0; ///< Rotor Count quint32 mPresFlow = 0; ///< Prescribed flow rate + quint32 mRotorHall = 0; ///< Rotor hall sensor value }; MDialysateFlow() { } Index: sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -26,6 +26,10 @@ _data.mArterialLimitHigh .value, _data.mVenousLimitLow .value, _data.mVenousLimitHigh .value, + _data.mArtLongFilter .value, + _data.mVenousLongFilter .value, + _data.mBloodOcclLongFilter .value, + _data.mPartialOcclBaseline .value, }; } @@ -39,6 +43,10 @@ if (GetValue(vByteArray, index, _data.mArterialLimitHigh )) if (GetValue(vByteArray, index, _data.mVenousLimitLow )) if (GetValue(vByteArray, index, _data.mVenousLimitHigh )) + if (GetValue(vByteArray, index, _data.mArtLongFilter )) + if (GetValue(vByteArray, index, _data.mVenousLongFilter )) + if (GetValue(vByteArray, index, _data.mBloodOcclLongFilter )) + if (GetValue(vByteArray, index, _data.mPartialOcclBaseline )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -48,6 +56,10 @@ 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; } } /*! @@ -57,13 +69,17 @@ */ MPressureOcclusion::Data MPressureOcclusion::data() const { Data data; - data.mArterialPressure = _data.mArterialPressure .value; - data.mVenousPressure = _data.mVenousPressure .value; - data.mBloodPumpOcclusion = _data.mBloodPumpOcclusion .value; - data.mPressureLimitState = _data.mPressureLimitState .value; - data.mArterialLimitLow = _data.mArterialLimitLow .value; - data.mArterialLimitHigh = _data.mArterialLimitHigh .value; - data.mVenousLimitLow = _data.mVenousLimitLow .value; - data.mVenousLimitHigh = _data.mVenousLimitHigh .value; + data.mArterialPressure = _data.mArterialPressure .value; + data.mVenousPressure = _data.mVenousPressure .value; + data.mBloodPumpOcclusion = _data.mBloodPumpOcclusion .value; + data.mPressureLimitState = _data.mPressureLimitState .value; + data.mArterialLimitLow = _data.mArterialLimitLow .value; + data.mArterialLimitHigh = _data.mArterialLimitHigh .value; + data.mVenousLimitLow = _data.mVenousLimitLow .value; + data.mVenousLimitHigh = _data.mVenousLimitHigh .value; + data.mArtLongFilter = _data.mArtLongFilter .value; + data.mVenousLongFilter = _data.mVenousLongFilter .value; + data.mBloodOcclLongFilter = _data.mBloodOcclLongFilter .value; + data.mPartialOcclBaseline = _data.mPartialOcclBaseline .value; return data; } Index: sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -36,14 +36,18 @@ * * | Payload || * | || - * | #1:(F32) | \ref Data::mArterialPressure | - * | #2:(F32) | \ref Data::mVenousPressure | - * | #3:(U32) | \ref Data::mBloodPumpOcclusion | - * | #4:(U32) | \ref Data::mPressureLimitState | - * | #5:(U32) | \ref Data::mArterialLimitLow | - * | #6:(U32) | \ref Data::mArterialLimitHigh | - * | #7:(U32) | \ref Data::mVenousLimitLow | - * | #8:(U32) | \ref Data::mVenousLimitHigh | + * | #1: (F32) | \ref Data::mArterialPressure | + * | #2: (F32) | \ref Data::mVenousPressure | + * | #3: (U32) | \ref Data::mBloodPumpOcclusion | + * | #4: (U32) | \ref Data::mPressureLimitState | + * | #5: (S32) | \ref Data::mArterialLimitLow | + * | #6: (S32) | \ref Data::mArterialLimitHigh | + * | #7: (S32) | \ref Data::mVenousLimitLow | + * | #8: (S32) | \ref Data::mVenousLimitHigh | + * | #9: (F32) | \ref Data::mArtLongFilter | + * | #10:(F32) | \ref Data::mVenousLongFilter | + * | #11:(F32) | \ref Data::mBloodOcclLongFilter | + * | #12:(F32) | \ref Data::mPartialOcclBaseline | * * \sa Data * @@ -71,6 +75,10 @@ Types::S32 mArterialLimitHigh ; ///< Current arterial maximum pressure limit (mmHg) Types::S32 mVenousLimitLow ; ///< Current venous minimum pressure limit (mmHg) Types::S32 mVenousLimitHigh ; ///< Current venous maximum pressure limit (mmHg) + Types::F32 mArtLongFilter ; ///< Arterial long filter (mmHg) + Types::F32 mVenousLongFilter ; ///< Venous long filter (mmHg) + Types::F32 mBloodOcclLongFilter ; ///< Blood pump occlusion long filter + Types::F32 mPartialOcclBaseline ; ///< Partial Occlusion base line } _data; public: @@ -87,7 +95,11 @@ qint32 mArterialLimitLow = 0; qint32 mArterialLimitHigh = 0; qint32 mVenousLimitLow = 0; - qint32 mVenousLimitHigh = 0; + qint32 mVenousLimitHigh = 0; + float mArtLongFilter = 0; + float mVenousLongFilter = 0; + float mBloodOcclLongFilter = 0; + float mPartialOcclBaseline = 0; }; MPressureOcclusion () { } Index: sources/view/dg/data/VDGHeatersData.cpp =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/view/dg/data/VDGHeatersData.cpp (.../VDGHeatersData.cpp) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/view/dg/data/VDGHeatersData.cpp (.../VDGHeatersData.cpp) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -32,4 +32,6 @@ primaryCalcTargetTemp ( vData.mPrimaryCalcTargetTemp ); trimmerCalcCurrentTemp ( vData.mTrimmerCalcCurrentTemp ); trimmerUseLastDC ( vData.mTrimmerUseLastDC ); + trimmerPreviousFlow ( vData.mTrimmerPreviousFlow ); + trimmerControlCounter ( vData.mTrimmerContolCounter ); } Index: sources/view/dg/data/VDGHeatersData.h =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/view/dg/data/VDGHeatersData.h (.../VDGHeatersData.h) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/view/dg/data/VDGHeatersData.h (.../VDGHeatersData.h) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -47,6 +47,8 @@ PROPERTY( float , primaryCalcTargetTemp , 0) PROPERTY( float , trimmerCalcCurrentTemp , 0) PROPERTY( quint32 , trimmerUseLastDC , 0) + PROPERTY( float , trimmerPreviousFlow , 0) + PROPERTY( quint32 , trimmerControlCounter , 0) VIEW_DEC(VDGHeaters, DGHeatersData) }; Index: sources/view/hd/data/VHDBloodLeakData.cpp =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/view/hd/data/VHDBloodLeakData.cpp (.../VHDBloodLeakData.cpp) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/view/hd/data/VHDBloodLeakData.cpp (.../VHDBloodLeakData.cpp) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -22,4 +22,6 @@ void VHDBloodLeak::onActionReceive(const HDBloodLeakData &vData) { bloodLeakStatus (vData.mBloodLeakStatus ); bloodLeakState (vData.mBloodLeakState ); + bloodLeakPersistentCounter (vData.mBloodLeakPersistentCounter ); + bloodLeakSerialCommState (vData.mBloodLeakSerialCommState ); } Index: sources/view/hd/data/VHDBloodLeakData.h =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/view/hd/data/VHDBloodLeakData.h (.../VHDBloodLeakData.h) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/view/hd/data/VHDBloodLeakData.h (.../VHDBloodLeakData.h) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -37,6 +37,8 @@ PROPERTY( quint32 , bloodLeakStatus , 0) PROPERTY( quint32 , bloodLeakState , 0) + PROPERTY( quint32 , bloodLeakPersistentCounter , 0) + PROPERTY( quint32 , bloodLeakSerialCommState , 0) VIEW_DEC(VHDBloodLeak, HDBloodLeakData) }; Index: sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp (.../VTreatmentBloodFlow.cpp) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp (.../VTreatmentBloodFlow.cpp) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -30,4 +30,5 @@ bloodFlow_PWMDutyCycle (vData.mPWMDutyCycle ); bloodFlow_RotorCount (vData.mRotorCount ); bloodFlow_PresFlow (vData.mPresFlow ); + bloodFlow_RotorHall (vData.mRotorHall ); } Index: sources/view/hd/data/treatment/VTreatmentBloodFlow.h =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/view/hd/data/treatment/VTreatmentBloodFlow.h (.../VTreatmentBloodFlow.h) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/view/hd/data/treatment/VTreatmentBloodFlow.h (.../VTreatmentBloodFlow.h) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -45,6 +45,7 @@ PROPERTY( float , bloodFlow_PWMDutyCycle , 0) PROPERTY( quint32, bloodFlow_RotorCount , 0) PROPERTY( quint32, bloodFlow_PresFlow , 0) + PROPERTY( quint32, bloodFlow_RotorHall , 0) VIEW_DEC(VTreatmentBloodFlow, BloodFlowData) }; Index: sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp (.../VTreatmentDialysateFlow.cpp) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp (.../VTreatmentDialysateFlow.cpp) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -30,4 +30,5 @@ dialysateFlow_PWMDutyCycle (vData.mPWMDutyCycle ); dialysateFlow_RotorCount (vData.mRotorCount ); dialysateFlow_PresFlow (vData.mPresFlow ); + dialysateFlow_RotorHall (vData.mRotorHall ); } Index: sources/view/hd/data/treatment/VTreatmentDialysateFlow.h =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/view/hd/data/treatment/VTreatmentDialysateFlow.h (.../VTreatmentDialysateFlow.h) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/view/hd/data/treatment/VTreatmentDialysateFlow.h (.../VTreatmentDialysateFlow.h) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -45,6 +45,7 @@ PROPERTY( float , dialysateFlow_PWMDutyCycle , 0) PROPERTY( quint32, dialysateFlow_RotorCount , 0) PROPERTY( quint32, dialysateFlow_PresFlow , 0) + PROPERTY( quint32, dialysateFlow_RotorHall , 0) VIEW_DEC(VTreatmentDialysateFlow, DialysateFlowData) }; Index: sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp (.../VTreatmentPressureOcclusion.cpp) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp (.../VTreatmentPressureOcclusion.cpp) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -21,12 +21,16 @@ void VTreatmentPressureOcclusion::onActionReceive(const PressureOcclusionData &vData) { - arterialPressure ( vData.mArterialPressure ); - venousPressure ( vData.mVenousPressure ); - bloodPumpOcclusion ( vData.mBloodPumpOcclusion ); - pressureLimitState ( vData.mPressureLimitState ); - arterialPressureLimitLowerBound ( vData.mArterialLimitLow ); - arterialPressureLimitUpperBound ( vData.mArterialLimitHigh ); - venousPressureLimitLowerBound ( vData.mVenousLimitLow ); - venousPressureLimitUpperBound ( vData.mVenousLimitHigh ); + arterialPressure ( vData.mArterialPressure ); + venousPressure ( vData.mVenousPressure ); + bloodPumpOcclusion ( vData.mBloodPumpOcclusion ); + pressureLimitState ( vData.mPressureLimitState ); + arterialPressureLimitLowerBound ( vData.mArterialLimitLow ); + arterialPressureLimitUpperBound ( vData.mArterialLimitHigh ); + venousPressureLimitLowerBound ( vData.mVenousLimitLow ); + venousPressureLimitUpperBound ( vData.mVenousLimitHigh ); + arterialPressureLongFilter ( vData.mArtLongFilter ); + venousLongFilter ( vData.mVenousLongFilter ); + bloodPumpOcclLongFilter ( vData.mBloodOcclLongFilter ); + partialOcclBaseLine ( vData.mPartialOcclBaseline ); } Index: sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -44,6 +44,10 @@ PROPERTY( qint32 , arterialPressureLimitUpperBound , 0) PROPERTY( qint32 , venousPressureLimitLowerBound , 0) PROPERTY( qint32 , venousPressureLimitUpperBound , 0) + PROPERTY( float , arterialPressureLongFilter , 0) + PROPERTY( float , venousLongFilter , 0) + PROPERTY( float , bloodPumpOcclLongFilter , 0) + PROPERTY( float , partialOcclBaseLine , 0) VIEW_DEC(VTreatmentPressureOcclusion, PressureOcclusionData) }; Index: sources/view/settings/VDuetRoWaterDG.cpp =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/view/settings/VDuetRoWaterDG.cpp (.../VDuetRoWaterDG.cpp) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/view/settings/VDuetRoWaterDG.cpp (.../VDuetRoWaterDG.cpp) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -38,27 +38,22 @@ void View::VDuetRoWaterDG::onActionReceive(const DuetRoWaterStatDGqData & ) // 0xC300 : 195 { - _post = true; doAdjustment( _status ); } void View::VDuetRoWaterDG::onActionReceive(const DuetRoWaterModeDGrData &vData) // 0xC400 : 196 { adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); + adjustment_FWValue ( vData.mFirmwareValue ); + // Accept the value that has been sent + status( vData.mFirmwareValue ); + if (vData.mAccepted) { - status( _data.mStatus ); // apply the request notification(""); } else { - if ( _post ) { - status( ! _status ); // on post what UI currently has, is rejected, so UI should change to opposite. - _post = false; - } - else { - status( _status ); // use the old value to emit signal for UI - } notification(tr("The RO Water Mode change request has been rejected [%1]").arg(vData.mReason)); } @@ -81,7 +76,6 @@ */ void View::VDuetRoWaterDG::onActionReceive(const SettingsData &) { - _post = true; QString mCategory = Storage::Settings_Category_SettingsSystem; FROMVARIANT( status, "RoWaterMode", "RoWaterMode", UInt ); } Index: sources/view/settings/VDuetRoWaterDG.h =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -re305f7fba8aa7293eedc322bb96306ca7e1380d7 --- sources/view/settings/VDuetRoWaterDG.h (.../VDuetRoWaterDG.h) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/view/settings/VDuetRoWaterDG.h (.../VDuetRoWaterDG.h) (revision e305f7fba8aa7293eedc322bb96306ca7e1380d7) @@ -76,15 +76,15 @@ Q_OBJECT DuetRoWaterModeUIiData _data; - bool _post = true; // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI // has been manually tested that it works perfectly fine - TRIGGER ( bool , adjustment , 0) + TRIGGER ( bool , adjustment , 0) - TRIGGER ( bool , status , 0) - PROPERTY( QString , notification ,"") + TRIGGER ( bool , status , 0) + PROPERTY( QString , notification ,"") + PROPERTY( quint32 , adjustment_FWValue , 0) VIEW_DEC_CLASS(VDuetRoWaterDG) VIEW_DEC_SLOT(DuetRoWaterStatDGqData)