Index: sources/storage/Logger.cpp
===================================================================
diff -u -rf724589acaa51725f5e5f8a746404d01804efbcf -rabd0e958420f25e5b8dd8ce6e21131f8561b99e0
--- sources/storage/Logger.cpp	(.../Logger.cpp)	(revision f724589acaa51725f5e5f8a746404d01804efbcf)
+++ sources/storage/Logger.cpp	(.../Logger.cpp)	(revision abd0e958420f25e5b8dd8ce6e21131f8561b99e0)
@@ -24,6 +24,7 @@
 #include <QFileInfoList>
 
 // Project
+#include "ApplicationController.h"
 #include "DeviceController.h"
 #include "Threads.h"
 #include "StorageGlobals.h"
@@ -39,9 +40,7 @@
  * \param   parent - QObject parent owner object.
  *          Qt handles the children destruction by their parent objects life-cycle.
  */
-Logger::Logger(QObject *parent) : QObject(parent) {
-    _logFileNamePrefix = QFileInfo(qApp->applicationFilePath()).baseName();
-}
+Logger::Logger(QObject *parent) : QObject(parent) {}
 
 /*!
  * \brief   Logger::init
@@ -130,6 +129,9 @@
  */
 void Logger::initConnections()
 {
+    connect(&_ApplicationController , SIGNAL(didActionReceive   (GuiActionType  , const QVariantList &)),
+            this                    ,   SLOT( onActionReceive   (GuiActionType  , const QVariantList &)));
+
     connect(&_exportLogsWatcher, SIGNAL(finished    ()),
             this               ,   SLOT(onExportLogs()));
 
@@ -313,13 +315,12 @@
 {
     if ( ! checkThread() ) return;
 
-    static QString date;
     QString mContent;
 
     // - Add header
-    QString currentDate = QDate::currentDate().toString(_dateFormat);
-    if ( date != currentDate ) {
-        if ( ! date.isEmpty() ) {
+    QString currentDate = QDate::currentDate().toString(_fileDateFormat);
+    if ( _logFileNameDate != currentDate ) {
+        if ( ! _logFileNameDate.isEmpty() ) {
             switch ( vLogType ) {
             case eLogAppED  : mContent = _headerA; break;
             case eLogDebug  : mContent = _headerD; break;
@@ -328,11 +329,20 @@
             }
             mContent += "\r\n";
         }
-        date  = currentDate;
+        _logFileNameDate = currentDate;
     }
 
     // - Make log file name
-    QString fileName = date + _dateSeparator + _logFileNamePrefix;
+    if (_logFileNameMode.isEmpty()) {
+        _logFileNameMode    = _logFileNameMode_init;
+        _logFileNameTime    = QDateTime::currentDateTime().time().toString(_fileTimeFormat);
+    }
+
+    QString fileName =         _logFileNameDate
+    //      + _fileSeparator + _logFileNameTime
+            + _fileSeparator + _logFileNameHDSN
+    //      + _fileSeparator + _logFileNameMode
+            ;
     switch (vLogType) {
     case LogType::eLogAppED:
     case LogType::eLogDebug:
@@ -375,7 +385,7 @@
  *          into USB drive folder (Storage::USB_Mount_Point)
  * \return  true if at least one file has been exported
  */
-bool Logger::exportLogs(const Gui::GuiStringIndexMap &vExportList)
+bool Logger::exportLogs(const GuiStringIndexMap &vExportList)
 {
     return exportList(vExportList, eLogAppED);
 }
@@ -386,7 +396,7 @@
  *          into USB drive folder (Storage::USB_Mount_Point)
  * \return  true if at least one file has been exported
  */
-bool Logger::exportErrs(const Gui::GuiStringIndexMap &vExportList)
+bool Logger::exportErrs(const GuiStringIndexMap &vExportList)
 {
     return exportList(vExportList, eLogDebug);
 }
@@ -397,7 +407,7 @@
  *          into USB drive folder (Storage::USB_Mount_Point)
  * \return  true if at least one file has been exported
  */
-bool Logger::exportTrts(const Gui::GuiStringIndexMap &vExportList)
+bool Logger::exportTrts(const GuiStringIndexMap &vExportList)
 {
     return exportList(vExportList, eLogTrtmt);
 }
@@ -422,7 +432,7 @@
  * \return  always returns true for now.
  * \note    This method uses QtConcurrent run to execute the FileHandler copyFolder method.
  */
-bool Logger::concurrentExportLogs(const Gui::GuiStringIndexMap &vExportList)
+bool Logger::concurrentExportLogs(const GuiStringIndexMap &vExportList)
 {
     if ( ! concurrentExportIsOk() ) return false;
 
@@ -439,7 +449,7 @@
  * \return  always returns true for now.
  * \note    This method uses QtConcurrent run to execute the FileHandler copyFolder method.
  */
-bool Logger::concurrentExportErrs(const Gui::GuiStringIndexMap &vExportList)
+bool Logger::concurrentExportErrs(const GuiStringIndexMap &vExportList)
 {
     if ( ! concurrentExportIsOk() ) return false;
 
@@ -456,7 +466,7 @@
  * \return  always returns true for now.
  * \note    This method uses QtConcurrent run to execute the FileHandler copyFolder method.
  */
-bool Logger::concurrentExportTrts(const Gui::GuiStringIndexMap &vExportList)
+bool Logger::concurrentExportTrts(const GuiStringIndexMap &vExportList)
 {
     if ( ! concurrentExportIsOk() ) return false;
 
@@ -487,6 +497,75 @@
 // disabled coco end
 
 /*!
+ * \brief   CloudSyncController::onActionReceive
+ * \details The slot which will be called when a CANBus message is received, and will be sent to CloudSync if related.
+ * \param   vAction  - The message action
+ * \param   vData    - The message data
+ */
+void Logger::onActionReceive(GuiActionType vAction, const QVariantList &vData)
+{
+    switch (vAction) {
+        case GuiActionType::ID_HDOperationModeData  : {
+            if ( vData.length() >= 2 ) {
+                bool ok = true;
+                quint32 opMode  = vData[0].toUInt(&ok); if ( ! ok ) return;
+                quint32 subMode = vData[1].toUInt(&ok); if ( ! ok ) return;
+                QString mode;
+                if ( subMode >= GuiHDStandbyStates::STANDBY_WAIT_FOR_DISINFECT_STATE ) {
+                    mode = "Disinfect";
+                    if( _logFileNameMode != mode ) {
+                        _logFileNameMode  = mode;
+                        _logFileNameTime  = QDateTime::currentDateTime().time().toString(_fileTimeFormat);
+                    }
+                }
+                else {
+                    switch ( opMode ) {
+                        case GuiHDOpModes::MODE_NLEG:
+                        case GuiHDOpModes::MODE_FAUL:
+                        case GuiHDOpModes::MODE_SERV:
+                        case GuiHDOpModes::MODE_INIT:
+                        case GuiHDOpModes::MODE_STAN:
+                            mode = _logFileNameMode_init;
+                            if( _logFileNameMode != mode ) {
+                                _logFileNameMode  = mode;
+                                _logFileNameTime  = QDateTime::currentDateTime().time().toString(_fileTimeFormat);
+                            }
+                        break;
+                        case GuiHDOpModes::MODE_TPAR:
+                        case GuiHDOpModes::MODE_PRET:
+                        case GuiHDOpModes::MODE_TREA:
+                        case GuiHDOpModes::MODE_POST:
+                            mode = "Treatment";
+                            if( _logFileNameMode != mode ) {
+                                _logFileNameMode  = mode;
+                                _logFileNameTime  = QDateTime::currentDateTime().time().toString(_fileTimeFormat);
+                            }
+                        break;
+
+                        default:
+                        break;
+                    }
+                    break;
+                }
+            }
+        }
+        break;
+
+        case GuiActionType::ID_AdjustSerialHDRsp    : {
+            if ( vData.length() >= 1 ) {
+                QString hdSerial= vData[0].toString();
+                if ( hdSerial.trimmed().isEmpty() ) hdSerial = "Unknown";
+                _logFileNameHDSN = hdSerial;
+            }
+        }
+        break;
+
+        default:
+        break;
+    }
+}
+
+/*!
  * \brief   Logger::removeLogs
  * \details Remove old logs by iterating in the log/service folders and look for expired logs.
  * \return  count file(s) have been removed.
@@ -679,7 +758,7 @@
  * \param   vLogType    - type of the log files to get the correct location for export.
  * \return  true if the export is successful.
  */
-bool Logger::exportList(const Gui::GuiStringIndexMap &vExportList, Logger::LogType vLogType)
+bool Logger::exportList(const GuiStringIndexMap &vExportList, Logger::LogType vLogType)
 {
     // DEBUG:    qDebug() << __FUNCTION__ << vExportList;
     // qDebug() << " ~~~~~~~~~~ " << QThread::currentThread()->objectName();
@@ -697,7 +776,7 @@
         result = FileHandler::copyFolder( mSource, mDestination);
     }
     else {
-        Gui::GuiStringIndexMapIterator it(vExportList);
+        GuiStringIndexMapIterator it(vExportList);
         while ( it.hasNext() ) {
             it.next();
             // qDebug() << it.key() << it.value() << mSource << mDestination;