Skip to content

Commit e150ea4

Browse files
workingmonkworkingmonk
committed
Merge pull request SmartThingsCommunity#797 from SmartThingsCommunity/staging
Rolling up changes to production from staging 2016-04-19 Release
2 parents e7c1d88 + cdbcab6 commit e150ea4

File tree

12 files changed

+1051
-49
lines changed

12 files changed

+1051
-49
lines changed

‎devicetypes/johnrucker/coopboss-h3vx.src/coopboss-h3vx.groovy‎

Lines changed: 795 additions & 0 deletions
Large diffs are not rendered by default.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
#==============================================================================
2424
# Korean (ko)
2525
# Device Preferences
26-
'''Give your device a name'''.ko=기기 이름 바꾸기
26+
'''Give your device a name'''.ko=기기 이름 설정
2727
'''Set Device Image'''.ko=기기 이미지 설정
28-
'''Presence timeout (minutes)'''.ko=시간 초과. 스마트폰 위치 정보
28+
'''Presence timeout (minutes)'''.ko=알람 유예 시간 설정 (분)
2929
'''Tap to set'''.ko=눌러서 설정
3030
'''Arrival Sensor'''.ko=도착알림 센서
3131
'''${currentValue}% battery'''.ko=${currentValue}% 배터리
3232
# Events / Notifications
33-
'''{{ linkText }} battery was {{ value }}'''.ko={{ linkText }}남아있는 배터리는 {{ value }}입니다.
34-
'''{{ linkText }} has arrived'''.ko={{ linkText }}집에 도착했습니다.
35-
'''{{ linkText }} has left'''.ko={{ linkText }}집을 나갔습니다.
33+
'''{{ linkText }} battery was {{ value }}'''.ko={{ linkText }}의 남은 배터리 {{ value }}
34+
'''{{ linkText }} has arrived'''.ko={{ linkText }} 귀가
35+
'''{{ linkText }} has left'''.ko={{ linkText }} 외출
3636
#==============================================================================

