Commit Graph

90 Commits

Author SHA1 Message Date
Kai Kreuzer 72607d3bee Apply spotless
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2023-07-24 01:20:31 +02:00
openhab-bot 809fceaff3 [unleash-maven-plugin] Preparation for next development cycle. 2023-07-23 19:19:01 +00:00
Markus Michels 00da6457f0
fix relay id for devices with more than 1 power meter, fix (#15247)
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>
2023-07-16 14:38:40 +02:00
openhab-bot bf9b06de03
New translations shelly.properties (German) (#15240) 2023-07-15 18:11:29 +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
openhab-bot 0ad8cfbb62
New Crowdin updates (#15224)
* New translations googletts.properties (French)
* New translations shelly.properties (German)
* New translations googletts.properties (German)
2023-07-12 08:22:17 +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
openhab-bot 7a8ef1fdcc
New translations shelly.properties (German) (#15200) 2023-07-07 21:39:29 +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
Holger Friedrich a5c47aebee
Reduce SAT warnings (#15090)
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2023-06-15 00:02:10 +02:00
openhab-bot 214e31b1b3
New translations shelly.properties (German) (#15055) 2023-06-07 22:43:29 +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
mlobstein dc19e2991d
Declare connection for bindings N thru S (#14907)
* Declare connection for bindings N-S

Signed-off-by: Michael Lobstein <michael.lobstein@gmail.com>
2023-04-30 17:37:32 +02:00
Wouter Born 83cbe746d0
Remove redundant modifiers from interfaces (#14843)
Signed-off-by: Wouter Born <github@maindrain.net>
2023-04-18 13:07:04 +02:00
Wouter Born 2b63b984dc
[shelly] Fix missing /shelly/manager (#14592)
Using Whiteboard annotations seems to fix this issue.

Signed-off-by: Wouter Born <github@maindrain.net>
2023-03-12 20:42:12 +01: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
lolodomo 9a0d0ba409
[shelly] Cancel the init job when the thing handler is disposed (#14290)
Fix #14032

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
2023-01-30 13:24:36 +01:00
Jacob Laursen fe9f0583b5
Fix some addon.xml issues (#14261)
* Fix some addon.xml issues
* Re-add thing-type binding for Velux
* Prefix thing-type filenames

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
2023-01-22 19:22:13 +01:00
J-N-K 89d0689e36
fix i18n for bindings (#14235)
Also-By: Jacob Laursen <jacob-github@vindvejr.dk>
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-01-21 12:14:51 +01:00
J-N-K 5f8214f08a
Adapt to core changes (addon.xml) (#13289)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-01-15 20:31:42 +01:00
Holger Friedrich 4e44de3894
Fix SAT warnings (#14202)
* Fix SAT warnings

- checkstyle.ModifierOrderCheck
- checkstyle.OneStatementPerLineCheck
- checkstyle.NeedBracesCheck
- PMD.UseStandardCharsets
- PMD.UseCollectionIsEmpty
- PMD.UnusedLocalVariable
- PMD.SimplifyBooleanReturns where reasonable, suppress where
readability is better without change
- PMD.SimplifyBooleanExpressions

* Include StandardCharsets

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2023-01-13 08:11:06 +01:00
Jacob Laursen 4dd6d3a8a2
Update license headers to 2023 (#14154)
* Update copyright year in configuration
* Update license headers

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
2023-01-06 09:49:54 +01:00
Johannes Velde 7c3fbfdde3
fix typo (#14146)
Signed-off-by: veldhaenchen <jo.velde@gmx.de>
2023-01-03 18:58:19 +01:00
J-N-K 4d6d6443ef
fix spotless after release (#14014)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2022-12-19 15:22:17 +01:00
openhab-bot 7993786dc9 [unleash-maven-plugin] Preparation for next development cycle. 2022-12-19 00:55:11 +00:00
Jacob Laursen c5b68d0248
Fix NullPointerException (#14010)
Fixes #13961

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
2022-12-18 23:22:40 +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
Дилян Палаузов 6c1373f7c2
Typos a/an (#13819) 2022-12-02 13:07:31 +01:00
Дилян Палаузов 78534e8106
Typos a/an (#13812) 2022-12-01 14:30:50 +01:00
openhab-bot baa8d208ea
New translations shelly.properties (German) (#13534) 2022-10-10 20:14:16 +02: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
Wouter Born 487811fdfd
Update Shelly and Tradfri bindings for upgrade to Californium 2.7.3 (#13407)
* Update Shelly and Tradfri bindings for upgrade to Californium 2.7.3

* Fixes deprecated API usages
* Resolves itest runbundles

Signed-off-by: Wouter Born <github@maindrain.net>
2022-09-21 12:19:19 +02:00
openhab-bot ce6b0a876d
New translations shelly.properties (German) (#13366) 2022-09-09 22:13:10 +02:00
openhab-bot a99199720a
New Crowdin updates (#13291)
* New translations shelly.properties (German)
* New translations goecharger.properties (Italian)
2022-08-18 22:04:39 +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
Kai Kreuzer 440f603e88
Apply spotless and resolver (#13027)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2022-06-27 16:00:37 +02:00
openhab-bot ed4858ebbb [unleash-maven-plugin] Preparation for next development cycle. 2022-06-26 18:18:40 +00:00
openhab-bot 1e864d444b
New Crowdin updates (#12894)
* New translations shelly.properties (German)
* New translations luxom.properties (Italian)
2022-06-06 11:34:28 +02:00
Markus Michels 29a45ef1ab
Fix #12381 (#12843)
Signed-off-by: markus7017 <markus7017@gmail.com>
Signed-off-by: Markus Michels <markus7017@gmail.com>
2022-06-05 12:03:14 +02:00
openhab-bot 598d88648c
New Crowdin updates (#12849)
* New translations boschshc.properties (German)
* New translations jinja.properties (German)
* New translations regex.properties (German)
* New translations jsonpath.properties (German)
* New translations xpath.properties (German)
* New translations dynamodb.properties (German)
* New translations jdbc.properties (German)
* New translations neeo.properties (German)
* New translations fsinternetradio.properties (German)
* New translations sonyaudio.properties (German)
* New translations systeminfo.properties (German)
* New translations wemo.properties (German)
* New translations googlestt.properties (German)
* New translations voicerss.properties (German)
* New translations porcupineks.properties (German)
* New translations watsonstt.properties (German)
* New translations voskstt.properties (German)
* New translations deutschebahn.properties (German)
* New translations dwdunwetter.properties (German)
* New translations shelly.properties (German)
* New translations googletts.properties (German)
* New translations http.properties (Italian)
* New translations evcc.properties (German)
* New translations imperihome.properties (Italian)
* New translations voicerss.properties (German)
* New translations dwdunwetter.properties (German)
2022-06-01 12:11:04 +02:00
Markus Michels 6c78b4a63d
Fixes CoAP parsing problem (#12831) (#12834)
Signed-off-by: markus7017 <markus7017@gmail.com>
Signed-off-by: Markus Michels <markus7017@gmail.com>
2022-05-28 11:55:58 +02:00
Markus Michels 5291d7ddc9
[shelly] Prepare for CrowdIn translations, bug fixes (#12822)
* Prepare for CrowdIn translations, includes translation of binding
settings; fix #12815 endless initialization; fix #12535 invalid log
messages

Signed-off-by: markus7017 <markus7017@gmail.com>
Signed-off-by: Markus Michels <markus7017@gmail.com>
2022-05-28 10:33:40 +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