From 6e3892e814a367e84b93e07d28f542fd9fecb19c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Wed, 28 May 2025 14:19:38 +0200 Subject: [PATCH] Shelly: Add support for Shelly Pro 3EM 400A model --- debian/changelog | 6 ++++++ shelly/README.md | 2 +- shelly/integrationpluginshelly.cpp | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bd764020..429ef605 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nymea-plugins (1.11.0+202505281205~6693e6c5~bookworm) UNRELEASED; urgency=medium + + * New Package build + + -- Wed, 28 May 2025 12:12:22 +0000 + nymea-plugins (1.11.0) jammy; urgency=medium [ Simon Stürz ] diff --git a/shelly/README.md b/shelly/README.md index 557a0ebc..99e2edc4 100644 --- a/shelly/README.md +++ b/shelly/README.md @@ -18,7 +18,7 @@ The currently supported devices are: * Shelly Button 1 * Shelly EM * Shelly 3EM -* Shelly Pro 3EM +* Shelly Pro 3EM (including 400A model) * Shelly H+T * Shelly i3 * Shelly Motion diff --git a/shelly/integrationpluginshelly.cpp b/shelly/integrationpluginshelly.cpp index 4cf4c333..86f12d1f 100644 --- a/shelly/integrationpluginshelly.cpp +++ b/shelly/integrationpluginshelly.cpp @@ -119,7 +119,7 @@ void IntegrationPluginShelly::discoverThings(ThingDiscoveryInfo *info) } else if (info->thingClassId() == shellyEm3ThingClassId) { namePattern = QRegularExpression("^shellyem3-[0-9A-Z]+$"); } else if (info->thingClassId() == shellyPro3EMThingClassId) { - namePattern = QRegularExpression("^ShellyPro3EM-[0-9A-Z]+$", QRegularExpression::CaseInsensitiveOption); + namePattern = QRegularExpression("^ShellyPro3EM(400)?-[0-9A-Z]+$", QRegularExpression::CaseInsensitiveOption); } else if (info->thingClassId() == shellyHTThingClassId) { namePattern = QRegularExpression("shellyht(g3)?-[0-9A-Z]+$", QRegularExpression::CaseInsensitiveOption); } else if (info->thingClassId() == shellyI3ThingClassId) {