MSA-932: VER. TEST

Merge pull request #597 from workingmonk/bug/cree_bulb
[DVCSMP-1442] Cree bulb does not properly reflect dimming value
2026-03-11 05:11:51 +00:00 · 2016-03-08 03:23:06 -06:00 · 2016-03-07 20:17:53 -08:00 · 2016-03-07 19:13:19 -08:00 · 2016-03-07 17:27:37 -08:00 · 2016-03-07 17:27:18 -08:00
18 changed files with 104 additions and 54 deletions
--- a/devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy
+++ b/devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy
@@ -1,7 +1,7 @@
 /**
 *  Cree Bulb
 *
- *  Copyright 2014 SmartThings
+ *  Copyright 2016 SmartThings
 *
 *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 *  in compliance with the License. You may obtain a copy of the License at:
@@ -15,29 +15,29 @@
 */
 
 metadata {
-	definition (name: "Cree Bulb", namespace: "smartthings", author: "SmartThings") {
+    definition (name: "Cree Bulb", namespace: "smartthings", author: "SmartThings") {

-		capability "Actuator"
+        capability "Actuator"
        capability "Configuration"
-		capability "Refresh"
-		capability "Switch"
-		capability "Switch Level"
+        capability "Refresh"
+        capability "Switch"
+        capability "Switch Level"

-		fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,1000", outClusters: "0000,0019"
-	}
+        fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,1000", outClusters: "0000,0019"
+    }

-	// simulator metadata
-	simulator {
-		// status messages
-		status "on": "on/off: 1"
-		status "off": "on/off: 0"
+    // simulator metadata
+    simulator {
+        // status messages
+        status "on": "on/off: 1"
+        status "off": "on/off: 0"

-		// reply messages
-		reply "zcl on-off on": "on/off: 1"
-		reply "zcl on-off off": "on/off: 0"
-	}
+        // reply messages
+        reply "zcl on-off on": "on/off: 1"
+        reply "zcl on-off off": "on/off: 0"
+    }

-	// UI tile definitions
+    // UI tile definitions
    tiles(scale: 2) {
        multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
            tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
@@ -62,18 +62,12 @@ metadata {
 def parse(String description) {
    log.debug "description is $description"

-    def resultMap = zigbee.getKnownDescription(description)
+    def resultMap = zigbee.getEvent(description)
    if (resultMap) {
-        log.info resultMap
-        if (resultMap.type == "update") {
-            log.info "$device updates: ${resultMap.value}"
-        }
-        else {
-            sendEvent(name: resultMap.type, value: resultMap.value)
-        }
+        sendEvent(resultMap)
    }
    else {
-        log.warn "DID NOT PARSE MESSAGE for description : $description"
+        log.debug "DID NOT PARSE MESSAGE for description : $description"
        log.debug zigbee.parseDescriptionAsMap(description)
    }
 }
@@ -87,7 +81,7 @@ def on() {
 }

 def setLevel(value) {
-    zigbee.setLevel(value)
+    zigbee.setLevel(value) + ["delay 500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }

 def refresh() {
--- a/devicetypes/smartthings/ecobee-sensor.src/ecobee-sensor.groovy
+++ b/devicetypes/smartthings/ecobee-sensor.src/ecobee-sensor.groovy
@@ -48,8 +48,8 @@ metadata {
 		}

 		standardTile("motion", "device.motion") {
-			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0")
 			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff")
+			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0")
 		}

 		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat") {
--- a/devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy
+++ b/devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy
@@ -9,6 +9,7 @@ metadata {
 	definition (name: "Hue Lux Bulb", namespace: "smartthings", author: "SmartThings") {
 		capability "Switch Level"
 		capability "Actuator"
+		capability "Color Temperature"
 		capability "Switch"
 		capability "Refresh"
 		capability "Sensor"
@@ -47,12 +48,19 @@ metadata {
            state "level", action:"switch level.setLevel"
        }

-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2000..6500)") {
+            state "colorTemperature", action:"color temperature.setColorTemperature"
+        }
+        valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+            state "colorTemperature", label: '${currentValue} K'
+        }
+
+        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
        }

        main(["switch"])
-        details(["rich-control", "refresh"])
+        details(["rich-control", "colorTempSliderControl", "colorTemp", "refresh"])
    }
 }

@@ -90,6 +98,14 @@ void setLevel(percent) {
 	sendEvent(name: "level", value: percent)
 }

+void setColorTemperature(value) {
+	if (value) {
+        log.trace "setColorTemperature: ${value}k"
+        parent.setColorTemperature(this, value)
+        sendEvent(name: "colorTemperature", value: value)
+	}
+}
+
 void refresh() {
 	log.debug "Executing 'refresh'"
 	parent.manualRefresh()
--- a/devicetypes/smartthings/smartsense-motion-temp-sensor.src/smartsense-motion-temp-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-motion-temp-sensor.src/smartsense-motion-temp-sensor.groovy
@@ -14,6 +14,8 @@
 *
 */

+//DEPRECATED - Using the smartsense-motion-sensor.groovy DTH for this device. Users need to be moved before deleting this DTH
+
 metadata {
 	definition (name: "SmartSense Motion/Temp Sensor", namespace: "smartthings", author: "SmartThings") {
 		capability "Motion Sensor"
@@ -25,10 +27,6 @@ metadata {
        
        command "enrollResponse"

-		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3305-S"
-        fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3305"
-        fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3325"
-        fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3326"
 	}

 	simulator {
@@ -233,7 +231,7 @@ private Map getBatteryResult(rawValue) {
 	def volts = rawValue / 10
 	def descriptionText

-	if (rawValue == 0) {}
+    if (rawValue == 0 || rawValue == 255) {}
 	else {
 		if (volts > 3.5) {
 			result.descriptionText = "${linkText} battery has too much power (${volts} volts)."
--- a/devicetypes/smartthings/smartsense-open-closed-accelerometer-sensor.src/smartsense-open-closed-accelerometer-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-open-closed-accelerometer-sensor.src/smartsense-open-closed-accelerometer-sensor.groovy
@@ -13,6 +13,7 @@
 *  for the specific language governing permissions and limitations under the License.
 *
 */
+//DEPRECATED - Using the smartsense-multi-sensor.groovy DTH for this device. Users need to be moved before deleting this DTH

 metadata {
 	definition (name: "SmartSense Open/Closed Accelerometer Sensor", namespace: "smartthings", author: "SmartThings") {
@@ -23,8 +24,7 @@
 		capability "Refresh"
 		capability "Temperature Measurement"
 		command "enrollResponse"
- 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05,FC02", outClusters: "0019", manufacturer: "CentraLite", model: "3320"
-		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05,FC02", outClusters: "0019", manufacturer: "CentraLite", model: "3321"
+
 	}

 	simulator {
@@ -225,7 +225,8 @@ def getTemperature(value) {

 		def volts = rawValue / 10
 		def descriptionText
-		if (volts > 3.5) {
+        if (rawValue == 0 || rawValue == 255) {}
+		else if (volts > 3.5) {
 			result.descriptionText = "${linkText} battery has too much power (${volts} volts)."
 		}
 		else {
--- a/devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy
@@ -220,7 +220,8 @@ private Map getBatteryResult(rawValue) {
    
 	def volts = rawValue / 10
 	def descriptionText
-	if (volts > 3.5) {
+    if (rawValue == 0 || rawValue == 255) {}
+    else if (volts > 3.5) {
 		result.descriptionText = "${linkText} battery has too much power (${volts} volts)."
 	}
 	else {
--- a/devicetypes/smartthings/smartsense-temp-humidity-sensor.src/smartsense-temp-humidity-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-temp-humidity-sensor.src/smartsense-temp-humidity-sensor.groovy
@@ -196,7 +196,8 @@ private Map getBatteryResult(rawValue) {

 	def volts = rawValue / 10
 	def descriptionText
-	if (volts > 3.5) {
+    if (rawValue == 0 || rawValue == 255) {}
+    else if (volts > 3.5) {
 		result.descriptionText = "${linkText} battery has too much power (${volts} volts)."
 	}
 	else {
--- a/devicetypes/smartthings/zigbee-dimmer-power.src/zigbee-dimmer-power.groovy
+++ b/devicetypes/smartthings/zigbee-dimmer-power.src/zigbee-dimmer-power.groovy
@@ -44,7 +44,7 @@ metadata {
                attributeState "power", label:'${currentValue} W'
            }
        }
-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
        }
        main "switch"
--- a/devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy
+++ b/devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy
@@ -39,7 +39,7 @@ metadata {
                attributeState "level", action:"switch level.setLevel"
            }
        }
-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
        }
        main "switch"
--- a/devicetypes/smartthings/zigbee-hue-bulb.src/zigbee-hue-bulb.groovy
+++ b/devicetypes/smartthings/zigbee-hue-bulb.src/zigbee-hue-bulb.groovy
@@ -63,7 +63,7 @@ metadata {
 			state "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 			state "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
 		}
-		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
+		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat") {
 			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
 		controlTile("rgbSelector", "device.color", "color", height: 3, width: 3, inactiveLabel: false) {
--- a/devicetypes/smartthings/zigbee-lock.src/zigbee-lock.groovy
+++ b/devicetypes/smartthings/zigbee-lock.src/zigbee-lock.groovy
@@ -52,7 +52,7 @@
 		valueTile("battery", "device.battery", inactiveLabel:false, decoration:"flat", width:2, height:2) {
 			state "battery", label:'${currentValue}% battery', unit:""
 		}
-		standardTile("refresh", "device.lock", inactiveLabel:false, decoration:"flat", width:2, height:2) {
+		standardTile("refresh", "device.refresh", inactiveLabel:false, decoration:"flat", width:2, height:2) {
 			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
 		}

--- a/devicetypes/smartthings/zigbee-rgbw-bulb.src/zigbee-rgbw-bulb.groovy
+++ b/devicetypes/smartthings/zigbee-rgbw-bulb.src/zigbee-rgbw-bulb.groovy
@@ -57,7 +57,7 @@ metadata {
        valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
            state "colorTemperature", label: '${currentValue} K'
        }
-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
        }

--- a/devicetypes/smartthings/zigbee-switch-power.src/zigbee-switch-power.groovy
+++ b/devicetypes/smartthings/zigbee-switch-power.src/zigbee-switch-power.groovy
@@ -40,7 +40,7 @@ metadata {
                attributeState "power", label:'${currentValue} W'
            }
        }
-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
        }
        main "switch"
--- a/devicetypes/smartthings/zigbee-switch.src/zigbee-switch.groovy
+++ b/devicetypes/smartthings/zigbee-switch.src/zigbee-switch.groovy
@@ -42,7 +42,7 @@ metadata {
                attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn"
            }
        }
-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
        }
        main "switch"
--- a/devicetypes/smartthings/zigbee-white-color-temperature-bulb.src/zigbee-white-color-temperature-bulb.groovy
+++ b/devicetypes/smartthings/zigbee-white-color-temperature-bulb.src/zigbee-white-color-temperature-bulb.groovy
@@ -54,7 +54,7 @@ metadata {
            }
        }

-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
        }

--- a/devicetypes/test1/test.src/test.groovy
+++ b/devicetypes/test1/test.src/test.groovy
@@ -0,0 +1,35 @@
+/**
+ *  TEST
+ *
+ *  Copyright 2016 김지섭
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ */
+metadata {
+	definition (name: "TEST", namespace: "TEST1", author: "김지섭") {
+		capability "Temperature Measurement"
+	}
+
+	simulator {
+		// TODO: define status and reply messages here
+	}
+
+	tiles {
+		// TODO: define your main and details tiles here
+	}
+}
+
+// parse events into attributes
+def parse(String description) {
+	log.debug "Parsing '${description}'"
+	// TODO: handle 'temperature' attribute
+
+}
--- a/smartapps/smartthings/ecobee-connect.src/ecobee-connect.groovy
+++ b/smartapps/smartthings/ecobee-connect.src/ecobee-connect.groovy
@@ -545,10 +545,15 @@ def updateSensorData() {
 				def occupancy = ""
 				it.capability.each {
 					if (it.type == "temperature") {
-						if (location.temperatureScale == "F") {
-							temperature = Math.round(it.value.toDouble() / 10)
+						if (it.value == "unknown") {
+							temperature = "--"
 						} else {
-							temperature = convertFtoC(it.value.toDouble() / 10)
+							if (location.temperatureScale == "F") {
+								temperature = Math.round(it.value.toDouble() / 10)
+							} else {
+								temperature = convertFtoC(it.value.toDouble() / 10)
+							}
+
 						}

 					} else if (it.type == "occupancy") {
--- a/smartapps/smartthings/virtual-thermostat.src/virtual-thermostat.groovy
+++ b/smartapps/smartthings/virtual-thermostat.src/virtual-thermostat.groovy
@@ -139,5 +139,4 @@ private hasBeenRecentMotion()
 		isActive = true
 	}
 	isActive
-}
-
+}
Author	SHA1	Message	Date
김지섭	5769e72c3d	MSA-932: VER. TEST	2016-03-08 03:23:06 -06:00
Vinay Rao	e83d08cf2f	Merge pull request #597 from workingmonk/bug/cree_bulb [DVCSMP-1442] Cree bulb does not properly reflect dimming value	2016-03-07 20:17:53 -08:00
Vinay Rao	55905a10da	issue with CREE Bulb not reporting back state updating copyright and spacing	2016-03-07 19:13:19 -08:00
Juan Pablo Risso	546ee007f1	Merge pull request #561 from juano2310/hue-PROB-528 PROB-528 - Commented singleInstance: true	2016-03-07 17:27:37 -08:00
Juan Pablo Risso	21ae20302c	Merge pull request #584 from juano2310/Hue_ColorTemp DVCSMP-1565 & DVCSMP-1548	2016-03-07 17:27:18 -08:00
juano2310	9880ced851	Fix wrong DT for Hue bulb	2016-03-07 17:05:06 -08:00
juano2310	fb99a81704	fixed rich-control	2016-03-04 17:15:49 -05:00
juano2310	6bda59c340	DVCSMP-1565 & DVCSMP-1548 DVCSMP-1565 Color for light is not adjusted. DVCSMP-1548 Color temperature	2016-03-04 17:08:24 -05:00
Vinay Rao	c1422438ac	Merge pull request #576 from workingmonk/bug/refresh_tile fix device.refresh for refresh tiles	2016-03-03 14:18:13 -08:00
Yaima	8ed23f4c7e	Merge pull request #577 from Yaima/master Including unknown temperature values as part of the response for sensors	2016-03-02 14:24:04 -08:00
Yaima Valdivia	e7e6ea7d56	Including unknown temperature values as part of the response for sensors https://smartthings.atlassian.net/browse/DVCSMP-1511	2016-03-02 14:20:44 -08:00
Vinay Rao	12896f4095	device.refresh change for tile	2016-03-01 19:51:27 -08:00
Vinay Rao	ab4e8a892a	Merge pull request #572 from workingmonk/bug/battery_values [DVCSMP-1255] Fixing issue with weird battery values	2016-03-01 17:01:27 -08:00
Vinay Rao	e076818573	Merge pull request #573 from workingmonk/deprecate_DTH [DVCSMP-1463] Deprecating copied DTH	2016-03-01 16:57:50 -08:00
Vinay Rao	cd8bbca5ee	removing the fingerprints from the additional copy of DTH	2016-03-01 12:46:16 -08:00
Vinay Rao	2d060bddfc	fixing issue with weird battery values	2016-03-01 12:17:50 -08:00
Juan Pablo Risso	600a9a2ca1	PROB-528 - Commented singleInstance: true This will allow any one with more than one Hue Bridge to install an instance for each Bridge.	2016-02-26 14:45:12 -05:00