MSA-1182: Control your Air Conditioner remotely.

Rolling down hotfix from staging to master

devicetypes/melissa/melissa-climate.src/melissa-climate.groovy

@@ -0,0 +1,351 @@
+/**
+ *  Melissa Climate
+ *
+ *  Copyright 2016 Kiril Maslenkov
+ *
+ *  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.
+ *
+ */
+ 
+ 
+preferences {
+	input "email", "text", title: "Email", description: "Your Email", required: true
+	input "password", "password", title: "Password", description: "Your Melissa Password", required: true
+    input "mac", "text", title: "Melissa MAC Address", description: "Melissa Mac Address", required: true
+}
+
+ 
+metadata {
+	definition (name: "Melissa Climate", namespace: "Melissa", author: "Melissa Climate") {
+        
+		capability "Thermostat"
+    
+    
+    	command temperatureUp
+        command temperatureDown
+        
+        command sendCommand
+
+        command switchMode
+        command switchFanMode
+        command switchingState
+        
+        command refreshApp
+
+	}
+
+	simulator {	}
+
+	tiles(scale: 2) {
+        multiAttributeTile(name:"status", type: "thermostat", width: 6, height: 4){  
+          tileAttribute("device.temperature", key:"PRIMARY_CONTROL"){
+              attributeState("default", label:'${currentValue}°', unit: "df", backgroundColor: '#4b8df8')
+          }	
+          
+          tileAttribute("device.humidity", key: "SECONDARY_CONTROL") {
+              attributeState("default", label:'${currentValue}%', unit:"%")
+          }
+          
+          tileAttribute("device.temperature", key: "VALUE_CONTROL") {
+              attributeState("VALUE_UP", action: "temperatureUp")
+              attributeState("VALUE_DOWN", action: "temperatureDown")
+          }
+        }
+        
+        standardTile("mode", "device.mode", decoration: "flat", width: 3, height: 2) {
+        	state "auto", action:"switchMode", label: '${name}', nextState: "cool", icon: "http://server.seemelissa.com/smartthings/icons/modes/auto-2.png"
+			state "cool", action:"switchMode", label: '${name}', nextState: "heat", icon: "http://server.seemelissa.com/smartthings/icons/modes/cool.png"
+			state "heat", action:"switchMode", label: '${name}', nextState: "dry", icon: "http://server.seemelissa.com/smartthings/icons/modes/heat.png"
+			state "dry", action:"switchMode",  label: '${name}', nextState: "auto", icon: "http://server.seemelissa.com/smartthings/icons/modes/dry.png"
+		}
+        
+		standardTile("fan", "device.fan", decoration: "flat", width: 3, height: 2, canChangeIcon: true, canChangeBackground: true) {
+            state "auto", action:"switchFanMode", label: '${name}', nextState: "high", icon: "http://server.seemelissa.com/smartthings/icons/modes/auto-2.png"
+            state "high", action:"switchFanMode", label: '${name}', nextState: "medium", icon: "http://server.seemelissa.com/smartthings/icons/fan/fan1.png"
+            state "medium", action:"switchFanMode", label: '${name}', nextState: "low", icon: "http://server.seemelissa.com/smartthings/icons/fan/fan2.png"
+    		state "low", action:"switchFanMode", label: '${name}', nextState: "auto", icon: "http://server.seemelissa.com/smartthings/icons/fan/fan3.png"
+		}
+
+		standardTile("switchState", "device.switchState", width: 3, height: 2, decoration: "flat", canChangeIcon: true, canChangeBackground: true) {
+            state "on", label: '${name}', action: "switchingState", nextState: "off", icon: "http://server.seemelissa.com/smartthings/icons/on_off/turn-on-off-white.png", backgroundColor: "#79b821"
+			state "off", label: '${name}', action: "switchingState", nextState: "on", icon: "http://server.seemelissa.com/smartthings/icons/on_off/turn-on-off.png", backgroundColor: "#ffffff"
+
+			//state "on", label: '${name}', action: "switchState.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
+			//state "off", label: '${name}', action: "switchState.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
+		}
+
+        standardTile("send", "device.send", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        	state "default", action:"sendCommand", label: 'Send Command' 
+        }
+		
+        standardTile("refresh", "device.send2", inactiveLabel: false, decoration: "flat", width: 3, height: 2) {
+        	state "default", action:"refreshApp", icon: "st.secondary.refresh"
+        }
+        
+    	standardTile("username", "device.username", inactiveLabel: false, decoration: "flat", width: 6, height: 2) {
+        	state "default", label:'${currentValue}'
+        }
+        
+        main(["status", "mode",  "fan", "send"])
+        //details(["status", "mode", "fan", "refresh", "switchState",  "username"])
+        
+        details(["status", "mode", "fan", "refresh", "switchState"])
+	}
+}
+
+def switchingState() {
+    if (state.ac_state == "on") {
+    	state.ac_state = "off"
+    } else {
+    	state.ac_state = "on"
+    }
+    sendEvent(name: "switchState", value: state.ac_state);
+    sendCommand()
+}
+
+/* SWITCHING MODES Auto, Cool, Heat, Dry*/
+
+def switchMode() {
+    switch (state.mode) {
+    	case "auto":
+        	state.mode = "cool";
+        break;
+        case "cool":
+        	state.mode = "heat";
+        break; 
+        case "heat":
+        	state.mode = "dry";
+        break;
+		case "dry":
+        	state.mode = "auto";
+        break;
+
+
+	}
+    //sendEvent(name: "username", value: state.mode)
+	sendCommand()
+ //   log.debug state.mode
+}
+
+/* SWITCHING FAN MODES*/
+
+def switchFanMode() {
+    switch (state.fan) {
+    	case "auto":
+        	state.fan = "high";
+        break;
+        case "high":
+        	state.fan = "medium";
+        break;
+        case "medium":
+        	state.fan = "low";
+        break;
+        
+        case "low":
+        	state.fan = "auto";
+        break;
+
+
+	}
+    sendEvent(name: "username", value: state.fan)
+    sendCommand()
+    //log.debug state.fan
+}
+
+def refreshApp() {
+  def params = [
+       uri:  'http://api2.seemelissa.com/user/login',
+        body: [
+            
+            email: "k.maslenkov@sabev.at",
+            password: "xxxxx"
+			
+            //email: settings.email,
+            //password: settings.password
+        ]
+    ]
+    try {
+        httpPost(params) {resp ->
+			/*
+			log.debug "resp data: ${resp.data}"
+            log.debug resp.data
+            log.debug resp
+            */
+            def _try = resp.data
+            def slurper = new groovy.json.JsonSlurper()
+            def results = slurper.parseText("${resp.data}")
+            
+            
+            state.token = results.Data
+            
+            settings.mac = "OIEQ321TGR6"
+            def getParams = [
+                uri: "http://api2.seemelissa.com",
+                path: "/testusers/getMelissaData/${settings.mac}"
+                
+                //path: "/testusers/getMelissaData/OIEQ321TGR6"
+                
+            ]
+            try {
+                httpGet(getParams) {response->
+
+                    def getResult = slurper.parseText("${response.data}")
+                    
+					state.temp = getResult.temp as int
+                    state.humidity = getResult.humidity
+                    state.codeset = getResult.codeset_id as int
+                    switch (getResult.mode) {
+                    	case "0":
+                        	state.mode = "auto";
+                        break; 
+                        case "1":
+                        	state.mode = "fan";
+                        break;
+                    	case "2":
+                        	state.mode = "heat";
+                        break;
+                        case "3":
+                        	state.mode = "cool";
+                        break;
+                        case "4":
+                        	state.mode = "dry";
+                        break;
+                    }
+                    switch (getResult.fan) {
+                    	case "0":
+                        	state.fan = "auto";
+                        break; 
+                        case "1":
+                        	state.fan = "low";
+                        break;
+                    	case "2":
+                        	state.fan = "medium";
+                        break;
+                        case "3":
+                        	state.fan = "high";
+                        break;
+                    }
+                    if (getResult.state == "0") {
+                    	state.ac_state = "off"
+                    } else {
+                    	state.ac_state = "on"
+                    }
+                    sendEvent(name: "mode", value: state.mode)
+                    sendEvent(name: "fan", value: state.fan)
+                    sendEvent(name: "temperature", value: state.temp)
+                    sendEvent(name: "humidity", value: state.humidity)
+                    sendEvent(name: "switchState", value: state.ac_state)
+                    
+                }
+            }
+            catch (e) {
+                log.error "error: $e"
+            }
+        }
+    } catch (e) {
+        log.error "error: $e"
+    }	
+}
+
+def sendCommand () {
+	log.error state
+    
+    def params = [
+        uri:  'http://api2.seemelissa.com/testusers/sendCommand',
+        body: [
+            mac: "OIEQ321TGR6",
+            //mac: settings.mac,
+            temp: state.temp,
+            token: state.token,
+            fan: state.fan,
+            mode: state.mode,
+            ac_state: state.ac_state,
+            codeset: state.codeset
+        ]
+    ]
+    try {
+        httpPost(params) {resp ->
+        
+        	log.debug "Send command done"
+            log.debug "resp data: ${resp.data}"
+            
+        }
+    } catch (e) {
+        log.error "error: $e"
+    }	
+}
+
+def updated() {
+	//log.debug "Updated !!!"
+    login()
+}
+
+def temperatureDown() {
+    if (state.temp != 18) {
+    	state.temp = state.temp - 1
+    }
+	sendEvent(name: "temperature", value: state.temp)
+    sendCommand()
+}
+
+def temperatureUp() {
+    if (state.temp != 30) {
+    	state.temp = state.temp + 1
+    }
+
+	sendEvent(name: "temperature", value: state.temp)
+    sendCommand()
+}
+
+
+def login() {
+	refreshApp()
+/*
+    def params = [
+        uri:  'http://api2.seemelissa.com/user/login',
+        body: [
+             email: settings.email,
+             password: settings.password
+        ]
+    ]
+    
+    try {
+        httpPost(params) {resp ->
+            log.debug "resp data: ${resp.data}"
+ 			log.debug "Response Received: Status [$resp.status]"            
+          
+            def _try = resp.data
+            def slurper = new groovy.json.JsonSlurper()
+            def results = slurper.parseText("${resp.data}")
+            
+            
+            state.token = results.Data
+            state.temp = 18
+            state.humidity = 40
+            
+            sendEvent(name: "temperature", value: state.temp)
+            sendEvent(name: "humidity", value: state.humidity)
+            
+            sendEvent(name: "username", value: state.token)
+            
+            
+        }
+    } catch (e) {
+        log.error "error: $e"
+    }
+*/
+}
+
+
+// parse events into attributes
+def parse(String description) {
+	log.debug "Parsing '${description}'"
+
+}

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

