Index: main.cpp
===================================================================
diff -u -r93315aa549a91c6c0d6973248e9b903df9cc40a2 -re1cbc3d1ccf5877a8dfed934e33964aaadbf5b39
--- main.cpp	(.../main.cpp)	(revision 93315aa549a91c6c0d6973248e9b903df9cc40a2)
+++ main.cpp	(.../main.cpp)	(revision e1cbc3d1ccf5877a8dfed934e33964aaadbf5b39)
@@ -103,8 +103,9 @@
 
 bool        gEnableManufacturing        = false ;
 bool        gEnableUpdating             = false ;
-bool        gUseRootHome                = false ;
+bool        gEnableRegistration         = false ;
 
+bool        gUseRootHome                = false ;
 bool        gLogLongName                = false ;
 bool        gLogUpload                  = false ;
 bool        gLogCompress                = false ;
@@ -120,50 +121,55 @@
  * 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-mode      Enables the manufacturing mode to
+ *                                        configure the system for the first time.
+ *   -U, --enable-update-mode             Enables the update mode to update only
+ *                                        necessary files during the update and
+ *                                        keep the rest.
+ *   -R, --enable-registeration-mode      Enables the registration mode to only
+ *                                        register the device and keep the rest
+ *                                        Be careful and keep backup of the
+ *                                        credentials, this operation will
+ *                                        overwrite them.
+ *   -r, --use-root-home                  In case the application is not in
+ *                                        Manufacturing Setup but needs to use root
+ *                                        home folder for configurations.
+ *   -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
  *
  * \endverbatim
  */
@@ -286,22 +292,29 @@
 
     // --- -E : enable-manufacturing
     QCommandLineOption optionEnableManufacturing(
-        QStringList() << "E" << "enable-manufacturing",
+        QStringList() << "E" << "enable-manufacturing-mode",
         QCoreApplication::translate("main", "Enables the manufacturing mode to configure the system for the first time."));
     parser.addOption(optionEnableManufacturing);
 
-    // --- -R : use-root-home
-    QCommandLineOption optionUseRootHome(
-        QStringList() << "R" << "use-root-home",
-        QCoreApplication::translate("main", "In case the application is not in Manufacturing Setup but needs to use root home folder for configurations."));
-    parser.addOption(optionUseRootHome);
-
     // --- -U : Update mode
     QCommandLineOption optionEnableUpdating(
         QStringList() << "U" << "enable-update-mode",
         QCoreApplication::translate("main", "Enables the update mode to update only necessary files during the update and keep the rest."));
     parser.addOption(optionEnableUpdating);
 
+    // --- -R : registration only mode
+    QCommandLineOption optionEnableRegistration(
+        QStringList() << "R" << "enable-registeration-mode",
+        QCoreApplication::translate("main", "Enables the registration mode to only register the device and keep the rest\n"
+                                            "Be careful and keep backup of the credentials, this operation will overwrite them."));
+    parser.addOption(optionEnableRegistration);
+
+    // --- -r : use-root-home
+    QCommandLineOption optionUseRootHome(
+        QStringList() << "r" << "use-root-home",
+        QCoreApplication::translate("main", "In case the application is not in Manufacturing Setup but needs to use root home folder for configurations."));
+    parser.addOption(optionUseRootHome);
+
     // --- -x : use-log-long-name
     QCommandLineOption optionLogLongName(
                 QStringList() << "x" << "use-log-long-name",
@@ -350,8 +363,9 @@
 
     gEnableManufacturing        = parser.isSet(optionEnableManufacturing        );
     gEnableUpdating             = parser.isSet(optionEnableUpdating             );
-    gUseRootHome                = parser.isSet(optionUseRootHome                );
+    gEnableRegistration         = parser.isSet(optionEnableRegistration         );
 
+    gUseRootHome                = parser.isSet(optionUseRootHome                );
     gLogLongName                = parser.isSet(optionLogLongName                );
     gLogUpload                  = parser.isSet(optionLogUpload                  );
     gLogCompress                = parser.isSet(optionLogCompress                );
@@ -462,7 +476,7 @@
     // only during setup mode which is -E (manufacturing setup) or -U -E (update setup) application is running under the root user permissions
     // 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 ) {
+    if ( gEnableManufacturing || gEnableUpdating || gEnableRegistration ) {
         QString scriptName = Storage::Device_Lockdown;
         quint16 errorCode;
         QString errorText;
Index: sources/ApplicationController.cpp
===================================================================
diff -u -rc70ae33e19c08779ce89e2f1728f2d1af7b5c100 -re1cbc3d1ccf5877a8dfed934e33964aaadbf5b39
--- sources/ApplicationController.cpp	(.../ApplicationController.cpp)	(revision c70ae33e19c08779ce89e2f1728f2d1af7b5c100)
+++ sources/ApplicationController.cpp	(.../ApplicationController.cpp)	(revision e1cbc3d1ccf5877a8dfed934e33964aaadbf5b39)
@@ -677,7 +677,7 @@
 #ifdef BUILD_FOR_DESKTOP
     initSettings();
 #else
-    if ( gEnableManufacturing || gEnableUpdating ) initSettings();
+    if ( gEnableManufacturing || gEnableUpdating || gEnableRegistration ) initSettings();
 #endif
 }
 
Index: sources/device/DeviceController.cpp
===================================================================
diff -u -r146db65b27df897c06dba90f24e6ac0f4f132456 -re1cbc3d1ccf5877a8dfed934e33964aaadbf5b39
--- sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision 146db65b27df897c06dba90f24e6ac0f4f132456)
+++ sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision e1cbc3d1ccf5877a8dfed934e33964aaadbf5b39)
@@ -1050,7 +1050,9 @@
     /// therefore no need to mount the cononfiguraiton partition.
     /// also for manufacturing the partition is being set up
     /// and is less steps for setup if the partition is not mounted.
