mirror of
https://github.com/mtan93/SmartThingsPublic.git
synced 2026-04-01 06:13:06 +01:00
Compare commits
1 Commits
MSA-1412-1
...
MSA-1408-1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1674dc7339 |
@@ -1,118 +1,118 @@
|
|||||||
/**
|
/**
|
||||||
* Copyright 2015 SmartThings
|
* Copyright 2015 SmartThings
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
|
* 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:
|
* in compliance with the License. You may obtain a copy of the License at:
|
||||||
*
|
*
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
* 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
|
* 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
|
* 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.
|
* for the specific language governing permissions and limitations under the License.
|
||||||
*
|
*
|
||||||
* Aeon Home Energy Meter
|
* Aeon Home Energy Meter
|
||||||
*
|
*
|
||||||
* Author: SmartThings
|
* Author: SmartThings
|
||||||
*
|
*
|
||||||
* Date: 2013-05-30
|
* Date: 2013-05-30
|
||||||
*/
|
*/
|
||||||
metadata {
|
metadata {
|
||||||
definition (name: "Aeon Home Energy Meter", namespace: "smartthings", author: "SmartThings") {
|
definition (name: "Aeon Home Energy Meter", namespace: "smartthings", author: "SmartThings") {
|
||||||
capability "Energy Meter"
|
capability "Energy Meter"
|
||||||
capability "Power Meter"
|
capability "Power Meter"
|
||||||
capability "Configuration"
|
capability "Configuration"
|
||||||
capability "Sensor"
|
capability "Sensor"
|
||||||
|
|
||||||
command "reset"
|
command "reset"
|
||||||
|
|
||||||
fingerprint deviceId: "0x2101", inClusters: " 0x70,0x31,0x72,0x86,0x32,0x80,0x85,0x60"
|
fingerprint deviceId: "0x2101", inClusters: " 0x70,0x31,0x72,0x86,0x32,0x80,0x85,0x60"
|
||||||
}
|
}
|
||||||
|
|
||||||
// simulator metadata
|
// simulator metadata
|
||||||
simulator {
|
simulator {
|
||||||
for (int i = 0; i <= 10000; i += 1000) {
|
for (int i = 0; i <= 10000; i += 1000) {
|
||||||
status "power ${i} W": new physicalgraph.zwave.Zwave().meterV1.meterReport(
|
status "power ${i} W": new physicalgraph.zwave.Zwave().meterV1.meterReport(
|
||||||
scaledMeterValue: i, precision: 3, meterType: 4, scale: 2, size: 4).incomingMessage()
|
scaledMeterValue: i, precision: 3, meterType: 4, scale: 2, size: 4).incomingMessage()
|
||||||
}
|
}
|
||||||
for (int i = 0; i <= 100; i += 10) {
|
for (int i = 0; i <= 100; i += 10) {
|
||||||
status "energy ${i} kWh": new physicalgraph.zwave.Zwave().meterV1.meterReport(
|
status "energy ${i} kWh": new physicalgraph.zwave.Zwave().meterV1.meterReport(
|
||||||
scaledMeterValue: i, precision: 3, meterType: 0, scale: 0, size: 4).incomingMessage()
|
scaledMeterValue: i, precision: 3, meterType: 0, scale: 0, size: 4).incomingMessage()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// tile definitions
|
// tile definitions
|
||||||
tiles {
|
tiles {
|
||||||
valueTile("power", "device.power", decoration: "flat") {
|
valueTile("power", "device.power", decoration: "flat") {
|
||||||
state "default", label:'${currentValue} W'
|
state "default", label:'${currentValue} W'
|
||||||
}
|
}
|
||||||
valueTile("energy", "device.energy", decoration: "flat") {
|
valueTile("energy", "device.energy", decoration: "flat") {
|
||||||
state "default", label:'${currentValue} kWh'
|
state "default", label:'${currentValue} kWh'
|
||||||
}
|
}
|
||||||
standardTile("reset", "device.energy", inactiveLabel: false, decoration: "flat") {
|
standardTile("reset", "device.energy", inactiveLabel: false, decoration: "flat") {
|
||||||
state "default", label:'reset kWh', action:"reset"
|
state "default", label:'reset kWh', action:"reset"
|
||||||
}
|
}
|
||||||
standardTile("refresh", "device.power", inactiveLabel: false, decoration: "flat") {
|
standardTile("refresh", "device.power", inactiveLabel: false, decoration: "flat") {
|
||||||
state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
|
state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
|
||||||
}
|
}
|
||||||
standardTile("configure", "device.power", inactiveLabel: false, decoration: "flat") {
|
standardTile("configure", "device.power", inactiveLabel: false, decoration: "flat") {
|
||||||
state "configure", label:'', action:"configuration.configure", icon:"st.secondary.configure"
|
state "configure", label:'', action:"configuration.configure", icon:"st.secondary.configure"
|
||||||
}
|
}
|
||||||
|
|
||||||
main (["power","energy"])
|
main (["power","energy"])
|
||||||
details(["power","energy", "reset","refresh", "configure"])
|
details(["power","energy", "reset","refresh", "configure"])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
def parse(String description) {
|
def parse(String description) {
|
||||||
def result = null
|
def result = null
|
||||||
def cmd = zwave.parse(description, [0x31: 1, 0x32: 1, 0x60: 3])
|
def cmd = zwave.parse(description, [0x31: 1, 0x32: 1, 0x60: 3])
|
||||||
if (cmd) {
|
if (cmd) {
|
||||||
result = createEvent(zwaveEvent(cmd))
|
result = createEvent(zwaveEvent(cmd))
|
||||||
}
|
}
|
||||||
log.debug "Parse returned ${result?.descriptionText}"
|
log.debug "Parse returned ${result?.descriptionText}"
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
def zwaveEvent(physicalgraph.zwave.commands.meterv1.MeterReport cmd) {
|
def zwaveEvent(physicalgraph.zwave.commands.meterv1.MeterReport cmd) {
|
||||||
if (cmd.scale == 0) {
|
if (cmd.scale == 0) {
|
||||||
[name: "energy", value: cmd.scaledMeterValue, unit: "kWh"]
|
[name: "energy", value: cmd.scaledMeterValue, unit: "kWh"]
|
||||||
} else if (cmd.scale == 1) {
|
} else if (cmd.scale == 1) {
|
||||||
[name: "energy", value: cmd.scaledMeterValue, unit: "kVAh"]
|
[name: "energy", value: cmd.scaledMeterValue, unit: "kVAh"]
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
[name: "power", value: Math.round(cmd.scaledMeterValue), unit: "W"]
|
[name: "power", value: Math.round(cmd.scaledMeterValue), unit: "W"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
def zwaveEvent(physicalgraph.zwave.Command cmd) {
|
def zwaveEvent(physicalgraph.zwave.Command cmd) {
|
||||||
// Handles all Z-Wave commands we aren't interested in
|
// Handles all Z-Wave commands we aren't interested in
|
||||||
[:]
|
[:]
|
||||||
}
|
}
|
||||||
|
|
||||||
def refresh() {
|
def refresh() {
|
||||||
delayBetween([
|
delayBetween([
|
||||||
zwave.meterV2.meterGet(scale: 0).format(),
|
zwave.meterV2.meterGet(scale: 0).format(),
|
||||||
zwave.meterV2.meterGet(scale: 2).format()
|
zwave.meterV2.meterGet(scale: 2).format()
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
def reset() {
|
def reset() {
|
||||||
// No V1 available
|
// No V1 available
|
||||||
return [
|
return [
|
||||||
zwave.meterV2.meterReset().format(),
|
zwave.meterV2.meterReset().format(),
|
||||||
zwave.meterV2.meterGet(scale: 0).format()
|
zwave.meterV2.meterGet(scale: 0).format()
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
def configure() {
|
def configure() {
|
||||||
def cmd = delayBetween([
|
def cmd = delayBetween([
|
||||||
zwave.configurationV1.configurationSet(parameterNumber: 101, size: 4, scaledConfigurationValue: 4).format(), // combined power in watts
|
zwave.configurationV1.configurationSet(parameterNumber: 101, size: 4, scaledConfigurationValue: 4).format(), // combined power in watts
|
||||||
zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: 300).format(), // every 5 min
|
zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: 300).format(), // every 5 min
|
||||||
zwave.configurationV1.configurationSet(parameterNumber: 102, size: 4, scaledConfigurationValue: 8).format(), // combined energy in kWh
|
zwave.configurationV1.configurationSet(parameterNumber: 102, size: 4, scaledConfigurationValue: 8).format(), // combined energy in kWh
|
||||||
zwave.configurationV1.configurationSet(parameterNumber: 112, size: 4, scaledConfigurationValue: 300).format(), // every 5 min
|
zwave.configurationV1.configurationSet(parameterNumber: 112, size: 4, scaledConfigurationValue: 300).format(), // every 5 min
|
||||||
zwave.configurationV1.configurationSet(parameterNumber: 103, size: 4, scaledConfigurationValue: 0).format(), // no third report
|
zwave.configurationV1.configurationSet(parameterNumber: 103, size: 4, scaledConfigurationValue: 0).format(), // no third report
|
||||||
zwave.configurationV1.configurationSet(parameterNumber: 113, size: 4, scaledConfigurationValue: 300).format() // every 5 min
|
zwave.configurationV1.configurationSet(parameterNumber: 113, size: 4, scaledConfigurationValue: 300).format() // every 5 min
|
||||||
])
|
])
|
||||||
log.debug cmd
|
log.debug cmd
|
||||||
cmd
|
cmd
|
||||||
}
|
}
|
||||||
|
|||||||
103
smartapps/curb-v2/curb-control.src/curb-control.groovy
Normal file
103
smartapps/curb-v2/curb-control.src/curb-control.groovy
Normal file
@@ -0,0 +1,103 @@
|
|||||||
|
/**
|
||||||
|
* Curb Control
|
||||||
|
*
|
||||||
|
* Copyright 2016 Savanni D'Gerinel
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
definition(
|
||||||
|
name: "Curb Control",
|
||||||
|
namespace: "curb-v2",
|
||||||
|
author: "Savanni D'Gerinel",
|
||||||
|
description: "Control point for Curb/SmartThings integration",
|
||||||
|
category: "Green Living",
|
||||||
|
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 {
|
||||||
|
section("Allow Endpoint to Control These Things...") {
|
||||||
|
input "switches", "capability.switch", title: "Which Switches?", multiple: true, required: false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mappings {
|
||||||
|
|
||||||
|
path("/switches") {
|
||||||
|
action: [
|
||||||
|
GET: "listSwitches"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
path("/switches/:id") {
|
||||||
|
action: [
|
||||||
|
GET: "showSwitch"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
path("/switches/:id/:command") {
|
||||||
|
action: [
|
||||||
|
PUT: "updateSwitch"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def installed() {}
|
||||||
|
|
||||||
|
def updated() {}
|
||||||
|
|
||||||
|
|
||||||
|
//switches
|
||||||
|
def listSwitches() {
|
||||||
|
switches.collect{device(it,"switch")}
|
||||||
|
}
|
||||||
|
|
||||||
|
def showSwitch() {
|
||||||
|
show(switches, "switch")
|
||||||
|
}
|
||||||
|
void updateSwitch() {
|
||||||
|
update(switches)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def deviceHandler(evt) {}
|
||||||
|
|
||||||
|
private void update(devices) {
|
||||||
|
log.debug "update, request: params: ${params}, devices: $devices.id"
|
||||||
|
|
||||||
|
|
||||||
|
//def command = request.JSON?.command
|
||||||
|
def command = params.command
|
||||||
|
//let's create a toggle option here
|
||||||
|
if (command)
|
||||||
|
{
|
||||||
|
def device = devices.find { it.id == params.id }
|
||||||
|
if (!device) {
|
||||||
|
httpError(404, "Device not found")
|
||||||
|
} else {
|
||||||
|
if(command == "toggle")
|
||||||
|
{
|
||||||
|
if(device.currentValue('switch') == "on")
|
||||||
|
device.off();
|
||||||
|
else
|
||||||
|
device.on();;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private show(devices, type) {
|
||||||
|
def device = devices.find { it.id == params.id }
|
||||||
|
if (!device) {
|
||||||
|
httpError(404, "Device not found")
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
def attributeName = type == "motionSensor" ? "motion" : type
|
||||||
|
def s = device.currentState(attributeName)
|
||||||
|
[id: device.id, label: device.displayName, value: s?.value, unitTime: s?.date?.time, type: type]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private device(it, type) {
|
||||||
|
it ? [id: it.id, label: it.label, type: type] : null
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user