@@ -23,14 +23,14 @@
 #==============================================================================
 # Korean (ko)
 # Device Preferences
-'''Give your device a name'''.ko=기기 이름 바꾸기
+'''Give your device a name'''.ko=기기 이름 설정
 '''Set Device Image'''.ko=기기 이미지 설정
-'''Presence timeout (minutes)'''.ko=시간 초과. 스마트폰 위치 정보
+'''Presence timeout (minutes)'''.ko=알람 유예 시간 설정 (분)
 '''Tap to set'''.ko=눌러서 설정
 '''Arrival Sensor'''.ko=도착알림 센서
 '''${currentValue}% battery'''.ko=${currentValue}% 배터리
 # Events / Notifications
-'''{{ linkText }} battery was {{ value }}'''.ko={{ linkText }}남아있는 배터리는 {{ value }}입니다.
-'''{{ linkText }} has arrived'''.ko={{ linkText }}집에 도착했습니다.
-'''{{ linkText }} has left'''.ko={{ linkText }}집을 나갔습니다.
+'''{{ linkText }} battery was {{ value }}'''.ko={{ linkText }}의 남은 배터리 {{ value }}
+'''{{ linkText }} has arrived'''.ko={{ linkText }} 귀가
+'''{{ linkText }} has left'''.ko={{ linkText }} 외출
 #==============================================================================

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

