Index: sources/model/hd/alarm/MAlarmTriggered.h
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r4a67c01045f365be38f1a12a8572c0070d343e1e
--- sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
@@ -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 ();
};