public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[shelly] 1PM/1L/2.5: New device#supplyVoltage; Motion: Missing channel for vibration; UNI: Unit for ADC voltage; PF for EM; Bulb: fix range for color temp (#10815)

Browse Source 
* fixes #10738, #10799

Signed-off-by: Markus Michels <markus7017@gmail.com>

* - Feature #10090 New device#supplyVoltage channel for Shelly 2.5, 1PM
and 1L
- Change  #10039 Info on "not reachable / timeout" should be warning,
not info
- Fix     #10799 Missing Channel Definition for Vibration Events
- Fix     #10738 Shelly UNI - ADC Voltage units of measure missing
- Fix     #10111 Creating Equipment from Shelly Bulb Duo causes wrong
min/max
- README updated

Signed-off-by: Markus Michels <markus7017@gmail.com>

* #10737 Shelly EM - add powerFactor channel support

Signed-off-by: Markus Michels <markus7017@gmail.com>

* README updated

Signed-off-by: Markus Michels <markus7017@gmail.com>

* channel powerFactor (EM+EM3) is now of type Number:Dimensionless

Signed-off-by: Markus Michels <markus7017@gmail.com>

* Fix for #10864: Do not trigger same alarm within 5 minutes

Signed-off-by: Markus Michels <markus7017@gmail.com>

* better logic for alarm filter

Signed-off-by: Markus Michels <markus7017@gmail.com>
This commit is contained in:
Markus Michels
2021-06-16 00:00:56 +02:00
committed by GitHub
parent c9933454db
commit d0f4b84841
14 changed files with 72 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bundles/org.openhab.binding.shelly/README.md
View File

@@ -207,6 +207,7 @@ Every device has a channel group `device` with the following channels:
| |internalTemp |Number |yes |Internal device temperature (when provided by the device) |
| |selfTest |String |yes |Result from device self-test (pending/not_completed/running/completed/unknown) |
| |alarm |Trigger |yes |Self-Test result not_completed/completed/running/pending |
| |supplyVoltage |Number |yes |Shelly 1PM, 1L, 2.5: Supply voltage (fixed or measured depending on device) |
| |accumulatedWatts |Number |yes |Accumulated power in W of the device (including all meters) |
| |accumulatedTotal |Number |yes |Accumulated total power in kwh of the device (including all meters) |
| |accumulatedReturned|Number |yes |Accumulated returned power in kwh of the device (including all meters) |
@@ -401,12 +402,14 @@ In this case the is no real measurement based on power consumption, but the Shel
| |returnedKWH |Number |yes |Total returned energy, kwh |
| |reactiveWatts|Number |yes |Instantaneous reactive power, Watts |
| |voltage |Number |yes |RMS voltage, Volts |
| |powerFactor |Number |yes |Power Factor in percent |
| |lastUpdate |DateTime |yes |Timestamp of the last measurement |
|meter2 |currentWatts |Number |yes |Current power consumption in Watts |
| |totalKWH |Number |yes |Total energy consumption in Watts since the device powered up (resets on restart)|
| |returnedKWH |Number |yes |Total returned energy, kwh |
| |reactiveWatts|Number |yes |Instantaneous reactive power, Watts |
| |voltage |Number |yes |RMS voltage, Volts |
| |powerFactor |Number |yes |Power Factor in percent |
| |lastUpdate |DateTime |yes |Timestamp of the last measurement |
### Shelly 3EM (thing-type: shellyem3)
@@ -431,7 +434,7 @@ The Thing id is derived from the service name, so that's the reason why the Thin
| |reactiveWatts|Number |yes |Instantaneous reactive power, Watts |
| |voltage |Number |yes |RMS voltage, Volts |
| |current |Number |yes |Current in A |
| |powerFactor |Number |yes |Power Factor |
| |powerFactor |Number |yes |Power Factor in percent |
| |lastUpdate |DateTime |yes |Timestamp of the last measurement |
|meter2 |currentWatts |Number |yes |Current power consumption in Watts |
| |totalKWH |Number |yes |Total energy consumption in Watts since the device powered up (resets on restart)|
@@ -439,7 +442,7 @@ The Thing id is derived from the service name, so that's the reason why the Thin
| |reactiveWatts|Number |yes |Instantaneous reactive power, Watts |
| |voltage |Number |yes |RMS voltage, Volts |
| |current |Number |yes |Current in A |
| |powerFactor |Number |yes |Power Factor |
| |powerFactor |Number |yes |Power Factor in percent |
| |lastUpdate |DateTime |yes |Timestamp of the last measurement |
|meter3 |currentWatts |Number |yes |Current power consumption in Watts |
| |totalKWH |Number |yes |Total energy consumption in Watts since the device powered up (resets on restart)|
@@ -447,7 +450,7 @@ The Thing id is derived from the service name, so that's the reason why the Thin
| |reactiveWatts|Number |yes |Instantaneous reactive power, Watts |
| |voltage |Number |yes |RMS voltage, Volts |
| |current |Number |yes |Current in A |
| |powerFactor |Number |yes |Power Factor |
| |powerFactor |Number |yes |Power Factor in percent |
| |lastUpdate |DateTime |yes |Timestamp of the last measurement |