Index: main.cpp
===================================================================
diff -u -rf91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec -rc0b30f1fa82d0121706351057ab52b3bb1141459
--- main.cpp	(.../main.cpp)	(revision f91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec)
+++ main.cpp	(.../main.cpp)	(revision c0b30f1fa82d0121706351057ab52b3bb1141459)
@@ -32,27 +32,30 @@
 #include <QDebug>
 #include <QString>
 #include <QApplication>
-#include <QTranslator>
 #include <QFont>
 #include <QCommandLineParser>
 #include <QDateTime>
 
-#include "Compatible.h"
 
 // Project
+#include "FileHandler.h"
 #include "MainTimer.h"
 #include "CanInterface.h"
 #include "FrameInterface.h"
 #include "MessageAcknowModel.h"
 #include "MessageDispatcher.h"
+#include "ApplicationController.h"
+#include "Logger.h"
 
+//AMIR
+#include "Settings.h"
+
 #include "Threads.h"
 
-#include "drydemostates.h"
-
 // kernel
 #include <signal.h>
 
+
 /*!
  * \brief   signalhandler
  * \details When application terminates it quits gracefully.
@@ -77,14 +80,14 @@
 const char *gFakeData_default           = "00"  ;
 bool        gSendEmptyKeepAwake         = false ;
 bool        gFakeSeqAtBegin             = false ;
+bool        gDisableUnhandledReport     = false ;
 bool        gDisableDialinUnhandled     = false ;
 bool        gDisableTimeout             = false ;
 bool        gDisableAlarmNoMinimize     = false ;
 bool        gDisableSDCFailLogStop      = false ;
 bool        gDisableCloudSyncFailStop   = false ;
 
 bool        gDisableCheckInLog          = false ;
-bool        gDisableUnhandledReport     = false ;
 bool        gDisableAcknowLog           = false ;
 
 bool        gConsoleoutLogs             = false ;
@@ -101,6 +104,7 @@
 bool        gLogLongName                = false ;
 bool        gLogUpload                  = false ;
 bool        gLogCompress                = false ;
+bool        gLogUnhandledOnly           = false ;
 
 QString     gParserErrorText            = "";
 QString     gStandard_tmp               = QString("/%1/").arg("tmp");
@@ -113,50 +117,51 @@
  * Usage: ./denali [options]
  * Denali
  *
- *  Options:
- *    -h, --help                           Displays help on commandline options.
- *    --help-all                           Displays help including Qt specific
- *                                         options.
- *    -v, --version                        Displays version information.
- *    -c, --canOut                         Show the Can Frame Output
- *    -m, --msgOut                         Show the Message Output
- *    -l, --logOut                         Show the Logs Output
- *    -0, --enable-keep-awake              Enable send low priority, empty message
- *                                         on the CANBus just to keep UI board CAN
- *                                         driver awake
- *    -i, --fake-interval <interval>       Test fake message interval(ms)
- *    -f, --fake-message <data>            Test fake message data
- *                                         will use default sequenced long fake
- *                                         message if set to 00(default)
- *                                         will used only if correct integer value
- *                                         assigned for interval option
- *    -b, --fake-message-seq-at-begin      Test fake message sequence at the
- *                                         beginning of the frame
- *    -u, --disable-unhandled-report       Disable unhandled messages report as an
- *                                         error in the log
- *    -d, --disable-dialin-unhandled       Disable the Dialin messages logged as
- *                                         unhandled
- *    -q, --disable-timeout                Disables HD communication timeout
- *    -a, --disable-alarm-no-minimize      Disables alarm no minimize
- *    -S, --disable-sd-card-fail-log-stop  disable-sd-card-fail-log-stop
- *    -C, --disable-cloudsync-fail-stop    disable-cloudsync-fail-stop
- *    -k, --disable-check-in-log           Disables Check-In Log
- *    -K, --disable-acknow-log             Disables Acknowledgment Log
- *    -D, --enable-dry-demo                Enables Dry-Demo Mode
- *    -A, --active-can-bus <CANBus>        Sets the Active CANBus [Shall start with
- *                                         'can' or 'vcan]
- *    -E, --enable-manufacturing           Enables the manufacturing mode to
- *                                         configure the system for the first time.
- *    -R, --use-root-home                  In case the application is not in
- *                                         Manufacturing Setup but needs to use root
- *                                         home folder for configurations.
- *    -U, --enable-update-mode             Enables the update mode to update only
- *                                         necessary files during the update and
- *                                         keep the rest.
- *    -x, --use-log-long-name              Use the log long file name format
- *                                         <date>_<time>_<serial>_<mode>
- *    -y, --use-log-cloud-upload           Use the log cloud upload
- *    -z, --use-log-compression            Use the log compression
+ * Options:
+ *   -h, --help                           Displays help on commandline options.
+ *   --help-all                           Displays help including Qt specific
+ *                                        options.
+ *   -v, --version                        Displays version information.
+ *   -c, --canOut                         Show the Can Frame Output
+ *   -m, --msgOut                         Show the Message Output
+ *   -l, --logOut                         Show the Logs Output
+ *   -0, --enable-keep-awake              Enable send low priority, empty message
+ *                                        on the CANBus just to keep UI board CAN
+ *                                        driver awake
+ *   -i, --fake-interval <interval>       Test fake message interval(ms)
+ *   -f, --fake-message <data>            Test fake message data
+ *                                        will use default sequenced long fake
+ *                                        message if set to 00(default)
+ *                                        will used only if correct integer value
+ *                                        assigned for interval option
+ *   -b, --fake-message-seq-at-begin      Test fake message sequence at the
+ *                                        beginning of the frame
+ *   -u, --disable-unhandled-report       Disable unhandled messages report as an
+ *                                        error in the log
+ *   -d, --disable-dialin-unhandled       Disable the Dialin messages logged as
+ *                                        unhandled
+ *   -q, --disable-timeout                Disables HD communication timeout
+ *   -a, --disable-alarm-no-minimize      Disables alarm no minimize
+ *   -S, --disable-sd-card-fail-log-stop  disable-sd-card-fail-log-stop
+ *   -C, --disable-cloudsync-fail-stop    disable-cloudsync-fail-stop
+ *   -k, --disable-check-in-log           Disables Check-In Log
+ *   -K, --disable-acknow-log             Disables Acknowledgment Log
+ *   -D, --enable-dry-demo                Enables Dry-Demo Mode
+ *   -A, --active-can-bus <CANBus>        Sets the Active CANBus [Shall start with
+ *                                        'can' or 'vcan]
+ *   -E, --enable-manufacturing           Enables the manufacturing mode to
+ *                                        configure the system for the first time.
+ *   -R, --use-root-home                  In case the application is not in
+ *                                        Manufacturing Setup but needs to use root
+ *                                        home folder for configurations.
+ *   -U, --enable-update-mode             Enables the update mode to update only
+ *                                        necessary files during the update and
+ *                                        keep the rest.
+ *   -x, --use-log-long-name              Use the log long file name format
+ *                                        <date>_<time>_<serial>_<mode>
+ *   -y, --use-log-cloud-upload           Use the log cloud upload
+ *   -z, --use-log-compression            Use the log compression
+ *   -L, --use-log-unhandled-only         Use the unhandled messages only to log
  *
  * \endverbatim
  */
