Merge pull request #54 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.2.2",
-  "releaseNotes": "2.2.2 Add Shelly Pro Dual Cover PM\r\n Add Shelly Vintage Bulb, minor fixes for Dimmer\r\n Add Shelly Dimmer 1&2 support\r\nAdd Shelly 2.5 (Gen1). Fix missing cover functionality.\r\n2.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",
+  "version": "2.2.3",
+  "releaseNotes": "2.2.3 Fixes for inputs on Gen 1 device not properly being created/updated\r\nAdd Shelly Pro Dual Cover PM\r\n Add Shelly Vintage Bulb, minor fixes for Dimmer\r\n Add Shelly Dimmer 1&2 support\r\nAdd Shelly 2.5 (Gen1). Fix missing cover functionality.\r\n2.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

@@ -422,6 +422,7 @@ void getPreferencesFromShellyDeviceGen1() {
     prefs['gen1_tamper_sensitivity'] = gen1SettingsResponse?.tamper_sensitivity as Integer
   }
   if(gen1SettingsResponse?.set_volume != null) {prefs['gen1_set_volume'] = gen1SettingsResponse?.set_volume as Integer}
+
   //Process ADC(s)
   List adcs = (List)gen1SettingsResponse?.adcs
   if(adcs != null && adcs.size() > 0) {
@@ -439,6 +440,7 @@ void getPreferencesFromShellyDeviceGen1() {
       }
     }
   }
+
   //Process Temp Sensors
   LinkedHashMap temps = (LinkedHashMap)gen1SettingsResponse?.ext_temperature
   //Get humidity, if present, to determine if ext sensor is single DHT22 or 1-3 DS18B20
@@ -511,6 +513,17 @@ void getPreferencesFromShellyDeviceGen1() {
       setDeviceDataValue('lightMode', mode)
     }
   }
+
+  LinkedHashMap gen1StatusResponse = (LinkedHashMap)sendGen1Command('status')
+
+  List inputs = (List)gen1StatusResponse?.inputs
+  if(inputs != null && inputs.size() > 0) {
+    inputs.eachWithIndex{ it, index ->
+      createChildInput(index, "Button")
+      createChildInput(index, "Switch")
+    }
+  }
+
   if(prefs.size() > 0) { setHubitatDevicePreferences(prefs) }
   refresh()
 }
@@ -1500,6 +1513,12 @@ Boolean getSwitchState() {
   return thisDevice().currentValue('switch', true) == 'on'
 }
 
+@CompileStatic
+void setHeatingSetpoint(BigDecimal temperature) {
+  Integer id = getDeviceDataValue('tstatId') as Integer
+  parentSendGen1CommandAsync("settings/thermostat/${id}/?target_t_enabled=1&target_t=${temperature}")
+}
+
 void on() {
   if(deviceIsInputSwitch(thisDevice()) == true) {
     logWarn('Cannot change state of an input on a Shelly device from Hubitat!')
@@ -2719,6 +2738,18 @@ void parseGen1Message(String raw) {
   else if(query[0] == 'btn_on') {setInputSwitchState(true, query[1] as Integer)}
   else if(query[0] == 'btn_off') {setInputSwitchState(false, query[1] as Integer)}
 
+  else if(query[0] == 'btn1_on') {setInputSwitchState(true, 0 as Integer)}
+  else if(query[0] == 'btn1_off') {setInputSwitchState(false, 0 as Integer)}
+
+  else if(query[0] == 'btn2_on') {setInputSwitchState(true, 1 as Integer)}
+  else if(query[0] == 'btn2_off') {setInputSwitchState(false, 1 as Integer)}
+
+  else if(query[0] == 'btn1_shortpush') {setPushedButton(1, 0 as Integer)}
+  else if(query[0] == 'btn1_longpush') {setHeldButton(1, 0 as Integer)}
+
+  else if(query[0] == 'btn2_shortpush') {setPushedButton(1, 1 as Integer)}
+  else if(query[0] == 'btn2_longpush') {setHeldButton(1, 1 as Integer)}
+
   else if(query[0] == 'humidity.change') {setHumidityPercent(new BigDecimal(query[2]))}
   else if(query[0] == 'temperature.change' && query[1] == 'tC') {setTemperatureC(new BigDecimal(query[2]))}
   else if(query[0] == 'temperature.change' && query[1] == 'tF') {setTemperatureF(new BigDecimal(query[2]))}