Index: sources/model/hd/alarm/MAlarmTriggered.h =================================================================== diff -u -r712f4c8a1b2382919300895b4422b831471044a3 -rd7f70405a20319dd9f2dc93ee7f357cc88d0f84b --- sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision 712f4c8a1b2382919300895b4422b831471044a3) +++ sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision d7f70405a20319dd9f2dc93ee7f357cc88d0f84b) @@ -113,8 +113,14 @@ * |0x0200| 0x004 | Req | Y | UI | All | Alarm Triggered | * * | Payload || - * | || - * | || + * | #1:(U32) | \ref Data::mAlarmID | + * | #2:(U32) | \ref Data::mFieldDescriptor1 | + * | #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 @@ -129,9 +135,30 @@ */ class MAlarmTriggeredReq : public MModel { public: - QString toString(); - static QString toString(const QVariantList &vParameters); - static Can::Can_Id canid (); + quint32 mAlarmID = 0; + quint32 mFieldDescriptor1 = 0; + quint32 mDataField1 = 0; + quint32 mFieldDescriptor2 = 0; + quint32 mDataField2 = 0; + quint32 mPriority = 0; + quint32 mRank = 0; + quint32 mClearTop = 0; + + QString toString() { + return toString + ({ mAlarmID , + mFieldDescriptor1 , + mDataField1 , + mFieldDescriptor2 , + mDataField2 , + mPriority , + mRank , + mClearTop + }); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AlarmTriggered", vParameters); + } }; }