MSA-948: 테스트용으로작성한것 취소요청

build.gradle

@@ -52,9 +52,6 @@ hipchatShareFile {
 hipchatSendNotification {
     String branch = project.hasProperty('branch') ? project.property('branch') : 'unknown'
     message = "Began executable deploy of SmartThingsPublic(${branch})."
-    if (branch == 'master') {
-      message += ' (dev shards)'
-    }
     color = branch == 'master' ? 'yellow' : 'red'
     notify = true
 }

devicetypes/smartthings/aeon-led-bulb.src/aeon-led-bulb.groovy

@@ -251,4 +251,4 @@ def huesatToRGB(float hue, float sat) {
 		case 4: return [t, p, 255]
 		case 5: return [255, p, q]
 	}
-}
+}

devicetypes/smartthings/arrival-sensor-ha.src/arrival-sensor-ha.groovy

@@ -11,17 +11,6 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
- 
- /*
- *  Purpose: Arrival Sensor HA DTH File
- *
- *  Filename: Arrival-Sensor-HA.src/Arrival-Sensor-HA.groovy
- *
- *  Change History:
- *  1. 20160115 TW - Update/Edit to support i18n translations
- *  2. 20160121 TW - Update to V4 battery calcs, added pref's page title translations
- */
- 
 metadata {
     definition (name: "Arrival Sensor HA", namespace: "smartthings", author: "SmartThings") {
         capability "Tone"
@@ -43,7 +32,7 @@ metadata {
                 ])
         }
         section {
-            input "checkInterval", "enum", title: "Presence timeout (minutes)", description: "Tap to set",
+            input "checkInterval", "enum", title: "Presence timeout (minutes)",
                     defaultValue:"2", options: ["2", "3", "5"], displayDuringSetup: false
         }
     }
@@ -93,6 +82,7 @@ def parse(String description) {
 
 private handleReportAttributeMessage(String description) {
     def descMap = zigbee.parseDescriptionAsMap(description)
+
     if (descMap.clusterInt == 0x0001 && descMap.attrInt == 0x0020) {
         handleBatteryEvent(Integer.parseInt(descMap.value, 16))
     }
@@ -104,7 +94,6 @@ private handleReportAttributeMessage(String description) {
  * @param volts Battery voltage in .1V increments
  */
 private handleBatteryEvent(volts) {
-	def descriptionText
     if (volts == 0 || volts == 255) {
         log.debug "Ignoring invalid value for voltage (${volts/10}V)"
     }
@@ -118,17 +107,15 @@ private handleBatteryEvent(volts) {
             volts = minVolts
         else if (volts > maxVolts)
             volts = maxVolts
-        def value = batteryMap[volts]
-        if (value != null) {
+        def pct = batteryMap[volts]
+        if (pct != null) {
             def linkText = getLinkText(device)
-            descriptionText = '{{ linkText }} battery was {{ value }}'
             def eventMap = [
                 name: 'battery',
-                value: value,
-                descriptionText: descriptionText,
-                translatable: true
+                value: pct,
+                descriptionText: "${linkText} battery was ${pct}%"
             ]
-            log.debug "Creating battery event for voltage=${volts/10}V: ${linkText} ${eventMap.name} is ${eventMap.value}%"
+            log.debug "Creating battery event for voltage=${volts/10}V: ${eventMap}"
             sendEvent(eventMap)
         }
     }
@@ -144,19 +131,13 @@ private handlePresenceEvent(present) {
         stopTimer()
     }
     def linkText = getLinkText(device)
-    def descriptionText
-    if ( present )
-    	descriptionText = "{{ linkText }} has arrived"
-    else
-    	descriptionText = "{{ linkText }} has left"
     def eventMap = [
         name: "presence",
         value: present ? "present" : "not present",
         linkText: linkText,
-        descriptionText: descriptionText,
-        translatable: true
+        descriptionText: "${linkText} has ${present ? 'arrived' : 'left'}",
     ]
-    log.debug "Creating presence event: ${device.displayName} ${eventMap.name} is ${eventMap.value}"
+    log.debug "Creating presence event: ${eventMap}"
     sendEvent(eventMap)
 }
 
@@ -177,4 +158,4 @@ def checkPresenceCallback() {
     if (timeSinceLastCheckin >= theCheckInterval) {
         handlePresenceEvent(false)
     }
-}
+}

devicetypes/smartthings/arrival-sensor-ha.src/i18n/messages.properties

@@ -1,35 +0,0 @@
-#==============================================================================
-#  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:
-#
-#     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.
-#==============================================================================
-# Purpose: Arrival Sensor HA i18n Translation File
-#
-# Filename: Arrival-Sensor-HA.src/i18n/messages.properties
-#
-# Change History:
-#	1. 20160115 TW Initial release with informal Korean translation.
-#	2. 20160121 TW Added def preference section titles.
-#==============================================================================
-# Korean (ko)
-# Device Preferences
-'''Give your device a name'''.ko=기기 이름 바꾸기
-'''Set Device Image'''.ko=기기 이미지 설정
-'''Presence timeout (minutes)'''.ko=시간 초과. 스마트폰 위치 정보
-'''Tap to set'''.ko=눌러서 설정
-'''Arrival Sensor'''.ko=도착알림 센서
-# Events / Notifications
-'''{{ linkText }} battery was {{ value }}'''.ko={{ linkText }}남아있는 배터리는 {{ value }}입니다.
-'''{{ linkText }} has arrived'''.ko={{ linkText }}집에 도착했습니다.
-'''{{ linkText }} has left'''.ko={{ linkText }}집을 나갔습니다.
-#==============================================================================

devicetypes/smartthings/ecobee-sensor.src/ecobee-sensor.groovy

@@ -20,6 +20,7 @@ metadata {
 		capability "Temperature Measurement"
 		capability "Motion Sensor"
 		capability "Refresh"
+		capability "Polling"
 	}
 
 	tiles {
@@ -67,6 +68,6 @@ def refresh() {
 
 void poll() {
 	log.debug "Executing 'poll' using parent SmartApp"
-	parent.pollChild()
+	parent.pollChild(this)
 
 }

devicetypes/smartthings/ecobee-thermostat.src/ecobee-thermostat.groovy

@@ -20,6 +20,7 @@ metadata {
 		capability "Actuator"
 		capability "Thermostat"
 		capability "Temperature Measurement"
+		capability "Polling"
 		capability "Sensor"
 		capability "Refresh"
 		capability "Relative Humidity Measurement"
@@ -133,7 +134,9 @@ def refresh() {
 
 void poll() {
 	log.debug "Executing 'poll' using parent SmartApp"
-	parent.pollChild()
+
+	def results = parent.pollChild(this)
+	generateEvent(results) //parse received message from parent
 }
 
 def generateEvent(Map results) {
@@ -379,16 +382,12 @@ def getDataByName(String name) {
 	state[name] ?: device.getDataValue(name)
 }
 
-def setThermostatMode(String mode) {
-	log.debug "setThermostatMode($mode)"
-	mode = mode.toLowerCase()
-	switchToMode(mode)
+def setThermostatMode(String value) {
+	log.debug "setThermostatMode({$value})"
 }
 
-def setThermostatFanMode(String mode) {
-	log.debug "setThermostatFanMode($mode)"
-	mode = mode.toLowerCase()
-	switchToFanMode(mode)
+def setThermostatFanMode(String value) {
+	log.debug "setThermostatFanMode({$value})"
 }
 
 def generateModeEvent(mode) {

devicetypes/smartthings/hue-bridge.src/hue-bridge.groovy

@@ -17,13 +17,16 @@ metadata {
 
 	tiles(scale: 2) {
      	multiAttributeTile(name:"rich-control"){
-			tileAttribute ("", key: "PRIMARY_CONTROL") {
+			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
 	            attributeState "default", label: "Hue Bridge", action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#F3C200"
-			}
+			}    
 	        tileAttribute ("serialNumber", key: "SECONDARY_CONTROL") {
 	            attributeState "default", label:'SN: ${currentValue}'
-			}
-        }
+			}    
+        }    
+		standardTile("icon", "icon", width: 1, height: 1, canChangeIcon: false, inactiveLabel: true, canChangeBackground: false) {
+			state "default", label: "Hue Bridge", action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#FFFFFF"
+		}
 		valueTile("serialNumber", "device.serialNumber", decoration: "flat", height: 1, width: 2, inactiveLabel: false) {
 			state "default", label:'SN: ${currentValue}'
 		}
@@ -31,7 +34,7 @@ metadata {
 			state "default", label:'${currentValue}', height: 1, width: 2, inactiveLabel: false
 		}
 
-		main (["rich-control"])
+		main (["icon"])
 		details(["rich-control", "networkAddress"])
 	}
 }
@@ -72,7 +75,6 @@ def parse(description) {
 				}
 				else if (contentType?.contains("xml")) {
 					log.debug "HUE BRIDGE ALREADY PRESENT"
-                    parent.hubVerification(device.hub.id, msg.body)
 				}
 			}
 		}

devicetypes/smartthings/hue-bulb.src/hue-bulb.groovy

@@ -3,7 +3,6 @@
  *
  *  Author: SmartThings
  */
-
 // for the UI
 metadata {
 	// Automatically generated. Make future change here.
@@ -28,10 +27,10 @@ metadata {
 	tiles (scale: 2){
 		multiAttributeTile(name:"rich-control", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
-				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#C6C7CC", nextState:"turningOn"
-				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
-				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#C6C7CC", nextState:"turningOn"
+				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
+				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
+				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
+				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
 			}
 			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
 				attributeState "level", action:"switch level.setLevel", range:"(0..100)"
@@ -44,10 +43,16 @@ metadata {
 			}
 		}
 
+		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
+			state "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
+			state "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
+			state "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
+			state "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
+		}
+
         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'
         }
@@ -55,12 +60,29 @@ metadata {
 		standardTile("reset", "device.reset", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
 			state "default", label:"Reset Color", action:"reset", icon:"st.lights.philips.hue-single"
 		}
-
-		standardTile("refresh", "device.refresh", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
+		standardTile("refresh", "device.switch", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
 			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
+		controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 2, inactiveLabel: false, range:"(0..100)") {
+			state "level", action:"switch level.setLevel"
+		}
+		valueTile("level", "device.level", inactiveLabel: false, decoration: "flat") {
+			state "level", label: 'Level ${currentValue}%'
+		}
+		controlTile("saturationSliderControl", "device.saturation", "slider", height: 1, width: 2, inactiveLabel: false) {
+			state "saturation", action:"color control.setSaturation"
+		}
+		valueTile("saturation", "device.saturation", inactiveLabel: false, decoration: "flat") {
+			state "saturation", label: 'Sat ${currentValue}    '
+		}
+		controlTile("hueSliderControl", "device.hue", "slider", height: 1, width: 2, inactiveLabel: false) {
+			state "hue", action:"color control.setHue"
+		}
+		valueTile("hue", "device.hue", inactiveLabel: false, decoration: "flat") {
+			state "hue", label: 'Hue ${currentValue}   '
+		}
 
-		main(["rich-control"])
+		main(["switch"])
 		details(["rich-control", "colorTempSliderControl", "colorTemp", "reset", "refresh"])
 	}
 }
@@ -105,34 +127,34 @@ void nextLevel() {
 void setLevel(percent) {
 	log.debug "Executing 'setLevel'"
 	parent.setLevel(this, percent)
-	sendEvent(name: "level", value: percent, descriptionText: "Level has changed to ${percent}%")
+	sendEvent(name: "level", value: percent)
 }
 
 void setSaturation(percent) {
 	log.debug "Executing 'setSaturation'"
 	parent.setSaturation(this, percent)
-	sendEvent(name: "saturation", value: percent, displayed: false)
+	sendEvent(name: "saturation", value: percent)
 }
 
 void setHue(percent) {
 	log.debug "Executing 'setHue'"
 	parent.setHue(this, percent)
-	sendEvent(name: "hue", value: percent, displayed: false)
+	sendEvent(name: "hue", value: percent)
 }
 
 void setColor(value) {
 	log.debug "setColor: ${value}, $this"
 	parent.setColor(this, value)
-	if (value.hue) { sendEvent(name: "hue", value: value.hue, displayed: false)}
-	if (value.saturation) { sendEvent(name: "saturation", value: value.saturation, displayed: false)}
+	if (value.hue) { sendEvent(name: "hue", value: value.hue)}
+	if (value.saturation) { sendEvent(name: "saturation", value: value.saturation)}
 	if (value.hex) { sendEvent(name: "color", value: value.hex)}
-	if (value.level) { sendEvent(name: "level", value: value.level, descriptionText: "Level has changed to ${value.level}%")}
-	sendEvent(name: "switch", value: "on")
+	if (value.level) { sendEvent(name: "level", value: value.level)}
+	if (value.switch) { sendEvent(name: "switch", value: value.switch)}
 }
 
 void reset() {
 	log.debug "Executing 'reset'"
-    def value = [level:100, saturation:56, hue:23]
+    def value = [level:100, hex:"#90C638", saturation:56, hue:23]
     setAdjustedColor(value)
 	parent.poll()
 }

devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy

@@ -1,89 +1,97 @@
-/**
- *  Hue Lux Bulb
- *
- *  Author: SmartThings
- */
-// for the UI
-metadata {
-	// Automatically generated. Make future change here.
-	definition (name: "Hue Lux Bulb", namespace: "smartthings", author: "SmartThings") {
-		capability "Switch Level"
-		capability "Actuator"
-		capability "Switch"
-		capability "Refresh"
-		capability "Sensor"
-
-        command "refresh"
-	}
-
-	simulator {
-		// TODO: define status and reply messages here
-	}
-
-    tiles(scale: 2) {
-        multiAttributeTile(name:"rich-control", type: "lighting", canChangeIcon: true){
-            tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-              attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
-              attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-              attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
-              attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-            }
-            tileAttribute ("device.level", key: "SLIDER_CONTROL") {
-              attributeState "level", action:"switch level.setLevel", range:"(0..100)"
-            }
-            tileAttribute ("device.level", key: "SECONDARY_CONTROL") {
-	            attributeState "level", label: 'Level ${currentValue}%'
-			}
-        }
-
-        controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 2, inactiveLabel: false, range:"(0..100)") {
-            state "level", action:"switch level.setLevel"
-        }
-
-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
-        }
-
-        main(["rich-control"])
-        details(["rich-control", "refresh"])
-    }
-}
-
-// parse events into attributes
-def parse(description) {
-	log.debug "parse() - $description"
-	def results = []
-
-	def map = description
-	if (description instanceof String)  {
-		log.debug "Hue Bulb stringToMap - ${map}"
-		map = stringToMap(description)
-	}
-
-	if (map?.name && map?.value) {
-		results << createEvent(name: "${map?.name}", value: "${map?.value}")
-	}
-	results
-}
-
-// handle commands
-void on() {
-	parent.on(this)
-	sendEvent(name: "switch", value: "on")
-}
-
-void off() {
-	parent.off(this)
-	sendEvent(name: "switch", value: "off")
-}
-
-void setLevel(percent) {
-	log.debug "Executing 'setLevel'"
-	parent.setLevel(this, percent)
-	sendEvent(name: "level", value: percent)
-}
-
-void refresh() {
-	log.debug "Executing 'refresh'"
-	parent.manualRefresh()
-}
+/**
+ *  Hue Lux Bulb
+ *
+ *  Author: SmartThings
+ */
+// for the UI
+metadata {
+	// Automatically generated. Make future change here.
+	definition (name: "Hue Lux Bulb", namespace: "smartthings", author: "SmartThings") {
+		capability "Switch Level"
+		capability "Actuator"
+		capability "Color Temperature"
+		capability "Switch"
+		capability "Refresh"
+		capability "Sensor"
+
+        command "refresh"
+	}
+
+	simulator {
+		// TODO: define status and reply messages here
+	}
+
+    tiles(scale: 2) {
+        multiAttributeTile(name:"rich-control", type: "lighting", canChangeIcon: true){
+            tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
+              attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
+              attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
+              attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
+              attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
+            }
+            tileAttribute ("device.level", key: "SLIDER_CONTROL") {
+              attributeState "level", action:"switch level.setLevel", range:"(0..100)"
+            }
+            tileAttribute ("device.level", key: "SECONDARY_CONTROL") {
+	            attributeState "level", label: 'Level ${currentValue}%'
+			}
+        }
+
+		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
+			state "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
+			state "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
+			state "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
+			state "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
+        }
+				
+        controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 2, inactiveLabel: false, range:"(0..100)") {
+            state "level", action:"switch level.setLevel"
+        }
+
+        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+        }
+
+        main(["switch"])
+        details(["rich-control", "colorTempSliderControl","refresh"])
+    }
+}
+
+// parse events into attributes
+def parse(description) {
+	log.debug "parse() - $description"
+	def results = []
+
+	def map = description
+	if (description instanceof String)  {
+		log.debug "Hue Bulb stringToMap - ${map}"
+		map = stringToMap(description)
+	}
+
+	if (map?.name && map?.value) {
+		results << createEvent(name: "${map?.name}", value: "${map?.value}")
+	}
+	results
+}
+
+// handle commands
+void on() {
+	parent.on(this)
+	sendEvent(name: "switch", value: "on")
+}
+
+void off() {
+	parent.off(this)
+	sendEvent(name: "switch", value: "off")
+}
+
+void setLevel(percent) {
+	log.debug "Executing 'setLevel'"
+	parent.setLevel(this, percent)
+	sendEvent(name: "level", value: percent)
+}
+
+void refresh() {
+	log.debug "Executing 'refresh'"
+	parent.manualRefresh()
+}

