Index: leahi.pro =================================================================== diff -u -re07cde120d7476c4add90c4f86cf55af9ea830de -r8c3cf6523e22b063f4f9d7c595d16398e95ef7bc --- leahi.pro (.../leahi.pro) (revision e07cde120d7476c4add90c4f86cf55af9ea830de) +++ leahi.pro (.../leahi.pro) (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) @@ -179,6 +179,7 @@ sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.h \ sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h \ sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h \ + sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.h \ sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.h \ @@ -364,8 +365,6 @@ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MAdjustRequestsBase.h \ sources/model/hd/adjustment/settings/MAdjustHDRequests.h \ - \ # ---------- Models - HD - Adjustment - Settings - sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \ \ # ---------- Models - HD - Adjustment - Pre-Treatment sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \ @@ -663,6 +662,7 @@ sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \ sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.cpp \ sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.cpp \ + sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.cpp \ \ # ---------- Models - TD - Adjustment - Pre-Treatment sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \ sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \ @@ -675,8 +675,6 @@ sources/model/td/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \ \ # ---------- Models - DD - Adjustment - Settings sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp \ - \ # ---------- Models - HD - Adjustment - Settings - sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \ \ # ---------- Models - HD - Adjustment - Pre-Treatment sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \ Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r5335f246461dfd5b9a48dcc8c01aa97778ae773b -r8c3cf6523e22b063f4f9d7c595d16398e95ef7bc --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 5335f246461dfd5b9a48dcc8c01aa97778ae773b) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) @@ -480,7 +480,7 @@ * \param vData - Data model contains the alarm volume * \return void */ -void MessageDispatcher::onAdjustment(const AdjustHDAlarmVolumeRequestData &vData) +void MessageDispatcher::onAdjustment(const AdjustTDAlarmVolumeRequestData &vData) { QVariantList mData; mData += vData.volume2HD(); Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -re7a8d5092cb499d6c6ed621eabde437bccbc1e0e -r8c3cf6523e22b063f4f9d7c595d16398e95ef7bc --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision e7a8d5092cb499d6c6ed621eabde437bccbc1e0e) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) @@ -285,7 +285,7 @@ // alarms case Gui::GuiActionType::ID_AlarmSilenceReq : INTERPRET_TRANSMIT_MESSAGE(AlarmSilenceRequestData ); break; case Gui::GuiActionType::ID_AlarmUserActionReq : INTERPRET_TRANSMIT_MESSAGE(AlarmUserActionRequestData ); break; - case Gui::GuiActionType::ID_AlarmVolumeSetReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHDAlarmVolumeRequestData ); break; + case Gui::GuiActionType::ID_AlarmVolumeSetReq : INTERPRET_TRANSMIT_MESSAGE(AdjustTDAlarmVolumeRequestData ); break; // This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. case Gui::GuiActionType::ID_AlarmActiveListReq : INTERPRET_TRSMT_MT_MESSAGE(AlarmActiveListRequestData ); break; case Gui::GuiActionType::ID_AlarmTriggered : INTERPRET_TRANSMIT_MESSAGE(AlarmTriggeredRequestData ); break; @@ -582,7 +582,7 @@ 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_AlarmVolumeSetRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmVolumeSetRsp ); break; + case Gui::GuiActionType::ID_AlarmVolumeSetRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmVolumeSetRsp ); break; // This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. case Gui::GuiActionType::ID_AlarmActiveListRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmActiveListRsp ); break; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rbdf090c85ac9b272d1c693025542e8a5fac5a7e5 -r8c3cf6523e22b063f4f9d7c595d16398e95ef7bc --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision bdf090c85ac9b272d1c693025542e8a5fac5a7e5) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) @@ -130,7 +130,7 @@ ID_TreatmentTime = 0x3B00, // 59 //// ----- @LEAHIZED ID_BloodFlow = 0x1100, // 17 //// ----- @LEAHIZED ID_DialysateInletFlow = 0x0800, - ID_DialysateOutletFlow = 0x0B00, + ID_DialysateOutletFlow = 0x0B0F, //// ----- @CRAPIZED ID_PressureOcclusion = 0x2400, // 36 //// ----- @LEAHIZED ID_Saline = 0x3D00, // 61 //// ----- @LEAHIZED ID_Ultrafiltration = 0x3E00, // 62 //// ----- @LEAHIZED @@ -198,7 +198,7 @@ ID_DGDrainPumpData = 0x240F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication ID_DDOperationModeData = 0x1300, ID_DGReservoirData = 0x280F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication - ID_DGLoadCellReadingsData = 0x0C00, // 12 + ID_DGLoadCellReadingsData = 0x0C0F, // 12 ID_DGAccelerometerData = 0x340F, // 52 //// ----- @CRAPIZED: had to change to avoid duplication ID_DDValvesStatesData = 0x1B00, // 27 //// ----- @LEAHIZED ID_DDPressuresData = 0x1C00, // 28 //// ----- @LEAHIZED Index: sources/gui/qml/components/IdleTimer.qml =================================================================== diff -u -rbce1e6f584c921c9fa6945204ed1e1d38021fbc8 -r8c3cf6523e22b063f4f9d7c595d16398e95ef7bc --- sources/gui/qml/components/IdleTimer.qml (.../IdleTimer.qml) (revision bce1e6f584c921c9fa6945204ed1e1d38021fbc8) +++ sources/gui/qml/components/IdleTimer.qml (.../IdleTimer.qml) (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) @@ -21,8 +21,8 @@ import QtQuick 2.15 Item { id: _root - property int timeout: 1000 * 60 // 1000 ms * 60 sec = 1 min - signal idle() // emitted when user is inactive + property int timeout: 1000 * 60 * 5 // 1000 ms * 60 sec * 5 = 5 min + signal idle() // emitted when user is inactive focus : true Keys.onPressed : reset() Index: sources/gui/qml/dialogs/headerbar/HeaderbarSettings.qml =================================================================== diff -u -rabb959f145f8af64bab3b8f24314bf0ba8f3bb0e -r8c3cf6523e22b063f4f9d7c595d16398e95ef7bc --- sources/gui/qml/dialogs/headerbar/HeaderbarSettings.qml (.../HeaderbarSettings.qml) (revision abb959f145f8af64bab3b8f24314bf0ba8f3bb0e) +++ sources/gui/qml/dialogs/headerbar/HeaderbarSettings.qml (.../HeaderbarSettings.qml) (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) @@ -30,7 +30,7 @@ SettingsSlider { id: _volume width : _private.columnWidth - value : vAdjustmentAlarmVolume.hdAlarmVolume ?? 0 + value : vAdjustmentAlarmVolume.tdAlarmVolume ?? 0 iconImage : "qrc:/images/iVolume" onValueChanged : vAdjustmentAlarmVolume.doAdjustment( slider.value ) @@ -53,7 +53,7 @@ Connections { target: vAdjustmentAlarmVolume function onAdjustmentTriggered ( vValue ) { if ( vAdjustmentAlarmVolume.adjustment_Accepted ) { - vSettings .alarmVolume = vAdjustmentAlarmVolume.hdAlarmVolume + vSettings .alarmVolume = vAdjustmentAlarmVolume.tdAlarmVolume } else { // TODO do something with rejection message Index: sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml =================================================================== diff -u -rabb959f145f8af64bab3b8f24314bf0ba8f3bb0e -r8c3cf6523e22b063f4f9d7c595d16398e95ef7bc --- sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision abb959f145f8af64bab3b8f24314bf0ba8f3bb0e) +++ sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) @@ -82,7 +82,7 @@ SettingsSlider { id: _volume anchors.horizontalCenter: parent.horizontalCenter width : _private.contentWidth - value : vAdjustmentAlarmVolume.hdAlarmVolume ?? 0 + value : vAdjustmentAlarmVolume.tdAlarmVolume ?? 0 text : qsTr("Alarm Volume") textOnly : true sliderBkgndColor : Colors.createTreatmentInactive @@ -94,14 +94,14 @@ Connections { target: vAdjustmentAlarmVolume function onAdjustmentTriggered ( vValue ) { if ( vAdjustmentAlarmVolume.adjustment_Accepted ) { - vSettings .alarmVolume = vAdjustmentAlarmVolume.hdAlarmVolume + vSettings .alarmVolume = vAdjustmentAlarmVolume.tdAlarmVolume _root.notificationText = "" } else { _root.notificationText = vAdjustmentAlarmVolume.adjustment_ReasonText } // regardless of the rejection or acceptance the value will be sent from C++ to be adjusted. - _alarmVolume.reset ( vAdjustmentAlarmVolume.hdAlarmVolume ) + _alarmVolume.reset ( vAdjustmentAlarmVolume.tdAlarmVolume ) } } Index: sources/model/MModel.h =================================================================== diff -u -rd17a7a6adf72a6224280548e2341dfce22bf72c7 -r8c3cf6523e22b063f4f9d7c595d16398e95ef7bc --- sources/model/MModel.h (.../MModel.h) (revision d17a7a6adf72a6224280548e2341dfce22bf72c7) +++ sources/model/MModel.h (.../MModel.h) (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) @@ -27,7 +27,7 @@ #include "MAlarmTriggered.h" #include "MAlarmCleared.h" #include "MAlarmActiveList.h" -#include "MAdjustHDAlarmVolumeResponse.h" +#include "MAdjustTDAlarmVolumeResponse.h" #include "MDuetConfirmTDi.h" // POST @@ -492,7 +492,7 @@ REGISTER_METATYPE( AdjustServiceDatesRequestData ) \ REGISTER_METATYPE( AdjustTDDateTimeRequestData ) \ REGISTER_METATYPE( AdjustDDDateTimeRequestData ) \ - REGISTER_METATYPE( AdjustHDAlarmVolumeRequestData ) \ + REGISTER_METATYPE( AdjustTDAlarmVolumeRequestData ) \ \ /* Response */ \ /* Post-Treatment */ \ @@ -551,7 +551,7 @@ REGISTER_METATYPE( AdjustDDDateTimeResponseData ) \ /* Alarms - Active List Response */ \ REGISTER_METATYPE( AlarmActiveListResponseData ) \ - REGISTER_METATYPE( AdjustHDAlarmVolumeResponseData ) \ + REGISTER_METATYPE( AdjustTDAlarmVolumeResponseData ) \ REGISTER_METATYPE( AdjustInstitutionalRequestData ) \ REGISTER_METATYPE( AdjustInstitutionalRecordResponseData ) \ REGISTER_METATYPE( InstitutionalRequestData ) \ @@ -728,7 +728,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDDateTimeResponseData ) \ /* Alarms - Active List Response */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmActiveListResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTDAlarmVolumeResponseData ) \ /* Settings - HD Data Response */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDUsageInfoResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustInstitutionalRecordResponseData ) \ @@ -774,7 +774,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTDAlarmVolumeRequestData ) \ /* Post-Treatment */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientDisconnectionNotifyRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientDisconnectionConfirmRequestData ) \ @@ -977,7 +977,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDDateTimeResponseData ) \ /* Alarms - Active List Response */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmActiveListResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDAlarmVolumeResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTDAlarmVolumeResponseData ) \ /* Settings - HD Data Response */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDUsageInfoResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustInstitutionalRecordResponseData ) \ @@ -1045,7 +1045,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceDatesRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDAlarmVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTDAlarmVolumeRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmUserActionRequestData ) \ @@ -1119,7 +1119,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustServiceDatesRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDAlarmVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTDAlarmVolumeRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmUserActionRequestData ) \ @@ -1193,7 +1193,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustServiceDatesRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDAlarmVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTDAlarmVolumeRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmUserActionRequestData ) \ @@ -1359,7 +1359,7 @@ ACTION_RECEIVE_SIGNAL( AdjustDDDateTimeResponseData ) \ /* Alarms */ \ ACTION_RECEIVE_SIGNAL( AlarmActiveListResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustHDAlarmVolumeResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustTDAlarmVolumeResponseData ) \ /* Settings - HD data response */ \ ACTION_RECEIVE_SIGNAL( HDUsageInfoResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustInstitutionalRecordResponseData ) \ Fisheye: Tag 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/hd/adjustment/settings/MAdjustHDRequests.h =================================================================== diff -u -re49c956894f999f6539b0c404dd1c9b18a76bb4b -r8c3cf6523e22b063f4f9d7c595d16398e95ef7bc --- sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision e49c956894f999f6539b0c404dd1c9b18a76bb4b) +++ sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) @@ -68,7 +68,7 @@ * * | Payload || * | || - * | #1:(U32) volume | \ref MAdjustHDAlarmVolumeResponse | + * | #1:(U32) volume | \ref MAdjustTDAlarmVolumeResponse | * */ class MAdjustHDAlarmVolumeReq : public MModel { @@ -651,7 +651,7 @@ typedef Model:: MAdjustVersionsRsp AdjustVersionsResponseData; typedef Model:: MAdjustServiceDatesReq AdjustServiceDatesRequestData; typedef Model:: MAdjustTDDateTimeReq AdjustTDDateTimeRequestData; -typedef Model:: MAdjustHDAlarmVolumeReq AdjustHDAlarmVolumeRequestData; +typedef Model:: MAdjustHDAlarmVolumeReq AdjustTDAlarmVolumeRequestData; typedef Model:: MAdjustUIPostFinalResultReq AdjustUIPostFinalResultRequestData; typedef Model:: MHDUsageInfoReq HDUsageInfoRequestData; typedef Model:: MInstitutionalRecordReq InstitutionalRequestData; Index: sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.cpp =================================================================== diff -u --- sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.cpp (revision 0) +++ sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.cpp (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) @@ -0,0 +1,49 @@ +/*! + * + * Copyright (c) 2021-2024 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 MAdjustTDAlarmVolumeResponse.cpp + * \author (last) Behrouz NematiPour + * \date (last) 23-May-2021 + * \author (original) Behrouz NematiPour + * \date (original) 23-May-2021 + * + */ +#include "MAdjustTDAlarmVolumeResponse.h" + +using namespace Model; + +QVariantList MAdjustTDAlarmVolumeResponse::parameters() const { + return { + _data.mAccepted.value, + _data.mReason .value, + }; +} + +bool MAdjustTDAlarmVolumeResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MAdjustTDAlarmVolumeResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustTDAlarmVolumeResponseData MAdjustTDAlarmVolumeResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted.value; + data.mReason = _data.mReason .value; + return data; +} Index: sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.h =================================================================== diff -u --- sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.h (revision 0) +++ sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.h (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) @@ -0,0 +1,82 @@ +/*! + * + * Copyright (c) 2021-2024 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 MAdjustHDAlarmVolumeResponse.h + * \author (last) Behrouz NematiPour + * \date (last) 23-May-2021 + * \author (original) Behrouz NematiPour + * \date (original) 23-May-2021 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustHDAlarmVolumeResponse class + * \details The HD Alarm Volume adjustment response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:| + * |0x0C00| 0x040 | Rsp | Y | TD | UI | Set Alarm Volume Rsp | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | AdjustTDAlarmVolume| + * + */ +class MAdjustTDAlarmVolumeResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted; + Types::U32 mReason ; + } _data; + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } + QString infoText () const override { return QString("AdjustTDAlarmVolume") ; } + + struct Data { + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + }; + + MAdjustTDAlarmVolumeResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustTDAlarmVolumeResponse::Data AdjustTDAlarmVolumeResponseData; Index: sources/view/settings/VAdjustmentAlarmVolume.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8c3cf6523e22b063f4f9d7c595d16398e95ef7bc --- sources/view/settings/VAdjustmentAlarmVolume.cpp (.../VAdjustmentAlarmVolume.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/settings/VAdjustmentAlarmVolume.cpp (.../VAdjustmentAlarmVolume.cpp) (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) @@ -24,34 +24,34 @@ * \details All the class signal/slot connections are defined here. */ void View::VAdjustmentAlarmVolume::initConnections() { - ADJUST_VIEW_CONNECTION(AdjustHDAlarmVolumeRequestData ); - ACTION_VIEW_CONNECTION(AdjustHDAlarmVolumeResponseData ); + ADJUST_VIEW_CONNECTION(AdjustTDAlarmVolumeRequestData ); + ACTION_VIEW_CONNECTION(AdjustTDAlarmVolumeResponseData ); ACTION_VIEW_CONNECTION(SettingsData) connect(&_GuiController, &GuiController::didPOSTPass, this, [=](bool) { //POST// - doAdjustment(_hdAlarmVolume); + doAdjustment(_tdAlarmVolume); }); } -void View::VAdjustmentAlarmVolume::onActionReceive(const AdjustHDAlarmVolumeResponseData &vData) +void View::VAdjustmentAlarmVolume::onActionReceive(const AdjustTDAlarmVolumeResponseData &vData) { adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); // TODO : Value // in the correct/standard design (like all the other MVCs) there should always be the FW preferred (or old value) for the requested value to change. - // a line like : hdAlarmVolume( vData.volume ); // please give attention to the vData(received) instead of _data(private). + // a line like : tdAlarmVolume( vData.volume ); // please give attention to the vData(received) instead of _data(private). // but is has not been provided !!! - // at this moment the only thing that can be done is to use _data.volume(accepted)/_hdAlarmVolume(rejected) to revert back to the old private value the view has. + // at this moment the only thing that can be done is to use _data.volume(accepted)/_tdAlarmVolume(rejected) to revert back to the old private value the view has. // Please notice that it works but we are just predicting what the FW has and the GUI is totally agnostic about the FW current value, // so we get easily out of sync with FW. if (vData.mAccepted) { - hdAlarmVolume( _data.volume() ); + tdAlarmVolume( _data.volume() ); status(""); } else { - hdAlarmVolume(_hdAlarmVolume); + tdAlarmVolume(_tdAlarmVolume); // TODO : Rejection Reason (status) // Same thing which has been done for the alarmMapping has to be done for the Reason returning by each response. status(tr("The alarm volume change request has been rejected [%1]").arg(vData.mReason)); @@ -77,5 +77,5 @@ void View::VAdjustmentAlarmVolume::onActionReceive(const SettingsData &) { QString mCategory = Storage::Settings_Category_SettingsSystem; - FROMVARIANT( hdAlarmVolume, "Alarm", "Volume", UInt ); + FROMVARIANT( tdAlarmVolume, "Alarm", "Volume", UInt ); } Index: sources/view/settings/VAdjustmentAlarmVolume.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r8c3cf6523e22b063f4f9d7c595d16398e95ef7bc --- sources/view/settings/VAdjustmentAlarmVolume.h (.../VAdjustmentAlarmVolume.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/view/settings/VAdjustmentAlarmVolume.h (.../VAdjustmentAlarmVolume.h) (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) @@ -20,7 +20,7 @@ #include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MAdjustHDRequests.h" -#include "MAdjustHDAlarmVolumeResponse.h" +#include "MAdjustTDAlarmVolumeResponse.h" #include "MSettings.h" namespace View { @@ -38,18 +38,18 @@ // friends friend class ::tst_views; - AdjustHDAlarmVolumeRequestData _data; + AdjustTDAlarmVolumeRequestData _data; // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI TRIGGER( bool , adjustment , 0) // HD AlarmVolume data - PROPERTY( quint8 , hdAlarmVolume , 5) //TODO Needs to get maxVolume from MAdjustHDAlarmVolumeReq + PROPERTY( quint8 , tdAlarmVolume , 4) //TODO Needs to get maxVolume from MAdjustHDAlarmVolumeReq PROPERTY( QString , status , "") VIEW_DEC_CLASS(VAdjustmentAlarmVolume) - VIEW_DEC_SLOT(AdjustHDAlarmVolumeResponseData) + VIEW_DEC_SLOT(AdjustTDAlarmVolumeResponseData) VIEW_DEC_SLOT(SettingsData) // ---------- Alarm Volume @@ -62,6 +62,6 @@ * \details the notification signal to send the user's Request * \param vData - data model includes request information */ - void didAdjustment(const AdjustHDAlarmVolumeRequestData &vData); + void didAdjustment(const AdjustTDAlarmVolumeRequestData &vData); }; } Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp =================================================================== diff -u -r27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5 -r8c3cf6523e22b063f4f9d7c595d16398e95ef7bc --- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision 27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5) +++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) @@ -68,13 +68,11 @@ ENUM_CHECK_O( GuiSalineStates, vData.mSalineState ) { ENUM_CHECK ( GuiSalineStates, FLUID_BOLUS_IDLE_STATE ) ENUM_CHECK ( GuiSalineStates, FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE ) - ENUM_CHECK ( GuiSalineStates, FLUID_BOLUS_SALINE_IN_PROGRESS_STATE ) - ENUM_CHECK ( GuiSalineStates, FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE ) + ENUM_CHECK ( GuiSalineStates, FLUID_BOLUS_IN_PROGRESS_STATE ) ENUM_CHECK_C( GuiSalineStates, NUM_OF_FLUID_BOLUS_STATES ) } ENUM_READ ( GuiSalineStates, FLUID_BOLUS_IDLE_STATE , sbIdle ); ENUM_READ ( GuiSalineStates, FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE , sbWaitPump ); - ENUM_READ ( GuiSalineStates, FLUID_BOLUS_SALINE_IN_PROGRESS_STATE , sbRunning ); - ENUM_READ ( GuiSalineStates, FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE , sbSubstitutionRunning ); + ENUM_READ ( GuiSalineStates, FLUID_BOLUS_IN_PROGRESS_STATE , sbRunning ); // Heparin States _heparin = false; Index: sources/view/td/data/treatment/VTDTreatmentStatesData.h =================================================================== diff -u -r27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5 -r8c3cf6523e22b063f4f9d7c595d16398e95ef7bc --- sources/view/td/data/treatment/VTDTreatmentStatesData.h (.../VTDTreatmentStatesData.h) (revision 27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5) +++ sources/view/td/data/treatment/VTDTreatmentStatesData.h (.../VTDTreatmentStatesData.h) (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) @@ -75,7 +75,6 @@ PROPERTY( bool , sbIdle , true ) ///< SALINE_BOLUS_STATE_IDLE = 0 # No saline bolus delivery is in progress PROPERTY( bool , sbWaitPump , false) ///< SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP = 1 # Wait for pumps to stop before starting bolus PROPERTY( bool , sbRunning , false) ///< SALINE_BOLUS_STATE_IN_PROGRESS = 2 # A saline bolus delivery is in progress - PROPERTY( bool , sbSubstitutionRunning , false) ///< FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE = 3 # A substitution delivery is in progress // ---- Heparin states PROPERTY( bool , hpOff , true ) ///< HEPARIN_STATE_OFF = 0 # No heparin delivery is in progress