Index: sources/model/hd/alarm/MAlarmTriggered.h
===================================================================
diff -u -r29424716b9b1aafc77443cc2607572ddbd9da372 -r338575f7f1856c99fbc3c0cb59391fc23601c89b
--- sources/model/hd/alarm/MAlarmTriggered.h	(.../MAlarmTriggered.h)	(revision 29424716b9b1aafc77443cc2607572ddbd9da372)
+++ sources/model/hd/alarm/MAlarmTriggered.h	(.../MAlarmTriggered.h)	(revision 338575f7f1856c99fbc3c0cb59391fc23601c89b)
@@ -18,7 +18,7 @@
 #include <QString>
 
 // Project
-#include "MAbstract.h"
+#include "MAbstractDynamic.h"
 #include "MAdjustRequestsBase.h"
 #include "types.h"
 
@@ -37,7 +37,7 @@
  *
  * | Payload  ||
  * |          ||
- * | #1:(U32) | \ref Data::mAlarmID          |
+ * | #1:(U32) | \ref Data::mAlarmID(mID)     |
  * | #2:(U32) | \ref Data::mFieldDescriptor1 |
  * | #3:(Any) | \ref Data::mDataField1       |
  * | #4:(U32) | \ref Data::mFieldDescriptor2 |
@@ -54,53 +54,18 @@
  * | infoText     | AlarmTriggered |
  *
  */
-class MAlarmTriggered : public MAbstract {
+class MAlarmTriggered : public MAbstractDynamic {
 
     // friends
     friend class ::tst_models;
 
-    QVariantList parameters() const override;
-
-    struct {
-        Types::U32  mAlarmID            ;
-        Types::U32  mFieldDescriptor1   ;
-        Types::U32  mDataFieldU1        ;
-        Types::S32  mDataFieldS1        ;
-        Types::F32  mDataFieldF1        ;
-        Types::U32  mDataFieldB1        ;
-        Types::U32  mFieldDescriptor2   ;
-        Types::U32  mDataFieldU2        ;
-        Types::S32  mDataFieldS2        ;
-        Types::F32  mDataFieldF2        ;
-        Types::U32  mDataFieldB2        ;
-    } _data;
-
-
 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;  ///< Alarm ID
-        quint32     mFieldDescriptor1   ;
-        quint32     mDataFieldU1        ;
-        qint32      mDataFieldS1        ;
-        float       mDataFieldF1        ;
-        bool        mDataFieldB1        ;
-        quint32     mFieldDescriptor2   ;
-        quint32     mDataFieldU2        ;
-        qint32      mDataFieldS2        ;
-        float       mDataFieldF2        ;
-        bool        mDataFieldB2        ;
-    };
-
 public:
     MAlarmTriggered () { }
-
-    bool    fromByteArray   (const QByteArray   &vByteArray  , int *vIndex = nullptr)       override;
-    Data    data            (                                                       ) const         ;
 };