iobroker.e3oncan 1.0.3 → 1.1.0

package/README.de.md

@@ -12,11 +12,14 @@
 
 ## e3oncan Adapter für ioBroker
 
+> **Hinweis:** Die Navigationslinks in diesem Dokument funktionieren am besten in der [GitHub-Ansicht](https://github.com/MyHomeMyData/ioBroker.e3oncan/blob/main/README.de.md). Relative Links zu anderen Dokumenten (z.B. [data-points.md](https://github.com/MyHomeMyData/ioBroker.e3oncan/blob/main/lib/data-points.md)) öffnen ebenfalls auf GitHub.
+
 > Dieses Dokument ist die deutsche Version der Dokumentation. [English version: README.md](README.md)
 
 ## Inhaltsverzeichnis
 
 - [Übersicht](#übersicht)
+- [Was ist neu in v1.1.0](#was-ist-neu-in-v110)
 - [Was ist neu in v1.0.3](#was-ist-neu-in-v103)
 - [Was ist neu in v1.0.0](#was-ist-neu-in-v100)
 - [Schnellstart](#schnellstart)
@@ -57,6 +60,26 @@ Welche Modi verfügbar sind, hängt von der Gerätekonfiguration ab. Weitere Det
 
 ---
 
+## Was ist neu in v1.1.0
+
+### Aktualisierte Datenpunkt-Definitionen
+
+Die Datenpunktdefinitionen wurden auf Version 20260701 (allgemein) und 20260630 (Varianten) aktualisiert.
+
+### Neuer Codec O3ESwitch
+
+Ein neuer Codec `O3ESwitch` wurde für Datenpunkte ergänzt, deren Struktur von einem gerätespezifischen Diskriminator-Byte abhängt. Das erste Byte wählt die aktive Variante aus einem Satz vordefinierter Codec-Zweige. Damit wird die vollständig strukturierte Dekodierung der ZigBee-Geräteslot-DIDs (2086–2143, 2262) ermöglicht, bei denen die dekodierten Felder je nach Gerätetyp unterschiedlich sind (z. B. Klimasensor, Heizkörperthermostat, Fußbodenheizungsthermostat, Stellantrieb).
+
+### Dezimalrundung für numerische Codecs
+
+Numerische Codecs (`O3EInt8`, `O3EInt16`, `O3EInt32`, `O3EInt64`, `O3EFloat32`) unterstützen jetzt einen optionalen Parameter `decimals`. Ist dieser größer als 0, wird das Dekodierergebnis auf die angegebene Anzahl Nachkommastellen gerundet. Beispielsweise wird `SignalLevel` (Skalierung 2,55, Dezimalstellen 2) damit ohne übermäßig lange Gleitkommazahlen ausgegeben.
+
+### Einheiten und Metadaten werden beim Start nach Strukturänderungen gesetzt
+
+Erkennt der Adapter beim Start, dass sich die Struktur eines Datenpunkts geändert hat (neue Version in `didsE3var.json` oder `didsE3.json`), werden Einheiten und Beschreibungen für alle Unterzustände des neu angelegten Tree-Abschnitts jetzt korrekt gesetzt. Bisher wurden Einheiten nur beim Datenpunktscan gesetzt; nach einer Strukturaktualisierung war ein erneuter Scan erforderlich, um sie zu befüllen.
+
+---
+
 ## Was ist neu in v1.0.3
 
 ### Kein Rebuild mehr nach einem Node.js-Upgrade

package/README.md

@@ -12,11 +12,14 @@
 
 ## e3oncan adapter for ioBroker
 
+> **Note:** Navigation links in this document work best when viewed [on GitHub](https://github.com/MyHomeMyData/ioBroker.e3oncan#readme). Relative links to other documents (e.g. [data-points.md](https://github.com/MyHomeMyData/ioBroker.e3oncan/blob/main/lib/data-points.md)) also open on GitHub.
+
 > Eine deutsche Version dieser Dokumentation ist verfügbar: [README.de.md](README.de.md)
 
 ## Table of contents
 
 - [Overview](#overview)
+- [What's new in v1.1.0](#whats-new-in-v110)
 - [What's new in v1.0.3](#whats-new-in-v103)
 - [What's new in v1.0.0](#whats-new-in-v100)
 - [What's new in v0.11.x](#whats-new-in-v011x)
@@ -58,6 +61,26 @@ Which modes are available depends on your device topology. See the [device topol
 
 ---
 
+## What's new in v1.1.0
+
+### Updated data point definitions
+
+Data point definitions have been updated to version 20260701 (common) and 20260630 (variant).
+
+### New O3ESwitch codec
+
+A new codec `O3ESwitch` has been added for data points whose structure depends on a device type discriminator byte. The first byte selects the active variant from a set of predefined codec branches. This enables full structured decoding of ZigBee device slot DIDs (2086–2143, 2262), where the decoded fields differ by device type (e.g. climate sensor, TRV, floor thermostat, actuator).
+
+### Decimal rounding for numeric codecs
+
+Numeric codecs (`O3EInt8`, `O3EInt16`, `O3EInt32`, `O3EInt64`, `O3EFloat32`) now support an optional `decimals` parameter. When set to a value greater than 0, the decoded result is rounded to that number of decimal places. This is used, for example, for `SignalLevel` (scale 2.55, decimals 2) to avoid excessively long floating-point values.
+
+### Units and metadata set at startup when data point structure changes
+
+When the adapter detects at startup that a data point's structure has changed (new version in `didsE3var.json` or `didsE3.json`), it now correctly registers units and descriptions for all sub-states of the rebuilt tree. Previously, units were only set during a data point scan; a subsequent scan was required to populate them after a structure update.
+
+---
+
 ## What's new in v1.0.3
 
 ### No more rebuild after a Node.js upgrade
@@ -111,24 +134,6 @@ After the data point scan, the adapter automatically analyses the bus topology d
 
 ---
 
-## What's new in v0.11.x
-
-### Updated data point structures (action required when upgrading)
-
-Version 0.11.0 introduced updated definitions for many data points — new variant types, additional metadata (description, unit, links), and revised data format handling. **If you are upgrading from v0.10.x, please perform a device scan followed by a full data point scan** to apply the new definitions and metadata to your ioBroker object tree.
-
-For a detailed list of changed data points see the [data point changelog](lib/data-points.md#changelog-of-data-point-definitions).
-
-### Variant data points and device format configuration
-
-The adapter now handles variant data points — data points whose structure depends on the device's configuration (e.g. temperature unit °C/°F, date/time format). During the device scan, the relevant format configuration (data point 382) is read and stored. The data point scan then applies the correct codec for each device automatically.
-
-### Metadata on data point objects
-
-Data point objects in the ioBroker object tree now carry metadata: description, physical unit, read/write access flag, and links to further information where available. Metadata for existing objects is updated during each data point scan and is also restored if a data point object is deleted and re-created (added in v0.11.1).
-
----
-
 ## Quick start
 
 **Prerequisites**
@@ -422,6 +427,12 @@ If you enjoyed this project — or just feeling generous, consider buying me a b
     Placeholder for the next version (at the beginning of the line):
     ### **WORK IN PROGRESS**
 -->
+### 1.1.0 (2026-07-05)
+* (MyHomeMyData) Update of list of data points for E3 devices to version 20260701 (common) and 20260630 (variant)
+* (MyHomeMyData) Added codec `O3ESwitch` for device-dependent data point structures selected by a discriminator byte
+* (MyHomeMyData) Added optional `decimals` parameter to numeric codecs to round decoded values
+* (MyHomeMyData) Added update of meta data during startup, when structure of data point has changed
+
 ### 1.0.3 (2026-06-02)
 * (MyHomeMyData) Update of list of data points for E3 devices to version 20260528 for common and 20260527 for variant data points; For details see this [changelog](lib/data-points.md#changelog-of-data-point-definitions)
 * (MyHomeMyData) Suppress spurious variant-did warning when common dict covers the length
@@ -440,52 +451,6 @@ If you enjoyed this project — or just feeling generous, consider buying me a b
 * (MyHomeMyData) Improved scan status detection: uses `udsDidsWritable` instead of `didsMetaDict` to reliably detect whether a data point scan has been performed
 * (MyHomeMyData) Added re-scan recommendation hint in datapoints tab when a scan exists but Collect auto-detection has not yet been run
 
-### 1.0.0-beta.2 (2026-05-02)
-* (MyHomeMyData) Fixed: saving schedules in the datapoints tab could leave stale entries under certain conditions
-* (MyHomeMyData) Added Topology button to the datapoints tab; opens the bus topology diagram in a modal dialog
-
-### 1.0.0-beta.1 (2026-04-30)
-* (MyHomeMyData) Bus topology analysis is now generated automatically after the data point scan; results are stored in `info.topology` (JSON) and `info.topologyHtml` (HTML); see Readme for details
-* (MyHomeMyData) Input validation added for interval and delay fields in the datapoints tab — only positive integers are accepted
-
-### 1.0.0-beta.0 (2026-04-26)
-* (MyHomeMyData) Introduced new e3oncan datapoints webUI pinned to the adapter's instance row
-* (MyHomeMyData) Energy meters (E380, E3100CB) are now auto-detected during the device scan by passive CAN listening on both CAN channels
-* (MyHomeMyData) State names for energy meters are assigned automatically based on CAN address and channel; see Readme for details
-* (MyHomeMyData) Energy meter Collect toggle and delay are now configured exclusively in the e3oncan datapoints page; changes take effect after adapter restart
-* (MyHomeMyData) On first run after upgrade, the active setting is automatically migrated from the previous adapter configuration
-* (MyHomeMyData) Collect-capable devices are now auto-detected during the data point scan by passive CAN listening; a pin icon is shown in the device card header for each detected device
-* (MyHomeMyData) Added option to suppress storing of data point values during data point scan
-
-### 0.11.3 (2026-05-03)
-* (MyHomeMyData) The accidentally mentioned data points 1415-1418 have been removed from the changelog of version 0.11.0
-
-### 0.11.2 (2026-05-02)
-* (MyHomeMyData) Added "What's new in v0.11.x" section to Readme with upgrade notes for data point structure changes
-
-### 0.11.1 (2026-04-23)
-* (MyHomeMyData) Improved robustness: Receiving a data point of length zero is treated as a "negative response"
-* (MyHomeMyData) The metadata is now also restored after a data point is deleted
-* (MyHomeMyData) Aligned test cases for German system language
-
-### 0.11.0 (2026-04-14)
-* (MyHomeMyData) To take full advantage of the variant data points and metadata, please perform a device scan followed by a data point scan
-* (MyHomeMyData) Added handling for variant data points and for device's data format configuration, refer to https://github.com/MyHomeMyData/ioBroker.e3oncan/lib/data-points.md for details
-* (MyHomeMyData) Added metadata to several data points, e.g. description, unit, link to further info
-* (MyHomeMyData) During scan of data points now metadata are added to data point objects
-* (MyHomeMyData) Changed handling of writable data points; this info now also is available within definition of data point; however, there is no change to handling of the whitelist of writables
-* (MyHomeMyData) During device scan the information about used data formats (data point 382) is evaluated
-* (MyHomeMyData) Updated structure of many data points; for details see this [changelog](lib/data-points.md#changelog-of-data-point-definitions)
-
-### 0.10.14 (2025-11-03)
-* (MyHomeMyData) Added elements to enums.js based of PR no. 182 of open3e
-* (MyHomeMyData) Simplified configuration of dids scan limits in source code
-* (MyHomeMyData) Extended scan up to did 3338
-* (MyHomeMyData) Added hint regarding scan range in Readme
-* (MyHomeMyData) Fixes for issue #169 (repository checker)
-* (MyHomeMyData) Bugfix: Manual change of device specific dids was not evaluated for collect workers
-* (MyHomeMyData) Update of list of data points for E3 devices to version 20251102
-
 ### Older versions
 
 Older changelog entries are available in [CHANGELOG_OLD.md](CHANGELOG_OLD.md).

package/admin/i18n/{en/translations.json → en.json}

@@ -1,92 +1,92 @@
 {
+    "'Device state name' must not be blank!": "'Device state name' must not be blank!",
+    "Activate communication": "Activate communication",
+    "Assignments to External CAN Adapter": "Assignments to External CAN Adapter",
+    "Assignments to Internal CAN Adapter": "Assignments to Internal CAN Adapter",
+    "Assignments to UDS CAN Adapter": "Assignments to UDS CAN Adapter",
+    "Assignments to second CAN Adapter": "Assignments to second CAN Adapter",
     "CAN Adapter": "CAN Adapter",
-    "Please start this adapter instance to enable further configuration options.": "Please start this adapter instance to enable further configuration options.",
-    "Please press button 'Save', when you're done on this tab.": "Please press button 'Save', when you're done on this tab.",
-    "External CAN Adapter": "External CAN Adapter",
-    "Device mame of CAN adapter connected to external bus, e.g. can0": "Device mame of CAN adapter connected to external bus, e.g. can0",
+    "CAN id - still experimental. Leave blank for deactivation.": "CAN id - still experimental. Leave blank for deactivation.",
+    "CAN id for collecting data": "CAN id for collecting data",
+    "Cancel": "Cancel",
+    "Check, if this adapter shall be used.": "Check, if this adapter shall be used.",
+    "Codec": "Codec",
+    "Codec used for datapoint": "Codec used for data point",
+    "Collecting Data on External CAN Adapter": "Collecting Data on External CAN Adapter",
+    "Collecting Data on Internal CAN Adapter": "Collecting Data on Internal CAN Adapter",
+    "Collecting Data on UDS CAN Adapter": "Collecting Data on UDS CAN Adapter",
+    "Collecting Data on second CAN Adapter": "Collecting Data on second CAN Adapter",
+    "Configuration requires a running adapter instance!": "Configuration requires a running adapter instance!",
+    "Confirm scan for datapoints": "Confirm scan for data points",
     "Connect to Adapter": "Connect to Adapter",
-    "Internal CAN Adapter": "Internal CAN Adapter",
+    "Data formats used by the device": "Data formats used by the device",
+    "Description": "Description",
+    "Description of datapoint": "Description of data point",
+    "Detected Collect CAN IDs": "Detected Collect CAN IDs",
+    "Detected during last device scan. Run scan to update.": "Detected during last device scan. Run scan to update.",
+    "Detected energy meters": "Detected energy meters",
+    "Device Address": "Device address",
+    "Device ECU address (fixed)": "Device ECU address (fixed)",
+    "Device ECU name (fixed)": "Device ECU name (fixed)",
+    "Device is using these formats for numbers, date and time": "Device is using these formats for numbers, date and time",
+    "Device mame of CAN adapter connected to UDS-capable bus, e.g. can0": "Device mame of CAN adapter connected to UDS-capable bus, e.g. can0",
+    "Device mame of CAN adapter connected to external bus, e.g. can0": "Device mame of CAN adapter connected to external bus, e.g. can0",
     "Device mame of CAN adapter connected to internal bus, e.g. can1": "Device mame of CAN adapter connected to internal bus, e.g. can1",
-    "List of UDS devices": "List of UDS devices",
-    "List of available devices": "List of available devices",
-    "Configuration requires a running adapter instance!": "Configuration requires a running adapter instance!",
-    "You may edit 2nd column to set name of state for the device (visible in object tree).": "You may edit 2nd column to set name of state for the device (visible in object tree).",
-    "UDS device scan is ongoing. This may take up to 20 seconds.": "UDS device scan is ongoing. This may take up to 20 seconds.",
-    "'Device state name' must not be blank!": "'Device state name' must not be blank!",
-    "Symbol '.' not allowed in 'Device state name'": "Symbol '.' not allowed in 'Device state name'",
+    "Device mame of CAN adapter connected to second bus, e.g. can1": "Device mame of CAN adapter connected to second bus, e.g. can1",
     "Device name (Viessmann)": "Device name (Viessmann)",
+    "Device name in object tree. Must not contain dots.": "Device name in object tree. Must not contain dots.",
     "Device state name": "Device state name",
-    "Device ECU name (fixed)": "Device ECU name (fixed)",
-    "Data formats used by the device": "Data formats used by the device",
-    "Device is using these formats for numbers, date and time": "Device is using these formats for numbers, date and time",
-    "n/a": "n/a",
-    "For a list of frequently used data points see here.": "For a list of frequently used data points see here.",
+    "Devices for collecting data. No writing to CAN bus. Press '+' to add device.": "Devices for collecting data. No writing to CAN bus. Press '+' to add device.",
+    "ERROR: column 'Device state name' must contain unique text.": "ERROR: column 'Device state name' must contain unique text.",
+    "Energy Meter E380": "Energy Meter E380",
+    "Energy Meters": "Energy Meters",
+    "Energy meter detection and configuration": "Energy meter detection and configuration",
+    "External CAN Adapter": "External CAN Adapter",
     "For a list of all available data points see here.": "For a list of all available data points see here.",
-    "Device Address": "Device address",
-    "Device ECU address (fixed)": "Device ECU address (fixed)",
-    "CAN id for collecting data": "CAN id for collecting data",
-    "CAN id - still experimental. Leave blank for deactivation.": "CAN id - still experimental. Leave blank for deactivation.",
-    "List of datapoints": "List of data points",
-    "Start scan for datapoints of all devices": "Start scan for data points of all devices",
-    "Confirm scan for datapoints": "Confirm scan for data points",
-    "Scan will take up to 5 minutes. Please make sure, no other UDSonCAN client (e.g. Open3Eclient.py) is running. Please do not close the tab during scan. You may follow up the progress by watching the Log in an additional tab.": "Scan will take up to 5 minutes. Please make sure, no other UDSonCAN client (e.g. Open3Eclient.py) is running. Please do not close the tab during scan. You may follow up the progress by watching the Log in an additional tab.",
-    "OK": "OK",
-    "Cancel": "Cancel",
-    "Select device": "Select device",
-    "List of device specific datapoints": "List of device specific data points",
+    "For a list of frequently used data points see here.": "For a list of frequently used data points see here.",
     "ID": "ID",
     "Id of datapoint": "Id of data point",
+    "Internal CAN Adapter": "Internal CAN Adapter",
     "Length": "Length",
     "Length of datapoint": "Length of data point",
-    "Name": "Name",
-    "Description of datapoint": "Description of data point",
-    "Name of datapoint": "Name of data point",
-    "Codec": "Codec",
-    "Codec used for datapoint": "Codec used for data point",
-    "Assignments to External CAN Adapter": "Assignments to External CAN Adapter",
-    "Energy Meter E380": "Energy Meter E380",
-    "WARNING: Values below 2 seconds may cause heavy system load!": "WARNING: Values below 2 seconds may cause heavy system load!",
-    "Activate communication": "Activate communication",
-    "This text will be used as base for object tree": "This text will be used as base for object tree",
+    "List of UDS devices": "List of UDS devices",
+    "List of available devices": "List of available devices",
+    "List of datapoints": "List of data points",
+    "List of device specific datapoints": "List of device specific data points",
     "Min. update time (s)": "Min. update time (s)",
     "Minumum update time for states. 0 for immediate update.": "Minumum update time for states. 0 for immediate update.",
-    "Collecting Data on External CAN Adapter": "Collecting Data on External CAN Adapter",
-    "Devices for collecting data. No writing to CAN bus. Press '+' to add device.": "Devices for collecting data. No writing to CAN bus. Press '+' to add device.",
+    "Name": "Name",
+    "Name of datapoint": "Name of data point",
     "No device for collecting available (missing CAN ID).": "No device for collecting available (missing CAN ID).",
-    "ERROR: column 'Device state name' must contain unique text.": "ERROR: column 'Device state name' must contain unique text.",
-    "active": "active",
+    "OK": "OK",
+    "Optional description of this schedule.": "Optional description of this schedule.",
+    "Please press button 'Save', when you're done on this tab.": "Please press button 'Save', when you're done on this tab.",
+    "Please start this adapter instance to enable further configuration options.": "Please start this adapter instance to enable further configuration options.",
+    "Requesting data on UDS CAN Adapter via UDSonCAN": "Requesting data on UDS CAN Adapter via UDSonCAN",
     "Requesting data on external CAN Adapter via UDSonCAN": "Requesting data on external CAN Adapter via UDSonCAN",
-    "Specify schedules for devices, press '+' to begin.": "Specify schedules for devices, press '+' to begin.",
+    "Run the scan above to discover all data points on your devices and add metadata (description, unit, access). This is required before writing to any data point and recommended after every adapter or device firmware update.": "Run the scan above to discover all data points on your devices and add metadata (description, unit, access). This is required before writing to any data point and recommended after every adapter or device firmware update.",
+    "Save all data point values to object tree during scan": "Save all data point values to object tree during scan",
+    "Scan will take up to 5 minutes. Please make sure, no other UDSonCAN client (e.g. Open3Eclient.py) is running. Please do not close the tab during scan. You may follow up the progress by watching the Log in an additional tab.": "Scan will take up to 5 minutes. Please make sure, no other UDSonCAN client (e.g. Open3Eclient.py) is running. Please do not close the tab during scan. You may follow up the progress by watching the Log in an additional tab.",
     "Schedule (s)": "Schedule (s)",
     "Schedule for requesting given datapoints. 0 for one time request on start of adapter instance.": "Schedule for requesting given data points. 0 for one time request on start of adapter instance.",
+    "Second CAN Adapter": "Second CAN Adapter",
+    "Select device": "Select device",
     "Separate by comma! All given datapoints will be requested with specified schedule and ECU address.": "Separate by comma! All given data points will be requested with specified schedule and ECU address.",
-    "Assignments to Internal CAN Adapter": "Assignments to Internal CAN Adapter",
-    "Collecting Data on Internal CAN Adapter": "Collecting Data on Internal CAN Adapter",
-    "Update list of datapoints": "Update list of data points",
+    "Specify schedules for devices, press '+' to begin.": "Specify schedules for devices, press '+' to begin.",
+    "Start scan for datapoints of all devices": "Start scan for data points of all devices",
     "Start scan to update list of devices": "Start scan to update list of devices",
-    "Description": "Description",
-    "Optional description of this schedule.": "Optional description of this schedule.",
-    "Energy Meters": "Energy Meters",
-    "UDS CAN Adapter": "UDS CAN Adapter",
-    "Device mame of CAN adapter connected to UDS-capable bus, e.g. can0": "Device mame of CAN adapter connected to UDS-capable bus, e.g. can0",
-    "Assignments to UDS CAN Adapter": "Assignments to UDS CAN Adapter",
-    "Collecting Data on UDS CAN Adapter": "Collecting Data on UDS CAN Adapter",
-    "Requesting data on UDS CAN Adapter via UDSonCAN": "Requesting data on UDS CAN Adapter via UDSonCAN",
-    "Second CAN Adapter": "Second CAN Adapter",
-    "Device mame of CAN adapter connected to second bus, e.g. can1": "Device mame of CAN adapter connected to second bus, e.g. can1",
-    "Assignments to second CAN Adapter": "Assignments to second CAN Adapter",
-    "Collecting Data on second CAN Adapter": "Collecting Data on second CAN Adapter",
-    "Detected during last device scan. Run scan to update.": "Detected during last device scan. Run scan to update.",
-    "Detected energy meters": "Detected energy meters",
-    "Energy meter detection and configuration": "Energy meter detection and configuration",
-    "Detected Collect CAN IDs": "Detected Collect CAN IDs",
-    "Topology summary (JSON)": "Topology summary (JSON)",
+    "Symbol '.' not allowed in 'Device state name'": "Symbol '.' not allowed in 'Device state name'",
+    "This text will be used as base for object tree": "This text will be used as base for object tree",
     "Topology summary (HTML)": "Topology summary (HTML)",
-    "Save all data point values to object tree during scan": "Save all data point values to object tree during scan",
+    "Topology summary (JSON)": "Topology summary (JSON)",
+    "UDS CAN Adapter": "UDS CAN Adapter",
+    "UDS device scan is ongoing. This may take up to 20 seconds.": "UDS device scan is ongoing. This may take up to 20 seconds.",
+    "Update list of datapoints": "Update list of data points",
+    "WARNING: Values below 2 seconds may cause heavy system load!": "WARNING: Values below 2 seconds may cause heavy system load!",
     "When unchecked, values and metadata are updated for already existing data point objects only. New data point objects are not created during the scan — they are created automatically on first data receipt after the scan.": "When unchecked, values and metadata are updated for already existing data point objects only. New data point objects are not created during the scan — they are created automatically on first data receipt after the scan.",
-    "Run the scan above to discover all data points on your devices and add metadata (description, unit, access). This is required before writing to any data point and recommended after every adapter or device firmware update.": "Run the scan above to discover all data points on your devices and add metadata (description, unit, access). This is required before writing to any data point and recommended after every adapter or device firmware update.",
+    "You may edit 2nd column to set name of state for the device (visible in object tree).": "You may edit 2nd column to set name of state for the device (visible in object tree).",
+    "active": "active",
+    "n/a": "n/a",
     "► After the scan, browse and manage the discovered data points using the 'datapoints page', which is accessible via the link button in the adapter's instance row.": "► After the scan, browse and manage the discovered data points using the 'datapoints page', which is accessible via the link button in the adapter's instance row.",
-    "► Alternatively, you can use the tab 'Assignments to UDS CAN Adapter' within this configuration dialog.": "► Alternatively, you can use the tab 'Assignments to UDS CAN Adapter' within this configuration dialog.",
-    "Check, if this adapter shall be used.": "Check, if this adapter shall be used.",
-    "Device name in object tree. Must not contain dots.": "Device name in object tree. Must not contain dots."
+    "► Alternatively, you can use the tab 'Assignments to UDS CAN Adapter' within this configuration dialog.": "► Alternatively, you can use the tab 'Assignments to UDS CAN Adapter' within this configuration dialog."
 }

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "e3oncan",
-    "version": "1.0.3",
+    "version": "1.1.0",
     "news": {
+      "1.1.0": {
+        "en": "Update of list of data points for E3 devices to version 20260701 (common) and 20260630 (variant)\nAdded codec `O3ESwitch` for device-dependent data point structures selected by a discriminator byte\nAdded optional `decimals` parameter to numeric codecs to round decoded values\nAdded update of meta data during startup, when structure of data point has changed",
+        "de": "Aktualisierung der Liste der Datenpunkte für E3-Geräte auf Version 20260701 für gemeinsame und 20260630 für variante Datenpunkte\nCodec `O3ESwitch` für geräteabhängige Datenpunktstrukturen hinzugefügt, die durch ein Diskriminatorbyte ausgewählt werden.\nDer optionale Parameter `decimals` wurde zu den numerischen Codecs hinzugefügt, um die dekodierten Werte zu runden.\nDie Metadaten werden nun beim Start aktualisiert, wenn sich die Struktur eines Datenpunkts geändert hat.",
+        "ru": "Обновлен список параметров данных для устройств E3 до версий 20260701 (общая) и 20260630 (вариант).\nДобавлен кодек `O3ESwitch` для зависимых от устройства структур данных, выбираемых дискриминаторным байтом.\nДобавлен необязательный параметр `decimals` к числовым кодекам для округления декодированных значений.\nДобавлено обновление метаданных во время запуска при изменении структуры точки данных.",
+        "pt": "Atualização da lista de pontos de dados para dispositivos E3 para a versão 20260701 (comum) e 20260630 (variante)\nAdicionado o codec `O3ESwitch` para estruturas de pontos de dados dependentes do dispositivo, selecionadas por um byte discriminador.\nAdicionado parâmetro opcional `decimals` aos codecs numéricos para arredondar os valores decodificados.\nAdicionada atualização de metadados durante a inicialização, quando a estrutura do ponto de dados é alterada.",
+        "nl": "Update van de lijst met gegevenspunten voor E3-apparaten naar versie 20260701 (standaard) en 20260630 (variant).\nCodec `O3ESwitch` toegevoegd voor apparaatafhankelijke datapuntstructuren die worden geselecteerd door een discriminatorbyte.\nEr is een optionele parameter `decimals` toegevoegd aan numerieke codecs om gedecodeerde waarden af te ronden.\nUpdate van metadata tijdens het opstarten toegevoegd, wanneer de structuur van een datapunt is gewijzigd.",
+        "fr": "Mise à jour de la liste des points de données pour les périphériques E3 vers la version 20260701 (commune) et 20260630 (variante)\nAjout du codec `O3ESwitch` pour les structures de points de données dépendantes du périphérique sélectionnées par un octet discriminateur.\nAjout d'un paramètre optionnel `decimals` aux codecs numériques pour arrondir les valeurs décodées\nAjout d'une mise à jour des métadonnées au démarrage, lorsque la structure du point de données a été modifiée.",
+        "it": "Aggiornamento dell'elenco dei punti dati per i dispositivi E3 alle versioni 20260701 (comune) e 20260630 (variante).\nAggiunto il codec `O3ESwitch` per le strutture di punti dati dipendenti dal dispositivo selezionate da un byte discriminatore\nAggiunto il parametro opzionale `decimals` ai codec numerici per arrotondare i valori decodificati.\nAggiunto l'aggiornamento dei metadati all'avvio, quando la struttura del punto dati cambia",
+        "es": "Actualización de la lista de puntos de datos para dispositivos E3 a la versión 20260701 (común) y 20260630 (variante).\nSe agregó el códec `O3ESwitch` para estructuras de puntos de datos dependientes del dispositivo seleccionadas por un byte discriminador.\nSe agregó el parámetro opcional `decimals` a los códecs numéricos para redondear los valores decodificados.\nSe agregó la actualización de metadatos durante el inicio, cuando la estructura del punto de datos ha cambiado.",
+        "pl": "Aktualizacja listy punktów danych dla urządzeń E3 do wersji 20260701 (wspólna) i 20260630 (wariant)\nDodano kodek „O3ESwitch” dla struktur punktów danych zależnych od urządzenia, wybranych przez bajt dyskryminatora\nDodano opcjonalny parametr „decimals” do kodeków numerycznych w celu zaokrąglenia zdekodowanych wartości\nDodano aktualizację metadanych podczas uruchamiania, gdy struktura punktu danych uległa zmianie",
+        "uk": "Оновлення списку точок даних для пристроїв E3 до версії 20260701 (загальна) та 20260630 (варіант)\nДодано кодек `O3ESwitch` для залежних від пристрою структур точок даних, вибраних байтом дискримінатора.\nДодано необов'язковий параметр `decimals` до числових кодеків для округлення декодованих значень\nДодано оновлення метаданих під час запуску, коли змінюється структура точки даних.",
+        "zh-cn": "将 E3 设备的数据点列表更新至版本 20260701（通用）和 20260630（变体）\n新增了用于设备相关数据点结构的编解码器 `O3ESwitch`，该结构由鉴别器字节选择。\n为数值编解码器添加了可选的 `decimals` 参数，用于对解码值进行四舍五入。\n启动时，当数据点的结构发生变化时，会更新元数据。"
+      },
       "1.0.3": {
         "en": "Update of list of data points for E3 devices to version 20260528 for common and 20260527 for variant data points; For details see this [changelog](lib/data-points.md#changelog-of-data-point-definitions)\nSuppress spurious variant-did warning when common dict covers the length\nUser-defined variant data point structures in `udsDidsSpecific` can now be protected from automatic updates by adding `\"protected\": true` (and an optional `\"reason\"` text) to the entry; see [documentation](lib/data-points.md#user-defined-data-point-structures-in-udsdidsspecific)\nUpdated socketcan dependency to 4.2.1 (N-API) — the native CAN module no longer needs to be rebuilt after a Node.js upgrade",
         "de": "Aktualisierung der Liste der Datenpunkte für E3 Geräte auf Version 20260528 für gemeinsame und 20260527 für variante Datenpunkte; Für Details siehe [hier](lib/data-points.md#changelog-of-data-point-definitions)\nIrreführende Varianten-Did Warnung wird unterdrückt\nBenutzerdefinierte Varianten-Datenpunktstrukturen in `udsDidsSpecific` können nun durch Hinzufügen von `\"protected\": true` (und optionaler `\"reason\"' Text) zum Eintrag vor automatischen Updates geschützt werden; siehe [Dokumentation](lib/data-points.md#user-definiert-data-point-structures-in-udsdidsspezifische)\nAktualisierte socketcan-Abhängigkeit auf 4.2.1 (N-API) — das native CAN-Modul muss nach einem Node.js-Upgrade nicht mehr neu compiliert werden",
@@ -80,19 +93,6 @@
         "pl": "Analiza topologii magistrali jest teraz generowana automatycznie po skanowaniu punktów danych; wyniki są przechowywane w info.topology (JSON) i info.topologyHtml (HTML); szczegóły w Readme\nDodano walidację danych wejściowych dla pól interwału i opóźnienia w zakładce punktów danych — akceptowane są tylko dodatnie liczby całkowite",
         "uk": "Аналіз топології шини тепер генерується автоматично після сканування точок даних; результати зберігаються в info.topology (JSON) та info.topologyHtml (HTML); подробиці у Readme\nДодано перевірку введення для полів інтервалу та затримки на вкладці точок даних — приймаються лише додатні цілі числа",
         "zh-cn": "数据点扫描后现在自动生成总线拓扑分析；结果存储在info.topology（JSON）和info.topologyHtml（HTML）中；详情请参阅Readme\n在数据点标签的间隔和延迟字段中添加了输入验证——只接受正整数"
-      },
-      "1.0.0-beta.0": {
-        "en": "Introduced new e3oncan datapoints webUI pinned to the adapter's instance row\nEnergy meters (E380, E3100CB) are now auto-detected during the device scan by passive CAN listening on both CAN channels\nState names for energy meters are assigned automatically based on CAN address and channel; see Readme for details\nEnergy meter Collect toggle and delay are now configured exclusively in the e3oncan datapoints page; changes take effect after adapter restart\nOn first run after upgrade, the active setting is automatically migrated from the previous adapter configuration\nCollect-capable devices are now auto-detected during the data point scan by passive CAN listening; a pin icon is shown in the device card header for each detected device\nAdded option to suppress storing of data point values during data point scan",
-        "de": "Neue e3oncan Datenpunkte-Webseite, direkt in der Adapterinstanzzeile verankert\nEnergiezähler (E380, E3100CB) werden jetzt beim Gerätescan durch passives CAN-Lauschen auf beiden Kanälen automatisch erkannt\nState-Namen für Energiezähler werden automatisch anhand von CAN-Adresse und Kanal vergeben; Details im Readme\nCollect-Schalter und Verzögerung für Energiezähler werden ausschließlich in der e3oncan Datenpunkte-Seite konfiguriert; Änderungen werden nach Adapter-Neustart wirksam\nBeim ersten Start nach einem Upgrade wird die Aktiv-Einstellung automatisch aus der bisherigen Adapterkonfiguration migriert\nCollect-fähige Geräte werden jetzt beim Datenpunktscan durch passives CAN-Lauschen automatisch erkannt; ein Pin-Symbol erscheint im Gerätekarten-Header für jedes erkannte Gerät\nOption hinzugefügt, das Speichern von Datenpunktwerten während des Datenpunktscans zu unterdrücken",
-        "ru": "Новая веб-страница датапоинтов e3oncan, закреплённая в строке экземпляра адаптера\nСчётчики электроэнергии (E380, E3100CB) теперь автоматически обнаруживаются при сканировании устройств путём пассивного прослушивания CAN на обоих каналах\nИмена состояний для счётчиков электроэнергии назначаются автоматически по адресу CAN и каналу; подробности в Readme\nПереключатель Collect и задержка для счётчиков электроэнергии настраиваются исключительно на странице датапоинтов e3oncan; изменения вступают в силу после перезапуска адаптера\nПри первом запуске после обновления активная настройка автоматически переносится из предыдущей конфигурации\nУстройства с поддержкой Collect теперь автоматически обнаруживаются при сканировании датапоинтов; значок булавки отображается в заголовке карточки устройства\nДобавлена опция для отключения сохранения значений датапоинтов во время сканирования",
-        "pt": "Nova página web de pontos de dados e3oncan fixada na linha de instância do adaptador\nContadores de energia (E380, E3100CB) são agora automaticamente detectados durante o scan de dispositivos por escuta passiva CAN em ambos os canais\nNomes de estado para contadores de energia são atribuídos automaticamente com base no endereço CAN e canal; consulte o Readme para detalhes\nO interruptor Collect e o atraso para contadores de energia são configurados exclusivamente na página de pontos de dados e3oncan; as alterações têm efeito após reinício do adaptador\nNa primeira execução após atualização, a configuração ativa é automaticamente migrada da configuração anterior do adaptador\nDispositivos com capacidade Collect são agora automaticamente detectados durante o scan de pontos de dados; um ícone de pino é mostrado no cabeçalho do cartão do dispositivo\nAdicionada opção para suprimir o armazenamento de valores de pontos de dados durante o scan",
-        "nl": "Nieuwe e3oncan datapunten webpagina vastgezet in de adapterinstantierij\nEnergiemeters (E380, E3100CB) worden nu automatisch gedetecteerd tijdens de apparaatscan door passief CAN-luisteren op beide kanalen\nToestandsnamen voor energiemeters worden automatisch toegewezen op basis van CAN-adres en kanaal; zie Readme voor details\nDe Collect-schakelaar en vertraging voor energiemeters worden uitsluitend geconfigureerd op de e3oncan datapunten pagina; wijzigingen worden van kracht na herstart van de adapter\nBij de eerste uitvoering na een upgrade wordt de actieve instelling automatisch gemigreerd vanuit de vorige adapterconfiguratie\nCollect-geschikte apparaten worden nu automatisch gedetecteerd tijdens de datapuntscan; een speldpictogram verschijnt in de apparaatkaart header voor elk gedetecteerd apparaat\nOptie toegevoegd om het opslaan van datapuntwaarden tijdens de scan te onderdrukken",
-        "fr": "Nouvelle page web des points de données e3oncan épinglée dans la ligne d'instance de l'adaptateur\nLes compteurs d'énergie (E380, E3100CB) sont maintenant automatiquement détectés lors du scan des appareils par écoute passive CAN sur les deux canaux\nLes noms d'état des compteurs d'énergie sont attribués automatiquement selon l'adresse CAN et le canal ; voir le Readme pour les détails\nL'interrupteur Collect et le délai pour les compteurs d'énergie sont configurés exclusivement dans la page des points de données e3oncan ; les modifications prennent effet après redémarrage de l'adaptateur\nLors du premier démarrage après une mise à jour, la configuration active est automatiquement migrée depuis la configuration précédente\nLes appareils compatibles Collect sont maintenant automatiquement détectés lors du scan des points de données ; une icône d'épingle est affichée dans l'en-tête de la carte de l'appareil\nAjout d'une option pour supprimer l'enregistrement des valeurs de points de données lors du scan",
-        "it": "Nuova pagina web dei punti dati e3oncan agganciata alla riga dell'istanza dell'adattatore\nI contatori di energia (E380, E3100CB) vengono ora rilevati automaticamente durante la scansione dei dispositivi tramite ascolto passivo CAN su entrambi i canali\nI nomi degli stati per i contatori di energia vengono assegnati automaticamente in base all'indirizzo CAN e al canale; vedere il Readme per i dettagli\nL'interruttore Collect e il ritardo per i contatori di energia sono configurati esclusivamente nella pagina dei punti dati e3oncan; le modifiche hanno effetto dopo il riavvio dell'adattatore\nAl primo avvio dopo un aggiornamento, la configurazione attiva viene migrata automaticamente dalla configurazione precedente\nI dispositivi con supporto Collect vengono ora rilevati automaticamente durante la scansione dei punti dati; un'icona a spillo è mostrata nell'intestazione della scheda del dispositivo\nAggiunta opzione per sopprimere il salvataggio dei valori dei punti dati durante la scansione",
-        "es": "Nueva página web de puntos de datos e3oncan anclada en la fila de instancia del adaptador\nLos contadores de energía (E380, E3100CB) ahora se detectan automáticamente durante el escaneo de dispositivos mediante escucha pasiva CAN en ambos canales\nLos nombres de estado para los contadores de energía se asignan automáticamente según la dirección CAN y el canal; consulte el Readme para más detalles\nEl interruptor Collect y el retardo para los contadores de energía se configuran exclusivamente en la página de puntos de datos e3oncan; los cambios tienen efecto tras reiniciar el adaptador\nEn la primera ejecución tras una actualización, la configuración activa se migra automáticamente desde la configuración anterior\nLos dispositivos con capacidad Collect ahora se detectan automáticamente durante el escaneo de puntos de datos; se muestra un icono de chincheta en el encabezado de la tarjeta del dispositivo\nSe añadió una opción para suprimir el almacenamiento de valores de puntos de datos durante el escaneo",
-        "pl": "Nowa strona internetowa punktów danych e3oncan przypięta do wiersza instancji adaptera\nLiczniki energii (E380, E3100CB) są teraz automatycznie wykrywane podczas skanowania urządzeń przez pasywne nasłuchiwanie CAN na obu kanałach\nNazwy stanów dla liczników energii są przypisywane automatycznie na podstawie adresu CAN i kanału; szczegóły w Readme\nPrzełącznik Collect i opóźnienie dla liczników energii są konfigurowane wyłącznie na stronie punktów danych e3oncan; zmiany wchodzą w życie po ponownym uruchomieniu adaptera\nPrzy pierwszym uruchomieniu po aktualizacji aktywna konfiguracja jest automatycznie migrowana z poprzedniej konfiguracji adaptera\nUrządzenia obsługujące tryb Collect są teraz automatycznie wykrywane podczas skanowania punktów danych; ikona pinezki jest wyświetlana w nagłówku karty urządzenia\nDodano opcję pomijania zapisywania wartości punktów danych podczas skanowania",
-        "uk": "Нова веб-сторінка точок даних e3oncan, закріплена в рядку екземпляра адаптера\nЛічильники електроенергії (E380, E3100CB) тепер автоматично виявляються під час сканування пристроїв шляхом пасивного прослуховування CAN на обох каналах\nІмена станів для лічильників електроенергії призначаються автоматично на основі адреси CAN та каналу; подробиці у Readme\nПеремикач Collect і затримка для лічильників електроенергії налаштовуються виключно на сторінці точок даних e3oncan; зміни набирають чинності після перезапуску адаптера\nПри першому запуску після оновлення активне налаштування автоматично переноситься з попередньої конфігурації адаптера\nПристрої з підтримкою Collect тепер автоматично виявляються під час сканування точок даних; значок шпильки відображається у заголовку картки пристрою\nДодано опцію для відключення збереження значень точок даних під час сканування",
-        "zh-cn": "新的e3oncan数据点网页固定在适配器实例行中\n能量表（E380、E3100CB）现在在设备扫描期间通过对两个CAN通道的被动监听自动检测\n能量表的状态名称根据CAN地址和通道自动分配；详情请参阅Readme\n能量表的Collect开关和延迟仅在e3oncan数据点页面中配置；更改在适配器重启后生效\n升级后首次运行时，激活设置会自动从之前的适配器配置中迁移\n在数据点扫描期间，通过被动CAN监听自动检测支持Collect模式的设备；每个检测到的设备在设备卡片标题中显示图钉图标\n添加了在扫描期间抑制数据点值存储的选项"
       }
     },
     "titleLang": {

package/lib/codecs.js

@@ -277,6 +277,7 @@ class O3EInt {
         this.byte_width = byte_width;
         this.scale = _args.scale;
         this.signed = _args.signed;
+        this.decimals = _args.decimals;
     }
     /**
      * @param {string} data  Raw data
@@ -292,7 +293,12 @@ class O3EInt {
      * @param {Array} data  Array of bytes
      */
     decode(data) {
-        return int2val(data.slice(0, this.byte_width), this.signed) / this.scale;
+        const val = int2val(data.slice(0, this.byte_width), this.signed) / this.scale;
+        if (this.decimals > 0) {
+            const f = 10 ** this.decimals;
+            return Math.round(val * f) / f;
+        }
+        return val;
     }
 
     /**
@@ -422,6 +428,7 @@ class O3EFloat32 {
         this.string_len = string_len;
         this.id = idStr;
         this.scale = _args.scale;
+        this.decimals = _args.decimals;
     }
     /**
      * @param {number} _data  Float32 value
@@ -438,7 +445,12 @@ class O3EFloat32 {
         const intView = new Int32Array(buffer);
         const floatView = new Float32Array(buffer);
         intView[0] = int2val(string_bin, false);
-        return floatView[0] / this.scale;
+        const val = floatView[0] / this.scale;
+        if (this.decimals > 0) {
+            const f = 10 ** this.decimals;
+            return Math.round(val * f) / f;
+        }
+        return val;
     }
 
     /**
@@ -1016,6 +1028,64 @@ class O3EEnum {
     }
 }
 
+/**
+ *  Codec for UDSonCAN: Discriminated union. Decodes a 1-byte enum value (looked up in
+ *  enums[listStr], same as O3EEnum), followed by a payload whose codec is selected from
+ *  args.cases by the enum value (falling back to args.default if no case matches).
+ */
+class O3ESwitch {
+    /**
+     * @param {number} string_len  Length of raw data
+     * @param {string} idStr  Data ID (DID)
+     * @param {object} _args  Additional parameters
+     * @param {string} _devUnits  Units and formats of device
+     */
+    constructor(string_len, idStr, _args, _devUnits) {
+        this.string_len = string_len;
+        this.id = idStr;
+        this.listStr = _args.listStr;
+        this.cases = _args.cases;
+        this.default = _args.default;
+        this.devUnits = _devUnits;
+    }
+    /**
+     * @param {object} _data  Raw data
+     */
+    encode(_data) {
+        throw new Error('O3ESwitch.encode(): not implemented yet');
+    }
+    /**
+     * @param {Array} string_bin  Raw data (array of bytes)
+     */
+    decode(string_bin) {
+        const val = string_bin[0];
+        const txt =
+            this.listStr in enums.enums && String(val) in enums.enums[this.listStr]
+                ? enums.enums[this.listStr][String(val)]
+                : `Enum not found in ${this.listStr}`;
+        const result = { ID: val, Text: txt };
+        const cdi = this.cases[String(val)] ?? this.default;
+        if (!cdi) {
+            result.Error = `No matching case for ID ${val}`;
+            return result;
+        }
+        const subT = new O3Ecodecs[cdi.codec](cdi.len, cdi.id, cdi.args, this.devUnits);
+        const sub = subT.decode(string_bin.slice(1, 1 + subT.string_len));
+        if (sub !== null && typeof sub === 'object' && !Array.isArray(sub)) {
+            Object.assign(result, sub);
+        } else {
+            result[subT.id] = sub;
+        }
+        return result;
+    }
+    /**
+     * Returns length of raw data
+     */
+    __len__() {
+        return this.string_len;
+    }
+}
+
 /**
  *  Codec for UDSonCAN: List of subs
  */
@@ -1256,6 +1326,7 @@ const O3Ecodecs = {
     O3EDateTime: O3EDateTime,
     O3EUtc: O3EUtc,
     O3EEnum: O3EEnum,
+    O3ESwitch: O3ESwitch,
     O3EList: O3EList,
     O3EArray: O3EArray,
     O3EComplexType: O3EComplexType,

package/lib/codecs.test.js

@@ -185,6 +185,12 @@ describe('codecs.js => O3EFloat32().decode()', () => {
     codecDecode('Float -7851817360303081791424561152', -7851817360303081791424561152, E3.O3Ecodecs.O3EFloat32, 4,  'Float32Test9', {scale: 1.0}, [0xed, 0xca, 0xf6, 0xf8].reverse());
     codecDecode('Float +0.005'                       ,         +0.004999999888241291, E3.O3Ecodecs.O3EFloat32, 4,  'Float32Test9', {scale: 1.0}, [0x3b, 0xa3, 0xd7, 0x0a].reverse());
     codecDecode('Float -0.005'                       ,         -0.004999999888241291, E3.O3Ecodecs.O3EFloat32, 4, 'Float32Test10', {scale: 1.0}, [0xbb, 0xa3, 0xd7, 0x0a].reverse());
+    codecDecode('Float +0.005, decimals=2'           ,                          0.0,  E3.O3Ecodecs.O3EFloat32, 4, 'Float32Test11', {scale: 1.0, decimals: 2}, [0x3b, 0xa3, 0xd7, 0x0a].reverse());
+});
+
+describe('codecs.js => O3EInt8().decode() with decimals', () => {
+    codecDecode('scale=2.55, decimals=2', 1.96,  E3.O3Ecodecs.O3EInt8, 1, 'test1', {scale:2.55, signed:false, decimals:2}, [0x05]);
+    codecDecode('scale=2.55, decimals=0', 5 / 2.55, E3.O3Ecodecs.O3EInt8, 1, 'test2', {scale:2.55, signed:false, decimals:0}, [0x05]);
 });
 
 // Integer DECODER:
@@ -289,6 +295,38 @@ describe('codecs.js => O3EList()', () => {
     codecEncode('Encoding did 266 ', raw_arr, E3.O3Ecodecs[cdi.codec], cdi.len, cdi.id, cdi.args, js, 'Metric / DayMonthYear / TwentyFourHours');
 });
 
+describe('codecs.js => O3ESwitch().decode()', () => {
+    const cases = {
+        '0': { codec: 'RawCodec', len: 1, id: 'Unknown', args: {} },
+        '1': { codec: 'O3EInt8', len: 1, id: 'Demand', args: { scale: 10, signed: false } },
+    };
+    codecDecode(
+        'Discriminator matches case 0 (RawCodec)',
+        { ID: 0, Text: 'Standby', Unknown: 'ab' },
+        E3.O3Ecodecs.O3ESwitch, 2, 'test1', { listStr: 'ZigBeeOperatingModes', cases },
+        [0x00, 0xab],
+    );
+    codecDecode(
+        'Discriminator matches case 1 (O3EInt8)',
+        { ID: 1, Text: 'Heating', Demand: 5 },
+        E3.O3Ecodecs.O3ESwitch, 2, 'test2', { listStr: 'ZigBeeOperatingModes', cases },
+        [0x01, 0x32],
+    );
+    codecDecode(
+        'Discriminator without case and without default',
+        { ID: 9, Text: 'Enum not found in ZigBeeOperatingModes', Error: 'No matching case for ID 9' },
+        E3.O3Ecodecs.O3ESwitch, 2, 'test3', { listStr: 'ZigBeeOperatingModes', cases },
+        [0x09, 0xff],
+    );
+    codecDecode(
+        'Discriminator without case, falls back to default',
+        { ID: 9, Text: 'Enum not found in ZigBeeOperatingModes', Unknown: 'cd' },
+        E3.O3Ecodecs.O3ESwitch, 2, 'test4',
+        { listStr: 'ZigBeeOperatingModes', cases, default: { codec: 'RawCodec', len: 1, id: 'Unknown', args: {} } },
+        [0x09, 0xcd],
+    );
+});
+
 describe('codecs.js => O3EList()', () => {
     const raw_hex = '0a00b001f3031417120b050e3a313602f3031417120b050e390c3602f3031417120b050e2f273602f3031417120b050d2b063602f3031417120b050d2a233602f3031417120b050d27383602f3031417120b050d26033602f3031417120b050d242d3602f3031417120b050d1f043602f3031417120b050d1e133602';
     const raw_arr = toByteArray(raw_hex);

package/lib/data-points.md

@@ -185,6 +185,29 @@ The adapter will log `Variant datapoint ... is protected by user. Update skipped
 
 ## Changelog of Data Point Definitions
 
+### v1.1.0 (2026-07-05)
+
+**Variant data points (didsE3var.json, v20260630)**
+
+* **ZigBee current-values DIDs 2086–2143 and 2262** (68-byte variant): Restructured around a new `ViCareDevice` O3ESwitch discriminator that selects the decoded fields by device type:
+  - type 0 — empty slot (raw)
+  - type 1 — climate sensor: `ActualTemperature` (°C), `Humidity` (%)
+  - type 2 — TRV: `ActualTemperature` (°C), `ValveOpening` (%), `DeviceDisplayTurned`, `DeviceChildLockActive`, `DeviceTemperatureSetpoint` (°C)
+  - type 3 — floor thermostat / Verteiler: `FlowTemperature` (°C, int16 LE), `OperatingMode`
+  - type 4/5 — actuator NC/NO: `Demand` (%), `ValveState`
+  - `SignalLevel` (%) and `BatteryRssi` (dBm, signed) added to all types
+* **Room property DIDs 1884–1943** (85-byte variant): Added linked ZigBee device index fields; `ChildLockActive` description updated; `WindowDetection` enum corrected.
+* **DID 1603** (PointOfCommonCouplingPower): minor description update.
+
+**Common data points (didsE3.json, v20260701)**
+
+* **3 new DIDs** using `O3EFloat32`:
+  - 2990 `ElectricalEnergySystemBatteryCapacityDelta`
+  - 2991 `ElectricalEnergySystemBatteryCapacity`
+  - 2992 `ElectricalEnergySystemStateOfChargeUseable`
+* **Unit fixes**: DID 279 and 281 field `Actual`: unit corrected to °C (was empty); DID 321 field `Average`: unit corrected to °C (was hPa); DID 322 field `Average`: unit corrected to hPa (was °C).
+* `decimals` field added to all numeric sub-fields for consistency with the updated codec definition (value `0` — no change to decoded values).
+
 ### v1.0.3 (2026-05-31)
 * **ZigBee DIDs 2084–2319 structured**: ZigBeeDeviceProperty (incl. ArticleNumber), ZigBeeDeviceCurrentValues in 57-byte (gas heater) and 68-byte (heat pump) variants with WorkingMode, Setpoint, Display, ChildLock fields
 * **Room DIDs 1884–1943 structured**: RoomProperty (name, type, temperature control, window detection) and RoomCurrentValues (temperature, humidity min/max) in 84/85-byte variants