[enocean] Consolidate datagram injector motion/FTK updates

Signed-off-by: Sven Schad <svnsssd@gmail.com>

Author: svnsssd

bundles/org.openhab.binding.enocean/EEP_FTK.txt

@@ -0,0 +1,8 @@
+FTK (EEP:D5-00-01)
+ORG = 0x06
+Data_byte3= Kontakt geschlossen -> 0x09
+			Kontakt offen -> 0x08
+Data_byte2= -
+Data_byte1= -
+Data_byte0= -
+Lerntelegramm DB3..DB0: 0x00, 0x00, 0x00, 0x00

bundles/org.openhab.binding.enocean/README.md

@@ -99,6 +99,7 @@ Hence if your device supports one of the following EEPs the chances are good tha
 | multiFunctionSmokeDetector      | D2-14/F6-05       | 0x30/02                 | smokeDetection, batteryLow                                  | Insafe+, Afriso ASD     | Discovery |
 | heatRecoveryVentilation         | D2-50             | 0x00,01,10,11           | a lot of different state channels                           | Dimplex DL WE2          | Discovery |
 | classicDevice                   | F6-02             | 0x01-02                 | virtualRockerswitchA, virtualRockerswitchB                  | -                       | Teach-in  |
+| datagramInjector                | D5-00             | 0x01 (FTK profile)      | switch                                                      | FTK-like contact use cases | Manually |
 
 ¹ Not all channels are supported by all devices, it depends which specific EEP type is used by the device, all thing types additionally support `rssi`, `repeatCount` and `lastReceived` channels
 
@@ -261,10 +262,14 @@ rejected during validation.
 |                                 | broadcastMessages |                             | true, false |
 |                                 | suppressRepeating |                             | true, false |
 | classicDevice                   | senderIdOffset    |                             | 1-127 |
+|                                 | senderAddress     | Full sender address (takes precedence over senderIdOffset, RS485 only) | 8 hex chars |
 |                                 | sendingEEPId      |                             | F6_02_01, F6_02_02 |
 |                                 | broadcastMessages |                             | true, false |
 |                                 | receivingEEPId    |                             | F6_02_01, F6_02_02 |
 |                                 | suppressRepeating |                             | true, false |
+| datagramInjector                | senderAddress     | Virtual sender address used by injector telegrams (RS485 only) | 8 hex chars |
+|                                 | sendingProfileId  | Profile used for command encoding | FTK_D5_00_01, MOTION_A5_07_01 |
+|                                 | suppressRepeating | Suppress repeating of msg | true, false |
 
 ¹ multiple values possible, EEPs have to be of different EEP families.
 If you want to receive messages of your EnOcean devices you have to set **the enoceanId to the EnOceanId of your device**.
