Merge pull request #632 from SmartThingsCommunity/staging

Rolling up changes to production from staging 2016-03-17 Release
Merge pull request #633 from tslagle13/tts-fixes
2026-05-08 22:06:57 +01:00 · 2016-03-18 10:43:22 -07:00 · 2016-03-14 11:08:45 -07:00 · 2016-03-13 17:04:15 -07:00 · 2016-03-10 18:35:42 -08:00 · 2016-03-10 18:11:54 -08:00
3 changed files with 106 additions and 104 deletions
@@ -9,7 +9,6 @@ metadata {
 	definition (name: "Hue Lux Bulb", namespace: "smartthings", author: "SmartThings") {
 		capability "Switch Level"
 		capability "Actuator"
-		capability "Color Temperature"
 		capability "Switch"
 		capability "Refresh"
 		capability "Sensor"
@@ -53,7 +52,7 @@ metadata {
        }

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

@@ -32,14 +32,15 @@ metadata {
 				attributeState("default", label:'${currentValue}', unit:"dF")
 			}
 			tileAttribute("device.temperature", key: "VALUE_CONTROL") {
-				attributeState("default", action: "setTemperature")
+				attributeState("VALUE_UP", action: "tempUp")
+				attributeState("VALUE_DOWN", action: "tempDown")
 			}
 			tileAttribute("device.humidity", key: "SECONDARY_CONTROL") {
 				attributeState("default", label:'${currentValue}%', unit:"%")
 			}
 			tileAttribute("device.thermostatOperatingState", key: "OPERATING_STATE") {
 				attributeState("idle", backgroundColor:"#44b621")
-				attributeState("heating", backgroundColor:"#ffa81e")
+				attributeState("heating", backgroundColor:"#ea5462")
 				attributeState("cooling", backgroundColor:"#269bd2")
 			}
 			tileAttribute("device.thermostatMode", key: "THERMOSTAT_MODE") {
@@ -76,7 +76,7 @@ def mainPage() {
 		}
 		section{
 			input "actionType", "enum", title: "Action?", required: true, defaultValue: "Bell 1", options: [
-				//"Custom Message",
+				"Custom Message",
 				"Bell 1",
 				"Bell 2",
 				"Dogs Barking",
@@ -89,7 +89,7 @@ def mainPage() {
 				"Someone is arriving",
 				"Piano",
 				"Lightsaber"]
-			//input "message","text",title:"Play this message", required:false, multiple: false
+			input "message","text",title:"Play this message", required:false, multiple: false
 		}
 		section {
 			input "sonos", "capability.musicPlayer", title: "On this Speaker player", required: true
@@ -408,13 +408,15 @@ private loadText() {
 		case "Lightsaber":
 			state.sound = [uri: "http://s3.amazonaws.com/smartapp-media/sonos/lightsaber.mp3", duration: "10"]
 			break;
-		default:
-			/*if (message) {
+		case "Custom Message":
+			if (message) {
 				state.sound = textToSpeech(message instanceof List ? message[0] : message) // not sure why this is (sometimes) needed)
 			}
 			else {
 				state.sound = textToSpeech("You selected the custom message option but did not enter a message in the $app.label Smart App")
-			}*/
+			}
+			break;
+		default:
 			state.sound = [uri: "http://s3.amazonaws.com/smartapp-media/sonos/bell1.mp3", duration: "10"]
 			break;
 	}
Author	SHA1	Message	Date
Vinay Rao	024a6cb698	Merge pull request #632 from SmartThingsCommunity/staging Rolling up changes to production from staging 2016-03-17 Release	2016-03-18 10:43:22 -07:00
tslagle13	410e9f40cc	Merge pull request #633 from tslagle13/tts-fixes Fix text-to-speech feature	2016-03-14 11:08:45 -07:00
tslagle13	1578c48440	Fix text-to-speech feature Refactor case statement so custom message works. Remove comment from input selection.	2016-03-13 17:04:15 -07:00
Vinay Rao	7526d2b445	Merge pull request #628 from SmartThingsCommunity/master Rolling up master to staging	2016-03-10 18:35:42 -08:00
Vinay Rao	caf761c015	Merging changes from staging to master	2016-03-10 18:11:54 -08:00
Vinay Rao	62a965d90b	Merge pull request #599 from SmartThingsCommunity/staging Rolling up changes to production from staging 2016-03-10 Release	2016-03-10 16:26:26 -08:00
Vinay Rao	fb9f1dee47	Merge pull request #626 from munds/hue-hotfix Hue hotfix for color temperature and overall stability	2016-03-10 15:04:01 -08:00
Amol Mundayoor	3a433d3865	Hue hotfix for color temperature and overall stability	2016-03-10 14:21:49 -08:00
Matt Pennig	c15a09a077	Merge pull request #606 from SmartThingsCommunity/update-simulated-thermostat Update simulated thermostat with new functionality and brand colors	2016-03-09 18:33:25 -06:00
Amol Mundayoor	2e4036d694	Merge pull request #610 from SmartThingsCommunity/MSA-941-1 MSA-941: Remove color temperature from Hue Lux.	2016-03-09 16:31:26 -08:00
Matt Pennig	20e112f4f8	Update sim. thermostat with new functionality and brand colors	2016-03-08 11:20:57 -06:00
Vinay Rao	8f25ff4434	Merge pull request #570 from SmartThingsCommunity/master Rolling up changes to staging from master	2016-03-01 12:01:26 -08:00
Vinay Rao	515b268374	Merge pull request #549 from SmartThingsCommunity/staging Rolling up changes to production from staging 2016-02-25 Release	2016-02-26 10:51:42 -08:00
Vinay Rao	9b87d39fe8	Merge pull request #546 from SmartThingsCommunity/master Rolling up changes from master to staging	2016-02-23 10:50:20 -08:00
Vinay Rao	a103d437c2	Merge pull request #523 from SmartThingsCommunity/staging Deploy to production 2/18	2016-02-18 09:28:02 -08:00
Vinay Rao	bdd88deb99	Merge pull request #504 from SmartThingsCommunity/staging Merging changes from staging to production	2016-02-11 22:40:38 -08:00