Merge pull request #74 from ShellyUSA/DanielWinks

Daniel winks

Author: DanielWinks

PackageManifests/ShellyWebhookDrivers/packageManifest.json

@@ -1,8 +1,8 @@
 {
   "packageName": "Shelly Webhook/Websocket Drivers",
   "author": "ShellyUSA, Daniel Winks",
-  "version": "2.13.0",
-  "releaseNotes": "2.13.0 Add Shelly Pro 3EM400 Support/r/n2.12.0 Add Shelly Pro EM support/r/n2.11.0 Add support for Shelly 1, Shelly RGBW (Gen1), Shelly RGBW White Mode (Gen1), Shelly Plus Wall Dimmer, Shelly Pro 1PM, Pro 2, Pro Dimmer 1PM, Pro Dimmer 2PM",
+  "version": "2.14.0",
+  "releaseNotes": "2.14.0 Add Shelly EM, Shelly 3EM/r/n2.13.0 Add Shelly Pro 3EM400 Support/r/n2.12.0 Add Shelly Pro EM support/r/n2.11.0 Add support for Shelly 1, Shelly RGBW (Gen1), Shelly RGBW White Mode (Gen1), Shelly Plus Wall Dimmer, Shelly Pro 1PM, Pro 2, Pro Dimmer 1PM, Pro Dimmer 2PM",
   "minimumHEVersion": "2.3.7.114",
   "dateReleased": "2024-02-10",
   "licenseFile": "https://raw.githubusercontent.com/ShellyUSA/Hubitat-Drivers/master/LICENSE",
@@ -169,6 +169,13 @@
       "location": "https://raw.githubusercontent.com/ShellyUSA/Hubitat-Drivers/master/WebhookWebsocket/Shelly2.5.groovy",
       "required": false
     },
+    {
+      "id": "62ee7ce0-bb10-4800-a504-234a7bc66eec",
+      "name": "Shelly 3EM",
+      "namespace": "ShellyUSA",
+      "location": "https://raw.githubusercontent.com/ShellyUSA/Hubitat-Drivers/master/WebhookWebsocket/Shelly3EM.groovy",
+      "required": false
+    },
     {
       "id": "4900ccee-fbb9-4df7-bd3a-2a479335ba79",
       "name": "Shelly Blu Gateway",
@@ -204,6 +211,13 @@
       "location": "https://raw.githubusercontent.com/ShellyUSA/Hubitat-Drivers/master/WebhookWebsocket/ShellyDuoWWCW.groovy",
       "required": false
     },
+    {
+      "id": "9e02af5d-ab78-401c-9a57-99ecd78c0b81",
+      "name": "Shelly EM",
+      "namespace": "ShellyUSA",
+      "location": "https://raw.githubusercontent.com/ShellyUSA/Hubitat-Drivers/master/WebhookWebsocket/ShellyEM.groovy",
+      "required": false
+    },
     {
       "id": "2b2d10f3-c078-406f-aacf-936936d41a1d",
       "name": "Shelly Flood",

ShellyDriverLibrary/ShellyUSA.ShellyUSA_Driver_Library.groovy

@@ -463,7 +463,7 @@ void getPreferencesFromShellyDevice() {
         setDeviceDataValue('frequencyId', "${id}")
       }
 
-      if(em1s?.size() > 0 && hasNoChildrenNeeded() == false) {
+      if(em1s?.size() > 0) {
         em1s.each{ em1 ->
           Integer id = em1.tokenize(':')[1] as Integer
           logTrace("EM1 ID: ${id}")
@@ -476,7 +476,7 @@ void getPreferencesFromShellyDevice() {
         }
       }
 
-      if(ems?.size() > 0 && hasNoChildrenNeeded() == false) {
+      if(ems?.size() > 0) {
         ems.each{ em ->
           Integer id = em.tokenize(':')[1] as Integer
           logTrace("EM ID: ${id}")

WebhookWebsocket/Shelly3EM.groovy

@@ -0,0 +1,19 @@
+#include ShellyUSA.ShellyUSA_Driver_Library
+
+metadata {
+  definition (name: 'Shelly 3EM', namespace: 'ShellyUSA', author: 'Daniel Winks', singleThreaded: false, importUrl: '') {
+    capability 'Initialize'
+    capability 'Configuration'
+    capability 'Refresh'
+    capability 'CurrentMeter' //amperage - NUMBER, unit:A
+    capability 'PowerMeter' //power - NUMBER, unit:W
+    capability 'VoltageMeasurement' //voltage - NUMBER, unit:V //frequency - NUMBER, unit:Hz
+    capability 'EnergyMeter' //energy - NUMBER, unit:kWh
+    attribute 'returnedEnergy', 'number' //unit:kWh
+    attribute 'apparentPower', 'number'
+    command 'resetEnergyMonitors'
+  }
+}
+
+@Field static Boolean WS = true
+@Field static Boolean DEVICEISBLUGATEWAY = true

WebhookWebsocket/ShellyEM.groovy

@@ -0,0 +1,21 @@
+#include ShellyUSA.ShellyUSA_Driver_Library
+
+metadata {
+  definition (name: 'Shelly EM', namespace: 'ShellyUSA', author: 'Daniel Winks', singleThreaded: false, importUrl: '') {
+    capability 'Initialize'
+    capability 'Configuration'
+    capability 'Refresh'
+    capability 'CurrentMeter' //amperage - NUMBER, unit:A
+    capability 'PowerMeter' //power - NUMBER, unit:W
+    capability 'VoltageMeasurement' //voltage - NUMBER, unit:V //frequency - NUMBER, unit:Hz
+    capability 'EnergyMeter' //energy - NUMBER, unit:kWh
+    capability 'Switch'
+    attribute 'returnedEnergy', 'number' //unit:kWh
+    attribute 'apparentPower', 'number'
+    command 'resetEnergyMonitors'
+  }
+}
+
+@Field static Boolean WS = true
+@Field static Boolean DEVICEISBLUGATEWAY = true
+@Field static Boolean NOCHILDREN = true