Skip to content

Commit 4312b38

Browse files
authored
Merge pull request #57 from ShellyUSA/DanielWinks
Daniel winks
2 parents 78644bf + 77199c7 commit 4312b38

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

PackageManifests/ShellyWebhookDrivers/packageManifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"packageName": "Shelly Webhook/Websocket Drivers",
33
"author": "ShellyUSA, Daniel Winks",
4-
"version": "2.3.1",
5-
"releaseNotes": "2.3.1 Add Shelly TRV\r\nFixes 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",
4+
"version": "2.3.2",
5+
"releaseNotes": "2.3.2 Fix open/close commands on TRV\r\nAdd Shelly TRV\r\nFixes 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",
66
"minimumHEVersion": "2.3.7.114",
77
"dateReleased": "2024-02-10",
88
"licenseFile": "https://raw.githubusercontent.com/ShellyUSA/Hubitat-Drivers/master/LICENSE",

ShellyDriverLibrary/ShellyUSA.ShellyUSA_Driver_Library.groovy

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,19 +1663,27 @@ void setLastUpdated() {
16631663
//Rollers
16641664
@CompileStatic
16651665
void open() {
1666-
if(isGen1Device() == true) {
1667-
parentSendGen1CommandAsync("/roller/${getDeviceDataValue('coverId')}/?go=open")
1666+
if(hasCapabilityValve() == true) {
1667+
if(isGen1Device() == true) { parentSendGen1CommandAsync("thermostat/0/?pos=100") }
16681668
} else {
1669-
parentPostCommandSync(coverOpenCommand(getIntegerDeviceDataValue('coverId')))
1669+
if(isGen1Device() == true) {
1670+
parentSendGen1CommandAsync("/roller/${getDeviceDataValue('coverId')}/?go=open")
1671+
} else {
1672+
parentPostCommandSync(coverOpenCommand(getIntegerDeviceDataValue('coverId')))
1673+
}
16701674
}
16711675
}
16721676

16731677
@CompileStatic
16741678
void close() {
1675-
if(isGen1Device() == true) {
1676-
parentSendGen1CommandAsync("/roller/${getDeviceDataValue('coverId')}/?go=close")
1679+
if(hasCapabilityValve() == true) {
1680+
if(isGen1Device() == true) { parentSendGen1CommandAsync("thermostat/0/?pos=0")}
16771681
} else {
1678-
parentPostCommandSync(coverCloseCommand(getIntegerDeviceDataValue('coverId')))
1682+
if(isGen1Device() == true) {
1683+
parentSendGen1CommandAsync("/roller/${getDeviceDataValue('coverId')}/?go=close")
1684+
} else {
1685+
parentPostCommandSync(coverCloseCommand(getIntegerDeviceDataValue('coverId')))
1686+
}
16791687
}
16801688
}
16811689

0 commit comments

Comments
 (0)