@@ -23,10 +23,10 @@
 #==============================================================================
 # Korean (ko)
 # Device Preferences
-'''Give your device a name'''.ko=기기 이름 바꾸기
+'''Give your device a name'''.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=외출

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

@@ -22,14 +22,14 @@
 #==============================================================================
 # Korean (ko)
 # Device Preferences
-'''Give your device a name'''.ko=기기 이름 바꾸기
-'''Outlet'''.ko=플러그
+'''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 }}와트입니다
-'''On'''.ko=켜짐
+'''{{ device.displayName }} is On'''.ko={{ device.displayName }} 켜짐
+'''{{ device.displayName }} is Off'''.ko={{ device.displayName }} 꺼짐
+'''{{ device.displayName }} power is {{ value }} Watts'''.ko={{ device.displayName }} 전력은 {{ value }}와트입니다.
+'''On'''.ko= 켜짐
 '''Off'''.ko=꺼짐
-'''Turning On'''.ko=켜기
-'''Turning Off'''.ko=끄기
+'''Turning On'''.ko=켜는 중
+'''Turning Off'''.ko=끄는 중
 #==============================================================================

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

@@ -31,14 +31,14 @@
 '''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=누수센서
+'''Give your device a name'''.ko=기기 이름 설정
+'''Water Leak Sensor'''.ko=누수감지 센서
 '''${currentValue}% battery'''.ko=${currentValue}% 배터리
 # Events descriptionText
 '''{{ device.displayName }} is dry'''.ko={{ device.displayName }}가 건조
 '''{{ device.displayName }} is wet'''.ko={{ device.displayName }}누수
