MSA-1925: The DH is developed by SmartThings and the only changes are made within Tiles and UI.

devicetypes/sensative/sensative-zb-strips.src/sensative-zb-strips.groovy

@@ -0,0 +1,182 @@
+/**
+ *  SmartSense Open/Closed Sensor
+ *
+ *  Copyright 2014 SmartThings
+ *
+ *  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.
+ *
+ */
+import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
+
+metadata {
+	definition(name: "Sensative ZB Strips", namespace: "sensative", author: "SmartThings") {
+		capability "Battery"
+		capability "Configuration"
+		capability "Contact Sensor"
+		capability "Refresh"
+		capability "Temperature Measurement"
+		capability "Health Check"
+		capability "Sensor"
+
+		command "enrollResponse"
+
+
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "Sensative", model: "Strips-001"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "Sensative", model: "Strips-001"
+		fingerprint inClusters: "0000,0001,0003,0020,0402,0500,0B05", outClusters: "0019", manufacturer: "Sensativee", model: "Strips-001", deviceJoinName: "Sensative ZB Strips"
+        
+	}
+
+	simulator {
+
+	}
+
+	preferences {
+		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"
+		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+	}
+
+	tiles(scale: 2) {
+		multiAttributeTile(name: "contact", type: "generic", width: 6, height: 4) {
+			tileAttribute("device.contact", key: "PRIMARY_CONTROL") {
+				attributeState "open", label: '${name}', icon: "st.contact.contact.open", backgroundColor: "#e86d13"
+				attributeState "closed", label: '${name}', icon: "st.contact.contact.closed", backgroundColor: "#00A0DC"
+			}
+		}
+
+		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
+			state "temperature", label: '${currentValue}°F',
+					backgroundColors: [
+							[value: 31, color: "#153591"],
+							[value: 44, color: "#1e9cbb"],
+							[value: 59, color: "#90d2a7"],
+							[value: 74, color: "#44b621"],
+							[value: 84, color: "#f1d801"],
+							[value: 95, color: "#d04e00"],
+							[value: 96, color: "#bc2323"]
+					]
+		}
+		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
+			state "battery", label: 'Battery\n${currentValue}%', unit: ""
+		}
+
+		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+			state "default", action: "refresh.refresh", icon: "st.secondary.refresh"
+		}
+
+		main(["contact"])
+		details(["contact", "battery", "temperature", "refresh"])
+	}
+}
+
+def parse(String description) {
+	log.debug "description: $description"
+
+	Map map = zigbee.getEvent(description)
+	if (!map) {
+		if (description?.startsWith('zone status')) {
+			map = parseIasMessage(description)
+		} else {
+			Map descMap = zigbee.parseDescriptionAsMap(description)
+			if (descMap?.clusterInt == 0x0001 && descMap.commandInt != 0x07 && descMap?.value) {
+				map = getBatteryResult(Integer.parseInt(descMap.value, 16))
+			} else if (descMap?.clusterInt == zigbee.TEMPERATURE_MEASUREMENT_CLUSTER && descMap.commandInt == 0x07) {
+				if (descMap.data[0] == "00") {
+					log.debug "TEMP REPORTING CONFIG RESPONSE: $descMap"
+					sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+				} else {
+					log.warn "TEMP REPORTING CONFIG FAILED- error code: ${descMap.data[0]}"
+				}
+			}
+		}
+	} else if (map.name == "temperature") {
+		if (tempOffset) {
+			map.value = (int) map.value + (int) tempOffset
+		}
+		map.descriptionText = temperatureScale == 'C' ? '{{ device.displayName }} was {{ value }}°C' : '{{ device.displayName }} was {{ value }}°F'
+		map.translatable = true
+	}
+
+	log.debug "Parse returned $map"
+	def result = map ? createEvent(map) : [:]
+
+	if (description?.startsWith('enroll request')) {
+		List cmds = zigbee.enrollResponse()
+		log.debug "enroll response: ${cmds}"
+		result = cmds?.collect { new physicalgraph.device.HubAction(it) }
+	}
+	return result
+}
+
+
+private Map parseIasMessage(String description) {
+	ZoneStatus zs = zigbee.parseZoneStatus(description)
+	return zs.isAlarm1Set() ? getContactResult('open') : getContactResult('closed')
+}
+
+private Map getBatteryResult(rawValue) {
+	log.debug 'Battery'
+	def linkText = getLinkText(device)
+
+    def result = [:]
+
+	def volts = rawValue / 10
+	if (!(rawValue == 0 || rawValue == 255)) {
+		def minVolts = 2.1
+		def maxVolts = 3.0
+		def pct = (volts - minVolts) / (maxVolts - minVolts)
+		def roundedPct = Math.round(pct * 100)
+		if (roundedPct <= 0)
+			roundedPct = 1
+		result.value = Math.min(100, roundedPct)
+		result.descriptionText = "${linkText} battery was ${result.value}%"
+		result.name = 'battery'
+	}
+
+	return result
+}
+
+private Map getContactResult(value) {
+	log.debug 'Contact Status'
+	def linkText = getLinkText(device)
+	def descriptionText = "${linkText} was ${value == 'open' ? 'opened' : 'closed'}"
+	return [
+			name           : 'contact',
+			value          : value,
+			descriptionText: descriptionText
+	]
+}
+
+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+	return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
+}
+
+def refresh() {
+	log.debug "Refreshing Temperature and Battery"
+	def refreshCmds = zigbee.readAttribute(zigbee.TEMPERATURE_MEASUREMENT_CLUSTER, 0x0000) +
+			zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0020)
+
+	return refreshCmds + zigbee.enrollResponse()
+}
+
+def configure() {
+	// Device-Watch allows 2 check-in misses from device + ping (plus 1 min lag time)
+	// enrolls with default periodic reporting until newer 5 min interval is confirmed
+	sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+
+	log.debug "Configuring Reporting, IAS CIE, and Bindings."
+
+	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity
+	// battery minReport 30 seconds, maxReportTime 6 hrs by default
+	return refresh() + zigbee.batteryConfig() + zigbee.temperatureConfig(30, 300) // send refresh cmds as part of config
+}

