Index: denali.pro.user =================================================================== diff -u -rb42479c75add1af6281a6f7d8e6090117eaa55a9 -r7ffe641e90fd076e4358d56ef9aa400e9a9c1f75 --- denali.pro.user (.../denali.pro.user) (revision b42479c75add1af6281a6f7d8e6090117eaa55a9) +++ denali.pro.user (.../denali.pro.user) (revision 7ffe641e90fd076e4358d56ef9aa400e9a9c1f75) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r3e5cdca5de3ac46619325bf1e37c572d729d5fa9 -r7ffe641e90fd076e4358d56ef9aa400e9a9c1f75 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 3e5cdca5de3ac46619325bf1e37c572d729d5fa9) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 7ffe641e90fd076e4358d56ef9aa400e9a9c1f75) @@ -332,10 +332,12 @@ */ void MessageDispatcher::onAdjustment(const AlarmClearedConditionRequestData &vData) { + // coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. QVariantList mData; mData += vData.alarmID; onActionTransmit(GuiActionType::ID_AlarmClearedConditionReq, mData); } +// coco end /*! * \brief MessageDispatcher::onAdjustment Index: sources/gui/qml/main.qml =================================================================== diff -u -r5b17a1d8d36a1fdae83391453aff79d41c1ee0c4 -r7ffe641e90fd076e4358d56ef9aa400e9a9c1f75 --- sources/gui/qml/main.qml (.../main.qml) (revision 5b17a1d8d36a1fdae83391453aff79d41c1ee0c4) +++ sources/gui/qml/main.qml (.../main.qml) (revision 7ffe641e90fd076e4358d56ef9aa400e9a9c1f75) @@ -202,7 +202,7 @@ onOkClicked : vAlarmStatus.doUserActionOk () onMinimizeClicked : { alarmMinimize() - // when used minimizes the alarm it can stay minimized until otherwize is set + // when user minimizes the alarm it can stay minimized until otherwize is set // by the next alarm status received. // see also the "Connections { target: vAlarmStatus" implementation vAlarmStatus.alarm_KeepMinimized = true Index: sources/model/hd/alarm/MAlarmClearedCondition.cpp =================================================================== diff -u -r3e5cdca5de3ac46619325bf1e37c572d729d5fa9 -r7ffe641e90fd076e4358d56ef9aa400e9a9c1f75 --- sources/model/hd/alarm/MAlarmClearedCondition.cpp (.../MAlarmClearedCondition.cpp) (revision 3e5cdca5de3ac46619325bf1e37c572d729d5fa9) +++ sources/model/hd/alarm/MAlarmClearedCondition.cpp (.../MAlarmClearedCondition.cpp) (revision 7ffe641e90fd076e4358d56ef9aa400e9a9c1f75) @@ -16,6 +16,7 @@ using namespace Model; +// coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. QVariantList MAlarmClearedCondition::parameters() const { return { _data.mAlarmID.value @@ -39,3 +40,4 @@ data.mAlarmID = _data.mAlarmID.value; return data; } +// coco end Index: sources/model/hd/alarm/MAlarmClearedCondition.h =================================================================== diff -u -r3e5cdca5de3ac46619325bf1e37c572d729d5fa9 -r7ffe641e90fd076e4358d56ef9aa400e9a9c1f75 --- sources/model/hd/alarm/MAlarmClearedCondition.h (.../MAlarmClearedCondition.h) (revision 3e5cdca5de3ac46619325bf1e37c572d729d5fa9) +++ sources/model/hd/alarm/MAlarmClearedCondition.h (.../MAlarmClearedCondition.h) (revision 7ffe641e90fd076e4358d56ef9aa400e9a9c1f75) @@ -60,10 +60,11 @@ } _data; public: + // coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. Type_Enum typeText() const override { return Type_Enum::eEvent ; } Unit_Enum unitText() const override { return Unit_Enum::eHD ; } QString infoText() const override { return QString("AlarmCondition") ; } - + // coco end struct Data { quint32 mAlarmID = 0; ///< Alarm ID }; Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -rb42479c75add1af6281a6f7d8e6090117eaa55a9 -r7ffe641e90fd076e4358d56ef9aa400e9a9c1f75 --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision b42479c75add1af6281a6f7d8e6090117eaa55a9) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 7ffe641e90fd076e4358d56ef9aa400e9a9c1f75) @@ -86,7 +86,7 @@ * \details Send out a request to notify alarm condition is cleared * \note this is an example of how to do the clear condition * later it may require to have a parameter or it needs to be different slots - * currently there is use case for this + * currently there is no use case for this */ void View::VAlarmStatus::doClearCondition() {