MSA-1517: foscam modified device type

alterSetpoint - check for auto or off mode

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

@@ -655,55 +655,60 @@ void lowerSetpoint() {
 void alterSetpoint(temp) {
 
 	def mode = device.currentValue("thermostatMode")
-	def heatingSetpoint = device.currentValue("heatingSetpoint")
-	def coolingSetpoint = device.currentValue("coolingSetpoint")
-	def deviceId = device.deviceNetworkId.split(/\./).last()
 
-	def targetHeatingSetpoint
-	def targetCoolingSetpoint
-
-	//step1: check thermostatMode, enforce limits before sending request to cloud
-	if (mode == "heat" || mode == "auxHeatOnly"){
-		if (temp.value > coolingSetpoint){
-			targetHeatingSetpoint = temp.value
-			targetCoolingSetpoint = temp.value
-		} else {
-			targetHeatingSetpoint = temp.value
-			targetCoolingSetpoint = coolingSetpoint
-		}
-	} else if (mode == "cool") {
-		//enforce limits before sending request to cloud
-		if (temp.value < heatingSetpoint){
-			targetHeatingSetpoint = temp.value
-			targetCoolingSetpoint = temp.value
-		} else {
-			targetHeatingSetpoint = heatingSetpoint
-			targetCoolingSetpoint = temp.value
-		}
-	}
-
-	log.debug "alterSetpoint >> in mode ${mode} trying to change heatingSetpoint to $targetHeatingSetpoint " +
-			"coolingSetpoint to $targetCoolingSetpoint with holdType : ${holdType}"
-
-	def sendHoldType = holdType ? (holdType=="Temporary")? "nextTransition" : (holdType=="Permanent")? "indefinite" : "indefinite" : "indefinite"
-
-	def coolingValue = location.temperatureScale == "C"? convertCtoF(targetCoolingSetpoint) : targetCoolingSetpoint
-	def heatingValue = location.temperatureScale == "C"? convertCtoF(targetHeatingSetpoint) : targetHeatingSetpoint
-
-	if (parent.setHold(heatingValue, coolingValue, deviceId, sendHoldType)) {
-		sendEvent("name": "thermostatSetpoint", "value": temp.value, displayed: false)
-		sendEvent("name": "heatingSetpoint", "value": targetHeatingSetpoint, "unit": location.temperatureScale)
-		sendEvent("name": "coolingSetpoint", "value": targetCoolingSetpoint, "unit": location.temperatureScale)
-		log.debug "alterSetpoint in mode $mode succeed change setpoint to= ${temp.value}"
+	if (mode == "off" || mode == "auto") {
+		log.warn "this mode: $mode does not allow alterSetpoint"
 	} else {
-		log.error "Error alterSetpoint()"
+		def heatingSetpoint = device.currentValue("heatingSetpoint")
+		def coolingSetpoint = device.currentValue("coolingSetpoint")
+		def deviceId = device.deviceNetworkId.split(/\./).last()
+
+		def targetHeatingSetpoint
+		def targetCoolingSetpoint
+
+		//step1: check thermostatMode, enforce limits before sending request to cloud
 		if (mode == "heat" || mode == "auxHeatOnly"){
-			sendEvent("name": "thermostatSetpoint", "value": heatingSetpoint.toString(), displayed: false)
+			if (temp.value > coolingSetpoint){
+				targetHeatingSetpoint = temp.value
+				targetCoolingSetpoint = temp.value
+			} else {
+				targetHeatingSetpoint = temp.value
+				targetCoolingSetpoint = coolingSetpoint
+			}
 		} else if (mode == "cool") {
-			sendEvent("name": "thermostatSetpoint", "value": coolingSetpoint.toString(), displayed: false)
+			//enforce limits before sending request to cloud
+			if (temp.value < heatingSetpoint){
+				targetHeatingSetpoint = temp.value
+				targetCoolingSetpoint = temp.value
+			} else {
+				targetHeatingSetpoint = heatingSetpoint
+				targetCoolingSetpoint = temp.value
+			}
 		}
+
+		log.debug "alterSetpoint >> in mode ${mode} trying to change heatingSetpoint to $targetHeatingSetpoint " +
+				"coolingSetpoint to $targetCoolingSetpoint with holdType : ${holdType}"
+
+		def sendHoldType = holdType ? (holdType=="Temporary")? "nextTransition" : (holdType=="Permanent")? "indefinite" : "indefinite" : "indefinite"
+
+		def coolingValue = location.temperatureScale == "C"? convertCtoF(targetCoolingSetpoint) : targetCoolingSetpoint
+		def heatingValue = location.temperatureScale == "C"? convertCtoF(targetHeatingSetpoint) : targetHeatingSetpoint
+
+		if (parent.setHold(heatingValue, coolingValue, deviceId, sendHoldType)) {
+			sendEvent("name": "thermostatSetpoint", "value": temp.value, displayed: false)
+			sendEvent("name": "heatingSetpoint", "value": targetHeatingSetpoint, "unit": location.temperatureScale)
+			sendEvent("name": "coolingSetpoint", "value": targetCoolingSetpoint, "unit": location.temperatureScale)
+			log.debug "alterSetpoint in mode $mode succeed change setpoint to= ${temp.value}"
+		} else {
+			log.error "Error alterSetpoint()"
+			if (mode == "heat" || mode == "auxHeatOnly"){
+				sendEvent("name": "thermostatSetpoint", "value": heatingSetpoint.toString(), displayed: false)
+			} else if (mode == "cool") {
+				sendEvent("name": "thermostatSetpoint", "value": coolingSetpoint.toString(), displayed: false)
+			}
+		}
+		generateStatusEvent()
 	}
-	generateStatusEvent()
 }
 
 def generateStatusEvent() {

devicetypes/smartthings/virtual-foscam.src/virtual-foscam.groovy

@@ -0,0 +1,154 @@
+import static java.util.UUID.randomUUID 
+import java.security.MessageDigest
+import javax.crypto.spec.SecretKeySpec
+import javax.crypto.Mac
+import java.security.SignatureException
+
+metadata {
+	// Automatically generated. Make future change here.
+	definition (name: "Virtual Foscam", namespace: "smartthings", author: "sidoh") {
+		capability "Actuator"
+		capability "Image Capture"
+        capability "Switch"
+        
+        command "enableRecording"
+        command "disableRecording"
+        
+        attribute "preset", "enum", ["Door", "Couch", "Table"]
+        command "setPresetDoor"
+        command "setPresetCouch"
+        command "setPresetTable"
+	}
+    
+    preferences {
+    	input "camera", "text", title: "Camera Identifier", displayDuringSetup: true
+    }
+
+	simulator {
+		// TODO: define status and reply messages here
+	}
+
+	tiles {
+		standardTile("camera", "device.image", width: 1, height: 1, canChangeIcon: false, inactiveLabel: true, canChangeBackground: true) {
+			state "default", label: "", action: "", icon: "st.camera.dropcam-centered", backgroundColor: "#FFFFFF"
+		}
+
+		carouselTile("cameraDetails", "device.image", width: 3, height: 2) { }
+
+		standardTile("take", "device.image", width: 1, height: 1, canChangeIcon: false, inactiveLabel: true, canChangeBackground: false) {
+			state "take", label: "Take", action: "Image Capture.take", icon: "st.camera.dropcam", backgroundColor: "#FFFFFF", nextState:"taking"
+			state "taking", label:'Taking', action: "", icon: "st.camera.dropcam", backgroundColor: "#53a7c0"
+			state "image", label: "Take", action: "Image Capture.take", icon: "st.camera.dropcam", backgroundColor: "#FFFFFF", nextState:"taking"
+		}
+        
+        standardTile("switch", "device.switch", width: 1, height: 1, canChangeIcon: true) {
+            state "on", label:'${name}', action:"switch.off", icon:"st.Entertainment.entertainment9", backgroundColor:"#79b821", nextState:"turningOff"
+            state "off", label:'${name}', action:"switch.on", icon:"st.Entertainment.entertainment9", backgroundColor:"#ffffff", nextState:"turningOn"
+            state "turningOn", label:'${name}', icon:"st.Entertainment.entertainment9", backgroundColor:"#79b821"
+            state "turningOff", label:'${name}', icon:"st.Entertainment.entertainment9", backgroundColor:"#ffffff"
+		}
+        
+        standardTile("presetDoor", "device.preset", width: 1, height: 1, canChangeIcon: true) {
+        	state "Door", label: '${name}', backgroundColor:"#79b821", action: "setPresetDoor"
+        }
+        
+        standardTile("presetCouch", "device.preset", width: 1, height: 1, canChangeIcon: true) {
+        	state "Couch", label: '${name}', backgroundColor:"#79b821", action: "setPresetCouch"
+        }
+        
+        standardTile("presetTable", "device.preset", width: 1, height: 1, canChangeIcon: true) {
+        	state "Table", label: '${name}', backgroundColor:"#79b821", action: "setPresetTable"
+        }
+
+		main "switch"
+		details(["cameraDetails", "take", "switch", "presetDoor", "presetCouch", "presetTable"])
+	}
+}
+
+def setPresetDoor() {
+	setPreset("Door")
+}
+
+def setPresetCouch() {
+	setPreset("Couch")
+}
+
+def setPresetTable() {
+	setPreset("Table")
+}
+
+def on() {
+	sendEvent(name: "switch", value: "on")
+    gwPost('', [recording: true])
+}
+
+def off() {
+	sendEvent(name: "switch", value: "off")
+    gwPost('', [recording: false])
+}
+
+def take() {
+	log.info "Executing 'take'"
+
+	gwGet('/snapshot.jpg') {
+    	final def imageName = "${randomUUID() as String}.jpg"
+		storeImage(imageName, it.data)
+    }
+}
+
+def hmac(String data, String key) throws SignatureException {
+  final Mac hmacSha1;
+  try {
+     hmacSha1 = Mac.getInstance("HmacSHA1");
+  } catch (Exception nsae) {
+     hmacSha1 = Mac.getInstance("HMAC-SHA-1");         
+  }
+  
+  final SecretKeySpec macKey = new SecretKeySpec(key.getBytes(), "RAW");
+  hmacSha1.init(macKey);
+  
+  final byte[] signature =  hmacSha1.doFinal(data.getBytes());
+  
+  return signature.encodeHex()
+}
+
+def getHmacHeaders() {
+    final def payload = randomUUID() as String
+    long time = new Date().getTime() 
+    time /= 1000L
+    
+    final String signature = hmac(payload + time, '<security_token>')
+
+    [
+        'X-Signature-Timestamp': time,
+        'X-Signature-Payload': payload,
+        'X-Signature': signature
+    ]
+}
+
+def setPreset(preset) {
+	gwPost('', [preset: preset])
+    runIn(2, take)
+    sendEvent(name: 'preset', value: preset)
+}
+
+def gwPost(path, params, success = {}) {
+    httpPost(
+    	[
+            uri: ("http://<ha_gateway_url>/camera/${settings.camera}${path}"),
+            body: params,
+            headers: getHmacHeaders(),
+            success: success
+        ]
+    )
+}
+
+def gwGet(path, success = {}) {
+    httpGet(
+    	[
+            uri: ("http://<ha_gateway_url>/camera/${settings.camera}${path}"),
+            headers: getHmacHeaders(),
+            success: success
+        ]
+    )
+}

smartapps/lights-in-my-home/lights-in-my-home.src/lights-in-my-home.groovy

@@ -1,96 +0,0 @@
-/**
- *  Lights In My Home
- *
- *  Copyright 2016 Maciej Urbanski
- *
- *  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: "Lights In My Home",
-    namespace: "lights-in-my-home",
-    author: "Maciej Urbanski",
-    description: "Controll lights in my home",
-    category: "Convenience",
-    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",
-    oauth: true)
-
-
-preferences {
-	preferences {
-  		section ("Allow external service to control these things...") {
-    		input "switches", "capability.switch", multiple: true, required: true
-  		}
-	}
-}
-
-mappings {
-  path("/switches") {
-    action: [
-      GET: "listSwitches"
-    ]
-  }
-  path("/switches/:command") {
-    action: [
-      PUT: "updateSwitches"
-    ]
-  }
-}
-
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-
-	unsubscribe()
-	initialize()
-}
-
-// returns a list like
-// [[name: "kitchen lamp", value: "off"], [name: "bathroom", value: "on"]]
-def listSwitches() {
-    def resp = []
-    switches.each {
-      resp << [name: it.displayName, value: it.currentValue("switch")]
-    }
-    return resp
-}
-
-void updateSwitches() {
-    // use the built-in request object to get the command parameter
-    def command = params.command
-
-    // all switches have the command
-    // execute the command on all switches
-    // (note we can do this on the array - the command will be invoked on every element
-    switch(command) {
-        case "on":
-            switches.on()
-            break
-        case "off":
-            switches.off()
-            break
-        default:
-            httpError(400, "$command is not a valid command for all switches specified")
-    }
-}
-
-def initialize() {
-	// TODO: subscribe to attributes, devices, locations, etc.
-}
-
-// TODO: implement event handlers