Skip to content

Commit 3ee140e

Browse files
workingmonkworkingmonk
authored
Merge pull request SmartThingsCommunity#3050 from SmartThingsCommunity/staging
Rolling down staging to master
2 parents c6333d4 + 1615a1b commit 3ee140e

File tree

105 files changed

+356
-11
lines changed

Some content is hidden

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

105 files changed

+356
-11
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -474,12 +474,12 @@ def alterSetpoint(raise, setpoint) {
474474
// update UI without waiting for the device to respond, this to give user a smoother UI experience
475475
// also, as runIn's have to overwrite and user can change heating/cooling setpoint separately separate runIn's have to be used
476476
if (data.targetHeatingSetpoint) {
477-
sendEvent("name": "heatingSetpoint", "value": getTempInLocalScale(data.targetHeatingSetpoint, deviceScale),
478-
unit: getTemperatureScale(), eventType: "ENTITY_UPDATE", displayed: false)
477+
sendEvent("name": "heatingSetpoint", "value": getTempInLocalScale(data.targetHeatingSetpoint, "F"),
478+
unit: locationScale, eventType: "ENTITY_UPDATE", displayed: false)
479479
}
480480
if (data.targetCoolingSetpoint) {
481-
sendEvent("name": "coolingSetpoint", "value": getTempInLocalScale(data.targetCoolingSetpoint, deviceScale),
482-
unit: getTemperatureScale(), eventType: "ENTITY_UPDATE", displayed: false)
481+
sendEvent("name": "coolingSetpoint", "value": getTempInLocalScale(data.targetCoolingSetpoint, "F"),
482+
unit: locationScale, eventType: "ENTITY_UPDATE", displayed: false)
483483
}
484484
runIn(5, "updateSetpoint", [data: data, overwrite: true])
485485
}
@@ -524,9 +524,9 @@ def updateSetpoint(data) {
524524

525525
if (parent.setHold(data.targetHeatingSetpoint, data.targetCoolingSetpoint, deviceId, sendHoldType)) {
526526
log.debug "updateSetpoint succeed to change setpoints:${data}"
527-
sendEvent("name": "heatingSetpoint", "value": getTempInLocalScale(data.targetHeatingSetpoint, deviceScale),
527+
sendEvent("name": "heatingSetpoint", "value": getTempInLocalScale(data.targetHeatingSetpoint, "F"),
528528
unit: getTemperatureScale(), eventType: "ENTITY_UPDATE", displayed: false)
529-
sendEvent("name": "coolingSetpoint", "value": getTempInLocalScale(data.targetCoolingSetpoint, deviceScale),
529+
sendEvent("name": "coolingSetpoint", "value": getTempInLocalScale(data.targetCoolingSetpoint, "F"),
530530
unit: getTemperatureScale(), eventType: "ENTITY_UPDATE", displayed: false)
531531
generateStatusEvent()
532532
} else {

‎devicetypes/smartthings/zwave-switch-generic.src/zwave-switch-generic.groovy‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ metadata {
2626
fingerprint mfr: "001D", prod: "3401", model: "0001", deviceJoinName: "Leviton Switch" //Leviton DZ15S
2727
fingerprint mfr: "0063", prod: "4F50", model: "3031", deviceJoinName: "GE Plug-in Outdoor Switch"
2828
fingerprint mfr: "0063", prod: "4F50", model: "3032", deviceJoinName: "GE Plug-in Outdoor Switch"
29+
fingerprint mfr: "0063", prod: "5250", model: "3130", deviceJoinName: "GE Plug-in Outdoor Switch"
2930
fingerprint mfr: "001D", prod: "1D04", model: "0334", deviceJoinName: "Leviton Outlet"
3031
fingerprint mfr: "001D", prod: "1C02", model: "0334", deviceJoinName: "Leviton Switch"
3132
fingerprint mfr: "001D", prod: "0301", model: "0334", deviceJoinName: "Leviton 15A Switch"

‎smartapps/egid/smart-windows.src/i18n/ar-AE.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@
2222
'''Tap to set'''=النقر للضبط
2323
'''Phone'''=رقم الهاتف
2424
'''Which?'''=أي مستشعر؟
25+
'''Set your location'''=ضبط موقعك

‎smartapps/egid/smart-windows.src/i18n/bg-BG.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@
2222
'''Tap to set'''=Докосване за задаване
2323
'''Phone'''=Телефонен номер
2424
'''Which?'''=Кое?
25+
'''Set your location'''=Задаване на местоположение

‎smartapps/egid/smart-windows.src/i18n/ca-ES.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@
2222
'''Tap to set'''=Toca aquí para definir
2323
'''Phone'''=Número de teléfono
2424
'''Which?'''=Cal?
25+
'''Set your location'''=Define a túa localización

‎smartapps/egid/smart-windows.src/i18n/cs-CZ.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@
2222
'''Tap to set'''=Nastavte klepnutím
2323
'''Phone'''=Telefonní číslo
2424
'''Which?'''=Který?
25+
'''Set your location'''=Nastavte svou polohu

‎smartapps/egid/smart-windows.src/i18n/da-DK.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@
2222
'''Tap to set'''=Tryk for at indstille
2323
'''Phone'''=Telefonnummer
2424
'''Which?'''=Hvilken?
25+
'''Set your location'''=Angiv din placering

‎smartapps/egid/smart-windows.src/i18n/de-DE.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@
2222
'''Tap to set'''=Zum Festlegen tippen
2323
'''Phone'''=Telefonnummer
2424
'''Which?'''=Welcher?
25+
'''Set your location'''=Ihren Standort festlegen

‎smartapps/egid/smart-windows.src/i18n/el-GR.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@
2222
'''Tap to set'''=Πατήστε για ρύθμιση
2323
'''Phone'''=Αριθμός τηλεφώνου
2424
'''Which?'''=Ποιος;
25+
'''Set your location'''=Ορισμός της τοποθεσίας σας

‎smartapps/egid/smart-windows.src/i18n/en-GB.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@
2121
'''Tap to set'''=Tap to set
2222
'''Phone'''=Phone
2323
'''Which?'''=Which?
24+
'''Set your location'''=Set your location

0 commit comments

Comments
 (0)