Index: denali.pro =================================================================== diff -u -r338575f7f1856c99fbc3c0cb59391fc23601c89b -rb94c297fa75f826acd539c57684c1769e5883d67 --- denali.pro (.../denali.pro) (revision 338575f7f1856c99fbc3c0cb59391fc23601c89b) +++ denali.pro (.../denali.pro) (revision b94c297fa75f826acd539c57684c1769e5883d67) @@ -196,6 +196,7 @@ sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \ \ # ---------- Models - HD - Data sources/model/hd/data/MHDDebugText.h \ + sources/model/hd/data/MHDGeneralEvent.h \ sources/model/hd/data/MHDAccelerometerData.h \ sources/model/hd/data/MHDSyringePumpData.h \ sources/model/hd/data/MTreatmentRangesData.h \ @@ -225,6 +226,7 @@ sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.h \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDebugText.h \ + sources/model/dg/data/MDGGeneralEvent.h \ sources/model/dg/data/MDGDrainPumpData.h \ sources/model/dg/data/MDGHeatersData.h \ sources/model/dg/data/MDGLoadCellReadingsData.h \ @@ -434,6 +436,7 @@ sources/model/hd/adjustment/disinfect/MDisinfectAdjustChemicalConfirmResponse.cpp \ \ # ---------- Models - HD - Data sources/model/hd/data/MHDDebugText.cpp \ + sources/model/hd/data/MHDGeneralEvent.cpp \ sources/model/hd/data/MHDAccelerometerData.cpp \ sources/model/hd/data/MHDSyringePumpData.cpp \ sources/model/hd/data/MTreatmentRangesData.cpp \ @@ -466,6 +469,7 @@ sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.cpp \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDebugText.cpp \ + sources/model/dg/data/MDGGeneralEvent.cpp \ sources/model/dg/data/MDGDrainPumpData.cpp \ sources/model/dg/data/MDGHeatersData.cpp \ sources/model/dg/data/MDGLoadCellReadingsData.cpp \ Index: denali.pro.user =================================================================== diff -u -r338575f7f1856c99fbc3c0cb59391fc23601c89b -rb94c297fa75f826acd539c57684c1769e5883d67 --- denali.pro.user (.../denali.pro.user) (revision 338575f7f1856c99fbc3c0cb59391fc23601c89b) +++ denali.pro.user (.../denali.pro.user) (revision b94c297fa75f826acd539c57684c1769e5883d67) @@ -1,6 +1,6 @@ - + EnvironmentId Index: en_US.udic =================================================================== diff -u -r338575f7f1856c99fbc3c0cb59391fc23601c89b -rb94c297fa75f826acd539c57684c1769e5883d67 --- en_US.udic (.../en_US.udic) (revision 338575f7f1856c99fbc3c0cb59391fc23601c89b) +++ en_US.udic (.../en_US.udic) (revision b94c297fa75f826acd539c57684c1769e5883d67) @@ -179,3 +179,7 @@ MBluetooth MAbstract mID +MHDGeneral +HDEvent +MHDDebug +MDGGeneral Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -re4a0e2fc4c7ae0cbce0d670772276bf7f5ff3845 -rb94c297fa75f826acd539c57684c1769e5883d67 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision e4a0e2fc4c7ae0cbce0d670772276bf7f5ff3845) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision b94c297fa75f826acd539c57684c1769e5883d67) @@ -243,6 +243,9 @@ {Gui::GuiActionType::ID_HDDebugText , 40 + 1 }, // ASCII text - 40 bytes + null term {Gui::GuiActionType::ID_DGDebugText , 40 + 1 }, // ASCII text - 40 bytes + null term + {Gui::GuiActionType::ID_HDGeneralEvent , 5 * 4 }, // 5 parameters each 4bytes + {Gui::GuiActionType::ID_DGGeneralEvent , 5 * 4 }, // 5 parameters each 4bytes + }; /*! Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rcbb246d6efa242f927f88ac5da518dedb2d63320 -rb94c297fa75f826acd539c57684c1769e5883d67 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision cbb246d6efa242f927f88ac5da518dedb2d63320) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision b94c297fa75f826acd539c57684c1769e5883d67) @@ -400,6 +400,7 @@ // ----- Debug case Gui::GuiActionType::ID_CANBusFaultCount : ok = canbusFaultCountData (vMessage, vData); break; // TODO : implement notify<>() case Gui::GuiActionType::ID_HDDebugText : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDDebugText ); break; + case Gui::GuiActionType::ID_HDGeneralEvent : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDGeneralEvent ); break; // ----- Events case Gui::GuiActionType::ID_Acknow : ok = true; break; // TODO : implement notify<>() @@ -541,6 +542,7 @@ case Gui::GuiActionType::ID_DGLoadCellReadingsData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGLoadCellReadingsData ); break; case Gui::GuiActionType::ID_DGTemperaturesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGTemperaturesData ); break; case Gui::GuiActionType::ID_DGDebugText : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGDebugText ); break; + case Gui::GuiActionType::ID_DGGeneralEvent : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGGeneralEvent ); break; case Gui::GuiActionType::ID_DGAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGAccelerometerData ); break; // ----- Datum - Pre-Treatment progress case Gui::GuiActionType::ID_DGFilterFlushData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData ); break; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rfc329c788fe9453983072bee937ccbc95b4ed6e4 -rb94c297fa75f826acd539c57684c1769e5883d67 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision b94c297fa75f826acd539c57684c1769e5883d67) @@ -72,6 +72,9 @@ ID_HDDebugText = 0xF1FF, ID_DGDebugText = 0xF2FF, + ID_HDGeneralEvent = 0xA400, + ID_DGGeneralEvent = 0xA500, + ID_DGCheckIn = 0x0600, ID_KeepAlive = 0x0700, Index: sources/model/MAbstractDynamic.cpp =================================================================== diff -u -r338575f7f1856c99fbc3c0cb59391fc23601c89b -rb94c297fa75f826acd539c57684c1769e5883d67 --- sources/model/MAbstractDynamic.cpp (.../MAbstractDynamic.cpp) (revision 338575f7f1856c99fbc3c0cb59391fc23601c89b) +++ sources/model/MAbstractDynamic.cpp (.../MAbstractDynamic.cpp) (revision b94c297fa75f826acd539c57684c1769e5883d67) @@ -154,24 +154,3 @@ else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } } - -/*! - * \brief MAbstractDynamic::data - * \details Provides model's Data from the received messages data values - * \return Data - */ -MAbstractDynamic::Data MAbstractDynamic::data() const { - Data data; - data.mID = _data.mID .value; - data.mFieldDescriptor1 = _data.mFieldDescriptor1 .value; - data.mDataFieldU1 = _data.mDataFieldU1 .value; - data.mDataFieldS1 = _data.mDataFieldS1 .value; - data.mDataFieldF1 = _data.mDataFieldF1 .value; - data.mDataFieldB1 = _data.mDataFieldB1 .value ? true : false; - data.mFieldDescriptor2 = _data.mFieldDescriptor2 .value; - data.mDataFieldU2 = _data.mDataFieldU2 .value; - data.mDataFieldS2 = _data.mDataFieldS2 .value; - data.mDataFieldF2 = _data.mDataFieldF2 .value; - data.mDataFieldB2 = _data.mDataFieldB2 .value ? true : false; - return data; -} Index: sources/model/MAbstractDynamic.h =================================================================== diff -u -r338575f7f1856c99fbc3c0cb59391fc23601c89b -rb94c297fa75f826acd539c57684c1769e5883d67 --- sources/model/MAbstractDynamic.h (.../MAbstractDynamic.h) (revision 338575f7f1856c99fbc3c0cb59391fc23601c89b) +++ sources/model/MAbstractDynamic.h (.../MAbstractDynamic.h) (revision b94c297fa75f826acd539c57684c1769e5883d67) @@ -75,28 +75,10 @@ Types::U32 mDataFieldB2 ; } _data; - public: - - struct Data { - quint32 mID = 0; - quint32 mFieldDescriptor1 ; - quint32 mDataFieldU1 ; - qint32 mDataFieldS1 ; - float mDataFieldF1 ; - bool mDataFieldB1 ; - quint32 mFieldDescriptor2 ; - quint32 mDataFieldU2 ; - qint32 mDataFieldS2 ; - float mDataFieldF2 ; - bool mDataFieldB2 ; - }; - -public: MAbstractDynamic () { } bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; - Data data ( ) const ; }; } Index: sources/model/MModel.h =================================================================== diff -u -rb252cd2777aadbce2d04aa32cc275f193de0cf52 -rb94c297fa75f826acd539c57684c1769e5883d67 --- sources/model/MModel.h (.../MModel.h) (revision b252cd2777aadbce2d04aa32cc275f193de0cf52) +++ sources/model/MModel.h (.../MModel.h) (revision b94c297fa75f826acd539c57684c1769e5883d67) @@ -60,6 +60,8 @@ // Debugging Messages #include "MHDDebugText.h" #include "MDGDebugText.h" +#include "MHDGeneralEvent.h" +#include "MDGGeneralEvent.h" // Settings #include "MAdjustHDRequests.h" @@ -310,6 +312,8 @@ \ REGISTER_METATYPE( HDDebugTextData ) \ REGISTER_METATYPE( DGDebugTextData ) \ + REGISTER_METATYPE( HDGeneralEventData ) \ + REGISTER_METATYPE( DGGeneralEventData ) \ /* Pre-Treatment */ \ REGISTER_METATYPE( DGFilterFlushData ) \ REGISTER_METATYPE( PreTreatmentSelfTestNoCartridgeData ) \ @@ -476,6 +480,8 @@ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDebugTextData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDGeneralEventData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGGeneralEventData ) \ /* Pre-Treatment */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGFilterFlushData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PreTreatmentSelfTestNoCartridgeData ) \ @@ -645,6 +651,8 @@ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDebugTextData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( HDGeneralEventData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DGGeneralEventData ) \ /* Pre-Treatment */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGFilterFlushData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( PreTreatmentSelfTestNoCartridgeData ) \ @@ -898,6 +906,8 @@ \ ACTION_RECEIVE_SIGNAL( HDDebugTextData ) \ ACTION_RECEIVE_SIGNAL( DGDebugTextData ) \ + ACTION_RECEIVE_SIGNAL( HDGeneralEventData ) \ + ACTION_RECEIVE_SIGNAL( DGGeneralEventData ) \ /* Pre-Treatment */ \ ACTION_RECEIVE_SIGNAL( DGFilterFlushData ) \ ACTION_RECEIVE_SIGNAL( PreTreatmentSelfTestNoCartridgeData ) \ Index: sources/model/dg/data/MDGGeneralEvent.cpp =================================================================== diff -u --- sources/model/dg/data/MDGGeneralEvent.cpp (revision 0) +++ sources/model/dg/data/MDGGeneralEvent.cpp (revision b94c297fa75f826acd539c57684c1769e5883d67) @@ -0,0 +1,42 @@ +/*! + * + * 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 MDGGeneralEvent.h + * \author (last) Behrouz NematiPour + * \author (original) Behrouz NematiPour + * \date (last) 07-Oct-2021 + * \date (original) 07-Oct-2021 + * + */ +#include "MDGGeneralEvent.h" +// Qt + +// Project +#include "GuiGlobals.h" + +using namespace Model; + +/*! + * \brief MDGGeneralEvent::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +MDGGeneralEvent::Data MDGGeneralEvent::data() const { + Data data; + data.mEventID = _data.mID .value; + data.mFieldDescriptor1 = _data.mFieldDescriptor1 .value; + data.mDataFieldU1 = _data.mDataFieldU1 .value; + data.mDataFieldS1 = _data.mDataFieldS1 .value; + data.mDataFieldF1 = _data.mDataFieldF1 .value; + data.mDataFieldB1 = _data.mDataFieldB1 .value ? true : false; + data.mFieldDescriptor2 = _data.mFieldDescriptor2 .value; + data.mDataFieldU2 = _data.mDataFieldU2 .value; + data.mDataFieldS2 = _data.mDataFieldS2 .value; + data.mDataFieldF2 = _data.mDataFieldF2 .value; + data.mDataFieldB2 = _data.mDataFieldB2 .value ? true : false; + return data; +} Index: sources/model/dg/data/MDGGeneralEvent.h =================================================================== diff -u --- sources/model/dg/data/MDGGeneralEvent.h (revision 0) +++ sources/model/dg/data/MDGGeneralEvent.h (revision b94c297fa75f826acd539c57684c1769e5883d67) @@ -0,0 +1,86 @@ +/*! + * + * 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 MDGGeneralEvent.h + * \author (last) Behrouz NematiPour + * \author (original) Behrouz NematiPour + * \date (last) 07-Oct-2021 + * \date (original) 07-Oct-2021 + * + */ +#pragma once + +// Qt + +// Project +#include "MAbstractDynamic.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MDGGeneralEvent class + * \details The DG General Event model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:| + * |0xA400| 0x070 | Event | N | DG | UI | DG General Event | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mEventID | + * | #2:(U32) | \ref Data::mFieldDescriptor1 | + * | #3:(Any) | \ref Data::mDataField1 | + * | #4:(U32) | \ref Data::mFieldDescriptor2 | + * | #5:(Any) | \ref Data::mDataField2 | + * + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DG | + * | infoText | General | + * + */ +class MDGGeneralEvent : public MAbstractDynamic { + + // friends + friend class ::tst_models; + +public: + Type_Enum typeText() const override { return Type_Enum::eEvent ; } + Unit_Enum unitText() const override { return Unit_Enum::eDG ; } + QString infoText() const override { return QString("General" ) ; } + + struct Data { + quint32 mEventID = 0; + quint32 mFieldDescriptor1 ; + quint32 mDataFieldU1 ; + qint32 mDataFieldS1 ; + float mDataFieldF1 ; + bool mDataFieldB1 ; + quint32 mFieldDescriptor2 ; + quint32 mDataFieldU2 ; + qint32 mDataFieldS2 ; + float mDataFieldF2 ; + bool mDataFieldB2 ; + }; + +public: + MDGGeneralEvent () { } + + Data data () const; +}; +} + +typedef Model::MDGGeneralEvent::Data DGGeneralEventData; Index: sources/model/hd/alarm/MAlarmTriggered.cpp =================================================================== diff -u -r338575f7f1856c99fbc3c0cb59391fc23601c89b -rb94c297fa75f826acd539c57684c1769e5883d67 --- sources/model/hd/alarm/MAlarmTriggered.cpp (.../MAlarmTriggered.cpp) (revision 338575f7f1856c99fbc3c0cb59391fc23601c89b) +++ sources/model/hd/alarm/MAlarmTriggered.cpp (.../MAlarmTriggered.cpp) (revision b94c297fa75f826acd539c57684c1769e5883d67) @@ -21,6 +21,27 @@ using namespace Model; +/*! + * \brief MAlarmTriggered::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +MAlarmTriggered::Data MAlarmTriggered::data() const { + Data data; + data.mAlarmID = _data.mID .value; + data.mFieldDescriptor1 = _data.mFieldDescriptor1 .value; + data.mDataFieldU1 = _data.mDataFieldU1 .value; + data.mDataFieldS1 = _data.mDataFieldS1 .value; + data.mDataFieldF1 = _data.mDataFieldF1 .value; + data.mDataFieldB1 = _data.mDataFieldB1 .value ? true : false; + data.mFieldDescriptor2 = _data.mFieldDescriptor2 .value; + data.mDataFieldU2 = _data.mDataFieldU2 .value; + data.mDataFieldS2 = _data.mDataFieldS2 .value; + data.mDataFieldF2 = _data.mDataFieldF2 .value; + data.mDataFieldB2 = _data.mDataFieldB2 .value ? true : false; + return data; +} + /// The Alarm Trigger Request QString MAlarmTriggeredReq::toString() { Index: sources/model/hd/alarm/MAlarmTriggered.h =================================================================== diff -u -r338575f7f1856c99fbc3c0cb59391fc23601c89b -rb94c297fa75f826acd539c57684c1769e5883d67 --- sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision 338575f7f1856c99fbc3c0cb59391fc23601c89b) +++ sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision b94c297fa75f826acd539c57684c1769e5883d67) @@ -37,7 +37,7 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mAlarmID(mID) | + * | #1:(U32) | \ref Data::mAlarmID | * | #2:(U32) | \ref Data::mFieldDescriptor1 | * | #3:(Any) | \ref Data::mDataField1 | * | #4:(U32) | \ref Data::mFieldDescriptor2 | @@ -64,8 +64,24 @@ Unit_Enum unitText() const override { return Unit_Enum::eHD ; } QString infoText() const override { return QString("AlarmTriggered") ; } + struct Data { + quint32 mAlarmID = 0; + quint32 mFieldDescriptor1 ; + quint32 mDataFieldU1 ; + qint32 mDataFieldS1 ; + float mDataFieldF1 ; + bool mDataFieldB1 ; + quint32 mFieldDescriptor2 ; + quint32 mDataFieldU2 ; + qint32 mDataFieldS2 ; + float mDataFieldF2 ; + bool mDataFieldB2 ; + }; + public: MAlarmTriggered () { } + + Data data () const; }; Index: sources/model/hd/data/MHDDebugText.cpp =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rb94c297fa75f826acd539c57684c1769e5883d67 --- sources/model/hd/data/MHDDebugText.cpp (.../MHDDebugText.cpp) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ sources/model/hd/data/MHDDebugText.cpp (.../MHDDebugText.cpp) (revision b94c297fa75f826acd539c57684c1769e5883d67) @@ -8,7 +8,7 @@ * \file MHDDebugText.cpp * \author (last) Behrouz NematiPour * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour + * \author (original) Behrouz NematiPour * \date (original) 13-Jul-2020 * */ Index: sources/model/hd/data/MHDDebugText.h =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rb94c297fa75f826acd539c57684c1769e5883d67 --- sources/model/hd/data/MHDDebugText.h (.../MHDDebugText.h) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ sources/model/hd/data/MHDDebugText.h (.../MHDDebugText.h) (revision b94c297fa75f826acd539c57684c1769e5883d67) @@ -30,9 +30,9 @@ * \brief The MHDDebugText class * \details the Debug Text Message from HD * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------------------------:| - * |0xFFF1| 0x020 | 6 | Event| N | HD | UI | HD debug text for UI to log ASCII text | + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:| + * |0xFFF1| 0x020 | 6 | Event| N | HD | UI | HD debug text for UI to log ASCII text | * * | Payload | * | | Index: sources/model/hd/data/MHDGeneralEvent.cpp =================================================================== diff -u --- sources/model/hd/data/MHDGeneralEvent.cpp (revision 0) +++ sources/model/hd/data/MHDGeneralEvent.cpp (revision b94c297fa75f826acd539c57684c1769e5883d67) @@ -0,0 +1,42 @@ +/*! + * + * 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 MHDGeneralEvent.h + * \author (last) Behrouz NematiPour + * \author (original) Behrouz NematiPour + * \date (last) 07-Oct-2021 + * \date (original) 07-Oct-2021 + * + */ +#include "MHDGeneralEvent.h" +// Qt + +// Project +#include "GuiGlobals.h" + +using namespace Model; + +/*! + * \brief MHDGeneralEvent::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +MHDGeneralEvent::Data MHDGeneralEvent::data() const { + Data data; + data.mEventID = _data.mID .value; + data.mFieldDescriptor1 = _data.mFieldDescriptor1 .value; + data.mDataFieldU1 = _data.mDataFieldU1 .value; + data.mDataFieldS1 = _data.mDataFieldS1 .value; + data.mDataFieldF1 = _data.mDataFieldF1 .value; + data.mDataFieldB1 = _data.mDataFieldB1 .value ? true : false; + data.mFieldDescriptor2 = _data.mFieldDescriptor2 .value; + data.mDataFieldU2 = _data.mDataFieldU2 .value; + data.mDataFieldS2 = _data.mDataFieldS2 .value; + data.mDataFieldF2 = _data.mDataFieldF2 .value; + data.mDataFieldB2 = _data.mDataFieldB2 .value ? true : false; + return data; +} Index: sources/model/hd/data/MHDGeneralEvent.h =================================================================== diff -u --- sources/model/hd/data/MHDGeneralEvent.h (revision 0) +++ sources/model/hd/data/MHDGeneralEvent.h (revision b94c297fa75f826acd539c57684c1769e5883d67) @@ -0,0 +1,86 @@ +/*! + * + * 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 MHDGeneralEvent.h + * \author (last) Behrouz NematiPour + * \author (original) Behrouz NematiPour + * \date (last) 07-Oct-2021 + * \date (original) 07-Oct-2021 + * + */ +#pragma once + +// Qt + +// Project +#include "MAbstractDynamic.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MHDGeneralEvent class + * \details The HD General Event model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:| + * |0xA400| 0x020 | Event | N | HD | UI | HD General Event | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mEventID | + * | #2:(U32) | \ref Data::mFieldDescriptor1 | + * | #3:(Any) | \ref Data::mDataField1 | + * | #4:(U32) | \ref Data::mFieldDescriptor2 | + * | #5:(Any) | \ref Data::mDataField2 | + * + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | General | + * + */ +class MHDGeneralEvent : public MAbstractDynamic { + + // friends + friend class ::tst_models; + +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("General" ) ; } + + struct Data { + quint32 mEventID = 0; + quint32 mFieldDescriptor1 ; + quint32 mDataFieldU1 ; + qint32 mDataFieldS1 ; + float mDataFieldF1 ; + bool mDataFieldB1 ; + quint32 mFieldDescriptor2 ; + quint32 mDataFieldU2 ; + qint32 mDataFieldS2 ; + float mDataFieldF2 ; + bool mDataFieldB2 ; + }; + +public: + MHDGeneralEvent () { } + + Data data () const; +}; +} + +typedef Model::MHDGeneralEvent::Data HDGeneralEventData;