devicetypes/smartthings/aeon-hem-xively.src/aeon-hem-xively.groovy

@@ -1,166 +0,0 @@
-/**
- *  Aeon HEM - Xively
- *
- *  Copyright 2014 Dan Anghelescu
- *
- *  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.
- *
- *
- *
- *  Genesys: Based off of Aeon Smart Meter Code sample provided by SmartThings (2013-05-30), Aeon Home Energy Meter v2 by Barry A. Burke, and Xively Logger by Patrick Stuart  Built on US model
- *           may also work on international versions (currently reports total values only)
- */
-
-
-// Automatically generated. Make future change here.
-definition (
-                name: "Aeon HEM - Xively",
-                namespace: "smartthings",
-                author: "Dan Anghelescu",
-                description: "Aeon HEM - Xively Logger",
-                category: "My Apps",
-                iconUrl: "https://graph.api.smartthings.com/api/devices/icons/st.Electronics.electronics13-icn?displaySize",
-                iconX2Url: "https://graph.api.smartthings.com/api/devices/icons/st.Electronics.electronics13-icn?displaySize=2x")
-
-preferences {
-    section("Log devices...") {
-        input "energymeters", "capability.EnergyMeter", title: "Energy Meter", required: false, multiple: true
-        input "thermostats", "capability.thermostat", title: "Thermostat", required: false, multiple: true
-        input "weatherstations", "capability.temperatureMeasurement", title: "Outside Temperature", required: false, multiple: true 
-
-    }
-
-    section ("Xively Info") {
-        input "xi_apikey", "text", title: "Xively API Key"
-        input "xi_feed", "number", title: "Xively Feed ID"
-    }
-}
-
-def installed() {
-    initialize()
-}
-
-def updated() {
-    unsubscribe()
-
-    initialize()
-}
-
-def initialize() {
-    state.clear()
-        unschedule(checkSensors)
-        schedule("0 */5 * * * ?", "checkSensors")
-        subscribe(app, appTouch)
-}
-
-def appTouch(evt) {
-    log.debug "appTouch: $evt"
-    checkSensors()
-}
-
-
-
-def checkSensors() {
-
-    def logitems = []
-    for (t in settings.energymeters) {
-        logitems.add([t.displayName, "energymeter.energy", t.latestValue("energy"), "KilowattHours", "kWh"] )
-        state[t.displayName + ".energy"] = t.latestValue("energy")
-    }
-    for (t in settings.thermostats) {
-    	logitems.add([t.displayName, "inside.temperature", t.latestValue("temperature"), "Farenheight", "°F"] )
-        state[t.displayName + ".temperature"] = t.latestValue("temperature")
-
-/*        
-		if ( t.currentValue("thermostatOperatingState")  ==  "cooling") {
-                logitems.add([t.displayName, "thermostatState", 1 ])
-                state[t.displayName + ".thermostatOperatingState"] = 1
-         }
-        if ( t.currentValue("thermostatOperatingState")  ==  "heating") {
-                logitems.add([t.displayName, "thermostatState", 2 ])
-                state[t.displayName + ".thermostatOperatingState"] = 2
-        }
-        if ( t.currentValue("thermostatOperatingState")  ==  "idle") {
-                logitems.add([t.displayName, "thermostatState", 0 ])
-                state[t.displayName + ".thermostatOperatingState"] = 0
-        }
-*/
-    }
-    for (t in settings.energymeters) {
-        logitems.add([t.displayName, "energymeter.power", t.latestValue("power"), "Watts", "W"] )
-        state[t.displayName + ".power"] = t.latestValue("power")
-    }
-    for (t in settings.energymeters) {
-        logitems.add([t.displayName, "energymeter.volts", t.latestValue("volts"), "Volts", "V"] )
-        state[t.displayName + ".volts"] = t.latestValue("volts")
-    }
-    for (t in settings.energymeters) {
-        logitems.add([t.displayName, "energymeter.amps", t.latestValue("amps"), "Amps", "A"] )
-        state[t.displayName + ".amps"] = t.latestValue("amps")
-    }
-    for (t in settings.weatherstations) {
-    	logitems.add([t.displayName, "outside.temperature", t.latestValue("temperature"), "Farenheight", "°F"] )
-        state[t.displayName + ".temperature"] = t.latestValue("temperature")
-    }
-    logField2(logitems)
-
-}
-
-private getFieldMap(channelInfo) {
-    def fieldMap = [:]
-    channelInfo?.findAll { it.key?.startsWith("field") }.each { fieldMap[it.value?.trim()] = it.key }
-    return fieldMap
-}
-
-
-private logField2(logItems) {
-    def fieldvalues = ""
-    log.debug logItems
-
-
-    def xivelyinfo = ""
-    logItems.eachWithIndex() { item, i ->
-    def channelname = item[0].replace(" ","_") + "_" + item[1]
-    xivelyinfo += "{\"id\":\"${channelname}\",\"current_value\":\"${item[2]}\",\"unit\":{\"label\":\"${item[3]}\",\"symbol\":\"${item[4]}\"}}"
-    if (i.toInteger() + 1 < logItems.size())
-    {
-    xivelyinfo += ","
-    }
-
-    }
-    log.debug xivelyinfo
-    def uri = "https://api.xively.com/v2/feeds/${xi_feed}.json"
-    def json = "{\"version\":\"1.0.0\",\"datastreams\":[${xivelyinfo} ]}"
-
-    def headers = [
-        "X-ApiKey" : "${xi_apikey}"
-    ]
-
-    def params = [
-        uri: uri,
-        headers: headers,
-        body: json
-    ]
-    log.debug params.body
-    httpPutJson(params) {response -> parseHttpResponse(response)}
-}
-
-def parseHttpResponse(response) {
-    log.debug "HTTP Response: ${response}"
-}
-
-def captureState(theDevice) {
-    def deviceAttrValue = [:]
-    for ( attr in theDevice.supportedAttributes ) {
-        def attrName = "${attr}"
-        def attrValue = theDevice.currentValue(attrName)
-        deviceAttrValue[attrName] = attrValue
-    }
-    return deviceAttrValue
-}

