Skip to content

Support for non-dimmable lights in dimmable groups #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bloodtick wants to merge 4 commits into
base: TrendSetter
Choose a base branch
from
Open

Support for non-dimmable lights in dimmable groups #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c33d038
Support for non-dimmable lights in dimmable groups
bloodtick Mar 22, 2019
0fb6d2c
Added delay
bloodtick Apr 20, 2019
7093a00
Updated to readable states
bloodtick May 25, 2019
494f132
setLevel Modification
bloodtick Nov 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...tter/color-temperature-light-group-device.src/color-temperature-light-group-device.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ def setLevel(val, triggerGroup) {
}

sendEvent(name: "level", value: val, isStateChange: true)
sendEvent(name: "switch.setLevel", value: val, isStateChange: true)
sendEvent(name: "switch level.setLevel", value: val, isStateChange: true)

if (triggerGroup)
parent.performGroupCommand("setLevel", [val])
Expand Down
2 changes: 1 addition & 1 deletion ...es/kriskit-trendsetter/colorful-light-group-device.src/colorful-light-group-device.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ def setLevel(val, triggerGroup) {
}

sendEvent(name: "level", value: val, isStateChange: true)
sendEvent(name: "switch.setLevel", value: val, isStateChange: true)
sendEvent(name: "switch level.setLevel", value: val, isStateChange: true)

if (triggerGroup)
parent.performGroupCommand("setLevel", [val])
Expand Down
2 changes: 1 addition & 1 deletion ...olorful-temperature-light-group-device.src/colorful-temperature-light-group-device.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ def setLevel(val, triggerGroup) {
}

sendEvent(name: "level", value: val, isStateChange: true)
sendEvent(name: "switch.setLevel", value: val, isStateChange: true)
sendEvent(name: "switch level.setLevel", value: val, isStateChange: true)

if (triggerGroup)
parent.performGroupCommand("setLevel", [val])
Expand Down
14 changes: 7 additions & 7 deletions devicetypes/kriskit-trendsetter/dimmer-group-device.src/dimmer-group-device.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ metadata {
attributeState "off", label: '${name}', action: "switch.on", icon: "st.lights.multi-light-bulb-off", backgroundColor: "#ffffff", nextState: "turningOn"
attributeState "turningOn", label: '${name}', action: "switch.off", icon: "st.lights.multi-light-bulb-on", backgroundColor: "#00a0dc", nextState: "turningOff"
attributeState "turningOff", label: '${name}', action: "switch.on", icon: "st.lights.multi-light-bulb-off", backgroundColor: "#ffffff", nextState: "turningOn"
attributeState "half", label: '${name}', action: "switch.on", icon: "st.lights.multi-light-bulb-on", backgroundColor: "#6bb3ce", nextState: "turningOn"
attributeState "mostlyOn", label: 'Onish', action: "switch.on", icon: "st.lights.multi-light-bulb-on", backgroundColor: "#2fa8d6", nextState: "turningOn"
attributeState "mostlyOff", label: 'Offish', action: "switch.off", icon: "st.lights.multi-light-bulb-off", backgroundColor: "#98c1d1", nextState: "turningOff"
attributeState "Half On", label: 'Half', action: "switch.on", icon: "st.lights.multi-light-bulb-on", backgroundColor: "#6bb3ce", nextState: "turningOn"
attributeState "Mainly On", label: 'Onish', action: "switch.on", icon: "st.lights.multi-light-bulb-on", backgroundColor: "#2fa8d6", nextState: "turningOn"
attributeState "Mostly Off", label: 'Offish', action: "switch.off", icon: "st.lights.multi-light-bulb-off", backgroundColor: "#98c1d1", nextState: "turningOff"
}

tileAttribute ("device.onPercentage", key: "SECONDARY_CONTROL") {
Expand Down Expand Up @@ -155,11 +155,11 @@ def syncSwitch(values) {
def value = null

if (percentOn == 50)
value = "half"
value = "Half On"
else if (percentOn > 0 && percentOn < 50)
value = "mostlyOff"
value = "Mostly Off"
else if (percentOn > 50 && percentOn < 100)
value = "mostlyOn"
value = "Mainly On"

sendEvent(name: "switch", value: value)
sendEvent(name: "onPercentage", value: percentOn, displayed: false)
Expand Down Expand Up @@ -187,7 +187,7 @@ def setLevel(val, triggerGroup) {
}

sendEvent(name: "level", value: val, isStateChange: true)
sendEvent(name: "switch.setLevel", value: val, isStateChange: true)
sendEvent(name: "switch level.setLevel", value: val, isStateChange: true)

if (triggerGroup)
parent.performGroupCommand("setLevel", [val])
Expand Down
26 changes: 13 additions & 13 deletions smartapps/kriskit-trendsetter/group.src/group.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ definition(
iconX3Url: "https://cdn.rawgit.com/Kriskit/SmartThings/master/icons/trendsetter/icon@3x.png")

def version() {
return "1.2.2"
return "1.2.3"
}

def typeDefinitions() {
Expand All @@ -44,7 +44,7 @@ def typeDefinitions() {
],
[
id: "switchLevel",
type: "switchLevel",
type: "switch",
singular: "Dimmer",
plural: "Dimmers",
groupDeviceType: "Dimmer Group Device",
Expand Down Expand Up @@ -230,7 +230,7 @@ def onDeviceAttributeChange(evt) {
runCommand(it, commandInfo.command, commandInfo.arguments)
}
}

pause(500)
updateControllerState()
}

Expand Down Expand Up @@ -347,43 +347,43 @@ def selectedDevicesContainsController() {
private $performCommand(target, command, args) {
switch(args?.size()) {
default:
target?."$command"()
for(it in target) if(it.hasCommand("$command")) it."$command"()
break

case 1:
target?."$command"(args[0])
for(it in target) if(it.hasCommand("$command")) it."$command"(args[0])
break

case 2:
target?."$command"(args[0], args[1])
for(it in target) if(it.hasCommand("$command")) it."$command"(args[0], args[1])
break

case 3:
target?."$command"(args[0], args[1], args[2])
for(it in target) if(it.hasCommand("$command")) it."$command"(args[0], args[1], args[2])
break

case 4:
target?."$command"(args[0], args[1], args[2], args[3])
for(it in target) if(it.hasCommand("$command")) it."$command"(args[0], args[1], args[2], args[3])
break

case 5:
target?."$command"(args[0], args[1], args[2], args[3], args[4], args[5])
for(it in target) if(it.hasCommand("$command")) it."$command"(args[0], args[1], args[2], args[3], args[4], args[5])
break

case 6:
target?."$command"(args[0], args[1], args[2], args[3], args[4], args[5], args[6])
for(it in target) if(it.hasCommand("$command")) it."$command"(args[0], args[1], args[2], args[3], args[4], args[5], args[6])
break

case 7:
target?."$command"(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7])
for(it in target) if(it.hasCommand("$command")) it."$command"(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7])
break

case 8:
target?."$command"(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8])
for(it in target) if(it.hasCommand("$command")) it."$command"(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8])
break

case 9:
target?."$command"(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9])
for(it in target) if(it.hasCommand("$command")) it."$command"(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9])
break
}
}