Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -rc421ddadef2ade71d3abe269493a84b12b85296b -rd2035a8728794afeefaa244bf8d1597926d945f5 --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision c421ddadef2ade71d3abe269493a84b12b85296b) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision d2035a8728794afeefaa244bf8d1597926d945f5) @@ -1,15 +1,16 @@ /*! - * + * * 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 messageinterpreter.cpp - * \date 12/11/2019 - * \author Behrouz NematiPour - * + * 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 messageinterpreter.cpp + * \author (last) Peter Lucia + * \date (last) 29-Jun-2020 + * \author (original) Behrouz NematiPour + * \date (original) 13-Dec-2019 + * */ #include "messageinterpreter.h" @@ -233,6 +234,12 @@ LOG_EVENT(AdjustUltrafiltrationConfirmRequestData::toString(vData)); break; + case Gui::GuiActionType::ID_AlarmSilenceReq: + if ( ! count ) { logInvalidLength(vActionId); return false; } + vPayload = Format::fromVariant(vData); + LOG_EVENT(AlarmSilenceRequestData::toString(vData)); + break; + default: QString mActionIdHexString = Format::toHexString(vActionId); LOG_DEBUG(mSenderID + tr("Unknown transmit Message with ID '%1'").arg(mActionIdHexString)); @@ -316,7 +323,8 @@ case Gui::GuiActionType::ID_AlarmStatus : ok = alarmStatus (vMessage, vData); break; case Gui::GuiActionType::ID_AlarmTriggered : ok = alarmTriggered (vMessage, vData); break; case Gui::GuiActionType::ID_AlarmCleared : ok = alarmCleared (vMessage, vData); break; - + case Gui::GuiActionType::ID_AlarmSilenceRsp : ok = alarmSilence (vMessage, vData); break; // Don't think we are going to have response and it is only an Ack. + // Adjustment Response Messages case Gui::GuiActionType::ID_AdjustDurationRsp : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_AdjustDurationRsp , Model::MAdjustDurationResponse ); break; case Gui::GuiActionType::ID_AdjustBloodDialysateRsp : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_AdjustBloodDialysateRsp , Model::MAdjustBloodDialysateResponse ); break;