Merge pull request #47 from ShellyUSA/DanielWinks

DanielWinks · web-flow · commit ac9b164106d5 · 2025-01-24T12:21:54.000-05:00
Remove excess logging, lastUpdated from non-battery devices.
diff --git a/ShellyDriverLibrary/ShellyUSA.ShellyUSA_Driver_Library.groovy b/ShellyDriverLibrary/ShellyUSA.ShellyUSA_Driver_Library.groovy
@@ -850,10 +850,8 @@ void updateParentEnergyTotal() {
   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'])
   }
diff --git a/WebhookWebsocket/ShellyPMMiniGen3.groovy b/WebhookWebsocket/ShellyPMMiniGen3.groovy
@@ -11,7 +11,6 @@ metadata {
     capability 'EnergyMeter' //energy - NUMBER, unit:kWh
     command 'enableBluetooth'
     command 'resetEnergyMonitors'
-    attribute 'lastUpdated', 'string'
   }
 }
 
diff --git a/WebhookWebsocket/ShellyPlus1.groovy b/WebhookWebsocket/ShellyPlus1.groovy
@@ -5,7 +5,5 @@ metadata {
     capability 'Initialize'
     capability 'Configuration'
     capability 'Refresh'
-
-    attribute 'lastUpdated', 'string'
   }
 }
diff --git a/WebhookWebsocket/ShellyPlus1PM.groovy b/WebhookWebsocket/ShellyPlus1PM.groovy
@@ -12,6 +12,5 @@ metadata {
     capability 'EnergyMeter' //energy - NUMBER, unit:kWh
 
     command 'resetEnergyMonitors'
-    attribute 'lastUpdated', 'string'
   }
 }
diff --git a/WebhookWebsocket/ShellyPlus1PMMini.groovy b/WebhookWebsocket/ShellyPlus1PMMini.groovy
@@ -12,6 +12,5 @@ metadata {
     capability 'EnergyMeter' //energy - NUMBER, unit:kWh
 
     command 'resetEnergyMonitors'
-    attribute 'lastUpdated', 'string'
   }
 }
diff --git a/WebhookWebsocket/ShellyPlusH&T.groovy b/WebhookWebsocket/ShellyPlusH&T.groovy
@@ -3,9 +3,9 @@
 metadata {
   definition (name: 'Shelly Plus H&T Gen 2&3 (Webhook)', namespace: 'ShellyUSA', author: 'Daniel Winks', importUrl: '') {
     capability 'Initialize'
-    capability "Battery" //battery - NUMBER, unit:%
-    capability "RelativeHumidityMeasurement" //humidity - NUMBER, unit:%rh
-    capability "TemperatureMeasurement" //temperature - NUMBER, unit:°F || °C
+    capability 'Battery' //battery - NUMBER, unit:%
+    capability 'RelativeHumidityMeasurement' //humidity - NUMBER, unit:%rh
+    capability 'TemperatureMeasurement' //temperature - NUMBER, unit:°F || °C
     attribute 'lastUpdated', 'string'
   }
 }
diff --git a/WebhookWebsocket/ShellyPro3.groovy b/WebhookWebsocket/ShellyPro3.groovy
@@ -5,8 +5,6 @@ metadata {
     capability 'Initialize'
     capability 'Configuration'
     capability 'Refresh'
-
-    attribute 'lastUpdated', 'string'
   }
 }
 
diff --git a/WebhookWebsocket/ShellyUni.groovy b/WebhookWebsocket/ShellyUni.groovy
@@ -8,8 +8,6 @@ metadata {
     command 'getPreferencesFromShellyDeviceGen1'
     command 'deleteHubitatWebhooksGen1'
     command 'deleteChildDevices'
-
-    attribute 'lastUpdated', 'string'
   }
 }
 
