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

Simplify adapter monitor

Browse Source
This commit is contained in:
Simon Stürz 2020-11-18 19:24:59 +01:00
parent 28878adb73
commit 0acc4d667f
2 changed files with 16 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
libnymea-zigbee/zigbeeuartadaptermonitor.cpp
View File

@ -42,70 +42,11 @@ ZigbeeUartAdapterMonitor::ZigbeeUartAdapterMonitor(QObject *parent) : QObject(pa
return; return;
} }
// Read initially all tty devices
foreach (const QSerialPortInfo &serialPortInfo, QSerialPortInfo::availablePorts()) { foreach (const QSerialPortInfo &serialPortInfo, QSerialPortInfo::availablePorts()) {
addAdapterInternally(serialPortInfo.systemLocation()); addAdapterInternally(serialPortInfo.systemLocation());
} }
// Read initially all tty devices
// struct udev_enumerate *enumerate = udev_enumerate_new(m_udev);
// if (!enumerate) {
// qCWarning(dcZigbeeAdapterMonitor()) << "Could not create udev enumerate for initial device reading for the adapter monitor.";
// udev_unref(m_udev);
// m_udev = nullptr;
// return;
// }
// udev_enumerate_add_match_subsystem(enumerate, "tty");
// if (udev_enumerate_scan_devices(enumerate) < 0) {
// qCWarning(dcZigbeeAdapterMonitor()) << "Failed to scan devices from udev enumerate.";
// udev_enumerate_unref(enumerate);
// enumerate = nullptr;
// udev_unref(m_udev);
// m_udev = nullptr;
// return;
// }
// qCDebug(dcZigbeeAdapterMonitor()) << "Load initial list of available serial ports...";
// struct udev_list_entry *devices = nullptr;
// devices = udev_enumerate_get_list_entry(enumerate);
// struct udev_list_entry *dev_list_entry = nullptr;
// udev_list_entry_foreach(dev_list_entry, devices) {
// struct udev_device *device = nullptr;
// const char *path;
// path = udev_list_entry_get_name(dev_list_entry);
// device = udev_device_new_from_syspath(m_udev, path);
// // Filter out virtual devices
// QString devicePath = QString::fromLatin1(udev_device_get_property_value(device,"DEVPATH"));
// QString systemPath = QString::fromLatin1(udev_device_get_property_value(device,"DEVNAME"));
// if (!devicePath.contains("/virtual/tty/")) {
// // Print properties
// struct udev_list_entry *properties = udev_device_get_properties_list_entry(device);
// struct udev_list_entry *property_list_entry = nullptr;
// udev_list_entry_foreach(property_list_entry, properties) {
// qCDebug(dcZigbeeAdapterMonitor()) << " - Property" << udev_list_entry_get_name(property_list_entry) << udev_list_entry_get_value(property_list_entry);
// }
// QString manufacturerString = QString::fromLatin1(udev_device_get_property_value(device,"ID_VENDOR_ENC"));
// QString descriptionString = QString::fromLatin1(udev_device_get_property_value(device,"ID_MODEL_ENC"));
// QString serialNumberString = QString::fromLatin1(udev_device_get_property_value(device, "ID_SERIAL_SHORT"));
// qCDebug(dcZigbeeAdapterMonitor()) << "[+]" << systemPath << manufacturerString << descriptionString << serialNumberString;
// addAdapterInternally(systemPath);
// } else {
// qCDebug(dcZigbeeAdapterMonitor()) << "Skipping virtual tty device" << systemPath << "-->" << devicePath;
// }
// // Clean up this device since we have all information
// udev_device_unref(device);
// }
// udev_enumerate_unref(enumerate);
// enumerate = nullptr;
// Create udev monitor // Create udev monitor
m_monitor = udev_monitor_new_from_netlink(m_udev, "udev"); m_monitor = udev_monitor_new_from_netlink(m_udev, "udev");
if (!m_monitor) { if (!m_monitor) {
@ -152,15 +93,8 @@ ZigbeeUartAdapterMonitor::ZigbeeUartAdapterMonitor(QObject *parent) : QObject(pa
return; return;
} }
QString systemPath = QString::fromLatin1(udev_device_get_property_value(device,"DEVNAME"));
QString devicePath = QString::fromLatin1(udev_device_get_property_value(device,"DEVPATH"));
if (devicePath.contains("/virtual/tty/")) {
qCDebug(dcZigbeeAdapterMonitor()) << "Skipping virtual tty device" << systemPath << "-->" << devicePath;
return;
}
QString actionString = QString::fromLatin1(udev_device_get_action(device)); QString actionString = QString::fromLatin1(udev_device_get_action(device));
QString systemPath = QString::fromLatin1(udev_device_get_property_value(device,"DEVNAME"));
QString manufacturerString = QString::fromLatin1(udev_device_get_property_value(device,"ID_VENDOR_ENC")); QString manufacturerString = QString::fromLatin1(udev_device_get_property_value(device,"ID_VENDOR_ENC"));
QString descriptionString = QString::fromLatin1(udev_device_get_property_value(device,"ID_MODEL_ENC")); QString descriptionString = QString::fromLatin1(udev_device_get_property_value(device,"ID_MODEL_ENC"));
QString serialNumberString = QString::fromLatin1(udev_device_get_property_value(device, "ID_SERIAL_SHORT")); QString serialNumberString = QString::fromLatin1(udev_device_get_property_value(device, "ID_SERIAL_SHORT"));
@ -193,6 +127,19 @@ ZigbeeUartAdapterMonitor::ZigbeeUartAdapterMonitor(QObject *parent) : QObject(pa
m_isValid = true; m_isValid = true;
} }
ZigbeeUartAdapterMonitor::~ZigbeeUartAdapterMonitor()
{
if (m_notifier)
delete m_notifier;
if (m_monitor)
udev_monitor_unref(m_monitor);
if (m_udev)
udev_unref(m_udev);
}
QList<ZigbeeUartAdapter> ZigbeeUartAdapterMonitor::availableAdapters() const QList<ZigbeeUartAdapter> ZigbeeUartAdapterMonitor::availableAdapters() const
{ {
return m_availableAdapters.values(); return m_availableAdapters.values();

1
libnymea-zigbee/zigbeeuartadaptermonitor.h
View File

@ -38,6 +38,7 @@ class ZigbeeUartAdapterMonitor : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit ZigbeeUartAdapterMonitor(QObject *parent = nullptr); explicit ZigbeeUartAdapterMonitor(QObject *parent = nullptr);
~ZigbeeUartAdapterMonitor();
QList<ZigbeeUartAdapter> availableAdapters() const; QList<ZigbeeUartAdapter> availableAdapters() const;
bool hasAdapter(const QString &serialPort) const; bool hasAdapter(const QString &serialPort) const;