@@ -450,6 +455,40 @@ Switch Garage_Light "Switch" {
 }
 ```
 
+## Datagram Injector
+
+The `datagramInjector` thing is a send-only profile based injector for EnOcean telegrams.
+It can only be used when RS485 mode is enabled on the bridge.
+It supports the following profiles: `FTK_D5_00_01`, `MOTION_A5_07_01`.
+
+For profile `FTK_D5_00_01` the channel command is converted as follows:
+
+- `CLOSED` or `ON` -> telegram payload `0x09`
+- `OPEN` or `OFF` -> telegram payload `0x08`
+
+For profile `MOTION_A5_07_01` the channel command is converted as follows:
+
+- `ON` -> motion detected
+- `OFF` -> no motion detected
+
+Example Thing DSL definition:
+
+```xtend
+Bridge enocean:bridge:gtwy "EnOcean Gateway" [ path="/dev/ttyAMA0" ] {
+  Thing datagramInjector ftkTx "FTK TX" [
+    sendingProfileId="FTK_D5_00_01",
+    senderAddress="00AABBCC",
+    suppressRepeating=false
+  ]
+}
+```
+
+Example Item linking:
+
+```xtend
+Switch Window_Contact_TX "Window Contact TX" { channel="enocean:datagramInjector:gtwy:ftkTx:switch" }
+```
+
 ## Generic Things
 
 If an EnOcean device uses an unsupported EEP or _A5-3F-7F_, you have to create a `genericThing`.

bundles/org.openhab.binding.enocean/plan-datagramInjector.prompt.md

@@ -0,0 +1,76 @@
+## Plan: Symmetrischer Datagram Injector (FTK Start, ohne Transform-Service)
+
+Ziel ist ein send-only `datagramInjector`-Pfad, der symmetrisch zur bestehenden EEP-Typisierung aufgebaut ist: statt externer MAP/Transformationen wird eine interne Profil-/Codec-Struktur genutzt. Einstieg erfolgt mit einem konkreten Profil für FTK (`D5-00-01`) auf Basis der Spezifikation in `EEP_FTK.txt`.
+
+Zusätzlich muss die bereits als PR vorliegende Alternative zu `senderIdOffset` umgesetzt werden: `senderAddress` (vollständige 32-bit Senderadresse in Hex), mit Vorrang vor `senderIdOffset` und RS485-Validierung.
+
+**Architekturentscheidungen**
+- Eigener Handler (`EnOceanDatagramInjectorHandler`) statt Vererbung vom Sensor-Handler.
+- Interne Mapping-/Codec-Registry (profilbasiert), kein openHAB Transform-Service.
+- Start mit genau einem Profil: `FTK_D5_00_01`.
+- Erweiterbar auf weitere Geräteprofile analog zu `EEPType`.
+- Senderidentität dual:
+  - Standard: `senderIdOffset` (bestehendes Verhalten)
+  - Alternative: `senderAddress` (PR-Lösung), hat Vorrang.
+
+**Schritt A: PR-Lösung für Senderadresse (Pflichtteil)**
+1. Parameter `senderAddress` ergänzen (wie in PR):
+   - `EnOceanBindingConstants`: `PARAMETER_SENDERADDRESS`
+   - `EnOceanActuatorConfig`: `@Nullable String senderAddress`
+2. Validierungs-/Initialisierungslogik im TX-Handler übernehmen:
+   - Wenn `senderAddress` gesetzt: hex-dekodieren, Länge = 4 Byte prüfen, als `senderId` verwenden.
+   - `senderAddress` hat Vorrang vor `senderIdOffset`.
+   - Bei `senderAddress` keine Offset-Reservierung am Bridge-Allocator.
+3. RS485-Guard übernehmen:
+   - `EnOceanBridgeHandler#isRS485Enabled()` bereitstellen.
+   - `senderAddress` nur zulassen, wenn Bridge im RS485-Modus läuft.
+   - Sonst `CONFIGURATION_ERROR` mit klarer Fehlermeldung.
+4. XML/i18n für relevante sendende Thing-Typen ergänzen:
+   - Label/Description für `senderAddress`
+   - Beschreibung: „32-bit hex, 8 Stellen, Vorrang vor senderIdOffset“.
+
+**Schritt B: DatagramInjector V1 (FTK) auf dieser Basis**
+1. Neues Thing-Modell `datagramInjector` in `OH-INF/thing/DatagramInjector.xml` definieren.
+   - Konfiguration: `sendingProfileId`, `senderIdOffset`, `senderAddress`, `broadcastMessages`, `suppressRepeating`, optional `enoceanId`.
+   - Identitätsauflösung wie oben: `senderAddress` vor `senderIdOffset`.
+2. Neue Thing-Type-Konstante `THING_TYPE_DATAGRAMINJECTOR` in `EnOceanBindingConstants` ergänzen und in `SUPPORTED_DEVICE_THING_TYPES_UIDS` aufnehmen.
+3. Neues Profil-Enum/Registry einführen (z. B. `DatagramProfileType`), initial mit `FTK_D5_00_01`.
+4. Codec-Schnittstelle für Outbound definieren (z. B. `DatagramCommandEncoder`).
+   - Methode: `encode(channelId, channelTypeId, command, channelConfig, currentStateProvider)` → ERP1 payload bytes.
+5. FTK-Encoder implementieren (`FtkD5_00_01Encoder`).
+   - Mapping gemäß `EEP_FTK.txt`: `CLOSED -> 0x09`, `OPEN -> 0x08` (DB3), Teach-In optional `0x00`.
+6. `EnOceanDatagramInjectorHandler` implementieren auf Basis von `EnOceanBaseThingHandler`.
+   - `validateConfig`: Profil + Senderidentität (`senderAddress`/`senderIdOffset`) + Zieladresse.
+   - `handleCommand`: Command an Encoder, ERP1 bauen, via Bridge senden.
+   - Keine PacketListener-Registrierung, keine RX-EEP-Pflicht.
+7. Handler-Factory (`EnOceanHandlerFactory`) erweitern, damit `datagramInjector` den neuen Handler erhält.
+8. i18n ergänzen (`enocean.properties`) für Thing/Config/Channel inkl. Profiloption `FTK_D5_00_01` und `senderAddress`.
+9. README erweitern:
+   - Neues Kapitel „Datagram Injector (Profile-based, send-only)“.
+   - FTK-Beispiel inkl. `senderAddress`-Variante und `senderIdOffset`-Variante.
+
+**FTK V1 Mapping**
+- Profil: `FTK_D5_00_01`
+- EEP: `D5-00-01` (1BS, ORG/RORG `0x06`)
+- Nutzdaten:
+  - Kontakt geschlossen → `0x09`
+  - Kontakt offen → `0x08`
+  - Teach-In Telegramm DB3..DB0 → `0x00,0x00,0x00,0x00` (optional)
+
+**Verification**
+- Build: `mvn clean install -DskipTests` im Binding-Verzeichnis.
+- Formatierung: `mvn spotless:apply` im Binding-Verzeichnis.
+- Funktionstest Senderidentität:
+  - Fall 1: `senderIdOffset` gesetzt, `senderAddress` leer → bestehendes Verhalten.
+  - Fall 2: `senderAddress` gesetzt, RS485 aktiv → direkte 32-bit Senderadresse wird verwendet.
+  - Fall 3: `senderAddress` gesetzt, RS485 inaktiv → erwarteter `CONFIGURATION_ERROR`.
+- Funktionstest FTK:
+  - Injector-Thing mit Profil `FTK_D5_00_01` anlegen.
+  - `OPEN`/`CLOSED` Command senden, Bus auf `0x08/0x09` prüfen.
+- Negativtests:
+  - Ungültiges Profil/Command oder ungültiges `senderAddress` (nicht-hex / !=8 Zeichen) → keine Sendung + klare Fehlermeldung.
+
+**Abgrenzung V1**
+- Kein RX-Pfad für den Injector.
+- Kein generischer Hex-Injector.
+- Keine zusätzlichen Geräteprofile außer FTK im ersten Schnitt.

bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/EnOceanBindingConstants.java

@@ -72,6 +72,7 @@ public class EnOceanBindingConstants {
     public static final ThingTypeUID THING_TYPE_ENVIRONMENTALSENSOR = new ThingTypeUID(BINDING_ID,
             "environmentalSensor");
     public static final ThingTypeUID THING_TYPE_GENERICTHING = new ThingTypeUID(BINDING_ID, "genericThing");
+    public static final ThingTypeUID THING_TYPE_DATAGRAMINJECTOR = new ThingTypeUID(BINDING_ID, "datagramInjector");
     public static final ThingTypeUID THING_TYPE_ROLLERSHUTTER = new ThingTypeUID(BINDING_ID, "rollershutter");
     public static final ThingTypeUID THING_TYPE_MULTFUNCTIONSMOKEDETECTOR = new ThingTypeUID(BINDING_ID,
             "multiFunctionSmokeDetector");
@@ -85,10 +86,10 @@ public class EnOceanBindingConstants {
             THING_TYPE_ROCKERSWITCH, THING_TYPE_CLASSICDEVICE, THING_TYPE_CENTRALCOMMAND, THING_TYPE_ROOMOPERATINGPANEL,
             THING_TYPE_MECHANICALHANDLE, THING_TYPE_CONTACT, THING_TYPE_MEASUREMENTSWITCH, THING_TYPE_TEMPERATURESENSOR,
             THING_TYPE_TEMPERATUREHUMIDITYSENSOR, THING_TYPE_GASSENSOR, THING_TYPE_GENERICTHING,
-            THING_TYPE_ROLLERSHUTTER, THING_TYPE_OCCUPANCYSENSOR, THING_TYPE_LIGHTTEMPERATUREOCCUPANCYSENSOR,
-            THING_TYPE_LIGHTSENSOR, THING_TYPE_ENVIRONMENTALSENSOR, THING_TYPE_AUTOMATEDMETERSENSOR,
-            THING_TYPE_THERMOSTAT, THING_TYPE_MULTFUNCTIONSMOKEDETECTOR, THING_TYPE_HEATRECOVERYVENTILATION,
-            THING_TYPE_WINDOWSASHHANDLESENSOR);
+            THING_TYPE_DATAGRAMINJECTOR, THING_TYPE_ROLLERSHUTTER, THING_TYPE_OCCUPANCYSENSOR,
+            THING_TYPE_LIGHTTEMPERATUREOCCUPANCYSENSOR, THING_TYPE_LIGHTSENSOR, THING_TYPE_ENVIRONMENTALSENSOR,
+            THING_TYPE_AUTOMATEDMETERSENSOR, THING_TYPE_THERMOSTAT, THING_TYPE_MULTFUNCTIONSMOKEDETECTOR,
+            THING_TYPE_HEATRECOVERYVENTILATION, THING_TYPE_WINDOWSASHHANDLESENSOR);
 
     // List of all Channel Type Ids, these type ids are also used as channel ids during dynamic creation of channels
     // this makes it a lot easier as we do not have to manage a type id and an id, drawback long channel names
