X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartapps.git;a=blobdiff_plain;f=official%2Fspeaker-weather-forecast.groovy;h=256b58fc4bd5be3777cd272484e47d9e3910261a;hp=bb3bc4192623a92a7a797d054de5f4fadedaebbe;hb=78b9eb4587b5803b0c53c473d7051b08bbda9937;hpb=3325c1b0cc49b9fbbc497cb3612f7aeff5263eca

diff --git a/official/speaker-weather-forecast.groovy b/official/speaker-weather-forecast.groovy
index bb3bc41..256b58f 100755
--- a/official/speaker-weather-forecast.groovy
+++ b/official/speaker-weather-forecast.groovy
@@ -36,6 +36,20 @@ preferences {
 	}
 }
 
+// input "motion", "capability.motionSensor", title: "Motion Here", required: false, multiple: true
+// input "contact", "capability.contactSensor", title: "Contact Opens", required: false, multiple: true
+// input "contactClosed", "capability.contactSensor", title: "Contact Closes", required: false, multiple: true
+// input "acceleration", "capability.accelerationSensor", title: "Acceleration Detected", required: false, multiple: true
+// input "mySwitch", "capability.switch", title: "Switch Turned On", required: false, multiple: true
+// input "mySwitchOff", "capability.switch", title: "Switch Turned Off", required: false, multiple: true
+// input "arrivalPresence", "capability.presenceSensor", title: "Arrival Of", required: false, multiple: true
+// input "departurePresence", "capability.presenceSensor", title: "Departure Of", required: false, multiple: true
+// input "smoke", "capability.smokeDetector", title: "Smoke Detected", required: false, multiple: true
+// input "water", "capability.waterSensor", title: "Water Sensor Wet", required: false, multiple: true
+// input "button1", "capability.button", title: "Button Press", required:false, multiple:true //remove from production
+// input "triggerModes", "mode", title: "System Changes Mode", required: false, multiple: true
+// input "timeOfDay", "time", title: "At a Scheduled Time", required: false
+
 def mainPage() {
 	dynamicPage(name: "mainPage") {
 		def anythingSet = anythingSet()
@@ -56,7 +70,7 @@ def mainPage() {
 				ifSet "timeOfDay", "time", title: "At a Scheduled Time", required: false
 			}
 		}
-		def hideable = anythingSet || app.installationState == "COMPLETE"
+		def hideable = anythingSet //|| app.installationState == "COMPLETE"
 		def sectionTitle = anythingSet ? "Select additional triggers" : "Play weather report when..."
 
 		section(sectionTitle, hideable: hideable, hidden: true){
@@ -89,17 +103,17 @@ def mainPage() {
 		}
 		section("More options", hideable: true, hidden: true) {
 			input "resumePlaying", "bool", title: "Resume currently playing music after weather report finishes", required: false, defaultValue: true
-			href "chooseTrack", title: "Or play this music or radio station", description: song ? state.selectedSong?.station : "Tap to set", state: song ? "complete" : "incomplete"
+			//href "chooseTrack", title: "Or play this music or radio station", description: song ? state.selectedSong?.station : "Tap to set", state: song ? "complete" : "incomplete"
 
 			input "zipCode", "text", title: "Zip Code", required: false
 			input "volume", "number", title: "Temporarily change volume", description: "0-100%", required: false
 			input "frequency", "decimal", title: "Minimum time between actions (defaults to every event)", description: "Minutes", required: false
-			href "timeIntervalInput", title: "Only during a certain time", description: timeLabel ?: "Tap to set", state: timeLabel ? "complete" : "incomplete"
+			//href "timeIntervalInput", title: "Only during a certain time", description: timeLabel ?: "Tap to set", state: timeLabel ? "complete" : "incomplete"
 			input "days", "enum", title: "Only on certain days of the week", multiple: true, required: false,
 				options: ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]
-			if (settings.modes) {
+			//if (settings.modes) {
             	input "modes", "mode", title: "Only when mode is", multiple: true, required: false
-            }
+            //}
 			input "oncePerDay", "bool", title: "Only once per day", required: false, defaultValue: false
 		}
 		section([mobileOnly:true]) {
@@ -223,16 +237,16 @@ private takeAction(evt) {
 	loadText()
 
 	if (song) {
-		sonos.playSoundAndTrack(state.sound.uri, state.sound.duration, state.selectedSong, volume)
+		//sonos.playSoundAndTrack(state.sound.uri, state.sound.duration, state.selectedSong, volume)
 	}
 	else if (resumePlaying){
-		sonos.playTrackAndResume(state.sound.uri, state.sound.duration, volume)
+		//sonos.playTrackAndResume(state.sound.uri, state.sound.duration, volume)
 	}
 	else if (volume) {
-		sonos.playTrackAtVolume(state.sound.uri, volume)
+		//sonos.playTrackAtVolume(state.sound.uri, volume)
 	}
 	else {
-		sonos.playTrack(state.sound.uri)
+		//sonos.playTrack(state.sound.uri)
 	}
 
 	if (frequency || oncePerDay) {