-'''{{ device.displayName }} was {{ value }}°C'''.ko={{ device.displayName }}이(가) {{ value }}°C였습니다
+'''{{ 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 }}%입니다.
+'''{{ device.displayName }} battery was {{ value }}%'''.ko={{ device.displayName }}의 남은 배터리 {{ value }}%
 #==============================================================================

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

@@ -28,16 +28,16 @@
 '''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=기기 이름 바꾸기
+'''Give your device a name'''.ko=기기 이름 설정
 '''Motion Sensor'''.ko=모션 센서
-'''motion'''.ko=동작 감지
+'''motion'''.ko= 동작 감지 
 '''no motion'''.ko=동작 없음
 '''${currentValue}% battery'''.ko=${currentValue}% 배터리
 # 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 }} 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였습니다
 '''{{ 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 }}%
 #==============================================================================

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

@@ -31,20 +31,20 @@
 '''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=멀티 센서
+'''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 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 }}%입니다.
+'''{{ device.displayName }} battery was {{ value }}%'''.ko={{ device.displayName }}의 남은 배터리 {{ value }}%
 '''Updating device to garage sensor'''.ko=기기-차고 센서 업데이트 중
 '''Updating device to open/close sensor'''.ko=기기-열림/닫힘 센서 업데이트 중
-'''Inactive'''.ko=비활성
-'''Active'''.ko=활성
-'''Open'''.ko=열림
+'''Inactive'''.ko=비활성 상태
+'''Active'''.ko=활성 상태
+'''Open'''.ko= 열림이 감지될 때
 '''Closed'''.ko=닫힘
 '''${currentValue}% battery'''.ko=${currentValue}% 배터리

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

@@ -23,9 +23,9 @@
 '''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=누수가 감지되었을 때
-'''{{ 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 }}을(를) 떠났습니다
+'''{{ triggerEvent.linkText }} has arrived at the {{ location.name }}'''.ko={{ location.name }}에 {{ triggerEvent.linkText }} 귀가
+'''{{ triggerEvent.linkText }} has arrived at {{ location.name }}'''.ko={{ location.name }}에 {{ triggerEvent.linkText }} 귀가
+'''{{ triggerEvent.linkText }} has left the {{ location.name }}'''.ko={{ location.name }}에서 {{ triggerEvent.linkText }} 외출
+'''{{ triggerEvent.linkText }} has left {{ location.name }}'''.ko={{ location.name }}에서 {{ triggerEvent.linkText }} 외출
 '''Assign a name'''.ko=이름 설정
 '''Choose Modes'''.ko=상태 선택