From 300ae3545759d6e08fa3273868f7deb4f72676b2 Mon Sep 17 00:00:00 2001
From: Laurens <43173895+GreenGrassBlueOcean@users.noreply.github.com>
Date: Fri, 9 Oct 2026 17:57:56 +0200
Subject: [PATCH 1/7] feat(cenplus): support WHO 25 Scenario Plus commands and
 events (OWNd#91)

---
 custom_components/myhome/const.py             |  3 +
 custom_components/myhome/gateway_events.py    | 44 ++++++++++++++
 custom_components/myhome/services.py          | 43 ++++++++++++++
 custom_components/myhome/services.yaml        | 32 ++++++++++
 custom_components/myhome/strings.json         | 18 ++++++
 custom_components/myhome/translations/en.json | 18 ++++++
 docs/configuration/cen_cenplus.md             |  6 ++
 docs/configuration/services.md                | 23 ++++++++
 tests/test_gateway.py                         | 59 +++++++++++++++++++
 tests/test_services.py                        | 56 ++++++++++++++++++
 10 files changed, 302 insertions(+)

diff --git a/custom_components/myhome/const.py b/custom_components/myhome/const.py
index 03ce4f445..b0f7c4dee 100644
--- a/custom_components/myhome/const.py
+++ b/custom_components/myhome/const.py
@@ -11,6 +11,8 @@
 
 ATTR_GATEWAY = "gateway"
 ATTR_MESSAGE = "message"
+ATTR_WHERE = "where"
+ATTR_ACTION = "action"
 INTEGRATION_VERSION = "2.0.0b15"
 # hass.data[DOMAIN] key holding the OWNd version resolved off the event loop
 DATA_OWND_VERSION = "_ownd_version"
@@ -107,6 +109,7 @@ def get_ownd_version() -> str:
 SERVICE_STOP_COVER_CALIBRATION = "stop_cover_calibration"
 SERVICE_SET_COVER_TRAVEL_TIME = "set_cover_travel_time"
 SERVICE_RESET_COVER_TRAVEL_TIME = "reset_cover_travel_time"
+SERVICE_SEND_SCENARIO_PLUS_COMMAND = "send_scenario_plus_command"
 EVENT_COVER_CALIBRATION = "myhome_cover_calibration"
 CALIBRATION_RUN_TIMEOUT = 180.0  # s to wait for the actuator's stop status per run
 CALIBRATION_MIN_RUN = 1.0        # s: anything shorter is not a full travel
diff --git a/custom_components/myhome/gateway_events.py b/custom_components/myhome/gateway_events.py
index f0de727e7..6cfd7bfe6 100644
--- a/custom_components/myhome/gateway_events.py
+++ b/custom_components/myhome/gateway_events.py
@@ -27,6 +27,12 @@
     OWNMessage,
 )
 
+try:  # OWNd > 2.0.0b10 (OpenWebNet-HA/OWNd#91)
+    from OWNd.message import OWNScenarioPlusEvent
+except ImportError:  # pragma: no cover - pinned OWNd 2.0.0b10 fallback
+    class OWNScenarioPlusEvent:  # type: ignore[no-redef]
+        pass
+
 from .const import (
     CONF_LONG_PRESS,
     CONF_LONG_PRESS_REPEAT,
@@ -420,6 +426,44 @@ async def process_message(self, message: Any) -> None:
                 self.handler.log_id,
                 message.human_readable_log,
             )
+        elif isinstance(message, OWNScenarioPlusEvent):
+            raw_obj = str(message.object)
+            clean_obj = raw_obj.split("#")[0]
+            try:
+                obj_val: int | str = int(clean_obj)
+            except (ValueError, TypeError):  # pragma: no cover - defensive
+                obj_val = raw_obj
+
+            target_mac: str | None = self.handler.mac
+            config_entry = getattr(self.handler, "config_entry", None)
+            target_entry_id = getattr(config_entry, "entry_id", None) if config_entry else None
+
+            if getattr(self.handler, "is_standby", False):
+                primary_gw = self.handler._get_primary_gateway()
+                if primary_gw is not None and not primary_gw.is_connected and self.handler._profile_supports_who(25):
+                    target_mac = primary_gw.mac
+                    pri_entry = getattr(primary_gw, "config_entry", None)
+                    target_entry_id = getattr(pri_entry, "entry_id", None) if pri_entry else None
+                else:
+                    target_mac = None
+
+            if target_mac is not None and self._is_active_for_who(25):
+                self.handler._ensure_cen_device(25, raw_obj)
+                scenarioplus_payload: dict[str, Any] = {
+                    "object": obj_val,
+                    "action": getattr(message, "action", None),
+                    "where": raw_obj,
+                    "gateway_mac": target_mac,
+                }
+                if target_entry_id and isinstance(target_entry_id, str):
+                    scenarioplus_payload["entry_id"] = target_entry_id
+                self.hass.bus.async_fire("myhome_scenario_plus_event", scenarioplus_payload)
+                dispatcher_send(self.hass, f"myhome_scenario_plus_event_{target_mac}", scenarioplus_payload)
+            self._logger.debug(
+                "%s %s",
+                self.handler.log_id,
+                message.human_readable_log,
+            )
         elif isinstance(message, OWNCENEvent):
             event = None
             if message.is_pressed:
diff --git a/custom_components/myhome/services.py b/custom_components/myhome/services.py
index 4d24be3dd..a6969e5d8 100644
--- a/custom_components/myhome/services.py
+++ b/custom_components/myhome/services.py
@@ -10,9 +10,12 @@
 from homeassistant.helpers import device_registry as dr
 
 from .const import (
+    ATTR_ACTION,
     ATTR_GATEWAY,
     ATTR_MESSAGE,
+    ATTR_WHERE,
     DOMAIN,
+    SERVICE_SEND_SCENARIO_PLUS_COMMAND,
     SERVICE_STOP_COVER_CALIBRATION,
 )
 from .data import get_runtime_data
@@ -207,7 +210,47 @@ async def handle_stop_cover_calibration(call: ServiceCall) -> None:
         gateway = call.data.get(ATTR_GATEWAY, None)
         await async_stop_cover_calibration(hass, gateway_mac=gateway)
 
+    async def handle_send_scenario_plus_command(call: ServiceCall) -> None:
+        """Handle sending a scenario plus command."""
+        where = call.data.get(ATTR_WHERE)
+        action = str(call.data.get(ATTR_ACTION, "")).lower()
+        gateway = call.data.get(ATTR_GATEWAY, None)
+        if gateway is not None:
+            gateway = dr.format_mac(gateway)
+        handler = _get_gateway_handler(hass, gateway)
+        if handler is None:
+            _LOGGER.error("Gateway `%s` not found for scenario plus command.", gateway)
+            return
+
+        if where is None:
+            _LOGGER.error("No where/object specified for scenario plus command.")
+            return
+
+        try:
+            from OWNd.message import OWNScenarioPlusCommand
+        except ImportError:  # pragma: no cover
+            _LOGGER.error("OWNd does not support scenario plus commands.")
+            return
+
+        cmd: OWNScenarioPlusCommand | None = None
+        if action == "on":
+            cmd = OWNScenarioPlusCommand.turn_on(where)
+        elif action == "off":
+            cmd = OWNScenarioPlusCommand.turn_off(where)
+        elif action == "increase":
+            cmd = OWNScenarioPlusCommand.increase(where)
+        elif action == "decrease":
+            cmd = OWNScenarioPlusCommand.decrease(where)
+        elif action == "stop":
+            cmd = OWNScenarioPlusCommand.stop(where)
+        else:
+            _LOGGER.error("Unknown scenario plus action `%s`.", action)
+            return
+
+        await handler.send(cmd)
+
     hass.services.async_register(DOMAIN, SERVICE_SYNC_TIME, handle_sync_time)
     hass.services.async_register(DOMAIN, SERVICE_SEND_MESSAGE, handle_send_message)
     hass.services.async_register(DOMAIN, SERVICE_SWEEP_BUS, handle_sweep_bus)
     hass.services.async_register(DOMAIN, SERVICE_STOP_COVER_CALIBRATION, handle_stop_cover_calibration)
