|
|
@ -24,7 +24,7 @@ void ModbusWrapper::initWrapper(QString serialPort, int slaveAddress) |
|
|
|
connect(this, &ModbusWrapper::stopConnectionOrder, &modBusObj, &ModBusMaster::stop, Qt::BlockingQueuedConnection); |
|
|
|
connect(&workerThread, &QThread::started, &modBusObj, &ModBusMaster::init); |
|
|
|
connect(&modBusObj, &ModBusMaster::finished, &workerThread, &QThread::terminate); |
|
|
|
|
|
|
|
connect(this, &ModbusWrapper::getCoilOrder, &modBusObj, &ModBusMaster::getCoil, Qt::BlockingQueuedConnection); |
|
|
|
qDebug() << "initWrapper " << QThread::currentThreadId() ; |
|
|
|
emit openConnectionOrder(serialPort, slaveAddress); |
|
|
|
} |
|
|
@ -36,7 +36,6 @@ void ModbusWrapper::stopWrapper() |
|
|
|
|
|
|
|
QBitArray ModbusWrapper::getCoilWrapper(int startAddress, quint16 numberOfEntries) |
|
|
|
{ |
|
|
|
connect(this, &ModbusWrapper::getCoilOrder, &modBusObj, &ModBusMaster::getCoil, Qt::BlockingQueuedConnection); |
|
|
|
QBitArray coilDataFromClient = emit getCoilOrder(startAddress, numberOfEntries); |
|
|
|
return coilDataFromClient; |
|
|
|
} |
|
|
|