Index: denali.pro =================================================================== diff -u -r8be0073f796109578435eaa14edc7d3b9a2352da -rba928149acf9501b0ab751eab84f4b7e8ac05353 --- denali.pro (.../denali.pro) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) +++ denali.pro (.../denali.pro) (revision ba928149acf9501b0ab751eab84f4b7e8ac05353) @@ -114,7 +114,6 @@ \ # Controllers sources/ApplicationController.h \ sources/device/DeviceController.h \ - sources/model/ui/data/MUIBloodPressureData.h \ sources/storage/Settings.h \ sources/storage/TreatmentLog.h \ sources/view/hd/data/post/VHDPOSTData.h \ @@ -136,6 +135,7 @@ sources/model/settings/MSettings.h \ sources/model/settings/MWifiNetwork.h \ sources/model/settings/MBluetooth.h \ + sources/model/ui/data/MUIBloodPressureData.h \ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h \ sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.h \ @@ -191,6 +191,7 @@ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h \ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h \ \ # ---------- Models - HD - Adjustment - Disinfeection + sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeRequests.h \ sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h \ sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.h \ \ # ---------- Models - HD - Data - Pre-Treatment - Progress Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r8be0073f796109578435eaa14edc7d3b9a2352da -rba928149acf9501b0ab751eab84f4b7e8ac05353 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision ba928149acf9501b0ab751eab84f4b7e8ac05353) @@ -746,6 +746,19 @@ /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the Disinfect mode request Denali message. + * \param vData - Data model contains the initiate/cancel boolean disinfection mode + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDisinfectModeRequestData &vData) +{ + QVariantList mData; + mData += vData.mInititate; + onActionTransmit(GuiActionType::ID_AdjustDisinfectModeReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the UI power on self test final result * \param vData - Data model contains the final result of the UI POST * \return void Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -r8be0073f796109578435eaa14edc7d3b9a2352da -rba928149acf9501b0ab751eab84f4b7e8ac05353 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision ba928149acf9501b0ab751eab84f4b7e8ac05353) @@ -143,6 +143,7 @@ GuiActionType::ID_AdjustPatientDisconnectionConfirmReq , GuiActionType::ID_AdjustDisposablesRemovalConfirmReq , // Disinfect + GuiActionType::ID_AdjustDisinfectModeReq , GuiActionType::ID_AdjustDisinfectStartReq , // Settings GuiActionType::ID_AdjustServiceModeReq , Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r8be0073f796109578435eaa14edc7d3b9a2352da -rba928149acf9501b0ab751eab84f4b7e8ac05353 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision ba928149acf9501b0ab751eab84f4b7e8ac05353) @@ -239,7 +239,9 @@ {Gui::GuiActionType::ID_AdjustDGDateTimeRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- Disinfect - {Gui::GuiActionType::ID_AdjustDisinfectStartReq , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustDisinfectModeReq , 1 * 4 }, // 1 parameter 4bytes + {Gui::GuiActionType::ID_AdjustDisinfectModeRsp , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustDisinfectStartReq , 1 * 4 }, // 1 parameter 4bytes {Gui::GuiActionType::ID_AdjustDisinfectStartRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- {Gui::GuiActionType::ID_CANBusFaultCount , 1 }, Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r8be0073f796109578435eaa14edc7d3b9a2352da -rba928149acf9501b0ab751eab84f4b7e8ac05353 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision ba928149acf9501b0ab751eab84f4b7e8ac05353) @@ -281,6 +281,7 @@ case Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisposablesRemovalConfirmRequestData ); break; case Gui::GuiActionType::ID_AdjustTreatmentLogReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustTreatmentLogRequestData ); break; // Disinfection + case Gui::GuiActionType::ID_AdjustDisinfectModeReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDisinfectModeRequestData ); break; case Gui::GuiActionType::ID_AdjustDisinfectStartReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDisinfectStartRequestData ); break; // alarms case Gui::GuiActionType::ID_AlarmSilenceReq : INTERPRET_TRANSMIT_MESSAGE(AlarmSilenceRequestData ); break; Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml =================================================================== diff -u -r8be0073f796109578435eaa14edc7d3b9a2352da -rba928149acf9501b0ab751eab84f4b7e8ac05353 --- sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) +++ sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision ba928149acf9501b0ab751eab84f4b7e8ac05353) @@ -72,9 +72,8 @@ TouchRect { text.text: _root.chemicalTitle ; onClicked: { doDisinfectChemical () } } ] instructionBased : true - header.confirmVisible : vDisinfectAdjustDisinfect .hasCancel // if initiated by User from setting can be canceled. - header.confirmText.text : qsTr("Cancel") - onConfirmClicked : { vDisinfectAdjustDisinfect .doCancel () } + header.backVisible : vDisinfectAdjustDisinfect .hasCancel // if initiated by User from setting can be canceled. + onBackClicked : { vDisinfectAdjustDisinfect .doDisinfectCancel () } } DisinfectBase { id : _disinfectFlush Index: sources/model/MModel.h =================================================================== diff -u -r8be0073f796109578435eaa14edc7d3b9a2352da -rba928149acf9501b0ab751eab84f4b7e8ac05353 --- sources/model/MModel.h (.../MModel.h) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) +++ sources/model/MModel.h (.../MModel.h) (revision ba928149acf9501b0ab751eab84f4b7e8ac05353) @@ -135,6 +135,7 @@ #include "MTreatmentLogEventData.h" // Disinfection +#include "MDisinfectAdjustModeRequests.h" #include "MDisinfectAdjustStartRequests.h" #include "MDisinfectAdjustResponse.h" @@ -351,6 +352,7 @@ REGISTER_METATYPE( AdjustPatientConnectionConfirmRequestData ) \ REGISTER_METATYPE( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ + REGISTER_METATYPE( AdjustDisinfectModeRequestData ) \ REGISTER_METATYPE( AdjustDisinfectStartRequestData ) \ \ /* Alarms */ \ @@ -585,6 +587,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectStartRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmSilenceRequestData ) \ @@ -740,6 +743,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisinfectModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisinfectStartRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodDialysateRequestData ) \ @@ -790,6 +794,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisinfectModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisinfectStartRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodDialysateRequestData ) \ @@ -840,6 +845,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisinfectModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisinfectStartRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodDialysateRequestData ) \ Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeRequests.h =================================================================== diff -u -r8be0073f796109578435eaa14edc7d3b9a2352da -rba928149acf9501b0ab751eab84f4b7e8ac05353 --- sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeRequests.h (.../MDisinfectAdjustModeRequests.h) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) +++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeRequests.h (.../MDisinfectAdjustModeRequests.h) (revision ba928149acf9501b0ab751eab84f4b7e8ac05353) @@ -5,11 +5,11 @@ * 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 MDisinfectAdjustRequests.h + * \file MDisinfectAdjustModeRequests.h * \author (last) Behrouz NematiPour - * \date (last) 18-Apr-2022 * \author (original) Behrouz NematiPour - * \date (original) 18-Apr-2021 + * \date (last) 16-Aug-2022 + * \date (original) 16-Aug-2021 * */ @@ -35,33 +35,30 @@ */ /*! - * \brief The MAdjustDisinfectReq class + * \brief The MAdjustDisinfectModeReq class * \details The model to request heat/chemical disinfect * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:| - * |0x7F00| 0x100 | Req | Y | UI | HD | Flush, Heat/Chemical Disinfect Request | + * |0x9A00| 0x100 | Req | Y | UI | HD | Disinfect Mode Request | * * | Payload || * | || - * | #1:(U32) | \ref mState | * */ -class MAdjustDisinfectReq : public MModel { +class MAdjustDisinfectModeReq : public MModel { public: - GuiDisinfectDGStates mState = GuiDisinfectDGStates::DG_DISINFECT_NOT_RUNNING_STATE; + bool mInititate = true; // if true means initiate the disinfection mode , false means cancel. - // 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({mState}); + return toString({mInititate}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { - return MModel::toString("DisinfectStart", vParameters); + return MModel::toString("DisinfectMode", vParameters); } }; } -typedef Model:: MAdjustDisinfectReq AdjustDisinfectRequestData; +typedef Model::MAdjustDisinfectModeReq AdjustDisinfectModeRequestData; Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h =================================================================== diff -u -r8be0073f796109578435eaa14edc7d3b9a2352da -rba928149acf9501b0ab751eab84f4b7e8ac05353 --- sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h (.../MDisinfectAdjustStartRequests.h) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) +++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h (.../MDisinfectAdjustStartRequests.h) (revision ba928149acf9501b0ab751eab84f4b7e8ac05353) @@ -5,7 +5,7 @@ * 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 MDisinfectAdjustRequests.h + * \file MDisinfectAdjustStartRequests.h * \author (last) Behrouz NematiPour * \date (last) 18-Apr-2022 * \author (original) Behrouz NematiPour Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp =================================================================== diff -u -r8be0073f796109578435eaa14edc7d3b9a2352da -rba928149acf9501b0ab751eab84f4b7e8ac05353 --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision ba928149acf9501b0ab751eab84f4b7e8ac05353) @@ -24,6 +24,8 @@ * \details All the class signal/slot connections are defined here. */ void View::VDisinfectAdjustDisinfect::initConnections() { + ADJUST_VIEW_CONNECTION(AdjustDisinfectModeRequestData); + ADJUST_VIEW_CONNECTION(AdjustDisinfectStartRequestData); ACTION_VIEW_CONNECTION(AdjustDisinfectResponseData); } @@ -47,6 +49,8 @@ case GuiDisinfectDGStates::DG_DISINFECT_CHEM_STATE : adjustment_DisinfectStartChemical (true); break; default: break; } + + hasCancel(vData.mAccepted); } /*! @@ -55,7 +59,10 @@ */ void View::VDisinfectAdjustDisinfect::doDisinfectInitiate() { - + hasCancel(true); + AdjustDisinfectModeRequestData vData; + vData.mInititate = true; + emit didAdjustment(vData); } /*! @@ -64,7 +71,9 @@ */ void View::VDisinfectAdjustDisinfect::doDisinfectCancel() { - + AdjustDisinfectModeRequestData vData; + vData.mInititate = false; + emit didAdjustment(vData); } /*! Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h =================================================================== diff -u -r8be0073f796109578435eaa14edc7d3b9a2352da -rba928149acf9501b0ab751eab84f4b7e8ac05353 --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h (.../VDisinfectAdjustDisinfect.h) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h (.../VDisinfectAdjustDisinfect.h) (revision ba928149acf9501b0ab751eab84f4b7e8ac05353) @@ -19,6 +19,7 @@ // Project #include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" +#include "MDisinfectAdjustModeRequests.h" #include "MDisinfectAdjustStartRequests.h" #include "MDisinfectAdjustResponse.h" @@ -62,6 +63,13 @@ signals: /*! * \brief didAdjustment + * \details the notification signal to send the user's Disinfect Mode Request + * \param vData - data model includes request information + */ + void didAdjustment(const AdjustDisinfectModeRequestData &vData); + + /*! + * \brief didAdjustment * \details the notification signal to send the user's Disinfect Request * \param vData - data model includes request information */