Index: main.cpp
===================================================================
diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r1f2e7dbd08b00f8c56eedf29f083733570aa642e
--- main.cpp	(.../main.cpp)	(revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263)
+++ main.cpp	(.../main.cpp)	(revision 1f2e7dbd08b00f8c56eedf29f083733570aa642e)
@@ -97,6 +97,11 @@
 bool        gConsoleoutFrameInterface   = false ;
 bool        gConsoleoutCanInterface     = false ;
 
+bool        gBypassFault                = false ;
+bool        gEnableDryDemo              = false ;
+QString     gActiveCANBus               = "can0";
+
+
 /*!
  * \page    CommandLineSwitches Denali Command Line Switches
  * \verbatim
@@ -231,7 +236,22 @@
                                                QCoreApplication::translate("main", "Enables Acknowledgment Log"));
     parser.addOption(optionEnableAcknowLog);
 
+    // --- -D : enable-dry-demo
+    QCommandLineOption optionEnableDryDemo(QStringList() << "D" << "enable-dry-demo",
+                                             QCoreApplication::translate("main", "Enables Dry-Demo Mode"));
+    parser.addOption(optionEnableDryDemo);
 
+    // --- -A : active-can-bus
+    QCommandLineOption optionActiveCANBus(QStringList() << "A" << "active-can-bus",
+                                          QCoreApplication::translate("main", "Sets the Active CANBus [Shall start with 'can' or 'vcan]"),
+                                          QCoreApplication::translate("main", "CANBus"));
+    parser.addOption(optionActiveCANBus);
+
+    // --- -F : disable-fault-screen
+    QCommandLineOption optionBypassFault(QStringList() << "F" << "disable-fault-screen",
+                                           QCoreApplication::translate("main", "Enables UI to navigate to Home/Standby on fault"));
+    parser.addOption(optionBypassFault);
+
     // --- parse command lines
     parser.process(*qApp);
 
@@ -248,6 +268,17 @@
     gEnableCheckInLog           = parser.isSet(optionEnableCheckInLog           );
     gEnableAcknowLog            = parser.isSet(optionEnableAcknowLog            );
 
+    gBypassFault                = parser.isSet(optionBypassFault                );
+    gEnableDryDemo              = parser.isSet(optionEnableDryDemo              );
+
+    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
+             ( value.startsWith("can") || value.startsWith("vcan") ) ) {    // to be more precise
+            gActiveCANBus = value;
+        }
+    }
+
     if (parser.isSet(optionSendEmptyKeepAwake)) gSendEmptyKeepAwake = true;
     bool ok = false;