Index: denali.pro =================================================================== diff -u -rbd560752aaa76183f168f0af6ad97b75b6b57c79 -rcb7aaf6a2207a1112a086676391d504bafbc58e4 --- denali.pro (.../denali.pro) (revision bd560752aaa76183f168f0af6ad97b75b6b57c79) +++ denali.pro (.../denali.pro) (revision cb7aaf6a2207a1112a086676391d504bafbc58e4) @@ -89,6 +89,7 @@ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h \ sources/model/hd/adjustment/MAdjustHDDateTimeResponse.h \ + sources/model/hd/adjustment/MAdjustHDServiceResponse.h \ \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/MTreatmentAdjustRequests.h \ sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h \ @@ -123,6 +124,7 @@ \ # ---------- Models - DG - Adjustment sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.h \ sources/model/dg/adjustment/MAdjustDGDateTimeResponse.h \ + sources/model/dg/adjustment/MAdjustDGServiceResponse.h \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDrainPumpData.h \ sources/model/dg/data/MDGHeatersData.h \ @@ -255,6 +257,7 @@ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp \ sources/model/hd/adjustment/MAdjustHDDateTimeResponse.cpp \ + sources/model/hd/adjustment/MAdjustHDServiceResponse.cpp \ \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp \ @@ -288,6 +291,7 @@ \ # ---------- Models - DG - Adjustment sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.cpp \ sources/model/dg/adjustment/MAdjustDGDateTimeResponse.cpp \ + sources/model/dg/adjustment/MAdjustDGServiceResponse.cpp \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDrainPumpData.cpp \ sources/model/dg/data/MDGHeatersData.cpp \ Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rb55cd9ea96a465115044a79bb768c7445461f2a2 -rcb7aaf6a2207a1112a086676391d504bafbc58e4 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision b55cd9ea96a465115044a79bb768c7445461f2a2) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision cb7aaf6a2207a1112a086676391d504bafbc58e4) @@ -523,6 +523,19 @@ } /*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the request for service information. + * \param vData - Data model contains the epoch time + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustServiceRequestData &vData) +{ + Q_UNUSED(vData); + QVariantList mData; + onActionTransmit(GuiActionType::ID_AdjustServiceReq, mData); +} + +/*! * \brief MessageDispatcher::actionTransmit * \details This method is called by slot MessageDispatcher::onActionTransmit * which emits didFrameTransmit on successful interpretation of the requested message Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rbd560752aaa76183f168f0af6ad97b75b6b57c79 -rcb7aaf6a2207a1112a086676391d504bafbc58e4 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision bd560752aaa76183f168f0af6ad97b75b6b57c79) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision cb7aaf6a2207a1112a086676391d504bafbc58e4) @@ -235,6 +235,7 @@ case Gui::GuiActionType::ID_AdjustVersionsReq : INTERPRET_RECVD_MT_MESSAGE(AdjustVersionsRequestData ); break; case Gui::GuiActionType::ID_AdjustHDDateTimeReq : INTERPRET_RECEIVED_MESSAGE(AdjustHDDateTimeRequestData ); break; case Gui::GuiActionType::ID_AdjustDGDateTimeReq : INTERPRET_RECEIVED_MESSAGE(AdjustDGDateTimeRequestData ); break; + case Gui::GuiActionType::ID_AdjustServiceReq : INTERPRET_RECVD_MT_MESSAGE(AdjustServiceRequestData ); break; // in-treatment case Gui::GuiActionType::ID_AdjustDurationReq : INTERPRET_RECEIVED_MESSAGE(AdjustDurationRequestData ); break; case Gui::GuiActionType::ID_AdjustBloodDialysateReq : INTERPRET_RECEIVED_MESSAGE(AdjustBloodDialysateRequestData ); break; @@ -359,8 +360,9 @@ case Gui::GuiActionType::ID_AdjustRinsebackRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustRinsebackRsp ); break; case Gui::GuiActionType::ID_AdjustRecirculateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustRecirculateRsp ); break; case Gui::GuiActionType::ID_AdjustTreatmentEndRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustTreatmentEndRsp ); break; - case Gui::GuiActionType::ID_AdjustHDVersionsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHDVersionsRsp ); break; - case Gui::GuiActionType::ID_AdjustHDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHDDateTimeRsp ); break; + case Gui::GuiActionType::ID_AdjustHDVersionsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHDVersionsRsp ); break; + case Gui::GuiActionType::ID_AdjustHDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHDDateTimeRsp ); break; + case Gui::GuiActionType::ID_HDAdjustServiceRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDAdjustServiceRsp ); break; // these need to be standard and use notify as well case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp : ok = adjustUltrafiltrationEdit (vMessage, vData); break; // TODO : implement notify<>() @@ -423,6 +425,7 @@ case Gui::GuiActionType::ID_AdjustDGVersionsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDGVersionsRsp ); break; case Gui::GuiActionType::ID_AdjustDGDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDGDateTimeRsp ); break; case Gui::GuiActionType::ID_DGSerialNumberRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGSerialNumberRsp ); break; + case Gui::GuiActionType::ID_DGAdjustServiceRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGAdjustServiceRsp ); break; // unhandled messages: these will only be logged as received message Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rb55cd9ea96a465115044a79bb768c7445461f2a2 -rcb7aaf6a2207a1112a086676391d504bafbc58e4 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision b55cd9ea96a465115044a79bb768c7445461f2a2) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision cb7aaf6a2207a1112a086676391d504bafbc58e4) @@ -171,6 +171,9 @@ // independent bidirectional ID_AdjustVersionsReq = 0x1C00, // 28 + ID_AdjustServiceReq = 0x8900, // 137 + ID_HDAdjustServiceRsp = 0x8A00, // 138 + ID_DGAdjustServiceRsp = 0x8C00, // 140 ID_AdjustHDVersionsRsp = 0x1D00, // 29 ID_AdjustDGVersionsRsp = 0x1E00, // 30 ID_HDSerialNumberRsp = 0x8700, // 135 Index: sources/gui/qml/pages/SettingsHome.qml =================================================================== diff -u -rb55cd9ea96a465115044a79bb768c7445461f2a2 -rcb7aaf6a2207a1112a086676391d504bafbc58e4 --- sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision b55cd9ea96a465115044a79bb768c7445461f2a2) +++ sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision cb7aaf6a2207a1112a086676391d504bafbc58e4) @@ -149,7 +149,11 @@ anchors.centerIn: parent SettingsItem { id: _item_ title : qsTr("Device Information") - onClicked: _settingsStack.push(_deviceInformation) + onClicked: { + vDeviceInformation.doRequestHDDGVersions() + vDeviceInformation.doRequestServiceData() + _settingsStack.push(_deviceInformation) + } } SettingsItem { id: _item_bluetooth Index: sources/model/MModel.h =================================================================== diff -u -rbd560752aaa76183f168f0af6ad97b75b6b57c79 -rcb7aaf6a2207a1112a086676391d504bafbc58e4 --- sources/model/MModel.h (.../MModel.h) (revision bd560752aaa76183f168f0af6ad97b75b6b57c79) +++ sources/model/MModel.h (.../MModel.h) (revision cb7aaf6a2207a1112a086676391d504bafbc58e4) @@ -75,6 +75,8 @@ #include "MHDSerialNumberResponse.h" #include "MDGSerialNumberResponse.h" #include "MAlarmVolumeData.h" +#include "MAdjustHDServiceResponse.h" +#include "MAdjustDGServiceResponse.h" /*! * \page MessageFlow Message interpretation Flow @@ -257,6 +259,7 @@ REGISTER_METATYPE( AdjustPressuresLimitsRequestData ) \ REGISTER_METATYPE( AdjustTreatmentParametersRequestData ) \ REGISTER_METATYPE( AdjustVersionsRequestData ) \ + REGISTER_METATYPE( AdjustServiceRequestData ) \ REGISTER_METATYPE( AdjustHDDateTimeRequestData ) \ REGISTER_METATYPE( AdjustDGDateTimeRequestData ) \ REGISTER_METATYPE( AdjustAlarmVolumeRequestData ) \ @@ -284,6 +287,8 @@ REGISTER_METATYPE( AdjustDGDateTimeResponseData ) \ REGISTER_METATYPE( HDSerialNumberResponseData ) \ REGISTER_METATYPE( DGSerialNumberResponseData ) \ + REGISTER_METATYPE( AdjustHDServiceResponseData ) \ + REGISTER_METATYPE( AdjustDGServiceResponseData ) \ //===============================================================================// /*! @@ -359,6 +364,8 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDSerialNumberResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGSerialNumberResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDServiceResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGServiceResponseData ) \ // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ @@ -380,6 +387,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentParametersRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustServiceRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmUserActionRequestData ) \ @@ -467,6 +475,8 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGDateTimeResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDSerialNumberResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGSerialNumberResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDServiceResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGServiceResponseData ) \ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ /* Request --------------------------------------------------------- */ \ @@ -486,6 +496,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentParametersRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDGDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustAlarmVolumeRequestData ) \ @@ -514,6 +525,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentParametersRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDGDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustAlarmVolumeRequestData ) \ @@ -542,6 +554,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( TreatmentConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTreatmentParametersRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDGDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustAlarmVolumeRequestData ) \ @@ -613,6 +626,8 @@ ACTION_RECEIVE_SIGNAL( AdjustDGDateTimeResponseData ) \ ACTION_RECEIVE_SIGNAL( HDSerialNumberResponseData ) \ ACTION_RECEIVE_SIGNAL( DGSerialNumberResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustHDServiceResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDGServiceResponseData ) \ //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -rb55cd9ea96a465115044a79bb768c7445461f2a2 -rcb7aaf6a2207a1112a086676391d504bafbc58e4 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision b55cd9ea96a465115044a79bb768c7445461f2a2) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision cb7aaf6a2207a1112a086676391d504bafbc58e4) @@ -527,6 +527,35 @@ static Can::Can_Id canid () { return Can::eChlid_UI_HD; } }; +/*! + * \brief The MAdjustServiceReq class + * \details The DG/HD versions request model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:----:|:---:|:---:|:----:|:---------------------------:| + * | 0x8900 | 0x200 | Req | Y | UI | All | DG/HD Service Dates Request | + * + * | Payload || + * | || + * | #1:(N/A) | \ref None | + * + */ +class MAdjustServiceReq : 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("ServiceDates", vParameters); + } + + static Can::Can_Id canid () { return Can::eChlid_UI_Sync; } +}; + //// ---------- Alarms /*! @@ -825,6 +854,7 @@ typedef Model:: MTreatmentConfirmReq TreatmentConfirmRequestData; typedef Model:: MAdjustTreatmentParametersReq AdjustTreatmentParametersRequestData; typedef Model:: MAdjustVersionsReq AdjustVersionsRequestData; +typedef Model:: MAdjustServiceReq AdjustServiceRequestData; typedef Model:: MAdjustHDDateTimeReq AdjustHDDateTimeRequestData; typedef Model:: MAdjustDGDateTimeReq AdjustDGDateTimeRequestData; typedef Model:: MAdjustAlarmVolumeReq AdjustAlarmVolumeRequestData;