Merge pull request #46 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.0.4",
-  "releaseNotes": "2.0.4 Fix null issue on setting parent energy totals\r\n2.0.3 Fix for cover child devices not getting coverId properly from device data\r\n2.0.3 Add drivers for Pro2PM, Pro3, Uni gen1 and gen2 to HPM. \r\n2.0.1 Change logging level on a few things to keep logs from warning about Shelly auth related messages. \r\n2.0.0 Added support for many more devices. Major rewrite of library code. 🥳\r\n1.2.0 Added Shelly Flood, Shelly PM Mini Gen3\r\n1.1.0 Added support for Bluetooth Gateway, Blu devices (button, motion, door/window), H&T (gen 1)\r\n1.0.0 Release of Shelly Plug US, Button 1, Motion 2, Shelly H&T (gen 2 and 3), and Shelly Gas",
+  "version": "2.0.5",
+  "releaseNotes": "2.0.5 Fix overflow issue on setting parent energy totals.\r\nFix null issue on setting parent energy totals\r\n2.0.3 Fix for cover child devices not getting coverId properly from device data\r\n2.0.3 Add drivers for Pro2PM, Pro3, Uni gen1 and gen2 to HPM. \r\n2.0.1 Change logging level on a few things to keep logs from warning about Shelly auth related messages. \r\n2.0.0 Added support for many more devices. Major rewrite of library code. 🥳\r\n1.2.0 Added Shelly Flood, Shelly PM Mini Gen3\r\n1.1.0 Added support for Bluetooth Gateway, Blu devices (button, motion, door/window), H&T (gen 1)\r\n1.0.0 Release of Shelly Plug US, Button 1, Motion 2, Shelly H&T (gen 2 and 3), and Shelly Gas",
   "minimumHEVersion": "2.3.7.114",
   "dateReleased": "2024-02-10",
   "licenseFile": "https://raw.githubusercontent.com/ShellyUSA/Hubitat-Drivers/master/LICENSE",

ShellyDriverLibrary/ShellyUSA.ShellyUSA_Driver_Library.groovy

@@ -831,7 +831,6 @@ BigDecimal getVoltage(Integer id = 0) {
 void setEnergy(BigDecimal value, Integer id = 0) {
   value = value.setScale(2, BigDecimal.ROUND_HALF_UP)
 
-
   ChildDeviceWrapper c = getSwitchChildById(id)
   if(value == -1) {
     if(c != null) { sendChildDeviceEvent([name: 'energy', value: null, unit:'kWh'], c) }
@@ -848,9 +847,16 @@ void setEnergy(BigDecimal value, Integer id = 0) {
 
 @CompileStatic
 void updateParentEnergyTotal() {
-  List<ChildDeviceWrapper> energySwitchChildren = getEnergySwitchChildren()
-  List<BigDecimal> childEnergies = energySwitchChildren.findAll{it.currentValue('energy') != null}.collect{it.currentValue('energy') as BigDecimal}
-  setEnergy(childEnergies.sum() as BigDecimal)
+  if(hasChildren() == true) {
+    List<ChildDeviceWrapper> energySwitchChildren = getEnergySwitchChildren().findAll{it.currentValue('energy') != null}
+    List<BigDecimal> childEnergies = []
+    logDebug("energySwitchChildren: ${energySwitchChildren}")
+    if(energySwitchChildren != null && energySwitchChildren?.size() > 0) {
+      childEnergies = energySwitchChildren.collect{it.currentValue('energy') as BigDecimal}
+      logDebug("ChildEnergies: ${childEnergies}")
+    }
+    sendDeviceEvent([name: 'energy', value: childEnergies.sum() as BigDecimal, unit:'kWh'])
+  }
 }
 
 @CompileStatic
@@ -1482,7 +1488,7 @@ void setInputAnalogState(BigDecimal value, Integer id = 0) {
 
 @CompileStatic
 void setLastUpdated() {
-  sendDeviceEvent([name: 'lastUpdated', value: nowFormatted()])
+  if(hasCapabilityBattery() == true) {sendDeviceEvent([name: 'lastUpdated', value: nowFormatted()])}
 }
 
 void sendEventToShellyBluetoothHelper(String loc, Object value, String dni) {