Index: sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h =================================================================== diff -u -rdd6c876521e397ff990f81e7363b4f007fe3e2d9 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h (.../MTreatmentLogAlarmData.h) (revision dd6c876521e397ff990f81e7363b4f007fe3e2d9) +++ sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h (.../MTreatmentLogAlarmData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * 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 MTreatmentLogAlarmDataData.h + * \file MTreatmentLogAlarmData.h * \author (last) Behrouz NematiPour - * \date (last) 15-May-2021 + * \date (last) 22-Mar-2023 * \author (original) Behrouz NematiPour * \date (original) 15-May-2021 * @@ -33,13 +33,13 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:| - * |0x9400| 0x020 | Event | Y | HD | UI | Treatment Log Alarm Data | + * |0x9500| 0x020 | Event | Y | HD | UI | Treatment Log Alarm Data | * * | Payload || * | || * | #1:(U32) | \ref Data::mAlarmID | - * | #2:(U32) | \ref Data::mParam1 | - * | #3:(U32) | \ref Data::mParam2 | + * | #2:(F32) | \ref Data::mParam1 | + * | #3:(F32) | \ref Data::mParam2 | * * \sa Data * \sa HD_Post_Treatment_Mode_States @@ -61,8 +61,8 @@ struct { Types::U32 mAlarmID ; ///< Alarm ID - Types::U32 mParam1 ; ///< Alarm Parameter 1 // may need more than 1 parameter but defined one so it would be easier to add more later. - Types::U32 mParam2 ; ///< Alarm Parameter 2 // may need more than 1 parameter but defined one so it would be easier to add more later. + Types::F32 mParam1 ; ///< Alarm Parameter 1 // may need more than 1 parameter but defined one so it would be easier to add more later. + Types::F32 mParam2 ; ///< Alarm Parameter 2 // may need more than 1 parameter but defined one so it would be easier to add more later. } _data; public: @@ -74,8 +74,8 @@ struct Data { quint64 mTimeStamp ; ///< Timestamp of the received message in secs since epoch quint32 mAlarmID ; ///< Alarm ID - quint32 mParam1 ; ///< Alarm Parameter 1 - quint32 mParam2 ; ///< Alarm Parameter 2 + float mParam1 ; ///< Alarm Parameter 1 + float mParam2 ; ///< Alarm Parameter 2 }; MTreatmentLogAlarmData() { }