Index: sources/model/hd/alarm/MAlarmStatusData.h =================================================================== diff -u -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d -r5db87178d372acd2cc4e5d75bf99f4c0cb11f1f2 --- sources/model/hd/alarm/MAlarmStatusData.h (.../MAlarmStatusData.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) +++ sources/model/hd/alarm/MAlarmStatusData.h (.../MAlarmStatusData.h) (revision 5db87178d372acd2cc4e5d75bf99f4c0cb11f1f2) @@ -29,9 +29,9 @@ * \brief The MAlarmStatus class * \details The alarm status model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | #3:(U32) | #4:(U32) | #5:(U16) | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: | - * |0x0200| 0x001 | 1 | 1 Hz | N | HD | All | Alarm Status | mState | mTop | mEscalatesIn | mMuteTimeout | mFlags | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | #3:(U32) | #4:(U32) | #5:(U16) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: | + * |0x0200| 0x001 | 1 | 1 Hz | N | HD | All | Alarm Status | \ref Data::mState | \ref Data::mTop | \ref Data::mEscalatesIn | \ref Data::mMuteTimeout | \ref Data::mFlags | * * \sa Data * @@ -59,7 +59,7 @@ QString stringPrefix = "Alarm Status"; struct Data { quint32 mState = 0; ///< State - Alarm Priority - quint32 mTop = 0; ///< Top - Top + quint32 mTop = 0; ///< Top - Top current alarm ID quint32 mEscalatesIn = 0; ///< EscalatesIn - EscalatesIn quint32 mMuteTimeout = 0; ///< MuteTimeout - MuteTimeout QBitArray mFlags ; ///< Flags - Flags @@ -77,7 +77,7 @@ public: MAlarmStatus(); - QString toString ( ) const ; + QString toString ( ) const ; void toVariantList ( QVariantList &vData ) const ; bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr); static QString toText ( Gui::GuiAlarmID vAlarmID);