@@ -613,7 +614,7 @@ public class EnOceanBindingConstants {
 
     // Thing config parameter
     public static final String PARAMETER_SENDERIDOFFSET = "senderIdOffset";
-    public static final String PARAMETER_SENDERID = "senderId";
+    public static final String PARAMETER_SENDERADDRESS = "senderAddress";
     public static final String PARAMETER_SENDINGEEPID = "sendingEEPId";
     public static final String PARAMETER_RECEIVINGEEPID = "receivingEEPId";
 

bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/EnOceanHandlerFactory.java

@@ -26,6 +26,7 @@
 import org.openhab.binding.enocean.internal.handler.EnOceanBaseSensorHandler;
 import org.openhab.binding.enocean.internal.handler.EnOceanBridgeHandler;
 import org.openhab.binding.enocean.internal.handler.EnOceanClassicDeviceHandler;
+import org.openhab.binding.enocean.internal.handler.EnOceanDatagramInjectorHandler;
 import org.openhab.core.config.discovery.DiscoveryService;
 import org.openhab.core.io.transport.serial.SerialPortManager;
 import org.openhab.core.thing.Bridge;
@@ -91,6 +92,8 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) {
             return new EnOceanBaseSensorHandler(thing, itemChannelLinkRegistry);
         } else if (EnOceanClassicDeviceHandler.SUPPORTED_THING_TYPES.contains(thingTypeUID)) {
             return new EnOceanClassicDeviceHandler(thing, itemChannelLinkRegistry);
+        } else if (EnOceanDatagramInjectorHandler.SUPPORTED_THING_TYPES.contains(thingTypeUID)) {
+            return new EnOceanDatagramInjectorHandler(thing, itemChannelLinkRegistry);
         }
 
         return null;

bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/config/EnOceanActuatorConfig.java