-    if (     gEnableManufacturing     ) return; // it should do the mount when gEnableUpdating, therefore here should not add gEnableUpdating.
+    // it should do the mount when gEnableUpdating      , therefore should not be added here.
+    // it should do the mount when gEnableRegistratin   , therefore should not be added here.
+    if (     gEnableManufacturing     ) return;
     if ( ! ( _hasThread && _hasSalt ) ) return;
 
     DeviceCryptSetupRequestData data;
Index: sources/gui/GuiView.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re1cbc3d1ccf5877a8dfed934e33964aaadbf5b39
--- sources/gui/GuiView.cpp	(.../GuiView.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/gui/GuiView.cpp	(.../GuiView.cpp)	(revision e1cbc3d1ccf5877a8dfed934e33964aaadbf5b39)
@@ -399,6 +399,7 @@
 {
     manufactMode( gEnableManufacturing && vPassed );
     updateMode  ( gEnableUpdating      && vPassed );
+    registerMode( gEnableRegistration  && vPassed );
     postPass(vPassed);
 }
 
Index: sources/gui/GuiView.h
===================================================================
diff -u -r93315aa549a91c6c0d6973248e9b903df9cc40a2 -re1cbc3d1ccf5877a8dfed934e33964aaadbf5b39
--- sources/gui/GuiView.h	(.../GuiView.h)	(revision 93315aa549a91c6c0d6973248e9b903df9cc40a2)
+++ sources/gui/GuiView.h	(.../GuiView.h)	(revision e1cbc3d1ccf5877a8dfed934e33964aaadbf5b39)
@@ -83,8 +83,10 @@
     READONLY(bool   , dryDemoMode   , gEnableDryDemo        )
     READONLY(bool   , manufactSetup , gEnableManufacturing  )
     READONLY(bool   , updateSetup   , gEnableUpdating       )
+    READONLY(bool   , registerSetup , gEnableRegistration   )
     READONLY(bool   , manufactMode  , false                 )
     READONLY(bool   , updateMode    , false                 )
+    READONLY(bool   , registerMode  , false                 )
 
     TRIGGER (bool   , postPass      , false                 )
 
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r26433c42f2efa2cb18af95f523581c7eeeff049d -re1cbc3d1ccf5877a8dfed934e33964aaadbf5b39
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 26433c42f2efa2cb18af95f523581c7eeeff049d)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision e1cbc3d1ccf5877a8dfed934e33964aaadbf5b39)
@@ -262,7 +262,7 @@
         function isManager    () { _mainMenu.itemPressed(1) }
         function isSettings   () { _mainMenu.itemPressed(2) }
 
-        disable                 : _GuiView.manufactSetup || _GuiView.updateSetup
+        disable                 : _GuiView.manufactSetup || _GuiView.updateSetup || _GuiView.registerSetup
         hidden                  : true // it should be hidden by default since the landing screen changed to init and it does not have the main menu until the POST passes.
         titles                  : [ qsTr("Treatment") , qsTr("Manager") , qsTr("Settings") ]
         visibleItems            : [       true        ,       false     ,       true       ]
Index: sources/gui/qml/pages/MainStack.qml
===================================================================
diff -u -rc70ae33e19c08779ce89e2f1728f2d1af7b5c100 -re1cbc3d1ccf5877a8dfed934e33964aaadbf5b39
--- sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision c70ae33e19c08779ce89e2f1728f2d1af7b5c100)
+++ sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision e1cbc3d1ccf5877a8dfed934e33964aaadbf5b39)
@@ -38,7 +38,7 @@
     // DEBUG: this property can mostly be used for debugging to get pass the initial screen
     property var initialItem: _postModeScreen
 
