X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=official%2Fgentle-wake-up.groovy;h=d4d0c7209d9c697127a8efcf1ff11283df318f15;hb=b18e71eb126d94bcf4a6c2b4651e1c4c29f58c84;hp=8454ae9e9e78f0255a3e5d59a6c439df888de82f;hpb=a7eda979a37f4af864c6bac48a651b87e6f3e00c;p=smartapps.git

diff --git a/official/gentle-wake-up.groovy b/official/gentle-wake-up.groovy
index 8454ae9..d4d0c72 100755
--- a/official/gentle-wake-up.groovy
+++ b/official/gentle-wake-up.groovy
@@ -35,11 +35,11 @@ definition(
 
 preferences {
 	page(name: "rootPage")
+	page(name: "numbersPage")
 	page(name: "schedulingPage")
 	page(name: "completionPage")
-	page(name: "numbersPage")
 	page(name: "controllerExplanationPage")
-	page(name: "unsupportedDevicesPage")
+	//page(name: "unsupportedDevicesPage")
 }
 
 def rootPage() {
@@ -51,7 +51,7 @@ def rootPage() {
 				/*if (dimmersContainUnsupportedDevices()) {
 					href(name: "toUnsupportedDevicesPage", page: "unsupportedDevicesPage", title: "Some of your selected dimmers don't seem to be supported", description: "Tap here to fix it", required: true)
 				}*/
-				href(name: "toNumbersPage", page: "numbersPage", title: "Duration & Direction", description: numbersPageHrefDescription(), state: "complete")
+				href(name: "toNumbersPage", page: "numbersPage", title: "Duration & Direction", state: "complete")
 			}
 		}
 
@@ -62,9 +62,9 @@ def rootPage() {
 			}
 
 			section("Rules For Dimming") {
-				href(name: "toSchedulingPage", page: "schedulingPage", title: "Automation", description: schedulingHrefDescription() ?: "Set rules for when to start", state: schedulingHrefDescription() ? "complete" : "")
+				href(name: "toSchedulingPage", page: "schedulingPage", title: "Automation")
 				input(name: "manualOverride", type: "enum", options: ["Cancel dimming","Jump to the end"], title: "When one of the dimmers is manually turned off…", description: "dimming will continue", required: false, multiple: false)
-				href(name: "toCompletionPage", title: "Completion Actions", page: "completionPage", state: completionHrefDescription() ? "complete" : "", description: completionHrefDescription() ?: "Set rules for what to do when dimming completes")
+				href(name: "toCompletionPage", title: "Completion Actions", page: "completionPage")
 			}
 
 			section {
@@ -148,8 +148,8 @@ def numbersPage() {
 		}
 
 		section {
-			input(name: "startLevel", type: "number", range: "0..99", title: "From this level", defaultValue: defaultStart(), description: "Current Level", required: false, multiple: false)
-			input(name: "endLevel", type: "number", range: "0..99", title: "To this level", defaultValue: defaultEnd(), description: "Between 0 and 99", required: true, multiple: false)
+			input(name: "startLevel", type: "number", range: "0..99", title: "From this level", description: "Current Level", required: false, multiple: false)
+			input(name: "endLevel", type: "number", range: "0..99", title: "To this level", , description: "Between 0 and 99", required: true, multiple: false)
 		}
 
 		def colorDimmers = dimmersWithSetColorCommand()
@@ -295,13 +295,13 @@ private initialize() {
 		subscribe(dimmers, "switch.off", stopDimmersHandler)
 	}
 
-	if (!getAllChildDevices()) {
+	/*if (!getAllChildDevices()) {
 		// create controller device and set name to the label used here
 		def dni = "${new Date().getTime()}"
 		log.debug "app.label: ${app.label}"
 		addChildDevice("smartthings", "Gentle Wake Up Controller", dni, null, ["label": app.label])
 		state.controllerDni = dni
-	}
+	}*/
 }
 
 def appHandler(evt) {
@@ -564,17 +564,14 @@ def updateDimmers(percentComplete) {
 
 			def shouldChangeColors = (colorize && colorize != "false")
 
-			if (shouldChangeColors && hasSetColorCommand(dimmer)) {
+			if (shouldChangeColors/*&& hasSetColorCommand(dimmer)*/) {
 				def hue = getHue(dimmer, nextLevel)
 				log.debug "Setting ${deviceLabel(dimmer)} level to ${nextLevel} and hue to ${hue}"
 				dimmer.setColor([hue: hue, saturation: 100, level: nextLevel])
-			} else if (hasSetLevelCommand(dimmer)) {
+			} else {
 				log.debug "Setting ${deviceLabel(dimmer)} level to ${nextLevel}"
 				dimmer.setLevel(nextLevel)
-			} else {
-				log.warn "${deviceLabel(dimmer)} does not have setColor or setLevel commands."
 			}
-
 		}
 	}
 
@@ -872,9 +869,9 @@ private hasCommand(device, String command) {
 private dimmersWithSetColorCommand() {
 	def colorDimmers = []
 	dimmers.each { dimmer ->
-		if (hasSetColorCommand(dimmer)) {
+		//if (hasSetColorCommand(dimmer)) {
 			colorDimmers << dimmer
-		}
+		//}
 	}
 	return colorDimmers
 }