Commit Graph

24 Commits

Author SHA1 Message Date
Дилян Палаузов
78534e8106
Typos a/an (#13812) 2022-12-01 14:30:50 +01:00
Hilbrand Bouwkamp
18a41dbe84
[dsmr] Made additional key for smarty meter an option (#13359)
* [dsmr] Made additional key for smarty meter optional

Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
2022-09-07 11:08:04 +02:00
Hilbrand Bouwkamp
a58ae57942
[dsmr] Fix incorrect deriving of sub channel names when updating channels (#13076)
Subchannels were created by appending the key. However this was done inside a loop and if multiple updates were needed they would be appended to the channel name, instead of taking the channel name each time.
Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
2022-07-04 21:50:03 +02:00
Hilbrand Bouwkamp
e6cc323723
DSMR identifier cosem objects should be parsed as hex values (#12756)
Closes #12724

Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
2022-05-16 21:13:28 +02: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
Wouter Born
4ee2b6e1bb
[dsmr] Add missing English translations (#11713)
Without these English defaults Crowdin would remove Dutch translations.

Signed-off-by: Wouter Born <github@maindrain.net>
2021-12-05 22:12:41 +01:00
Wouter Born
b097463d7e
Rename English i18n properties to follow Crowdin naming conventions (#11709)
This allows these files to be used for creating translations with Crowdin.

Signed-off-by: Wouter Born <github@maindrain.net>
2021-12-05 20:14:44 +01:00
Wouter Born
589400e223
Fix/suppress PMD CompareObjectsWithEquals findings (#11476)
Newer PMD versions discover more CompareObjectsWithEquals findings.

Related to https://github.com/openhab/static-code-analysis/pull/423

Signed-off-by: Wouter Born <github@maindrain.net>
2021-11-02 10:43:53 +01:00
Hilbrand Bouwkamp
90525c5150
[dsmr] Add support for Austrian meters, Fix for channel id detection (#11458)
* Fix fix for channel id detection, Added missing channels to emucs electra

- M-bus channels are dynamic and present in the obis id.
The binding had most channel types fixed because most of the time these channels are the same.
However the device identifier is the same for multiple devices.
But the binding only registered only one and while the channel id was derived from this obis data.
For detected meters this resulted in the channel id to be the same if there are multiple devices.
This change looks at the channel id to assign it to the found device.
This is a bit tricky because the general device has no channel and has channels that have different id's.
So the binding needs to cover that case.

This change also adds some optional channels to the emucs electra meter.

Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>

* [dsmr] Add support for Austrian meters

Improved the work done in pr #11193

Also-by: Thomas <thomas@knaller.info>
Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>

* [dsmr] Added Null handling annotations.
2021-10-30 18:04:42 +02: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
Hilbrand Bouwkamp
1b80f1d492
[dsmr] Fix payload length calculation for Smarty meters (#11328)
Fixes #10932
Supersedes #10933 and adds a unit test.

Also-by: Alexander Hotz <alex.hotz@gmail.com>
Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
2021-09-30 22:59:54 +02:00
Wouter Born
c3a6aa5814
Upgrade Units of Measurement dependencies (#10583)
* Fix code/tests for upgrade
* Resolve runbundles
* Update Checkstyle ruleset for changed packages

Signed-off-by: Wouter Born <github@maindrain.net>
2021-05-11 08:31:03 +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
Wouter Born
5d99a7f524
[dsmr] Use ThingHandlerService for discovery (#9044)
This simplifies the DSMRHandlerFactory code so it no longer needs to register and keep track of a discovery service for each bridge.

Also contains a few other improvements:

* more constructor injection
* add a few missing @NonNullByDefault on test classes

Signed-off-by: Wouter Born <github@maindrain.net>
2021-04-08 22:49:14 +02:00
Hilbrand Bouwkamp
0fc60d82c6
[dsmr] Fix test after openhab-core change #2126 (#9900)
PortInUseException interface changed.

Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
2021-01-21 16:41:36 +01:00
Hilbrand Bouwkamp
3f0c0ebf1f
[dsmr] Fix handling problem reading gasmeter (#9736)
* [dsmr] Fix handling problem reading gasmeter

The gasmeter seem to return an invalid date value in some cases.
Possible problems with the meter. This however caused the whole meter readings to be ignored, while it should only ignore the single problem value.

Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>

* [dsmr] Make eclipse happy again.

Don't ask...

Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>

* [dsmr] Removed sat warnings

Removed usage of apache library and added NonNullByDefault to test classes..

Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
2021-01-08 23:16:33 +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
Hilbrand Bouwkamp
a2f36c31f9
[dsmr] cleanup message file (#9510)
For some reason the dutch message file contained all kind of garbage.

Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
2020-12-24 16:49:08 +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
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
Wouter Born
bd82ca82df
Migrate tests to JUnit 5 (#8519)
Signed-off-by: Wouter Born <github@maindrain.net>
2020-09-21 18:21:26 +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