Index: denali.pro.user =================================================================== diff -u -r8f336b528afb37743d4ae3404c810e6a9e4422c4 -rcb7d9e125fe619ab0713f9146e9774940e26a096 --- denali.pro.user (.../denali.pro.user) (revision 8f336b528afb37743d4ae3404c810e6a9e4422c4) +++ denali.pro.user (.../denali.pro.user) (revision cb7d9e125fe619ab0713f9146e9774940e26a096) @@ -1,6 +1,6 @@ - + EnvironmentId Index: main.cpp =================================================================== diff -u -r8f336b528afb37743d4ae3404c810e6a9e4422c4 -rcb7d9e125fe619ab0713f9146e9774940e26a096 --- main.cpp (.../main.cpp) (revision 8f336b528afb37743d4ae3404c810e6a9e4422c4) +++ main.cpp (.../main.cpp) (revision cb7d9e125fe619ab0713f9146e9774940e26a096) @@ -87,10 +87,11 @@ bool gDisableDialinUnhandled = false ; bool gDisableTimeout = false ; bool gDisableAlarmNoMinimize = false ; -bool gDisableCheckInLog = false ; -bool gDisableAcknowLog = false ; bool gDisableSDCFailLogStop = false ; +bool gEnableCheckInLog = false ; +bool gEnableAcknowLog = false ; + bool gConsoleoutLogs = false ; bool gConsoleoutFrameInterface = false ; bool gConsoleoutCanInterface = false ; @@ -206,21 +207,22 @@ QCoreApplication::translate("main", "Disables alarm no minimize")); parser.addOption(optionDisableAlarmMoMinimize); - // --- -k : disable-Check-in-log (keep-alive) - QCommandLineOption optionDisableCheckInLog(QStringList() << "k" << "disable-check-in-log", - QCoreApplication::translate("main", "Disables Check-In Log")); - parser.addOption(optionDisableCheckInLog); - - // --- -K : disable-acknow-log (Acknowledge) - QCommandLineOption optionDisableAcknowLog(QStringList() << "K" << "disable-acknow-log", - QCoreApplication::translate("main", "Disables Acknowledgment Log")); - parser.addOption(optionDisableAcknowLog); - // --- -S : disable-sd-card-fail-log-stop QCommandLineOption optionDisableSDCardFailLogStop(QStringList() << "S" << "disable-sd-card-fail-log-stop", QCoreApplication::translate("main", "disable-sd-card-fail-log-stop")); parser.addOption(optionDisableSDCardFailLogStop); + // --- -k : enable-Check-in-log (keep-alive) + QCommandLineOption optionEnableCheckInLog(QStringList() << "k" << "enable-check-in-log", + QCoreApplication::translate("main", "Enables Check-In Log")); + parser.addOption(optionEnableCheckInLog); + + // --- -K : enable-acknow-log (Acknowledge) + QCommandLineOption optionEnableAcknowLog(QStringList() << "K" << "enable-acknow-log", + QCoreApplication::translate("main", "Enables Acknowledgment Log")); + parser.addOption(optionEnableAcknowLog); + + // --- parse command lines parser.process(*qApp); @@ -231,10 +233,11 @@ gDisableDialinUnhandled = parser.isSet(optionDisableDialinUnhandled ); gDisableTimeout = parser.isSet(optionDisableTimeout ); gDisableAlarmNoMinimize = parser.isSet(optionDisableAlarmMoMinimize ); - gDisableCheckInLog = parser.isSet(optionDisableCheckInLog ); - gDisableAcknowLog = parser.isSet(optionDisableAcknowLog ); gDisableSDCFailLogStop = parser.isSet(optionDisableSDCardFailLogStop ); + gEnableCheckInLog = parser.isSet(optionEnableCheckInLog ); + gEnableAcknowLog = parser.isSet(optionEnableAcknowLog ); + if (parser.isSet(optionSendEmptyKeepAwake)) gSendEmptyKeepAwake = true; bool ok = false; Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r627b97843f87f5ca8fbd731c6c4a6d9fae4352ce -rcb7d9e125fe619ab0713f9146e9774940e26a096 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 627b97843f87f5ca8fbd731c6c4a6d9fae4352ce) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision cb7d9e125fe619ab0713f9146e9774940e26a096) @@ -802,7 +802,7 @@ bool mNeedsAcknow = needsAcknow(vActionId); if (mNeedsAcknow) { mSequence = -mSequence; - if ( ! gDisableAcknowLog ) { + if ( gEnableAcknowLog ) { LOG_EVENT(tr("UI,Ack Req, Sq:%1, ID:%2").arg(mSequence).arg(Format::toHexString(vActionId))); } #ifdef DEBUG_ACKBACK_HD_TO_UI @@ -876,7 +876,7 @@ bool ok = false; if ( mActionId == GuiActionType::ID_Acknow ) { ok = true; - if ( ! gDisableAcknowLog ) { + if ( gEnableAcknowLog ) { LOG_EVENT(tr("%1,Ack Bak, Sq:%2").arg(vSrcText).arg(mSequence)); } #ifdef DEBUG_ACKBACK_HD_TO_UI @@ -905,7 +905,7 @@ if (mSequence < 0) { ok = true; - if ( ! gDisableAcknowLog ) { + if ( gEnableAcknowLog ) { LOG_EVENT(tr("%1,Ack Req, Sq:%2, ID:%3").arg(vSrcText).arg(mSequence).arg(Format::toHexString(mActionId))); } #ifdef DEBUG_ACKBACK_HD_TO_UI @@ -915,7 +915,7 @@ QString dstText; Can_Id dstID = MessageInterpreter::identifyDestination(vMessage.can_id, &dstText); actionTransmit(GuiActionType::ID_Acknow, {}, -mSequence, dstID); - if ( ! gDisableAcknowLog ) { + if ( gEnableAcknowLog ) { LOG_EVENT(tr("UI,Ack Bak, Sq:%1, Dst:%2").arg(-mSequence).arg(dstText)); } #ifdef DEBUG_ACKBACK_HD_TO_UI Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rae149c87409efbe66b84924aa1cbb3131be9d5b7 -rcb7d9e125fe619ab0713f9146e9774940e26a096 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision ae149c87409efbe66b84924aa1cbb3131be9d5b7) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision cb7d9e125fe619ab0713f9146e9774940e26a096) @@ -227,7 +227,7 @@ if ( length ) { // this message has a variable length vPayload = Format::fromVariant(vData[0]); } - if ( ! gDisableCheckInLog ) + if ( gEnableCheckInLog ) LOG_EVENT_UI(QString("CheckIn")); break; Index: sources/main.h =================================================================== diff -u -r465a935949a85d3d1bebd11979737ff38ef96122 -rcb7d9e125fe619ab0713f9146e9774940e26a096 --- sources/main.h (.../main.h) (revision 465a935949a85d3d1bebd11979737ff38ef96122) +++ sources/main.h (.../main.h) (revision cb7d9e125fe619ab0713f9146e9774940e26a096) @@ -62,10 +62,11 @@ extern bool gDisableDialinUnhandled ; extern bool gDisableTimeout ; extern bool gDisableAlarmNoMinimize ; -extern bool gDisableCheckInLog ; -extern bool gDisableAcknowLog ; extern bool gDisableSDCFailLogStop ; +extern bool gEnableCheckInLog ; +extern bool gEnableAcknowLog ; + extern bool gConsoleoutLogs ; extern bool gConsoleoutFrameInterface ; extern bool gConsoleoutCanInterface ; Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r465a935949a85d3d1bebd11979737ff38ef96122 -rcb7d9e125fe619ab0713f9146e9774940e26a096 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 465a935949a85d3d1bebd11979737ff38ef96122) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision cb7d9e125fe619ab0713f9146e9774940e26a096) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 11-Aug-2022 + * \date (last) 12-Aug-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 *