From 9d02b34ad06f48bfbd0cc8a129f48c6d7eae2228 Mon Sep 17 00:00:00 2001
From: jfmartel <jean-francois.martel@stm.info>
Date: Thu, 19 Sep 2019 14:13:48 -0400
Subject: [PATCH] Modbus SEI dev...

---
 Configuration/ZT.cfg                    |   2 +-
 Configuration/ZTSettings.ztc            | Bin 41 -> 41 bytes
 sources/GlobalDefine.h                  |   2 +-
 sources/GuiElements/SEISettingsPage.cpp |   2 +-
 sources/Modbus/ModbusSEIMgr.cpp         |  24 ++++++++++++------------
 sources/Modbus/ModbusSEIMgr.h           |   4 ++--
 sources/Zonetest.cpp                    |   6 ++++++
 7 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/Configuration/ZT.cfg b/Configuration/ZT.cfg
index c54d661..fb3f7a6 100644
--- a/Configuration/ZT.cfg
+++ b/Configuration/ZT.cfg
@@ -61,7 +61,7 @@ MODBUS_CC_ETH_IF=eth2
 #Adresse modbus de la ZT
 MODBUS_SEI_DEVID=1
 #Port Modbus/TCP
-MODBUS_SEI_PORT=502
+MODBUS_SEI_PORT=503
 
 
 #----------------------------------
diff --git a/Configuration/ZTSettings.ztc b/Configuration/ZTSettings.ztc
index b814bee69922f3fea61c8665b7adf4e8b079a0a7..dcfad7b14f99f7d2da090a1e1afb3de06692debd 100644
GIT binary patch
delta 6
NcmdPYoS?y&3IGJ?0dW8T

delta 6
NcmdPYoS?y&4gdt|0doKV

diff --git a/sources/GlobalDefine.h b/sources/GlobalDefine.h
index 28d4748..83ce5e8 100644
--- a/sources/GlobalDefine.h
+++ b/sources/GlobalDefine.h
@@ -63,7 +63,7 @@
 #define FILESYSTEM_FORCED_SYNC_TIMEOUT (qint64)2400000  //2.4 million milliseconds = 40 minutes
 #define MAX_ENGINEERING_LOG_FILESIZE (qint32)1000000 //~1Mb
 #define SEI_CLIENT_RECONNECT_TIMEOUT 200    //ms
-#define SEI_CLIENT_CONNECTION_TIMEOUT 500 //ms
+#define SEI_CLIENT_CONNECTION_TIMEOUT 5000 //ms
 
 #define USE_DAQNAVI_LIB
 
diff --git a/sources/GuiElements/SEISettingsPage.cpp b/sources/GuiElements/SEISettingsPage.cpp
index fd35666..61c8c71 100644
--- a/sources/GuiElements/SEISettingsPage.cpp
+++ b/sources/GuiElements/SEISettingsPage.cpp
@@ -186,7 +186,7 @@ int CSEISettingsPage::SetActualSettings(QHostAddress CCHostAdd)
 void CSEISettingsPage::ModbusSEIConnected(qint32 LocalIP, qint32 RemoteIP)
 {
     mSEIConnectionLED->setPixmap(QPixmap("./Images/green-led-on-md.png").scaled(25,25));
-    mModbusSEIConnectionState->setPlainText(QString("Connection NetTrac: Connectée. \nIP: Local[%1] - HPC[%2]").arg(QHostAddress(LocalIP).toString()).arg(QHostAddress(RemoteIP).toString()));
+    mModbusSEIConnectionState->setPlainText(QString("Connection NetTrac: Connectée. \nIP: Local[%1] - NetTrac[%2]").arg(QHostAddress(LocalIP).toString()).arg(QHostAddress(RemoteIP).toString()));
 }
 
 void CSEISettingsPage::ModbusSEIDisconnected()