@@ -24,7 +24,7 @@ public class EnOceanActuatorConfig extends EnOceanBaseConfig {
 
     public int channel;
     public @Nullable Integer senderIdOffset = null;
-    public @Nullable String senderId = null;
+    public @Nullable String senderAddress = null;
     public String manufacturerId = "";
     public String teachInType = "";
 

bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/config/EnOceanDatagramInjectorConfig.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2010-2026 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.enocean.internal.config;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+
+/**
+ * Configuration for send-only datagram injector thing.
+ *
+ * @author openHAB Contributors
+ */
+@NonNullByDefault
+public class EnOceanDatagramInjectorConfig extends EnOceanBaseConfig {
+
+    public @Nullable String senderAddress = null;
+
+    public String sendingProfileId = "";
+
+    public boolean suppressRepeating = false;
+}

bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_07/A5_07.java

@@ -33,6 +33,9 @@
 @NonNullByDefault
 public abstract class A5_07 extends _4BSMessage {
 
+    public A5_07() {
+    }
+
     public A5_07(ERP1Message packet) {
         super(packet);
     }

bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_07/A5_07_01.java

@@ -12,11 +12,20 @@
  */
 package org.openhab.binding.enocean.internal.eep.A5_07;
 
+import static org.openhab.binding.enocean.internal.EnOceanBindingConstants.CHANNEL_GENERAL_SWITCHING;
+
+import java.util.function.Function;
+
 import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.enocean.internal.messages.ERP1Message;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.types.Command;
 import org.openhab.core.types.State;
 import org.openhab.core.types.UnDefType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
@@ -25,12 +34,47 @@
 @NonNullByDefault
 public class A5_07_01 extends A5_07 {
 
+    @SuppressWarnings("null")
+    private final Logger logger = LoggerFactory.getLogger(A5_07_01.class);
+
+    private static final String CHANNEL_SWITCH = "switch";
+
+    private static final byte OUTBOUND_PIR_ON = (byte) 0xFF;
     private static final int PIR_OFF = 0x7f;
+    private static final byte DB3_DEFAULT = 0x00;
+    private static final byte DB2_DEFAULT = 0x00;
+    private static final byte DB0_DEFAULT = 0x09;
+
+    public A5_07_01() {
+        super();
+    }
 
     public A5_07_01(ERP1Message packet) {
         super(packet);
     }
 
+    @Override
+    protected void convertFromCommandImpl(String channelId, String channelTypeId, Command command,
+            Function<String, State> getCurrentStateFunc, @Nullable Configuration config) {
+        if (!CHANNEL_SWITCH.equals(channelId) && !CHANNEL_GENERAL_SWITCHING.equals(channelTypeId)) {
+            throw new IllegalArgumentException("Unsupported channel for A5_07_01 outbound command: " + channelId);
+        }
+
+        if (command instanceof OnOffType motionCommand) {
+            if (motionCommand == OnOffType.ON) {
+                setData(DB3_DEFAULT, DB2_DEFAULT, OUTBOUND_PIR_ON, DB0_DEFAULT);
+                logger.debug("A5_07_01 outbound motion switch command: {}, data DB3..DB0={} {} {} {}", motionCommand,
+                        String.format("0x%02X", DB3_DEFAULT), String.format("0x%02X", DB2_DEFAULT),
+                        String.format("0x%02X", OUTBOUND_PIR_ON), String.format("0x%02X", DB0_DEFAULT));
+            } else {
+                logger.debug("A5_07_01 outbound motion switch command OFF: no telegram sent");
+            }
+            return;
+        }
+
+        throw new IllegalArgumentException("Unsupported command for A5_07_01 outbound motion detection: " + command);
+    }
+
     @Override
     protected State getIllumination() {
         return UnDefType.UNDEF;

bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D5_00/D5_00_01.java

@@ -22,9 +22,13 @@
 import org.openhab.binding.enocean.internal.eep.Base._1BSMessage;
 import org.openhab.binding.enocean.internal.messages.ERP1Message;
 import org.openhab.core.config.core.Configuration;
+import org.openhab.core.library.types.OnOffType;
 import org.openhab.core.library.types.OpenClosedType;
+import org.openhab.core.types.Command;
 import org.openhab.core.types.State;
 import org.openhab.core.types.UnDefType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
@@ -33,6 +37,11 @@
 @NonNullByDefault
 public class D5_00_01 extends _1BSMessage {
 
+    @SuppressWarnings("null")
+    private final Logger logger = LoggerFactory.getLogger(D5_00_01.class);
+
+    private static final String CHANNEL_SWITCH = "switch";
+
     protected static final byte OPEN = 0 | TEACHIN_BIT;
     protected static final byte CLOSED = 1 | TEACHIN_BIT;
 
@@ -43,6 +52,22 @@ public D5_00_01(ERP1Message packet) {
         super(packet);
     }
 
+    @Override
+    protected void convertFromCommandImpl(String channelId, String channelTypeId, Command command,
+            Function<String, State> getCurrentStateFunc, @Nullable Configuration config) {
+        if (!channelId.equals(CHANNEL_SWITCH)) {
+            throw new IllegalArgumentException("Unsupported channel for D5_00_01 outbound command: " + channelId);
+        }
+
+        if (command instanceof OnOffType switchCommand) {
+            logger.debug("D5_00_01 outbound switch command: {}", switchCommand);
+            setData(switchCommand == OnOffType.ON ? CLOSED : OPEN);
+            return;
+        }
+
+        throw new IllegalArgumentException("Unsupported command for D5_00_01 outbound switch: " + command);
+    }
+
     @Override
     protected State convertToStateImpl(String channelId, String channelTypeId,
             Function<String, @Nullable State> getCurrentStateFunc, Configuration config) {