-    property var _startupScreen: ( _GuiView.manufactSetup || _GuiView.updateSetup ) ? _settingsStack : _mainHome
+    property var _startupScreen: ( _GuiView.manufactSetup || _GuiView.updateSetup || _GuiView.registerSetup ) ? _settingsStack : _mainHome
 
     stackView.initialItem   : _root.initialItem
 
Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -r26433c42f2efa2cb18af95f523581c7eeeff049d -re1cbc3d1ccf5877a8dfed934e33964aaadbf5b39
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 26433c42f2efa2cb18af95f523581c7eeeff049d)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision e1cbc3d1ccf5877a8dfed934e33964aaadbf5b39)
@@ -39,10 +39,11 @@
 
     property bool   serviceMode : false
 
-    readonly property bool normalMode                   : ! ( _GuiView.manufactSetup ||   _GuiView.updateSetup )
-    readonly property bool  setupMode                   :     _GuiView.manufactSetup ||   _GuiView.updateSetup
-    readonly property bool onlyManufacturing            :     _GuiView.manufactMode  && ! _GuiView.updateMode // <...>Mode is true if the POST passes
-    readonly property bool onlyUpdating                 : !   _GuiView.manufactMode  &&   _GuiView.updateMode // <...>Mode is true if the POST passes
+    readonly property bool normalMode                   : ! ( _GuiView.manufactSetup ||   _GuiView.updateSetup ||   _GuiView.registerSetup )
+    readonly property bool  setupMode                   :     _GuiView.manufactSetup ||   _GuiView.updateSetup ||   _GuiView.registerSetup
+    readonly property bool onlyManufacturing            :     _GuiView.manufactMode  && ! _GuiView.updateMode  || ! _GuiView.registerMode   // <...>Mode is true if the POST passes
+    readonly property bool onlyUpdating                 : !   _GuiView.manufactMode  &&   _GuiView.updateMode  || ! _GuiView.registerMode   // <...>Mode is true if the POST passes
+    readonly property bool onlyRegistration             : !   _GuiView.manufactMode  && ! _GuiView.updateMode  ||   _GuiView.registerMode   // <...>Mode is true if the POST passes
     readonly property bool loggedIn                     :   serviceMode
 
 
@@ -69,7 +70,7 @@
     readonly property bool visibleDecommission          :                            loggedIn
     readonly property bool visibleSetDateTime           :                            loggedIn   ||   onlyUpdating
     readonly property bool visibleDeviceConfiguration   :   onlyManufacturing   &&   loggedIn
-    readonly property bool visibleDeviceRegistration    :   onlyManufacturing   &&   loggedIn
+    readonly property bool visibleDeviceRegistration    :   onlyManufacturing   &&   loggedIn   ||   onlyRegistration
     readonly property bool visibleInstitutionalRecord   :   true
 
 
