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

refurbished the serialport commander

Browse Source
This commit is contained in:
nymea 2019-05-20 10:51:04 +02:00
parent 921bf87fd2
commit d3f00a9f5e
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
serialportcommander/devicepluginserialportcommander.cpp
View File

@ -44,6 +44,34 @@ DevicePluginSerialPortCommander::DevicePluginSerialPortCommander()
{ {
} }
DeviceManager::DeviceError DevicePluginSerialPortCommander::discoverDevices(const DeviceClassId &deviceClassId, const ParamList &params)
{
Q_UNUSED(params)
// Create the list of available serial interfaces
QList<DeviceDescriptor> deviceDescriptors;
foreach(QSerialPortInfo port, QSerialPortInfo::availablePorts()) {
qCDebug(dcSerialPortCommander()) << "Found serial port:" << port.portName();
QString description = port.manufacturer() + " " + port.description();
DeviceDescriptor deviceDescriptor(deviceClassId, port.portName(), description);
ParamList parameters;
foreach (Device *existingDevice, myDevices()) {
if (existingDevice->paramValue(serialPortCommanderDeviceSerialPortParamTypeId).toString() == port.portName()) {
deviceDescriptor.setDeviceId(existingDevice->id());
break;
}
}
parameters.append(Param(serialPortCommanderDeviceSerialPortParamTypeId, port.portName()));
deviceDescriptor.setParams(parameters);
deviceDescriptors.append(deviceDescriptor);
}
emit devicesDiscovered(deviceClassId, deviceDescriptors);
return DeviceManager::DeviceErrorAsync;
}
DeviceManager::DeviceSetupStatus DevicePluginSerialPortCommander::setupDevice(Device *device) DeviceManager::DeviceSetupStatus DevicePluginSerialPortCommander::setupDevice(Device *device)
{ {
if(!m_reconnectTimer) { if(!m_reconnectTimer) {
@ -105,33 +133,6 @@ DeviceManager::DeviceSetupStatus DevicePluginSerialPortCommander::setupDevice(De
} }
DeviceManager::DeviceError DevicePluginSerialPortCommander::discoverDevices(const DeviceClassId &deviceClassId, const ParamList &params)
{
Q_UNUSED(params)
// Create the list of available serial interfaces
QList<DeviceDescriptor> deviceDescriptors;
foreach(QSerialPortInfo port, QSerialPortInfo::availablePorts()) {
qCDebug(dcSerialPortCommander()) << "Found serial port:" << port.portName();
QString description = port.manufacturer() + " " + port.description();
DeviceDescriptor deviceDescriptor(deviceClassId, port.portName(), description);
ParamList parameters;
foreach (Device *existingDevice, myDevices()) {
if (existingDevice->paramValue(serialPortCommanderDeviceSerialPortParamTypeId).toString() == port.portName()) {
deviceDescriptor.setDeviceId(existingDevice->id());
break;
}
}
parameters.append(Param(serialPortCommanderDeviceSerialPortParamTypeId, port.portName()));
deviceDescriptor.setParams(parameters);
deviceDescriptors.append(deviceDescriptor);
}
emit devicesDiscovered(deviceClassId, deviceDescriptors);
return DeviceManager::DeviceErrorAsync;
}
DeviceManager::DeviceError DevicePluginSerialPortCommander::executeAction(Device *device, const Action &action) DeviceManager::DeviceError DevicePluginSerialPortCommander::executeAction(Device *device, const Action &action)
{ {
if (device->deviceClassId() == serialPortCommanderDeviceClassId ) { if (device->deviceClassId() == serialPortCommanderDeviceClassId ) {
@ -189,7 +190,7 @@ void DevicePluginSerialPortCommander::onReadyRead()
emitEvent(event); emitEvent(event);
} }
void DevicePluginSerialPortCommander::onSerialError(const QSerialPort::SerialPortError &error) void DevicePluginSerialPortCommander::onSerialError(QSerialPort::SerialPortError error)
{ {
QSerialPort *serialPort = static_cast<QSerialPort*>(sender()); QSerialPort *serialPort = static_cast<QSerialPort*>(sender());
Device *device = m_serialPorts.key(serialPort); Device *device = m_serialPorts.key(serialPort);

5
serialportcommander/devicepluginserialportcommander.h
View File

@ -25,8 +25,8 @@
#include "plugin/deviceplugin.h" #include "plugin/deviceplugin.h"
#include "devicemanager.h" #include "devicemanager.h"
#include <QTimer>
#include <QTimer>
#include <QSerialPort> #include <QSerialPort>
#include <QSerialPortInfo> #include <QSerialPortInfo>
@ -51,14 +51,13 @@ private:
private slots: private slots:
void onReadyRead(); void onReadyRead();
void onSerialError(const QSerialPort::SerialPortError &error); void onSerialError(QSerialPort::SerialPortError error);
void onBaudRateChanged(qint32 baudRate, QSerialPort::Directions direction); void onBaudRateChanged(qint32 baudRate, QSerialPort::Directions direction);
void onParityChanged(QSerialPort::Parity parity); void onParityChanged(QSerialPort::Parity parity);
void onDataBitsChanged(QSerialPort::DataBits dataBits); void onDataBitsChanged(QSerialPort::DataBits dataBits);
void onStopBitsChanged(QSerialPort::StopBits stopBits); void onStopBitsChanged(QSerialPort::StopBits stopBits);
void onFlowControlChanged(QSerialPort::FlowControl flowControl); void onFlowControlChanged(QSerialPort::FlowControl flowControl);
void onReconnectTimer(); void onReconnectTimer();
}; };
#endif // DEVICEPLUGINSERIALPORTCOMMANDER_H #endif // DEVICEPLUGINSERIALPORTCOMMANDER_H