Index: sources/model/hd/alarm/MAlarmTriggered.h =================================================================== diff -u -rd7f70405a20319dd9f2dc93ee7f357cc88d0f84b -rd4043dfea6feab1bd705d2f740e18eb838db9d75 --- sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision d7f70405a20319dd9f2dc93ee7f357cc88d0f84b) +++ sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision d4043dfea6feab1bd705d2f740e18eb838db9d75) @@ -113,16 +113,9 @@ * |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 * *

Logging info

@@ -135,30 +128,9 @@ */ class MAlarmTriggeredReq : public MModel { public: - 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); - } + QString toString(); + static QString toString(const QVariantList &vParameters); + static Can::Can_Id canid (); }; }