@@ -313,6 +318,12 @@
                 QCoreApplication::translate("main", "Use the log compression"));
     parser.addOption(optionLogCompress);
 
+    // --- -L : use-log-unhandled-only
+    QCommandLineOption optionLogUnhandledOnly(
+        QStringList() << "L" << "use-log-unhandled-only",
+        QCoreApplication::translate("main", "Use the unhandled messages only to log"));
+    parser.addOption(optionLogUnhandledOnly);
+
     // --- parse command lines
     if ( ! parser.parse(qApp->arguments()) ) {
         gParserErrorText = parser.errorText();
@@ -337,7 +348,6 @@
     gDisableCloudSyncFailStop   = parser.isSet(optionDisableCloudSyncFailStop   );
 
     gDisableCheckInLog          = parser.isSet(optionDisableCheckInLog          );
-
     gDisableAcknowLog           = parser.isSet(optionDisableAcknowLog           );
 
     gEnableDryDemo              = parser.isSet(optionEnableDryDemo              );
@@ -349,13 +359,21 @@
     gLogLongName                = parser.isSet(optionLogLongName                );
     gLogUpload                  = parser.isSet(optionLogUpload                  );
     gLogCompress                = parser.isSet(optionLogCompress                );
+    gLogUnhandledOnly           = parser.isSet(optionLogUnhandledOnly           );
 
     //DEBUG:
     qDebug() << "\n"
              << "---------- x:" << gLogLongName << "\n"
              << "---------- y:" << gLogUpload   << "\n"
              << "---------- z:" << gLogCompress << "\n";
 
+    if ( gLogUnhandledOnly ) {
+        qDebug() << "\n"
+                 << "**********************************************************"  << "\n"
+                 << "********** SYSTEM IS IN UNHANDLED LOG ONLY MODE **********"  << "\n"
+                 << "**********************************************************"  << "\n";
+    }
+
     if (                          parser.isSet(optionActiveCANBus               ) ) {
         QString value = parser.value(optionActiveCANBus);
         if ( ! value.startsWith("-") &&                                     //  if a value is not given for the switch then the next switch becomes the value of the previous one
@@ -402,7 +420,7 @@
     QString ver_micro   = QString("%1").arg(VER_MICRO               );
     QString ver_revis   = QString("%1").arg(VER_REVIS               );
     QString ver_branch  = QString("%1").arg(VER_BRANCH              );
-    QString ver_comp    = QString("%1").arg(SW_COMPATIBILITY_REV    );
+    QString ver_comp    = QString("%1").arg(0                       );
     QString ver_branchx = "";
 
     if (ver_revis.isEmpty())  {
@@ -480,14 +498,20 @@
     // and all the files are copied to the /home/root/ to later be copied to secured locations
     // and that will be done by lockdown.sh script running within application after the user is done with the setup and QUIT s the application.
     if ( gEnableManufacturing || gEnableUpdating ) {
+        QString scriptName = Storage::Device_Lockdown;
         quint16 errorCode;
-        Q_UNUSED(errorCode);
         QString errorText;
+        //errorCode = Device::DeviceError::checkScript    (scriptName, Storage::Device_Lockdown   );
+        //errorText = Device::DeviceError::deviceErrorText( static_cast<Device::DeviceError::Scripts_Error_Enum>(errorCode), 1);
         qDebug() << errorText;  // since we are in the manufacturing mode it is possible to probably take a look at the serial, if not that is being logged.
 #ifdef BUILD_FOR_TARGET
         Storage::FileHandler::write("/home/root/lockdown.log"   , errorText, false);
 #else
+        Storage::FileHandler::write("/home/denali/lockdown.log" , errorText, false);
 #endif
+        if ( ! errorCode ) {
+            //QProcess::startDetached( scriptName, { qApp->applicationName() + ":" + QString::number(qApp->applicationPid()) });
+        }
     }
 }
 
@@ -508,31 +532,14 @@
     signal(SIGTERM, signalhandler);
 #endif
 
-    drydemostates dryStates;
-
-    qDebug() << "Here";
-
-    //dryStates.start();
-
-    dryStates.connectToState("Idle", QScxmlStateMachine::onEntry([&]() {
-                                 qDebug() << "In onEntry";
-                                 QThread::sleep(4);
-                                 dryStates.submitEvent("Tx_Start_Rqst");}));
-
-    dryStates.connectToState("Idle", QScxmlStateMachine::onExit([&] {
-                                 qDebug() << "Exiting";}));
-
-    dryStates.connectToState("Treatment", QScxmlStateMachine::onEntry([&]() {
-                                 qDebug() << "In Treatment";}));
-
     // setting the environment for the keyboard.
     qputenv("QT_IM_MODULE"                  , QByteArray("qtvirtualkeyboard"                            ));
     qputenv("QT_VIRTUALKEYBOARD_STYLE"      , QByteArray("denali"                                       ));
     qputenv("QT_VIRTUALKEYBOARD_LAYOUT_PATH", QByteArray(":/plugins/QtQuick/VirtualKeyboard/Layouts"    ));
 
     //! - Qt Application initialization and parameters settings
     // Qt Core Application parameters settings
-    QApplication::setApplicationName(QLatin1String("Denali"));
+    QApplication::setApplicationName(QLatin1String("DryDemo"));
     QApplication::setOrganizationName(QLatin1String("Diality Inc."));
 
     //! - Check the required font(s) present and can be loaded
@@ -551,27 +558,39 @@
     // SYSTEM TEST FOR INSTRUCTIONS WHEN THERE IS NO PORT AVAILABLE
     // Storage::FileHandler::copyFolder(QString(Storage::USB_Mount_Point) + "Instructions", QString(Storage::Settings_Path()));
 
-    //! - Translation initialization
-    QTranslator translator;
-    bool trLoaded = translator.load(QLocale(), app.applicationName(), QLatin1String("_"), QLatin1String(":/translations"));
-    if (trLoaded) {
-        app.installTranslator(&translator);
-    }
 
     //! - Initializing required thread types
     Threads::registerTypes();
 
+    //! - Initializing Logger
+    if(_Logger.init(Threads::_Logger_Thread)) {
+        _Logger.enableConsoleOut(gConsoleoutLogs);
+    }
+    _Logger.postInit();
+
+    // That is enough to call to the I function here to create the object in the thread that Settings is leaving in,
+    // which currently is Application_Thread, since the Settings is created in that thread.
+    _Settings;
+    QTranslator translator;
+    { // on-shot use of settings to load the translation only
+        // Storage::Settings settings;
+        //! - Reading localization
+        if ( ! Storage::Settings::readLocale() ) {
+            //! - Translation initialization
+            Storage::Settings::loadTranslation(translator);
+        }
+    }
+
     if (gFakeInterval) {
         QString msg = "  ~~ !!!!! APPLICATION RUNNING IN THE TEST MODE !!!!! ~~ ";
         qDebug() <<  msg;
-        // TODO is this needed?
-        //LOG_APPED(" \n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "
-        //          " \n " +                       msg                          +
-        //          " \n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ");
+        LOG_APPED(" \n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "
+                  " \n " +                       msg                          +
+                  " \n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ");
     }
 
     if ( ! gParserErrorText.isEmpty() ) {
-        //LOG_DEBUG(QString("Command-line arguments process failed:") + gParserErrorText); // TODO is this needed?
+        LOG_DEBUG(QString("Command-line arguments process failed:") + gParserErrorText);
     }
 
     //! - Initializing the CANBus Interface
@@ -590,16 +609,15 @@
         _MessageDispatcher.enableConsoleOut(gConsoleoutFrameInterface);
     }
 
+    //! - Initializing Application Controller
+    _ApplicationController.init(Threads::_Application_Thread);
+
     //! - Initializing Main Timer
     _MainTimer.init();
 
-    //! - Initialize the QML Viewer and starts GUI
     int app_exec = -1;
-    //LOG_DEBUG("Dry Demo Initializing"); // TODO is this needed?
-    //if ( guiStarted /*startGui()*/ ) {
-        //LOG_DEBUG("UI Initialized"); // TODO is this needed?
-        app_exec = app.exec();
-    //}
+    _ApplicationController.startPOST();
+    app_exec = app.exec();
 
     // Due to Qt Error the CAN Device cannot be disable/enable from withing another thread
     // (other than main thread which is the owner of the CanDevice).