Обновить custom_components/motion_light/coordinator.py

custom_components/motion_light/const.py

@@ -46,5 +46,6 @@ STATE_ACTIVE = "active"
 STATE_OFF = "off"
 STATE_MANUAL_ON = "manual_on"
 STATE_MANUAL_OFF_COOLDOWN = "manual_off_cooldown"
+STATE_FORCE_STOPPED = "force_stopped" 
 STATE_ERROR = "error"
 STATE_DISABLED = "disabled"

custom_components/motion_light/coordinator.py

@@ -28,6 +28,7 @@ from .const import (
     STATE_OFF,
     STATE_MANUAL_ON,
     STATE_MANUAL_OFF_COOLDOWN,
+    STATE_FORCE_STOPPED,
     STATE_ERROR,
     STATE_DISABLED,
 )
@@ -110,6 +111,9 @@ class MotionLightCoordinator(DataUpdateCoordinator):
         attrs["main_sensors"] = self.main_sensors
         attrs["extend_sensors"] = self.extend_sensors
         attrs["lux_sensor"] = self.lux_sensor
+        attrs["force_stop_sensor"] = self.force_stop_sensor
+        attrs["force_stop_state"] = self.force_stop_state
+        attrs["force_stop_active"] = self._state == STATE_FORCE_STOPPED
         attrs["active_main_sensors"] = self._get_active_main_sensors()
         attrs["active_extend_sensors"] = self._get_active_extend_sensors()
         attrs["lux_value"] = self._get_current_lux()
@@ -154,8 +158,6 @@ class MotionLightCoordinator(DataUpdateCoordinator):
     def set_manual_idle_timeout(self, value: float) -> None:
         self.manual_idle_timeout = int(value)
         self.logger.info("Manual idle timeout set to %d sec", self.manual_idle_timeout)
-        
-        # Если таймер уже тикает, а мы изменили значение на 0, нужно его отменить
         if self.manual_idle_timeout <= 0 and self._manual_idle_timer:
             self.logger.info("Manual idle timeout set to 0, cancelling active timer")
             self._manual_idle_timer()
@@ -175,6 +177,15 @@ class MotionLightCoordinator(DataUpdateCoordinator):
         self.logger.info("Switches: %s, Main sensors: %s, Extend sensors: %s, Lux: %s",
                          self.switch_entities, self.main_sensors, self.extend_sensors, self.lux_sensor)
         
