* A comprehensive documentation for developers who want to learn more
about architecture of the binding and technical details. It also
describes how to add new devices.
Signed-off-by: Markus Michels <markus7017@gmail.com>
* Fix reinitialize problem after Wifi disconnect of the hub device and
binding stopping updates from BLU events.
Signed-off-by: Markus Michels <markus7017@gmail.com>
* * Sync access to ShellyDeviceStats (use AtomicInteger/Long for stats
values)
Signed-off-by: Markus Michels <markus7017@gmail.com>
Co-authored-by: Ravi Nadahar <nadahar@rediffmail.com>
* Rudimentary refactoring to let WebSocketClient share lifecycle with the ThingHandler
Signed-off-by: Markus Michels <markus7017@gmail.com>
Co-authored-by: Ravi Nadahar <nadahar@rediffmail.com>
* Refactoring BLU support as basis for adding new BLU device types
* Completely refactored, supports decoding of all BTHome sensor id and is
the basis to add more BLU devices by an upcoming PR.
Signed-off-by: Markus Michels <markus7017@gmail.com>
* Move all device / thing related definitoons to class ShellyDevices.
Device Profile initialization is now based THING_TYPE_CLASSES, some unit
tests fixed.
* The BLU Gateway is a regular W-LAN device, has the Gen 2 API and acts as
a gateway for the BLU devices. BLUGWxx was renamed to PLUSBLUGWxx to
make it clear and moved the declarations under the the Shelly Plus
series, removed it from the BLU_SENSOR group
* group GROUP_MINI_THING_TYPES added, group GROUP_LIGHT_THING_TYPES is
build from sub-groups, SUPPORTED_THING_TYPES uses GROUP_xxx and adds
only remaining thing types to improve maintainability
Signed-off-by: Markus Michels <markus7017@gmail.com>
* Firmware 1.6.1 does not provide the component id on NotifyStatus updates
(id value = null). The change provides a fallback if id==null as well as
additional safety checks.
Signed-off-by: Markus Michels <markus7017@gmail.com>
* Fix Shelly Plug US: This is a Gen2 device, but the service name is
missing the "plus" - shellyplugus instead of shellyplusplugus. As a
result the thing uses the Gen1 API, which does not work.
Signed-off-by: Markus Michels <markus7017@gmail.com>
* Fixes thing re-init during/after firmware update. API will not be closed
on ota_success message.
* Don't disconnect from device during firmware update, this ensures to get
further events throughout the upgrade process
* suspress COMMUNICATION_ERROR on expected restart after fw upgrade
Signed-off-by: Markus Michels <markus7017@gmail.com>
* Fixes#17052 (caused by inproper initialization of the profile flags for
BLU devices in general and for BLU Motion another one)
Signed-off-by: Markus Michels <markus7017@gmail.com>
* 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>
* 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>
* Check for local_ip == 169.254.x.xm, which is the result when DHCP IP
assignment failed. Avoid that the binding passes this address to the
device as part of the callback url.
Signed-off-by: Markus Michels <markus7017@gmail.com>
Co-authored-by: markus7017 <markus7017@gmail..com>
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
* Implements #15949: Plus Dimmer 10v added
* category DimmableLight does not exist; README updated
---------
Signed-off-by: Markus Michels <markus7017@gmail.com>
* Fix resource leak when discovery handling failed and NPE when a IPv6
address is reported.
* remove callApi(request/innerRequest from Shelly1HttpApi, which changes
to callApi/httpRequest in ShellyHttpCLient.
Signed-off-by: Markus Michels <markus7017@gmail.com>
* 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>
initialization if device doesn't support scripts (Pro4); fix resetMeter
for EM50 (has 2 power meters); removed channel sensors#open; removed
device#voltage updates for Plus/Pro, needs to be verified
Signed-off-by: Markus Michels <markus7017@gmail.com>
* 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>
* 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>
* 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>
* 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>
* 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>
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>
* - 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>
* 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>
* Fix: Start UPNP listener to catch power off button, thing id in log
messages
Signed-off-by: Markus Michels <markus7017@gmail.com>
* comment removed
Signed-off-by: Markus Michels <markus7017@gmail.com>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* add representationProperty to thing definition to make it OH3 compatible
* adapted to OH3 (representationProperty added to thing definition)
* as always...spotless:apply :-(
Signed-off-by: Markus Michels <markus7017@gmail.com>
* OH3 adaption - fixes small issues when running on OH3
* #8612: Fix total consumption for RGW2+Roller
* #8492: Shelly Plug US
* 2 more immediate = true catched and removed
* spotless applied
Signed-off-by: Markus Michels <markus7017@gmail.com>
Markus MichelsandGitHub
