Index: leahi.pro =================================================================== diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -r08ffb068817ab0bb1c7f2fe2705986142ac68601 --- leahi.pro (.../leahi.pro) (revision cb9c48c7c307690dcafcfd16ef412fe660291692) +++ leahi.pro (.../leahi.pro) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) @@ -239,6 +239,10 @@ sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.h \ \ # ---------- Models - TD - Adjustment - In-Treatment sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.h \ + \ # ---------- Models - TD - Adjustment - Settings + sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.h \ + \ # ---------- Models - DD - Adjustment - Settings + sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.h \ \ # ---------- Models - confirm sources/model/confirm/MDuetConfirmHDi.h \ \ # ---------- Models - POST @@ -270,7 +274,6 @@ sources/model/hd/adjustment/MAdjustPowerOff.h \ sources/model/hd/adjustment/settings/MAdjustHDRequests.h \ \ # ---------- Models - HD - Adjustment - Settings - sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \ \ # ---------- Models - HD - Adjustment - Pre-Treatment sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h \ @@ -330,8 +333,6 @@ \ # ---------- Models - DG - Adjustment sources/model/dg/adjustment/settings/MAdjustDGRequests.h \ sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.h \ - \ # ---------- Models - DG - Adjustment - Settings - sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.h \ \ # ---------- Models - DG - Data - Pre-Treatment - Progress sources/model/dg/data/pretreatment/MDGFilterFlushData.h \ \ # ---------- Models - DG - Data - Disinfect - Progress @@ -584,10 +585,13 @@ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \ \ # ---------- Models - TD - Adjustment - In-Treatment sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp \ + \ # ---------- Models - TD - Adjustment - Settings + sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \ + \ # ---------- Models - DD - Adjustment - Settings + sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp \ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MAdjustPowerOff.cpp \ \ # ---------- Models - HD - Adjustment - Settings - sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \ \ # ---------- Models - HD - Adjustment - Pre-Treatment sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \ @@ -641,7 +645,6 @@ sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp \ \ # ---------- Models - DG - Adjustment \ # ---------- Models - DG - Adjustment - Settings - sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp \ sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.cpp \ \ # ---------- Models - DG - Data - Pre-Treatment - Progress sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp \ Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -r08ffb068817ab0bb1c7f2fe2705986142ac68601 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision cb9c48c7c307690dcafcfd16ef412fe660291692) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) @@ -703,28 +703,28 @@ /*! * \brief MessageDispatcher::onAdjustment - * \details This method transmits the HD Set Date Time Denali message. + * \details This method transmits the TD Set Date Time Leahi message. * \param vData - Data model contains the epoch time * \return void */ -void MessageDispatcher::onAdjustment(const AdjustHDDateTimeRequestData &vData) +void MessageDispatcher::onAdjustment(const AdjustTDDateTimeRequestData &vData) { QVariantList mData; mData += vData.mEpoch ; - onActionTransmit(GuiActionType::ID_AdjustHDDateTimeReq, mData); + onActionTransmit(GuiActionType::ID_AdjustTDDateTimeReq, mData); } /*! * \brief MessageDispatcher::onAdjustment - * \details This method transmits the DG Set Date Time Denali message. + * \details This method transmits the DD Set Date Time Leahi message. * \param vData - Data model contains the epoch time * \return void */ -void MessageDispatcher::onAdjustment(const AdjustDGDateTimeRequestData &vData) +void MessageDispatcher::onAdjustment(const AdjustDDDateTimeRequestData &vData) { QVariantList mData; mData += vData.mEpoch ; - onActionTransmit(GuiActionType::ID_AdjustDGDateTimeReq, mData); + onActionTransmit(GuiActionType::ID_AdjustDDDateTimeReq, mData); } /*! Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -rc1d0546e2d1a51ff919b2172ce647003359f0853 -r08ffb068817ab0bb1c7f2fe2705986142ac68601 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision c1d0546e2d1a51ff919b2172ce647003359f0853) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) @@ -156,8 +156,8 @@ GuiActionType::ID_AdjustVersionsUIReq , GuiActionType::ID_AdjustVersionsUIRsp , GuiActionType::ID_AdjustServiceDatesReq , - GuiActionType::ID_AdjustHDDateTimeReq , - GuiActionType::ID_AdjustDGDateTimeReq , + GuiActionType::ID_AdjustTDDateTimeReq , + GuiActionType::ID_AdjustDDDateTimeReq , GuiActionType::ID_HDUsageInfoReq , GuiActionType::ID_AdjustInstitutionalRecordReq , // Treatment Log Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -r08ffb068817ab0bb1c7f2fe2705986142ac68601 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision cb9c48c7c307690dcafcfd16ef412fe660291692) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) @@ -271,10 +271,10 @@ {Gui::GuiActionType::ID_AdjustServiceDatesDGRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- RTC - {Gui::GuiActionType::ID_AdjustHDDateTimeReq , 1 * 4 }, // 1 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustHDDateTimeRsp , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustDGDateTimeReq , 1 * 4 }, // 1 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustDGDateTimeRsp , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustTDDateTimeReq , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustTDDateTimeRsp , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustDDDateTimeReq , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustDDDateTimeRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- Disinfect {Gui::GuiActionType::ID_AdjustDisinfectModeReq , 1 * 4 }, // 1 parameter 4bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r9048646630717f980a852df54349805ba63773e0 -r08ffb068817ab0bb1c7f2fe2705986142ac68601 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 9048646630717f980a852df54349805ba63773e0) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) @@ -226,8 +226,8 @@ case Gui::GuiActionType::ID_AdjustServiceModeReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustServiceModeRequestData ); break; case Gui::GuiActionType::ID_AdjustVersionsUIRsp : INTERPRET_TRANSMIT_MESSAGE(AdjustVersionsResponseData ); break; case Gui::GuiActionType::ID_AdjustVersionsUIReq : INTERPRET_TRANSMIT_MESSAGE(AdjustVersionsRequestData ); break; - case Gui::GuiActionType::ID_AdjustHDDateTimeReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHDDateTimeRequestData ); break; - case Gui::GuiActionType::ID_AdjustDGDateTimeReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDGDateTimeRequestData ); break; + case Gui::GuiActionType::ID_AdjustTDDateTimeReq : INTERPRET_TRANSMIT_MESSAGE(AdjustTDDateTimeRequestData ); break; + case Gui::GuiActionType::ID_AdjustDDDateTimeReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDDDateTimeRequestData ); break; case Gui::GuiActionType::ID_AdjustServiceDatesReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustServiceDatesRequestData ); break; case Gui::GuiActionType::ID_HDUsageInfoReq : INTERPRET_TRSMT_MT_MESSAGE(HDUsageInfoRequestData ); break; case Gui::GuiActionType::ID_AdjustInstitutionalRecordReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustInstitutionalRequestData ); break; @@ -466,7 +466,7 @@ case Gui::GuiActionType::ID_AdjustVersionsTDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsTDRsp ); break; case Gui::GuiActionType::ID_AdjustSerialTDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialTDRsp ); break; case Gui::GuiActionType::ID_AdjustServiceDatesHDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesHDRsp ); break; - case Gui::GuiActionType::ID_AdjustHDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHDDateTimeRsp ); break; + case Gui::GuiActionType::ID_AdjustTDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustTDDateTimeRsp ); break; case Gui::GuiActionType::ID_HDUsageInfoRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDUsageInfoRsp ); break; case Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp ); break; // ----- States @@ -475,7 +475,7 @@ case Gui::GuiActionType::ID_TreatmentStates : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentStates ); break; case Gui::GuiActionType::ID_PostTreatmentStates : ok = notify(vMessage, vData, Gui::GuiActionType::ID_PostTreatmentStates ); break; - // ----- Datum + // ----- Datum0 case Gui::GuiActionType::ID_HDAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDAccelerometerData ); break; case Gui::GuiActionType::ID_HDSyringePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDSyringePumpData ); break; case Gui::GuiActionType::ID_TDVoltageData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDVoltageData ); break; @@ -614,7 +614,7 @@ 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; case Gui::GuiActionType::ID_AdjustServiceDatesDGRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesDGRsp ); break; - case Gui::GuiActionType::ID_AdjustDGDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDGDateTimeRsp ); break; + case Gui::GuiActionType::ID_AdjustDDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp ); 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; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -r08ffb068817ab0bb1c7f2fe2705986142ac68601 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision cb9c48c7c307690dcafcfd16ef412fe660291692) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) @@ -114,10 +114,10 @@ ID_HDUsageInfoRsp = 0x8B00, // 139 // RTC - ID_AdjustHDDateTimeReq = 0x6D00, // 109 - ID_AdjustHDDateTimeRsp = 0x6E00, // 110 - ID_AdjustDGDateTimeReq = 0x6F00, // 111 - ID_AdjustDGDateTimeRsp = 0x7000, // 112 + ID_AdjustTDDateTimeReq = 0x6C00, // 108 + ID_AdjustTDDateTimeRsp = 0x6D00, // 109 + ID_AdjustDDDateTimeReq = 0x6E00, // 110 + ID_AdjustDDDateTimeRsp = 0x6F00, // 111 ID_HDRTCEpochData = 0x0A0F, // 10 //// ----- @CRAPIZED // State Messages @@ -224,7 +224,7 @@ // HD Data Messages ID_HDAccelerometerData = 0x3300, // 51 ID_HDSyringePumpData = 0x6900, // 105 - ID_HDBloodLeakData = 0x6C00, // 108 + ID_HDBloodLeakData = 0x6C0F, // 108 //// ----- @CRAPIZED: had to change to avoid duplication ID_TDAirBubbleData = 0x1E00, // 30 //// ----- @LEAHIZED ID_TDAirPumpData = 0x2000, // 32 //// ----- @LEAHIZED ID_TDAirTrapData = 0x2A00, // 42 //// ----- @LEAHIZED Index: sources/model/MModel.h =================================================================== diff -u -r9048646630717f980a852df54349805ba63773e0 -r08ffb068817ab0bb1c7f2fe2705986142ac68601 --- sources/model/MModel.h (.../MModel.h) (revision 9048646630717f980a852df54349805ba63773e0) +++ sources/model/MModel.h (.../MModel.h) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) @@ -94,8 +94,8 @@ #include "MAdjustHDServiceModeResponse.h" #include "MAdjustHDServiceDatesResponse.h" #include "MAdjustDGServiceDatesResponse.h" -#include "MAdjustHDDateTimeResponse.h" -#include "MAdjustDGDateTimeResponse.h" +#include "MAdjustTDDateTimeResponse.h" +#include "MAdjustDDDateTimeResponse.h" #include "MDuetRoWaterDG.h" #include "MAdjustHDInstitutionalRecordResponse.h" @@ -461,8 +461,8 @@ REGISTER_METATYPE( AdjustVersionsRequestData ) \ REGISTER_METATYPE( AdjustServiceModeRequestData ) \ REGISTER_METATYPE( AdjustServiceDatesRequestData ) \ - REGISTER_METATYPE( AdjustHDDateTimeRequestData ) \ - REGISTER_METATYPE( AdjustDGDateTimeRequestData ) \ + REGISTER_METATYPE( AdjustTDDateTimeRequestData ) \ + REGISTER_METATYPE( AdjustDDDateTimeRequestData ) \ REGISTER_METATYPE( AdjustHDAlarmVolumeRequestData ) \ \ /* Response */ \ @@ -506,8 +506,8 @@ REGISTER_METATYPE( AdjustServiceModeResponseData ) \ REGISTER_METATYPE( AdjustServiceDatesHDResponseData ) \ REGISTER_METATYPE( AdjustServiceDatesDGResponseData ) \ - REGISTER_METATYPE( AdjustHDDateTimeResponseData ) \ - REGISTER_METATYPE( AdjustDGDateTimeResponseData ) \ + REGISTER_METATYPE( AdjustTDDateTimeResponseData ) \ + REGISTER_METATYPE( AdjustDDDateTimeResponseData ) \ /* Alarms - Active List Response */ \ REGISTER_METATYPE( AlarmActiveListResponseData ) \ REGISTER_METATYPE( AdjustHDAlarmVolumeResponseData ) \ @@ -663,8 +663,8 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceModeResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesHDResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesDGResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTDDateTimeResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDDateTimeResponseData ) \ /* Alarms - Active List Response */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmActiveListResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeResponseData ) \ @@ -698,8 +698,8 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustServiceModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTDDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeRequestData ) \ /* Post-Treatment */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientDisconnectionNotifyRequestData ) \ @@ -883,8 +883,8 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceModeResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceDatesHDResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceDatesDGResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDDateTimeResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGDateTimeResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTDDateTimeResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDDateTimeResponseData ) \ /* Alarms - Active List Response */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmActiveListResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDAlarmVolumeResponseData ) \ @@ -941,8 +941,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceDatesRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDGDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTDDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDAlarmVolumeRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmSilenceRequestData ) \ @@ -1002,8 +1002,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustServiceModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustServiceDatesRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDGDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTDDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDAlarmVolumeRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmSilenceRequestData ) \ @@ -1063,8 +1063,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustServiceModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustServiceDatesRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDGDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTDDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDAlarmVolumeRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmSilenceRequestData ) \ @@ -1210,8 +1210,8 @@ ACTION_RECEIVE_SIGNAL( AdjustServiceModeResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustServiceDatesHDResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustServiceDatesDGResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustHDDateTimeResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustDGDateTimeResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustTDDateTimeResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDDateTimeResponseData ) \ /* Alarms */ \ ACTION_RECEIVE_SIGNAL( AlarmActiveListResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustHDAlarmVolumeResponseData ) \ Index: sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) @@ -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 MAdjustDDDateTimeResponse.cpp + * \author (last) Behrouz NematiPour + * \date (last) 16-Apr-2021 + * \author (original) Behrouz NematiPour + * \date (original) 16-Apr-2021 + * + */ +#include "MAdjustDDDateTimeResponse.h" + +using namespace Model; + +QVariantList MAdjustDDDateTimeResponse::parameters() const { + return { + _data.mAccepted.value, + _data.mReason .value, + }; +} + +bool MAdjustDDDateTimeResponse::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 MAdjustDDDateTimeResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustDDDateTimeResponseData MAdjustDDDateTimeResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted.value; + data.mReason = _data.mReason .value; + return data; +} Index: sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.h =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.h (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.h (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) @@ -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 MAdjustDDDateTimeResponse.h + * \author (last) Behrouz NematiPour + * \date (last) 16-Apr-2021 + * \author (original) Behrouz NematiPour + * \date (original) 16-Apr-2021 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustDDDateTimeResponse class + * \details The DG Date and Time adjustment response model + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:| + * |0x6F00| 0x070 | | Rsp | Y | DG | UI | Set RTC Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DG | + * | infoText | AdjustDGDateTime | + * + */ +class MAdjustDDDateTimeResponse : 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("AdjustDDDateTime") ; } + + struct Data { + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + }; + + MAdjustDDDateTimeResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustDDDateTimeResponse::Data AdjustDDDateTimeResponseData; Fisheye: Tag 08ffb068817ab0bb1c7f2fe2705986142ac68601 refers to a dead (removed) revision in file `sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 08ffb068817ab0bb1c7f2fe2705986142ac68601 refers to a dead (removed) revision in file `sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/dg/adjustment/settings/MAdjustDGRequests.h =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r08ffb068817ab0bb1c7f2fe2705986142ac68601 --- sources/model/dg/adjustment/settings/MAdjustDGRequests.h (.../MAdjustDGRequests.h) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/model/dg/adjustment/settings/MAdjustDGRequests.h (.../MAdjustDGRequests.h) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) @@ -32,23 +32,23 @@ */ /*! - * \brief The MAdjustDGDateTimeReq class + * \brief The MAdjustDDDateTimeReq class * \details The model to request starting a treatment * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:| - * | 0x6F | 0x110 | Req | Y | UI | DG | Set RTC Date and Time | + * | 0x6E | 0x110 | Req | Y | UI | DG | Set RTC Date and Time | * * | Payload || * | || * | #1:(U32) | \ref mEpoch | * */ -class MAdjustDGDateTimeReq : public MModel { +class MAdjustDDDateTimeReq : public MModel { public: quint32 mEpoch; static QString toString(const QVariantList &vParameters) { - return MModel::toString("AdjustDGDateTime", vParameters); + return MModel::toString("AdjustDDDateTime", vParameters); } static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } @@ -76,5 +76,5 @@ }; } -typedef Model::MAdjustDGDateTimeReq AdjustDGDateTimeRequestData; +typedef Model::MAdjustDDDateTimeReq AdjustDDDateTimeRequestData; typedef Model::MAdjustDGCleaningUsageReq AdjustDGCleaningUsageRequestData; Fisheye: Tag 08ffb068817ab0bb1c7f2fe2705986142ac68601 refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 08ffb068817ab0bb1c7f2fe2705986142ac68601 refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/hd/adjustment/settings/MAdjustHDRequests.h =================================================================== diff -u -r712f4c8a1b2382919300895b4422b831471044a3 -r08ffb068817ab0bb1c7f2fe2705986142ac68601 --- sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision 712f4c8a1b2382919300895b4422b831471044a3) +++ sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) @@ -35,26 +35,26 @@ */ /*! - * \brief The MAdjustHDDateTime class + * \brief The MAdjustTDDateTime class * \details The model to request starting a treatment * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:------:|:------:|:----:|:---:|:---:|:----:|:-----------:| - * | 0x6d00 | 0x100 | Req | Y | UI | HD | Set RTC Date and Time | + * | 0x6C00 | 0x100 | Req | Y | UI | HD | Set RTC Date and Time | * * | Payload || * | || * | #1:(U32) mEpoch | \ref mEpoch | * */ -class MAdjustHDDateTimeReq : public MModel { +class MAdjustTDDateTimeReq : public MModel { public: quint32 mEpoch; QString toString() { return toString({mEpoch}); } static QString toString(const QVariantList &vParameters) { - return MModel::toString("AdjustHDDateTime", vParameters); + return MModel::toString("AdjustTDDateTime", vParameters); } }; @@ -328,7 +328,7 @@ typedef Model:: MAdjustVersionsReq AdjustVersionsRequestData; typedef Model:: MAdjustVersionsRsp AdjustVersionsResponseData; typedef Model:: MAdjustServiceDatesReq AdjustServiceDatesRequestData; -typedef Model:: MAdjustHDDateTimeReq AdjustHDDateTimeRequestData; +typedef Model:: MAdjustTDDateTimeReq AdjustTDDateTimeRequestData; typedef Model:: MAdjustHDAlarmVolumeReq AdjustHDAlarmVolumeRequestData; typedef Model:: MAdjustUIPostFinalResultReq AdjustUIPostFinalResultRequestData; typedef Model:: MHDUsageInfoReq HDUsageInfoRequestData; Index: sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp =================================================================== diff -u --- sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp (revision 0) +++ sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) @@ -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 MAdjustTDDateTimeResponse.cpp + * \author (last) Behrouz NematiPour + * \date (last) 16-Apr-2021 + * \author (original) Behrouz NematiPour + * \date (original) 16-Apr-2021 + * + */ +#include "MAdjustTDDateTimeResponse.h" + +using namespace Model; + +QVariantList MAdjustTDDateTimeResponse::parameters() const { + return { + _data.mAccepted.value, + _data.mReason .value, + }; +} + +bool MAdjustTDDateTimeResponse::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 MAdjustTDDateTimeResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustTDDateTimeResponseData MAdjustTDDateTimeResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted.value; + data.mReason = _data.mReason .value; + return data; +} Index: sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.h =================================================================== diff -u --- sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.h (revision 0) +++ sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.h (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) @@ -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 MAdjustTDDateTimeResponse.h + * \author (last) Behrouz NematiPour + * \date (last) 16-Apr-2021 + * \author (original) Behrouz NematiPour + * \date (original) 16-Apr-2021 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustTDDateTimeResponse class + * \details The HD Date and Time adjustment response model + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:| + * |0x6D00| 0x020 | | Rsp | Y | HD | UI | Set RTC Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DG | + * | infoText | AdjustHDDateTime | + * + */ +class MAdjustTDDateTimeResponse : 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("AdjustTDDateTime") ; } + + struct Data { + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + }; + + MAdjustTDDateTimeResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustTDDateTimeResponse::Data AdjustTDDateTimeResponseData; Index: sources/view/settings/VDateTime.cpp =================================================================== diff -u -r86df7ff03ea32f9cd8a18bbbc7b2e01de64c783f -r08ffb068817ab0bb1c7f2fe2705986142ac68601 --- sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision 86df7ff03ea32f9cd8a18bbbc7b2e01de64c783f) +++ sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) @@ -28,11 +28,11 @@ void VDateTime::initConnections() { startTimer(_timerInterval); - ACTION_VIEW_CONNECTION(AdjustHDDateTimeResponseData); - ACTION_VIEW_CONNECTION(AdjustDGDateTimeResponseData); + ACTION_VIEW_CONNECTION(AdjustTDDateTimeResponseData); + ACTION_VIEW_CONNECTION(AdjustDDDateTimeResponseData); ACTION_VIEW_CONNECTION(HDRTCEpochData); - ADJUST_VIEW_CONNECTION( AdjustHDDateTimeRequestData); - ADJUST_VIEW_CONNECTION( AdjustDGDateTimeRequestData); + ADJUST_VIEW_CONNECTION( AdjustTDDateTimeRequestData); + ADJUST_VIEW_CONNECTION( AdjustDDDateTimeRequestData); connect(&_process, SIGNAL( finished(int)), this, SLOT(onSetDateUIFinished(int))); @@ -112,8 +112,8 @@ status("Setting date and time ..."); dateTimeUI(dateTimeLocalStr, vNTP ); - dateTimeHD(epochUTC_sec ); // ??? TODO - dateTimeDG(epochUTC_sec ); // ??? TODO + dateTimeTD(epochUTC_sec ); // ??? TODO + dateTimeDD(epochUTC_sec ); // ??? TODO } /*! @@ -138,9 +138,9 @@ * \brief VDateTime::onActionReceive * Called when we receive a response back from the HD after requesting to * set the epoch - * \param vData (AdjustHDDateTimeResponseData) - the response data + * \param vData (AdjustTDDateTimeResponseData) - the response data */ -void VDateTime::onActionReceive(const AdjustHDDateTimeResponseData &vData) +void VDateTime::onActionReceive(const AdjustTDDateTimeResponseData &vData) { _acceptHD = vData.mAccepted ? SUCCEED : FAILED; _reasonHD = vData.mReason ; @@ -151,35 +151,35 @@ * \brief VDateTime::onActionReceive * Called when we receive a response back from the DG after requesting to * set the epoch - * \param vResponse (AdjustDGDateTimeResponseData) - the response + * \param vResponse (AdjustDDDateTimeResponseData) - the response */ -void VDateTime::onActionReceive(const AdjustDGDateTimeResponseData &vData) +void VDateTime::onActionReceive(const AdjustDDDateTimeResponseData &vData) { _acceptDG = vData.mAccepted ? SUCCEED : FAILED; _reasonDG = vData.mReason ; updateStatus(); } /*! - * \brief VDateTime::dateTimeHD - * \details Requests HD to set the date/time + * \brief VDateTime::dateTimeTD + * \details Requests TD to set the date/time * \param epoch - the epoch parameter which FW understands to set date/time */ -void VDateTime::dateTimeHD(quint32 epoch) +void VDateTime::dateTimeTD(quint32 epoch) { - AdjustHDDateTimeRequestData data; + AdjustTDDateTimeRequestData data; data.mEpoch = epoch; emit didAdjustment(data); } /*! - * \brief VDateTime::dateTimeDG + * \brief VDateTime::dateTimeDD * \details Requests DG to set the date/time * \param epoch - the epoch parameter which FW understands to set date/time */ -void VDateTime::dateTimeDG(quint32 epoch) +void VDateTime::dateTimeDD(quint32 epoch) { - AdjustDGDateTimeRequestData data; + AdjustDDDateTimeRequestData data; data.mEpoch = epoch; emit didAdjustment(data); } Index: sources/view/settings/VDateTime.h =================================================================== diff -u -r86df7ff03ea32f9cd8a18bbbc7b2e01de64c783f -r08ffb068817ab0bb1c7f2fe2705986142ac68601 --- sources/view/settings/VDateTime.h (.../VDateTime.h) (revision 86df7ff03ea32f9cd8a18bbbc7b2e01de64c783f) +++ sources/view/settings/VDateTime.h (.../VDateTime.h) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) @@ -22,8 +22,8 @@ // Project #include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" -#include "MAdjustHDDateTimeResponse.h" -#include "MAdjustDGDateTimeResponse.h" +#include "MAdjustTDDateTimeResponse.h" +#include "MAdjustDDDateTimeResponse.h" #include "MHDRTCEpochData.h" @@ -76,8 +76,8 @@ quint8 _reasonDG = 0; quint8 _reasonUI = 0; - void dateTimeHD(quint32 epoch); - void dateTimeDG(quint32 epoch); + void dateTimeTD(quint32 epoch); + void dateTimeDD(quint32 epoch); void dateTimeUI(const QString &vDateTime, const bool &vNTP ); @@ -106,8 +106,8 @@ PROPERTY(QString, timezone , "" ) VIEW_DEC_CLASS(VDateTime) - VIEW_DEC_SLOT (AdjustHDDateTimeResponseData) - VIEW_DEC_SLOT (AdjustDGDateTimeResponseData) + VIEW_DEC_SLOT (AdjustTDDateTimeResponseData) + VIEW_DEC_SLOT (AdjustDDDateTimeResponseData) VIEW_DEC_SLOT (HDRTCEpochData) void greeting(quint16 vMilitaryTime); @@ -126,7 +126,7 @@ void onSetDateUIErrored(QProcess::ProcessError error); signals: - void didAdjustment(const AdjustHDDateTimeRequestData); - void didAdjustment(const AdjustDGDateTimeRequestData); + void didAdjustment(const AdjustTDDateTimeRequestData); + void didAdjustment(const AdjustDDDateTimeRequestData); }; }