+        # Проверяем состояние force_stop_sensor при старте
+        if self.force_stop_sensor:
+            force_stop_state_obj = self.hass.states.get(self.force_stop_sensor)
+            if force_stop_state_obj and force_stop_state_obj.state == self.force_stop_state:
+                self.logger.info("Force stop sensor is already in stop state at startup")
+                await self._update_state(STATE_FORCE_STOPPED)
+                await self._start_listening()
+                return
+
         any_on = any(
             self.hass.states.get(s) and self.hass.states.get(s).state == "on"
             for s in self.switch_entities
@@ -294,6 +305,11 @@ class MotionLightCoordinator(DataUpdateCoordinator):
             self.logger.debug("Integration disabled, ignoring")
             return
 
+        # БЛОКИРОВЩИК: Игнорируем движение, если активна принудительная остановка
+        if self._state == STATE_FORCE_STOPPED:
+            self.logger.debug("Ignoring during force_stopped")
+            return
+
         self.logger.debug("Main sensor ON by %s, current state: %s", triggered_by, self._state)
 
         if self._state == STATE_MANUAL_OFF_COOLDOWN:
@@ -302,7 +318,6 @@ class MotionLightCoordinator(DataUpdateCoordinator):
 
         if self._state == STATE_MANUAL_ON:
             self.logger.debug("During manual_on, resetting idle timer")
-            # ИЗМЕНЕНИЕ: Сбрасываем таймер только если он включен (>0)
             if self.manual_idle_timeout > 0:
                 self._reset_manual_idle_timer()
             return
@@ -394,6 +409,11 @@ class MotionLightCoordinator(DataUpdateCoordinator):
             self.logger.debug("Integration disabled, ignoring")
             return
 
+        # БЛОКИРОВЩИК: Игнорируем движение, если активна принудительная остановка
+        if self._state == STATE_FORCE_STOPPED:
+            self.logger.debug("Ignoring during force_stopped")
+            return
+
         self.logger.debug("Extend sensor ON by %s, current state: %s", triggered_by, self._state)
 
         if self._state == STATE_IDLE:
@@ -406,7 +426,6 @@ class MotionLightCoordinator(DataUpdateCoordinator):
 
         if self._state == STATE_MANUAL_ON:
             self.logger.debug("During manual_on, resetting idle timer")
-            # ИЗМЕНЕНИЕ: Сбрасываем таймер только если он включен (>0)
             if self.manual_idle_timeout > 0:
                 self._reset_manual_idle_timer()
             return
@@ -440,6 +459,11 @@ class MotionLightCoordinator(DataUpdateCoordinator):
         if not self.respect_manual:
             return
 
+        # БЛОКИРОВЩИК: Игнорируем ручные переключения, если активна принудительная остановка
+        if self._state == STATE_FORCE_STOPPED:
+            self.logger.debug("Ignoring manual change during force_stopped")
+            return
+            
         new_state = event.data.get("new_state")
         old_state = event.data.get("old_state")
         if not new_state or not old_state:
@@ -485,9 +509,27 @@ class MotionLightCoordinator(DataUpdateCoordinator):
         if not new_state:
             return
 
+        # Если датчик перешел в блокирующее состояние
         if new_state.state == self.force_stop_state:
             self.logger.info("Force stop triggered by %s", event.data.get("entity_id"))
-            self.hass.async_create_task(self._force_stop())
+            self.hass.async_create_task(self._enter_force_stop())
+        # Если датчик вышел из блокирующего состояния
+        else:
+            self.logger.info("Force stop released by %s", event.data.get("entity_id"))
+            self.hass.async_create_task(self._exit_force_stop())
+
+    async def _enter_force_stop(self):
+        """Enter force_stopped state."""
+        self.logger.info("Entering force_stopped state")
+        self._cancel_all_timers()
+        if self._state in (STATE_ON, STATE_DELAYING, STATE_ACTIVE, STATE_MANUAL_ON):
+            await self._turn_off_switches()
+        await self._update_state(STATE_FORCE_STOPPED)
+
+    async def _exit_force_stop(self):
+        """Exit force_stopped state to idle."""
+        self.logger.info("Exiting force_stopped state")
+        await self._update_state(STATE_IDLE)
 
     def _is_any_main_sensor_active(self) -> bool:
         """Check if any main sensor is currently in 'on' state."""
@@ -658,11 +700,11 @@ class MotionLightCoordinator(DataUpdateCoordinator):
             self.hass.async_create_task(self._update_state(STATE_IDLE))
 
     async def _turn_on_switches(self) -> None:
-        """Turn on switches with our context."""
+        """Turn on switches/lights with our context."""
         ctx = Context(
             id=f"motion_light_{self.entry.entry_id}_{dt_util.utcnow().timestamp()}"
         )
-        self.logger.info("Turning ON switches: %s", self.switch_entities)
+        self.logger.info("Turning ON entities: %s", self.switch_entities)
         await self.hass.services.async_call(
             "homeassistant",
             "turn_on",
@@ -671,11 +713,11 @@ class MotionLightCoordinator(DataUpdateCoordinator):
         )
 
     async def _turn_off_switches(self) -> None:
-        """Turn off switches with our context."""
+        """Turn off switches/lights with our context."""
         ctx = Context(
             id=f"motion_light_{self.entry.entry_id}_{dt_util.utcnow().timestamp()}"
         )
-        self.logger.info("Turning OFF switches: %s", self.switch_entities)
+        self.logger.info("Turning OFF entities: %s", self.switch_entities)
         await self.hass.services.async_call(
             "homeassistant",
             "turn_off",
@@ -686,7 +728,6 @@ class MotionLightCoordinator(DataUpdateCoordinator):
     async def _enter_manual_on(self):
         """Enter manual_on state."""
         await self._update_state(STATE_MANUAL_ON)
-        # ИЗМЕНЕНИЕ: Запускаем таймер только если он не отключен (не равен 0)
         if self.manual_idle_timeout > 0:
             self._reset_manual_idle_timer()
         else:
@@ -694,7 +735,6 @@ class MotionLightCoordinator(DataUpdateCoordinator):
 
     def _reset_manual_idle_timer(self):
         """Reset manual idle timer."""
-        # ИЗМЕНЕНИЕ: Защита от создания таймера при значении 0
         if self.manual_idle_timeout <= 0:
             return
 
@@ -715,8 +755,8 @@ class MotionLightCoordinator(DataUpdateCoordinator):
         self.hass.async_create_task(self._turn_off_switches_manual())
 
     async def _turn_off_switches_manual(self):
-        """Turn off switches in manual mode."""
+        """Turn off switches/lights in manual mode."""
-        self.logger.info("Turning OFF switches (manual timeout): %s", self.switch_entities)
+        self.logger.info("Turning OFF entities (manual timeout): %s", self.switch_entities)
         await self.hass.services.async_call(
             "homeassistant",
             "turn_off",
@@ -756,14 +796,6 @@ class MotionLightCoordinator(DataUpdateCoordinator):
         self._lux_cooldown_timer = None
         self.logger.info("Lux cooldown expired")
 
-    async def _force_stop(self):
-        """Force stop — turn off switches."""
-        self.logger.info("Force stop called")
-        self._cancel_all_timers()
-        await self._turn_off_switches()
-        await self._update_state(STATE_OFF)
-        async_call_later(self.hass, 1, self._transition_to_idle)
-
     def _cancel_all_timers(self):
         """Cancel all timers."""
         if self._motion_detect_timer:

custom_components/motion_light/manifest.json

@@ -1,7 +1,7 @@
 {
   "domain": "motion_light",
   "name": "Motion Light",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "documentation": "https://github.com/sirmrak/motion_light",
   "issue_tracker": "https://github.com/sirmrak/motion_light/issues",
   "dependencies": [],

custom_components/motion_light/number.py

@@ -10,6 +10,7 @@ from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.device_registry import DeviceInfo
 from .const import (
     DOMAIN,
+    CONF_LUX_SENSOR,
     ENTITY_MOTION_FILTER,
     ENTITY_OFF_DELAY,
     ENTITY_LUX_THRESHOLD,
@@ -70,16 +71,23 @@ async def async_setup_entry(
 ) -> None:
     """Set up Motion Light number entities."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
+    
+    lux_sensor = entry.options.get(CONF_LUX_SENSOR) or entry.data.get(CONF_LUX_SENSOR)
+    
     entities = [
         MotionLightNumber(coordinator, entry, ENTITY_MOTION_FILTER, 0, 10, 1, DEFAULT_MOTION_FILTER),
         MotionLightNumber(coordinator, entry, ENTITY_OFF_DELAY, 0, 600, 5, DEFAULT_OFF_DELAY),
-        MotionLightNumber(coordinator, entry, ENTITY_LUX_THRESHOLD, 1, 1000, 10, DEFAULT_LUX_THRESHOLD),
+        MotionLightNumber(coordinator, entry, ENTITY_MANUAL_IDLE_TIMEOUT, 0, 3600, 30, DEFAULT_MANUAL_IDLE_TIMEOUT),
-        MotionLightNumber(coordinator, entry, ENTITY_LUX_COOLDOWN, 0, 300, 5, DEFAULT_LUX_COOLDOWN),
-        MotionLightNumber(coordinator, entry, ENTITY_MANUAL_IDLE_TIMEOUT, 0, 3600, 60, DEFAULT_MANUAL_IDLE_TIMEOUT),
         MotionLightNumber(coordinator, entry, ENTITY_MANUAL_OFF_COOLDOWN, 0, 300, 5, DEFAULT_MANUAL_OFF_COOLDOWN),
     ]
-    async_add_entities(entities)
     
+    if lux_sensor:
+        entities.extend([
+            MotionLightNumber(coordinator, entry, ENTITY_LUX_THRESHOLD, 1, 1000, 10, DEFAULT_LUX_THRESHOLD),
+            MotionLightNumber(coordinator, entry, ENTITY_LUX_COOLDOWN, 0, 300, 5, DEFAULT_LUX_COOLDOWN),
+        ])
+        
+    async_add_entities(entities)
 
 class MotionLightNumber(CoordinatorEntity, NumberEntity, RestoreEntity):
     """Representation of a Motion Light setting as a number entity."""

custom_components/motion_light/sensor.py

@@ -45,6 +45,7 @@ class MotionLightStatusSensor(CoordinatorEntity, SensorEntity):
             "off": "mdi:lightbulb-off-outline",
             "manual_on": "mdi:hand-back-left",
             "manual_off_cooldown": "mdi:timer-pause",
+            "force_stopped": "mdi:stop-circle-outline", 
             "error": "mdi:alert-circle",
             "disabled": "mdi:lightbulb-off",
         }

custom_components/motion_light/translations/en.json

@@ -55,6 +55,7 @@
           "off": "Off",
           "manual_on": "Manual on",
           "manual_off_cooldown": "Manual off cooldown",
+          "force_stopped":  "Force stopped",
           "error": "Error",
           "disabled": "Disabled"
         }

custom_components/motion_light/translations/ru.json

@@ -55,6 +55,7 @@
           "off": "Выключено",
           "manual_on": "Ручное включение",
           "manual_off_cooldown": "Пауза после ручного выкл.",
+          "force_stopped":  "Принудительная остановка",
           "error": "Ошибка",
           "disabled": "Отключено"
         }