Index: leahi.pro =================================================================== diff -u -r8c3cf6523e22b063f4f9d7c595d16398e95ef7bc -r7bde5ac0646170a584dd5410fcf89fd9bc8b251c --- leahi.pro (.../leahi.pro) (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) +++ leahi.pro (.../leahi.pro) (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) @@ -155,6 +155,7 @@ sources/model/confirm/MDuetConfirmTDi.h \ sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.h \ sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.h \ + sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.h \ sources/model/dd/data/MDDBloodLeakData.h \ sources/model/dd/data/MDDConcentratePumpData.h \ sources/model/dd/data/MDDConductivityData.h \ @@ -262,6 +263,7 @@ sources/view/fp/data/VFPROPumpData.h \ sources/view/fp/data/VFPRORejectionPercentageData.h \ sources/view/fp/data/VFPTemperatureData.h \ + sources/view/settings/VAdjustRoWaterMode.h \ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \ sources/view/settings/VAdvancedInstitutionalRecord.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \ @@ -353,7 +355,6 @@ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h \ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h \ - sources/model/dg/adjustment/settings/MDuetRoWaterDG.h \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmStatusData.h \ sources/model/hd/alarm/MAlarmTriggered.h \ @@ -447,7 +448,6 @@ sources/view/settings/VAdjustmentServiceMode.h \ sources/view/settings/VAdjustmentServiceDates.h \ sources/view/settings/VAdjustmentDGCleaningUsage.h \ - sources/view/settings/VDuetRoWaterDG.h \ sources/view/settings/VCloudSync.h \ sources/view/settings/VHDUsageInfo.h \ sources/view/settings/VAdjustmentInstitutionalRecord.h \ @@ -526,6 +526,7 @@ sources/model/confirm/MDuetConfirmTDi.cpp \ sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.cpp \ sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.cpp \ + sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.cpp \ sources/model/dd/data/MDDBloodLeakData.cpp \ sources/model/dd/data/MDDConcentratePumpData.cpp \ sources/model/dd/data/MDDConductivityData.cpp \ @@ -648,7 +649,6 @@ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp \ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp \ - sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmStatusData.cpp \ sources/model/hd/alarm/MAlarmMapping.cpp \ @@ -737,6 +737,7 @@ sources/view/VGeneralEvent.cpp \ sources/device/DeviceView.cpp \ \ # ---------- Views - TD - States Data + sources/view/settings/VAdjustRoWaterMode.cpp \ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \ sources/view/settings/VAdvancedInstitutionalRecord.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \ @@ -808,7 +809,6 @@ sources/view/settings/VAdjustmentAlarmVolume.cpp \ sources/view/settings/VAdjustmentServiceMode.cpp \ sources/view/settings/VAdjustmentServiceDates.cpp \ - sources/view/settings/VDuetRoWaterDG.cpp \ sources/view/settings/VCloudSync.cpp \ sources/view/settings/VAdjustmentDGCleaningUsage.cpp \ sources/view/settings/VHDUsageInfo.cpp \ Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r8c3cf6523e22b063f4f9d7c595d16398e95ef7bc -r7bde5ac0646170a584dd5410fcf89fd9bc8b251c --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) @@ -948,11 +948,11 @@ * \param vData - Data model contains the UI RO Water Mode adjustment request data. * \return void */ -void MessageDispatcher::onAdjustment(const DuetRoWaterModeUIiData &vData) +void MessageDispatcher::onAdjustment(const AdjustRoWaterModeRequestData &vData) { QVariantList mData; mData += vData.mStatus; - actionTransmit(GuiActionType::ID_DuetRoWaterModeUIi, mData); + actionTransmit(GuiActionType::ID_AdjustRoWaterModeReq, mData); } /*! Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -re7a8d5092cb499d6c6ed621eabde437bccbc1e0e -r7bde5ac0646170a584dd5410fcf89fd9bc8b251c --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision e7a8d5092cb499d6c6ed621eabde437bccbc1e0e) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) @@ -330,9 +330,8 @@ {Gui::GuiActionType::ID_AdjustDGCleaningUsageReq , 0 * 4 }, // 0 parameter {Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp , 10 * 4 }, //10 parameters each 4bytes // ---- RO Water - {Gui::GuiActionType::ID_DuetRoWaterStatDGq , 0 * 4 }, // 0 parameter each 4bytes - {Gui::GuiActionType::ID_DuetRoWaterModeUIi , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_DuetRoWaterModeDGr , 3 * 4 }, // 3 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustRoWaterModeReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustRoWaterModeRsp , 2 * 4 }, // 2 parameter each 4bytes // ---- {Gui::GuiActionType::ID_RawData , 255 }, {Gui::GuiActionType::ID_Acknow , 0 }, Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r8c3cf6523e22b063f4f9d7c595d16398e95ef7bc -r7bde5ac0646170a584dd5410fcf89fd9bc8b251c --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) @@ -217,7 +217,7 @@ // Generic Confirm case Gui::GuiActionType::ID_DuetConfirmUIr : INTERPRET_TRANSMIT_MESSAGE(DuetConfirmUIrData ); break; // RO Water - case Gui::GuiActionType::ID_DuetRoWaterModeUIi : INTERPRET_TRANSMIT_MESSAGE(DuetRoWaterModeUIiData ); break; + case Gui::GuiActionType::ID_AdjustRoWaterModeReq : INTERPRET_TRANSMIT_MESSAGE(AdjustRoWaterModeRequestData ); break; // POST case Gui::GuiActionType::ID_UIPostFinalResultData : INTERPRET_TRANSMIT_MESSAGE(AdjustUIPostFinalResultRequestData ); break; // Settings @@ -634,9 +634,6 @@ // DG Response Messages case Gui::GuiActionType::ID_AdjustServiceDatesDGRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesDGRsp ); break; case Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp ); break; - // RO Water - case Gui::GuiActionType::ID_DuetRoWaterStatDGq : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DuetRoWaterStatDGq ); break; - case Gui::GuiActionType::ID_DuetRoWaterModeDGr : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DuetRoWaterModeDGr ); break; // unhandled messages: these will only be logged as received message // there has nothing been defined for these messages. default : printUnhandled (vMessage ); break; @@ -659,6 +656,8 @@ case Gui::GuiActionType::ID_DDValvesStatesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDValvesStatesData ); break; case Gui::GuiActionType::ID_AdjustDDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp ); break; + case Gui::GuiActionType::ID_AdjustRoWaterModeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustRoWaterModeRsp ); break; + case Gui::GuiActionType::ID_DDOperationModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDOperationModeData ); break; case Gui::GuiActionType::ID_AdjustVersionsDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp ); break; case Gui::GuiActionType::ID_AdjustSerialDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDDRsp ); break; Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -r7bde5ac0646170a584dd5410fcf89fd9bc8b251c --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) @@ -49,7 +49,7 @@ #include "VDateTime.h" #include "VAdjustmentAlarmVolume.h" #include "VBluetooth.h" -#include "VDuetRoWaterDG.h" +#include "VAdjustRoWaterMode.h" #include "VCloudSync.h" #include "VHDUsageInfo.h" #include "VAdjustmentInstitutionalRecord.h" Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r8c3cf6523e22b063f4f9d7c595d16398e95ef7bc -r7bde5ac0646170a584dd5410fcf89fd9bc8b251c --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) @@ -344,9 +344,8 @@ ID_AdjustDGCleaningUsageRsp = 0x8D0F, // 141 //// ----- @CRAPIZED: had to change to avoid duplication // RO Water Input Mode - ID_DuetRoWaterStatDGq = 0xC300, // 195 DG -> UI // DG initiates Status query - ID_DuetRoWaterModeUIi = 0xBC00, // 188 UI -> DG // UI initiates Mode Set || responses to status query - ID_DuetRoWaterModeDGr = 0xC400, // 196 UI <- DG // DG responses Mode Set + ID_AdjustRoWaterModeReq = 0xED00, // 237 + ID_AdjustRoWaterModeRsp = 0xEE00, // 238 // Institutional record request and response ID_InstitutionalRecordReq = 0x8200, // 130 UI -> TD request institutional record Index: sources/gui/qml/main.qml =================================================================== diff -u -re255d4633b338f4f46c3a2fad5a62f982ebfcd18 -r7bde5ac0646170a584dd5410fcf89fd9bc8b251c --- sources/gui/qml/main.qml (.../main.qml) (revision e255d4633b338f4f46c3a2fad5a62f982ebfcd18) +++ sources/gui/qml/main.qml (.../main.qml) (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) @@ -54,7 +54,7 @@ import VDateTime 0.1 import VAdjustmentAlarmVolume 0.1 import VBluetooth 0.1 -import VDuetRoWaterDG 0.1 +import VAdjustRoWaterMode 0.1 import VCloudSync 0.1 import VHDUsageInfo 0.1 import VInstitutionalRecord 0.1 @@ -196,7 +196,7 @@ VDateTime { id: vDateTime } VAdjustmentAlarmVolume { id: vAdjustmentAlarmVolume } VBluetooth { id: vBluetooth } - VDuetRoWaterDG { id: vDuetRoWaterDG } + VAdjustRoWaterMode { id: vAdjustRoWaterMode } VCloudSync { id: vCloudSync } VHDUsageInfo { id: vHDUsageInfo } VAdjustmentInstitutionalRecord { id: vAdjustmentInstitutionalRecord } Index: sources/gui/qml/pages/settings/SettingsROInput.qml =================================================================== diff -u -rfb1185f1c17778a9f8b300170d8d635a1532f6b4 -r7bde5ac0646170a584dd5410fcf89fd9bc8b251c --- sources/gui/qml/pages/settings/SettingsROInput.qml (.../SettingsROInput.qml) (revision fb1185f1c17778a9f8b300170d8d635a1532f6b4) +++ sources/gui/qml/pages/settings/SettingsROInput.qml (.../SettingsROInput.qml) (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) @@ -26,41 +26,42 @@ * which enables the Ro Water Input */ SettingsBase { id: _root - itemIndex : SettingsStack.RoInput + itemIndex : SettingsStack.RoInput + confirmVisible : false + onVisibleChanged : _roInputComboBox.currentIndex = vSettings.roWaterMode - confirmVisible : false - contentItem: Item { - LabelUnitContainer { id: _settingsRoInputItem - anchors.horizontalCenter : parent.horizontalCenter - width : Variables.adjustmentLabelUnitContainerWidth - height : Variables.adjustmentLabelUnitContainerHeight - text : qsTr("RO Water Mode") - contentArea.anchors.leftMargin : width * 0.75 + text : qsTr("RO Water Mode") + width : parent.width / 2 + anchors.horizontalCenter : parent.horizontalCenter - contentItem: BaseSwitch { id: _settingsRoInputSwitch - checked : vSettings.roWaterMode -// checked : vDuetRoWaterDG.status // TODO?? + contentItem : BaseComboBox { id: _roInputComboBox + anchors.rightMargin : Variables.defaultMargin + anchors.leftMargin : anchors.rightMargin + anchors.topMargin : Variables.defaultMargin / 2 + anchors.bottomMargin: anchors.topMargin + centerHorizontally : true - onClicked: { - vSettings.roWaterMode = _settingsRoInputSwitch.checked -// vDuetRoWaterDG.doAdjustment ( _settingsRoInputSwitch.checked ) + currentIndex : vSettings.roWaterMode + model : vTreatmentRanges.roWaterModeOptions + + onActivated: { + vSettings.roWaterMode = _roInputComboBox.currentIndex + vAdjustRoWaterMode.doAdjustment ( _roInputComboBox.currentIndex ) } } } } - // TODO - Connections { target: vDuetRoWaterDG + Connections { target: vAdjustRoWaterMode function onAdjustmentTriggered(vValue) { - if ( vDuetRoWaterDG.adjustment_Accepted ) { + if ( vAdjustRoWaterMode.adjustment_Accepted ) { _settingsRoInput.notificationText = "" } else { - _settingsRoInput.notificationText = vDuetRoWaterDG.notification // adjustment_ReasonText + _settingsRoInput.notificationText = vAdjustRoWaterMode.notification // adjustment_ReasonText } - vSettings.roWaterMode = vDuetRoWaterDG.status } } } Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -rbdf090c85ac9b272d1c693025542e8a5fac5a7e5 -r7bde5ac0646170a584dd5410fcf89fd9bc8b251c --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision bdf090c85ac9b272d1c693025542e8a5fac5a7e5) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) @@ -112,7 +112,7 @@ qsTr("Date and Time" ), // SetDateTime qsTr("Export Logs" ), // ExportLogs qsTr("Language" ), // Localization - qsTr("Water Input Mode" ), // RoInput + qsTr("RO Water Mode" ), // RoInput qsTr("Calibration" ), // Calibration qsTr("Device Configuration" ), // Device Configuration qsTr("Device Registration" ), // DeviceRegistration Index: sources/model/MModel.h =================================================================== diff -u -r8c3cf6523e22b063f4f9d7c595d16398e95ef7bc -r7bde5ac0646170a584dd5410fcf89fd9bc8b251c --- sources/model/MModel.h (.../MModel.h) (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) +++ sources/model/MModel.h (.../MModel.h) (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) @@ -96,7 +96,7 @@ #include "MAdjustDGServiceDatesResponse.h" #include "MAdjustTDDateTimeResponse.h" #include "MAdjustDDDateTimeResponse.h" -#include "MDuetRoWaterDG.h" +#include "MAdjustRoWaterModeResponse.h" #include "MAdjustTDInstitutionalRecordResponse.h" #include "MTDInstitutionalRecordResponse.h" #include "MAdjustTDAdvancedInstitutionalRecordResponse.h" @@ -314,9 +314,8 @@ REGISTER_METATYPE( DuetConfirmTDiData ) \ REGISTER_METATYPE( DuetConfirmUIrData ) \ /* RO Water Mode */ \ - REGISTER_METATYPE( DuetRoWaterStatDGqData ) \ - REGISTER_METATYPE( DuetRoWaterModeUIiData ) \ - REGISTER_METATYPE( DuetRoWaterModeDGrData ) \ + REGISTER_METATYPE( AdjustRoWaterModeRequestData ) \ + REGISTER_METATYPE( AdjustRoWaterModeResponseData ) \ /* POST */ \ REGISTER_METATYPE( HDPostSingleResultData ) \ REGISTER_METATYPE( HDPostFinalResultData ) \ @@ -583,8 +582,7 @@ /* CONFIRM */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DuetConfirmTDiData ) \ /* RO Water Mode */ \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DuetRoWaterStatDGqData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DuetRoWaterModeDGrData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRoWaterModeResponseData ) \ /* POST */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDPostSingleResultData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDPostFinalResultData ) \ @@ -740,7 +738,7 @@ /* CONFIRM */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DuetConfirmUIrData ) \ /* RO Water Mode */ \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DuetRoWaterModeUIiData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustRoWaterModeRequestData ) \ /* POST */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUIPostFinalResultRequestData ) \ \ @@ -831,8 +829,7 @@ /* CONFIRM */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( DuetConfirmTDiData ) \ /* RO Water Mode */ \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DuetRoWaterStatDGqData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DuetRoWaterModeDGrData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRoWaterModeResponseData ) \ /* POST */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDPostSingleResultData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDPostFinalResultData ) \ @@ -990,7 +987,7 @@ /* CONFIRM */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( DuetConfirmUIrData ) \ /* RO Water Mode */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( DuetRoWaterModeUIiData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustRoWaterModeRequestData ) \ /* POST */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ @@ -1064,7 +1061,7 @@ /* CONFIRM */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DuetConfirmUIrData ) \ /* RO Water Mode */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DuetRoWaterModeUIiData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustRoWaterModeRequestData ) \ /* POST */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ @@ -1138,7 +1135,7 @@ /* CONFIRM */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DuetConfirmUIrData ) \ /* RO Water Mode */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DuetRoWaterModeUIiData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustRoWaterModeRequestData ) \ /* POST */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ @@ -1212,8 +1209,7 @@ /* CONFIRM */ \ ACTION_RECEIVE_SIGNAL( DuetConfirmTDiData ) \ /* RO Water Mode */ \ - ACTION_RECEIVE_SIGNAL( DuetRoWaterStatDGqData ) \ - ACTION_RECEIVE_SIGNAL( DuetRoWaterModeDGrData ) \ + ACTION_RECEIVE_SIGNAL( AdjustRoWaterModeResponseData ) \ /* POST */ \ ACTION_RECEIVE_SIGNAL( HDPostSingleResultData ) \ ACTION_RECEIVE_SIGNAL( HDPostFinalResultData ) \ Index: sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.cpp =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.cpp (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.cpp (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) @@ -0,0 +1,36 @@ + +#include "MAdjustRoWaterModeResponse.h" + +using namespace Model; + +QVariantList MAdjustRoWaterModeResponse::parameters() const { + return { + _data.mAccepted.value, + _data.mReason .value, + }; +} + +bool MAdjustRoWaterModeResponse::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 + */ +AdjustRoWaterModeResponseData MAdjustRoWaterModeResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted.value; + data.mReason = _data.mReason .value; + return data; +} Index: sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.h =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.h (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.h (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) @@ -0,0 +1,80 @@ +/*! + * + * Copyright (c) 2023-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 MDuetRoWaterDG.h + * \author (last) Dara Navaei + * \date (last) 08-May-2024 + * \author (original) Behrouz NematiPour + * \date (original) 03-Apr-2023 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAdjustRequestsBase.h" +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustRoWaterModeResponse class + * \details The DD RO Water Mode Status Query model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:| + * |0xEE00| 0x070 | Qry | Y | DD | UI | RO Water Mode | + * + * | Payload || + * | || + * | #1: (U32) | \ref Data::mAccepted | + * | #2: (U32) | \ref Data::mReason | + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DD | + * + */ +class MAdjustRoWaterModeResponse : 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::eDD ; } + QString infoText () const override { return QString("AdjustRoWaterMode") ; } + + struct Data { + quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + }; + + MAdjustRoWaterModeResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustRoWaterModeResponse::Data AdjustRoWaterModeResponseData; Index: sources/model/dg/adjustment/settings/MAdjustDGRequests.h =================================================================== diff -u -r08ffb068817ab0bb1c7f2fe2705986142ac68601 -r7bde5ac0646170a584dd5410fcf89fd9bc8b251c --- sources/model/dg/adjustment/settings/MAdjustDGRequests.h (.../MAdjustDGRequests.h) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) +++ sources/model/dg/adjustment/settings/MAdjustDGRequests.h (.../MAdjustDGRequests.h) (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) @@ -74,7 +74,31 @@ static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } }; + +/*! + * \brief The MdjustRoWaterModeReq class + * \details The model to request DG Cleaning Usage + * + * | MSG | Type | Ack | Src | Dest | Description | + * |:----:|:----:|:---:|:---:|:----:|:-----------:| + * | 0xED | Req | Y | UI | DG | AdjustRoWaterModeReq | + * + * | Payload || + * | || + * | #1:(U32) | \ref mStatus | + * + */ +class MAdjustRoWaterModeReq : public MModel { +public: + quint32 mStatus; + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustROWaterMode", vParameters); + } + + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } +}; } typedef Model::MAdjustDDDateTimeReq AdjustDDDateTimeRequestData; typedef Model::MAdjustDGCleaningUsageReq AdjustDGCleaningUsageRequestData; +typedef Model::MAdjustRoWaterModeReq AdjustRoWaterModeRequestData; Fisheye: Tag 7bde5ac0646170a584dd5410fcf89fd9bc8b251c refers to a dead (removed) revision in file `sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7bde5ac0646170a584dd5410fcf89fd9bc8b251c refers to a dead (removed) revision in file `sources/model/dg/adjustment/settings/MDuetRoWaterDG.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r1df84ec72872967e283b8979e14c2753b740064a -r7bde5ac0646170a584dd5410fcf89fd9bc8b251c --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 1df84ec72872967e283b8979e14c2753b740064a) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) @@ -233,7 +233,8 @@ /*0197*/case GuiAlarmID::ALARM_ID_DD_D92_PUMP_RPM_OUT_OF_RANGE : { result = QObject::tr("DD D92 pump rpm out of range." ); break; } /* 197*/ /*0198*/case GuiAlarmID::ALARM_ID_TD_PRIME_COMPLETED_MEDIUM : { result = QObject::tr("TD prime completed medium priority alarm." ); break; } /* 198*/ /*0199*/case GuiAlarmID::ALARM_ID_TD_REPEATED_AIR_TRAP_LOWER_EVENTS : { result = QObject::tr("TD repeated air trap lower events." ); break; } /* 199*/ -/*0200*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Number of alarms." ); break; } /* 200*/ +/*0200*/case GuiAlarmID::ALARM_ID_TD_TUBE_SET_MISMATCH : { result = QObject::tr("TD tubeset mismatch alarm." ); break; } /* 200*/ +/*0201*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Number of alarms." ); break; } /* 201*/ default: result = QObject::tr("ALARM_ID_UNDEFINED [%1]").arg(int(vAlarmID)); Index: sources/view/VView.h =================================================================== diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -r7bde5ac0646170a584dd5410fcf89fd9bc8b251c --- sources/view/VView.h (.../VView.h) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) +++ sources/view/VView.h (.../VView.h) (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) @@ -139,7 +139,7 @@ REGISTER_TYPE( VDateTime ) \ REGISTER_TYPE( VAdjustmentAlarmVolume ) \ REGISTER_TYPE( VBluetooth ) \ - REGISTER_TYPE( VDuetRoWaterDG ) \ + REGISTER_TYPE( VAdjustRoWaterMode ) \ REGISTER_TYPE( VCloudSync ) \ REGISTER_TYPE( VHDUsageInfo ) \ REGISTER_TYPE( VAdjustmentInstitutionalRecord ) \ Index: sources/view/settings/VAdjustRoWaterMode.cpp =================================================================== diff -u --- sources/view/settings/VAdjustRoWaterMode.cpp (revision 0) +++ sources/view/settings/VAdjustRoWaterMode.cpp (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) @@ -0,0 +1,44 @@ +#include "VAdjustRoWaterMode.h" + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VAdjustRoWaterMode) + +/*! + * \brief Connection Initializer + * \details All the class signal/slot connections are defined here. +*/ +void View::VAdjustRoWaterMode::initConnections() { + ADJUST_VIEW_CONNECTION(AdjustRoWaterModeRequestData) + ACTION_VIEW_CONNECTION(AdjustRoWaterModeResponseData) + ACTION_VIEW_CONNECTION(SettingsData) +} + +void View::VAdjustRoWaterMode::onActionReceive(const AdjustRoWaterModeResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + + // *** has to be the last to let the information to be set and then emit the signal *** + // *** otherwise will use the Previous values before being set. *** + adjustment ( true ); +} + +void View::VAdjustRoWaterMode::doAdjustment(int vStatus) +{ + AdjustRoWaterModeRequestData data; + data.mStatus = vStatus; + emit didAdjustment(data); +} + +/*! + * \brief VAdjustRoWaterMode::onSettingsDone + * \details fills the items below, read from the settings file, when the reading is notified done by ApplicationController. + * acidConcentrateOptions + */ +void View::VAdjustRoWaterMode::onActionReceive(const SettingsData &) +{ + QString mCategory = Storage::Settings_Category_SettingsSystem; + FROMVARIANT( status, "Feature Configurations" , "RoWaterMode", UInt ); +} Index: sources/view/settings/VAdjustRoWaterMode.h =================================================================== diff -u --- sources/view/settings/VAdjustRoWaterMode.h (revision 0) +++ sources/view/settings/VAdjustRoWaterMode.h (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) @@ -0,0 +1,44 @@ +#pragma once + +// Qt +#include + +// Project +#include "main.h" // Doxygen : do not remove +#include "VAdjustmentResponseBase.h" +#include "MAdjustRoWaterModeResponse.h" +#include "MSettings.h" + +// namespace +namespace View { + +/*! + * \brief The VAdjustRoWaterMode class + * \details View for Model's data representation. + */ +class VAdjustRoWaterMode : public VAdjustmentResponseBase +{ + Q_OBJECT + + // The property adjustment_Triggered has to be always true + // and to always trigger the change event to work as a notifier for GUI + // has been manually tested that it works perfectly fine + TRIGGER ( bool , adjustment , 0) + + TRIGGER ( bool , status , 0) + + VIEW_DEC_CLASS_ADJUSTMENT(VAdjustRoWaterMode, AdjustRoWaterModeResponseData) + VIEW_DEC_SLOT(SettingsData) + +public slots: + void doAdjustment(int vStatus); + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to send the user's Request + * \param vData - data model includes request information + */ + void didAdjustment(const AdjustRoWaterModeRequestData &vData); +}; +} Fisheye: Tag 7bde5ac0646170a584dd5410fcf89fd9bc8b251c refers to a dead (removed) revision in file `sources/view/settings/VDuetRoWaterDG.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7bde5ac0646170a584dd5410fcf89fd9bc8b251c refers to a dead (removed) revision in file `sources/view/settings/VDuetRoWaterDG.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/settings/VSettings.cpp =================================================================== diff -u -r8f6ecb60abf6d47d4554cfd3019ca496d79b6f69 -r7bde5ac0646170a584dd5410fcf89fd9bc8b251c --- sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision 8f6ecb60abf6d47d4554cfd3019ca496d79b6f69) +++ sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) @@ -56,10 +56,10 @@ } } -void VSettings::roWaterMode_post(const bool &vroWaterMode_post) { +void VSettings::roWaterMode_post(const int &vroWaterMode_post) { //TODO The Settings shall be the Singleton SettingsController and modify the MSettings like the others. if ( Storage::Settings::save(roWaterModeGroup(), roWaterModeKey(), QString::number(vroWaterMode_post)) != 0 ) { - roWaterMode(false); + roWaterMode(0); // FIXME: Notify UI with a message } } @@ -151,8 +151,8 @@ servicePass ( mServicePass); } else if ( isroWaterMode (category, group, key) ) { - bool mRoWaterMode; - mRoWaterMode = _Settings.value(category, group, key).toBool (); + int mRoWaterMode; + mRoWaterMode = _Settings.value(category, group, key).toInt (); keyValue[key] = mRoWaterMode ; roWaterMode ( mRoWaterMode); } Index: sources/view/settings/VSettings.h =================================================================== diff -u -r8f6ecb60abf6d47d4554cfd3019ca496d79b6f69 -r7bde5ac0646170a584dd5410fcf89fd9bc8b251c --- sources/view/settings/VSettings.h (.../VSettings.h) (revision 8f6ecb60abf6d47d4554cfd3019ca496d79b6f69) +++ sources/view/settings/VSettings.h (.../VSettings.h) (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) @@ -68,7 +68,7 @@ SETTINGS(QString , servicePass , "" , Storage::Settings_Category_SettingsSystem , "Service" , "Password" ) SETTINGS(quint8 , alarmVolume , 5 , Storage::Settings_Category_SettingsSystem , "Alarm" , "Volume" ) - SETTINGS(bool , roWaterMode , false , Storage::Settings_Category_SettingsSystem , "Feature Configurations" , "RoWaterMode" ) + SETTINGS(int , roWaterMode , 0 , Storage::Settings_Category_SettingsSystem , "Feature Configurations" , "RoWaterMode" ) SETTINGS(bool , integratedBPCuff , false , Storage::Settings_Category_SettingsSystem , "Feature Configurations" , "IntegratedBPCuff" ) SETTINGS(bool , heparinSyringePump , false , Storage::Settings_Category_SettingsSystem , "Feature Configurations" , "HeparinSyringePump" ) SETTINGS(bool , chemicalDisinfection , false , Storage::Settings_Category_SettingsSystem , "Feature Configurations" , "ChemicalDisinfection" ) Index: sources/view/td/data/VTreatmentRanges.cpp =================================================================== diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -r7bde5ac0646170a584dd5410fcf89fd9bc8b251c --- sources/view/td/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) +++ sources/view/td/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) @@ -251,6 +251,7 @@ dryBicabCartridgeSizeOptions ( _Settings.keys(mCategory , "Dry Bicarb Cartridge Size" )); waterSampleTestResultRequired ( _Settings.keys(mCategory , "Water Sample Test Result Required" )); hepatitisStatus ( _Settings.keys(mCategory , "Hepatitis Status" )); + roWaterModeOptions ( _Settings.keys(mCategory , "RO Water Mode" )); QStringList mAcidConcentrateKeys = _Settings.keys(mCategory , "Acid Concentrate Options" ); QVariantList mAcidConcentrateValues = _Settings.values(mCategory , "Acid Concentrate Options" ); @@ -273,6 +274,7 @@ isConfigsOk = isConfigsOk && !_dryBicabCartridgeSizeOptions .isEmpty(); isConfigsOk = isConfigsOk && !_waterSampleTestResultRequired.isEmpty(); isConfigsOk = isConfigsOk && !_hepatitisStatus .isEmpty(); + isConfigsOk = isConfigsOk && !_roWaterModeOptions .isEmpty(); vitalsInterval(_bloodPressureMeasureInterval.indexOf(_vitalsDef)); Index: sources/view/td/data/VTreatmentRanges.h =================================================================== diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -r7bde5ac0646170a584dd5410fcf89fd9bc8b251c --- sources/view/td/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) +++ sources/view/td/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c) @@ -128,6 +128,9 @@ // isolated UF RANGESET( quint32 , isolatedUFDuration , 0) + // RO Water + READONLY( QStringList , roWaterModeOptions ,{}) + VIEW_DEC_CLASS(VTreatmentRanges ) VIEW_DEC_SLOT(TreatmentRangesData ) VIEW_DEC_SLOT(SettingsData )