ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix debug print for modbus RTU master and try to connect masters after loading them

Browse Source
This commit is contained in:
Simon Stürz 2021-04-27 09:51:09 +02:00
parent 055ace3cc1
commit becd6c3374
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libnymea-core/modbus/modbusrtumanager.cpp
View File

@ -63,6 +63,15 @@ ModbusRtuManager::ModbusRtuManager(SerialPortMonitor *serialPortMonitor, QObject
} }
} }
}); });
// Try to connect the modbus rtu masters
foreach (ModbusRtuMaster *modbusMaster, m_modbusRtuMasters.values()) {
ModbusRtuMasterImpl *modbusMasterImpl = qobject_cast<ModbusRtuMasterImpl *>(modbusMaster);
if (!modbusMasterImpl->connectDevice()) {
qCWarning(dcModbusRtu()) << "Failed to connect modbus RTU master. Could not connect to" << modbusMaster;
}
}
} }
SerialPortMonitor *ModbusRtuManager::serialPortMonitor() const SerialPortMonitor *ModbusRtuManager::serialPortMonitor() const
@ -256,11 +265,6 @@ void ModbusRtuManager::addModbusRtuMasterInternally(ModbusRtuMasterImpl *modbusR
}); });
emit modbusRtuMasterAdded(modbusMaster); emit modbusRtuMasterAdded(modbusMaster);
// Try to connect the modbus rtu master after adding the bus
if (!modbusRtuMaster->connectDevice()) {
qCWarning(dcModbusRtu()) << "Failed to connect modbus RTU master. Could not connect to" << modbusMaster;
}
} }
} }

4
libnymea/hardware/modbus/modbusrtumaster.h
View File

@ -86,8 +86,8 @@ inline QDebug operator<<(QDebug debug, ModbusRtuMaster *modbusRtuMaster) {
debug.nospace() << ", " << modbusRtuMaster->dataBits(); debug.nospace() << ", " << modbusRtuMaster->dataBits();
debug.nospace() << ", " << modbusRtuMaster->stopBits(); debug.nospace() << ", " << modbusRtuMaster->stopBits();
debug.nospace() << ", " << modbusRtuMaster->parity(); debug.nospace() << ", " << modbusRtuMaster->parity();
debug.nospace() << ", Retries:" << modbusRtuMaster->numberOfRetries(); debug.nospace() << ", Retries: " << modbusRtuMaster->numberOfRetries();
debug.nospace() << ", Timeout:" << modbusRtuMaster->numberOfRetries() << "ms)"; debug.nospace() << ", Timeout: " << modbusRtuMaster->timeout() << "ms)";
return debug.space(); return debug.space();
}; };