From f5510f58ea18b3a37052c972e5ea14d8156fa426 Mon Sep 17 00:00:00 2001
From: jfmartel <jean-francois.martel@stm.info>
Date: Mon, 3 Jun 2024 13:51:21 -0400
Subject: [PATCH] =?UTF-8?q?Activation=20SFTP=20m=C3=AAme=20sans=20Modbus?=
 =?UTF-8?q?=20avec=20la=20CC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Configuration/ZTSettings.ztc | Bin 41 -> 41 bytes
 sources/ZTVersion.h          |   7 ++++++-
 sources/Zonetest.cpp         |  27 ++++++++++++---------------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Configuration/ZTSettings.ztc b/Configuration/ZTSettings.ztc
index cb8f2f7cf7b1dc78f8fdfd81bc258a84f434c7e9..d7191e9c232797e572a1119ffeafe29553d8f0fc 100644
GIT binary patch
delta 12
TcmdPYoS?)m$;5DAg;5>=5lRCu

delta 12
TcmdPYoS?+c%*1eDg;5>=5U>Lo

diff --git a/sources/ZTVersion.h b/sources/ZTVersion.h
index 5032810..5a02589 100755
--- a/sources/ZTVersion.h
+++ b/sources/ZTVersion.h
@@ -29,9 +29,14 @@
 #ifndef ZTVERSION_H
 #define ZTVERSION_H
 
-#define ZT_SOFT_VERSION "V1.25.1"
+#define ZT_SOFT_VERSION "V1.26"
 
 //LOG DES CHANGEMENTS
+//Version 1.26
+//-Ajout de la possibilité d'activer le module SFTP pour copier les logs sans que la
+// communication avec la CC soit activée (ZT branchée sur le réseau mais interface
+// avec la CC en fil-à-fil).
+
 //Version 1.25.1
 //-Deplacement de la notification de sychronisation de la date & heure SACL vers le
 // log d'ingenierie pour ne pas polluer ZTLog.
diff --git a/sources/Zonetest.cpp b/sources/Zonetest.cpp
index 2ec99b8..c868604 100644
--- a/sources/Zonetest.cpp
+++ b/sources/Zonetest.cpp
@@ -655,21 +655,6 @@ unsigned int CZoneTest::InitZT()
             connect(mZTStateMachine,SIGNAL(NewTrainLogSaved(QString,bool)),&mNetworkDriveMgr,SLOT(NewTrainFileSaved(QString,bool)));
         }
 
-        bool EnableSFTPClient = CZTConfigMgr::instance()->GetSFTPActivated();
-        QString SFTPLogin = CZTConfigMgr::instance()->GetSFTPLogin();
-        QString SFTPPassword = CZTConfigMgr::instance()->GetSFTPPassword();
-        QString SFTPServerAddress = CZTConfigMgr::instance()->GetSFTPServerAddress();
-        QString SFTPRemoteDir = CZTConfigMgr::instance()->GetSFTPServerRemoteDir();
-        bool UseEngLog = CZTConfigMgr::instance()->GetEngLog() != -1;
-        mSFTPManager.InitFTPServerManager(EnableSFTPClient,SFTPLogin,SFTPPassword,SFTPServerAddress,SFTPRemoteDir,mZTStation->GetStationShortName(),UseEngLog);
-        if(EnableSFTPClient == true)
-        {
-            connect(mZTStateMachine,SIGNAL(NewTrainLogSaved(QString,bool)),&mSFTPManager,SLOT(NewTrainFileSaved(QString,bool)));
-        }
-
-
-
-
     }
     else
     {
@@ -682,6 +667,18 @@ unsigned int CZoneTest::InitZT()
     }
     connect(mTKTransportInterface,SIGNAL(TKOutputStatesChanged(bool,bool)),panel.mMaintenancePage,SLOT(TKOutputChanged(bool,bool)));
 
+    //Start SFTP file copy service
+    bool EnableSFTPClient = CZTConfigMgr::instance()->GetSFTPActivated();
+    QString SFTPLogin = CZTConfigMgr::instance()->GetSFTPLogin();
+    QString SFTPPassword = CZTConfigMgr::instance()->GetSFTPPassword();
+    QString SFTPServerAddress = CZTConfigMgr::instance()->GetSFTPServerAddress();
+    QString SFTPRemoteDir = CZTConfigMgr::instance()->GetSFTPServerRemoteDir();
+    bool UseEngLog = CZTConfigMgr::instance()->GetEngLog() != -1;
+    mSFTPManager.InitFTPServerManager(EnableSFTPClient,SFTPLogin,SFTPPassword,SFTPServerAddress,SFTPRemoteDir,mZTStation->GetStationShortName(),UseEngLog);
+    if(EnableSFTPClient == true)
+    {
+        connect(mZTStateMachine,SIGNAL(NewTrainLogSaved(QString,bool)),&mSFTPManager,SLOT(NewTrainFileSaved(QString,bool)));
+    }
 
 	if(mSimulationON == true)
 	{