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

espuino: Add Qt6 support

master
Simon Stürz 2025-08-08 10:08:55 +02:00
parent 725b2d0fa8
commit a06333719b
3 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
espuino/espuino.pro
View File

@ -1,7 +1,6 @@
include(../plugins.pri) include(../plugins.pri)
QT += network \ QT *= network websockets
websockets
PKGCONFIG += nymea-mqtt PKGCONFIG += nymea-mqtt

24
espuino/integrationpluginespuino.cpp
View File

@ -1,6 +1,6 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Copyright 2013 - 2022, nymea GmbH * Copyright 2013 - 2025, nymea GmbH
* Contact: contact@nymea.io * Contact: contact@nymea.io
* *
* This file is part of nymea. * This file is part of nymea.
@ -30,15 +30,13 @@
#include "integrationpluginespuino.h" #include "integrationpluginespuino.h"
#include "integrations/integrationplugin.h"
#include "plugininfo.h" #include "plugininfo.h"
#include "network/networkaccessmanager.h" #include <network/networkaccessmanager.h>
#include "network/mqtt/mqttprovider.h" #include <network/mqtt/mqttprovider.h>
#include "network/mqtt/mqttchannel.h" #include <network/mqtt/mqttchannel.h>
#include "network/zeroconf/zeroconfservicebrowser.h" #include <network/zeroconf/zeroconfservicebrowser.h>
#include "platform/platformzeroconfcontroller.h" #include <platform/platformzeroconfcontroller.h>
#include <mqttclient.h> #include <mqttclient.h>
@ -46,6 +44,7 @@
#include <QJsonDocument> #include <QJsonDocument>
#include <QNetworkReply> #include <QNetworkReply>
#include <QUrlQuery> #include <QUrlQuery>
#include <QRegularExpression>
void IntegrationPluginEspuino::init() void IntegrationPluginEspuino::init()
{ {
@ -55,10 +54,9 @@ void IntegrationPluginEspuino::init()
void IntegrationPluginEspuino::discoverThings(ThingDiscoveryInfo *info) void IntegrationPluginEspuino::discoverThings(ThingDiscoveryInfo *info)
{ {
foreach (const ZeroConfServiceEntry &entry, m_zeroConfBrowser->serviceEntries()) { foreach (const ZeroConfServiceEntry &entry, m_zeroConfBrowser->serviceEntries()) {
QRegExp match("espuino.*");
if (!match.exactMatch(entry.name())) { if (!QRegularExpression("espuino.*").match(entry.name()).hasMatch())
continue; continue;
}
qCDebug(dcESPuino()) << "Found device:" << entry; qCDebug(dcESPuino()) << "Found device:" << entry;
ThingDescriptor descriptor(info->thingClassId(), entry.hostName(), entry.hostAddress().toString()); ThingDescriptor descriptor(info->thingClassId(), entry.hostName(), entry.hostAddress().toString());
@ -421,7 +419,7 @@ void IntegrationPluginEspuino::browseThing(BrowseResult *result)
void IntegrationPluginEspuino::browseThing(BrowseResult *result, const QString &path) void IntegrationPluginEspuino::browseThing(BrowseResult *result, const QString &path)
{ {
QUrl url(QString("http://%1/explorer?path=%2").arg(getHost(result->thing())).arg(path.isEmpty() ? "/" : path)); QUrl url(QString("http://%1/explorer?path=%2").arg(getHost(result->thing()), path.isEmpty() ? "/" : path));
QNetworkRequest request(url); QNetworkRequest request(url);
QNetworkReply *reply = hardwareManager()->networkManager()->get(request); QNetworkReply *reply = hardwareManager()->networkManager()->get(request);
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater); connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
@ -450,7 +448,7 @@ void IntegrationPluginEspuino::browseThing(BrowseResult *result, const QString &
if (variantMap.value("dir").toBool()) { if (variantMap.value("dir").toBool()) {
id.addQueryItem("playmode", QString::number(5)); id.addQueryItem("playmode", QString::number(5));
id.addQueryItem("type", "dir"); id.addQueryItem("type", "dir");
} else if (variantMap.value("name").toString().contains(QRegExp("\\.(:?mp3|ogg|wav|wma|acc|m4a|flac)$", Qt::CaseInsensitive))) { } else if (variantMap.value("name").toString().contains(QRegularExpression("\\.(:?mp3|ogg|wav|wma|acc|m4a|flac)$", QRegularExpression::CaseInsensitiveOption))) {
id.addQueryItem("playmode", QString::number(1)); id.addQueryItem("playmode", QString::number(1));
id.addQueryItem("type", "audiofile"); id.addQueryItem("type", "audiofile");
} else if (variantMap.value("name").toString().endsWith(".m3u", Qt::CaseInsensitive)) { } else if (variantMap.value("name").toString().endsWith(".m3u", Qt::CaseInsensitive)) {

10
espuino/integrationpluginespuino.h
View File

@ -1,6 +1,6 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Copyright 2013 - 2022, nymea GmbH * Copyright 2013 - 2025, nymea GmbH
* Contact: contact@nymea.io * Contact: contact@nymea.io
* *
* This file is part of nymea. * This file is part of nymea.
@ -31,8 +31,8 @@
#ifndef INTEGRATIONPLUGINESPUINO_H #ifndef INTEGRATIONPLUGINESPUINO_H
#define INTEGRATIONPLUGINESPUINO_H #define INTEGRATIONPLUGINESPUINO_H
#include "integrations/integrationplugin.h" #include <integrations/integrationplugin.h>
#include "plugintimer.h" #include <plugintimer.h>
#include <QHash> #include <QHash>
@ -69,8 +69,8 @@ private slots:
private: private:
QString getHost(Thing *thing) const; QString getHost(Thing *thing) const;
ZeroConfServiceBrowser *m_zeroConfBrowser; ZeroConfServiceBrowser *m_zeroConfBrowser = nullptr;
QHash<Thing*, MqttChannel*> m_mqttChannels; QHash<Thing *, MqttChannel *> m_mqttChannels;
QHash<ThingClassId, ParamTypeId> m_ipAddressParamTypeMap; QHash<ThingClassId, ParamTypeId> m_ipAddressParamTypeMap;
QMap<QString, QPointer<ThingActionInfo>> m_pendingActions; QMap<QString, QPointer<ThingActionInfo>> m_pendingActions;
}; };