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

Bug Fix

Browse Source 
-Correction du fichier ZT.cfg pour qu'il fonctionne mieux sur le proto
-Ajout du paramètre -version pour imprimer la version de la ZT
This commit is contained in:
jfmartel 2017-09-26 14:44:07 -04:00
parent 626645c382
commit 9fcceea4f0
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Configuration/ZT.cfg
View File

@ -18,7 +18,7 @@
#paramètres des modules d'entrées/sorties externes #paramètres des modules d'entrées/sorties externes
#L'adresse IP du module maître. #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 #DATAQ_IP=192.168.0.103
#--------------------------------- #---------------------------------
@ -42,7 +42,7 @@ EXTIO_440_MOD_PHYS_ADDR_1=3
#Ex.: SONDE_LASER_INT_1=x #Ex.: SONDE_LASER_INT_1=x
SONDE_LASER_INT_1=ttyS2 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 #Changer cette valeur à OUI ou NON pour sélectionner la communication Modbus

4
sources/Modbus/ModbusBackend.cpp
View File

@ -233,8 +233,8 @@ int CModbusBackend::AnalyzeModbusRequest(CModbusTransaction Transaction)
//Write register data //Write register data
mModbusRepo->WriteHRData(StartAdress,NbRegisters,data); mModbusRepo->WriteHRData(StartAdress,NbRegisters,data);
qDebug("\nSlave Rx Write Multiple Registers. Address: %d, Nb Reg: %d",StartAdress, NbRegisters); // qDebug("\nSlave Rx Write Multiple Registers. Address: %d, Nb Reg: %d",StartAdress, NbRegisters);
qDebug("Data: %s\n",data.toHex().data()); // 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. 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); SendModbusResponse(Transaction, data);

11
sources/main.cpp
View File

@ -27,6 +27,7 @@
#include <QApplication> #include <QApplication>
#include "Zonetest.h" #include "Zonetest.h"
#include "MainPanel.h" #include "MainPanel.h"
#include "ZTVersion.h"
#include <qobject.h> #include <qobject.h>
int main(int argc, char *argv[]) int main(int argc, char *argv[])
@ -39,8 +40,7 @@ int main(int argc, char *argv[])
QFont serifFont("Times", 10, QFont::Bold); QFont serifFont("Times", 10, QFont::Bold);
QApplication::setFont(serifFont); QApplication::setFont(serifFont);
//Create program instance
CZoneTest ZoneTest;
bool FullScreen = true; bool FullScreen = true;
@ -72,7 +72,14 @@ int main(int argc, char *argv[])
{ {
UseWatchdog = false; 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.mFullScreen = FullScreen;
ZoneTest.mSimulateLazerProbes = SimulLazerProbes; ZoneTest.mSimulateLazerProbes = SimulLazerProbes;