+    hass.services.async_register(DOMAIN, SERVICE_SEND_SCENARIO_PLUS_COMMAND, handle_send_scenario_plus_command)
diff --git a/custom_components/myhome/services.yaml b/custom_components/myhome/services.yaml
index a09700078..eed5e233b 100644
--- a/custom_components/myhome/services.yaml
+++ b/custom_components/myhome/services.yaml
@@ -213,3 +213,35 @@ tuner_seek_down:
     entity:
       domain: media_player
       integration: myhome
+
+send_scenario_plus_command:
+  name: Send scenario plus command
+  description: Send a WHO 25 scenario plus command (on, off, increase, decrease, stop) to an addressed scenario plus object.
+  fields:
+    gateway:
+      name: Gateway
+      description: The gateway's MAC address (optional; defaults to primary gateway).
+      example: "00:03:50:00:00:01"
+      selector:
+        text:
+    where:
+      name: Where
+      description: The scenario plus object address on the bus.
+      required: true
+      example: "11"
+      selector:
+        text:
+    action:
+      name: Action
+      description: The scenario plus action to execute (on, off, increase, decrease, or stop).
+      required: true
+      example: "on"
+      selector:
+        select:
+          options:
+            - "on"
+            - "off"
+            - "increase"
+            - "decrease"
+            - "stop"
+
diff --git a/custom_components/myhome/strings.json b/custom_components/myhome/strings.json
index 2dc8abc0e..42850564a 100644
--- a/custom_components/myhome/strings.json
+++ b/custom_components/myhome/strings.json
@@ -325,6 +325,24 @@
     "tuner_seek_down": {
       "name": "Tuner seek down",
       "description": "Seek backward to the previous receivable FM radio frequency on an F500 tuner source."
+    },
+    "send_scenario_plus_command": {
+      "name": "Send scenario plus command",
+      "description": "Send a WHO 25 scenario plus command (on, off, increase, decrease, stop) to an addressed scenario plus object.",
+      "fields": {
+        "gateway": {
+          "name": "Gateway",
+          "description": "The gateway's MAC address (optional; defaults to primary gateway)."
+        },
+        "where": {
+          "name": "Where",
+          "description": "The scenario plus object address on the bus."
+        },
+        "action": {
+          "name": "Action",
+          "description": "The scenario plus action to execute (on, off, increase, decrease, or stop)."
+        }
+      }
     }
   },
   "issues": {
diff --git a/custom_components/myhome/translations/en.json b/custom_components/myhome/translations/en.json
index 2dc8abc0e..42850564a 100644
--- a/custom_components/myhome/translations/en.json
+++ b/custom_components/myhome/translations/en.json
@@ -325,6 +325,24 @@
     "tuner_seek_down": {
       "name": "Tuner seek down",
       "description": "Seek backward to the previous receivable FM radio frequency on an F500 tuner source."
+    },
+    "send_scenario_plus_command": {
+      "name": "Send scenario plus command",
+      "description": "Send a WHO 25 scenario plus command (on, off, increase, decrease, stop) to an addressed scenario plus object.",
+      "fields": {
+        "gateway": {
+          "name": "Gateway",
+          "description": "The gateway's MAC address (optional; defaults to primary gateway)."
+        },
+        "where": {
+          "name": "Where",
+          "description": "The scenario plus object address on the bus."
+        },
+        "action": {
+          "name": "Action",
+          "description": "The scenario plus action to execute (on, off, increase, decrease, or stop)."
+        }
+      }
     }
   },
   "issues": {
diff --git a/docs/configuration/cen_cenplus.md b/docs/configuration/cen_cenplus.md
index 77783eab1..9ace5159a 100644
--- a/docs/configuration/cen_cenplus.md
+++ b/docs/configuration/cen_cenplus.md
@@ -18,6 +18,7 @@ BTicino / Legrand pushbuttons operate in either **CEN** (`WHO = 15`) or **CEN+**
 | **Release Long Press** | `WHAT = 2` | `WHAT = 24` |
 | **Rotary Dials** | Supported via vendor extensions | Supported (CW/CCW slow & fast) |
 | **Dry Contact Status** | N/A | `WHAT = 31` (Closed), `WHAT = 32` (Opened) |
+| **Scenario Plus Actions** | N/A | `WHAT = 11..15` (`on`, `off`, `increase`, `decrease`, `stop`) |
 
 ---
 
@@ -180,3 +181,8 @@ Enabling **Generate Events** in the **Options Flow** additionally fires every bu
 | **CEN+ Start Long** | 25 | `*25*22#<BUTTON>*<WHERE>##` | `*25*22#1*21##` |
 | **CEN+ Still Held** (repeats ~0.5 s) | 25 | `*25*23#<BUTTON>*<WHERE>##` | `*25*23#1*21##` |
 | **CEN+ Release** | 25 | `*25*24#<BUTTON>*<WHERE>##` | `*25*24#1*21##` |
+| **Scenario Plus On** | 25 | `*25*11#0*<WHERE>##` | `*25*11#0*11##` |
+| **Scenario Plus Off** | 25 | `*25*12*<WHERE>##` | `*25*12*11##` |
+| **Scenario Plus Increase** | 25 | `*25*13#0#5*<WHERE>##` | `*25*13#0#5*11##` |
+| **Scenario Plus Decrease** | 25 | `*25*14#0#5*<WHERE>##` | `*25*14#0#5*11##` |
+| **Scenario Plus Stop** | 25 | `*25*15*<WHERE>##` | `*25*15*11##` |
diff --git a/docs/configuration/services.md b/docs/configuration/services.md
index 5691dc795..8511ac1ac 100644
--- a/docs/configuration/services.md
+++ b/docs/configuration/services.md
@@ -19,6 +19,7 @@ This document provides a comprehensive reference for all custom services registe
 | [`myhome.reset_cover_travel_time`](#9-myhomereset_cover_travel_time) | `cover` | Forget measured / manual travel times; back to YAML or the default. |
 | [`myhome.tuner_seek_up`](#10-myhometuner_seek_up) | `media_player` | Seek forward to the next receivable FM radio frequency on an F500 tuner. |
 | [`myhome.tuner_seek_down`](#11-myhometuner_seek_down) | `media_player` | Seek backward to the previous receivable FM radio frequency on an F500 tuner. |
+| [`myhome.send_scenario_plus_command`](#12-myhomesend_scenario_plus_command) | Gateway | Send a WHO 25 scenario plus command (on, off, increase, decrease, stop). |
 
 ---
 
@@ -250,3 +251,25 @@ action: myhome.tuner_seek_down
 target:
   entity_id: media_player.audio_source_1
 ```
+
+---
+
+## 12. `myhome.send_scenario_plus_command`
+
+Sends a WHO 25 scenario plus command (`on`, `off`, `increase`, `decrease`, or `stop`) to an addressed scenario plus object on the SCS bus.
+
+### Fields
+| Parameter | Type | Required | Description | Example |
+| :--- | :---: | :---: | :--- | :--- |
+| `gateway` | string | No | The MAC address of the target gateway (defaults to primary). | `"00:03:50:20:00:01"` |
+| `where` | string | **Yes** | The scenario plus object address on the bus. | `"11"` |
+| `action` | string | **Yes** | The scenario plus action (`on`, `off`, `increase`, `decrease`, `stop`). | `"on"` |
+
+### Example YAML Call
+```yaml
+action: myhome.send_scenario_plus_command
+data:
+  where: "11"
+  action: "on"
+```
+
diff --git a/tests/test_gateway.py b/tests/test_gateway.py
index 000a58bc2..22a4b98e8 100644
--- a/tests/test_gateway.py
+++ b/tests/test_gateway.py
@@ -24,6 +24,13 @@
     OWNLightingEvent,
     OWNMessage,
 )
+
+try:
+    from OWNd.message import OWNScenarioPlusEvent
+except ImportError:  # pragma: no cover
+    class OWNScenarioPlusEvent:  # type: ignore[no-redef]
+        pass
+
 from OWNd.profiles import GatewayProfile
 
 from custom_components.myhome.const import (
@@ -1262,6 +1269,58 @@ async def test_gateway_cenplus_event_and_auto_registration(gateway_handler: MyHO
                 }
 
 
+@pytest.mark.asyncio
+async def test_gateway_scenarioplus_event_and_auto_registration(gateway_handler: MyHOMEGatewayHandler):
+    """Test receiving OWNScenarioPlusEvent dispatches bus event and registers CEN+ scenario device."""
+    mock_dr = MagicMock()
+    mock_dr.async_get_device.return_value = None
+    gateway_handler.config_entry.entry_id = "test_entry_789"
+    gateway_handler.device_registry_id = "gateway_device_789"
+
+    scenarioplus_msg = MagicMock(spec=OWNScenarioPlusEvent)
+    scenarioplus_msg.object = "15"
+    scenarioplus_msg.action = "on"
+    scenarioplus_msg.human_readable_log = "Scenario plus 15: on."
+
+    with patch("custom_components.myhome.gateway.OWNEventSession") as mock_session_class:
+        mock_session = MagicMock()
+        mock_session.connect = AsyncMock(return_value={"Success": True})
+        mock_session.get_next = AsyncMock(side_effect=[scenarioplus_msg, asyncio.CancelledError()])
+        mock_session_class.return_value = mock_session
+
+        with patch("homeassistant.helpers.device_registry.async_get", return_value=mock_dr):
+            with patch.object(gateway_handler.hass.bus, "async_fire") as mock_fire:
+                try:
+                    await gateway_handler.listening_loop()
+                except asyncio.CancelledError:
+                    pass
+
+                # Check bus event fired
+                mock_fire.assert_called_once_with(
+                    "myhome_scenario_plus_event",
+                    {
+                        "object": 15,
+                        "action": "on",
+                        "where": "15",
+                        "gateway_mac": gateway_handler.mac,
+                        "entry_id": "test_entry_789",
+                    },
+                )
+
+                # Check device registry auto-registration
+                mock_dr.async_get_or_create.assert_called_once()
+                kwargs = mock_dr.async_get_or_create.call_args.kwargs
+                via = {k: kwargs.pop(k) for k in ("via_device", "via_device_id") if k in kwargs}
+                assert via == {"via_device_id": "gateway_device_789"}
+                assert kwargs == {
+                    "config_entry_id": "test_entry_789",
+                    "identifiers": {(DOMAIN, f"{gateway_handler.mac}-25-15")},
+                    "name": "CEN+ Unit 15",
+                    "manufacturer": "BTicino",
+                    "model": "CEN+ Scenario Control",
+                }
+
+
 @pytest.mark.asyncio
 async def test_sending_loop_waits_for_event_session(gateway_handler):
     command_connect_started = asyncio.Event()
diff --git a/tests/test_services.py b/tests/test_services.py
index acbe34a3a..e1fc95521 100644
--- a/tests/test_services.py
+++ b/tests/test_services.py
@@ -269,3 +269,59 @@ async def test_stop_cover_calibration_service_forwards_gateway(hass: HomeAssista
     with patch("custom_components.myhome.cover.async_stop_cover_calibration", AsyncMock(return_value=True)) as stop:
         await hass.services.async_call(DOMAIN, "stop_cover_calibration", {ATTR_GATEWAY: "00:03:50:aa:bb:cc"}, blocking=True)
     stop.assert_awaited_once_with(hass, gateway_mac="00:03:50:aa:bb:cc")
+
+
+async def test_send_scenario_plus_command_service(hass: HomeAssistant, attach_gateway) -> None:
+    """Test send_scenario_plus_command service sends expected frames for all actions."""
+    from unittest.mock import AsyncMock
+
+    await async_setup_services(hass)
+
+    mock_handler = MagicMock()
+    mock_handler.send = AsyncMock()
+    gw_mac = "00:03:50:aa:bb:cc"
+    attach_gateway(gw_mac, mock_handler)
+
+    expected_frames = {
+        "on": "*25*11#0*11##",
+        "off": "*25*12*11##",
+        "increase": "*25*13#0#5*11##",
+        "decrease": "*25*14#0#5*11##",
+        "stop": "*25*15*11##",
+    }
+
+    for action, expected_str in expected_frames.items():
+        mock_handler.send.reset_mock()
+        await hass.services.async_call(
+            DOMAIN,
+            "send_scenario_plus_command",
+            {"gateway": gw_mac, "where": "11", "action": action},
+            blocking=True,
+        )
+        assert mock_handler.send.call_count == 1
+        sent_cmd = mock_handler.send.call_args[0][0]
+        assert str(sent_cmd) == expected_str
+
+    mock_handler.send.reset_mock()
+    await hass.services.async_call(
+        DOMAIN,
+        "send_scenario_plus_command",
+        {"gateway": gw_mac, "where": "11", "action": "invalid"},
+        blocking=True,
+    )
+    mock_handler.send.assert_not_called()
+
+    await hass.services.async_call(
+        DOMAIN,
+        "send_scenario_plus_command",
+        {"gateway": "00:03:50:99:99:99", "where": "11", "action": "on"},
+        blocking=True,
+    )
+
+    await hass.services.async_call(
+        DOMAIN,
+        "send_scenario_plus_command",
+        {"gateway": gw_mac, "action": "on"},
+        blocking=True,
+    )
+

From 5e76e43e02044fdbfa28f88a62f6a223e59bdf91 Mon Sep 17 00:00:00 2001
From: Laurens <43173895+GreenGrassBlueOcean@users.noreply.github.com>
Date: Fri, 9 Oct 2026 19:50:18 +0200
Subject: [PATCH 2/7] fix(cenplus): provide string fallback for scenario plus
 commands and fix event fallback inheritance

---
 custom_components/myhome/gateway_events.py |  2 +-
 custom_components/myhome/services.py       | 53 +++++++++++++--------
 tests/test_gateway.py                      |  8 +---
 tests/test_services.py                     | 54 ++++++++++++++++++----
 4 files changed, 82 insertions(+), 35 deletions(-)

diff --git a/custom_components/myhome/gateway_events.py b/custom_components/myhome/gateway_events.py
index 6cfd7bfe6..fcdbf5dc9 100644
--- a/custom_components/myhome/gateway_events.py
+++ b/custom_components/myhome/gateway_events.py
@@ -30,7 +30,7 @@
 try:  # OWNd > 2.0.0b10 (OpenWebNet-HA/OWNd#91)
     from OWNd.message import OWNScenarioPlusEvent
 except ImportError:  # pragma: no cover - pinned OWNd 2.0.0b10 fallback
-    class OWNScenarioPlusEvent:  # type: ignore[no-redef]
+    class OWNScenarioPlusEvent(OWNMessage):  # type: ignore[no-redef]
         pass
 
 from .const import (
diff --git a/custom_components/myhome/services.py b/custom_components/myhome/services.py
index a6969e5d8..7fe804836 100644
--- a/custom_components/myhome/services.py
+++ b/custom_components/myhome/services.py
@@ -3,7 +3,7 @@
 
 import asyncio
 import logging
-from typing import TYPE_CHECKING, cast
+from typing import TYPE_CHECKING, Any, cast
 
 from homeassistant.const import CONF_MAC
 from homeassistant.core import HomeAssistant, ServiceCall
@@ -228,26 +228,41 @@ async def handle_send_scenario_plus_command(call: ServiceCall) -> None:
 
         try:
             from OWNd.message import OWNScenarioPlusCommand
-        except ImportError:  # pragma: no cover
-            _LOGGER.error("OWNd does not support scenario plus commands.")
-            return
-
-        cmd: OWNScenarioPlusCommand | None = None
-        if action == "on":
-            cmd = OWNScenarioPlusCommand.turn_on(where)
-        elif action == "off":
-            cmd = OWNScenarioPlusCommand.turn_off(where)
-        elif action == "increase":
-            cmd = OWNScenarioPlusCommand.increase(where)
-        elif action == "decrease":
-            cmd = OWNScenarioPlusCommand.decrease(where)
-        elif action == "stop":
-            cmd = OWNScenarioPlusCommand.stop(where)
+        except ImportError:  # pragma: no cover - fallback when OWNd unreleased
+            OWNScenarioPlusCommand = None  # type: ignore[assignment,misc]
+
+        cmd: Any = None
+        if OWNScenarioPlusCommand is not None:
+            if action == "on":
+                cmd = OWNScenarioPlusCommand.turn_on(where)
+            elif action == "off":
+                cmd = OWNScenarioPlusCommand.turn_off(where)
+            elif action == "increase":
+                cmd = OWNScenarioPlusCommand.increase(where)
+            elif action == "decrease":
+                cmd = OWNScenarioPlusCommand.decrease(where)
+            elif action == "stop":
+                cmd = OWNScenarioPlusCommand.stop(where)
+            else:
+                _LOGGER.error("Unknown scenario plus action `%s`.", action)
+                return
         else:
-            _LOGGER.error("Unknown scenario plus action `%s`.", action)
-            return
+            action_frames = {
+                "on": f"*25*11#0*{where}##",
+                "off": f"*25*12*{where}##",
+                "increase": f"*25*13#0#5*{where}##",
+                "decrease": f"*25*14#0#5*{where}##",
+                "stop": f"*25*15*{where}##",
+            }
+            if action not in action_frames:
+                _LOGGER.error("Unknown scenario plus action `%s`.", action)
+                return
+            from OWNd.message import OWNCommand
+
+            cmd = OWNCommand.parse(action_frames[action])
 
-        await handler.send(cmd)
+        if cmd is not None:
+            await handler.send(cmd)
 
     hass.services.async_register(DOMAIN, SERVICE_SYNC_TIME, handle_sync_time)
     hass.services.async_register(DOMAIN, SERVICE_SEND_MESSAGE, handle_send_message)
diff --git a/tests/test_gateway.py b/tests/test_gateway.py
index 22a4b98e8..1f6df84a3 100644
--- a/tests/test_gateway.py
+++ b/tests/test_gateway.py
@@ -24,13 +24,6 @@
     OWNLightingEvent,
     OWNMessage,
 )
-
-try:
-    from OWNd.message import OWNScenarioPlusEvent
-except ImportError:  # pragma: no cover
-    class OWNScenarioPlusEvent:  # type: ignore[no-redef]
-        pass
-
 from OWNd.profiles import GatewayProfile
 
 from custom_components.myhome.const import (
@@ -53,6 +46,7 @@ class OWNScenarioPlusEvent:  # type: ignore[no-redef]
     DOMAIN,
 )
 from custom_components.myhome.gateway import MyHOMEGatewayHandler
+from custom_components.myhome.gateway_events import OWNScenarioPlusEvent
 
 
 @pytest.fixture
diff --git a/tests/test_services.py b/tests/test_services.py
index e1fc95521..e93726e82 100644
--- a/tests/test_services.py
+++ b/tests/test_services.py
@@ -302,14 +302,51 @@ async def test_send_scenario_plus_command_service(hass: HomeAssistant, attach_ga
         sent_cmd = mock_handler.send.call_args[0][0]
         assert str(sent_cmd) == expected_str
 
-    mock_handler.send.reset_mock()
-    await hass.services.async_call(
-        DOMAIN,
-        "send_scenario_plus_command",
-        {"gateway": gw_mac, "where": "11", "action": "invalid"},
-        blocking=True,
-    )
-    mock_handler.send.assert_not_called()
+    # Verify typed OWNScenarioPlusCommand branch when present in OWNd
+    from unittest.mock import patch
+
+    class MockScenarioPlusCommand:
+        @classmethod
+        def turn_on(cls, where: str) -> str:
+            return f"*25*11#0*{where}##"
+
+        @classmethod
+        def turn_off(cls, where: str) -> str:
+            return f"*25*12*{where}##"
+
+        @classmethod
+        def increase(cls, where: str) -> str:
+            return f"*25*13#0#5*{where}##"
+
+        @classmethod
+        def decrease(cls, where: str) -> str:
+            return f"*25*14#0#5*{where}##"
+
+        @classmethod
+        def stop(cls, where: str) -> str:
+            return f"*25*15*{where}##"
+
+    with patch("OWNd.message.OWNScenarioPlusCommand", MockScenarioPlusCommand, create=True):
+        for action, expected_str in expected_frames.items():
+            mock_handler.send.reset_mock()
+            await hass.services.async_call(
+                DOMAIN,
+                "send_scenario_plus_command",
+                {"gateway": gw_mac, "where": "11", "action": action},
+                blocking=True,
+            )
+            assert mock_handler.send.call_count == 1
+            sent_cmd = mock_handler.send.call_args[0][0]
+            assert str(sent_cmd) == expected_str
+
+        mock_handler.send.reset_mock()
+        await hass.services.async_call(
+            DOMAIN,
+            "send_scenario_plus_command",
+            {"gateway": gw_mac, "where": "11", "action": "invalid"},
+            blocking=True,
+        )
+        mock_handler.send.assert_not_called()
 
     await hass.services.async_call(
         DOMAIN,
@@ -325,3 +362,4 @@ async def test_send_scenario_plus_command_service(hass: HomeAssistant, attach_ga
         blocking=True,
     )
 
+

From 4b2a809fddde5b1a934f377362db949fa48facce Mon Sep 17 00:00:00 2001
From: Laurens <43173895+GreenGrassBlueOcean@users.noreply.github.com>
Date: Fri, 9 Oct 2026 19:58:07 +0200
Subject: [PATCH 3/7] fix(typing): satisfy mypy --strict ratchet on
 gateway_events and services

---
 custom_components/myhome/gateway_events.py | 6 +++---
 custom_components/myhome/services.py       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/custom_components/myhome/gateway_events.py b/custom_components/myhome/gateway_events.py
index fcdbf5dc9..e6751c805 100644
--- a/custom_components/myhome/gateway_events.py
+++ b/custom_components/myhome/gateway_events.py
@@ -30,7 +30,7 @@
 try:  # OWNd > 2.0.0b10 (OpenWebNet-HA/OWNd#91)
     from OWNd.message import OWNScenarioPlusEvent
 except ImportError:  # pragma: no cover - pinned OWNd 2.0.0b10 fallback
-    class OWNScenarioPlusEvent(OWNMessage):  # type: ignore[no-redef]
+    class OWNScenarioPlusEvent(OWNMessage):  # type: ignore[misc,no-redef]
         pass
 
 from .const import (
@@ -430,11 +430,11 @@ async def process_message(self, message: Any) -> None:
             raw_obj = str(message.object)
             clean_obj = raw_obj.split("#")[0]
             try:
-                obj_val: int | str = int(clean_obj)
+                obj_val = int(clean_obj)
             except (ValueError, TypeError):  # pragma: no cover - defensive
                 obj_val = raw_obj
 
-            target_mac: str | None = self.handler.mac
+            target_mac = self.handler.mac
             config_entry = getattr(self.handler, "config_entry", None)
             target_entry_id = getattr(config_entry, "entry_id", None) if config_entry else None
 
diff --git a/custom_components/myhome/services.py b/custom_components/myhome/services.py
index 7fe804836..d0c923303 100644
--- a/custom_components/myhome/services.py
+++ b/custom_components/myhome/services.py
@@ -229,7 +229,7 @@ async def handle_send_scenario_plus_command(call: ServiceCall) -> None:
         try:
             from OWNd.message import OWNScenarioPlusCommand
         except ImportError:  # pragma: no cover - fallback when OWNd unreleased
-            OWNScenarioPlusCommand = None  # type: ignore[assignment,misc]
+            OWNScenarioPlusCommand = None
 
         cmd: Any = None
         if OWNScenarioPlusCommand is not None:

From 4e3e5b8274baecf34e739743ba2ef39d52d9748e Mon Sep 17 00:00:00 2001
From: Laurens <43173895+GreenGrassBlueOcean@users.noreply.github.com>
Date: Fri, 9 Oct 2026 20:08:54 +0200
Subject: [PATCH 4/7] test(cenplus): test scenario plus event failover bridging
 and standby suppression on who25

---
 tests/test_multi_gateway.py | 67 +++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/tests/test_multi_gateway.py b/tests/test_multi_gateway.py
index 89a70e459..22bbf60db 100644
--- a/tests/test_multi_gateway.py
+++ b/tests/test_multi_gateway.py
@@ -1447,6 +1447,73 @@ def _on_dispatched(payload: Any) -> None:
     unsub_disp()
 
 
+@pytest.mark.asyncio
+async def test_standby_failover_scenarioplus_event_bridged_to_primary(hass: HomeAssistant) -> None:
+    """Test that Scenario Plus events on standby during failover are bridged with primary MAC and entry ID (#459)."""
+    from homeassistant.core import callback
+    from homeassistant.helpers.dispatcher import async_dispatcher_connect
+
+    from custom_components.myhome.gateway_events import OWNScenarioPlusEvent
+
+    entry_pri, gw_pri = _create_mock_gateway(
+        hass, "00:03:50:aa:bb:01", topology=TOPOLOGY_SHARED, role=ROLE_PRIMARY
+    )
+    entry_sb, gw_sb = _create_mock_gateway(
+        hass,
+        "00:03:50:aa:bb:02",
+        topology=TOPOLOGY_SHARED,
+        role=ROLE_STANDBY,
+        primary_gateway="00:03:50:aa:bb:01",
+    )
+
+    gw_pri.is_connected = False
+    gw_pri._available = False
+    gw_sb.is_connected = True
+    gw_sb._available = True
+
+    sp_events = []
+    dispatched_events = []
+
+    @callback
+    def _on_sp_event(e: Any) -> None:
+        sp_events.append(e)
+
+    @callback
+    def _on_dispatched(payload: Any) -> None:
+        dispatched_events.append(payload)
+
+    unsub_bus = hass.bus.async_listen("myhome_scenario_plus_event", _on_sp_event)
+    unsub_disp = async_dispatcher_connect(
+        hass,
+        f"myhome_scenario_plus_event_{gw_pri.mac}",
+        _on_dispatched,
+    )
+
+    msg = MagicMock(spec=OWNScenarioPlusEvent)
+    msg.object = "12"
+    msg.action = "on"
+    msg.human_readable_log = "Scenario plus 12: on."
+    await gw_sb._process_message(msg)
+
+    assert len(sp_events) == 1
+    assert sp_events[0].data["gateway_mac"] == gw_pri.mac
+    assert sp_events[0].data["entry_id"] == entry_pri.entry_id
+    assert sp_events[0].data["object"] == 12
+    assert sp_events[0].data["action"] == "on"
+
+    assert len(dispatched_events) == 1
+    assert dispatched_events[0]["gateway_mac"] == gw_pri.mac
+    assert dispatched_events[0]["entry_id"] == entry_pri.entry_id
+
+    # If primary recovers, standby Scenario Plus events are suppressed (not bridged)
+    gw_pri.is_connected = True
+    await gw_sb._process_message(msg)
+    assert len(sp_events) == 1
+
+    unsub_bus()
+    unsub_disp()
+
+
 @pytest.mark.asyncio
 async def test_secondary_gateway_event_delegation_filtering(hass: HomeAssistant) -> None:
     """Test that secondary gateway only processes events for its delegated WHOs (#459)."""

From c55fa8b1eee542a1130f782f95d1c460aad7cf33 Mon Sep 17 00:00:00 2001
From: Laurens <43173895+GreenGrassBlueOcean@users.noreply.github.com>
Date: Fri, 9 Oct 2026 20:15:34 +0200
Subject: [PATCH 5/7] test(services): add test coverage for invalid action on
 fallback scenario plus command

---
 tests/test_services.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/test_services.py b/tests/test_services.py
index e93726e82..481409ff9 100644
--- a/tests/test_services.py
+++ b/tests/test_services.py
@@ -302,6 +302,15 @@ async def test_send_scenario_plus_command_service(hass: HomeAssistant, attach_ga
         sent_cmd = mock_handler.send.call_args[0][0]
         assert str(sent_cmd) == expected_str
 
+    mock_handler.send.reset_mock()
+    await hass.services.async_call(
+        DOMAIN,
+        "send_scenario_plus_command",
+        {"gateway": gw_mac, "where": "11", "action": "invalid_fallback"},
+        blocking=True,
+    )
+    mock_handler.send.assert_not_called()
+
     # Verify typed OWNScenarioPlusCommand branch when present in OWNd
     from unittest.mock import patch
 

From f25659c12da8a9213fccef3c9c98c4c1a68957ca Mon Sep 17 00:00:00 2001
From: Laurens <43173895+GreenGrassBlueOcean@users.noreply.github.com>
Date: Fri, 9 Oct 2026 20:44:58 +0200
Subject: [PATCH 6/7] fix(services): raise ServiceValidationError on invalid
 scenario plus calls and add exception translations

---
 custom_components/myhome/gateway_events.py    |  4 +-
 custom_components/myhome/services.py          | 57 +++++++++----
 custom_components/myhome/strings.json         | 15 ++++
 custom_components/myhome/translations/en.json | 15 ++++
 tests/test_services.py                        | 85 ++++++++++++++-----
 5 files changed, 139 insertions(+), 37 deletions(-)

diff --git a/custom_components/myhome/gateway_events.py b/custom_components/myhome/gateway_events.py
index e6751c805..469c2278b 100644
--- a/custom_components/myhome/gateway_events.py
+++ b/custom_components/myhome/gateway_events.py
@@ -427,7 +427,9 @@ async def process_message(self, message: Any) -> None:
                 message.human_readable_log,
             )
         elif isinstance(message, OWNScenarioPlusEvent):
-            raw_obj = str(message.object)
+            raw_obj = str(message.object) if getattr(message, "object", None) is not None else ""
+            if not raw_obj and getattr(message, "where", None) is not None:  # pragma: no cover - defensive
+                raw_obj = str(message.where)
             clean_obj = raw_obj.split("#")[0]
             try:
                 obj_val = int(clean_obj)
diff --git a/custom_components/myhome/services.py b/custom_components/myhome/services.py
index d0c923303..e8c4877f6 100644
--- a/custom_components/myhome/services.py
+++ b/custom_components/myhome/services.py
@@ -7,6 +7,7 @@
 
 from homeassistant.const import CONF_MAC
 from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import device_registry as dr
 
 from .const import (
@@ -212,19 +213,42 @@ async def handle_stop_cover_calibration(call: ServiceCall) -> None:
 
     async def handle_send_scenario_plus_command(call: ServiceCall) -> None:
         """Handle sending a scenario plus command."""
-        where = call.data.get(ATTR_WHERE)
-        action = str(call.data.get(ATTR_ACTION, "")).lower()
         gateway = call.data.get(ATTR_GATEWAY, None)
         if gateway is not None:
             gateway = dr.format_mac(gateway)
         handler = _get_gateway_handler(hass, gateway)
         if handler is None:
-            _LOGGER.error("Gateway `%s` not found for scenario plus command.", gateway)
-            return
-
-        if where is None:
-            _LOGGER.error("No where/object specified for scenario plus command.")
-            return
+            if gateway is not None:
+                raise ServiceValidationError(
+                    f"Gateway '{gateway}' not found for scenario plus command",
+                    translation_domain=DOMAIN,
+                    translation_key="scenario_plus_gateway_not_found",
+                    translation_placeholders={"gateway": str(gateway)},
+                )
+            raise ServiceValidationError(
+                "No active MyHOME gateways found",
+                translation_domain=DOMAIN,
+                translation_key="scenario_plus_no_gateway",
+            )
+
+        where_raw = call.data.get(ATTR_WHERE)
+        if where_raw is None or not str(where_raw).strip():
+            raise ServiceValidationError(
+                "No where/object specified for scenario plus command",
+                translation_domain=DOMAIN,
+                translation_key="scenario_plus_missing_where",
+            )
+        where = str(where_raw).strip()
+
+        action = str(call.data.get(ATTR_ACTION, "")).lower().strip()
+        allowed_actions = ("on", "off", "increase", "decrease", "stop")
+        if action not in allowed_actions:
+            raise ServiceValidationError(
+                f"Unknown scenario plus action '{action}'",
+                translation_domain=DOMAIN,
+                translation_key="scenario_plus_unknown_action",
+                translation_placeholders={"action": action},
+            )
 
         try:
             from OWNd.message import OWNScenarioPlusCommand
@@ -243,9 +267,6 @@ async def handle_send_scenario_plus_command(call: ServiceCall) -> None:
                 cmd = OWNScenarioPlusCommand.decrease(where)
             elif action == "stop":
                 cmd = OWNScenarioPlusCommand.stop(where)
-            else:
-                _LOGGER.error("Unknown scenario plus action `%s`.", action)
-                return
         else:
             action_frames = {
                 "on": f"*25*11#0*{where}##",
@@ -254,15 +275,19 @@ async def handle_send_scenario_plus_command(call: ServiceCall) -> None:
                 "decrease": f"*25*14#0#5*{where}##",
                 "stop": f"*25*15*{where}##",
             }
-            if action not in action_frames:
-                _LOGGER.error("Unknown scenario plus action `%s`.", action)
-                return
             from OWNd.message import OWNCommand
 
             cmd = OWNCommand.parse(action_frames[action])
 
-        if cmd is not None:
-            await handler.send(cmd)
+        if cmd is None:
+            raise ServiceValidationError(
+                f"Could not build scenario plus command for where '{where}' and action '{action}'",
+                translation_domain=DOMAIN,
+                translation_key="scenario_plus_command_invalid",
+                translation_placeholders={"where": where, "action": action},
+            )
+
+        await handler.send(cmd)
 
     hass.services.async_register(DOMAIN, SERVICE_SYNC_TIME, handle_sync_time)
     hass.services.async_register(DOMAIN, SERVICE_SEND_MESSAGE, handle_send_message)
diff --git a/custom_components/myhome/strings.json b/custom_components/myhome/strings.json
index 42850564a..5215bd2fc 100644
--- a/custom_components/myhome/strings.json
+++ b/custom_components/myhome/strings.json
@@ -522,6 +522,21 @@
     },
     "seek_not_supported": {
       "message": "{entity_id}: seek is only supported on tuner source entities"
+    },
+    "scenario_plus_gateway_not_found": {
+      "message": "Gateway \"{gateway}\" not found for scenario plus command"
+    },
+    "scenario_plus_no_gateway": {
+      "message": "No active MyHOME gateways found"
+    },
+    "scenario_plus_missing_where": {
+      "message": "No where/object specified for scenario plus command"
+    },
+    "scenario_plus_unknown_action": {
+      "message": "Unknown scenario plus action \"{action}\""
+    },
+    "scenario_plus_command_invalid": {
+      "message": "Could not build scenario plus command for where \"{where}\" and action \"{action}\""
     }
   },
   "entity": {
diff --git a/custom_components/myhome/translations/en.json b/custom_components/myhome/translations/en.json
index 42850564a..5215bd2fc 100644
--- a/custom_components/myhome/translations/en.json
+++ b/custom_components/myhome/translations/en.json
@@ -522,6 +522,21 @@
     },
     "seek_not_supported": {
       "message": "{entity_id}: seek is only supported on tuner source entities"
+    },
+    "scenario_plus_gateway_not_found": {
+      "message": "Gateway \"{gateway}\" not found for scenario plus command"
+    },
+    "scenario_plus_no_gateway": {
+      "message": "No active MyHOME gateways found"
+    },
+    "scenario_plus_missing_where": {
+      "message": "No where/object specified for scenario plus command"
+    },
+    "scenario_plus_unknown_action": {
+      "message": "Unknown scenario plus action \"{action}\""
+    },
+    "scenario_plus_command_invalid": {
+      "message": "Could not build scenario plus command for where \"{where}\" and action \"{action}\""
     }
   },
   "entity": {
diff --git a/tests/test_services.py b/tests/test_services.py
index 481409ff9..45598305d 100644
--- a/tests/test_services.py
+++ b/tests/test_services.py
@@ -1,7 +1,9 @@
 """Test services module directly."""
 from unittest.mock import MagicMock
 
+import pytest
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ServiceValidationError
 
 from custom_components.myhome.const import (
     ATTR_GATEWAY,
@@ -303,12 +305,14 @@ async def test_send_scenario_plus_command_service(hass: HomeAssistant, attach_ga
         assert str(sent_cmd) == expected_str
 
     mock_handler.send.reset_mock()
-    await hass.services.async_call(
-        DOMAIN,
-        "send_scenario_plus_command",
-        {"gateway": gw_mac, "where": "11", "action": "invalid_fallback"},
-        blocking=True,
-    )
+    with pytest.raises(ServiceValidationError) as exc_fallback:
+        await hass.services.async_call(
+            DOMAIN,
+            "send_scenario_plus_command",
+            {"gateway": gw_mac, "where": "11", "action": "invalid_fallback"},
+            blocking=True,
+        )
+    assert exc_fallback.value.translation_key == "scenario_plus_unknown_action"
     mock_handler.send.assert_not_called()
 
     # Verify typed OWNScenarioPlusCommand branch when present in OWNd
@@ -349,26 +353,67 @@ def stop(cls, where: str) -> str:
             assert str(sent_cmd) == expected_str
 
         mock_handler.send.reset_mock()
+        with pytest.raises(ServiceValidationError) as exc_typed:
+            await hass.services.async_call(
+                DOMAIN,
+                "send_scenario_plus_command",
+                {"gateway": gw_mac, "where": "11", "action": "invalid"},
+                blocking=True,
+            )
+        assert exc_typed.value.translation_key == "scenario_plus_unknown_action"
+        mock_handler.send.assert_not_called()
+
+    with pytest.raises(ServiceValidationError) as exc_gw:
         await hass.services.async_call(
             DOMAIN,
             "send_scenario_plus_command",
-            {"gateway": gw_mac, "where": "11", "action": "invalid"},
+            {"gateway": "00:03:50:99:99:99", "where": "11", "action": "on"},
             blocking=True,
         )
-        mock_handler.send.assert_not_called()
+    assert exc_gw.value.translation_key == "scenario_plus_gateway_not_found"
 
-    await hass.services.async_call(
-        DOMAIN,
-        "send_scenario_plus_command",
-        {"gateway": "00:03:50:99:99:99", "where": "11", "action": "on"},
-        blocking=True,
-    )
+    with pytest.raises(ServiceValidationError) as exc_where:
+        await hass.services.async_call(
+            DOMAIN,
+            "send_scenario_plus_command",
+            {"gateway": gw_mac, "action": "on"},
+            blocking=True,
+        )
+    assert exc_where.value.translation_key == "scenario_plus_missing_where"
 
-    await hass.services.async_call(
-        DOMAIN,
-        "send_scenario_plus_command",
-        {"gateway": gw_mac, "action": "on"},
-        blocking=True,
-    )
+    with pytest.raises(ServiceValidationError) as exc_blank:
+        await hass.services.async_call(
+            DOMAIN,
+            "send_scenario_plus_command",
+            {"gateway": gw_mac, "where": "   ", "action": "on"},
+            blocking=True,
+        )
+    assert exc_blank.value.translation_key == "scenario_plus_missing_where"
+
+    # Command parse failure in fallback branch
+    with patch("OWNd.message.OWNScenarioPlusCommand", None, create=True), \
+         patch("OWNd.message.OWNCommand.parse", return_value=None):
+        with pytest.raises(ServiceValidationError) as exc_parse:
+            await hass.services.async_call(
+                DOMAIN,
+                "send_scenario_plus_command",
+                {"gateway": gw_mac, "where": "11", "action": "on"},
+                blocking=True,
+            )
+        assert exc_parse.value.translation_key == "scenario_plus_command_invalid"
+
+
+async def test_send_scenario_plus_command_no_gateways(hass: HomeAssistant) -> None:
+    """Test send_scenario_plus_command raises ServiceValidationError when no gateways are configured."""
+    await async_setup_services(hass)
+
+    with pytest.raises(ServiceValidationError) as exc_no_gw:
+        await hass.services.async_call(
+            DOMAIN,
+            "send_scenario_plus_command",
+            {"where": "11", "action": "on"},
+            blocking=True,
+        )
+    assert exc_no_gw.value.translation_key == "scenario_plus_no_gateway"
 
 

From ed293ed7ee5476dd5a2539c2a350455593d5a88c Mon Sep 17 00:00:00 2001
From: Laurens <43173895+GreenGrassBlueOcean@users.noreply.github.com>
Date: Fri, 9 Oct 2026 21:43:13 +0200
Subject: [PATCH 7/7] fix(cenplus): address PR review nits on naming,
 documentation, and error tests

---
 custom_components/myhome/gateway.py           |  4 ++--
 custom_components/myhome/gateway_events.py    | 12 +++++++++---
 custom_components/myhome/services.py          |  2 +-
 custom_components/myhome/services.yaml        |  2 +-
 custom_components/myhome/strings.json         |  2 +-
 custom_components/myhome/translations/en.json |  2 +-
 docs/configuration/services.md                |  5 ++++-
 tests/test_gateway.py                         |  2 +-
 tests/test_services.py                        |  4 ++++
 9 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/custom_components/myhome/gateway.py b/custom_components/myhome/gateway.py
index f2e454d29..977109960 100644
--- a/custom_components/myhome/gateway.py
+++ b/custom_components/myhome/gateway.py
@@ -314,9 +314,9 @@ def _event_session_ready(self) -> asyncio.Event:
         """Event set when the event session is established."""
         return self._event_runner._event_session_ready
 
-    def _ensure_cen_device(self, who: int, object_id: int | str) -> None:
+    def _ensure_cen_device(self, who: int, object_id: int | str, model: str | None = None) -> None:
         """Ensure CEN/CEN+ scenario unit is registered in device registry."""
-        self._event_dispatcher.ensure_cen_device(who, object_id)
+        self._event_dispatcher.ensure_cen_device(who, object_id, model=model)
 
     @property
     def identification_source(self) -> str:
diff --git a/custom_components/myhome/gateway_events.py b/custom_components/myhome/gateway_events.py
index 469c2278b..14ce79309 100644
--- a/custom_components/myhome/gateway_events.py
+++ b/custom_components/myhome/gateway_events.py
@@ -81,7 +81,12 @@ def cen_devices(self) -> set[tuple[int, Any]]:
         """Return the registered CEN device set."""
         return self._cen_devices
 
-    def ensure_cen_device(self, who: int, object_id: int | str) -> None:
+    def ensure_cen_device(
+        self,
+        who: int,
+        object_id: int | str,
+        model: str | None = None,
+    ) -> None:
         """Ensure CEN/CEN+ scenario unit is registered in device registry."""
         if getattr(self.handler, "is_standby", False) or not self._is_active_for_who(who):
             # Standby gateways never register devices on their own config entry,
@@ -147,7 +152,7 @@ def ensure_cen_device(self, who: int, object_id: int | str) -> None:
                 identifiers=identifiers,
                 name=dev_name,
                 manufacturer="BTicino",
-                model=f"{type_name} Scenario Control",
+                model=model or f"{type_name} Scenario Control",
                 **via_kwargs,
             )
             self._cen_devices.add(device_key)
@@ -450,7 +455,8 @@ async def process_message(self, message: Any) -> None:
                     target_mac = None
 
             if target_mac is not None and self._is_active_for_who(25):
-                self.handler._ensure_cen_device(25, raw_obj)
+                if raw_obj:
+                    self.handler._ensure_cen_device(25, raw_obj, model="CEN+ Scenario Plus Control")
                 scenarioplus_payload: dict[str, Any] = {
                     "object": obj_val,
                     "action": getattr(message, "action", None),
diff --git a/custom_components/myhome/services.py b/custom_components/myhome/services.py
index e8c4877f6..208a783b3 100644
--- a/custom_components/myhome/services.py
+++ b/custom_components/myhome/services.py
@@ -240,7 +240,7 @@ async def handle_send_scenario_plus_command(call: ServiceCall) -> None:
             )
         where = str(where_raw).strip()
 
-        action = str(call.data.get(ATTR_ACTION, "")).lower().strip()
+        action = str(call.data.get(ATTR_ACTION) or "").lower().strip()
         allowed_actions = ("on", "off", "increase", "decrease", "stop")
         if action not in allowed_actions:
             raise ServiceValidationError(
diff --git a/custom_components/myhome/services.yaml b/custom_components/myhome/services.yaml
index eed5e233b..ac84851b4 100644
--- a/custom_components/myhome/services.yaml
+++ b/custom_components/myhome/services.yaml
@@ -233,7 +233,7 @@ send_scenario_plus_command:
         text:
     action:
       name: Action
-      description: The scenario plus action to execute (on, off, increase, decrease, or stop).
+      description: The scenario plus action to execute (on, off, increase, decrease, or stop; step/speed for increase/decrease is fixed per protocol).
       required: true
       example: "on"
       selector:
diff --git a/custom_components/myhome/strings.json b/custom_components/myhome/strings.json
index 5215bd2fc..6d4054314 100644
--- a/custom_components/myhome/strings.json
+++ b/custom_components/myhome/strings.json
@@ -340,7 +340,7 @@
         },
         "action": {
           "name": "Action",
-          "description": "The scenario plus action to execute (on, off, increase, decrease, or stop)."
+          "description": "The scenario plus action to execute (on, off, increase, decrease, or stop; step/speed for increase/decrease is fixed per protocol)."
         }
       }
     }
diff --git a/custom_components/myhome/translations/en.json b/custom_components/myhome/translations/en.json
index 5215bd2fc..6d4054314 100644
--- a/custom_components/myhome/translations/en.json
+++ b/custom_components/myhome/translations/en.json
@@ -340,7 +340,7 @@
         },
         "action": {
           "name": "Action",
-          "description": "The scenario plus action to execute (on, off, increase, decrease, or stop)."
+          "description": "The scenario plus action to execute (on, off, increase, decrease, or stop; step/speed for increase/decrease is fixed per protocol)."
         }
       }
     }
diff --git a/docs/configuration/services.md b/docs/configuration/services.md
index 8511ac1ac..11695944b 100644
--- a/docs/configuration/services.md
+++ b/docs/configuration/services.md
@@ -258,12 +258,15 @@ target:
 
 Sends a WHO 25 scenario plus command (`on`, `off`, `increase`, `decrease`, or `stop`) to an addressed scenario plus object on the SCS bus.
 
+> [!NOTE]
+> For `increase` and `decrease` actions, step and speed parameters are fixed to standard Legrand protocol defaults (`#0#5`, as confirmed by physical gateway traces); they are not user-configurable in this service.
+
 ### Fields
 | Parameter | Type | Required | Description | Example |
 | :--- | :---: | :---: | :--- | :--- |
 | `gateway` | string | No | The MAC address of the target gateway (defaults to primary). | `"00:03:50:20:00:01"` |
 | `where` | string | **Yes** | The scenario plus object address on the bus. | `"11"` |
-| `action` | string | **Yes** | The scenario plus action (`on`, `off`, `increase`, `decrease`, `stop`). | `"on"` |
+| `action` | string | **Yes** | The scenario plus action (`on`, `off`, `increase`, `decrease`, `stop`). Step and speed for `increase`/`decrease` are fixed to standard defaults (`#0#5`). | `"on"` |
 
 ### Example YAML Call
 ```yaml
diff --git a/tests/test_gateway.py b/tests/test_gateway.py
index 1f6df84a3..f88f833cf 100644
--- a/tests/test_gateway.py
+++ b/tests/test_gateway.py
@@ -1311,7 +1311,7 @@ async def test_gateway_scenarioplus_event_and_auto_registration(gateway_handler:
                     "identifiers": {(DOMAIN, f"{gateway_handler.mac}-25-15")},
                     "name": "CEN+ Unit 15",
                     "manufacturer": "BTicino",
-                    "model": "CEN+ Scenario Control",
+                    "model": "CEN+ Scenario Plus Control",
                 }
 
 
diff --git a/tests/test_services.py b/tests/test_services.py
index 45598305d..d92dcc9e2 100644
--- a/tests/test_services.py
+++ b/tests/test_services.py
@@ -313,6 +313,7 @@ async def test_send_scenario_plus_command_service(hass: HomeAssistant, attach_ga
             blocking=True,
         )
     assert exc_fallback.value.translation_key == "scenario_plus_unknown_action"
+    assert exc_fallback.value.translation_placeholders == {"action": "invalid_fallback"}
     mock_handler.send.assert_not_called()
 
     # Verify typed OWNScenarioPlusCommand branch when present in OWNd
@@ -361,6 +362,7 @@ def stop(cls, where: str) -> str:
                 blocking=True,
             )
         assert exc_typed.value.translation_key == "scenario_plus_unknown_action"
+        assert exc_typed.value.translation_placeholders == {"action": "invalid"}
         mock_handler.send.assert_not_called()
 
     with pytest.raises(ServiceValidationError) as exc_gw:
@@ -371,6 +373,7 @@ def stop(cls, where: str) -> str:
             blocking=True,
         )
     assert exc_gw.value.translation_key == "scenario_plus_gateway_not_found"
+    assert exc_gw.value.translation_placeholders == {"gateway": "00:03:50:99:99:99"}
 
     with pytest.raises(ServiceValidationError) as exc_where:
         await hass.services.async_call(
@@ -401,6 +404,7 @@ def stop(cls, where: str) -> str:
                 blocking=True,
             )
         assert exc_parse.value.translation_key == "scenario_plus_command_invalid"
+        assert exc_parse.value.translation_placeholders == {"where": "11", "action": "on"}
 
 
 async def test_send_scenario_plus_command_no_gateways(hass: HomeAssistant) -> None: