diff --git a/Configuration/ZT.cfg b/Configuration/ZT.cfg index 2e3138a..e35916f 100644 --- a/Configuration/ZT.cfg +++ b/Configuration/ZT.cfg @@ -18,7 +18,7 @@ #paramètres des modules d'entrées/sorties externes #L'adresse IP du module maître. -EXTIO_MASTER_IP=192.168.0.51 +EXTIO_MASTER_IP=192.168.2.51 #DATAQ_IP=192.168.0.103 #--------------------------------- @@ -42,7 +42,7 @@ EXTIO_440_MOD_PHYS_ADDR_1=3 #Ex.: SONDE_LASER_INT_1=x SONDE_LASER_INT_1=ttyS2 -SONDE_LASER_EXT_1=ttyS0 +SONDE_LASER_EXT_1=ttyS1 #---------------------------------- #Changer cette valeur à OUI ou NON pour sélectionner la communication Modbus diff --git a/sources/Modbus/ModbusBackend.cpp b/sources/Modbus/ModbusBackend.cpp index 08d17bd..a01a747 100644 --- a/sources/Modbus/ModbusBackend.cpp +++ b/sources/Modbus/ModbusBackend.cpp @@ -233,8 +233,8 @@ int CModbusBackend::AnalyzeModbusRequest(CModbusTransaction Transaction) //Write register data mModbusRepo->WriteHRData(StartAdress,NbRegisters,data); - qDebug("\nSlave Rx Write Multiple Registers. Address: %d, Nb Reg: %d",StartAdress, NbRegisters); - qDebug("Data: %s\n",data.toHex().data()); + // qDebug("\nSlave Rx Write Multiple Registers. Address: %d, Nb Reg: %d",StartAdress, NbRegisters); + // qDebug("Data: %s\n",data.toHex().data()); data = Transaction.mPDU.mData.left(4); //The response corresponds to the Start Adress and Nb of Regs. Which is the first 4 bytes of the initial request. SendModbusResponse(Transaction, data); diff --git a/sources/main.cpp b/sources/main.cpp index aac4e76..1d85196 100644 --- a/sources/main.cpp +++ b/sources/main.cpp @@ -27,6 +27,7 @@ #include #include "Zonetest.h" #include "MainPanel.h" +#include "ZTVersion.h" #include int main(int argc, char *argv[]) @@ -39,8 +40,7 @@ int main(int argc, char *argv[]) QFont serifFont("Times", 10, QFont::Bold); QApplication::setFont(serifFont); - //Create program instance - CZoneTest ZoneTest; + bool FullScreen = true; @@ -72,7 +72,14 @@ int main(int argc, char *argv[]) { UseWatchdog = false; } + else if ( strcmp(argv[i],"-version") == 0 ) + { + qDebug("ZoneTest version: %s",ZT_SOFT_VERSION); + return 99; + } } + //Create program instance + CZoneTest ZoneTest; ZoneTest.mFullScreen = FullScreen; ZoneTest.mSimulateLazerProbes = SimulLazerProbes;