Index: main.cpp
===================================================================
diff -u -r6d76149dca70e879f33bf6ed44203d0d06bc523a -rc73feffa73c7fe073a7a7581144f5806dfc91beb
--- main.cpp	(.../main.cpp)	(revision 6d76149dca70e879f33bf6ed44203d0d06bc523a)
+++ main.cpp	(.../main.cpp)	(revision c73feffa73c7fe073a7a7581144f5806dfc91beb)
@@ -90,8 +90,8 @@
 bool        gDisableSDCFailLogStop      = false ;
 bool        gDisableCloudSyncFailStop   = false ;
 
-bool        gEnableCheckInLog           = false ;
-bool        gEnableAcknowLog            = false ;
+bool        gDisableCheckInLog          = false ;
+bool        gDisableAcknowLog           = false ;
 
 bool        gConsoleoutLogs             = false ;
 bool        gConsoleoutFrameInterface   = false ;
@@ -100,8 +100,11 @@
 bool        gEnableDryDemo              = false ;
 QString     gActiveCANBus               = "can0";
 
+bool        gEnableManufacturing        = false ;
+
 QString     gParserErrorText            = "";
 
+
 /*!
  * \page    CommandLineSwitches Denali Command Line Switches
  * \verbatim
@@ -199,7 +202,7 @@
                 QCoreApplication::translate("main", "Disable unhandled messages report as an error in the log"));
     parser.addOption(optionDisableUnhandledReport);
 
-    // --- -d : enable-dialin-unhandled
+    // --- -d : disable-dialin-unhandled
     QCommandLineOption optionDisableDialinUnhandled(
                 QStringList() << "d" << "disable-dialin-unhandled",
                 QCoreApplication::translate("main", "Disable the Dialin messages logged as unhandled"));
@@ -229,17 +232,17 @@
                 QCoreApplication::translate("main", "disable-cloudsync-fail-stop"));
     parser.addOption(optionDisableCloudSyncFailStop);
 
-    // --- -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 : 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 : enable-acknow-log (Acknowledge)
-    QCommandLineOption optionEnableAcknowLog(
-                QStringList() << "K" << "enable-acknow-log",
-                QCoreApplication::translate("main", "Enables Acknowledgment Log"));
-    parser.addOption(optionEnableAcknowLog);
+    // --- -K : disable-acknow-log (Acknowledge)
+    QCommandLineOption optionDisableAcknowLog(
+                QStringList() << "K" << "disable-acknow-log",
+                QCoreApplication::translate("main", "Disables Acknowledgment Log"));
+    parser.addOption(optionDisableAcknowLog);
 
     // --- -D : enable-dry-demo
     QCommandLineOption optionEnableDryDemo(
@@ -254,6 +257,12 @@
                 QCoreApplication::translate("main", "CANBus"));
     parser.addOption(optionActiveCANBus);
 
+    // --- -E : enable-manufacturing
+    QCommandLineOption optionEnableManufacturing(
+        QStringList() << "E" << "enable-manufacturing",
+        QCoreApplication::translate("main", "Enables the manufacturing mode to configure the system for the first time."));
+    parser.addOption(optionEnableManufacturing);
+
     // --- parse command lines
     if ( ! parser.parse(qApp->arguments()) ) {
         gParserErrorText = parser.errorText();
@@ -271,11 +280,13 @@
     gDisableSDCFailLogStop      = parser.isSet(optionDisableSDCardFailLogStop   );
     gDisableCloudSyncFailStop   = parser.isSet(optionDisableCloudSyncFailStop   );
 
-    gEnableCheckInLog           = parser.isSet(optionEnableCheckInLog           );
-    gEnableAcknowLog            = parser.isSet(optionEnableAcknowLog            );
+    gDisableCheckInLog          = parser.isSet(optionDisableCheckInLog          );
+    gDisableAcknowLog           = parser.isSet(optionDisableAcknowLog           );
 
     gEnableDryDemo              = parser.isSet(optionEnableDryDemo              );
 
+    gEnableManufacturing        = parser.isSet(optionEnableManufacturing        );
+
     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
@@ -447,7 +458,6 @@
 
     //! - Initializing Application Controller
     _ApplicationController.init(Threads::_Application_Thread);
-    _ApplicationController.initSettings();
 
     ////! - Initializing GUI Controller
     _GuiController.init(Threads::_Gui_Thread);