diff --git a/WebhookWebsocket/ShellyUniPlus.groovy b/WebhookWebsocket/ShellyUniPlus.groovy
@@ -8,10 +8,8 @@ metadata {
     capability 'Refresh'
     capability 'Sensor'
     capability 'VoltageMeasurement' //voltage - NUMBER, unit:V //frequency - NUMBER, unit:Hz
-    capability "RelativeHumidityMeasurement" //humidity - NUMBER, unit:%rh
-    capability "TemperatureMeasurement" //temperature - NUMBER, unit:°F || °C
-
-    attribute 'lastUpdated', 'string'
+    capability 'RelativeHumidityMeasurement' //humidity - NUMBER, unit:%rh
+    capability 'TemperatureMeasurement' //temperature - NUMBER, unit:°F || °C
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -850,10 +850,8 @@ void updateParentEnergyTotal() {`
`850`	`850`	`if(hasChildren() == true) {`
`851`	`851`	`List<ChildDeviceWrapper> energySwitchChildren = getEnergySwitchChildren().findAll{it.currentValue('energy') != null}`
`852`	`852`	`List<BigDecimal> childEnergies = []`
`853`		`- logDebug("energySwitchChildren: ${energySwitchChildren}")`
`854`	`853`	`if(energySwitchChildren != null && energySwitchChildren?.size() > 0) {`
`855`	`854`	`childEnergies = energySwitchChildren.collect{it.currentValue('energy') as BigDecimal}`
`856`		`- logDebug("ChildEnergies: ${childEnergies}")`
`857`	`855`	`}`
`858`	`856`	`sendDeviceEvent([name: 'energy', value: childEnergies.sum() as BigDecimal, unit:'kWh'])`
`859`	`857`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ metadata {`
`11`	`11`	`capability 'EnergyMeter' //energy - NUMBER, unit:kWh`
`12`	`12`	`command 'enableBluetooth'`
`13`	`13`	`command 'resetEnergyMonitors'`
`14`		`- attribute 'lastUpdated', 'string'`
`15`	`14`	`}`
`16`	`15`	`}`
`17`	`16`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,5 @@ metadata {`
`5`	`5`	`capability 'Initialize'`
`6`	`6`	`capability 'Configuration'`
`7`	`7`	`capability 'Refresh'`
`8`		`-`
`9`		`- attribute 'lastUpdated', 'string'`
`10`	`8`	`}`
`11`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,5 @@ metadata {`
`12`	`12`	`capability 'EnergyMeter' //energy - NUMBER, unit:kWh`
`13`	`13`
`14`	`14`	`command 'resetEnergyMonitors'`
`15`		`- attribute 'lastUpdated', 'string'`
`16`	`15`	`}`
`17`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`	`metadata {`
`4`	`4`	`definition (name: 'Shelly Plus H&T Gen 2&3 (Webhook)', namespace: 'ShellyUSA', author: 'Daniel Winks', importUrl: '') {`
`5`	`5`	`capability 'Initialize'`
`6`		`- capability "Battery" //battery - NUMBER, unit:%`
`7`		`- capability "RelativeHumidityMeasurement" //humidity - NUMBER, unit:%rh`
`8`		`- capability "TemperatureMeasurement" //temperature - NUMBER, unit:°F \|\| °C`
	`6`	`+ capability 'Battery' //battery - NUMBER, unit:%`
	`7`	`+ capability 'RelativeHumidityMeasurement' //humidity - NUMBER, unit:%rh`
	`8`	`+ capability 'TemperatureMeasurement' //temperature - NUMBER, unit:°F \|\| °C`
`9`	`9`	`attribute 'lastUpdated', 'string'`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@ metadata {`
`5`	`5`	`capability 'Initialize'`
`6`	`6`	`capability 'Configuration'`
`7`	`7`	`capability 'Refresh'`
`8`		`-`
`9`		`- attribute 'lastUpdated', 'string'`
`10`	`8`	`}`
`11`	`9`	`}`
`12`	`10`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,6 @@ metadata {`
`8`	`8`	`command 'getPreferencesFromShellyDeviceGen1'`
`9`	`9`	`command 'deleteHubitatWebhooksGen1'`
`10`	`10`	`command 'deleteChildDevices'`
`11`		`-`
`12`		`- attribute 'lastUpdated', 'string'`
`13`	`11`	`}`
`14`	`12`	`}`
`15`	`13`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,8 @@ metadata {`
`8`	`8`	`capability 'Refresh'`
`9`	`9`	`capability 'Sensor'`
`10`	`10`	`capability 'VoltageMeasurement' //voltage - NUMBER, unit:V //frequency - NUMBER, unit:Hz`
`11`		`- capability "RelativeHumidityMeasurement" //humidity - NUMBER, unit:%rh`
`12`		`- capability "TemperatureMeasurement" //temperature - NUMBER, unit:°F \|\| °C`
`13`		`-`
`14`		`- attribute 'lastUpdated', 'string'`
	`11`	`+ capability 'RelativeHumidityMeasurement' //humidity - NUMBER, unit:%rh`
	`12`	`+ capability 'TemperatureMeasurement' //temperature - NUMBER, unit:°F \|\| °C`
`15`	`13`	`}`
`16`	`14`	`}`
`17`	`15`