Commit Graph

49 Commits

Author SHA1 Message Date
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
lolodomo
6ef311304f
Remove some of the empty XML tag "description" (#12332)
Signed-off-by: Laurent Garnier <lg.hc@free.fr>
2022-02-20 23:16:16 +01:00
lolodomo
1197c67bbb
Replace unknown category DimmableLight by Light (#12264)
Also replace unknwon category DimmableCT by ColorLight

Fix #12263

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
2022-02-13 09:40:29 +01:00
lolodomo
e0b1c58c5a
[shelly] Category added to channel type sensorHumidity (#12266)
Signed-off-by: Laurent Garnier <lg.hc@free.fr>
2022-02-12 23:09:00 +01:00
Hilbrand Bouwkamp
da59cdd255
Update license headers to 2022 (#11973)
Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
2022-01-06 18:14:47 +01:00
Christoph Weitkamp
167f8ebc49
Avoid UnsupportedEncodingException & use const from StandardCharsets (#11948)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2022-01-03 16:05:08 +01:00
Martin Herbst
a407555362
Explicit conversion to double value added (#11887)
Fixes #11886


Signed-off-by: Martin Herbst <develop@mherbst.de>
2021-12-29 18:47:07 +01:00
Wouter Born
5eb6368927
[shelly] Fix comment in translations file (#11884)
This fixes the comment showing up in the translations.
The code seems to use the 'message.discovery.failed' instead of 'discovery.failed'.

Signed-off-by: Wouter Born <github@maindrain.net>
2021-12-29 14:10:54 +01:00
openhab-bot
c23f6adf13
New Crowdin updates (#11832)
* New translations astro.properties (Finnish)
* New translations astro.properties (German)
* New translations bluetooth.properties (German)
* New translations boschshc.properties (Italian)
* New translations comfoair.properties (German)
* New translations dwdunwetter.properties (German)
* New translations epsonprojector.properties (German)
* New translations gpio.properties (German)
* New translations heliosventilation.properties (German)
* New translations homeconnect.properties (German)
* New translations homematic.properties (German)
* New translations ipp.properties (German)
* New translations jruby.properties (Hungarian)
* New translations jsscripting.properties (German)
* New translations jsscripting.properties (Hungarian)
* New translations map.properties (German)
* New translations map.properties (Hungarian)
* New translations mqttbroker.properties (Italian)
* New translations nanoleaf.properties (German)
* New translations ocean.properties (German)
* New translations openhabcloud.properties (Finnish)
* New translations samsungtv.properties (Hungarian)
* New translations shelly.properties (German)
* New translations snmp.properties (German)
* New translations sonos.properties (German)
* New translations spotify.properties (German)
* New translations tr064.properties (German)
* New translations tradfri.properties (German)
* New translations unifi.properties (German)
* New translations unifi.properties (Hungarian)
* New translations valloxmv.properties (Finnish)
* New translations volvooncall.properties (German)
* New translations xslt.properties (German)
2021-12-29 13:16:52 +01:00
Marcel
cc47ef7f3e
pom update from http to https reference (#11833)
Signed-off-by: Marcel Verpaalen <marcel@verpaalen.com>
2021-12-23 19:40:44 +01:00
Kai Kreuzer
48746f5e3f Apply spotless
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2021-12-20 09:07:55 +01:00
openhab-bot
6dc031e6cf [unleash-maven-plugin] Preparation for next development cycle. 2021-12-20 00:30:46 +00:00
Wouter Born
798abaa4ca
Switch properties files encoding from ISO-8859-1 to UTF-8 (#11349)
* Switch properties files encoding from ISO-8859-1 to UTF-8

Crowdin will generate translations in this encoding, so this prevents a lot of diffs which makes it easier to review future Crowdin PRs.

Related to openhab/openhab-core#2298

Signed-off-by: Wouter Born <github@maindrain.net>
2021-10-09 19:56:49 +02:00
Wouter Born
2f4a27217f
Fix/remove outdated "Default Tags" (#11313)
There used to be the following "Default Tags" which are no longer used in the current semantic model:

* Lighting
* Switchable
* CurrentTemperature
* TargetTemperature
* CurrentHumidity

See:

* https://www.openhab.org/docs/developer/bindings/thing-xml.html#default-tags
* https://www.openhab.org/docs/tutorial/model.html#semantic-model

Signed-off-by: Wouter Born <github@maindrain.net>
2021-09-27 07:33:56 +02:00
lolodomo
7cdb41a459
[shelly] Suppress useless config URI with only 2 segments from binding.xml (#11022)
Signed-off-by: Laurent Garnier <lg.hc@free.fr>
2021-07-18 19:06:08 +02:00
Kai Kreuzer
bebab9ce29 applied spotless
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2021-06-27 23:25:35 +02:00
jenkins
8c5c81e256 [unleash-maven-plugin] Preparation for next development cycle. 2021-06-27 17:35:01 +00: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
Wouter Born
f5f922eaf4
Fix or suppress SAT CompareObjectsWithEquals findings (#10631)
* Fix or suppress SAT CompareObjectsWithEquals findings

Signed-off-by: Wouter Born <github@maindrain.net>
2021-05-05 21:06:04 +02:00
Wouter Born
b42101addc
Remove unused local variables (#10528)
Fixes 26 SAT UnusedLocalVariable findings

Signed-off-by: Wouter Born <github@maindrain.net>
2021-04-16 22:35:01 +02:00
Wouter Born
1633c705a1
Use Collection.isEmpty (#10525)
Fixes 47 SAT UseCollectionIsEmpty findings.

Signed-off-by: Wouter Born <github@maindrain.net>
2021-04-15 21:00:47 +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
Wouter Born
580f293766
Resolve itest runbundles for Gson and Commons Lang upgrades and fix JsonParser deprecations (#10345)
* Resolve itest runbundles for Gson and Commons Lang upgrades
* Fix JsonParser deprecations too
* Fix feature verification

Signed-off-by: Wouter Born <github@maindrain.net>
2021-03-18 12:15:15 +01: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
Hilbrand Bouwkamp
8889762bef
Removal of reference to PaperUI (#9905)
Related to #8607.

In some cases removed information that is actually generic information and should not be in binding readme.

Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
2021-01-22 09:51:24 +01:00
Wouter Born
d6364aceb1
Update license headers to 2021 (#9620)
Signed-off-by: Wouter Born <github@maindrain.net>
2021-01-02 22:03:14 +01:00
Wouter Born
ecac667258
Apply Spotless, update skeleton project version, resolve itest runbundles (#9459)
Signed-off-by: Wouter Born <github@maindrain.net>
2020-12-22 10:37:44 +01:00
jenkins
e4554f4aa6 [unleash-maven-plugin] Preparation for next development cycle. 2020-12-21 10:36:42 +00: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
Wouter Born
ac6f08908f
Use renamed Units class (#9267)
Signed-off-by: Wouter Born <github@maindrain.net>
2020-12-07 10:34:02 +01:00
Wouter Born
ac18da7fc3
Use core unit classes (#9261)
Add-ons should not depend on tec.uom.se classes but use core unit classes instead so they are less impacted when this library is replaced or upgraded.

Signed-off-by: Wouter Born <github@maindrain.net>
2020-12-06 19:57:26 +01:00
Kai Kreuzer
007c3b56e5
removed deprecated author information from binding.xml (#9113)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2020-11-23 19:06:33 -08:00
J-N-K
ba4c96d99d
[infrastructure] move infered nullness warnings to error and update EEA (#8949)
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
2020-11-12 21:07:11 +01:00
J-N-K
bd664ff0c8
[infrastructure] add external null-annotations (#8848)
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
2020-10-31 00:29:03 +01:00
Markus Michels
ff4d97eb2a
[shelly] Adaption to OH3, Shelly Plug US, minor fixes (#8642)
* 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>
2020-10-04 09:39:59 -07:00
Hilbrand Bouwkamp
003c3af985
Remove immediate = true from all Components (#8615)
We recommend not to use this on add-ons.

Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
2020-10-01 20:27:01 -07:00
Wouter Born
7f39d01a0f
Remove/ignore Eclipse project files (#8529)
Fixes #8451

Signed-off-by: Wouter Born <github@maindrain.net>
2020-09-21 22:50:37 +02: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