Commit Graph

34 Commits

Author SHA1 Message Date
Markus Michels
afc6d949e8
[shelly] Add support for Range Extender feature (#16419)
* Add support for Shelly Range Extender mode (Plus/Pro series only)
* Check for secondary devices also when manual scan is triggered

Signed-off-by: Markus Michels <markus7017@gmail.com>
2024-03-31 10:27:47 +02:00
Markus Michels
51109f4d95
[shelly] Support for Shelly BLU H&T (#16413)
* Support for Shelly BLU H&T added

Signed-off-by: Markus Michels <markus7017@gmail.com>
2024-02-18 08:59:19 +01:00
Markus Michels
4ca013d99b
[shelly] New channel group ncurrent for 3EM (#16336)
* Add channels for emeter_n (neutral current-based measurements) - polled
status and CoAP update (ncurrent only, no other values)

Signed-off-by: Markus Michels <markus7017@gmail.com>
2024-02-17 15:36:20 +01:00
Markus Michels
3fb5e66eb1
Support for Shelly Plus Mini Gen 3 series of devices, Shelly Plus UNI (#16335)
and Shelly BLU Gateway.

Signed-off-by: Markus Michels <markus7017@gmail.com>
2024-02-04 17:17:59 +01:00
Markus Michels
a6f9adf6ec
Fix stack overflow when an unknown CoAP Id is detected; Fix innerTemp (#16240)
channel creation for Gen2 devices not having this; Fix sensor
initialization on wakeup; Fix missingf temperature5 description; add
missing relay definition for shellywalldisplay; Some README fixes
2024-01-18 22:05:22 +01:00
Markus Michels
a4da986330
[shelly] Support for Plus Dimmer 10v (#15950)
* Implements #15949: Plus Dimmer 10v added
* category DimmableLight does not exist; README updated

---------

Signed-off-by: Markus Michels <markus7017@gmail.com>
2023-11-26 00:27:03 +01:00
Markus Michels
a13fd80bfe
[shelly] Misc changes (small fixes, log improvements, hardened leak prevention on (#15922)
* Misc changes (same fixes, log improvements, hardened leak prevention on
exceptions)

---------

Signed-off-by: Markus Michels <markus7017@gmail.com>
2023-11-25 09:46:22 +01:00
Markus Michels
a535caa13c
[shelly] BLU Motion, optimize ShellyManager for BLU devices (#15401)
Signed-off-by: Markus Michels <markus7017@gmail.com>
2023-11-18 21:50:10 +01:00
Markus Michels
f6e750a5ff
[shelly] Fix Plus/Pro Auth support (#15284)
* Reimplement Auth Digist to return response as http header field instead
of being part of post data; avoid sending Basic Auth for Gen2 and
/shelly

Signed-off-by: Markus Michels <markus7017@gmail.com>
2023-07-27 15:41:32 +02:00
Markus Michels
bfbbf3504f
[shelly] Add support for Shelly Plus Mini series, Pro EM-50 and various bug fixes (#15205)
* Shelly BLU support, various fixes
* Shelly Dimmer US added
* Reference to org.eclipse.jetty.websocket updated to 9.4.50.v20221201
* Support for Shelly Wall Display added
* Fixed #15052: channel totalKWH and totalRetruned: correct value is kw/h
(API value needs to be converted from Watt/Min to kw/h)
* Regular power meter returns Watt/Min, the EM/3EM meter returns W/h; this
needs to be handled differently
* Gen2 power meter returns Watt, which needs to be converted to W/h
(and then gets converted to kw&/h for the channel update)
* bug fixes around channel creation, some xml channel declarations fixed
* Support for 1Mini, 1PM Mini and PM Mini added
* Avoid NPE for devices having relay(s), but no meter (like Pro 2); README
updated
* Shelly Pro 3EM-50 added; fixes #15151, #15152 and more
* fix #15218 (only 1 device#resetTotals channel)
* Fix Pro EM50 (it's not a 3EM-50): thing type name is now shellyproem50,
use EM1DataDeleteAllData method rather then EMDataDeleteAllData
* <connection>local</connection> added to addon.xml
* channel group names for i4 fixed, Plus-Roller now has voltage

Signed-off-by: Markus Michels <markus7017@gmail.com>
2023-07-14 21:59:45 +02:00
Markus Michels
5bea9bcfdf
[shelly] Add support for Shelly Wall Dimmer US and Wall Display (#15051)
Signed-off-by: Markus Michels <markus7017@gmail.com>
2023-07-08 17:05:49 +02:00
Markus Michels
631148320f
[shelly] Add support for Shelly BLU series of devices (#15031)
* support for Pro 3EM (WIP)
* Support for Plug-S and Smoke added
* new channel resetTotals for emeters, new channel sensor#mute for Smoke
* Validate Temp reported by CoAP before updating channel, ignore 999
* Add support for Shelly BLU Button and Door/Window

Signed-off-by: Markus Michels <markus7017@gmail.com>
2023-06-26 16:37:50 +02:00
Markus Michels
1f774db959
[shelly] Support for Plus Smoke, Plus Plug-S/IT/UK/US, Plus Dimmer US, Pro 3EM; fix Gen1 sensor initialization (#14532)
* support for Pro 3EM (WIP)
* Support for Plug-S and Smoke added
* new channel resetTotals for emeters, new channel sensor#mute for Smoke
* Validate Temp reported by CoAP before updating channel, ignore 999
* Support device temp for Pro3, fix emeter.current rouding on 1 instead of
3 deciaml digits, check for reinit before executing channel command,
avoid NPE in Shelly Manaher
* Fix NPE in Shelly Manager with Plus/Pro devices (not having all Gen1
settings initialized)
* Avoid NPE if device time is not set; check thing stopping state to
prevent "handler already disposed"

Signed-off-by: Markus Michels <markus7017@gmail.com>
2023-05-24 14:20:11 +02:00
Felix Schneider
13ab221e09
Remove unused headings (#14571)
Remove the unused headings for generation 2. There is probably a manual missing for gen 2, but while this is the case the headlines can be removed

Signed-off-by: Felix Schneider <fs@felix-schneider.org>
2023-03-10 23:31:07 +01:00
Mithi83
8274020423
Fix typo (#14410) 2023-02-16 22:44:15 +01:00
Johannes Velde
7c3fbfdde3
fix typo (#14146)
Signed-off-by: veldhaenchen <jo.velde@gmx.de>
2023-01-03 18:58:19 +01:00
Wouter Born
8d65371844
[shelly] Remove broken images (#14007)
See also #13993

Signed-off-by: Wouter Born <github@maindrain.net>
2022-12-18 19:49:42 +01:00
Jerome Luckenbach
1ca9baf157
[Documentation] Markdown improvements n to s (#13948)
Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
2022-12-14 16:52:43 +01:00
Дилян Палаузов
2a5d6beb64
Typos a/an (#13846) 2022-12-05 18:47:43 +01:00
Markus Michels
8f972362c3
[shelly] Plus 1/1PM Add-On support; fix roller pos on open/close state (#13520)
* Added #13493 Plus 1/1PM addon support; Fixed #13515 pos for roller in
open/close state; various null warnings removed; README updated

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

* digitalInput, analogInput and voltage added for Add-On; README updated

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

* shelly2-roller re-added (wrong assumption that Shelly 2 doesn't support
roller mode, because it has no power meter)

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

* Initialization for Californium 2.7.3 fixed (no multicast packets where
received)

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

* Analogous input support for Plus Addon changed; Allterco made a format
change in the beta firmware

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

* changes applied

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

* README updated; Shelly Plus addon handling adjusted to latest firmware
(before was beta)

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

* Update bundles/org.openhab.binding.shelly/README.md

Signed-off-by: Fabian Wolter <github@fabian-wolter.de>

* fix JSON for Shelly1 - ext_switch_enable is a boolean, not an int

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

Signed-off-by: Markus Michels <markus7017@gmail.com>
Signed-off-by: markus7017 <markus7017@gmail.com>
Signed-off-by: Fabian Wolter <github@fabian-wolter.de>
Co-authored-by: Fabian Wolter <github@fabian-wolter.de>
2022-12-05 08:51:31 +01:00
Markus Michels
6835c278e1
[shelly] Add Plus/Pro support, some bugfixes (#13439)
* Plus/Pro support and some refactoring, bugfixes

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

* Review changes applied

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

* review changes

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

Signed-off-by: Markus Michels <markus7017@gmail.com>
2022-10-04 08:00:50 +02:00
Markus Michels
5b038786d5
[shelly] Improved TRV profile handling (selectable list via dynamic state options (#13227)
provider); some improvements & fixes

Signed-off-by: Markus Michels <markus7017@gmail.com>
2022-08-09 10:04:07 +02:00
Markus Michels
0d73ed8150
[shelly] Minor bugfixes from hardening (#13200)
* Minor bugfixes from hardening

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

* review changes applied

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

* controlProfile is type String

Signed-off-by: Markus Michels <markus7017@gmail.com>
2022-08-04 08:42:29 +02:00
Markus Michels
8aa88bc3d9
This PR is just to reduce the delta before I create the PR for Plus/Pro (#13176)
support. In general Gen1 and Gen2 devices have a total different API so
I spliced the API code in version/gen 1 and 2. This means restructuring
the classes (e.h. api+coap became api+api1+api2) and therefor dummy
changes in the code, e.g. import statements. This creates a lot of
overhead and separating those "dummy changes" simplifies merging the
actual PR.

Signed-off-by: Markus Michels <markus7017@gmail.com>
2022-07-29 19:48:10 +02:00
Markus Michels
4f8c1722a2
[shelly] Auto-numbering for channel labels & bugfixes (#13066)
* - new device types added
- min firmware set to 1.8.2
- unit for gas concentration fixed (ppm)
- Auto numbering on channel labels for groups with multiple instances
(add sequence suffix)
- API and Thing interfaces defined to restrict access to those classes
- fix on TRV boost update via CoAP
- fix for status.temperature and status.uptime, internalTemp channels
- don’t use meter timestamp if not present (RGBW2)
- low battery indicator for sensor devices fixed
- device detection based on model/type improved
- various messages/translations fixed/improved
- README updated (missing thing types added)

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

* missing properties added

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

* minor changes

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

* markdown fixed

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

* review changes applied

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

* shelly_de.properties restored from main branch

Signed-off-by: Markus Michels <markus7017@gmail.com>
2022-07-19 19:37:06 +02:00
Markus Michels
532a03375a
[shelly] TRV+Motion2 support, various fixes & enhancements (#12325)
* TRV support, various fixes & enhancements

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

* #12236 fixed

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

* TRV support competed

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

* Complete TRV support

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

* - TRV polling optimized

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

* # WARNING: head commit changed in the meantime

- Shelly Motion 2 support
- TRV polling optimized
- channel creatiom of ledStatusLed fixed if no ledPowerLed was created
- Handling of sensor.status_error fixed when = no error (0/"0")
- channel timerActive was missing for Dimmer 1/2
- Motion timestamp channels were 1h off
- exception with data format while initializing a bulb fixed
- README updated

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

* - added new TRV value boost minute, polling remnoved on valve position
changes (req. latest firmware)
- fix: don't create accu channels for roller
- fix: fix Id for some status messages

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

* log types revised

Signed-off-by: Markus Michels <markus7017@gmail.com> (github: markus7017)
Signed-off-by: Markus Michels <markus7017@gmail.com>
2022-04-18 19:32:16 +02:00
Markus Michels
d0f4b84841
[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)
* 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>
2021-06-16 00:00:56 +02:00
Markus Michels
a2084e746a
[shelly] Vibration event for DW2 (#10618)
* Adapted to new checkstyle

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

* stylecheck cnages; fix CoIoT update for vibration, url encode user+pw on
"set login credentials"

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

* #10617 Vibration event added for DW2

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

* brackets

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

* some unused stuff/code removed

Signed-off-by: Markus Michels <markus7017@gmail.com>
2021-05-09 20:21:35 +02:00
Markus Michels
1783017be4
[shelly] New Shelly Manager (more detailed information, status, integrated firmware upgrade) (#10276)
* This PR brings in the Shelly Manager, check doc/ShellyManager.md for
additional information.
* Restart Device in Manager when CoIoT Mode has changed
* Updated pattern to extract version info (thanks @fwolter), CoIoT warning
for non-Motion devices fixed; AdvancedUsers.md now refers to Shelly
Manager
* Modified message when beta is detected (reference to 1.5.7 release build
confuses users running 1.10 beta)
* Fix for Enable/Disable AP roaming
* Handle button events also in detached mode, README updated
* Ignore inconsistent version string for initial 1.10 releases
* removed display of firmware id (there are various formats and it has
no value)

Signed-off-by: Markus Michels <markus7017@gmail.com>
2021-03-31 22:42:33 +02:00
Markus Michels
3af0392724
[shelly] Improved Motion Support, Support CoIoT Unicast, fixes (#10220)
* New feature: Shelly Manager

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

* Removed Shelly Manager to reduce PR size (will be another PR)

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

* CoIoT initialization handles new COIOT options for the device,
sensorSleepTime is now adadvanced; Roller set position 0/100 is mapped
to UP/DOWN; Reference to Shelly Manager removed from README

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

* Nullpointer check added on settings.coiot (4Pro has this null)

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

* README updated

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

* Use regex to extract fw version from string, check fw version to detect
restarted, README updated, moved channel sensorSleepTime from group
device to sensors

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

* Review changes

Signed-off-by: Markus Michels <markus7017@gmail.com>
2021-03-03 17:43:02 +01:00
Markus Michels
fd1f7ebe75
[shelly] Add Shelly Motion, minor improvements (#10054)
* Support for Shelly Motion, some minotr improvements, README updated

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

* minor changes

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

* Bug fixes from hardening

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

* review changes applied

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

* review change

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

* review changes, fix creations of sensors#motion and device#externalPower
for H%T; moved images/uiroller*.png to doc/images

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

* missing in last fix

Signed-off-by: Markus Michels <markus7017@gmail.com>
2021-02-23 09:48:13 +01:00
Markus Michels
c4a3b1e6ba
[shelly] Improved documentation, support for UNI, 1L, Color Bulb (#9508)
* This PR merges the 2.5 code base with new features, a bunch of bug fixes
and improved documentation. Parts of the code has been re-factored and
vaious issues are fixed/optimized along the way.

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

* Minor fixed, support for Shelly Color Bulb, Shelly Motion

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

* Review changes applied

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

* review change applied

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

* review changes

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

* Review changes

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

* review changes

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

* README updated

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

* review change

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

* review change

Signed-off-by: Markus Michels <markus7017@gmail.com>
2021-02-03 22:25:19 +01:00
Markus Michels
712f1163de
[shelly] Improved documentation and first use case description (#9390)
Signed-off-by: Markus Michels <markus7017@gmail.com>
2020-12-19 15:43:34 +01:00
Kai Kreuzer
6df6783b60 added migrated 2.x add-ons
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2020-09-21 03:37:19 +02:00