@@ -159,15 +160,23 @@
     ]
 
     SettingsHome { id   : _settingsHome
-        title           : _GuiView.manufactSetup ? qsTr("Manufacturing Setup") : serviceMode ? qsTr("Service") : _GuiView.updateSetup ? qsTr("Software Update") : qsTr("Device Settings")
+        title           : _GuiView.manufactSetup
+                          ? qsTr("Manufacturing Setup")
+                          : serviceMode
+                            ? qsTr("Service")
+                            : _GuiView.updateSetup
+                              ? qsTr("Software Update")
+                              : _GuiView.registerSetup
+                                ? qsTr("Device Registration ")
+                                : qsTr("Device Settings")
         backVisible     : false
         //TODO  on graceful shutdown, the applicaiton quit shall be used for any applicaiton termination
         //      and needs to be distinguished between the QUIT or SHUTDOWN touch,
         //      to know whether to run the lockdown scropt or just quit the app.
-        confirmVisible  : serviceMode           || _GuiView.updateMode
-        confirmText.text: _GuiView.manufactMode || _GuiView.updateMode  ? qsTr("COMPLETE") : qsTr("SHUTDOWN")
+        confirmVisible  : serviceMode           || _GuiView.updateMode || _GuiView.registerMode
+        confirmText.text: _GuiView.manufactMode || _GuiView.updateMode || _GuiView.registerMode ? qsTr("COMPLETE") : qsTr("SHUTDOWN")
         onConfirmClicked: {
-            if ( _GuiView.manufactSetup || _GuiView.updateSetup ) {
+            if ( _GuiView.manufactSetup || _GuiView.updateSetup || _GuiView.registerSetup ) {
                 _GuiView.doQuitApplication()
             }
             else {
@@ -280,7 +289,7 @@
     SettingsInstitutionalRecord { id: _settingsInstitutionalRecord  }
 
     function gotoServiceMode( vservice ) {
-        //DEBUG console.log (" 0 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, vservice, stackView.initialItem, stackView.currentItem, stackView.depth)
+        //DEBUG console.log (" 0 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, _GuiView.registerMode, _GuiView.registerSetup, vservice, stackView.initialItem, stackView.currentItem, stackView.depth)
         if ( ! _servicePassword.isPassword_Accepted ) return
         serviceMode      = vservice
         if ( vservice )
@@ -328,7 +337,7 @@
             }
             push(stackView.initialItem)
 
-            //DEBUG console.log (" 1 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, vPass, stackView.initialItem, stackView.currentItem, stackView.depth)
+            //DEBUG console.log (" 1 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, _GuiView.registerSetup, vPass, stackView.initialItem, stackView.currentItem, stackView.depth)
             if ( _GuiView.manufactSetup ) {
                 _settingsHome.notificationText = vPass ? "" : qsTr("Application POST Failed, please shutdown and retry")
             }
@@ -344,6 +353,17 @@
                 _settingsHome.notificationText = vPass ? "" : qsTr("Application POST Failed, please shutdown and retry")
             }
         }
+        function onRegisterModeChanged( vPass ) {
+            if ( _GuiView.registerMode )  {
+                stackView.initialItem = _settingsHome
+            }
+            push(stackView.initialItem)
+
+            //DEBUG console.log (" 1 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, vPass, stackView.initialItem, stackView.currentItem, stackView.depth)
+            if ( _GuiView.registerSetup ) {
+                _settingsHome.notificationText = vPass ? "" : qsTr("Application POST Failed, please shutdown and retry")
+            }
+        }
     }
 
     onVisibleChanged: {
Index: sources/main.h
===================================================================
diff -u -r93315aa549a91c6c0d6973248e9b903df9cc40a2 -re1cbc3d1ccf5877a8dfed934e33964aaadbf5b39
--- sources/main.h	(.../main.h)	(revision 93315aa549a91c6c0d6973248e9b903df9cc40a2)
+++ sources/main.h	(.../main.h)	(revision e1cbc3d1ccf5877a8dfed934e33964aaadbf5b39)
@@ -100,8 +100,11 @@
 
 extern bool       gEnableDryDemo            ;
 extern QString    gActiveCANBus             ;
+
 extern bool       gEnableManufacturing      ;
 extern bool       gEnableUpdating           ;
+extern bool       gEnableRegistration       ;
+
 extern bool       gUseRootHome              ;
 extern QString    gStandard_tmp             ;
 
Index: sources/storage/StorageGlobals.cpp
===================================================================
diff -u -rf724589acaa51725f5e5f8a746404d01804efbcf -re1cbc3d1ccf5877a8dfed934e33964aaadbf5b39
--- sources/storage/StorageGlobals.cpp	(.../StorageGlobals.cpp)	(revision f724589acaa51725f5e5f8a746404d01804efbcf)
+++ sources/storage/StorageGlobals.cpp	(.../StorageGlobals.cpp)	(revision e1cbc3d1ccf5877a8dfed934e33964aaadbf5b39)
@@ -21,6 +21,7 @@
 
 extern bool       gEnableManufacturing      ;
 extern bool       gEnableUpdating           ;
+extern bool       gEnableRegistration       ;
 extern bool       gUseRootHome              ;
 
 /*!
@@ -80,7 +81,7 @@
 
     // Settings
     static bool settings_secured = false;
-    const char *Settings_Path   () { return gUseRootHome ? Settings_Path_Init : ( ( gEnableManufacturing || gEnableUpdating ) ? ( settings_secured ? Settings_Path_Name: Settings_Path_Init ) : Settings_Path_Name ); }
+    const char *Settings_Path   () { return gUseRootHome ? Settings_Path_Init : ( ( gEnableManufacturing || gEnableUpdating || gEnableRegistration ) ? ( settings_secured ? Settings_Path_Name: Settings_Path_Init ) : Settings_Path_Name ); }
           void  Settings_Secured() { settings_secured = true; }
 
 #ifdef BUILD_FOR_TARGET
@@ -128,7 +129,7 @@
             // lockdown script suppose to be the last thing to run,
             // and it is the lockdown.sh script which moves the scripts from root to denali home folder,
             // therefore in manufacturing or update mode we are still running scripts as root.
-            return QCoreApplication::applicationDirPath() + ( ( gEnableManufacturing || gEnableUpdating )? "/scripts/" : "/scripts/");
+            return QCoreApplication::applicationDirPath() + ( ( gEnableManufacturing || gEnableUpdating || gEnableRegistration) ? "/scripts/" : "/scripts/");
         #else
             return "/home/denali/Projects/application/scripts/";
         #endif