Index: main.cpp
===================================================================
diff -u -rbaa897583dca0ee668591daf01684069d040f9dd -ra2b150e7b398bbfbb51c8a11e35a029ba03e906f
--- main.cpp	(.../main.cpp)	(revision baa897583dca0ee668591daf01684069d040f9dd)
+++ main.cpp	(.../main.cpp)	(revision a2b150e7b398bbfbb51c8a11e35a029ba03e906f)
@@ -7,7 +7,7 @@
  *
  * \file    main.cpp
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      03-Nov-2023
+ * \date    (last)      10-Mar-2024
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  24-Sep-2019
  *
@@ -105,6 +105,10 @@
 bool        gEnableUpdating             = false ;
 bool        gUseRootHome                = false ;
 
+bool        gLogLongName                = false ;
+bool        gLogUpload                  = false ;
+bool        gLogCompress                = false ;
+
 QString     gParserErrorText            = "";
 QString     gStandard_tmp               = QString("/%1/").arg("tmp");
 
@@ -153,9 +157,14 @@
  *    -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
+ *    -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
+ *
  * \endverbatim
  */
 /*!
@@ -293,9 +302,33 @@
         QCoreApplication::translate("main", "Enables the update mode to update only necessary files during the update and keep the rest."));
     parser.addOption(optionEnableUpdating);
 
+    // --- -x : use-log-long-name
+    QCommandLineOption optionLogLongName(
+                QStringList() << "x" << "use-log-long-name",
+                QCoreApplication::translate("main", "Use the log long file name format\n<date>_<time>_<serial>_<mode>"));
+    parser.addOption(optionLogLongName);
+
+    // --- -y : use-log-cloud-upload
+    QCommandLineOption optionLogUpload(
+                QStringList() << "y" << "use-log-cloud-upload",
+                QCoreApplication::translate("main", "Use the log cloud upload"));
+    parser.addOption(optionLogUpload);
+
+    // --- -z : use-log-compression
+    QCommandLineOption optionLogCompress(
+                QStringList() << "z" << "use-log-compression",
+                QCoreApplication::translate("main", "Use the log compression"));
+    parser.addOption(optionLogCompress);
+
     // --- parse command lines
     if ( ! parser.parse(qApp->arguments()) ) {
         gParserErrorText = parser.errorText();
+        qDebug().noquote().nospace()
+                << "------------------------------" << "\n"
+                << gParserErrorText                 << "\n"
+                << "Command Line Parser failed !!!" << "\n"
+                << qApp->arguments().join(" ")      << "\n"
+                << "------------------------------" ;
         return;
     }
     parser.process(*qApp);
@@ -319,6 +352,16 @@
     gEnableUpdating             = parser.isSet(optionEnableUpdating             );
     gUseRootHome                = parser.isSet(optionUseRootHome                );
 
+    gLogLongName                = parser.isSet(optionLogLongName                );
+    gLogUpload                  = parser.isSet(optionLogUpload                  );
+    gLogCompress                = parser.isSet(optionLogCompress                );
+
+    //DEBUG:
+    qDebug() << "\n"
+             << "---------- x:" << gLogLongName << "\n"
+             << "---------- y:" << gLogUpload   << "\n"
+             << "---------- z:" << gLogCompress << "\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
@@ -366,12 +409,25 @@
     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_branchx = "";
 
     if (ver_revis.isEmpty())  {
         ver_revis = VER_REVIS_DEV;
         isOnServer  = false;
     }
 
+    //DEBUG: On Server
+    // isOnServer = true;
+    // ver_branch = "release/p1";
+    // ver_branch = "release/p1_staging";
+    // ver_branch = "release/p1_develop";
+    // ver_branch = "release/p1b/master";
+    // ver_branch = "release/p1/staging";
+    // ver_branch = "release/p1/develop";
+    // ver_branch = "master";
+    // ver_branch = "staging";
+    // ver_branch = "develop";
+
     bool isRelease  = ver_branch.startsWith("release/");
     bool isOnMaster = ver_branch == "master";
     bool isNotStory = isRelease                 ||
@@ -384,7 +440,17 @@
                 ver_branch = ""; // if only is built on server master branch do not show branch
             }
             if ( isRelease ) {
-                ver_branch = ver_branch.remove(0,QString("release/").length()).toUpper();
+                ver_branch = ver_branch.remove(0,QString("release/").length());
+                QStringList ver_branch_sections = ver_branch.split("/");
+                if ( ver_branch_sections.count() >= 2 ) {
+                    ver_branch  = ver_branch_sections[0].toUpper();
+                    ver_branchx = ver_branch_sections[1];
+                    if ( ver_branchx == "master" ) {
+                        ver_branchx = "";
+                    } else {
+                        ver_branchx = "-" + ver_branchx;
+                    }
+                }
             }
             ver_major   += sepVers;
             ver_minor   += sepVers;
@@ -402,7 +468,7 @@
     version += ver_micro    ;
     version += ver_revis    ; // build number
     version += ver_comp     ;
-
+    version += ver_branchx  ;
     QCoreApplication::setApplicationVersion(version);
 }