Index: sources/model/hd/alarm/MAlarmTriggered.h
===================================================================
diff -u -rb94c297fa75f826acd539c57684c1769e5883d67 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision b94c297fa75f826acd539c57684c1769e5883d67)
+++ sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
@@ -1,14 +1,14 @@
/*!
*
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2020-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 MAlarmTriggered.h
* \author (last) Behrouz NematiPour
- * \author (original) Behrouz NematiPour
- * \date (last) 16-Oct-2020
+ * \date (last) 18-Apr-2022
+ * \author (original) Behrouz NemaiPour
* \date (original) 02-Jul-2020
*
*/
@@ -42,8 +42,10 @@
* | #3:(Any) | \ref Data::mDataField1 |
* | #4:(U32) | \ref Data::mFieldDescriptor2 |
* | #5:(Any) | \ref Data::mDataField2 |
+ * | #6:(U32) | \ref Data::mPriority |
+ * | #7:(U32) | \ref Data::mRank |
+ * | #8:(U32) | \ref Data::mClearTop |
*
- *
* \sa Data
*
*
@@ -59,28 +61,45 @@
// friends
friend class ::tst_models;
+protected:
+ QVariantList parameters() const;
+
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("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 ;
+
+ quint32 mPriority ;
+ quint32 mRank ;
+ bool mClearTop ;
};
+ struct {
+ Types::U32 mPriority ;
+ Types::U32 mRank ;
+ Types::U32 mClearTop ;
+ } _xata;
+
public:
MAlarmTriggered () { }
+ bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override;
+
Data data () const;
};
@@ -110,10 +129,10 @@
*/
class MAlarmTriggeredReq : public MModel {
public:
- // coco begin validated: Has been validated manually.
+ // disabled coco begin validated: Has been validated manually.
// This object is used statically for now, kept the logic for later usage.
QString toString();
- // coco end
+ // disabled coco end
static QString toString(const QVariantList &vParameters);
static Can::Can_Id canid ();
};