Index: sources/model/hd/alarm/MAlarmStatusData.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r712f4c8a1b2382919300895b4422b831471044a3 --- sources/model/hd/alarm/MAlarmStatusData.h (.../MAlarmStatusData.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/alarm/MAlarmStatusData.h (.../MAlarmStatusData.h) (revision 712f4c8a1b2382919300895b4422b831471044a3) @@ -31,25 +31,24 @@ * \brief The MAlarmStatus class * \details The alarm status model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x0200| 0x001 | 1 | 1 Hz | N | HD | All | Alarm Status | + * | MSG | CAN ID | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:---:|:---:|:-----------: | + * |0x0100| 0x001 | N | TD | All | Alarm Status | * * | Payload || * | || * | #1:(U32) | \ref Data::mState | * | #2:(U32) | \ref Data::mTop | - * | #3:(U32) | \ref Data::mEscalatesIn | - * | #4:(U32) | \ref Data::mMuteTimeout | - * | #5:(U16) | \ref Data::mFlags | + * | #3:(U32) | \ref Data::mMuteTimeout | + * | #4:(U16) | \ref Data::mFlags | * * \sa Data * *

Logging info

* | || * | || * | typeText | Datum | - * | unitText | HD | + * | unitText | TD | * | infoText | Alarm Status | * */ @@ -63,7 +62,6 @@ struct { Types::U32 mState ; Types::U32 mTop ; - Types::U32 mEscalatesIn ; Types::U32 mMuteTimeout ; Types::Flags mFlags ; } _data; @@ -77,7 +75,6 @@ struct Data { quint32 mState = 0; ///< State - Alarm Priority quint32 mTop = 0; ///< Top - Top current alarm ID - quint32 mEscalatesIn = 0; ///< EscalatesIn - EscalatesIn quint32 mMuteTimeout = 0; ///< MuteTimeout - MuteTimeout QBitArray mFlags ; ///< Flags - Flags };