Skip to content

Commit

Permalink
Merge pull request SmartThingsCommunity#36508 from SmartThingsCommuni…
Browse files Browse the repository at this point in the history
…ty/acceptance

Rolling up acceptance to production for deploy
  • Loading branch information
greens authored Jul 7, 2020
2 parents 392c19e + b6e1aad commit 82fe20c
Show file tree
Hide file tree
Showing 17 changed files with 491 additions and 26 deletions.
26 changes: 22 additions & 4 deletions devicetypes/drzwave/ezmultipli.src/ezmultipli.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ def setupHealthCheck() {
def installed() {
sendEvent(name: "motion", value: "inactive", displayed: false)
state.colorReceived = [red: null, green: null, blue: null]
state.setColor = [red: null, green: null, blue: null]
state.colorQueryFailures = 0
setupHealthCheck()
}

Expand Down Expand Up @@ -247,15 +249,30 @@ def zwaveEvent(switchcolorv3.SwitchColorReport cmd) {
result << createEvent(name: "color", value: hexColor)
// Send the color as hue and saturation
def hsv = rgbToHSV(*colors)
result << createEvent(name: "hue", value: hsv.hue)
result << createEvent(name: "saturation", value: hsv.saturation)
// Reset the values
RGB_NAMES.collect { state.colorReceived[it] = null}
if (state.setColor.red == state.colorReceived.red && state.setColor.green == state.colorReceived.green && state.setColor.blue == state.colorReceived.blue) {
unschedule()
result << createEvent(name: "hue", value: hsv.hue)
result << createEvent(name: "saturation", value: hsv.saturation)
state.colorQueryFailures = 0
} else {
if (++state.colorQueryFailures >= 6) {
sendHubCommand(commands([
zwave.switchColorV3.switchColorSet(red: state.setColor.red, green: state.setColor.green, blue: state.setColor.blue),
queryAllColors()
]))
} else {
runIn(2, "sendColorQueryCommands", [overwrite: true])
}
}
}

result
}

private sendColorQueryCommands() {
sendHubCommand(commands(queryAllColors()))
}

def zwaveEvent(physicalgraph.zwave.Command cmd) {
// Handles all Z-Wave commands we aren't interested in
log.debug "Unhandled $cmd"
Expand Down Expand Up @@ -324,6 +341,7 @@ def setColor(value) {
return
}

state.setColor = [red: myred, green: mygreen, blue: myblue]
cmds << zwave.switchColorV3.switchColorSet(red: myred, green: mygreen, blue: myblue)
cmds << zwave.basicV1.basicGet()

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"name": "Apparent Temperature",
"attributes": {
"feelsLike": {
"schema": {
"type": "object",
"properties": {
"value": {
"title": "TemperatureValue",
"type": "number",
"minimum": -460,
"maximum": 10000
},
"unit": {
"type": "string",
"enum": [
"F",
"C"
]
}
},
"additionalProperties": false,
"required": [
"value",
"unit"
]
}
}
},
"commands": {
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
{
"name": "Astronomical Data",
"attributes": {
"localSunrise": {
"schema": {
"type": "object",
"properties": {
"value": {
"type": "string"
}
},
"additionalProperties": false,
"required": [
"value"
]
}
},
"localSunset": {
"schema": {
"type": "object",
"properties": {
"value": {
"type": "string"
}
},
"additionalProperties": false,
"required": [
"value"
]
}
},
"sunriseDate": {
"schema": {
"type": "object",
"properties": {
"value": {
"type": "string"
}
},
"additionalProperties": false,
"required": [
"value"
]
}
},
"sunsetDate": {
"schema": {
"type": "object",
"properties": {
"value": {
"type": "string"
}
},
"additionalProperties": false,
"required": [
"value"
]
}
},
"city": {
"schema": {
"type": "object",
"properties": {
"value": {
"type": "string"
}
},
"additionalProperties": false,
"required": [
"value"
]
}
},
"timeZoneOffset": {
"schema": {
"type": "object",
"properties": {
"value": {
"type": "string"
}
},
"additionalProperties": false,
"required": [
"value"
]
}
}
},
"commands": {
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"name": "Precipitation",
"attributes": {
"percentPrecip": {
"schema": {
"type": "object",
"properties": {
"value": {
"title": "IntegerPercent",
"type": "integer",
"minimum": 0,
"maximum": 100
},
"unit": {
"type": "string",
"enum": [
"%"
],
"default": "%"
}
},
"additionalProperties": false,
"required": [
"value"
]
}
}
},
"commands": {
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"name": "Smart Weather",
"attributes": {
"lastUpdate": {
"schema": {
"type": "object",
"properties": {
"value": {
"type": "string"
}
},
"additionalProperties": false,
"required": [
"value"
]
}
}
},
"commands": {
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"name": "Ultraviolet Description",
"attributes": {
"uvDescription": {
"schema": {
"type": "object",
"properties": {
"value": {
"type": "string"
}
},
"additionalProperties": false,
"required": [
"value"
]
}
}
},
"commands": {
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"name": "Weather Alert",
"attributes": {
"alert": {
"schema": {
"type": "object",
"properties": {
"value": {
"type": "string"
}
},
"additionalProperties": false,
"required": [
"value"
]
}
},
"alertKeys": {
"schema": {
"type": "object",
"properties": {
"value": {
"type": "string"
}
},
"additionalProperties": false,
"required": [
"value"
]
}
}
},
"commands": {
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"name": "Weather Forecast",
"attributes": {
"forecastIcon": {
"schema": {
"type": "object",
"properties": {
"value": {
"type": "string"
}
},
"additionalProperties": false,
"required": [
"value"
]
}
},
"forecastToday": {
"schema": {
"type": "object",
"properties": {
"value": {
"type": "string"
}
},
"additionalProperties": false,
"required": [
"value"
]
}
},
"forecastTonight": {
"schema": {
"type": "object",
"properties": {
"value": {
"type": "string"
}
},
"additionalProperties": false,
"required": [
"value"
]
}
},
"forecastTomorrow": {
"schema": {
"type": "object",
"properties": {
"value": {
"type": "string"
}
},
"additionalProperties": false,
"required": [
"value"
]
}
}
},
"commands": {
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"name": "Weather Summary",
"attributes": {
"weather": {
"schema": {
"type": "object",
"properties": {
"value": {
"type": "string"
}
},
"additionalProperties": false,
"required": [
"value"
]
}
},
"weatherIcon": {
"schema": {
"type": "object",
"properties": {
"value": {
"type": "string"
}
},
"additionalProperties": false,
"required": [
"value"
]
}
}
},
"commands": {
}
}
Loading

0 comments on commit 82fe20c

Please sign in to comment.