devicetypes/smartthings/mobile-presence.src/i18n/messages.properties

@@ -19,14 +19,13 @@
 #
 # Change History:
 #	1. 20160205 TW Initial release with informal Korean translation.
-#	2. 20160224 TW Updated with formal Korean translation.
 #==============================================================================
 # Korean (ko)
 # Device Preferences
 '''Give your device a name'''.ko=기기 이름 바꾸기
-'''Set Device Image'''.ko=기기 이미지 설정
+'''Set Device Image'''.ko=디바이스 이미지 설정
 # Events / Notifications
-'''{{ linkText }} has left'''.ko={{ linkText }}집을 나갔습니다.
-'''{{ linkText }} has arrived'''.ko={{ linkText }}집에 도착했습니다.
+'''{{ linkText }} has left'''.ko={{ linkText }}님이 나갔습니다
+'''{{ linkText }} has arrived'''.ko={{ linkText }}님이 도착했습니다
 '''present'''.ko=집안
-'''not present'''.ko=외출
+'''not present'''.ko=부재중

devicetypes/smartthings/mobile-presence.src/mobile-presence.groovy

@@ -1,28 +1,16 @@
-/*
-===============================================================================
- *  Copyright 2016 SmartThings
+/**
+ *  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:
+ *  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.
-===============================================================================
- *  Purpose: Mobile Presence DTH File
+ *  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.
  *
- *  Filename: mobile-presence.src/mobile-presence.groovy
- *
- *  Change History:
- *  1. 20160205 TW - Update/Edit to support i18n translations
-===============================================================================
  */
