jfmartel/ZT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modbus SEI dev...

Browse Source
This commit is contained in:
jfmartel 2019-09-19 14:13:48 -04:00
parent 32ca136904
commit 9d02b34ad0
7 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Configuration/ZT.cfg
View File

@ -61,7 +61,7 @@ MODBUS_CC_ETH_IF=eth2
#Adresse modbus de la ZT #Adresse modbus de la ZT
MODBUS_SEI_DEVID=1 MODBUS_SEI_DEVID=1
#Port Modbus/TCP #Port Modbus/TCP
MODBUS_SEI_PORT=502 MODBUS_SEI_PORT=503
#---------------------------------- #----------------------------------

BIN
Configuration/ZTSettings.ztc
View File

Binary file not shown.

2
sources/GlobalDefine.h
View File

@ -63,7 +63,7 @@
#define FILESYSTEM_FORCED_SYNC_TIMEOUT (qint64)2400000 //2.4 million milliseconds = 40 minutes #define FILESYSTEM_FORCED_SYNC_TIMEOUT (qint64)2400000 //2.4 million milliseconds = 40 minutes
#define MAX_ENGINEERING_LOG_FILESIZE (qint32)1000000 //~1Mb #define MAX_ENGINEERING_LOG_FILESIZE (qint32)1000000 //~1Mb
#define SEI_CLIENT_RECONNECT_TIMEOUT 200 //ms #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 #define USE_DAQNAVI_LIB

2
sources/GuiElements/SEISettingsPage.cpp
View File

@ -186,7 +186,7 @@ int CSEISettingsPage::SetActualSettings(QHostAddress CCHostAdd)
void CSEISettingsPage::ModbusSEIConnected(qint32 LocalIP, qint32 RemoteIP) void CSEISettingsPage::ModbusSEIConnected(qint32 LocalIP, qint32 RemoteIP)
{ {
mSEIConnectionLED->setPixmap(QPixmap("./Images/green-led-on-md.png").scaled(25,25)); 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() void CSEISettingsPage::ModbusSEIDisconnected()

24
sources/Modbus/ModbusSEIMgr.cpp
View File

@ -73,7 +73,7 @@ int CModbusSEIMgr::DisconnectFromSlave()
void CModbusSEIMgr::SocketConnected() void CModbusSEIMgr::SocketConnected()
{ {
emit ModbusMasterConnected(this); emit ModbusMasterConnected(mModbusTCPSocketHandle->localAddress().toIPv4Address(),mModbusTCPSocketHandle->peerAddress().toIPv4Address());
qDebug("Master: Connection established with NetTrac"); qDebug("Master: Connection established with NetTrac");
mConnectionTimer->stop(); mConnectionTimer->stop();
} }
@ -81,7 +81,7 @@ void CModbusSEIMgr::SocketConnected()
void CModbusSEIMgr::SocketDisconnected() void CModbusSEIMgr::SocketDisconnected()
{ {
ModbusLinkDisconnected(); ModbusLinkDisconnected();
emit ModbusMasterDisconnected(this); emit ModbusMasterDisconnected();
mConnectionTimer->start(); mConnectionTimer->start();
qDebug("Disconnected from NetTrac"); qDebug("Disconnected from NetTrac");
} }
@ -100,16 +100,16 @@ void CModbusSEIMgr::ConnectionTimerExpired()
ConnectToSlave(mSEIIPAddress,mModbusPort); ConnectToSlave(mSEIIPAddress,mModbusPort);
mConnectionTimeout.restart(); mConnectionTimeout.restart();
} }
else if(mModbusTCPSocketHandle->state() == QAbstractSocket::ConnectingState) // else if(mModbusTCPSocketHandle->state() == QAbstractSocket::ConnectingState)
{ // {
//Default connection timeout is 1s for sockets. We want this to be shorter. // //Default connection timeout is 1s for sockets. We want this to be shorter.
//if connection timeout is reached, disconnect and retry. // //if connection timeout is reached, disconnect and retry.
if(mConnectionTimeout.hasExpired(SEI_CLIENT_CONNECTION_TIMEOUT)) // if(mConnectionTimeout.hasExpired(SEI_CLIENT_CONNECTION_TIMEOUT))
{ // {
mModbusTCPSocketHandle->disconnectFromHost(); // mModbusTCPSocketHandle->disconnectFromHost();
qDebug("Connection timeout expired... disconnecting"); // qDebug("Connection timeout expired... disconnecting");
} // }
} // }
} }
int CModbusSEIMgr::SEISettingsChanged(QHostAddress ServerIP, int ModbusPort, int DevID) int CModbusSEIMgr::SEISettingsChanged(QHostAddress ServerIP, int ModbusPort, int DevID)

4
sources/Modbus/ModbusSEIMgr.h
View File

@ -37,8 +37,8 @@ private:
QHostAddress mSEIIPAddress; QHostAddress mSEIIPAddress;
signals: signals:
void ModbusMasterConnected(CModbusSEIMgr *); void ModbusMasterConnected(qint32 LocalIP, qint32 RemoteIP);
void ModbusMasterDisconnected(CModbusSEIMgr *); void ModbusMasterDisconnected();
void ModbusMasterRepositoryUpdated(); void ModbusMasterRepositoryUpdated();
public slots: public slots:

6
sources/Zonetest.cpp
View File

@ -620,6 +620,12 @@ unsigned int CZoneTest::InitZT()
} }
mModbusSEIMgr->StartSEICommunication(); 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 else