diff --git a/sources/Modbus/ModbusSEIMgr.cpp b/sources/Modbus/ModbusSEIMgr.cpp
index b3a9b4e..91aee85 100644
--- a/sources/Modbus/ModbusSEIMgr.cpp
+++ b/sources/Modbus/ModbusSEIMgr.cpp
@@ -73,7 +73,7 @@ int CModbusSEIMgr::DisconnectFromSlave()
 
 void CModbusSEIMgr::SocketConnected()
 {
-    emit ModbusMasterConnected(this);
+    emit ModbusMasterConnected(mModbusTCPSocketHandle->localAddress().toIPv4Address(),mModbusTCPSocketHandle->peerAddress().toIPv4Address());
     qDebug("Master: Connection established with NetTrac");
     mConnectionTimer->stop();
 }
@@ -81,7 +81,7 @@ void CModbusSEIMgr::SocketConnected()
 void CModbusSEIMgr::SocketDisconnected()
 {
     ModbusLinkDisconnected();
-    emit ModbusMasterDisconnected(this);
+    emit ModbusMasterDisconnected();
     mConnectionTimer->start();
     qDebug("Disconnected from NetTrac");
 }
@@ -100,16 +100,16 @@ void CModbusSEIMgr::ConnectionTimerExpired()
         ConnectToSlave(mSEIIPAddress,mModbusPort);
         mConnectionTimeout.restart();
     }
-    else if(mModbusTCPSocketHandle->state() == QAbstractSocket::ConnectingState)
-    {
-        //Default connection timeout is 1s for sockets.  We want this to be shorter.
-        //if connection timeout is reached, disconnect and retry.
-        if(mConnectionTimeout.hasExpired(SEI_CLIENT_CONNECTION_TIMEOUT))
-        {
-            mModbusTCPSocketHandle->disconnectFromHost();
-            qDebug("Connection timeout expired... disconnecting");
-        }
-    }
+//    else if(mModbusTCPSocketHandle->state() == QAbstractSocket::ConnectingState)
+//    {
+//        //Default connection timeout is 1s for sockets.  We want this to be shorter.
+//        //if connection timeout is reached, disconnect and retry.
+//        if(mConnectionTimeout.hasExpired(SEI_CLIENT_CONNECTION_TIMEOUT))
+//        {
+//            mModbusTCPSocketHandle->disconnectFromHost();
+//            qDebug("Connection timeout expired... disconnecting");
+//        }
+//    }
 }
 
 int CModbusSEIMgr::SEISettingsChanged(QHostAddress ServerIP, int ModbusPort, int DevID)
diff --git a/sources/Modbus/ModbusSEIMgr.h b/sources/Modbus/ModbusSEIMgr.h
index 4872b79..e2d175b 100644
--- a/sources/Modbus/ModbusSEIMgr.h
+++ b/sources/Modbus/ModbusSEIMgr.h
@@ -37,8 +37,8 @@ private:
     QHostAddress mSEIIPAddress;
     
 signals:
-    void ModbusMasterConnected(CModbusSEIMgr *);
-    void ModbusMasterDisconnected(CModbusSEIMgr *);
+    void ModbusMasterConnected(qint32 LocalIP, qint32 RemoteIP);
+    void ModbusMasterDisconnected();
     void ModbusMasterRepositoryUpdated();
 
 public slots:
diff --git a/sources/Zonetest.cpp b/sources/Zonetest.cpp
index c02b76e..ac0cd53 100644
--- a/sources/Zonetest.cpp
+++ b/sources/Zonetest.cpp
@@ -620,6 +620,12 @@ unsigned int CZoneTest::InitZT()
         }
         mModbusSEIMgr->StartSEICommunication();
 
+        connect(mModbusSEIMgr,SIGNAL(ModbusMasterConnected(qint32,qint32)),panel.mSEISettingsPage,SLOT(ModbusSEIConnected(qint32,qint32)));
+        connect(mModbusSEIMgr,SIGNAL(ModbusMasterDisconnected()),panel.mSEISettingsPage,SLOT(ModbusSEIDisconnected()));
+
+        panel.mZTMainPage->ModbusSEIDisconnected();
+
+
 
     }
     else