Skip to content

Commit 7a0fc7f

Browse files
authored
Merge pull request SmartThingsCommunity#3197 from SmartThingsCommunity/staging
Rolling up staging to production
2 parents e18c3db + 512eaaf commit 7a0fc7f

File tree

71 files changed

+1139
-44
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1139
-44
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ metadata {
2525
capability "Actuator"
2626
capability "Sensor"
2727
capability "Outlet"
28+
capability "Health Check"
2829

2930
fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "4257050-ZHAC"
3031

@@ -96,10 +97,16 @@ def on() {
9697
zigbee.on()
9798
}
9899

100+
def ping() {
101+
zigbee.onOffRefresh()
102+
}
103+
99104
def refresh() {
100105
zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.electricMeasurementPowerRefresh()
101106
}
102107

103108
def configure() {
109+
// default reporting time is 10min for on/off, checkInterval is set to 21min
110+
sendEvent(name: "checkInterval", value: 2 * 10 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
104111
refresh() + zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.electricMeasurementPowerConfig()
105112
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* Date: 2013-03-09
1717
*/
1818
metadata {
19-
definition (name: "SmartSense Garage Door Multi", namespace: "smartthings", author: "SmartThings", runLocally: true, minHubCoreVersion: '000.017.0012', executeCommandsLocally: false) {
19+
definition (name: "SmartSense Garage Door Multi", namespace: "smartthings", author: "SmartThings", runLocally: true, minHubCoreVersion: '000.017.0012', executeCommandsLocally: false, mnmn: "SmartThings", vid: "generic-contact-2") {
2020
capability "Three Axis"
2121
capability "Contact Sensor"
2222
capability "Acceleration Sensor"
@@ -77,11 +77,11 @@ metadata {
7777
main(["status", "contact", "acceleration"])
7878
details(["status", "contact", "acceleration", "temperature", "3axis", "battery"])
7979
}
80-
80+
8181
preferences {
8282
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"
8383
input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
84-
}
84+
}
8585
}
8686

8787
def parse(String description) {
@@ -105,7 +105,7 @@ def updated() {
105105
def threeAxis = device.currentState("threeAxis")
106106
if (threeAxis) {
107107
def xyz = threeAxis.xyzValue
108-
def value = Math.round(xyz.z) > 925 ? "open" : "closed"
108+
def value = Math.round(xyz.z) > 925 ? "open" : "closed"
109109
sendEvent(name: "contact", value: value)
110110
}
111111
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
*
1313
*/
1414
metadata {
15-
definition (name: "SmartSense Moisture", namespace: "smartthings", author: "SmartThings", runLocally: true, minHubCoreVersion: '000.017.0012', executeCommandsLocally: false) {
15+
definition (name: "SmartSense Moisture", namespace: "smartthings", author: "SmartThings", runLocally: true, minHubCoreVersion: '000.017.0012', executeCommandsLocally: false, mnmn: "SmartThings", vid: "generic-leak") {
1616
capability "Water Sensor"
1717
capability "Sensor"
1818
capability "Battery"
19-
capability "Temperature Measurement"
19+
capability "Temperature Measurement"
2020
capability "Health Check"
2121

2222
fingerprint deviceId: "0x2001", inClusters: "0x30,0x9C,0x9D,0x85,0x80,0x72,0x31,0x84,0x86"
@@ -34,7 +34,7 @@ metadata {
3434
status "battery ${i}%": new physicalgraph.zwave.Zwave().batteryV1.batteryReport(batteryLevel: i).incomingMessage()
3535
}
3636
}
37-
37+
3838
tiles(scale: 2) {
3939
multiAttributeTile(name:"water", type: "generic", width: 6, height: 4){
4040
tileAttribute ("device.water", key: "PRIMARY_CONTROL") {
@@ -188,4 +188,4 @@ def getTemperature(value) {
188188
def zwaveEvent(physicalgraph.zwave.Command cmd)
189189
{
190190
log.debug "COMMAND CLASS: $cmd"
191-
}
191+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*/
1414
metadata {
15-
definition (name: "SmartSense Motion", namespace: "smartthings", author: "SmartThings", runLocally: true, minHubCoreVersion: '000.017.0012', executeCommandsLocally: false) {
15+
definition (name: "SmartSense Motion", namespace: "smartthings", author: "SmartThings", runLocally: true, minHubCoreVersion: '000.017.0012', executeCommandsLocally: false, mnmn: "SmartThings", vid: "generic-motion-2") {
1616
capability "Signal Strength"
1717
capability "Motion Sensor"
1818
capability "Sensor"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*/
1414
metadata {
15-
definition (name: "SmartSense Multi", namespace: "smartthings", author: "SmartThings", runLocally: true, minHubCoreVersion: '000.017.0012', executeCommandsLocally: false) {
15+
definition (name: "SmartSense Multi", namespace: "smartthings", author: "SmartThings", runLocally: true, minHubCoreVersion: '000.017.0012', executeCommandsLocally: false, mnmn: "SmartThings", vid: "generic-contact-2") {
1616
capability "Three Axis"
1717
capability "Contact Sensor"
1818
capability "Acceleration Sensor"

smartapps/imbrianj/door-knocker.src/i18n/ar-AE.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
'''Notifications'''=الإشعارات
88
'''Send a push notification?'''=هل تريد إرسال إشعار دفع؟
99
'''Send a Text Message?'''=هل تريد إرسال رسالة نصية؟
10-
'''{{knockSensor.label ?: knockSensor.name}} detected a knock.'''=تم اكتشاف قرعة بواسطة {{knockSensor.label ?: knockSensor.name}}.
10+
'''{{kSensor}} detected a knock.'''=تم اكتشاف قرعة بواسطة {{kSensor}}.
1111
'''Door Knocker'''=مقرعة الباب
1212
'''Set for specific mode(s)'''=ضبط لوضع محدد (أوضاع محددة)
1313
'''Assign a name'''=تعيين اسم

smartapps/imbrianj/door-knocker.src/i18n/bg-BG.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
'''Notifications'''=Уведомления
88
'''Send a push notification?'''=Изпращане на насочено уведомление?
99
'''Send a Text Message?'''=Изпращане на текстово съобщение?
10-
'''{{knockSensor.label ?: knockSensor.name}} detected a knock.'''={{knockSensor.label ?: knockSensor.name}} откри почукване.
10+
'''{{kSensor}} detected a knock.'''={{kSensor}} откри почукване.
1111
'''Door Knocker'''=Почукване на врата
1212
'''Set for specific mode(s)'''=Зададено за конкретни режими
1313
'''Assign a name'''=Назначаване на име

smartapps/imbrianj/door-knocker.src/i18n/ca-ES.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
'''Notifications'''=Notificacións
88
'''Send a push notification?'''=Queres enviar unha notificación push?
99
'''Send a Text Message?'''=Queres enviar unha mensaxe de texto?
10-
'''{{knockSensor.label ?: knockSensor.name}} detected a knock.'''={{knockSensor.label ?: knockSensor.name}} detectou unha chamada á porta.
10+
'''{{kSensor}} detected a knock.'''={{kSensor}} detectou unha chamada á porta.
1111
'''Door Knocker'''=Door Knocker
1212
'''Set for specific mode(s)'''=Definir para modos específicos
1313
'''Assign a name'''=Asignar un nome

smartapps/imbrianj/door-knocker.src/i18n/cs-CZ.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
'''Notifications'''=Oznámení
88
'''Send a push notification?'''=Odeslat nabízené oznámení?
99
'''Send a Text Message?'''=Odeslat textovou zprávu?
10-
'''{{knockSensor.label ?: knockSensor.name}} detected a knock.'''={{knockSensor.label ?: knockSensor.name}} detekoval zaklepání.
10+
'''{{kSensor}} detected a knock.'''={{kSensor}} detekoval zaklepání.
1111
'''Door Knocker'''=Dveřní klepadlo
1212
'''Set for specific mode(s)'''=Nastavit pro konkrétní režimy
1313
'''Assign a name'''=Přiřadit název

smartapps/imbrianj/door-knocker.src/i18n/da-DK.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
'''Notifications'''=Meddelelser
88
'''Send a push notification?'''=Vil du sende en push-meddelelse?
99
'''Send a Text Message?'''=Vil du sende en sms?
10-
'''{{knockSensor.label ?: knockSensor.name}} detected a knock.'''={{knockSensor.label ?: knockSensor.name}} registrerede et bank.
10+
'''{{kSensor}} detected a knock.'''={{kSensor}} registrerede et bank.
1111
'''Door Knocker'''=Dørhammer
1212
'''Set for specific mode(s)'''=Indstil til bestemt(e) tilstand(e)
1313
'''Assign a name'''=Tildel et navn

0 commit comments

Comments
 (0)