diff --git a/devicetypes/smartthings/ecobee-thermostat.src/ecobee-thermostat.groovy b/devicetypes/smartthings/ecobee-thermostat.src/ecobee-thermostat.groovy index 10a1a50..f28323b 100644 --- a/devicetypes/smartthings/ecobee-thermostat.src/ecobee-thermostat.groovy +++ b/devicetypes/smartthings/ecobee-thermostat.src/ecobee-thermostat.groovy @@ -99,7 +99,7 @@ metadata { } preferences { - input "holdType", "enum", title: "Hold Type", description: "When changing temperature, use Temporary or Permanent hold (default)", required: false, options:["Temporary", "Permanent"] + input "holdType", "enum", title: "Hold Type", description: "When changing temperature, use Temporary (Until next transition) or Permanent hold (default)", required: false, options:["Temporary", "Permanent"] } } diff --git a/devicetypes/smartthings/zigbee-lock.src/zigbee-lock.groovy b/devicetypes/smartthings/zigbee-lock.src/zigbee-lock.groovy index 6c8557c..11d3eec 100644 --- a/devicetypes/smartthings/zigbee-lock.src/zigbee-lock.groovy +++ b/devicetypes/smartthings/zigbee-lock.src/zigbee-lock.groovy @@ -136,15 +136,15 @@ def parse(String description) { // Lock capability commands def lock() { - def cmds = zigbee.zigbeeCommand("${CLUSTER_DOORLOCK}", "${DOORLOCK_CMD_LOCK_DOOR}", "{}") - log.info "lock() -- cmds: $cmds" + //def cmds = zigbee.zigbeeCommand("${CLUSTER_DOORLOCK}", "${DOORLOCK_CMD_LOCK_DOOR}", "{}") + //log.info "lock() -- cmds: $cmds" //return cmds "st cmd 0x${device.deviceNetworkId} 0x${device.endpointId} ${CLUSTER_DOORLOCK} ${DOORLOCK_CMD_LOCK_DOOR} {}" } def unlock() { - def cmds = zigbee.zigbeeCommand("${CLUSTER_DOORLOCK}", "${DOORLOCK_CMD_UNLOCK_DOOR}", "{}") - log.info "unlock() -- cmds: $cmds" + //def cmds = zigbee.zigbeeCommand("${CLUSTER_DOORLOCK}", "${DOORLOCK_CMD_UNLOCK_DOOR}", "{}") + //log.info "unlock() -- cmds: $cmds" //return cmds "st cmd 0x${device.deviceNetworkId} 0x${device.endpointId} ${CLUSTER_DOORLOCK} ${DOORLOCK_CMD_UNLOCK_DOOR} {}" } diff --git a/smartapps/smartthings/bose-soundtouch-control.src/bose-soundtouch-control.groovy b/smartapps/smartthings/bose-soundtouch-control.src/bose-soundtouch-control.groovy index 347eb7a..442200b 100644 --- a/smartapps/smartthings/bose-soundtouch-control.src/bose-soundtouch-control.groovy +++ b/smartapps/smartthings/bose-soundtouch-control.src/bose-soundtouch-control.groovy @@ -22,9 +22,9 @@ definition( author: "SmartThings & Joe Geiger", description: "Control your Bose® SoundTouch® when certain actions take place in your home.", category: "SmartThings Labs", - iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png", - iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience%402x.png", - iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience%402x.png" + iconUrl: "https://d3azp77rte0gip.cloudfront.net/smartapps/fcf1d93a-ba0b-4324-b96f-e5b5487dfaf5/images/BoseST_icon.png", + iconX2Url: "https://d3azp77rte0gip.cloudfront.net/smartapps/fcf1d93a-ba0b-4324-b96f-e5b5487dfaf5/images/BoseST_icon@2x.png", + iconX3Url: "https://d3azp77rte0gip.cloudfront.net/smartapps/fcf1d93a-ba0b-4324-b96f-e5b5487dfaf5/images/BoseST_icon@2x-1.png" ) preferences { diff --git a/smartapps/smartthings/bose-soundtouch-control.src/images/BoseST_icon.png b/smartapps/smartthings/bose-soundtouch-control.src/images/BoseST_icon.png new file mode 100644 index 0000000..d22798f Binary files /dev/null and b/smartapps/smartthings/bose-soundtouch-control.src/images/BoseST_icon.png differ diff --git a/smartapps/smartthings/bose-soundtouch-control.src/images/BoseST_icon@2x-1.png b/smartapps/smartthings/bose-soundtouch-control.src/images/BoseST_icon@2x-1.png new file mode 100644 index 0000000..813eafa Binary files /dev/null and b/smartapps/smartthings/bose-soundtouch-control.src/images/BoseST_icon@2x-1.png differ diff --git a/smartapps/smartthings/bose-soundtouch-control.src/images/BoseST_icon@2x.png b/smartapps/smartthings/bose-soundtouch-control.src/images/BoseST_icon@2x.png new file mode 100644 index 0000000..e360344 Binary files /dev/null and b/smartapps/smartthings/bose-soundtouch-control.src/images/BoseST_icon@2x.png differ diff --git a/smartapps/smartthings/ecobee-connect.src/ecobee-connect.groovy b/smartapps/smartthings/ecobee-connect.src/ecobee-connect.groovy index 7f9ea37..474a4f2 100644 --- a/smartapps/smartthings/ecobee-connect.src/ecobee-connect.groovy +++ b/smartapps/smartthings/ecobee-connect.src/ecobee-connect.groovy @@ -1,4 +1,15 @@ /** + * Copyright 2015 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: + * + * 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. + * * Ecobee Service Manager * * Author: scott diff --git a/smartapps/smartthings/speaker-notify-with-sound.src/speaker-notify-with-sound.groovy b/smartapps/smartthings/speaker-notify-with-sound.src/speaker-notify-with-sound.groovy index b9511c6..30a6521 100644 --- a/smartapps/smartthings/speaker-notify-with-sound.src/speaker-notify-with-sound.groovy +++ b/smartapps/smartthings/speaker-notify-with-sound.src/speaker-notify-with-sound.groovy @@ -75,8 +75,8 @@ def mainPage() { ifUnset "timeOfDay", "time", title: "At a Scheduled Time", required: false } section{ - input "actionType", "enum", title: "Action?", required: true, defaultValue: "Custom Message", options: [ - "Custom Message", + input "actionType", "enum", title: "Action?", required: true, defaultValue: "Bell 1", options: [ + //"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 @@ -409,12 +409,13 @@ private loadText() { state.sound = [uri: "http://s3.amazonaws.com/smartapp-media/sonos/lightsaber.mp3", duration: "10"] break; default: - if (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") - } + }*/ + state.sound = [uri: "http://s3.amazonaws.com/smartapp-media/sonos/bell1.mp3", duration: "10"] break; } }