Index: sources/canbus/messageacknowmodel.h =================================================================== diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -r7c2a96774285bb618946f125763bf7bea7acadd8 --- sources/canbus/messageacknowmodel.h (.../messageacknowmodel.h) (revision d2035a8728794afeefaa244bf8d1597926d945f5) +++ sources/canbus/messageacknowmodel.h (.../messageacknowmodel.h) (revision 7c2a96774285bb618946f125763bf7bea7acadd8) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. - * + * * \file messageacknowmodel.h * \author (last) Behrouz NematiPour * \date (last) 07-May-2020 * \author (original) Behrouz NematiPour * \date (original) 17-Jan-2020 - * + * */ #pragma once @@ -64,7 +64,7 @@ protected: /*! * \brief MessageAcknowModel::timerEvent - * \details This event handler has been override in here + * \details This event handler has been overrode in here * to receive timer events for the object * for the timer which has been set to _interval * emits the didFramesTransmit signal to retry transmitting the frames Index: sources/canbus/messagebuilder.cpp =================================================================== diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -r7c2a96774285bb618946f125763bf7bea7acadd8 --- sources/canbus/messagebuilder.cpp (.../messagebuilder.cpp) (revision d2035a8728794afeefaa244bf8d1597926d945f5) +++ sources/canbus/messagebuilder.cpp (.../messagebuilder.cpp) (revision 7c2a96774285bb618946f125763bf7bea7acadd8) @@ -1,21 +1,20 @@ /*! - * + * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. - * + * * \file messagebuilder.cpp * \author (last) Behrouz NematiPour * \date (last) 07-May-2020 * \author (original) Behrouz NematiPour * \date (original) 09-Dec-2019 - * + * */ #include "messagebuilder.h" // Qt -#include // Project #include "logger.h" Index: sources/canbus/messageglobals.h =================================================================== diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -r7c2a96774285bb618946f125763bf7bea7acadd8 --- sources/canbus/messageglobals.h (.../messageglobals.h) (revision d2035a8728794afeefaa244bf8d1597926d945f5) +++ sources/canbus/messageglobals.h (.../messageglobals.h) (revision 7c2a96774285bb618946f125763bf7bea7acadd8) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. - * + * * \file messageglobals.h * \author (last) Peter Lucia * \date (last) 25-Jun-2020 * \author (original) Behrouz NematiPour * \date (original) 06-Dec-2019 - * + * */ #pragma once @@ -167,7 +167,7 @@ eChlid_UI_HD = 0x100, ///< UI => HD [Out] // UI lessens occasionally - eChlid_DG_UI = 0x070, ///< No direct channel has been defined between DG&UI, May be required for logging + eChlid_DG_UI = 0x070, ///< DG => UI eChlid_UI_DG = eChlid_UI_Sync , ///< No direct channel has been defined between DG&UI, May be required for logging }; Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -r74005a93d93ec4b12230bac72ed29b948eb1aa0a -r7c2a96774285bb618946f125763bf7bea7acadd8 --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 74005a93d93ec4b12230bac72ed29b948eb1aa0a) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 7c2a96774285bb618946f125763bf7bea7acadd8) @@ -104,6 +104,11 @@ return true; } +/*! + * \brief MessageInterpreter::logInvalidLength + * \details Logs invalid data length for the message typye vActionId + * \param vActionId - Message Type + */ void MessageInterpreter::logInvalidLength(const Gui::GuiActionType &vActionId) { QString mActionIdHexString = Format::toHexString(vActionId); Index: sources/gui/qml/main.qml =================================================================== diff -u -r9cc1608f615e66d0f1c3a022aa6d19579d76b241 -r7c2a96774285bb618946f125763bf7bea7acadd8 --- sources/gui/qml/main.qml (.../main.qml) (revision 9cc1608f615e66d0f1c3a022aa6d19579d76b241) +++ sources/gui/qml/main.qml (.../main.qml) (revision 7c2a96774285bb618946f125763bf7bea7acadd8) @@ -75,7 +75,6 @@ ) break; } - } } @@ -87,7 +86,6 @@ _alarm_dialog.isSilenced = vAlarmStatus.alarm_Flag_alarmsSilenced _alarm_bar.toggleSilence(vAlarmStatus.alarm_Flag_alarmsSilenced, vAlarmStatus.alarm_MuteTimeout); - if (isAlarmHighPriority()) { _alarm_dialog.visible = true; _alarm_bar.visible = false; Index: sources/view/valarmstatus.cpp =================================================================== diff -u -rbf645acccabb7b5a84801620c4f7fa0b0e6878e0 -r7c2a96774285bb618946f125763bf7bea7acadd8 --- sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision bf645acccabb7b5a84801620c4f7fa0b0e6878e0) +++ sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision 7c2a96774285bb618946f125763bf7bea7acadd8) @@ -38,8 +38,8 @@ } if (acknowledgedAlarms.contains(alarmID)) { - qDebug() << "Alarm ID " << alarmID << " has been acknowleged and is visible. "; - LOG_EVENT(tr("Alarm ID %0 has been acknowleged and is visible. ").arg(alarmID)); + qDebug() << "Alarm ID " << alarmID << " has been acknowledged and is visible. "; + LOG_EVENT(tr("Alarm ID %0 has been acknowledged and is visible. ").arg(alarmID)); return; }