Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r26433c42f2efa2cb18af95f523581c7eeeff049d -r6760e0994f220fb0e31f675d6b3b74477560bdde --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 6760e0994f220fb0e31f675d6b3b74477560bdde) @@ -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 -r26433c42f2efa2cb18af95f523581c7eeeff049d -r6760e0994f220fb0e31f675d6b3b74477560bdde --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 6760e0994f220fb0e31f675d6b3b74477560bdde) @@ -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 -r988d4037838bb83205e1b98e1323846271e58571 -r6760e0994f220fb0e31f675d6b3b74477560bdde --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 988d4037838bb83205e1b98e1323846271e58571) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 6760e0994f220fb0e31f675d6b3b74477560bdde) @@ -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 -r26433c42f2efa2cb18af95f523581c7eeeff049d -r6760e0994f220fb0e31f675d6b3b74477560bdde --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 6760e0994f220fb0e31f675d6b3b74477560bdde) @@ -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 -r26433c42f2efa2cb18af95f523581c7eeeff049d -r6760e0994f220fb0e31f675d6b3b74477560bdde --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 6760e0994f220fb0e31f675d6b3b74477560bdde) @@ -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 -r26433c42f2efa2cb18af95f523581c7eeeff049d -r6760e0994f220fb0e31f675d6b3b74477560bdde --- sources/model/MModel.h (.../MModel.h) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) +++ sources/model/MModel.h (.../MModel.h) (revision 6760e0994f220fb0e31f675d6b3b74477560bdde) @@ -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/hd/adjustment/settings/MAdjustHDRequests.h =================================================================== diff -u -r26433c42f2efa2cb18af95f523581c7eeeff049d -r6760e0994f220fb0e31f675d6b3b74477560bdde --- sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) +++ sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision 6760e0994f220fb0e31f675d6b3b74477560bdde) @@ -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;