Commit Graph
100 Commits
Author SHA1 Message Date
J-N-KandGitHub c1c6b6d083 [ring] Further code improvements and enhancements (#18778)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2025-06-17 15:33:33 +02:00
J-N-KandGitHub 5437a6685c [ring] Refactor discovery and allow multiple accounts (#18767)
With this refactoring the device registry is bound to the account bridge, making it possible to use multiple ring accounts. It also changes the discovery service to a `ThingHandlerService, simplifying code.

Signed-off-by: Jan N. Klug <github@klug.nrw>
2025-06-15 16:35:13 +02:00
J-N-KandGitHub a32ac52ab7 [shelly] Add support for Shelly Plus RGBW PM (#17692)
* [shelly] Add support for Shelly Plus RGBW PM

Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-11-10 19:36:18 +01:00
J-N-KandGitHub 18862d3e28 [shelly] Fix timeDuration handling in DTOs (#17689)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-11-03 20:55:25 +01:00
J-N-KandGitHub c1a63ff4c6 [transform.jinja] Properly use jinjava OSGi (#17358)
Depends on https://github.com/openhab/openhab-osgiify/pull/49

Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-09-04 23:07:21 +02:00
J-N-KandGitHub a1d186776f Add J-N-K as code-owner to http and basicprofiles add-ons (#17339)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-08-27 21:27:42 +02:00
J-N-KandGitHub 81251c3b35 [awattar] Add TimeSeries support (#17172)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-08-07 00:00:13 +02:00
J-N-KandGitHub fd4dd89bb1 [http] Improve escaping of URLs (#17110)
* [http] Improve escaping of URLs

Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-07-24 12:20:45 +02:00
J-N-KandGitHub e735da12ac [rrd4j] Fix unit retrieval for group items (#17054)
Reported on the forum

Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-07-14 12:18:06 +02:00
J-N-KandGitHub f8e56444c7 [http] Properly escape + character in query string (#17042)
* [http] Properly escape + character in query string

Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-07-12 22:02:44 +02:00
J-N-KandGitHub 026c1e2b99 [awattar] Fix price handler refresh (#17032)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-07-09 19:54:53 +02:00
J-N-KandGitHub 701a6159d7 [mongodb] Fix handling of GroupItems on restore (#16978)
Related to https://github.com/openhab/openhab-core/pull/4257

Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-07-01 23:26:58 +02:00
J-N-KandGitHub 82379f0de6 [jpa] Fix return value for UoM items (#16977)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-07-01 23:24:04 +02:00
J-N-KandGitHub 994a6b8f6f [awattar] Add tests and improve code (#16871)
* [awattar] add tests

Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-06-23 22:05:20 +02:00
J-N-KandGitHub b996078818 [mqtt] Fix certificate pinning (#16857)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-06-08 23:22:24 +02:00
J-N-KandGitHub c2e051ec2d [snmp] SNMP v3 fixes and improvements (#16803)
* [snmp] SNMP v3 fixes and improvements

(cherry picked from commit a32af97d785f301ad2253801353af53a9941d6f9)

Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-06-05 23:30:33 +02:00
J-N-KandGitHub 706f9ca6b5 [basicprofiles] Initial contribution (#16754)
* [basicprofiles] Initial contribution

A set of basic profiles with general use cases. See documentation for details.

Also-By: Christoph Weitkamp <github@christophweitkamp.de>
Also-By: Arne Seime <arne.seime@gmail.com>
Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-05-28 23:30:46 +02:00
J-N-KandGitHub a177e699b3 [snmp] Upgrade SNMP4J and fix AUTH_NO_PRIV (#16801)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-05-25 10:10:54 +02:00
J-N-KandGitHub 7715bd2b53 [deconz] Fix color conversion (#16769)
After core changes to ColorUtil the Y part can no longer be used as brightness.

Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-05-17 21:41:38 +02:00
J-N-KandGitHub f164f71fd0 [tr064] Enable fourth WiFi channel and improvements (#16650)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-04-14 09:33:01 +02:00
J-N-KandGitHub 2d42e2e135 [rrd4j] Fix missing service pid (#16569)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-03-27 21:03:44 +01:00
J-N-KandGitHub 95434d8a58 [mongodb] Fix missing service pid (#16568)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-03-27 21:03:09 +01:00
J-N-KandGitHub a4ee09a519 [mapdb] Fix missing service pid (#16567)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-03-27 21:02:22 +01:00
J-N-KandGitHub 1f65f9296f [mail] Fix sending HTML mails (#16587)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-03-27 20:08:25 +01:00
J-N-KandGitHub 657405c2aa [mail] Fix content processing (#16580)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-03-27 05:17:45 +01:00
J-N-KandGitHub a1cef70277 [inmemory] Fix boundaries for queries (#16563)
Queries should include the boundaries, but the previous code did not.

Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-03-24 10:31:47 +01:00
J-N-KandGitHub e1e6d715b4 Fix KNX dimmer channels (#16421)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-02-18 22:03:24 +01:00
J-N-KandGitHub 8c0db0a4ee [knx] Fix dimmer channels (#16364)
* [knx] Fix dimmer channels

Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-02-05 23:15:54 +01:00
J-N-KandGitHub 06b8c73537 [http] Fix refresh time check and calculation (#16288)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-01-17 21:21:30 +01:00
J-N-KandGitHub 9400ced25f [freecurrency] Initial contribution (#16194)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-01-15 22:55:14 +01:00
J-N-KandGitHub 0fe8d79c9c [http] Improve binding (#16282)
This adds many improvements, new features and contains bugfixes.

Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-01-14 22:08:11 +01:00
J-N-KandGitHub 1c67114daf [yamahareceiver] Fix ChannelTypeProvider (#16278)
* [yamahareceiver] Fix ChannelTypeProvider
* [yamaha] Fix remaining ChannelTypeProvider (#23)

Also-by: Florian Hotze <florianh_dev@icloud.com>
Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-01-14 21:53:57 +01:00
J-N-KandGitHub dd1b3b91bc [dmx] Improve exception handling in refresh job (#16281)
If an exception is thrown while sending (or connecting) the refreshJob died. This exception is now handled gracefully.

Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-01-14 20:29:38 +01:00
J-N-KandGitHub b8c3c3df77 [systeminfo] Bump OSHI to 6.4.8 (#16197)
This is the latest OSHI version that is compatible with the Karaf provided JNA 5.13.0

Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-01-04 09:02:50 +01:00
J-N-KandGitHub 3136425b39 Adapt to core changes (ThingHandlerService) (#16107)
Related to: https://github.com/openhab/openhab-core/pull/3957

Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-01-03 11:50:55 +01:00
J-N-KandGitHub 8a0361feb6 [inmemory] Add filterCritera ordering (#16185)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2024-01-02 20:22:37 +01:00
J-N-KandGitHub af13c9d133 [chatgpt] Fix ConfigOptionProvider (#16131)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-12-29 16:13:39 +01:00
J-N-KandGitHub 3e0deab3ba [smgw] Initial contribution (#16017)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-12-17 10:13:00 +01:00
c44c9dc67e [knx] Fix IOOB exception with missing DPT in number channels (#15730)
* Fix IOOB exception with missing DPT in number channels

Also improves test messages for DPT unit tests

Signed-off-by: Jan N. Klug <github@klug.nrw>
Co-authored-by: Holger Friedrich <mail@holger-friedrich.de>
2023-12-06 07:53:16 +01:00
J-N-KandGitHub a850df1e8f build addon xml (#15870)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-12-04 22:42:40 +01:00
J-N-KandGitHub 28927310eb [influxdb] Improve connection handling (#15879)
* [influxdb] Improve connection handling

Especially for InfluxDB2 the connection check was not properly implemented. It only checked if a connections was ever successfully established. Since we removed the full crash when a write error occured, this lead to a situation where a broken connection was not detected. A ping is now implemented and also a failed write results in a disconnect.

---------

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-11-11 23:15:21 +01:00
J-N-KandGitHub 91b294521e Fix build after core changes (#15869)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-11-08 20:31:44 +01:00
J-N-KandGitHub d2694d47e4 [deconz] Support window covering controller (#15856)
Some devices report "Window covering controller" instead of "Window covering device". They are controlled in the same way.

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-11-06 21:31:53 +01:00
J-N-KandGitHub f24a517a0f [influxdb] Fix exception handling and improve some type conversions (#15452)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-09-09 15:08:58 +02:00
J-N-KandGitHub 3ce02971ae Resolve itests after core changes (#15454)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-08-19 10:18:49 +02:00
J-N-KandGitHub 196d8095bb [tr064] Fix clearing of auth (results) (#15415)
* [tr064] Fix clearing of auth (results)

In case of multiple root things the auth store (results and digests) was cleared for all clients instead of only removing the failed auth result or old authentication.

* fix TAM request

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-08-13 18:55:13 +02:00
J-N-KandGitHub 4c9f207a38 [knx] Refactor manufacturer map (#15297)
* [knx] Refactor manufacturer map

This makes adding new manufacturers easy.

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-07-24 23:09:46 +02:00
J-N-KandGitHub 4afe151108 [jsonpath] Fix exception when input string is empty (#15283)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-07-23 17:14:16 +02:00
J-N-KandGitHub ae146111c1 [mqtt] Dynamically change accepted item-type for Number channels (#15114)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-07-21 11:47:51 +02:00
J-N-KandGitHub 0beaada48c Fix rrd4j database start time (#15277)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-07-20 21:42:27 +02:00
J-N-KandGitHub eb059b50dc [avmfritz] Fix update instructions (#15261)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-07-18 09:06:47 +02:00
J-N-KandGitHub 571cd6334f [rrd4j] Improve event handling (#15223)
* [rrd4j] Improve event handling

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-07-13 22:11:14 +02:00
J-N-KandGitHub ae1a7475a7 [avmfritz] Fix wrong system channel types (#15172)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-07-03 22:48:03 +02:00
J-N-KandGitHub f0bdeff81b [mail] Add mail content processing (#14345)
* [mail] Add mail content processing

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-07-03 09:07:27 +02:00
J-N-KandGitHub c872d63c06 [jsscriptingnashorn] Fix addon.xml (#15133)
The addon-id was wrong (the same as for `jsscripting`), leading to wrong responses of the add-on service when both are installed.

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-06-25 09:20:31 +02:00
J-N-KandGitHub b3d0399d6b Fix build (#15132)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-06-25 09:18:55 +02:00
J-N-KandGitHub 0b6bdad557 [inmemory] Initial contribution (#15063)
This is the initial contribution of a new volatile persistence service. It does store values in memory only and can especially be used for forecasts or other data where volatile storage is sufficient.


Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-06-24 11:15:09 +02:00
J-N-KandGitHub 07e640387c [rrd4j] Improve timestamp handling (#15107)
* [rrd4j] Improve timestamp handling

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-06-18 21:14:41 +02:00
J-N-KandGitHub d2e10ab282 [influxdb] Handle exceptions gracefully (#15062)
* [influxdb] Handle exceptions gracefully

Signed-off-by: Jan N. Klug <github@klug.nrw>

* also catch InfluxDBIOExceptions

Signed-off-by: Jan N. Klug <github@klug.nrw>

---------

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-06-13 20:54:27 +02:00
J-N-KandGitHub 47eaf63698 [knx] dynamic channel-types (#15072)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-06-11 21:04:09 +02:00
J-N-KandGitHub 0724c3febc [airthings] Fix thing types (#15013)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-05-21 17:32:52 +02:00
J-N-KandGitHub f34aa8fa5c [influxdb] support restoring unit for dimension items (#15009)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-05-20 23:01:23 +02:00
J-N-KandGitHub 38df936aa9 [voicerss] Fix service-id in addon.xml (#14988)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-05-13 21:16:23 +02:00
J-N-KandGitHub d85bb786ad [jdbc] Fix addon-info (#14987)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-05-13 20:55:31 +02:00
J-N-KandGitHub 36024a8c03 [harmonyhub] Use AbstractStorageBasedTypeProvider (#14507)
* [harmonyhub] Use AbstractDynamicTypeProvider

---------

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-05-13 18:07:48 +02:00
J-N-KandGitHub 717addee9a [influxdb] Implement ModifiablePersistenceService (#14959)
* [influxdb] Implement ModifiablePersistenceService

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-05-13 12:37:48 +02:00
J-N-KandGitHub d9c12ca659 [jsscripting] Allow configuring from add-on page (#14985)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-05-13 12:21:14 +02:00
J-N-KandGitHub 16df575b38 [systeminfo] Use AbstractStorageBasedTypeProvider (#14501)
* [systeminfo] Use AbstractDynamicTypeProvider

---------

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-05-12 13:59:01 +02:00
J-N-KandGitHub 5fe99a18a9 [rrd4j] Write asynchronously to database (#14913)
* [rrd4j] Write asynchronously to database
* add timestamps to log message

---------

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-05-08 12:49:23 +02:00
J-N-KandGitHub c3a9a4c7b6 Adjust to core changes (#14952)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-05-08 09:35:36 +02:00
J-N-KandGitHub 6009c13966 [influxdb] Write asynchronously to database and improve performance (#14888)
* [influxdb] Write asynchronously to database

---------

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-05-01 11:43:39 +02:00
J-N-KandGitHub 990700de8d [mapdb] Make serialization asynchronous (#14900)
* [mapdb] Make serialization asynchronous

---------

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-05-01 09:10:28 +02:00
J-N-KandGitHub dba7fcc697 Fix exec transformation service whitelisting (#14884)
Reported on the german openHAB forum.

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-04-26 21:52:00 +02:00
J-N-KandGitHub f2f0f4b402 [map][scale] Fix localization (#14825)
The wrong key was used in the `cachedTransformations` map. Instead of the correctyl localized UID from the registry the provided transformation function was used.

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-04-17 21:33:28 +02:00
J-N-KandGitHub 09c394b928 Disable mielecloud tests (#14762)
As they always fail and therefore CI builds fail.

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-04-08 12:24:18 +02:00
J-N-KandGitHub 1786bb0eec [deconz] Cleanup code and improve tests, edit channels to vibration sensor (#14641)
* [deconz] Cleanup code and improve tests

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-03-21 22:46:53 +01:00
J-N-KandGitHub 8e902f6324 Bump spotless to 2.35 and Eclipse Java Formatter to 4.26 (#14645)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-03-21 21:03:05 +01:00
J-N-KandGitHub 6444964bf6 [deconz] Add On/Off thermostats (#14636)
* [deconz] Add On/Off thermostats
* further work
* fix regression

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-03-19 20:43:15 +01:00
J-N-KandGitHub ee1de11864 [deconz] Add Pairing/Scene actions, new devices and improve code (#14622)
* port changes
* update instructions
* Incorporate review comments from #14134
* new improvements (mostly Java 17 changes)
* further improvements

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-03-18 16:06:55 +01:00
J-N-KandGitHub 0f5dfa5088 Fix "empty range" exception when querying InfluxDB2 (#14627)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-03-18 13:31:41 +01:00
J-N-KandGitHub 6da85a4757 [influxdb] Fix query for InfluxDB2 (#14542)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-03-05 16:04:51 +01:00
J-N-KandGitHub 44634a6e89 [exec] Fix whitelist not read (#14522)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-03-02 20:57:02 +01:00
J-N-KandGitHub ec3f5369be Resolve itests after core changes (#14498)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-02-25 12:37:37 +01:00
J-N-KandGitHub cb31f420ff [tr064] Enhancements, code improvements and fixes (#14468)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-02-24 16:06:53 +01:00
J-N-KandGitHub 223deffcfd [jsscripting] Fix node_modules handling (#14398)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-02-18 19:53:33 +01:00
J-N-KandGitHub cb07f3e2f0 Fix build after core-changes (#14431)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-02-18 15:24:58 +01:00
J-N-KandGitHub 5ea0dcbda9 [onewire] Code improvements and bug fixes (#14400)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-02-16 18:49:00 +01:00
J-N-KandGitHub 9a05e9f3b5 [jsscripting] Fix JSScriptFileWatcher not ignoring correct directory (#14393)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-02-15 10:33:00 +01:00
J-N-KandGitHub d613641bbd Adapt addons to core watch service changes (#14004)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-02-13 16:37:57 +01:00
J-N-KandGitHub ed7159c780 [influxdb] Code improvements and enhancements (#14304)
* [influxdb] code improvements

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-02-13 15:23:05 +01:00
J-N-KandGitHub fc57f02fca [snmp] Upgrades and enhancements (#14330)
* [snmp] Upgrades and enhancements

- bug: improve test stability
- enhancement: add support for UoM
- bug: fix misleading error message
- bug: fix initialization exceptions
- enhancement: Add support for SNMPv3
- enhancement: add opaque value handling

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-02-04 15:47:30 +01:00
J-N-KandGitHub 4a370863d2 Fix findbugs instanceof pattern matching (#14329)
* Fix findbugs instanceof pattern matching

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-02-04 08:26:48 +01:00
J-N-KandGitHub 9deb181e1b [dmx] Refactor and improve code (#14327)
Also adds null-annotations

Signed-off-by: Jan N. Klug <github@klug.nrw>
(cherry picked from commit 8153032ce07f5bcd7c5b31316ac0d4565126fe72)
2023-02-03 20:41:16 +01:00
J-N-KandGitHub e5e067b79b [influxdb] Fix re-connection issues (#14296)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-01-30 20:04:57 +01:00
J-N-KandGitHub 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-KandGitHub 598a285adf Fix build after core changes (#14027)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-01-20 14:57:42 +01:00
J-N-KandGitHub 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
J-N-KandGitHub 6aa0dcbc70 [scripting] Adjust to core changes (#14043)
* [scripting] Adjust to core changes

Signed-off-by: Jan N. Klug <github@klug.nrw>
2023-01-12 22:23:20 +01:00
J-N-KandGitHub cd9e1b0590 Fix build / Resolve itests (#14018)
* Fix build / Resolve itests
* Remove Java 11 from GHA matrix

Also-by: Wouter Born <github@maindrain.net>
Signed-off-by: Jan N. Klug <github@klug.nrw>
2022-12-20 08:11:31 +01:00
J-N-KandGitHub 9f3b8e1c04 Raise minimum JDK version to 17 (#13276)
Signed-off-by: Jan N. Klug <github@klug.nrw>
2022-12-19 20:39:42 +01:00