From f745ee3cbdf1f10f29a462ad617c95b6f7056674 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Mon, 29 Jun 2020 13:28:32 +0200
Subject: [PATCH 1/3] Shelly: Add support for the Shelly Dimmer 2

---
 shelly/integrationpluginshelly.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shelly/integrationpluginshelly.cpp b/shelly/integrationpluginshelly.cpp
index 1a3f58a9..658c1581 100644
--- a/shelly/integrationpluginshelly.cpp
+++ b/shelly/integrationpluginshelly.cpp
@@ -200,7 +200,7 @@ void IntegrationPluginShelly::discoverThings(ThingDiscoveryInfo *info)
         } else if (info->thingClassId() == shellyRgbw2ThingClassId) {
             namePattern = QRegExp("^shellyrgbw2-[0-9A-Z]+$");
         } else if (info->thingClassId() == shellyDimmerThingClassId) {
-            namePattern = QRegExp("^shellydimmer-[0-9A-Z]+$");
+            namePattern = QRegExp("^shellydimmer(2)?-[0-9A-Z]+$");
         } else if (info->thingClassId() == shelly25ThingClassId) {
             namePattern = QRegExp("^shellyswitch25-[0-9A-Z]+$");
         }

From 9ba8908578620b3c49b9da59b130d7a9025f3fae Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Mon, 29 Jun 2020 13:30:38 +0200
Subject: [PATCH 2/3] update readme

---
 shelly/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shelly/README.md b/shelly/README.md
index 32638409..e6f5b2a8 100644
--- a/shelly/README.md
+++ b/shelly/README.md
@@ -8,7 +8,7 @@ The currently supported devices are:
 * Shelly 2.5
 * Shelly Plug / PlugS
 * Shelly RGBW2
-* Shelly Dimmer
+* Shelly Dimmer / Dimmer 2
 
 ## Requirements
 Shelly devices communicate with via MQTT. This means, in order to add Shelly devices to nymea, the nymea instance is required

From d3d0d0387e98ded3732a18570e390e8921b4adc2 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Mon, 29 Jun 2020 13:34:57 +0200
Subject: [PATCH 3/3] Update shelly dimmer description

---
 shelly/integrationpluginshelly.json            |  2 +-
 ...62773b-0435-408c-a4f8-7860d38031a9-en_US.ts | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/shelly/integrationpluginshelly.json b/shelly/integrationpluginshelly.json
index e0298565..f0c50a45 100644
--- a/shelly/integrationpluginshelly.json
+++ b/shelly/integrationpluginshelly.json
@@ -372,7 +372,7 @@
                 {
                     "id": "3a1d6fc1-c623-4b45-9c81-1573fcc15f99",
                     "name": "shellyDimmer",
-                    "displayName": "Shelly Dimmer",
+                    "displayName": "Shelly Dimmer / Dimmer 2",
                     "createMethods": ["discovery"],
                     "interfaces": ["dimmablelight", "connectable"],
                     "paramTypes": [
diff --git a/shelly/translations/6162773b-0435-408c-a4f8-7860d38031a9-en_US.ts b/shelly/translations/6162773b-0435-408c-a4f8-7860d38031a9-en_US.ts
index e4966a40..c963e6c8 100644
--- a/shelly/translations/6162773b-0435-408c-a4f8-7860d38031a9-en_US.ts
+++ b/shelly/translations/6162773b-0435-408c-a4f8-7860d38031a9-en_US.ts
@@ -4,38 +4,38 @@
 <context>
     <name>IntegrationPluginShelly</name>
     <message>
-        <location filename="../integrationpluginshelly.cpp" line="620"/>
+        <location filename="../integrationpluginshelly.cpp" line="629"/>
         <source>Unable to find the thing in the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../integrationpluginshelly.cpp" line="631"/>
+        <location filename="../integrationpluginshelly.cpp" line="640"/>
         <source>Roller shutter mode can&apos;t be mixed with relay mode. Please configure both connected devices to control a shutter or relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../integrationpluginshelly.cpp" line="636"/>
-        <location filename="../integrationpluginshelly.cpp" line="641"/>
+        <location filename="../integrationpluginshelly.cpp" line="645"/>
+        <location filename="../integrationpluginshelly.cpp" line="650"/>
         <source>For using a roller shutter, one channel must be set to up, the other to down.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../integrationpluginshelly.cpp" line="652"/>
+        <location filename="../integrationpluginshelly.cpp" line="663"/>
         <source>Error creating MQTT channel. Please check MQTT server settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../integrationpluginshelly.cpp" line="691"/>
+        <location filename="../integrationpluginshelly.cpp" line="704"/>
         <source>Username and password not set correctly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../integrationpluginshelly.cpp" line="693"/>
+        <location filename="../integrationpluginshelly.cpp" line="706"/>
         <source>Error connecting to Shelly device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../integrationpluginshelly.cpp" line="702"/>
+        <location filename="../integrationpluginshelly.cpp" line="715"/>
         <source>Unexpected data received from Shelly device.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -665,7 +665,7 @@ The name of the plugin shelly ({6162773b-0435-408c-a4f8-7860d38031a9})</extracom
     </message>
     <message>
         <location filename="../../../build-nymea-plugins-Desktop-Debug/shelly/plugininfo.h" line="728"/>
-        <source>Shelly Dimmer</source>
+        <source>Shelly Dimmer / Dimmer 2</source>
         <extracomment>The name of the ThingClass ({3a1d6fc1-c623-4b45-9c81-1573fcc15f99})</extracomment>
         <translation type="unfinished"></translation>
     </message>