Index: sources/model/hd/data/MHDAirTrapData.h =================================================================== diff -u -r2124420a19819f672e9180979ff3762dc083eb7f -r26433c42f2efa2cb18af95f523581c7eeeff049d --- sources/model/hd/data/MHDAirTrapData.h (.../MHDAirTrapData.h) (revision 2124420a19819f672e9180979ff3762dc083eb7f) +++ sources/model/hd/data/MHDAirTrapData.h (.../MHDAirTrapData.h) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) @@ -1,14 +1,14 @@ /*! * - * Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved. + * Copyright (c) 2022-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 MHDAirTrapData.h - * \author (last) Michael Garthwaite + * \author (last) Dara Navaei + * \date (last) 07-Mar-2024 * \author (original) Michael Garthwaite - * \date (last) 23-Feb-2022 * \date (original) 23-Feb-2022 * */ @@ -31,23 +31,25 @@ * \brief The MHDAirTrapData class * \details The HD Air Trap data model * - * | MSG | CAN ID | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x3E00| 0x080 | 1 Hz | N | DG | All | HD Air Trap Data | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0x3E00| 0x040 | 1 Hz | N | HD | All | HD Air Trap Data | * * | Payload || * | || * | #1:(U32) | \ref Data::mAirTrapLowerLevel | * | #2:(U32) | \ref Data::mAirTrapUpperLevel | + * | #3:(U32) | \ref Data::mAirTrapRawLowerLevel | + * | #4:(U32) | \ref Data::mAirTrapRawUpperLevel | * * \sa Data * *

Logging info

* | || * | || - * | typeText | Datum | - * | unitText | HD | - * | infoText | AirTrapData | + * | typeText | Datum | + * | unitText | HD | + * | infoText | AirTrap | * */ class MHDAirTrapData : public MAbstract { @@ -60,18 +62,22 @@ struct { Types::U32 mAirTrapLowerLevel; Types::U32 mAirTrapUpperLevel; + Types::U32 mAirTrapRawLowerLevel; + Types::U32 mAirTrapRawUpperLevel; } _data; public: - Type_Enum typeText() const override { return Type_Enum::eDatum ; } - Unit_Enum unitText() const override { return Unit_Enum::eHD ; } - QString infoText() const override { return QString("AirTrapData") ; } + Type_Enum typeText() const override { return Type_Enum::eDatum ; } + Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + QString infoText() const override { return QString("AirTrap") ; } struct Data { - quint32 mAirTrapLowerLevel = 0; ///< Lower Level - quint32 mAirTrapUpperLevel = 0; ///< Upper Level + quint32 mAirTrapLowerLevel = 0; ///< Lower Level + quint32 mAirTrapUpperLevel = 0; ///< Upper Level + quint32 mAirTrapRawLowerLevel = 0; ///< Raw Lower Level + quint32 mAirTrapRawUpperLevel = 0; ///< Raw Upper Level }; MHDAirTrapData () { }