Index: denali.pro =================================================================== diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -r3e5cdca5de3ac46619325bf1e37c572d729d5fa9 --- denali.pro (.../denali.pro) (revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7) +++ denali.pro (.../denali.pro) (revision 3e5cdca5de3ac46619325bf1e37c572d729d5fa9) @@ -67,9 +67,10 @@ sources/model/MDGDebugText.h \ sources/model/MHDDebugText.h \ \ # ---------- Models - Alarm - sources/model/hd/alarm/MAlarmCleared.h \ - sources/model/hd/alarm/MAlarmTriggered.h \ sources/model/hd/alarm/MAlarmStatusData.h \ + sources/model/hd/alarm/MAlarmTriggered.h \ + sources/model/hd/alarm/MAlarmCleared.h \ + sources/model/hd/alarm/MAlarmClearedCondition.h \ \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/MTreatmentAdjustRequests.h \ sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h \ @@ -187,9 +188,10 @@ sources/model/MTreatmentParametersResp.cpp \ sources/model/MDGDebugText.cpp \ \ # ---------- Models - Alarm - sources/model/hd/alarm/MAlarmCleared.cpp \ - sources/model/hd/alarm/MAlarmTriggered.cpp \ sources/model/hd/alarm/MAlarmStatusData.cpp \ + sources/model/hd/alarm/MAlarmTriggered.cpp \ + sources/model/hd/alarm/MAlarmCleared.cpp \ + sources/model/hd/alarm/MAlarmClearedCondition.cpp \ \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp \ Index: denali.pro.user =================================================================== diff -u -r1d43ff790e6a3fb03d371bb5bde9c2d432d299b6 -r3e5cdca5de3ac46619325bf1e37c572d729d5fa9 --- denali.pro.user (.../denali.pro.user) (revision 1d43ff790e6a3fb03d371bb5bde9c2d432d299b6) +++ denali.pro.user (.../denali.pro.user) (revision 3e5cdca5de3ac46619325bf1e37c572d729d5fa9) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rf325fa7bac94c7c0dcc9ed4185273e94669e17b7 -r3e5cdca5de3ac46619325bf1e37c572d729d5fa9 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision f325fa7bac94c7c0dcc9ed4185273e94669e17b7) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 3e5cdca5de3ac46619325bf1e37c572d729d5fa9) @@ -312,19 +312,6 @@ onActionTransmit(GuiActionType::ID_AlarmSilenceReq, mData); } -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Alarm Acknowledge Request message. - * \param vData - Data model contains the user acknowledge request information. - * \return void - */ -void MessageDispatcher::onAdjustment(const AlarmAcknowledgeRequestData &vData) -{ - QVariantList mData; - mData += vData.alarmID; - onActionTransmit(GuiActionType::ID_AlarmUserAckReq, mData); -} - /** * \details This method transmits the User Action Denali message. * \param vData - Data model contains User Action on the alarm dialog. @@ -339,6 +326,19 @@ /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the Alarm Acknowledge Request message. + * \param vData - Data model contains the user acknowledge request information. + * \return void + */ +void MessageDispatcher::onAdjustment(const AlarmClearedConditionRequestData &vData) +{ + QVariantList mData; + mData += vData.alarmID; + onActionTransmit(GuiActionType::ID_AlarmClearedConditionReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the Confirm Treatment request message. * \param vData - Data model contains the confirm treatment request * \return void Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -r3e5cdca5de3ac46619325bf1e37c572d729d5fa9 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 3e5cdca5de3ac46619325bf1e37c572d729d5fa9) @@ -114,7 +114,9 @@ GuiActionType::ID_AdjustSalineReq , GuiActionType::ID_AdjustHeparinReq , GuiActionType::ID_AdjustPressuresLimitsReq , + GuiActionType::ID_AlarmUserActionReq , GuiActionType::ID_AlarmSilenceReq , + GuiActionType::ID_AlarmClearedConditionReq , }; public slots: Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r71784f783e4e2c0eadebef28eefb0fc53534ba66 -r3e5cdca5de3ac46619325bf1e37c572d729d5fa9 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 71784f783e4e2c0eadebef28eefb0fc53534ba66) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 3e5cdca5de3ac46619325bf1e37c572d729d5fa9) @@ -75,8 +75,9 @@ {Gui::GuiActionType::ID_AlarmStatus , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2bytes {Gui::GuiActionType::ID_AlarmTriggered , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AlarmCleared , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AlarmClearedConditionReq , 1 * 4 }, // 1 parameter each 4bytes // the same message 63:0x3F00 + {Gui::GuiActionType::ID_AlarmClearedConditionRsp , 1 * 4 }, // 1 parameter each 4bytes // the same message 63:0x3F00 {Gui::GuiActionType::ID_AlarmSilenceReq , 1 * 1 }, // 1 parameter each 1bytes - {Gui::GuiActionType::ID_AlarmUserAckReq , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AlarmUserActionReq , 1 * 4 }, // 1 parameter each 4bytes // ---- Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -reb23f842f5b153622da276cdd167d98ea4d7ef04 -r3e5cdca5de3ac46619325bf1e37c572d729d5fa9 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision eb23f842f5b153622da276cdd167d98ea4d7ef04) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 3e5cdca5de3ac46619325bf1e37c572d729d5fa9) @@ -217,21 +217,26 @@ break; case Gui::GuiActionType::ID_PowerOff : INTERPRET_RECEIVED_MESSAGE(AdjustPowerOffRequestData ); break; - case Gui::GuiActionType::ID_AdjustBloodDialysateReq : INTERPRET_RECEIVED_MESSAGE(AdjustBloodDialysateRequestData ); break; + // in-treatment case Gui::GuiActionType::ID_AdjustDurationReq : INTERPRET_RECEIVED_MESSAGE(AdjustDurationRequestData ); break; + case Gui::GuiActionType::ID_AdjustBloodDialysateReq : INTERPRET_RECEIVED_MESSAGE(AdjustBloodDialysateRequestData ); break; + case Gui::GuiActionType::ID_AdjustPressuresLimitsReq : INTERPRET_RECEIVED_MESSAGE(AdjustPressuresLimitsRequestData ); break; + case Gui::GuiActionType::ID_AdjustSalineReq : INTERPRET_RECEIVED_MESSAGE(AdjustSalineRequestData ); break; + case Gui::GuiActionType::ID_AdjustHeparinReq : INTERPRET_RECEIVED_MESSAGE(AdjustHeparinRequestData ); break; + // in-treatment - ultrafiltration case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationStateRequestData ); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationEditRequestData ); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationConfirmRequestData); break; - case Gui::GuiActionType::ID_AdjustSalineReq : INTERPRET_RECEIVED_MESSAGE(AdjustSalineRequestData ); break; - case Gui::GuiActionType::ID_AdjustHeparinReq : INTERPRET_RECEIVED_MESSAGE(AdjustHeparinRequestData ); break; - case Gui::GuiActionType::ID_AdjustPressuresLimitsReq : INTERPRET_RECEIVED_MESSAGE(AdjustPressuresLimitsRequestData ); break; - case Gui::GuiActionType::ID_AlarmSilenceReq : INTERPRET_RECEIVED_MESSAGE(AlarmSilenceRequestData ); break; - case Gui::GuiActionType::ID_AlarmUserAckReq : INTERPRET_RECEIVED_MESSAGE(AlarmAcknowledgeRequestData ); break; - case Gui::GuiActionType::ID_AlarmUserActionReq : INTERPRET_RECEIVED_MESSAGE(AlarmUserActionRequestData ); break; + // pre-Treatment case Gui::GuiActionType::ID_StartTreatmentReq : INTERPRET_RECEIVED_MESSAGE(StartTreatmentRequestData ); break; case Gui::GuiActionType::ID_ConfirmTreatmentReq : INTERPRET_RECEIVED_MESSAGE(ConfirmTreatmentRequestData ); break; case Gui::GuiActionType::ID_EndTreatmentReq : INTERPRET_RECEIVED_MESSAGE(EndTreatmentRequestData ); break; case Gui::GuiActionType::ID_CreateTreatmentReq : INTERPRET_RECEIVED_MESSAGE(AdjustTreatmentParametersRequestData ); break; + // alarms + case Gui::GuiActionType::ID_AlarmSilenceReq : INTERPRET_RECEIVED_MESSAGE(AlarmSilenceRequestData ); break; + case Gui::GuiActionType::ID_AlarmUserActionReq : INTERPRET_RECEIVED_MESSAGE(AlarmUserActionRequestData ); break; + case Gui::GuiActionType::ID_AlarmClearedConditionReq : INTERPRET_RECEIVED_MESSAGE(AlarmClearedConditionRequestData ); break; + default: QString mActionIdHexString = Format::toHexString(vActionId); LOG_DEBUG(mSenderID + tr("Unknown transmit Message with ID '%1'").arg(mActionIdHexString)); @@ -314,19 +319,14 @@ case Gui::GuiActionType::ID_Acknow : ok = true; break; // TODO : implement notify<>() case Gui::GuiActionType::ID_PowerOff : ok = notify(vMessage, vData, Gui::GuiActionType::ID_PowerOff ); break; case Gui::GuiActionType::ID_ShuttingDown : ok = true; LOG_EVENT("HD,ShuttingDown"); break; // TODO : implement notify<>() - - case Gui::GuiActionType::ID_AlarmTriggered : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmTriggered ); break; - case Gui::GuiActionType::ID_AlarmCleared : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmCleared ); break; - case Gui::GuiActionType::ID_AlarmStatus : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus ); break; - case Gui::GuiActionType::ID_CreateTreatmentRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_CreateTreatmentRsp ); break; // Adjustment Response Messages case Gui::GuiActionType::ID_AdjustDurationRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationRsp ); break; case Gui::GuiActionType::ID_AdjustBloodDialysateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodDialysateRsp ); break; + case Gui::GuiActionType::ID_AdjustPressuresLimitsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPressuresLimitsRsp ); break; case Gui::GuiActionType::ID_AdjustSalineRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSalineRsp ); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp ); break; - case Gui::GuiActionType::ID_AdjustPressuresLimitsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPressuresLimitsRsp ); break; case Gui::GuiActionType::ID_AdjustHeparinRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHeparinRsp ); break; // these need to be standard and use notify as well @@ -336,6 +336,13 @@ case Gui::GuiActionType::ID_StartTreatmentRsp : ok = notify (vMessage, vData, Gui::GuiActionType::ID_StartTreatmentRsp ); break; case Gui::GuiActionType::ID_EndTreatmentRsp : ok = notify (vMessage, vData, Gui::GuiActionType::ID_EndTreatmentRsp ); break; + // Alarms + case Gui::GuiActionType::ID_AlarmStatus : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus ); break; + case Gui::GuiActionType::ID_AlarmTriggered : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmTriggered ); break; + case Gui::GuiActionType::ID_AlarmCleared : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmCleared ); break; + case Gui::GuiActionType::ID_AlarmClearedConditionRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmClearedConditionRsp); break; + + // unhandles messages: these will only be logged as received message // there has nothing been defined for these messages. default : printUnhandled (vMessage ); break; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -reb23f842f5b153622da276cdd167d98ea4d7ef04 -r3e5cdca5de3ac46619325bf1e37c572d729d5fa9 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision eb23f842f5b153622da276cdd167d98ea4d7ef04) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 3e5cdca5de3ac46619325bf1e37c572d729d5fa9) @@ -90,7 +90,8 @@ ID_AlarmStatus = 0x0200, ID_AlarmTriggered = 0x0300, ID_AlarmCleared = 0x0400, - ID_AlarmUserAckReq = 0x3F00, // 63 + ID_AlarmClearedConditionReq = 0x3F00, // 63 // the same code is used for every unit to send and receive over the CANBus + ID_AlarmClearedConditionRsp = 0x3F00, // 63 // the same code is used for every unit to send and receive over the CANBus ID_AlarmSilenceReq = 0x3200, // 50 ID_AlarmUserActionReq = 0x4000, // 64 // there is no response since it is kind of the response to the ID_AlarmStatus from UI to HD Index: sources/gui/qml/main.qml =================================================================== diff -u -r1d43ff790e6a3fb03d371bb5bde9c2d432d299b6 -r3e5cdca5de3ac46619325bf1e37c572d729d5fa9 --- sources/gui/qml/main.qml (.../main.qml) (revision 1d43ff790e6a3fb03d371bb5bde9c2d432d299b6) +++ sources/gui/qml/main.qml (.../main.qml) (revision 3e5cdca5de3ac46619325bf1e37c572d729d5fa9) @@ -210,13 +210,10 @@ } AlarmListDialog { id : _alarmListDialog - onMinimizeClicked : { - alarmMinimize() - // when used minimizes the alarm it can stay minimized until otherwize is set - // by the next alarm status received. - // see also the "Connections { target: vAlarmStatus" implementation - // vAlarmStatus.alarm_KeepMinimized = true - } + isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced + timeout : vAlarmStatus.alarm_MuteTimeout + onMuteClicked : vAlarmStatus.doSilence() + onMinimizeClicked : alarmMinimize() } // 9 - Others Index: sources/model/MModel.h =================================================================== diff -u -reb23f842f5b153622da276cdd167d98ea4d7ef04 -r3e5cdca5de3ac46619325bf1e37c572d729d5fa9 --- sources/model/MModel.h (.../MModel.h) (revision eb23f842f5b153622da276cdd167d98ea4d7ef04) +++ sources/model/MModel.h (.../MModel.h) (revision 3e5cdca5de3ac46619325bf1e37c572d729d5fa9) @@ -21,6 +21,7 @@ #include "MAlarmStatusData.h" #include "MAlarmTriggered.h" #include "MAlarmCleared.h" +#include "MAlarmClearedCondition.h" #include "MTreatmentTimeData.h" #include "MTreatmentFlowsData.h" @@ -195,6 +196,7 @@ REGISTER_METATYPE( AlarmStatusData ) \ REGISTER_METATYPE( AlarmTriggeredData ) \ REGISTER_METATYPE( AlarmClearedData ) \ + REGISTER_METATYPE( AlarmClearedConditionData ) \ \ REGISTER_METATYPE( DGROPumpData ) \ REGISTER_METATYPE( DGPressuresData ) \ @@ -215,9 +217,9 @@ REGISTER_METATYPE( ConfirmTreatmentRequestData ) \ REGISTER_METATYPE( EndTreatmentRequestData ) \ \ - REGISTER_METATYPE( AlarmAcknowledgeRequestData ) \ REGISTER_METATYPE( AlarmSilenceRequestData ) \ REGISTER_METATYPE( AlarmUserActionRequestData ) \ + REGISTER_METATYPE( AlarmClearedConditionRequestData ) \ \ REGISTER_METATYPE( AdjustBloodDialysateRequestData ) \ REGISTER_METATYPE( AdjustDurationRequestData ) \ @@ -273,6 +275,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmStatusData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmTriggeredData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmClearedData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmClearedConditionData ) \ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGROPumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGPressuresData ) \ @@ -316,9 +319,9 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentParametersRequestData ) \ \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmAcknowledgeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmUserActionRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmClearedConditionRequestData ) \ //===============================================================================// /*! @@ -354,6 +357,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmStatusData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmTriggeredData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmClearedData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmClearedConditionData ) \ \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGROPumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGPressuresData ) \ @@ -396,9 +400,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentParametersRequestData ) \ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmAcknowledgeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmUserActionRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmClearedConditionRequestData ) \ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT \ /* Request ----------------------- NoEmit -------------------------- */ \ @@ -416,8 +420,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentParametersRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmSilenceRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmAcknowledgeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmUserActionRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmClearedConditionRequestData ) \ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC \ /* Request ----------------------- public -------------------------- */ \ @@ -434,9 +438,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( EndTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTreatmentParametersRequestData ) \ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmAcknowledgeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmUserActionRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmClearedConditionRequestData ) \ //===============================================================================// #define ACTION_RECEIVE_SIGNALS \ @@ -457,6 +461,7 @@ ACTION_RECEIVE_SIGNAL( AlarmStatusData ) \ ACTION_RECEIVE_SIGNAL( AlarmTriggeredData ) \ ACTION_RECEIVE_SIGNAL( AlarmClearedData ) \ + ACTION_RECEIVE_SIGNAL( AlarmClearedConditionData ) \ \ ACTION_RECEIVE_SIGNAL( DGROPumpData ) \ ACTION_RECEIVE_SIGNAL( DGPressuresData ) \ Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -rf325fa7bac94c7c0dcc9ed4185273e94669e17b7 -r3e5cdca5de3ac46619325bf1e37c572d729d5fa9 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision f325fa7bac94c7c0dcc9ed4185273e94669e17b7) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 3e5cdca5de3ac46619325bf1e37c572d729d5fa9) @@ -366,19 +366,20 @@ }; /*! - * \brief The MAlarmAcknowledgeReq class + * \brief The MAlarmClearedConditionReq class * \details The model to tell HD an alarm has been acknowledged * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:----:|:----------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| - * |0x3F00| 0x001,2,4 | N/A | Cmd | Y | UI | HD | Alarm Acknowledge Request | + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:----------:|:-----:|:----:|:---:|:---:|:----:|:------------------------:| + * |0x3F00| 0x001,2,4 | N/A | Cmd | Y | UI | HD | Alarm Condition Cleared | * * | Payload || * | || * | #1:(U32) | \ref alarmID | * */ -class MAlarmAcknowledgeReq : public MModel { +// MAlarmAcknowledgeReq +class MAlarmClearedConditionReq : public MModel { public: GuiAlarmID alarmID = GuiAlarmID::ALARM_ID_NO_ALARM; // coco begin validated : Has been validated manually. @@ -388,7 +389,7 @@ } // coco end static QString toString(const QVariantList &vParameters) { - return MModel::toString("AlarmAcknowledge", vParameters); + return MModel::toString("AlarmCondition", vParameters); } }; @@ -604,5 +605,5 @@ typedef Model:: MEndTreatmentReq EndTreatmentRequestData; typedef Model:: MAdjustTreatmentParametersReq AdjustTreatmentParametersRequestData; typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; -typedef Model:: MAlarmAcknowledgeReq AlarmAcknowledgeRequestData; +typedef Model:: MAlarmClearedConditionReq AlarmClearedConditionRequestData; typedef Model:: MAlarmUserActionReq AlarmUserActionRequestData; Index: sources/model/hd/alarm/MAlarmClearedCondition.cpp =================================================================== diff -u --- sources/model/hd/alarm/MAlarmClearedCondition.cpp (revision 0) +++ sources/model/hd/alarm/MAlarmClearedCondition.cpp (revision 3e5cdca5de3ac46619325bf1e37c572d729d5fa9) @@ -0,0 +1,41 @@ +/*! + * + * 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 MAlarmClearedCondition.cpp + * \author (last) Behrouz NematiPour + * \date (last) 11-Dec-2020 + * \author (original) Behrouz NemaiPour + * \date (original) 11-Dec-2020 + * + */ +#include "MAlarmClearedCondition.h" + +using namespace Model; + +QVariantList MAlarmClearedCondition::parameters() const { + return { + _data.mAlarmID.value + }; +} + +bool MAlarmClearedCondition::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if (GetValue(vByteArray, index, _data.mAlarmID)) + return true ; + else { if(vIndex) *vIndex = index; return false; } +} + +/*! + * \brief MAlarmClearedCondition::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +MAlarmClearedCondition::Data MAlarmClearedCondition::data() const { + Data data; + data.mAlarmID = _data.mAlarmID.value; + return data; +} Index: sources/model/hd/alarm/MAlarmClearedCondition.h =================================================================== diff -u --- sources/model/hd/alarm/MAlarmClearedCondition.h (revision 0) +++ sources/model/hd/alarm/MAlarmClearedCondition.h (revision 3e5cdca5de3ac46619325bf1e37c572d729d5fa9) @@ -0,0 +1,79 @@ +/*! + * + * 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 MAlarmClearedCondition.h + * \author (last) Behrouz NematiPour + * \date (last) 11-Dec-2020 + * \author (original) Behrouz NemaiPour + * \date (original) 11-Dec-2020 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAlarmConditionCleared class + * \details The alarm condition cleared model + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:----------:|:-----:|:----:|:---:|:---:|:----:|:------------------------:| + * |0x3F00| 0x001,2,4 | N/A | Cmd | Y | UI | HD | Alarm Condition Cleared | + * + * | Payload || + * | || + * | #1:(U32) | \ref alarmID | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | Alarm Condition | + * + */ +class MAlarmClearedCondition : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAlarmID ; + } _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("AlarmCondition") ; } + + struct Data { + quint32 mAlarmID = 0; ///< Alarm ID + }; + +public: + MAlarmClearedCondition () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAlarmClearedCondition::Data AlarmClearedConditionData; Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -r71784f783e4e2c0eadebef28eefb0fc53534ba66 -r3e5cdca5de3ac46619325bf1e37c572d729d5fa9 --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 71784f783e4e2c0eadebef28eefb0fc53534ba66) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 3e5cdca5de3ac46619325bf1e37c572d729d5fa9) @@ -20,10 +20,10 @@ VIEW_DEF_CLASS_ADJUSTMENT(VAlarmStatus, AlarmStatusData) void VAlarmStatus::initConnections() { - ACTION_VIEW_CONNECTION(AlarmStatusData ); - ADJUST_VIEW_CONNECTION(AlarmAcknowledgeRequestData ); - ADJUST_VIEW_CONNECTION(AlarmSilenceRequestData ); - ADJUST_VIEW_CONNECTION(AlarmUserActionRequestData ); + ACTION_VIEW_CONNECTION(AlarmStatusData ); + ADJUST_VIEW_CONNECTION(AlarmSilenceRequestData ); + ADJUST_VIEW_CONNECTION(AlarmUserActionRequestData ); + ADJUST_VIEW_CONNECTION(AlarmClearedConditionRequestData ); } /*! Index: sources/view/hd/alarm/VAlarmStatus.h =================================================================== diff -u -r43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1 -r3e5cdca5de3ac46619325bf1e37c572d729d5fa9 --- sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1) +++ sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 3e5cdca5de3ac46619325bf1e37c572d729d5fa9) @@ -73,10 +73,10 @@ Q_PROPERTY(QString text READ text NOTIFY alarm_AlarmIDChanged) Q_PROPERTY(QString id READ id NOTIFY alarm_AlarmIDChanged) - VIEW_DEC_CLASS_ADJUSTMENT(VAlarmStatus, AlarmStatusData ) - ADJUST_TRANSMT_SIGNAL ( AlarmAcknowledgeRequestData ) - ADJUST_TRANSMT_SIGNAL ( AlarmSilenceRequestData ) - ADJUST_TRANSMT_SIGNAL ( AlarmUserActionRequestData ) + VIEW_DEC_CLASS_ADJUSTMENT(VAlarmStatus, AlarmStatusData ) + ADJUST_TRANSMT_SIGNAL ( AlarmSilenceRequestData ) + ADJUST_TRANSMT_SIGNAL ( AlarmUserActionRequestData ) + ADJUST_TRANSMT_SIGNAL ( AlarmClearedConditionRequestData) private: QString id ();