smartapps/smartthings/aeon-hem-xively.src/aeon-hem-xively.groovy

@@ -1,166 +0,0 @@
-/**
- *  Aeon HEM - Xively
- *
- *  Copyright 2014 Dan Anghelescu
- *
- *  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.
- *
- *
- *
- *  Genesys: Based off of Aeon Smart Meter Code sample provided by SmartThings (2013-05-30), Aeon Home Energy Meter v2 by Barry A. Burke, and Xively Logger by Patrick Stuart  Built on US model
- *           may also work on international versions (currently reports total values only)
- */
-
-
-// Automatically generated. Make future change here.
-definition (
-                name: "Aeon HEM - Xively",
-                namespace: "smartthings",
-                author: "Dan Anghelescu",
-                description: "Aeon HEM - Xively Logger",
-                category: "My Apps",
-                iconUrl: "https://graph.api.smartthings.com/api/devices/icons/st.Electronics.electronics13-icn?displaySize",
-                iconX2Url: "https://graph.api.smartthings.com/api/devices/icons/st.Electronics.electronics13-icn?displaySize=2x")
-
-preferences {
-    section("Log devices...") {
-        input "energymeters", "capability.EnergyMeter", title: "Energy Meter", required: false, multiple: true
-        input "thermostats", "capability.thermostat", title: "Thermostat", required: false, multiple: true
-        input "weatherstations", "capability.temperatureMeasurement", title: "Outside Temperature", required: false, multiple: true 
-
-    }
-
-    section ("Xively Info") {
-        input "xi_apikey", "text", title: "Xively API Key"
-        input "xi_feed", "number", title: "Xively Feed ID"
-    }
-}
-
-def installed() {
-    initialize()
-}
-
-def updated() {
-    unsubscribe()
-
-    initialize()
-}
-
-def initialize() {
-    state.clear()
-        unschedule(checkSensors)
-        schedule("0 */5 * * * ?", "checkSensors")
-        subscribe(app, appTouch)
-}
-
-def appTouch(evt) {
-    log.debug "appTouch: $evt"
-    checkSensors()
-}
-
-
-
-def checkSensors() {
-
-    def logitems = []
-    for (t in settings.energymeters) {
-        logitems.add([t.displayName, "energymeter.energy", t.latestValue("energy"), "KilowattHours", "kWh"] )
-        state[t.displayName + ".energy"] = t.latestValue("energy")
-    }
-    for (t in settings.thermostats) {
-    	logitems.add([t.displayName, "inside.temperature", t.latestValue("temperature"), "Farenheight", "°F"] )
-        state[t.displayName + ".temperature"] = t.latestValue("temperature")
-
-/*        
-		if ( t.currentValue("thermostatOperatingState")  ==  "cooling") {
-                logitems.add([t.displayName, "thermostatState", 1 ])
-                state[t.displayName + ".thermostatOperatingState"] = 1
-         }
-        if ( t.currentValue("thermostatOperatingState")  ==  "heating") {
-                logitems.add([t.displayName, "thermostatState", 2 ])
-                state[t.displayName + ".thermostatOperatingState"] = 2
-        }
-        if ( t.currentValue("thermostatOperatingState")  ==  "idle") {
-                logitems.add([t.displayName, "thermostatState", 0 ])
-                state[t.displayName + ".thermostatOperatingState"] = 0
-        }
-*/
-    }
-    for (t in settings.energymeters) {
-        logitems.add([t.displayName, "energymeter.power", t.latestValue("power"), "Watts", "W"] )
-        state[t.displayName + ".power"] = t.latestValue("power")
-    }
-    for (t in settings.energymeters) {
-        logitems.add([t.displayName, "energymeter.volts", t.latestValue("volts"), "Volts", "V"] )
-        state[t.displayName + ".volts"] = t.latestValue("volts")
-    }
-    for (t in settings.energymeters) {
-        logitems.add([t.displayName, "energymeter.amps", t.latestValue("amps"), "Amps", "A"] )
-        state[t.displayName + ".amps"] = t.latestValue("amps")
-    }
-    for (t in settings.weatherstations) {
-    	logitems.add([t.displayName, "outside.temperature", t.latestValue("temperature"), "Farenheight", "°F"] )
-        state[t.displayName + ".temperature"] = t.latestValue("temperature")
-    }
-    logField2(logitems)
-
-}
-
-private getFieldMap(channelInfo) {
-    def fieldMap = [:]
-    channelInfo?.findAll { it.key?.startsWith("field") }.each { fieldMap[it.value?.trim()] = it.key }
-    return fieldMap
-}
-
-
-private logField2(logItems) {
-    def fieldvalues = ""
-    log.debug logItems
-
-
-    def xivelyinfo = ""
-    logItems.eachWithIndex() { item, i ->
-    def channelname = item[0].replace(" ","_") + "_" + item[1]
-    xivelyinfo += "{\"id\":\"${channelname}\",\"current_value\":\"${item[2]}\",\"unit\":{\"label\":\"${item[3]}\",\"symbol\":\"${item[4]}\"}}"
-    if (i.toInteger() + 1 < logItems.size())
-    {
-    xivelyinfo += ","
-    }
-
-    }
-    log.debug xivelyinfo
-    def uri = "https://api.xively.com/v2/feeds/${xi_feed}.json"
-    def json = "{\"version\":\"1.0.0\",\"datastreams\":[${xivelyinfo} ]}"
-
-    def headers = [
-        "X-ApiKey" : "${xi_apikey}"
-    ]
-
-    def params = [
-        uri: uri,
-        headers: headers,
-        body: json
-    ]
-    log.debug params.body
-    httpPutJson(params) {response -> parseHttpResponse(response)}
-}
-
-def parseHttpResponse(response) {
-    log.debug "HTTP Response: ${response}"
-}
-
-def captureState(theDevice) {
-    def deviceAttrValue = [:]
-    for ( attr in theDevice.supportedAttributes ) {
-        def attrName = "${attr}"
-        def attrValue = theDevice.currentValue(attrName)
-        deviceAttrValue[attrName] = attrValue
-    }
-    return deviceAttrValue
-}