mtan93/SmartThingsPublic
1
0
Fork 0
mirror of https://github.com/mtan93/SmartThingsPublic.git synced 2026-03-08 05:31:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
bflorian
2015-11-04 09:41:38 -08:00
parent 0171644a77 d830c1fae0
commit 702f0f87d0
4 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
devicetypes/smartthings/aeon-rgbw-bulb.src/aeon-rgbw-bulb.groovy → devicetypes/smartthings/aeon-led-bulb.src/aeon-led-bulb.groovy
View File

2
devicetypes/smartthings/testing/simulated-color-control.src/simulated-color-control.groovy
View File

@@ -1,5 +1,5 @@
metadata { metadata {
definition (name: "Color Control Capability", namespace: "capabilities", author: "SmartThings") { definition (name: "Simulated Color Control", namespace: "smartthings/testing", author: "SmartThings") {
capability "Color Control" capability "Color Control"
} }

3
devicetypes/smartthings/zigbee-lock.src/zigbee-lock.groovy
View File

@@ -139,8 +139,7 @@ private Map parseReportAttributeMessage(String description) {
Map resultMap = [:] Map resultMap = [:]
if (descMap.clusterInt == CLUSTER_POWER && descMap.attrInt == POWER_ATTR_BATTERY_PERCENTAGE_REMAINING) { if (descMap.clusterInt == CLUSTER_POWER && descMap.attrInt == POWER_ATTR_BATTERY_PERCENTAGE_REMAINING) {
resultMap.name = "battery" resultMap.name = "battery"
// BatteryPercentageRemaining is specified in .5% increments resultMap.value = Math.round(Integer.parseInt(descMap.value, 16) / 2)
resultMap.value = Integer.parseInt(descMap.value, 16) / 2
log.info "parseReportAttributeMessage() --- battery: ${resultMap.value}" log.info "parseReportAttributeMessage() --- battery: ${resultMap.value}"
} }
else if (descMap.clusterInt == CLUSTER_DOORLOCK && descMap.attrInt == DOORLOCK_ATTR_LOCKSTATE) { else if (descMap.clusterInt == CLUSTER_DOORLOCK && descMap.attrInt == DOORLOCK_ATTR_LOCKSTATE) {

0
devicetypes/smartthings/zwave-device-mc.src/zwave-device-mc.groovy → devicetypes/smartthings/zwave-device-multichannel.src/zwave-device-multichannel.groovy
View File