‎devicetypes/smartthings/hue-bloom.src/hue-bloom.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ metadata {
2929
tiles (scale: 2){
3030
multiAttributeTile(name:"rich-control", type: "lighting", width: 6, height: 4, canChangeIcon: true){
3131
tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
32-
attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
33-
attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#C6C7CC", nextState:"turningOn"
34-
attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
35-
attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#C6C7CC", nextState:"turningOn"
32+
attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
33+
attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
34+
attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
35+
attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
3636
}
3737
tileAttribute ("device.level", key: "SLIDER_CONTROL") {
3838
attributeState "level", action:"switch level.setLevel", range:"(0..100)"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ metadata {
2525
tiles(scale: 2) {
2626
multiAttributeTile(name:"rich-control", type: "lighting", canChangeIcon: true){
2727
tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
28-
attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
29-
attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#C6C7CC", nextState:"turningOn"
30-
attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
31-
attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#C6C7CC", nextState:"turningOn"
28+
attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
29+
attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
30+
attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
31+
attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
3232
}
3333
tileAttribute ("device.level", key: "SLIDER_CONTROL") {
3434
attributeState "level", action:"switch level.setLevel", range:"(0..100)"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
#==============================================================================
2424
# Korean (ko)
2525
# Device Preferences
26-
'''Give your device a name'''.ko=기기 이름 바꾸기
26+
'''Give your device a name'''.ko=기기 이름 설정
2727
'''Set Device Image'''.ko=기기 이미지 설정
2828
# Events / Notifications
29-
'''{{ linkText }} has left'''.ko={{ linkText }}집을 나갔습니다.
30-
'''{{ linkText }} has arrived'''.ko={{ linkText }}집에 도착했습니다.
29+
'''{{ linkText }} has left'''.ko={{ linkText }} 외출
30+
'''{{ linkText }} has arrived'''.ko={{ linkText }} 귀가
3131
'''present'''.ko=집안
3232
'''not present'''.ko=외출

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
#==============================================================================
2323
# Korean (ko)
2424
# Device Preferences
25-
'''Give your device a name'''.ko=기기 이름 바꾸기
26-
'''Outlet'''.ko=플러그
25+
'''Give your device a name'''.ko=기기 이름 설정
26+
'''Outlet'''.ko= 스마트 플러그
2727
# Events descriptionText
28-
'''{{ device.displayName }} is On'''.ko={{ device.displayName }}켜졌습니다.
29-
'''{{ device.displayName }} is Off'''.ko={{ device.displayName }}꺼졌습니다.
30-
'''{{ device.displayName }} power is {{ value }} Watts'''.ko={{ device.displayName }} 전원은 {{ value }}와트입니다
31-
'''On'''.ko=켜짐
28+
'''{{ device.displayName }} is On'''.ko={{ device.displayName }} 켜짐
29+
'''{{ device.displayName }} is Off'''.ko={{ device.displayName }} 꺼짐
30+
'''{{ device.displayName }} power is {{ value }} Watts'''.ko={{ device.displayName }} 전력은 {{ value }}와트입니다.
31+
'''On'''.ko= 켜짐
3232
'''Off'''.ko=꺼짐
33-
'''Turning On'''.ko=켜기
34-
'''Turning Off'''.ko=끄기
33+
'''Turning On'''.ko=켜는 중
34+
'''Turning Off'''.ko=끄는 중
3535
#==============================================================================

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
'''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=기준 온도를 원하는대로 몇 도 올리거나 내려서 설정할 수 있습니다.
3232
'''Degrees'''.ko=온도
3333
'''Adjust temperature by this many degrees'''.ko=몇 도씩 온도를 조절하십시오
34-
'''Give your device a name'''.ko=기기 이름 바꾸기
35-
'''Water Leak Sensor'''.ko=누수센서
34+
'''Give your device a name'''.ko=기기 이름 설정
35+
'''Water Leak Sensor'''.ko=누수감지 센서
3636
'''${currentValue}% battery'''.ko=${currentValue}% 배터리
3737
# Events descriptionText
3838
'''{{ device.displayName }} is dry'''.ko={{ device.displayName }}가 건조
3939
'''{{ device.displayName }} is wet'''.ko={{ device.displayName }}누수
40-
'''{{ device.displayName }} was {{ value }}°C'''.ko={{ device.displayName }}이(가) {{ value }}°C였습니다
40+
'''{{ device.displayName }} was {{ value }}°C'''.ko={{ device.displayName }}에서 {{ value }}°C 감지
4141
'''{{ device.displayName }} was {{ value }}°F'''.ko={{ device.displayName }}이(가) {{ value }}°F였습니다
4242
'''{{ device.displayName }} battery has too much power: (> 3.5) volts.'''.ko={{ device.displayName }} 배터리 전력이 너무 높습니다(3.5볼트 초과).
43-
'''{{ device.displayName }} battery was {{ value }}%'''.ko={{ device.displayName }}남아있는 배터리는 {{ value }}%입니다.
43+
'''{{ device.displayName }} battery was {{ value }}%'''.ko={{ device.displayName }}의 남은 배터리 {{ value }}%
4444
#==============================================================================

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@
2828
'''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=기준 온도를 원하는대로 몇 도 올리거나 내려서 설정할 수 있습니다.
2929
'''Degrees'''.ko=온도
3030
'''Adjust temperature by this many degrees'''.ko=몇 도씩 온도를 조절하십시오
31-
'''Give your device a name'''.ko=기기 이름 바꾸기
31+
'''Give your device a name'''.ko=기기 이름 설정
3232
'''Motion Sensor'''.ko=모션 센서
33-
'''motion'''.ko=동작 감지
33+
'''motion'''.ko= 동작 감지
3434
'''no motion'''.ko=동작 없음
3535
'''${currentValue}% battery'''.ko=${currentValue}% 배터리
3636
# Events descriptionText
37-
'''{{ device.displayName }} detected motion'''.ko={{ device.displayName }} 가 움직임을 감지하였습니다.
38-
'''{{ device.displayName }} motion has stopped'''.ko={{ device.displayName }}움직임이 중단되었습니다
39-
'''{{ device.displayName }} was {{ value }}°C'''.ko={{ device.displayName }}이(가){{ value }}°C였습니다.
37+
'''{{ device.displayName }} detected motion'''.ko={{ device.displayName }}에서 움직임이 감지되었습니다.
38+
'''{{ device.displayName }} motion has stopped'''.ko={{ device.displayName }}에서 움직임이 중단되었습니다.
39+
'''{{ device.displayName }} was {{ value }}°C'''.ko={{ device.displayName }}에서 {{ value }}°C 감지
4040
'''{{ device.displayName }} was {{ value }}°F'''.ko={{ device.displayName }}이(가) {{ value }}°F였습니다
4141
'''{{ device.displayName }} battery has too much power: (> 3.5) volts.'''.ko={{ device.displayName }} 배터리 전력이 너무 높습니다(3.5볼트 초과).
42-
'''{{ device.displayName }} battery was {{ value }}%'''.ko={{ device.displayName }}남아있는 배터리는 {{ value }}%입니다.
42+
'''{{ device.displayName }} battery was {{ value }}%'''.ko={{ device.displayName }}의 남은 배터리 {{ value }}%
4343
#==============================================================================

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@
3131
'''Adjust temperature by this many degrees'''.ko=몇 도씩 온도를 조절하십시오
3232
'''Do you want to use this sensor on a garage door?'''.ko=차고 문의 센서 사용 설정하기
3333
'''Tap to set'''.ko=눌러서 설정
34-
'''Give your device a name'''.ko=기기 이름 바꾸기
35-
'''Multipurpose Sensor'''.ko=멀티 센서
34+
'''Give your device a name'''.ko=기기 이름 설정
35+
'''Multipurpose Sensor'''.ko=문 및 창 센서
3636
# Events descriptionText
37-
'''{{ device.displayName }} was opened'''.ko={{ device.displayName }}열림을 감지하였습니다.
38-
'''{{ device.displayName }} was closed'''.ko={{ device.displayName }}닫혔습니다.
39-
'''{{ device.displayName }} was active'''.ko={{ device.displayName }}활성화되었습니다.
40-
'''{{ device.displayName }} was inactive'''.ko={{ device.displayName }}비활성화되었습니다.
41-
'''{{ device.displayName }} was {{ value }}°C'''.ko={{ device.displayName }}이(가){{ value }}°C였습니다.
37+
'''{{ device.displayName }} was opened'''.ko={{ device.displayName }}에서 열림이 감지되었습니다.
38+
'''{{ device.displayName }} was closed'''.ko={{ device.displayName }}에서 닫힘이 감지되었습니다.
39+
'''{{ device.displayName }} was active'''.ko={{ device.displayName }} 활성화
40+
'''{{ device.displayName }} was inactive'''.ko={{ device.displayName }} 비활성화
41+
'''{{ device.displayName }} was {{ value }}°C'''.ko={{ device.displayName }}에서 {{ value }}°C 감지
4242
'''{{ device.displayName }} was {{ value }}°F'''.ko={{ device.displayName }}이(가) {{ value }}°F였습니다
43-
'''{{ device.displayName }} battery was {{ value }}%'''.ko={{ device.displayName }}남아있는 배터리는 {{ value }}%입니다.
43+
'''{{ device.displayName }} battery was {{ value }}%'''.ko={{ device.displayName }}의 남은 배터리 {{ value }}%
4444
'''Updating device to garage sensor'''.ko=기기-차고 센서 업데이트 중
4545
'''Updating device to open/close sensor'''.ko=기기-열림/닫힘 센서 업데이트 중
46-
'''Inactive'''.ko=비활성
47-
'''Active'''.ko=활성
48-
'''Open'''.ko=열림
46+
'''Inactive'''.ko=비활성 상태
47+
'''Active'''.ko=활성 상태
48+
'''Open'''.ko= 열림이 감지될 때
4949
'''Closed'''.ko=닫힘
5050
'''${currentValue}% battery'''.ko=${currentValue}% 배터리

‎smartapps/johnrucker/door-jammed-notification.src/door-jammed-notification.groovy‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
/**
2+
* Door Jammed Notification
3+
*
4+
* Copyright 2015 John Rucker
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
7+
* in compliance with the License. You may obtain a copy of the License at:
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
12+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
13+
* for the specific language governing permissions and limitations under the License.
14+
*
15+
*/
16+
17+
definition(
18+
name: "Door Jammed Notification",
19+
namespace: "JohnRucker",
20+
author: "[email protected]",
21+
description: "Sends a SmartThings notification and text messages when your CoopBoss detects a door jam.",
22+
category: "My Apps",
23+
iconUrl: "http://coopboss.com/images/SmartThingsIcons/coopbossLogo.png",
24+
iconX2Url: "http://coopboss.com/images/SmartThingsIcons/coopbossLogo2x.png",
25+
iconX3Url: "http://coopboss.com/images/SmartThingsIcons/coopbossLogo3x.png")
26+
27+
preferences {
28+
section("When the door state changes") {
29+
paragraph "Send a SmartThings notification when the coop's door jammed and did not close."
30+
input "doorSensor", "capability.doorControl", title: "Select CoopBoss", required: true, multiple: false
31+
input("recipients", "contact", title: "Recipients", description: "Send notifications to") {
32+
input "phone", "phone", title: "Phone number?", required: true}
33+
}
34+
}
35+
36+
def installed() {
37+
log.debug "Installed with settings: ${settings}"
38+
initialize()
39+
}
40+
41+
def updated() {
42+
log.debug "Updated with settings: ${settings}"
43+
unsubscribe()
44+
initialize()
45+
}
46+
47+
def initialize() {
48+
subscribe(doorSensor, "doorState", coopDoorStateHandler)
49+
}
50+
51+
def coopDoorStateHandler(evt) {
52+
if (evt.value == "jammed"){
53+
def msg = "WARNING ${doorSensor.displayName} door is jammed and did not close!"
54+
log.debug "WARNING ${doorSensor.displayName} door is jammed and did not close, texting $phone"
55+
56+
if (location.contactBookEnabled) {
57+
sendNotificationToContacts(msg, recipients)
58+
}
59+
else {
60+
sendPush(msg)
61+
if (phone) {
62+
sendSms(phone, msg)
63+
}
64+
}
65+
}
66+
}

0 commit comments

Comments
 (0)