- 
 metadata {
 	definition (name: "Mobile Presence", namespace: "smartthings", author: "SmartThings") {
 		capability "Presence Sensor"
@@ -53,7 +41,6 @@ def parse(String description) {
 	def isStateChange = isStateChange(device, name, value)
 
 	def results = [
-    	translatable: true,
 		name: name,
 		value: value,
 		unit: null,
@@ -85,8 +72,8 @@ private String parseValue(String description) {
 
 private parseDescriptionText(String linkText, String value, String description) {
 	switch(value) {
-		case "present": return "{{ linkText }} has arrived"
-		case "not present": return "{{ linkText }} has left"
+		case "present": return "$linkText has arrived"
+		case "not present": return "$linkText has left"
 		default: return value
 	}
 }
@@ -97,4 +84,4 @@ private getState(String value) {
 		case "not present": return "left"
 		default: return value
 	}
-}
+}

devicetypes/smartthings/smartpower-outlet.src/i18n/messages.properties

@@ -1,31 +0,0 @@
-#==============================================================================
-#  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:
-#
-#     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.
-#==============================================================================
-# Purpose: SmartPower Outlet i18n Translation File
-#
-# Filename: SmartPower-Outlet.src/i18n/messages.properties
-#
-# Change History:
-#	1. 20160116 TW Initial release with informal Korean translation.
-#==============================================================================
-# Korean (ko)
-# Device Preferences
-'''Give your device a name'''.ko=기기 이름 바꾸기
-'''Outlet'''.ko=플러그
-# Events descriptionText
-'''{{ device.displayName }} is On'''.ko={{ device.displayName }}켜졌습니다.
-'''{{ device.displayName }} is Off'''.ko={{ device.displayName }}꺼졌습니다.
-'''{{ device.displayName }} power is {{ value }} Watts'''.ko={{ device.displayName }} 전원은 {{ value }}와트입니다
-#==============================================================================

devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy

@@ -1,26 +1,19 @@
-/*
-===============================================================================
- *  Copyright 2016 SmartThings
+/**
+ *  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:
+ *  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.
-===============================================================================
- *  Purpose: SmartPower Outlet DTH File
+ *  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.
  *
- *  Filename: SmartPower-Outlet.src/SmartPower-Outlet.groovy
+ *	SmartPower Outlet (CentraLite)
  *
- *  Change History:
- *  1. 20160117 TW - Update/Edit to support i18n translations
-===============================================================================
+ *	Author: SmartThings
+ *	Date: 2015-08-23
  */
 metadata {
 	// Automatically generated. Make future change here.
@@ -98,22 +91,22 @@ def parse(String description) {
 		finalResult = getPowerDescription(zigbee.parseDescriptionAsMap(description))
 
 	if (finalResult) {
-		log.info "final result = $finalResult"
+		log.info finalResult
 		if (finalResult.type == "update") {
 			log.info "$device updates: ${finalResult.value}"
 		}
 		else if (finalResult.type == "power") {
 			def powerValue = (finalResult.value as Integer)/10
-			sendEvent(name: "power", value: powerValue, descriptionText: '{{ device.displayName }} power is {{ value }} Watts', translatable: true )
+			sendEvent(name: "power", value: powerValue)
 			/*
 				Dividing by 10 as the Divisor is 10000 and unit is kW for the device. AttrId: 0302 and 0300. Simplifying to 10
+
 				power level is an integer. The exact power level with correct units needs to be handled in the device type
 				to account for the different Divisor value (AttrId: 0302) and POWER Unit (AttrId: 0300). CLUSTER for simple metering is 0702
 			*/
 		}
 		else {
-			def descriptionText = finalResult.value == "on" ? '{{ device.displayName }} is On' : '{{ device.displayName }} is Off'
-			sendEvent(name: finalResult.type, value: finalResult.value, descriptionText: descriptionText, translatable: true)
+			sendEvent(name: finalResult.type, value: finalResult.value)
 		}
 	}
 	else {

devicetypes/smartthings/smartsense-moisture-sensor.src/i18n/messages.properties

@@ -1,41 +1,14 @@
-#==============================================================================
-#  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:
-#
-#     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.
-#==============================================================================
-# Purpose: SmartSense Moisture Sensor i18n Translation File
-#
-# Filename: SmartSense-Moisture-Sensor.src/i18n/messages.properties
-#
-# Change History:
-#	1. 20160116 TW Initial release with formal Korean translation.
-#==============================================================================
-# Korean (ko)
-# Device Preferences
+
+# Generated on Wed Feb 24 14:28:26 CST 2016 by dylan
+'''Adjust temperature by this many degrees'''.ko=몇 도씩 온도를 조절하십시오
+'''Degrees'''.ko=온도
+'''Temperature Offset'''.ko=온도 직접 설정
+'''This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter '-5'. If 3 degrees too cold, enter '+3'.'''.ko=기준 온도를 원하는대로 몇 도 올리거나 내려서 설정할 수 있습니다. 
+'''battery'''.ko=배터리
 '''dry'''.ko=건조
 '''wet'''.ko=누수
-'''battery'''.ko=배터리
-'''Temperature Offset'''.ko=온도 직접 설정
-'''This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter '-5'. If 3 degrees too cold, enter '+3'.'''.ko=기준 온도를 원하는대로 몇 도 올리거나 내려서 설정할 수 있습니다.
-'''Degrees'''.ko=온도
-'''Adjust temperature by this many degrees'''.ko=몇 도씩 온도를 조절하십시오
-'''Give your device a name'''.ko=기기 이름 바꾸기
-'''Water Leak Sensor'''.ko=누수센서
-# Events descriptionText
-'''{{ device.displayName }} is dry'''.ko={{ device.displayName }}가 건조
-'''{{ device.displayName }} is wet'''.ko={{ device.displayName }}누수
+'''{{ device.displayName }} battery has too much power: (> 3.5) volts.'''.ko={{ device.displayName }} 배터리 전력이 너무 높습니다(3.5볼트 초과).
+'''{{ device.displayName }} battery was {{ value }}'''.ko={{ device.displayName }} 배터리가 {{ value }}였습니다
+'''{{ device.displayName }} is {{ value | translate }}'''.ko={{ device.displayName }}이(가) {{ value | translate }}입니다
 '''{{ device.displayName }} was {{ value }}°C'''.ko={{ device.displayName }}이(가) {{ value }}°C였습니다
 '''{{ device.displayName }} was {{ value }}°F'''.ko={{ device.displayName }}이(가) {{ value }}°F였습니다
-'''{{ device.displayName }} battery has too much power: (> 3.5) volts.'''.ko={{ device.displayName }} 배터리 전력이 너무 높습니다(3.5볼트 초과).
-'''{{ device.displayName }} battery was {{ value }}%'''.ko={{ device.displayName }}남아있는 배터리는 {{ value }}%입니다.
-#==============================================================================

devicetypes/smartthings/smartsense-moisture-sensor.src/smartsense-moisture-sensor.groovy

@@ -1,29 +1,18 @@
-/*
-===============================================================================
- *  Copyright 2016 SmartThings
+/**
+ *  SmartSense Moisture Sensor
  *
- *  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:
+ *  Copyright 2014 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.
-===============================================================================
- *  Purpose: SmartSense Moisture Sensor DTH File
+ *  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.
  *
- *  Filename: SmartSense-Moisture-Sensor.src/SmartSense-Moisture-Sensor.groovy
- *
- *  Change History:
- *  1. 20160116 TW - Update/Edit to support i18n translations
- *  2. 20160125 TW = Incorporated new battery mapping from TM
-===============================================================================
  */
-
 metadata {
 	definition (name: "SmartSense Moisture Sensor",namespace: "smartthings", author: "SmartThings") {
 		capability "Configuration"
@@ -54,7 +43,7 @@ metadata {
 				])
 		}
 		section {
-			input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter '-5'. If 3 degrees too cold, enter '+3'.", displayDuringSetup: false, type: "paragraph", element: "paragraph"
+			input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
 			input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 		}
 	}
@@ -127,16 +116,16 @@ private Map parseCatchAllMessage(String description) {
 				resultMap = getBatteryResult(cluster.data.last())
 				break
 
-            case 0x0402:
-                // temp is last 2 data values. reverse to swap endian
-                String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
-                def value = getTemperature(temp)
-                resultMap = getTemperatureResult(value)
-                break
-        }
-    }
+			case 0x0402:
+				// temp is last 2 data values. reverse to swap endian
+				String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
+				def value = getTemperature(temp)
+				resultMap = getTemperatureResult(value)
+				break
+		}
+	}
 
-    return resultMap
+	return resultMap
 }
 
 private boolean shouldProcessMessage(cluster) {
@@ -231,8 +220,7 @@ private Map getBatteryResult(rawValue) {
 
 	def result = [
 		name: 'battery',
-		value: '--',
-		translatable: true
+		value: '--'
 	]
 
 	def volts = rawValue / 10
@@ -240,7 +228,7 @@ private Map getBatteryResult(rawValue) {
 	if (rawValue == 0 || rawValue == 255) {}
 	else {
 		if (volts > 3.5) {
-			result.descriptionText = "{{ device.displayName }} battery has too much power: (> 3.5) volts."
+			result.descriptionText = "${linkText} battery has too much power (${volts} volts)."
 		}
 		else {
 			if (device.getDataValue("manufacturer") == "SmartThings") {
@@ -257,7 +245,7 @@ private Map getBatteryResult(rawValue) {
 				def pct = batteryMap[volts]
 				if (pct != null) {
 					result.value = pct
-					result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
+					result.descriptionText = "${linkText} battery was ${result.value}%"
 				}
 			}
 			else {
@@ -265,7 +253,7 @@ private Map getBatteryResult(rawValue) {
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
 				result.value = Math.min(100, (int) pct * 100)
-				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
+				result.descriptionText = "${linkText} battery was ${result.value}%"
 			}
 		}
 	}
@@ -275,37 +263,27 @@ private Map getBatteryResult(rawValue) {
 
 private Map getTemperatureResult(value) {
 	log.debug 'TEMP'
+	def linkText = getLinkText(device)
 	if (tempOffset) {
 		def offset = tempOffset as int
 		def v = value as int
 		value = v + offset
 	}
-    def descriptionText
-    if ( temperatureScale == 'C' )
-    	descriptionText = '{{ device.displayName }} was {{ value }}°C'
-    else
-    	descriptionText = '{{ device.displayName }} was {{ value }}°F'
-
+	def descriptionText = "${linkText} was ${value}°${temperatureScale}"
 	return [
 		name: 'temperature',
 		value: value,
-		descriptionText: descriptionText,
-        translatable: true
+		descriptionText: descriptionText
 	]
 }
 
 private Map getMoistureResult(value) {
-	log.debug "water"
-    def descriptionText
-    if ( value == "wet" )
-    	descriptionText = '{{ device.displayName }} is wet'
-    else
-    	descriptionText = '{{ device.displayName }} is dry'
+	log.debug 'water'
+	String descriptionText = "${device.displayName} is ${value}"
 	return [
 		name: 'water',
 		value: value,
-		descriptionText: descriptionText,
-        translatable: true
+		descriptionText: descriptionText
 	]
 }
 

devicetypes/smartthings/smartsense-motion-sensor.src/i18n/messages.properties

@@ -1,40 +1,13 @@
-#==============================================================================
-#  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:
-#
-#     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.
-#==============================================================================
-# Purpose: SmartSense Motion Sensor i18n Translation File
-#
-# Filename: SmartSense-Motion-Sensor.src/i18n/messages.properties
-#
-# Change History:
-#	1. 20160116 TW Initial release with formal Korean translation.
-#	2. 20160224 TW Updated formal Korean translations from Mike Stoller.
-#==============================================================================
-# Korean (ko)
-# Device Preferences
-'''battery'''.ko=배터리
-'''Temperature Offset'''.ko=온도 직접 설정
-'''This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter '-5'. If 3 degrees too cold, enter '+3'.'''.ko=기준 온도를 원하는대로 몇 도 올리거나 내려서 설정할 수 있습니다.
-'''Degrees'''.ko=온도
+
+# Generated on Wed Feb 24 14:28:26 CST 2016 by dylan
 '''Adjust temperature by this many degrees'''.ko=몇 도씩 온도를 조절하십시오
-'''Give your device a name'''.ko=기기 이름 바꾸기
-'''Motion Sensor'''.ko=모션 센서
-# Events descriptionText
-'''{{ device.displayName }} detected motion'''.ko={{ device.displayName }} 가 움직임을 감지하였습니다.
-'''{{ device.displayName }} motion has stopped'''.ko={{ device.displayName }}움직임이 중단되었습니다
-'''{{ device.displayName }} was {{ value }}°C'''.ko={{ device.displayName }}이(가){{ value }}°C였습니다.
-'''{{ device.displayName }} was {{ value }}°F'''.ko={{ device.displayName }}이(가) {{ value }}°F였습니다
+'''Degrees'''.ko=온도
+'''Temperature Offset'''.ko=온도 직접 설정
+'''This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter '-5'. If 3 degrees too cold, enter '+3'.'''.ko=기준 온도를 원하는대로 몇 도 올리거나 내려서 설정할 수 있습니다. 
+'''battery'''.ko=배터리
 '''{{ device.displayName }} battery has too much power: (> 3.5) volts.'''.ko={{ device.displayName }} 배터리 전력이 너무 높습니다(3.5볼트 초과).
-'''{{ device.displayName }} battery was {{ value }}%'''.ko={{ device.displayName }}남아있는 배터리는 {{ value }}%입니다.
-#==============================================================================
+'''{{ device.displayName }} battery was {{ value }}'''.ko={{ device.displayName }} 배터리가 {{ value }}였습니다
+'''{{ device.displayName }} detected motion'''.ko={{ device.displayName }}가 움직임을 감지하였습니다.
+'''{{ device.displayName }} motion has stopped'''.ko={{ device.displayName }} 동작이 중단되었습니다
+'''{{ device.displayName }} was {{ value }}°C'''.ko={{ device.displayName }}이(가) {{ value }}°C였습니다
+'''{{ device.displayName }} was {{ value }}°F'''.ko={{ device.displayName }}이(가) {{ value }}°F였습니다

devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy

@@ -1,27 +1,17 @@
-/*
-===============================================================================
- *  Copyright 2016 SmartThings
+/**
+ *  SmartSense Motion/Temp Sensor
  *
- *  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:
+ *  Copyright 2014 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.
-===============================================================================
- *  Purpose: SmartSense Motion Sensor DTH File
+ *  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.
  *
- *  Filename: SmartSense-Motion-Sensor.src/SmartSense-Motion-Sensor.groovy
- *
- *  Change History:
- *  1. 20160116 TW - Update/Edit to support i18n translations
- *  2. 20160125 TW = Incorporated new battery mapping from TM
-===============================================================================
  */
 
 metadata {
@@ -57,7 +47,7 @@ metadata {
 				])
 		}
 		section {
-			input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter '-5'. If 3 degrees too cold, enter '+3'.", displayDuringSetup: false, type: "paragraph", element: "paragraph"
+			input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
 			input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 		}
 	}
@@ -246,8 +236,7 @@ private Map getBatteryResult(rawValue) {
 
 	def result = [
 		name: 'battery',
-		value: '--',
-		translatable: true
+		value: '--'
 	]
 
 	def volts = rawValue / 10
@@ -255,7 +244,7 @@ private Map getBatteryResult(rawValue) {
 	if (rawValue == 0 || rawValue == 255) {}
 	else {
 		if (volts > 3.5) {
-			result.descriptionText = "{{ device.displayName }} battery has too much power: (> 3.5) volts."
+			result.descriptionText = "${linkText} battery has too much power (${volts} volts)."
 		}
 		else {
 			if (device.getDataValue("manufacturer") == "SmartThings") {
@@ -272,8 +261,7 @@ private Map getBatteryResult(rawValue) {
 				def pct = batteryMap[volts]
 				if (pct != null) {
 					result.value = pct
-                    def value = pct
-					result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
+					result.descriptionText = "${linkText} battery was ${result.value}%"
 				}
 			}
 			else {
@@ -281,7 +269,7 @@ private Map getBatteryResult(rawValue) {
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
 				result.value = Math.min(100, (int) pct * 100)
-				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
+				result.descriptionText = "${linkText} battery was ${result.value}%"
 			}
 		}
 	}
@@ -291,33 +279,28 @@ private Map getBatteryResult(rawValue) {
 
 private Map getTemperatureResult(value) {
 	log.debug 'TEMP'
+	def linkText = getLinkText(device)
 	if (tempOffset) {
 		def offset = tempOffset as int
 		def v = value as int
 		value = v + offset
 	}
-    def descriptionText
-    if ( temperatureScale == 'C' )
-    	descriptionText = '{{ device.displayName }} was {{ value }}°C'
-    else
-    	descriptionText = '{{ device.displayName }} was {{ value }}°F'
-
+	def descriptionText = "${linkText} was ${value}°${temperatureScale}"
 	return [
 		name: 'temperature',
 		value: value,
-		descriptionText: descriptionText,
-        translatable: true
+		descriptionText: descriptionText
 	]
 }
 
 private Map getMotionResult(value) {
 	log.debug 'motion'
-	String descriptionText = value == 'active' ? "{{ device.displayName }} detected motion" : "{{ device.displayName }} motion has stopped"
+	String linkText = getLinkText(device)
+	String descriptionText = value == 'active' ? "${linkText} detected motion" : "${linkText} motion has stopped"
 	return [
 		name: 'motion',
 		value: value,
-		descriptionText: descriptionText,
-        translatable: true
+		descriptionText: descriptionText
 	]
 }
 

devicetypes/smartthings/smartsense-multi-sensor.src/i18n/messages.properties

@@ -1,45 +1,20 @@
-#==============================================================================
-#  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:
-#
-#     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.
-#==============================================================================
-# Purpose: SmartSense Multi Sensor i18n Translation File
-#
-# Filename: SmartSense-Multi-Sensor.src/i18n/messages.properties
-#
-# Change History:
-#	1. 20160117 TW Initial release with informal Korean translation.
-#==============================================================================
-# Korean (ko)
-# Device Preferences
-'''Yes'''.ko=예
+
+# Generated on Wed Feb 24 14:28:26 CST 2016 by dylan
+'''Adjust temperature by this many degrees'''.ko=몇 도씩 온도를 조절하십시오
+'''Degrees'''.ko=온도
+'''Do you want to use this sensor on a garage door?'''.ko=차고 문의 센서 사용 설정하기
 '''No'''.ko=아니요
-'''battery'''.ko=배터리
+'''Tap to set'''.ko=눌러서 설정
 '''Temperature Offset'''.ko=온도 직접 설정
 '''This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter '-5'. If 3 degrees too cold, enter '+3'.'''.ko=기준 온도를 원하는대로 몇 도 올리거나 내려서 설정할 수 있습니다.
-'''Degrees'''.ko=온도
-'''Adjust temperature by this many degrees'''.ko=몇 도씩 온도를 조절하십시오
-'''Do you want to use this sensor on a garage door?'''.ko=차고 문의 센서 사용 설정하기
-'''Tap to set'''.ko=눌러서 설정
-'''Give your device a name'''.ko=기기 이름 바꾸기
-'''Multipurpose Sensor'''.ko=멀티 센서
-# Events descriptionText
-'''{{ device.displayName }} was opened'''.ko={{ device.displayName }}열림을 감지하였습니다.
-'''{{ device.displayName }} was closed'''.ko={{ device.displayName }}닫혔습니다.
-'''{{ device.displayName }} was active'''.ko={{ device.displayName }}활성화되었습니다.
-'''{{ device.displayName }} was inactive'''.ko={{ device.displayName }}비활성화되었습니다.
-'''{{ device.displayName }} was {{ value }}°C'''.ko={{ device.displayName }}이(가){{ value }}°C였습니다.
-'''{{ device.displayName }} was {{ value }}°F'''.ko={{ device.displayName }}이(가) {{ value }}°F였습니다
-'''{{ device.displayName }} battery was {{ value }}%'''.ko={{ device.displayName }}남아있는 배터리는 {{ value }}%입니다.
 '''Updating device to garage sensor'''.ko=기기-차고 센서 업데이트 중
 '''Updating device to open/close sensor'''.ko=기기-열림/닫힘 센서 업데이트 중
+'''Yes'''.ko=예
+'''{{ device.displayName }} status was closed'''.ko={{ device.displayName }}은(는) 닫힌 상태입니다
+'''{{ device.displayName }} status was opened'''.ko={{ device.displayName }}은(는) 열린 상태입니다
+'''{{ device.displayName }} was active'''.ko={{ device.displayName }}이(가) 활성화되었습니다
+'''{{ device.displayName }} was closed'''.ko={{ device.displayName }}이(가) 닫혔습니다
+'''{{ device.displayName }} was inactive'''.ko={{ device.displayName }}이(가) 비활성화되었습니다
+'''{{ device.displayName }} was opened'''.ko={{ device.displayName }}이(가) 열렸습니다
+'''{{ device.displayName }} was {{ value }}°C'''.ko={{ device.displayName }}이(가) {{ value }}°C였습니다
+'''{{ device.displayName }} was {{ value }}°F'''.ko={{ device.displayName }}이(가) {{ value }}°F였습니다

devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy

@@ -1,27 +1,17 @@
-/*
-===============================================================================
- *  Copyright 2016 SmartThings
+/**
+ *  SmartSense Multi
  *
- *  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:
+ *  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.
-===============================================================================
- *  Purpose: SmartSense Multi Sensor DTH File
+ *  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.
  *
- *  Filename: SmartSense-Multi-Sensor.src/SmartSense-Multi-Sensor.groovy
- *
- *  Change History:
- *  1. 20160117 TW - Update/Edit to support i18n translations
- *  2. 20160125 TW = Incorporated new battery mapping from TM
-===============================================================================
  */
 
 metadata {
@@ -72,11 +62,11 @@ metadata {
 				])
 		}
 		section {
-			input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter '-5'. If 3 degrees too cold, enter '+3'.", displayDuringSetup: false, type: "paragraph", element: "paragraph"
+			input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
 			input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 		}
 		section {
-			input("garageSensor", "enum", title: "Do you want to use this sensor on a garage door?", description: "Tap to set", options: ["Yes", "No"], defaultValue: "No", required: false, displayDuringSetup: false)
+			input("garageSensor", "enum", title: "Do you want to use this sensor on a garage door?", options: ["Yes", "No"], defaultValue: "No", required: false, displayDuringSetup: false)
 		}
 	}
 
@@ -283,19 +273,19 @@ def updated() {
 	if (garageSensor == "Yes") {
 		def descriptionText = "Updating device to garage sensor"
 		if (device.latestValue("status") == "open") {
-			sendEvent(name: 'status', value: 'garage-open', descriptionText: descriptionText, translatable: true)
+			sendEvent(name: 'status', value: 'garage-open', descriptionText: descriptionText)
 		}
 		else if (device.latestValue("status") == "closed") {
-			sendEvent(name: 'status', value: 'garage-closed', descriptionText: descriptionText, translatable: true)
+			sendEvent(name: 'status', value: 'garage-closed', descriptionText: descriptionText)
 		}
 	}
 	else {
 		def descriptionText = "Updating device to open/close sensor"
 		if (device.latestValue("status") == "garage-open") {
-			sendEvent(name: 'status', value: 'open', descriptionText: descriptionText, translatable: true)
+			sendEvent(name: 'status', value: 'open', descriptionText: descriptionText)
 		}
 		else if (device.latestValue("status") == "garage-closed") {
-			sendEvent(name: 'status', value: 'closed', descriptionText: descriptionText, translatable: true)
+			sendEvent(name: 'status', value: 'closed', descriptionText: descriptionText)
 		}
 	}
 }
@@ -311,11 +301,11 @@ def getTemperature(value) {
 
 private Map getBatteryResult(rawValue) {
 	log.debug "Battery rawValue = ${rawValue}"
+	def linkText = getLinkText(device)
 
 	def result = [
 		name: 'battery',
-		value: '--',
-		translatable: true
+		value: '--'
 	]
 
 	def volts = rawValue / 10
@@ -323,7 +313,7 @@ private Map getBatteryResult(rawValue) {
 	if (rawValue == 0 || rawValue == 255) {}
 	else {
 		if (volts > 3.5) {
-			result.descriptionText = "{{ device.displayName }} battery has too much power: (> 3.5) volts."
+			result.descriptionText = "${linkText} battery has too much power (${volts} volts)."
 		}
 		else {
 			if (device.getDataValue("manufacturer") == "SmartThings") {
@@ -340,7 +330,7 @@ private Map getBatteryResult(rawValue) {
 				def pct = batteryMap[volts]
 				if (pct != null) {
 					result.value = pct
-					result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
+					result.descriptionText = "${linkText} battery was ${result.value}%"
 				}
 			}
 			else {
@@ -348,7 +338,7 @@ private Map getBatteryResult(rawValue) {
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
 				result.value = Math.min(100, (int) pct * 100)
-				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
+				result.descriptionText = "${linkText} battery was ${result.value}%"
 			}
 		}
 	}
@@ -358,50 +348,40 @@ private Map getBatteryResult(rawValue) {
 
 private Map getTemperatureResult(value) {
 	log.debug "Temperature"
+	def linkText = getLinkText(device)
 	if (tempOffset) {
 		def offset = tempOffset as int
 		def v = value as int
 		value = v + offset
 	}
-	def descriptionText = temperatureScale == 'C' ? '{{ device.displayName }} was {{ value }}°C':
-			'{{ device.displayName }} was {{ value }}°F'
-
+	def descriptionText = "${linkText} was ${value}°${temperatureScale}"
 	return [
 	name: 'temperature',
 	value: value,
-	descriptionText: descriptionText,
-    translatable: true
+	descriptionText: descriptionText
 	]
 }
 
 private Map getContactResult(value) {
-	log.debug "Contact: ${device.displayName} value = ${value}"
-	def descriptionText = value == 'open' ? '{{ device.displayName }} was opened' : '{{ device.displayName }} was closed'
-	sendEvent(name: 'contact', value: value, descriptionText: descriptionText, displayed: false, translatable: true)
-	sendEvent(name: 'status', value: value, descriptionText: descriptionText, translatable: true)
+	log.debug "Contact"
+	def linkText = getLinkText(device)
+	def descriptionText = "${linkText} was ${value == 'open' ? 'opened' : 'closed'}"
+	sendEvent(name: 'contact', value: value, descriptionText: descriptionText, displayed:false)
+	sendEvent(name: 'status', value: value, descriptionText: descriptionText)
 }
 
 private getAccelerationResult(numValue) {
 	log.debug "Acceleration"
 	def name = "acceleration"
-    def value
-    def descriptionText
-
-	if ( numValue.endsWith("1") ) {
-    	value = "active"
-        descriptionText = '{{ device.displayName }} was active'
-    } else {
-    	value = "inactive"
-        descriptionText = '{{ device.displayName }} was inactive'
-    }
-
+	def value = numValue.endsWith("1") ? "active" : "inactive"
+	def linkText = getLinkText(device)
+	def descriptionText = "$linkText was $value"
 	def isStateChange = isStateChange(device, name, value)
-	return [
+	[
 		name: name,
 		value: value,
 		descriptionText: descriptionText,
-		isStateChange: isStateChange,
-		translatable: true
+		isStateChange: isStateChange
 	]
 }
 
@@ -471,15 +451,15 @@ def configure() {
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 
 		"zcl mfg-code ${manufacturerCode}", "delay 200",
-		"zcl global send-me-a-report 0xFC02 0x0012 0x29 1 3600 {0100}", "delay 200",
+		"zcl global send-me-a-report 0xFC02 0x0012 0x29 1 3600 {01}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 
 		"zcl mfg-code ${manufacturerCode}", "delay 200",
-		"zcl global send-me-a-report 0xFC02 0x0013 0x29 1 3600 {0100}", "delay 200",
+		"zcl global send-me-a-report 0xFC02 0x0013 0x29 1 3600 {01}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 
 		"zcl mfg-code ${manufacturerCode}", "delay 200",
-		"zcl global send-me-a-report 0xFC02 0x0014 0x29 1 3600 {0100}", "delay 200",
+		"zcl global send-me-a-report 0xFC02 0x0014 0x29 1 3600 {01}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
 		]
 
@@ -548,9 +528,10 @@ def garageEvent(zValue) {
 		garageValue = 'garage-open'
 	}
 	if (contactValue != null){
-		def descriptionText = contactValue == 'open' ? '{{ device.displayName }} was opened' :'{{ device.displayName }} was closed'
-		sendEvent(name: 'contact', value: contactValue, descriptionText: descriptionText, displayed:false, translatable: true)
-		sendEvent(name: 'status', value: garageValue, descriptionText: descriptionText, translatable: true)
+		def linkText = getLinkText(device)
+		def descriptionText = "${linkText} was ${contactValue == 'open' ? 'opened' : 'closed'}"
+		sendEvent(name: 'contact', value: contactValue, descriptionText: descriptionText, displayed:false)
+		sendEvent(name: 'status', value: garageValue, descriptionText: descriptionText)
 	}
 }
 

devicetypes/smartthings/smartsense-multi.src/smartsense-multi.groovy

@@ -22,8 +22,6 @@ metadata {
 		capability "Battery"
 
 		fingerprint profileId: "FC01", deviceId: "0139"
-
-		attribute "status", "string"
 	}
 
 	simulator {
@@ -101,7 +99,7 @@ def parse(String description) {
 
 }
 
-private List parseSingleMessage(description) {
+private Map parseSingleMessage(description) {
 
 	def name = parseName(description)
 	def value = parseValue(description)
@@ -110,9 +108,8 @@ private List parseSingleMessage(description) {
 	def handlerName = value == 'open' ? 'opened' : value
 	def isStateChange = isStateChange(device, name, value)
 
-	def results = []
-	results << createEvent(
-		name: "contact",
+	def results = [
+		name: name,
 		value: value,
 		unit: null,
 		linkText: linkText,
@@ -120,18 +117,8 @@ private List parseSingleMessage(description) {
 		handlerName: handlerName,
 		isStateChange: isStateChange,
 		displayed: displayed(description, isStateChange)
-	)
-
-	results << createEvent(
-		name: "status",
-		value: value,
-		unit: null,
-		linkText: linkText,
-		descriptionText: descriptionText,
-		handlerName: handlerName,
-		isStateChange: isStateChange,
-		displayed: displayed(description, isStateChange)
-	)
+	]
+	log.debug "Parse results for $device: $results"
 
 	results
 }
@@ -282,7 +269,7 @@ private List parseRssiLqiMessage(String description) {
 	results
 }
 
-private List getContactResult(part, description) {
+private getContactResult(part, description) {
 	def name = "contact"
 	def value = part.endsWith("1") ? "open" : "closed"
 	def handlerName = value == 'open' ? 'opened' : value
@@ -290,30 +277,16 @@ private List getContactResult(part, description) {
 	def descriptionText = "$linkText was $handlerName"
 	def isStateChange = isStateChange(device, name, value)
 
-	def results = []
-	results << createEvent(
-			name: "contact",
-			value: value,
-			unit: null,
-			linkText: linkText,
-			descriptionText: descriptionText,
-			handlerName: handlerName,
-			isStateChange: isStateChange,
-			displayed:false
-	)
-
-	results << createEvent(
-			name: "status",
-			value: value,
-			unit: null,
-			linkText: linkText,
-			descriptionText: descriptionText,
-			handlerName: handlerName,
-			isStateChange: isStateChange,
-			displayed: displayed(description, isStateChange)
-	)
-
-	results
+	[
+		name: name,
+		value: value,
+		unit: null,
+		linkText: linkText,
+		descriptionText: descriptionText,
+		handlerName: handlerName,
+		isStateChange: isStateChange,
+		displayed: displayed(description, isStateChange)
+	]
 }
 
 private getAccelerationResult(part, description) {
@@ -476,7 +449,6 @@ private Boolean isOrientationMessage(String description) {
 	description ==~ /x:.*y:.*z:.*rssi:.*lqi:.*/
 }
 
-//Note: Not using this method anymore
 private String parseName(String description) {
 	if (isSupportedDescription(description)) {
 		return "contact"

devicetypes/smartthings/zwave-motion-sensor.src/zwave-motion-sensor.groovy

@@ -57,7 +57,7 @@ def parse(String description) {
 	return result
 }
 
-def sensorValueEvent(value) {
+def sensorValueEvent(Short value) {
 	if (value) {
 		createEvent(name: "motion", value: "active", descriptionText: "$device.displayName detected motion")
 	} else {
@@ -94,24 +94,24 @@ def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cm
 {
 	def result = []
 	if (cmd.notificationType == 0x07) {
-		if (cmd.v1AlarmType == 0x07) {  // special case for nonstandard messages from Monoprice ensors
-			result << sensorValueEvent(cmd.v1AlarmLevel)
-		} else if (cmd.event == 0x01 || cmd.event == 0x02 || cmd.event == 0x07 || cmd.event == 0x08) {
+		if (cmd.event == 0x01 || cmd.event == 0x02) {
 			result << sensorValueEvent(1)
-		} else if (cmd.event == 0x00) {
-			result << sensorValueEvent(0)
 		} else if (cmd.event == 0x03) {
-			result << createEvent(name: "tamper", value: "detected", descriptionText: "$device.displayName covering was removed", isStateChange: true)
-			result << response(zwave.batteryV1.batteryGet())
+			result << createEvent(descriptionText: "$device.displayName covering was removed", isStateChange: true)
+			result << response(zwave.wakeUpV1.wakeUpIntervalSet(seconds:4*3600, nodeid:zwaveHubNodeId))
+			if(!state.MSR) result << response(zwave.manufacturerSpecificV2.manufacturerSpecificGet())
 		} else if (cmd.event == 0x05 || cmd.event == 0x06) {
 			result << createEvent(descriptionText: "$device.displayName detected glass breakage", isStateChange: true)
+		} else if (cmd.event == 0x07) {
+			if(!state.MSR) result << response(zwave.manufacturerSpecificV2.manufacturerSpecificGet())
+			result << sensorValueEvent(1)
 		}
 	} else if (cmd.notificationType) {
 		def text = "Notification $cmd.notificationType: event ${([cmd.event] + cmd.eventParameter).join(", ")}"
-		result << createEvent(name: "notification$cmd.notificationType", value: "$cmd.event", descriptionText: text, isStateChange: true, displayed: false)
+		result << createEvent(name: "notification$cmd.notificationType", value: "$cmd.event", descriptionText: text, displayed: false)
 	} else {
 		def value = cmd.v1AlarmLevel == 255 ? "active" : cmd.v1AlarmLevel ?: "inactive"
-		result << createEvent(name: "alarm $cmd.v1AlarmType", value: value, isStateChange: true, displayed: false)
+		result << createEvent(name: "alarm $cmd.v1AlarmType", value: value, displayed: false)
 	}
 	result
 }

devicetypes/smartthings/zwave-smoke-alarm.src/zwave-smoke-alarm.groovy

@@ -61,44 +61,37 @@ def parse(String description) {
 			zwaveEvent(cmd, results)
 		}
 	}
-	log.debug "'$description' parsed to ${results.inspect()}"
+	// log.debug "\"$description\" parsed to ${results.inspect()}"
 	return results
 }
 
 
 def createSmokeOrCOEvents(name, results) {
 	def text = null
-	switch (name) {
-		case "smoke":
-			text = "$device.displayName smoke was detected!"
-			// these are displayed:false because the composite event is the one we want to see in the app
-			results << createEvent(name: "smoke",          value: "detected", descriptionText: text, displayed: false)
-			break
-		case "carbonMonoxide":
-			text = "$device.displayName carbon monoxide was detected!"
-			results << createEvent(name: "carbonMonoxide", value: "detected", descriptionText: text, displayed: false)
-			break
-		case "tested":
-			text = "$device.displayName was tested"
-			results << createEvent(name: "smoke",          value: "tested", descriptionText: text, displayed: false)
-			results << createEvent(name: "carbonMonoxide", value: "tested", descriptionText: text, displayed: false)
-			break
-		case "smokeClear":
-			text = "$device.displayName smoke is clear"
-			results << createEvent(name: "smoke",          value: "clear", descriptionText: text, displayed: false)
-			name = "clear"
-			break
-		case "carbonMonoxideClear":
-			text = "$device.displayName carbon monoxide is clear"
-			results << createEvent(name: "carbonMonoxide", value: "clear", descriptionText: text, displayed: false)
-			name = "clear"
-			break
-		case "testClear":
-			text = "$device.displayName test cleared"
-			results << createEvent(name: "smoke",          value: "clear", descriptionText: text, displayed: false)
-			results << createEvent(name: "carbonMonoxide", value: "clear", displayed: false)
-			name = "clear"
-			break
+	if (name == "smoke") {
+		text = "$device.displayName smoke was detected!"
+		// these are displayed:false because the composite event is the one we want to see in the app
+		results << createEvent(name: "smoke",          value: "detected", descriptionText: text, displayed: false)
+	} else if (name == "carbonMonoxide") {
+		text = "$device.displayName carbon monoxide was detected!"
+		results << createEvent(name: "carbonMonoxide", value: "detected", descriptionText: text, displayed: false)
+	} else if (name == "tested") {
+		text = "$device.displayName was tested"
+		results << createEvent(name: "smoke",          value: "tested", descriptionText: text, displayed: false)
+		results << createEvent(name: "carbonMonoxide", value: "tested", descriptionText: text, displayed: false)
+	} else if (name == "smokeClear") {
+		text = "$device.displayName smoke is clear"
+		results << createEvent(name: "smoke",          value: "clear", descriptionText: text, displayed: false)
+		name = "clear"
+	} else if (name == "carbonMonoxideClear") {
+		text = "$device.displayName carbon monoxide is clear"
+		results << createEvent(name: "carbonMonoxide", value: "clear", descriptionText: text, displayed: false)
+		name = "clear"
+	} else if (name == "testClear") {
+		text = "$device.displayName smoke is clear"
+		results << createEvent(name: "smoke",          value: "clear", descriptionText: text, displayed: false)
+		results << createEvent(name: "carbonMonoxide", value: "clear", displayed: false)
+		name = "clear"
 	}
 	// This composite event is used for updating the tile
 	results << createEvent(name: "alarmState", value: name, descriptionText: text)
@@ -124,10 +117,8 @@ def zwaveEvent(physicalgraph.zwave.commands.alarmv2.AlarmReport cmd, results) {
 			createSmokeOrCOEvents(cmd.alarmLevel ? "tested" : "testClear", results)
 			break
 		case 13:  // sent every hour -- not sure what this means, just a wake up notification?
-			if (cmd.alarmLevel == 255) {
-				results << createEvent(descriptionText: "$device.displayName checked in", isStateChange: false)
-			} else {
-				results << createEvent(descriptionText: "$device.displayName code 13 is $cmd.alarmLevel", isStateChange:true, displayed:false)
+			if (cmd.alarmLevel != 255) {
+				results << createEvent(descriptionText: "$device.displayName code 13 is $cmd.alarmLevel", displayed: true)
 			}
 			
 			// Clear smoke in case they pulled batteries and we missed the clear msg
@@ -136,8 +127,9 @@ def zwaveEvent(physicalgraph.zwave.commands.alarmv2.AlarmReport cmd, results) {
 			}
 			
 			// Check battery if we don't have a recent battery event
-			if (!state.lastbatt || (now() - state.lastbatt) >= 48*60*60*1000) {
-				results << response(zwave.batteryV1.batteryGet())
+			def prevBattery = device.currentState("battery")
+			if (!prevBattery || (new Date().time - prevBattery.date.time)/60000 >= 60 * 53) {
+				results << new physicalgraph.device.HubAction(zwave.batteryV1.batteryGet().format())
 			}
 			break
 		default:
@@ -166,17 +158,12 @@ def zwaveEvent(physicalgraph.zwave.commands.sensoralarmv1.SensorAlarmReport cmd,
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd, results) {
+	results << new physicalgraph.device.HubAction(zwave.wakeUpV1.wakeUpNoMoreInformation().format())
 	results << createEvent(descriptionText: "$device.displayName woke up", isStateChange: false)
-	if (!state.lastbatt || (now() - state.lastbatt) >= 56*60*60*1000) {
-		results << response(zwave.batteryV1.batteryGet(), "delay 2000", zwave.wakeUpV1.wakeUpNoMoreInformation())
-	} else {
-		results << response(zwave.wakeUpV1.wakeUpNoMoreInformation())
-	}
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd, results) {
-	def map = [ name: "battery", unit: "%", isStateChange: true ]
-	state.lastbatt = now()
+	def map = [ name: "battery", unit: "%" ]
 	if (cmd.batteryLevel == 0xFF) {
 		map.value = 1
 		map.descriptionText = "$device.displayName battery is low!"

smartapps/com-vinli-smartthings/vinli-home-connect.src/vinli-home-connect.groovy

@@ -67,11 +67,11 @@ mappings {
 def listAllDevices() {
    	def resp = []
    	switches.each {
-      resp << [name: it.name, label: it.label, value: it.currentValue("switch"), type: "switch", id: it.id, hub: it.hub?.name]
+      resp << [name: it.name, label: it.label, value: it.currentValue("switch"), type: "switch", id: it.id, hub: it.hub.name]
     }
     
     locks.each {
-      resp << [name: it.name, label: it.label, value: it.currentValue("lock"), type: "lock", id: it.id, hub: it.hub?.name]
+      resp << [name: it.name, label: it.label, value: it.currentValue("lock"), type: "lock", id: it.id, hub: it.hub.name]
     }
     return resp
 }

smartapps/smartthings/ecobee-connect.src/ecobee-connect.groovy

@@ -463,32 +463,29 @@ def pollChildren(child = null) {
 }
 
 // Poll Child is invoked from the Child Device itself as part of the Poll Capability
-def pollChild(){
+def pollChild(child){
 
-	def devices = getChildDevices()
-
-	if (pollChildren()){
-		devices.each { child ->
-			if (!child.device.deviceNetworkId.startsWith("ecobee_sensor")){
-				if(atomicState.thermostats[child.device.deviceNetworkId] != null) {
-					def tData = atomicState.thermostats[child.device.deviceNetworkId]
-					log.info "pollChild(child)>> data for ${child.device.deviceNetworkId} : ${tData.data}"
-					child.generateEvent(tData.data) //parse received message from parent
-				} else if(atomicState.thermostats[child.device.deviceNetworkId] == null) {
-					log.error "ERROR: Device connection removed? no data for ${child.device.deviceNetworkId}"
-					return null
-				}
+	if (pollChildren(child)){
+		if (!child.device.deviceNetworkId.startsWith("ecobee_sensor")){
+			if(atomicState.thermostats[child.device.deviceNetworkId] != null) {
+				def tData = atomicState.thermostats[child.device.deviceNetworkId]
+				log.info "pollChild(child)>> data for ${child.device.deviceNetworkId} : ${tData.data}"
+				child.generateEvent(tData.data) //parse received message from parent
+			} else if(atomicState.thermostats[child.device.deviceNetworkId] == null) {
+				log.error "ERROR: Device connection removed? no data for ${child.device.deviceNetworkId}"
+				return null
 			}
 		}
 	} else {
-		log.info "ERROR: pollChildren()"
+		log.info "ERROR: pollChildren(child) for ${child.device.deviceNetworkId} after polling"
 		return null
 	}
 
 }
 
 void poll() {
-	pollChild()
+	def devices = getChildDevices()
+	devices.each {pollChild(it)}
 }
 
 def availableModes(child) {

smartapps/smartthings/hue-connect.src/hue-connect.groovy

@@ -24,7 +24,7 @@ definition(
 	category: "SmartThings Labs",
 	iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/hue.png",
 	iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/hue@2x.png",
-    singleInstance: true
+        //singleInstance: true
 )
 
 preferences {
@@ -68,7 +68,7 @@ def bridgeDiscovery(params=[:])
 	}
 
 	//setup.xml request every 3 seconds except on discoveries
-	if(((bridgeRefreshCount % 3) == 0) && ((bridgeRefreshCount % 5) != 0)) {
+	if(((bridgeRefreshCount % 1) == 0) && ((bridgeRefreshCount % 5) != 0)) {
 		verifyHueBridges()
 	}
 
@@ -175,7 +175,6 @@ private discoverHueBulbs() {
 }
 
 private verifyHueBridge(String deviceNetworkId, String host) {
-	log.trace "Verify Hue Bridge $deviceNetworkId"
 	sendHubCommand(new physicalgraph.device.HubAction([
 		method: "GET",
 		path: "/description.xml",
@@ -603,20 +602,6 @@ def parse(childDevice, description) {
 	}
 }
 
-def hubVerification(bodytext) {
-	log.trace "Bridge sent back description.xml for verification"
-    def body = new XmlSlurper().parseText(bodytext)
-    if (body?.device?.modelName?.text().startsWith("Philips hue bridge")) {
-        def bridges = getHueBridges()
-        def bridge = bridges.find {it?.key?.contains(body?.device?.UDN?.text())}
-        if (bridge) {
-            bridge.value << [name:body?.device?.friendlyName?.text(), serialNumber:body?.device?.serialNumber?.text(), verified: true]
-        } else {
-            log.error "/description.xml returned a bridge that didn't exist"
-        }
-    }
-}
-
 def on(childDevice) {
 	log.debug "Executing 'on'"
 	put("lights/${getId(childDevice)}/state", [on: true])
@@ -658,25 +643,21 @@ def setColorTemperature(childDevice, huesettings) {
 
 def setColor(childDevice, huesettings) {
 	log.debug "Executing 'setColor($huesettings)'"
-    def hue = null
-    def sat = null
-    def xy = null
-    if (huesettings.hex) {
-    	xy = getHextoXY(huesettings.hex)
-    } else if (huesettings.hue && huesettings.saturation) {
-		hue = Math.min(Math.round(huesettings.hue * 65535 / 100), 65535)
-		sat = Math.min(Math.round(huesettings.saturation * 255 / 100), 255)
-    }
+	def hue = Math.min(Math.round(huesettings.hue * 65535 / 100), 65535)
+	def sat = Math.min(Math.round(huesettings.saturation * 255 / 100), 255)
     def alert = huesettings.alert ? huesettings.alert : "none"
     def transition = huesettings.transition ? huesettings.transition : 4
 
-	def value = [xy: xy, sat: sat, hue: hue, alert: alert, transitiontime: transition, on: true]
-
+	def value = [sat: sat, hue: hue, alert: alert, transitiontime: transition]
 	if (huesettings.level != null) {
         if (huesettings.level == 1) value.bri = 1 else value.bri = Math.min(Math.round(huesettings.level * 255 / 100), 255)
 		value.on = value.bri > 0
 	}
 
+	if (huesettings.switch) {
+		value.on = huesettings.switch == "on"
+	}
+
 	log.debug "sending command $value"
 	put("lights/${getId(childDevice)}/state", value)
 }
@@ -762,59 +743,6 @@ private getBridgeIP() {
     return host
 }
 
-private getHextoXY(String colorStr) {
-    // For the hue bulb the corners of the triangle are:
-    // -Red: 0.675, 0.322
-    // -Green: 0.4091, 0.518
-    // -Blue: 0.167, 0.04
-
-    def cred = Integer.valueOf( colorStr.substring( 1, 3 ), 16 )
-    def cgreen = Integer.valueOf( colorStr.substring( 3, 5 ), 16 )
-    def cblue = Integer.valueOf( colorStr.substring( 5, 7 ), 16 )
-
-    double[] normalizedToOne = new double[3];
-    normalizedToOne[0] = (cred / 255);
-    normalizedToOne[1] = (cgreen / 255);
-    normalizedToOne[2] = (cblue / 255);
-    float red, green, blue;
-
-    // Make red more vivid
-    if (normalizedToOne[0] > 0.04045) {
-        red = (float) Math.pow(
-                (normalizedToOne[0] + 0.055) / (1.0 + 0.055), 2.4);
-    } else {
-        red = (float) (normalizedToOne[0] / 12.92);
-    }
-
-    // Make green more vivid
-    if (normalizedToOne[1] > 0.04045) {
-        green = (float) Math.pow((normalizedToOne[1] + 0.055)
-                / (1.0 + 0.055), 2.4);
-    } else {
-        green = (float) (normalizedToOne[1] / 12.92);
-    }
-
-    // Make blue more vivid
-    if (normalizedToOne[2] > 0.04045) {
-        blue = (float) Math.pow((normalizedToOne[2] + 0.055)
-                / (1.0 + 0.055), 2.4);
-    } else {
-        blue = (float) (normalizedToOne[2] / 12.92);
-    }
-
-    float X = (float) (red * 0.649926 + green * 0.103455 + blue * 0.197109);
-    float Y = (float) (red * 0.234327 + green * 0.743075 + blue * 0.022598);
-    float Z = (float) (red * 0.0000000 + green * 0.053077 + blue * 1.035763);
-
-    float x = X / (X + Y + Z);
-    float y = Y / (X + Y + Z);
-
-    double[] xy = new double[2];
-    xy[0] = x;
-    xy[1] = y;
-    return xy;
-}
-
 private Integer convertHexToInt(hex) {
 	Integer.parseInt(hex,16)
 }

smartapps/smartthings/notify-me-when.src/i18n/messages.properties

@@ -1,31 +1,31 @@
-'''Acceleration Detected'''.ko=가속이 감지되었을 때
-'''Arrival Of'''.ko=도착했을 때
-'''Both Push and SMS?'''.ko=푸시 알람과 SMS 모두 사용
-'''Button Pushed'''.ko=버튼이 눌렸을 때
-'''Contact Closes'''.ko=닫힘이 감지되었을 때
-'''Contact Opens'''.ko=열림이 감지되었을 때
-'''Departure Of'''.ko=출발할 때
+'''Acceleration Detected'''.ko=가속화 감지됨
+'''Arrival Of'''.ko=도착
+'''Both Push and SMS?'''.ko=푸시 메시지와 SMS를 모두 사용하시겠습니까?
+'''Button Pushed'''.ko=버튼이 눌렸습니다
+'''Contact Closes'''.ko=접점 닫힘
+'''Contact Opens'''.ko=접점 열림
+'''Departure Of'''.ko=출발
 '''Message Text'''.ko=문자 메시지
-'''Minutes'''.ko=메시지 전송 간격(분)
-'''Motion Here'''.ko=움직임이 감지되었을 때
-'''Phone Number (for SMS, optional)'''.ko=전화번호 (옵션)
+'''Minutes'''.ko=분
+'''Motion Here'''.ko=동작
+'''Phone Number (for SMS, optional)'''.ko=휴대전화 번호(문자 메시지 - 옵션)
 '''Receive notifications when anything happens in your home.'''.ko=집 안에 무슨 일이 일어나면 알림이 전송됩니다.
-'''Smoke Detected'''.ko=연기가 감지되었을 때
-'''Switch Turned Off'''.ko=스위치가 꺼졌을 때
-'''Switch Turned On'''.ko=스위치가 켜졌을 때
-'''Choose one or more, when...'''.ko=다음 상황 중 하나 이상 선택
+'''Smoke Detected'''.ko=연기가 감지되었습니다
+'''Switch Turned Off'''.ko=스위치 꺼짐
+'''Switch Turned On'''.ko=스위치 꺼짐
+'''Choose one or more, when...'''.ko=다음의 경우 하나 이상 선택
 '''Yes'''.ko=예
 '''No'''.ko=아니요
-'''Send this message (optional, sends standard status message if not specified)'''.ko=메시지 작성 (작성하지 않을 경우 디폴트 메시지 전송)
-'''Via a push notification and/or an SMS message'''.ko=푸시 알람 및 SMS 설정
-'''Set for specific mode(s)'''.ko=특정 상태 설정
+'''Send this message (optional, sends standard status message if not specified)'''.ko=이 메시지 전송(선택적, 지정되지 않은 경우 표준 상태 메시지를 보냅니다)
+'''Via a push notification and/or an SMS message'''.ko=푸시 알림 및/또는 문자 메시지를 통해
+'''Set for specific mode(s)'''.ko=특정 모드 설정
 '''Tap to set'''.ko=눌러서 설정
-'''Minimum time between messages (optional, defaults to every message)'''.ko=메시지 전송 간격 설정
-'''If outside the US please make sure to enter the proper country code'''.ko=미국 이외 국가에 거주한다면 국가 코드와 함께 입력하여 주세요.
-'''Water Sensor Wet'''.ko=누수가 감지되었을 때
+'''Minimum time between messages (optional, defaults to every message)'''.ko=메시지작 간 최소 시간(선택 사항, 모든 메시지의 기본 설정)
+'''If outside the US please make sure to enter the proper country code'''.ko=미국 이외 거주자는 적절한 국가 코드를 입력했는지 확인하십시오
+'''Water Sensor Wet'''.ko=Water Sensor에서 물이 감지되었습니다
 '''{{ triggerEvent.linkText }} has arrived at the {{ location.name }}'''.ko={{ triggerEvent.linkText }}님이 {{ location.name }}에 도착했습니다
 '''{{ triggerEvent.linkText }} has arrived at {{ location.name }}'''.ko={{ triggerEvent.linkText }}님이 {{ location.name }}에 도착했습니다
 '''{{ triggerEvent.linkText }} has left the {{ location.name }}'''.ko={{ triggerEvent.linkText }}님이 {{ location.name }}을(를) 떠났습니다
 '''{{ triggerEvent.linkText }} has left {{ location.name }}'''.ko={{ triggerEvent.linkText }}님이 {{ location.name }}을(를) 떠났습니다
-'''Assign a name'''.ko=이름 설정
-'''Choose Modes'''.ko=상태 선택
+'''Assign a name'''.ko=이름 배정
+'''Choose Modes'''.ko=모드 선택

smartapps/smartthings/speaker-notify-with-sound.src/speaker-notify-with-sound.groovy

@@ -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,15 +408,13 @@ private loadText() {
 		case "Lightsaber":
 			state.sound = [uri: "http://s3.amazonaws.com/smartapp-media/sonos/lightsaber.mp3", duration: "10"]
 			break;
-		case "Custom Message":
-			if (message) {
+		default:
+			/*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;
 	}

smartapps/smartthings/virtual-thermostat.src/virtual-thermostat.groovy

@@ -1,143 +1,142 @@
-/**
- *  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.
- *
- *  Virtual Thermostat
- *
- *  Author: SmartThings
- */
-definition(
-    name: "Virtual Thermostat",
-    namespace: "smartthings",
-    author: "SmartThings",
-    description: "Control a space heater or window air conditioner in conjunction with any temperature sensor, like a SmartSense Multi.",
-    category: "Green Living",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Meta/temp_thermo-switch.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Meta/temp_thermo-switch@2x.png"
-)
-
-preferences {
-	section("Choose a temperature sensor... "){
-		input "sensor", "capability.temperatureMeasurement", title: "Sensor"
-	}
-	section("Select the heater or air conditioner outlet(s)... "){
-		input "outlets", "capability.switch", title: "Outlets", multiple: true
-	}
-	section("Set the desired temperature..."){
-		input "setpoint", "decimal", title: "Set Temp"
-	}
-	section("When there's been movement from (optional, leave blank to not require motion)..."){
-		input "motion", "capability.motionSensor", title: "Motion", required: false
-	}
-	section("Within this number of minutes..."){
-		input "minutes", "number", title: "Minutes", required: false
-	}
-	section("But never go below (or above if A/C) this value with or without motion..."){
-		input "emergencySetpoint", "decimal", title: "Emer Temp", required: false
-	}
-	section("Select 'heat' for a heater and 'cool' for an air conditioner..."){
-		input "mode", "enum", title: "Heating or cooling?", options: ["heat","cool"]
-	}
-}
-
-def installed()
-{
-	subscribe(sensor, "temperature", temperatureHandler)
-	if (motion) {
-		subscribe(motion, "motion", motionHandler)
-	}
-}
-
-def updated()
-{
-	unsubscribe()
-	subscribe(sensor, "temperature", temperatureHandler)
-	if (motion) {
-		subscribe(motion, "motion", motionHandler)
-	}
-}
-
-def temperatureHandler(evt)
-{
-	def isActive = hasBeenRecentMotion()
-	if (isActive || emergencySetpoint) {
-		evaluate(evt.doubleValue, isActive ? setpoint : emergencySetpoint)
-	}
-	else {
-		outlets.off()
-	}
-}
-
-def motionHandler(evt)
-{
-	if (evt.value == "active") {
-		def lastTemp = sensor.currentTemperature
-		if (lastTemp != null) {
-			evaluate(lastTemp, setpoint)
-		}
-	} else if (evt.value == "inactive") {
-		def isActive = hasBeenRecentMotion()
-		log.debug "INACTIVE($isActive)"
-		if (isActive || emergencySetpoint) {
-			def lastTemp = sensor.currentTemperature
-			if (lastTemp != null) {
-				evaluate(lastTemp, isActive ? setpoint : emergencySetpoint)
-			}
-		}
-		else {
-			outlets.off()
-		}
-	}
-}
-
-private evaluate(currentTemp, desiredTemp)
-{
-	log.debug "EVALUATE($currentTemp, $desiredTemp)"
-	def threshold = 1.0
-	if (mode == "cool") {
-		// air conditioner
-		if (currentTemp - desiredTemp >= threshold) {
-			outlets.on()
-		}
-		else if (desiredTemp - currentTemp >= threshold) {
-			outlets.off()
-		}
-	}
-	else {
-		// heater
-		if (desiredTemp - currentTemp >= threshold) {
-			outlets.on()
-		}
-		else if (currentTemp - desiredTemp >= threshold) {
-			outlets.off()
-		}
-	}
-}
-
-private hasBeenRecentMotion()
-{
-	def isActive = false
-	if (motion && minutes) {
-		def deltaMinutes = minutes as Long
-		if (deltaMinutes) {
-			def motionEvents = motion.eventsSince(new Date(now() - (60000 * deltaMinutes)))
-			log.trace "Found ${motionEvents?.size() ?: 0} events in the last $deltaMinutes minutes"
-			if (motionEvents.find { it.value == "active" }) {
-				isActive = true
-			}
-		}
-	}
-	else {
-		isActive = true
-	}
-	isActive
-}
-
+/**
+ *  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.
+ *
+ *  Virtual Thermostat
+ *
+ *  Author: SmartThings
+ */
+definition(
+    name: "Virtual Thermostat",
+    namespace: "smartthings",
+    author: "SmartThings",
+    description: "Control a space heater or window air conditioner in conjunction with any temperature sensor, like a SmartSense Multi.",
+    category: "Green Living",
+    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Meta/temp_thermo-switch.png",
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Meta/temp_thermo-switch@2x.png"
+)
+
+preferences {
+	section("Choose a temperature sensor... "){
+		input "sensor", "capability.temperatureMeasurement", title: "Sensor"
+	}
+	section("Select the heater or air conditioner outlet(s)... "){
+		input "outlets", "capability.switch", title: "Outlets", multiple: true
+	}
+	section("Set the desired temperature..."){
+		input "setpoint", "decimal", title: "Set Temp"
+	}
+	section("When there's been movement from (optional, leave blank to not require motion)..."){
+		input "motion", "capability.motionSensor", title: "Motion", required: false
+	}
+	section("Within this number of minutes..."){
+		input "minutes", "number", title: "Minutes", required: false
+	}
+	section("But never go below (or above if A/C) this value with or without motion..."){
+		input "emergencySetpoint", "decimal", title: "Emer Temp", required: false
+	}
+	section("Select 'heat' for a heater and 'cool' for an air conditioner..."){
+		input "mode", "enum", title: "Heating or cooling?", options: ["heat","cool"]
+	}
+}
+
+def installed()
+{
+	subscribe(sensor, "temperature", temperatureHandler)
+	if (motion) {
+		subscribe(motion, "motion", motionHandler)
+	}
+}
+
+def updated()
+{
+	unsubscribe()
+	subscribe(sensor, "temperature", temperatureHandler)
+	if (motion) {
+		subscribe(motion, "motion", motionHandler)
+	}
+}
+
+def temperatureHandler(evt)
+{
+	def isActive = hasBeenRecentMotion()
+	if (isActive || emergencySetpoint) {
+		evaluate(evt.doubleValue, isActive ? setpoint : emergencySetpoint)
+	}
+	else {
+		outlets.off()
+	}
+}
+
+def motionHandler(evt)
+{
+	if (evt.value == "active") {
+		def lastTemp = sensor.currentTemperature
+		if (lastTemp != null) {
+			evaluate(lastTemp, setpoint)
+		}
+	} else if (evt.value == "inactive") {
+		def isActive = hasBeenRecentMotion()
+		log.debug "INACTIVE($isActive)"
+		if (isActive || emergencySetpoint) {
+			def lastTemp = sensor.currentTemperature
+			if (lastTemp != null) {
+				evaluate(lastTemp, isActive ? setpoint : emergencySetpoint)
+			}
+		}
+		else {
+			outlets.off()
+		}
+	}
+}
+
+private evaluate(currentTemp, desiredTemp)
+{
+	log.debug "EVALUATE($currentTemp, $desiredTemp)"
+	def threshold = 1.0
+	if (mode == "cool") {
+		// air conditioner
+		if (currentTemp - desiredTemp >= threshold) {
+			outlets.on()
+		}
+		else if (desiredTemp - currentTemp >= threshold) {
+			outlets.off()
+		}
+	}
+	else {
+		// heater
+		if (desiredTemp - currentTemp >= threshold) {
+			outlets.on()
+		}
+		else if (currentTemp - desiredTemp >= threshold) {
+			outlets.off()
+		}
+	}
+}
+
+private hasBeenRecentMotion()
+{
+	def isActive = false
+	if (motion && minutes) {
+		def deltaMinutes = minutes as Long
+		if (deltaMinutes) {
+			def motionEvents = motion.eventsSince(new Date(now() - (60000 * deltaMinutes)))
+			log.trace "Found ${motionEvents?.size() ?: 0} events in the last $deltaMinutes minutes"
+			if (motionEvents.find { it.value == "active" }) {
+				isActive = true
+			}
+		}
+	}
+	else {
+		isActive = true
+	}
+	isActive
+}

smartapps/smartthings/wemo-connect.src/wemo-connect.groovy

@@ -234,7 +234,7 @@ def addSwitches() {
 		def d
 		if (selectedSwitch) {
 			d = getChildDevices()?.find {
-				it.deviceNetworkId == selectedSwitch.value.mac || it.device.getDataValue("mac") == selectedSwitch.value.mac
+				it.dni == selectedSwitch.value.mac || it.device.getDataValue("mac") == selectedSwitch.value.mac
 			}
 		}
 
@@ -265,7 +265,7 @@ def addMotions() {
 		def d
 		if (selectedMotion) {
 			d = getChildDevices()?.find {
-				it.deviceNetworkId == selectedMotion.value.mac || it.device.getDataValue("mac") == selectedMotion.value.mac
+				it.dni == selectedMotion.value.mac || it.device.getDataValue("mac") == selectedMotion.value.mac
 			}
 		}
 
@@ -296,7 +296,7 @@ def addLightSwitches() {
 		def d
 		if (selectedLightSwitch) {
 			d = getChildDevices()?.find {
-				it.deviceNetworkId == selectedLightSwitch.value.mac || it.device.getDataValue("mac") == selectedLightSwitch.value.mac
+				it.dni == selectedLightSwitch.value.mac || it.device.getDataValue("mac") == selectedLightSwitch.value.mac
 			}
 		}
 

smartapps/test/test.src/test.groovy

@@ -1,50 +0,0 @@
-/**
- *  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.
- *
- */
-definition(
-    name: "test 앱",
-    namespace: "test앱",
-    author: "이진희",
-    description: "\uD14C\uC2A4\uD2B8\uC785\uB2C8\uB2E4",
-    category: "",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png")
-
-
-preferences {
-	section("Title") {
-		// TODO: put inputs here
-	}
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-
-	unsubscribe()
-	initialize()
-}
-
-def initialize() {
-	// TODO: subscribe to attributes, devices, locations, etc.
-}
-
-// TODO: implement event handlers

smartapps/tslagle13/vacation-lighting-director.src/vacation-lighting-director.groovy

@@ -1,17 +1,11 @@
 /**
  *  Vacation Lighting Director
  * 
- * Version  2.5 - Moved scheduling over to Cron and added time as a trigger. 
- *				  Cleaned up formatting and some typos.
- *                Updated license.
- *                Made people option optional
- * 				  Added sttement to unschedule on mode change if people option is not selected
- *
- * Version  2.4 - Added information paragraphs
+ *  Version  2.4 - Added information paragraphs
  * 
  *  Source code can be found here: https://github.com/tslagle13/SmartThings/blob/master/smartapps/tslagle13/vacation-lighting-director.groovy
  *
- *  Copyright 2016 Tim Slagle
+ *  Copyright 2015 Tim Slagle
  *
  *  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:
@@ -57,7 +51,8 @@ def pageSetup() {
 	return dynamicPage(pageProperties) {
     	section(""){
         	paragraph "This app can be used to make your home seem occupied anytime you are away from your home. " +
-			"Please use each of the the sections below to setup the different preferences to your liking. " 
+			"Please use each othe the sections below to setup the different preferences to your liking. " +
+			"I recommend this app be used with at least two away modes.  An example would be 'Away Day' 'and Away Night'. " 
         }
         section("Setup Menu") {
             href "Setup", title: "Setup", description: "", state:greyedOut()
@@ -75,7 +70,7 @@ def Setup() {
     def newMode = [
         name:       	"newMode",
         type:       	"mode",
-        title:      	"Modes",
+        title:      	"Which?",
         multiple:   	true,
         required:   	true
     ]
@@ -101,6 +96,14 @@ def Setup() {
         required:	true,
     ]
     
+    def people = [
+        name:       "people",
+        type:       "capability.presenceSensor",
+        title:      "If these people are home do not change light status",
+        required:	true,
+        multiple:	true
+    ]
+    
     def pageName = "Setup"
     
     def pageProperties = [
@@ -113,11 +116,10 @@ def Setup() {
 
 		section(""){            
                     paragraph "In this section you need to setup the deatils of how you want your lighting to be affected while " +
-                    "you are away.  All of these settings are required in order for the simulator to run correctly."
+                    paragraph "you are away.  All of these settings are required in order for the simulator to run correctly."
         }
-        section("Simulator Triggers") {
-                    input newMode  
-                    href "timeIntervalInput", title: "Times", description: timeIntervalLabel(), refreshAfterSelection:true
+        section("Which mode change triggers the simulator? (This app will only run in selected mode(s))") {
+                    input newMode           
         }
         section("Light switches to turn on/off") {
                     input switches           
@@ -128,6 +130,9 @@ def Setup() {
         section("Number of active lights at any given time") {
                     input number_of_active_lights           
         }    
+        section("People") {
+                    input people            
+        }
     }
     
 }
@@ -157,29 +162,18 @@ def Settings() {
         title:      "Settings",
         nextPage:   "pageSetup"
     ]
-    
-    def people = [
-        name:       "people",
-        type:       "capability.presenceSensor",
-        title:      "If these people are home do not change light status",
-        required:	false,
-        multiple:	true
-    ]
 
     return dynamicPage(pageProperties) {
 
 		section(""){              
                     paragraph "In this section you can restrict how your simulator runs.  For instance you can restrict on which days it will run " +
-                    "as well as a delay for the simulator to start after it is in the correct mode.  Delaying the simulator helps with false starts based on a incorrect mode change."
+                    paragraph "as well as a delay for the simulator to start after it is in the correct mode.  Delaying the simulator helps with false starts based on a incorrect mode change."
         }
         section("Delay to start simulator") {
                     input falseAlarmThreshold
         }
-        section("People") {
-        			paragraph "Not using this setting may cause some lights to remain on when you arrive home"
-                    input people            
-        }
         section("More options") {
+                    href "timeIntervalInput", title: "Only during a certain time", description: getTimeLabel(starting, ending), state: greyedOutTime(starting, ending), refreshAfterSelection:true
                     input days
         } 
     }   
@@ -187,24 +181,9 @@ def Settings() {
 
 page(name: "timeIntervalInput", title: "Only during a certain time", refreshAfterSelection:true) {
 		section {
-			input "startTimeType", "enum", title: "Starting at", options: [["time": "A specific time"], ["sunrise": "Sunrise"], ["sunset": "Sunset"]], defaultValue: "time", submitOnChange: true
-			if (startTimeType in ["sunrise","sunset"]) {
-				input "startTimeOffset", "number", title: "Offset in minutes (+/-)", range: "*..*", required: false
-			}
-			else {
-				input "starting", "time", title: "Start time", required: false
-			}
+			input "starting", "time", title: "Starting", required: false 
+			input "ending", "time", title: "Ending", required: false 
 		}
-		section {
-			input "endTimeType", "enum", title: "Ending at", options: [["time": "A specific time"], ["sunrise": "Sunrise"], ["sunset": "Sunset"]], defaultValue: "time", submitOnChange: true
-			if (endTimeType in ["sunrise","sunset"]) {
-				input "endTimeOffset", "number", title: "Offset in minutes (+/-)", range: "*..*", required: false
-			}
-			else {
-				input "ending", "time", title: "End time", required: false
-			}
-		}
-        
 }
 
 def installed() {
@@ -222,13 +201,10 @@ def initialize(){
 	if (newMode != null) {
 		subscribe(location, modeChangeHandler)
     }
-    if (starting != null) {
-    	schedule(starting, modeChangeHandler)
-    }
-    log.debug "Installed with settings: ${settings}"
 }
 
 def modeChangeHandler(evt) {
+	log.debug "Mode change to: ${evt.value}"
 		def delay = (falseAlarmThreshold != null && falseAlarmThreshold != "") ? falseAlarmThreshold * 60 : 2 * 60  
     	runIn(delay, scheduleCheck)
 }
@@ -236,54 +212,48 @@ def modeChangeHandler(evt) {
 
 //Main logic to pick a random set of lights from the large set of lights to turn on and then turn the rest off
 def scheduleCheck(evt) {
-    if(allOk){
-        log.debug("Running")
-        // turn off all the switches
-        switches.off()
-        
-        // grab a random switch
-        def random = new Random()
-        def inactive_switches = switches
-        for (int i = 0 ; i < number_of_active_lights ; i++) {
-            // if there are no inactive switches to turn on then let's break
-            if (inactive_switches.size() == 0){
-                break
-            }
-            
-            // grab a random switch and turn it on
-            def random_int = random.nextInt(inactive_switches.size())
-            inactive_switches[random_int].on()
-            
-            // then remove that switch from the pool off switches that can be turned on
-            inactive_switches.remove(random_int)
-        }
-        
-        // re-run again when the frequency demands it
-        schedule("0 0/${frequency_minutes} * 1/1 * ? *", scheduleCheck)
+if(allOk){
+log.debug("Running")
+  // turn off all the switches
+  switches.off()
+
+  // grab a random switch
+  def random = new Random()
+  def inactive_switches = switches
+  for (int i = 0 ; i < number_of_active_lights ; i++) {
+    // if there are no inactive switches to turn on then let's break
+    if (inactive_switches.size() == 0){
+      break
     }
-    //Check to see if mode is ok but not time/day.  If mode is still ok, check again after frequency period.
-    else if (modeOk) {
-        log.debug("mode OK.  Running again")
-        switches.off()
-    }
-    //if none is ok turn off frequency check and turn off lights.
-    else {
-    	if(people){
-        	//don't turn off lights if anyone is home
-        	if(someoneIsHome()){
-        	    log.debug("Stopping Check for Light")
-        	    unschedule()
-        	}
-        	else{
-        	    log.debug("Stopping Check for Light and turning off all lights")
-        	    switches.off()
-        	    unschedule()
-        	}
+
+    // grab a random switch and turn it on
+    def random_int = random.nextInt(inactive_switches.size())
+    inactive_switches[random_int].on()
+
+    // then remove that switch from the pool off switches that can be turned on
+    inactive_switches.remove(random_int)
+  }
+
+  // re-run again when the frequency demands it
+  runIn(frequency_minutes * 60, scheduleCheck)
+}
+//Check to see if mode is ok but not time/day.  If mode is still ok, check again after frequency period.
+else if (modeOk) {
+	log.debug("mode OK.  Running again")
+	runIn(frequency_minutes * 60, scheduleCheck)
+    switches.off()
+}
+//if none is ok turn off frequency check and turn off lights.
+else if(people){
+    //don't turn off lights if anyone is home
+		if(someoneIsHome()){
+		log.debug("Stopping Check for Light")
     	}
-        else if (!modeOk) {
-        	unschedule()
-        }
+        else{
+    log.debug("Stopping Check for Light and turning off all lights")
+	switches.off()
     }
+}
 }      
 
 
@@ -316,6 +286,26 @@ private getDaysOk() {
 	result
 }
 
+private getTimeOk() {
+	def result = true
+	if (starting && ending) {
+		def currTime = now()
+		def start = timeToday(starting).time
+		def stop = timeToday(ending).time
+		result = start < stop ? currTime >= start && currTime <= stop : currTime <= stop || currTime >= start
+	}
+    
+    else if (starting){
+    	result = currTime >= start
+    }
+    else if (ending){
+    	result = currTime <= stop
+    }
+    
+	log.trace "timeOk = $result"
+	result
+}
+
 private getHomeIsEmpty() {
   def result = true
 
@@ -340,59 +330,25 @@ private getSomeoneIsHome() {
   return result
 }
 
-private getTimeOk() {
-	def result = true
-	def start = timeWindowStart()
-	def stop = timeWindowStop()
-	if (start && stop && location.timeZone) {
-		result = timeOfDayIsBetween(start, stop, new Date(), location.timeZone)
-	}
-	log.trace "timeOk = $result"
-	result
-}
-
-private timeWindowStart() {
-	def result = null
-	if (startTimeType == "sunrise") {
-		result = location.currentState("sunriseTime")?.dateValue
-		if (result && startTimeOffset) {
-			result = new Date(result.time + Math.round(startTimeOffset * 60000))
-		}
-	}
-	else if (startTimeType == "sunset") {
-		result = location.currentState("sunsetTime")?.dateValue
-		if (result && startTimeOffset) {
-			result = new Date(result.time + Math.round(startTimeOffset * 60000))
-		}
-	}
-	else if (starting && location.timeZone) {
-		result = timeToday(starting, location.timeZone)
-	}
-	log.trace "timeWindowStart = ${result}"
-	result
-}
-
-private timeWindowStop() {
-	def result = null
-	if (endTimeType == "sunrise") {
-		result = location.currentState("sunriseTime")?.dateValue
-		if (result && endTimeOffset) {
-			result = new Date(result.time + Math.round(endTimeOffset * 60000))
-		}
-	}
-	else if (endTimeType == "sunset") {
-		result = location.currentState("sunsetTime")?.dateValue
-		if (result && endTimeOffset) {
-			result = new Date(result.time + Math.round(endTimeOffset * 60000))
-		}
-	}
-	else if (ending && location.timeZone) {
-		result = timeToday(ending, location.timeZone)
-	}
-	log.trace "timeWindowStop = ${result}"
-	result
+
+//gets the label for time restriction. Label phrasing changes depending on if there is both start and stop times or just one start/stop time.
+def getTimeLabel(starting, ending){
+
+	def timeLabel = "Tap to set"
+	
+    if(starting && ending){
+    	timeLabel = "Between" + " " + hhmm(starting) + " "  + "and" + " " +  hhmm(ending)
+    }
+    else if (starting) {
+		timeLabel = "Start at" + " " + hhmm(starting)
+    }
+    else if(ending){
+    timeLabel = "End at" + hhmm(ending)
+    }
+	timeLabel
 }
 
+//fomrats time to readable format for time label
 private hhmm(time, fmt = "h:mm a")
 {
 	def t = timeToday(time, location.timeZone)
@@ -401,41 +357,6 @@ private hhmm(time, fmt = "h:mm a")
 	f.format(t)
 }
 
-private timeIntervalLabel() {
-	def start = ""
-	switch (startTimeType) {
-		case "time":
-			if (ending) {
-            	start += hhmm(starting)
-            }
-			break
-		case "sunrise":
-		case "sunset":
-        	start += startTimeType[0].toUpperCase() + startTimeType[1..-1]
-			if (startTimeOffset) {
-				start += startTimeOffset > 0 ? "+${startTimeOffset} min" : "${startTimeOffset} min"
-			}
-			break
-	}
-
-    def finish = ""
-	switch (endTimeType) {
-		case "time":
-			if (ending) {
-            	finish += hhmm(ending)
-            }
-			break
-		case "sunrise":
-		case "sunset":
-        	finish += endTimeType[0].toUpperCase() + endTimeType[1..-1]
-			if (endTimeOffset) {
-				finish += endTimeOffset > 0 ? "+${endTimeOffset} min" : "${endTimeOffset} min"
-			}
-			break
-	}
-	start && finish ? "${start} to ${finish}" : ""
-}
-
 //sets complete/not complete for the setup section on the main dynamic page
 def greyedOut(){
 	def result = ""
@@ -448,7 +369,16 @@ def greyedOut(){
 //sets complete/not complete for the settings section on the main dynamic page
 def greyedOutSettings(){
 	def result = ""
-    if (people || days || falseAlarmThreshold ) {
+    if (starting || ending || days || falseAlarmThreshold) {
+    	result = "complete"	
+    }
+    result
+}
+
+//sets complete/not complete for time restriction section in settings
+def greyedOutTime(starting, ending){
+	def result = ""
+    if (starting || ending) {
     	result = "complete"	
     }
     result