Index: denali.pro =================================================================== diff -u -r1ad10f77d0e95a986a670004d820be8fc4d2ccdb -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 --- denali.pro (.../denali.pro) (revision 1ad10f77d0e95a986a670004d820be8fc4d2ccdb) +++ denali.pro (.../denali.pro) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) @@ -53,6 +53,7 @@ sources/main.h \ sources/model/MDGDebugText.h \ sources/model/MHDDebugText.h \ + sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h \ sources/storage/DriveWatcher.h \ sources/threads.h \ sources/maintimer.h \ @@ -85,7 +86,6 @@ sources/model/hd/data/MHDOperationModeData.h \ sources/model/hd/data/MTreatmentSalineData.h \ sources/model/hd/data/MHDAccelerometerData.h \ - sources/model/hd/data/MHDVersionData.h \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDrainPumpData.h \ sources/model/dg/data/MDGHeatersData.h \ @@ -112,6 +112,7 @@ sources/gui/guicontroller.h \ \ # ---------- Views ---------- sources/view/VEventSpy.h \ + sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.h \ sources/view/hd/data/VHDTreatmentStatesData.h \ sources/view/vview.h \ sources/view/vpoweroff.h \ @@ -164,6 +165,8 @@ main.cpp \ sources/model/MDGDebugText.cpp \ sources/model/MHDDebugText.cpp \ + sources/model/hd/adjustment/MHDVersionResponse.cpp \ + sources/model/hd/data/MHDVersionData.cpp \ sources/storage/DriveWatcher.cpp \ sources/threads.cpp \ sources/maintimer.cpp \ @@ -219,7 +222,9 @@ sources/gui/guicontroller.cpp \ \ # ---------- Views ---------- sources/view/VEventSpy.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.cpp \ sources/view/hd/data/VHDTreatmentStatesData.cpp \ + sources/view/hd/data/VHDVersionData.cpp \ sources/view/vpoweroff.cpp \ \ # ---------- Views - Alarm sources/view/valarmstatus.cpp \ Index: main.cpp =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 --- main.cpp (.../main.cpp) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ main.cpp (.../main.cpp) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) @@ -180,6 +180,7 @@ } } } + /*! * \brief setApplicationVersion * \details sets up the application version regarding the environment valiables @@ -299,7 +300,6 @@ //! - Initializing Main Timer _MainTimer.init(); - //! - Initialize the Qml Viewer and starts GUI int app_exec = -1; LOG_DEBUG("UI Initializing"); Index: sources/applicationpost.h =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 --- sources/applicationpost.h (.../applicationpost.h) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/applicationpost.h (.../applicationpost.h) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file applicationpost.h - * \author (last) Behrouz NematiPour - * \date (last) 21-Oct-2019 + * \author (last) Peman Montazemi + * \date (last) 6-Nov-2020 * \author (original) Behrouz NematiPour * \date (original) 24-Sep-2019 * @@ -28,4 +28,3 @@ public slots: }; - Index: sources/canbus/messagedispatcher.cpp =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 --- sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) @@ -294,6 +294,18 @@ onActionTransmit(GuiActionType::ID_AdjustSalineReq, mData); } +/*! + * \brief MessageDispatcher::onHDVersions + * \details This method transmits the HD Version Denali message. + * \param vData - Data model contains HD Version state. + * \return void + */ +void MessageDispatcher::onHDVersions(const AdjustHDVersionsRequestData &vData) +{ + QVariantList mData; + mData += vData.requestedState; + onActionTransmit(GuiActionType::ID_AdjustHDVersionsReq, mData); +} /*! * \brief MessageDispatcher::actionTransmit Index: sources/canbus/messagedispatcher.h =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 --- sources/canbus/messagedispatcher.h (.../messagedispatcher.h) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/canbus/messagedispatcher.h (.../messagedispatcher.h) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file messagedispatcher.h - * \author (last) Behrouz NematiPour - * \date (last) 30-Jul-2020 + * \author (last) Peman Montazemi + * \date (last) 6-Nov-2020 * \author (original) Behrouz NematiPour * \date (original) 09-Dec-2019 * @@ -108,6 +108,7 @@ GuiActionType::ID_AdjustUltrafiltrationStateReq , GuiActionType::ID_AdjustUltrafiltrationEditReq , GuiActionType::ID_AdjustUltrafiltrationConfirmReq , + GuiActionType::ID_AdjustHDVersionsReq , GuiActionType::ID_AlarmSilenceReq , }; @@ -206,7 +207,5 @@ // ---- Signal/Slots ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS - }; - } Index: sources/canbus/messageglobals.h =================================================================== diff -u -re226d05ea339805934c2ebbaba108e7b03d5a001 -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 --- sources/canbus/messageglobals.h (.../messageglobals.h) (revision e226d05ea339805934c2ebbaba108e7b03d5a001) +++ sources/canbus/messageglobals.h (.../messageglobals.h) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) @@ -107,14 +107,19 @@ {Gui::GuiActionType::ID_AdjustSalineRsp , 3 * 4 }, // 3 parameters each 4bytes // ---- + {Gui::GuiActionType::ID_AdjustHDVersionsReq , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustHDVersionsRsp , 8 * 4 }, // 8 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustDGVersionsReq , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustDGVersionsRsp , 8 * 4 }, // 8 parameters each 4bytes + + // ---- {Gui::GuiActionType::ID_CANBusFaultCount , 1 }, {Gui::GuiActionType::ID_RawData , 255 }, {Gui::GuiActionType::ID_Acknow , 0 }, {Gui::GuiActionType::ID_AcknowGeneric , 1 }, {Gui::GuiActionType::ID_HDDebugText , 40 + 1 }, // ASCII text - 40 bytes + null term {Gui::GuiActionType::ID_DGDebugText , 40 + 1 }, // ASCII text - 40 bytes + null term - }; /*! @@ -144,7 +149,6 @@ eLenCRCDigits = 2, eLenChannelDigits = 3, eLenMessageIDDigits = 4, - }; /*! Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -re226d05ea339805934c2ebbaba108e7b03d5a001 -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision e226d05ea339805934c2ebbaba108e7b03d5a001) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) @@ -245,6 +245,12 @@ LOG_EVENT(AlarmSilenceRequestData::toString(vData)); break; + case Gui::GuiActionType::ID_HDVersionData: + if ( ! count ) { logInvalidLength(vActionId); return false; } + vPayload = Format::fromVariant(vData); + LOG_EVENT(HDVersionRequestData::toString(vData)); + break; + default: QString mActionIdHexString = Format::toHexString(vActionId); LOG_DEBUG(mSenderID + tr("Unknown transmit Message with ID '%1'").arg(mActionIdHexString)); @@ -317,6 +323,7 @@ case Gui::GuiActionType::ID_TreatmentStates : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentStates ); break; case Gui::GuiActionType::ID_Saline : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Saline ); break; case Gui::GuiActionType::ID_HDAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDAccelerometerData ); break; + case Gui::GuiActionType::ID_HDVersionData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDVersionData ); break; // ----- Events case Gui::GuiActionType::ID_HDOperationModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDOperationModeData ); break; Index: sources/canbus/messageinterpreter.h =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 --- sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file messageinterpreter.h - * \author (last) Behrouz NematiPour - * \date (last) 03-Aug-2020 + * \author (last) Peman Montazemi + * \date (last) 6-Nov-2020 * \author (original) Behrouz NematiPour * \date (original) 13-Dec-2019 * @@ -82,7 +82,5 @@ signals: ACTION_RECEIVE_SIGNALS - }; - } Index: sources/gui/guiglobals.cpp =================================================================== diff -u -re226d05ea339805934c2ebbaba108e7b03d5a001 -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 --- sources/gui/guiglobals.cpp (.../guiglobals.cpp) (revision e226d05ea339805934c2ebbaba108e7b03d5a001) +++ sources/gui/guiglobals.cpp (.../guiglobals.cpp) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file guiglobals.cpp - * \author (last) Behrouz NematiPour - * \date (last) 23-Aug-2020 + * \author (last) Peman Montazemi + * \date (last) 2-Nov-2020 * \author (original) Behrouz NematiPour * \date (original) 28-Oct-2019 * @@ -40,6 +40,7 @@ #include "VTreatmentSalineData.h" #include "VHDTreatmentStatesData.h" #include "VHDAccelerometerData.h" +#include "VHDVersionData.h" #include "VDGDrainPumpData.h" #include "VDGHeatersData.h" Index: sources/gui/guiglobals.h =================================================================== diff -u -r1ad10f77d0e95a986a670004d820be8fc4d2ccdb -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 --- sources/gui/guiglobals.h (.../guiglobals.h) (revision 1ad10f77d0e95a986a670004d820be8fc4d2ccdb) +++ sources/gui/guiglobals.h (.../guiglobals.h) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file guiglobals.h - * \author (last) Behrouz NematiPour - * \date (last) 25-Aug-2020 + * \author (last) Peman Montazemi + * \date (last) 2-Nov-2020 * \author (original) Behrouz NematiPour * \date (original) 28-Oct-2019 * @@ -78,13 +78,12 @@ ID_TreatmentStates = 0x0F00, // 15 ID_Saline = 0x2F00, // 47 ID_HDAccelerometerData = 0x3300, // 51 - ID_HDVersionData = 0x1D00, // 29 ID_AlarmStatus = 0x0200, ID_AlarmTriggered = 0x0300, ID_AlarmCleared = 0x0400, ID_AlarmSilenceReq = 0x3200, // 50 - Not implemented yet on FW side - ID_AlarmSilenceRsp = 0x0000, // Needs to be removed. + ID_AlarmSilenceRsp = 0x0000, // Needs to be removed ID_HDOperationModeData = 0x2500, // 37 @@ -117,6 +116,10 @@ ID_AdjustSalineReq = 0x1200, // 18 ID_AdjustSalineRsp = 0x1400, // 20 + ID_AdjustHDVersionsReq = 0x1C00, // 28 + ID_AdjustHDVersionsRsp = 0x1D00, // 29 + ID_AdjustDGVersionsReq = 0x1C00, // 28 + ID_AdjustDGVersionsRsp = 0x1E00, // 30 }; enum class GuiActionsData_Enum /*: quint8 QML doesn't support*/ { Index: sources/main.h =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 --- sources/main.h (.../main.h) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/main.h (.../main.h) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) @@ -167,4 +167,3 @@ //--------------------------------------------------------------------------------// #define REGISTER_TYPE(vTYPE) \ qmlRegisterType < vTYPE > (#vTYPE, 0, 1, #vTYPE); - Index: sources/model/MModel.h =================================================================== diff -u -re226d05ea339805934c2ebbaba108e7b03d5a001 -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 --- sources/model/MModel.h (.../MModel.h) (revision e226d05ea339805934c2ebbaba108e7b03d5a001) +++ sources/model/MModel.h (.../MModel.h) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file MModel.h - * \author (last) Behrouz NematiPour - * \date (last) 20-Aug-2020 + * \author (last) Peman Montazemi + * \date (last) 6-Nov-2020 * \author (original) Behrouz NemaiPour * \date (original) 02-Jul-2020 * @@ -53,6 +53,7 @@ #include "MTreatmentAdjustUltrafiltrationEditResponse.h" #include "MTreatmentAdjustUltrafiltrationConfirmResponse.h" #include "MTreatmentAdjustSalineResponse.h" +#include "MTreatmentAdjustHDVersionsResponse.h" /*! * \brief Message interpretation instruction @@ -149,21 +150,22 @@ \ REGISTER_METATYPE( HDDebugTextData ) \ REGISTER_METATYPE( DGDebugTextData ) \ - /* Request */ \ + /* Request */ REGISTER_METATYPE( AdjustBloodDialysateRequestData ) \ REGISTER_METATYPE( AdjustDurationRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmRequestData ) \ REGISTER_METATYPE( AdjustSalineRequestData ) \ - /* Response */ \ + REGISTER_METATYPE( AdjustHDVersionsRequestData ) \ + /* Response */ REGISTER_METATYPE( AdjustBloodDialysateResponseData ) \ REGISTER_METATYPE( AdjustDurationResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) \ - REGISTER_METATYPE( AdjustSalineResponseData ) - + REGISTER_METATYPE( AdjustSalineResponseData ) \ + REGISTER_METATYPE( AdjustHDVersionsResponseData ) //===============================================================================// #define ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, BloodFlowData ) \ @@ -180,7 +182,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentSalineData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDOperationModeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAccelerometerData ) \ - \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGROPumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGPressuresData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDrainPumpData ) \ @@ -191,24 +193,27 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGLoadCellReadingsData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGTemperaturesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGAccelerometerData ) \ - \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDebugTextData ) \ - /* Response */ \ + /* Response */ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDurationResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) -// /* Request */ ---------------------------------------------------------// + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDVersionsResponseData ) + /* Request */ #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDurationRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDVersionsRequestData ) //===============================================================================// #define ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS \ ACTION_RECEIVE_BRIDGE_DEFINITION( BloodFlowData ) \ @@ -245,31 +250,35 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDurationResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSalineResponseData ) + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSalineResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDVersionsResponseData ) // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSalineRequestData ) + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSalineRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDVersionsRequestData ) // /* Request */ ----------------------- NoEmit --------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationConfirmRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSalineRequestData ) + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSalineRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDVersionsRequestData ) // /* Request */ ----------------------- public --------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationConfirmRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSalineRequestData ) + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSalineRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDVersionsRequestData ) //===============================================================================// #define ACTION_RECEIVE_SIGNALS \ ACTION_RECEIVE_SIGNAL( BloodFlowData ) \ @@ -306,6 +315,7 @@ ACTION_RECEIVE_SIGNAL( AdjustDurationResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationConfirmResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustSalineResponseData ) + ACTION_RECEIVE_SIGNAL( AdjustSalineResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustHDVersionsResponseData ) //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// Index: sources/model/hd/adjustment/MHDVersionResponse.cpp =================================================================== diff -u --- sources/model/hd/adjustment/MHDVersionResponse.cpp (revision 0) +++ sources/model/hd/adjustment/MHDVersionResponse.cpp (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) @@ -0,0 +1,45 @@ +/*! + * + * 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 MHDVersionResponse.cpp + * \author (last) Peman Montazemi + * \date (last) 4-Nov-2020 + * \author (original) Peman Montazemi + * \date (original) 4-Nov-2020 + * + */ +#include "MTreatmentAdjustHDVersionsResponse.h" + +using namespace Model; + + +QVariantList MHDVersionResponse::parameters() const { + return { + _data.mAccepted.value, + _data.mReason .value, + _data.mTarget .value + }; +} + +bool MHDVersionResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if (GetValue(vByteArray, index, _data.mAccepted )) + if (GetValue(vByteArray, index, _data.mReason )) + if (GetValue(vByteArray, index, _data.mTarget )) + return true ; + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } +} + +HDVersionResponseData MHDVersionResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted.value; + data.mReason = _data.mReason .value; + data.mTarget = _data.mTarget .value; + return data; +} Index: sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h =================================================================== diff -u --- sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h (revision 0) +++ sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) @@ -0,0 +1,71 @@ +/*! + * + * 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 MHDVersionResponse.h + * \author (last) Peman Montazemi + * \date (last) 6-Nov-2020 + * \author (original) Peman Montazemi + * \date (original) 4-Nov-2020 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +class MAdjustHDVersionsResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U08 mMajor ; + Types::U08 mMinor ; + Types::U08 mMicro ; + Types::U16 mBuild ; + Types::U08 mFPGAId ; + Types::U08 mFPGAMajor ; + Types::U08 mFPGAMinor ; + Types::U08 mFPGALab ; + } _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("HDVersions") ; } + + struct Data { + quint8 mMajor = 0; /*!< HD Versions Major value of type quint08 extracted out */ + quint8 mMinor = 0; /*!< HD Versions Minor value of type quint08 extracted out */ + quint8 mMicro = 0; /*!< HD Versions Micro value of type quint08 extracted out */ + quint16 mBuild = 0; /*!< HD Versions Build value of type quint08 extracted out */ + quint8 mFPGAId = 0; /*!< HD Versions FPGA ID value of type quint08 extracted out */ + quint8 mFPGAMajor = 0; /*!< HD Versions FPGA Major value of type quint08 extracted out */ + quint8 mFPGAMinor = 0; /*!< HD Versions FPGA Minor value of type quint08 extracted out */ + quint8 mFPGALab = 0; /*!< HD Versions FPGA Lab value of type quint08 extracted out */ + }; + + MAdjustHDVersionsResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustHDVersionsResponse::Data AdjustHDVersionsResponseData; Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file MTreatmentAdjustRequests.h - * \author (last) Behrouz NematiPour - * \date (last) 10-Aug-2020 + * \author (last) Peman Montazemi + * \date (last) 6-Nov-2020 * \author (original) Behrouz NemaiPour * \date (original) 02-Jul-2020 * @@ -155,6 +155,19 @@ } }; +class MAdjustVersionReq : public MModel { +public: + // coco begin validated : Has been validated manually. + // This object is used statically for now, kept the logic for later usage. + QString toString() { + return toString({}); + } + // coco end + static QString toString(const QVariantList &vParameters) { + return MModel::toString("Version", vParameters); + } +}; + class MAlarmSilenceReq : public MModel { public: bool state = 0; @@ -168,7 +181,6 @@ return MModel::toString("AlarmSilence", vParameters); } }; - } typedef Model:: MAdjustPowerOffReq AdjustPowerOffRequestData; @@ -178,5 +190,5 @@ typedef Model:: MAdjustUltrafiltrationEditReq AdjustUltrafiltrationEditRequestData; typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData; typedef Model:: MAdjustSalineReq AdjustSalineRequestData; - +typedef Model:: MAdjustVersionReq AdjustHDVersionsRequestData; typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; Index: sources/model/hd/data/MHDVersionData.cpp =================================================================== diff -u --- sources/model/hd/data/MHDVersionData.cpp (revision 0) +++ sources/model/hd/data/MHDVersionData.cpp (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) @@ -0,0 +1,64 @@ +/*! + * + * Copyright (c) 2020-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 MHDVersionData.cpp + * \author (last) Peman Montazemi + * \date (last) 2-Nov-2020 + * \author (original) Peman Montazemi + * \date (original) 2-Nov-2020 + * + */ +#include "MHDVersionData.h" + +using namespace Model; + +QVariantList MHDVersion::parameters() const { + return { + _data.mMajor .value, + _data.mMinor .value, + _data.mMicro .value, + _data.mBuild .value, + _data.mFPGAId .value, + _data.mFPGAMajor .value, + _data.mFPGAMinor .value, + _data.mFPGALab .value, + }; +} + +bool MHDVersion::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if (GetValue(vByteArray, index, _data.mMajor )) + if (GetValue(vByteArray, index, _data.mMinor )) + if (GetValue(vByteArray, index, _data.mMicro )) + if (GetValue(vByteArray, index, _data.mBuild )) + if (GetValue(vByteArray, index, _data.mFPGAId )) + if (GetValue(vByteArray, index, _data.mFPGAMajor )) + if (GetValue(vByteArray, index, _data.mFPGAMinor )) + if (GetValue(vByteArray, index, _data.mFPGALab )) + return true ; + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } +} + +MHDVersion::Data MHDVersion::data() const { + Data data; + data.mMajor = _data.mMajor .value; + data.mMinor = _data.mMinor .value; + data.mMicro = _data.mMicro .value; + data.mBuild = _data.mBuild .value; + data.mFPGAId = _data.mFPGAId .value; + data.mFPGAMajor = _data.mFPGAMajor .value; + data.mFPGAMinor = _data.mFPGAMinor .value; + data.mFPGALab = _data.mFPGALab .value; + return data; +} Fisheye: Tag 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 refers to a dead (removed) revision in file `sources/model/hd/data/MHDVersionData.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.cpp =================================================================== diff -u --- sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.cpp (revision 0) +++ sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.cpp (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) @@ -0,0 +1,46 @@ +/*! + * + * 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 VTreatmentAdjustmentSaline.cpp + * \author (last) Peman Montazemi + * \date (last) 6-Nov-2020 + * \author (original) Peman Montazemi + * \date (original) 6-Nov-2020 + * + */ +#include "VTreatmentAdjustmentHDVersions.h" + +// Project +#include "guicontroller.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentHDVersions, AdjustHDVersionsResponseData) + +void VTreatmentAdjustmentHDVersions::initConnections() { + ACTION_VIEW_CONNECTION(AdjustHDVersionsResponseData); + ADJUST_VIEW_CONNECTION(AdjustHDVersionsRequestData ); +} + +void VTreatmentAdjustmentHDVersions::onActionReceive(const AdjustHDVersionsResponseData &vData) +{ + verMajor (vData.mMajor ); + verMinor (vData.mMinor ); + verMicro (vData.mMicro ); + verBuild (vData.mBuild ); + verFPGAId (vData.mFPGAId ); + verFPGAMajor (vData.mFPGAMajor); + verFPGAMinor (vData.mFPGAMinor); + verFPGALab (vData.mFPGALab ); + + // *** 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); // set here only because adjustment parent needs it, but HD Versions does not +} + +void View::VTreatmentAdjustmentHDVersions::doAdjustment() +{ + emit didAdjustment(); // notify the controllers to do the adjustment +} Index: sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.h =================================================================== diff -u --- sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.h (revision 0) +++ sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.h (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) @@ -0,0 +1,60 @@ +/*! + * + * 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 VTreatmentAdjustmentSaline.h + * \author (last) Peman Montazemi + * \date (last) 6-Nov-2020 + * \author (original) Peman Montazemi + * \date (original) 6-Nov-2020 + * + */ +#pragma once + +#include + +// Project +#include "vtreatmentadjustmentresponsebase.h" + +namespace View { + +class VTreatmentAdjustmentHDVersions : public VTreatmentAdjustmentResponseBase { + Q_OBJECT + + // friends + friend class ::tst_views; + + AdjustHDVersionsRequestData _data; + + // coco begin validated: + // 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 ) + // coco end + + // HD Versions data + PROPERTY( qint8, verMajor, 0) + PROPERTY( qint8, verMinor, 0) + PROPERTY( qint8, verMicro, 0) + PROPERTY( qint16, verBuild, 0) + PROPERTY( qint8, verFPGAId, 0) + PROPERTY( qint8, verFPGAMajor, 0) + PROPERTY( qint8, verFPGAMinor, 0) + PROPERTY( qint8, verFPGALab, 0) + + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentHDVersions, AdjustHDVersionsResponseData) + +// ---------- HD Version +public slots: + void doAdjustment() { + emit didAdjustment(); + } + +signals: + void didAdjustment(); +}; +} Index: sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 --- sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h (.../VTreatmentAdjustmentSaline.h) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h (.../VTreatmentAdjustmentSaline.h) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file VTreatmentAdjustmentSaline.h - * \author (last) Behrouz NematiPour - * \date (last) 23-Aug-2020 + * \author (last) Peman Montazemi + * \date (last) 6-Nov-2020 * \author (original) Behrouz NematiPour * \date (original) 13-Aug-2020 * @@ -21,8 +21,7 @@ namespace View { -class VTreatmentAdjustmentSaline : public VTreatmentAdjustmentResponseBase -{ +class VTreatmentAdjustmentSaline : public VTreatmentAdjustmentResponseBase { Q_OBJECT // friends Index: sources/view/hd/data/VHDVersionData.cpp =================================================================== diff -u --- sources/view/hd/data/VHDVersionData.cpp (revision 0) +++ sources/view/hd/data/VHDVersionData.cpp (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) @@ -0,0 +1,31 @@ +/*! + * + * Copyright (c) 2020-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 VHDVersionData.cpp + * \author (last) Peman Montazemi + * \date (last) 4-Nov-2020 + * \author (original) Peman Montazemi + * \date (original) 4-Nov-2020 + * + */ +#include "VHDAccelerometerData.h" + +// Project +#include "guicontroller.h" + +VIEW_DEF(VHDVersion , HDVersionData) + +void VHDVersion::onActionReceive(const HDVersionData &vData) { + major (vData.mMajor ); + minor (vData.mMinor ); + micro (vData.mMicro ); + build (vData.mBuild ); + FPGAId (vData.mFPGAId ); + FPGAMajor (vData.mFPGAMajor ); + FPGAMinor (vData.mFPGAMinor ); + FPGALab (vData.mFPGALab ); +} Index: sources/view/vview.h =================================================================== diff -u -re226d05ea339805934c2ebbaba108e7b03d5a001 -r50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7 --- sources/view/vview.h (.../vview.h) (revision e226d05ea339805934c2ebbaba108e7b03d5a001) +++ sources/view/vview.h (.../vview.h) (revision 50103d94820ce834f18b0b3d31dd8d6d7fbf8cc7) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file vview.h - * \author (last) Behrouz NematiPour - * \date (last) 13-Aug-2020 + * \author (last) Peman Montazemi + * \date (last) 6-Nov-2020 * \author (original) Behrouz NematiPour * \date (original) 10-Mar-2020 * @@ -124,5 +124,5 @@ REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationEdit ) \ REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationConfirm ) \ REGISTER_TYPE( VTreatmentAdjustmentSaline ) \ - + REGISTER_TYPE( VTreatmentAdjustmentHDVersion ) //--------------------------------------------------------------------------------//