Skip to content

Commit

Permalink
Merge branch 'master' into feat/smart-switch-manual-power
Browse files Browse the repository at this point in the history
  • Loading branch information
@bramstroker
bramstroker committed Dec 4, 2022
2 parents 92a8a32 + ddd52a1 commit dac442b
Show file tree
Hide file tree
Showing 98 changed files with 135 additions and 106 deletions.
6 changes: 5 additions & 1 deletion README.md
View file
Expand Up @@ -714,14 +714,18 @@ Assume you have a light `light.floorlamp_livingroom`, than you should have the f
> Available from v0.14 and higher
Use the following configuration to use an existing power sensor and let powercalc create the energy sensors and utility meters for it:
In the yaml configuration (functionality not available through the webUI) you can add the following configuration
to use an existing power sensor and let powercalc create the energy sensors and utility meters for it:
```yaml
- platform: powercalc
entity_id: light.toilet
power_sensor_id: sensor.toilet_light_power
```
This also enables you to combine virtual power sensors (created with powercalc) and existing power sensors in your HA installation into
a group. Without this configuration option power_sensor_id that would not be possible.
### Resetting energy sensor
> Available from v0.23 and higher
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/arlec/PC191HA/model.json
View file
@@ -1,7 +1,7 @@
{
"measure_description": "Manually measured. Set to 0.29 as fell below detection range in standby mode",
"measure_method": "manual",
"measure_device": "Tapo P110 Smart Plug",
"measure_device": "TP-Link Tapo P110",
"name": "Arlec White Grid Connect Smart Plug In Socket With Energy Meter",
"standby_power": 0.267,
"sensor_config": {
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/arlec/PC192HA/model.json
View file
@@ -1,7 +1,7 @@
{
"measure_description": "Manually measured. Set to 0.29 as fell below detection range in standby mode",
"measure_method": "manual",
"measure_device": "Tapo P110 Smart Plug",
"measure_device": "TP-Link Tapo P110",
"name": "Arlec Grid Connect Smart Plug In Multi-Function Socket With USB",
"standby_power": 0.66,
"sensor_config": {
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/arlec/PC287HA/model.json
View file
@@ -1,7 +1,7 @@
{
"measure_description": "Manually measured.",
"measure_method": "manual",
"measure_device": "Tapo P110 Smart Plug",
"measure_device": "TP-Link Tapo P110",
"name": "Arlec Grid Connect Smart Twin Socket With Energy Meter And Surge Protection PC287HA",
"standby_power": 0.29,
"sensor_config": {
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/athom/rgbww-light/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "athom, smart-plug-v2",
"measure_device": "Athom Smart Plug v2",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 1,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/blitzwolf/SHP6-15A/model.json
View file
@@ -1,7 +1,7 @@
{
"measure_description": "Manually measured. Transcribed from https://github.com/bramstroker/homeassistant-powercalc/discussions/207#discussioncomment-1484985",
"measure_method": "manual",
"measure_device": "Zhirui PR10-D",
"measure_device": "Zhurui PR10-D",
"name": "Blitzwolf BW-SHP6 version 15A",
"standby_power": 0.4,
"sensor_config": {
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/blitzwolf/SHP6/model.json
View file
@@ -1,7 +1,7 @@
{
"measure_description": "Manually measured. Transcribed from https://github.com/bramstroker/homeassistant-powercalc/discussions/207#discussioncomment-1484985",
"measure_method": "manual",
"measure_device": "Zhirui PR10-D",
"measure_device": "Zhurui PR10-D",
"name": "Blitzwolf BW-SHP6 version 10A",
"standby_power": 0.5,
"sensor_config": {
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/gledopto/GL-B-001P/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Shelly, Shelly Plug S",
"measure_device": "Shelly Plug S",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 2,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/gledopto/GL-S-005Z/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script. Controller: hue, Bulbs: 1, Dummy Load: None",
"measure_device": "Kasa, KP115(US)",
"measure_device": "TP-Link Kasa KP115(US)",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 2,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/gledopto/GL-S-007Z/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script. Controller: hue, Bulbs: 1, Dummy Load: None",
"measure_device": "Kasa, KP115(US)",
"measure_device": "TP-Link Kasa KP115(US)",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 2,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/govee/H6072/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Kasa KP115",
"measure_device": "TP-Link Kasa KP115",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 2,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/ikea/L1527/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Shelly, SHPLG-S",
"measure_device": "Shelly SHPLG-S",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 25,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/ikea/L1529/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "SHPLG-S",
"measure_device": "Shelly SHPLG-S",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 50,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/ikea/LED1623G12/model.json
View file
Expand Up @@ -5,7 +5,7 @@
"lut"
],
"measure_method": "manual",
"measure_device": "Power Recorder; PR10-D (Model); Shenzen Zhurui Technology (Manufacturer)",
"measure_device": "Zhurui PR10-D",
"measure_description": "Bulbs was measured twice at each dim setting (100 points) and mean value was used when there were differences",
"aliases": [
"TRADFRI bulb E27 opal 1000lm",
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/ikea/LED1649C5/model.json
View file
Expand Up @@ -5,7 +5,7 @@
"lut"
],
"measure_method": "manual",
"measure_device": "Power Recorder; PR10-D (Model); Shenzen Zhurui Technology (Manufacturer)",
"measure_device": "Zhurui PR10-D",
"measure_description": "Bulbs was measured twice at each dim setting (100 points) and mean value was used when there were differences",
"aliases": [
"TRADFRI bulb E14 W op/ch 400lm"
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/ikea/LED1650R5/model.json
View file
Expand Up @@ -5,7 +5,7 @@
"lut"
],
"measure_method": "manual",
"measure_device": "Power Recorder; PR10-D (Model); Shenzen Zhurui Technology (Manufacturer)",
"measure_device": "Zhurui PR10-D",
"measure_description": "Bulbs was measured twice at each dim setting (100 points) and mean value was used when there were differences",
"aliases": [
"TRADFRI bulb GU10 W 400lm"
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/ikea/LED1733G7/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Shelly, 1PM",
"measure_device": "Shelly 1PM",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 1,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/ikea/LED1736G9/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Shelly, 1PM",
"measure_device": "Shelly 1PM",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 1,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/ikea/LED1835C6/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Shelly, 1PM",
"measure_device": "Shelly 1PM",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 1,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/ikea/LED1837R5/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Shelly, 1PM",
"measure_device": "Shelly 1PM",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 1,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/ikea/LED1842G3/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "sonoff S31",
"measure_device": "Sonoff S31",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 2,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/ikea/LED1923R5/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script, manual correction of values measured as 0.0",
"measure_device": "Shelly, 1PM",
"measure_device": "Shelly 1PM",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 1,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/ikea/LED1924G9/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Shelly, 1PM",
"measure_device": "Shelly 1PM",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 1,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/ikea/LED1937T5_E27/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Shelly 1PM plus",
"measure_device": "Shelly Plus 1PM",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 2,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/ikea/LED2002G5/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Shelly, 1PM",
"measure_device": "Shelly 1PM",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 1,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/ikea/LED2004G8/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Shelly plug S",
"measure_device": "Shelly Plug S",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 2,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/ikea/T1820/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Shelly, 1PM",
"measure_device": "Shelly 1PM",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 1,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/innr/AE 280 C/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Sonoff, S31",
"measure_device": "Sonoff S31",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 3,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/innr/BY 265/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Kasa, KP115",
"measure_device": "TP-Link Kasa KP115",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 1,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/innr/RB 175 W/model.json
View file
Expand Up @@ -5,6 +5,6 @@
"lut"
],
"measure_method": "manual",
"measure_device": "Power Recorder; PR10-D (Model); Shenzen Zhurui Technology (Manufacturer)",
"measure_device": "Zhurui PR10-D",
"measure_description": "Bulbs was measured twice at each dim setting (100 points) and mean value was used when there were differences"
}
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/innr/RS 125/model.json
View file
Expand Up @@ -5,6 +5,6 @@
"lut"
],
"measure_method": "manual",
"measure_device": "Power Recorder; PR10-D (Model); Shenzen Zhurui Technology (Manufacturer)",
"measure_device": "Zhurui PR10-D",
"measure_description": "Bulbs was measured twice at each dim setting (100 points) and mean value was used when there were differences"
}
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/innr/RS 230 C/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Shelly, Shelly Plug S",
"measure_device": "Shelly Plug S",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 2,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/innr/SP 224/model.json
View file
@@ -1,7 +1,7 @@
{
"measure_description": "Manually measured w/3.65W Incandescent nightlight.",
"measure_method": "manual",
"measure_device": "Kasa KP115(US)",
"measure_device": "TP-Link Kasa KP115(US)",
"name": "Innr Zigbee Smart Plug",
"standby_power": 0.18,
"sensor_config": {
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/lidl/HG06106B/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Kasa HS110",
"measure_device": "TP-Link Kasa HS110",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 1,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/lidl/HG06106C/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Kasa HS110",
"measure_device": "TP-Link Kasa HS110",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 1,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/lidl/HG06492B/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Kasa HS110",
"measure_device": "TP-Link Kasa HS110",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 1,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/lidl/HG07834C/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Kasa HS110",
"measure_device": "TP-Link Kasa HS110",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 1,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/lifx/LIFX A19 Night Vision/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script. TP-link kp125 was having inconsistent readings towards the 0.52 watt and lower range, so I manually smoothed out some of the outliers",
"measure_device": "TP-Link KP125",
"measure_device": "TP-Link Kasa KP125",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 2,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/lifx/LIFX BR30 Night Vision/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Kasa KP115",
"measure_device": "TP-Link Kasa KP115",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 1,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/lifx/LIFX BR30/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Kasa HS110",
"measure_device": "TP-Link Kasa HS110",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 3,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/lifx/LIFX Candle/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Kasa KP115",
"measure_device": "TP-Link Kasa KP115",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 1,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/lifx/LIFX Mini Color/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "TP-Link KP125",
"measure_device": "TP-Link Kasa KP125",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 2,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/lifx/LIFX Original 1000/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Kasa KP115",
"measure_device": "TP-Link Kasa KP115",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 1,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/neo-coolcam/NAS-WR01Z/model.json
View file
@@ -1,7 +1,7 @@
{
"measure_description": "Manually measured",
"measure_method": "manual",
"measure_device": "Zhirui PR10-D",
"measure_device": "Zhurui PR10-D",
"name": "Smart Power Plug",
"standby_power": 0.31,
"sensor_config": {
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/nodon/Micro Smart Plug/model.json
View file
@@ -1,7 +1,7 @@
{
"measure_description": "Manually measured",
"measure_method": "manual",
"measure_device": "Zhirui PR10-D",
"measure_device": "Zhurui PR10-D",
"name": "NodOn Micro Smart Plug",
"standby_power": 0.67,
"sensor_config": {
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/osram/CLA60 TW/model.json
View file
@@ -1,6 +1,6 @@
{
"measure_description": "Measured with utils/measure script",
"measure_device": "Shelly, 1PM plus",
"measure_device": "Shelly Plus 1PM",
"measure_method": "script",
"measure_settings": {
"SAMPLE_COUNT": 3,
Expand Down
2 changes: 1 addition & 1 deletion custom_components/powercalc/data/osram/LIGHTIFY Plug 01/model.json
View file
@@ -1,7 +1,7 @@
{
"measure_description": "Manually measured. Transcribed from https://github.com/bramstroker/homeassistant-powercalc/discussions/207#discussioncomment-1484985",
"measure_method": "manual",
"measure_device": "Zhirui PR10-D",
"measure_device": "Zhurui PR10-D",
"name": "Osram Lightify Plug 01",
"standby_power": 0.44,
"sensor_config": {
Expand Down

0 comments on commit dac442b

Please sign in to comment.