Compare commits

...
38 Commits
Author SHA1 Message Date
semantic-release 900c40c8a1 chore(release): v1.0.5
/ Update Version (push) Successful in 5s
2026-07-09 16:43:26 +00:00
sirmrak 860584ca79 Добавить .gitea/workflows/update_version.yml
/ Update Version (push) Successful in 7s
2026-07-09 19:43:19 +03:00
sirmrak d230ec6590 Удалить .gitea/workflows/release.yml 2026-07-09 19:40:38 +03:00
sirmrak e0868fae9b fix: Test
HA Integration Release / Validate HA Integration (push) Successful in 2s
HA Integration Release / Semantic Release (push) Failing after 41s
2026-07-09 14:09:49 +03:00
sirmrak 59d3f9accd fix: Release 2026-07-09 14:06:50 +03:00
semantic-release ee6dde688c chore(release): v1.0.7
HA Integration Release / Validate HA Integration (push) Successful in 2s
HA Integration Release / Semantic Release (push) Successful in 41s
2026-07-09 11:01:55 +00:00
sirmrak e10e3e7c19 fix: Run Semantic Release
HA Integration Release / Validate HA Integration (push) Successful in 2s
HA Integration Release / Semantic Release (push) Failing after 43s
2026-07-09 14:01:05 +03:00
semantic-release 33756f1659 chore(release): v1.0.6
HA Integration Release / Validate HA Integration (push) Successful in 3s
HA Integration Release / Semantic Release (push) Successful in 41s
2026-07-09 10:58:00 +00:00
sirmrak bd34c9fd81 fix: release.yaml
HA Integration Release / Validate HA Integration (push) Successful in 3s
HA Integration Release / Semantic Release (push) Failing after 43s
2026-07-09 13:57:12 +03:00
semantic-release 590e110efa chore(release): v1.0.5
HA Integration Release / Validate HA Integration (push) Successful in 2s
HA Integration Release / Semantic Release (push) Successful in 5s
2026-07-09 10:50:44 +00:00
sirmrak 92b9392149 fix: test commit for release
HA Integration Release / Validate HA Integration (push) Successful in 3s
HA Integration Release / Semantic Release (push) Failing after 6s
2026-07-09 13:50:30 +03:00
semantic-release fced8328d7 chore(release): v1.0.6
HA Integration Release / Validate HA Integration (push) Successful in 2s
HA Integration Release / Semantic Release (push) Successful in 5s
2026-07-09 10:43:47 +00:00
sirmrak ae301f25db fix: disable SSL verification for semantic-release
HA Integration Release / Validate HA Integration (push) Successful in 2s
HA Integration Release / Semantic Release (push) Failing after 6s
2026-07-09 13:43:33 +03:00
semantic-release fcc4de59c1 chore(release): v1.0.5
HA Integration Release / Validate HA Integration (push) Successful in 2s
HA Integration Release / Semantic Release (push) Successful in 5s
2026-07-09 10:40:40 +00:00
sirmrak 4587148d70 fix: configure semantic-release for Gitea with SSL
HA Integration Release / Validate HA Integration (push) Successful in 2s
HA Integration Release / Semantic Release (push) Failing after 5s
2026-07-09 13:40:26 +03:00
semantic-release 6c73814724 1.0.0
HA Integration Release / Validate HA Integration (push) Successful in 2s
HA Integration Release / Semantic Release (push) Successful in 6s
Automatically generated by python-semantic-release
2026-07-09 10:32:03 +00:00
sirmrak 8c4009dc82 Обновить .gitea/workflows/release.yml
HA Integration Release / Validate HA Integration (push) Successful in 3s
HA Integration Release / Semantic Release (push) Failing after 15s
2026-07-09 13:31:39 +03:00
sirmrak 37de17749e Обновить .gitea/workflows/release.yml
HA Integration Release / Validate HA Integration (push) Failing after 3s
HA Integration Release / Semantic Release (push) Has been skipped
2026-07-09 13:28:52 +03:00
sirmrak d4c2548498 fix: Изменил размер картинки
Test Runner / Test Job (push) Successful in 4s
HA Integration Release / Validate HA Integration (push) Failing after 4s
HA Integration Release / Semantic Release (push) Has been skipped
2026-07-09 13:17:44 +03:00
sirmrak f889f18cd9 Добавить .gitea/workflows/release.yml
HA Integration Release / Validate HA Integration (push) Failing after 16s
HA Integration Release / Semantic Release (push) Has been skipped
Test Runner / Test Job (push) Successful in 7s
2026-07-09 13:16:33 +03:00
sirmrak 9abb91c3f9 Добавить pyproject.toml
Test Runner / Test Job (push) Successful in 4s
2026-07-09 13:15:26 +03:00
sirmrak 76388df08c GIT_SSL_NO_VERIFY: true
Test Runner / Test Job (push) Successful in 18s
2026-07-09 13:07:24 +03:00
sirmrak 9626fafd2f Добавить .gitea/workflows/test.yml
Test Runner / Test Job (push) Failing after 55s
2026-07-09 12:52:39 +03:00
sirmrak 71eb3a7c86 Обновить custom_components/motion_light/manifest.json 2026-07-09 09:56:10 +03:00
sirmrak b9dd8bcad7 Обновить custom_components/motion_light/translations/en.json 2026-07-09 09:48:46 +03:00
sirmrak b1a5eca9a5 Обновить custom_components/motion_light/translations/ru.json 2026-07-09 09:47:31 +03:00
sirmrak 182a46cf92 Обновить custom_components/motion_light/manifest.json 2026-07-09 09:22:02 +03:00
sirmrak e5c10104b8 Обновить custom_components/motion_light/coordinator.py 2026-07-09 09:19:53 +03:00
sirmrak 541ea43435 Обновить custom_components/motion_light/coordinator.py 2026-07-08 15:43:45 +03:00
sirmrak 62d4641097 Обновить custom_components/motion_light/translations/en.json 2026-07-08 15:26:07 +03:00
sirmrak 153d5d479f Обновить custom_components/motion_light/translations/ru.json 2026-07-08 15:25:32 +03:00
sirmrak 7ea6821116 Обновить custom_components/motion_light/sensor.py 2026-07-08 15:22:31 +03:00
sirmrak b1747ef487 Обновить custom_components/motion_light/coordinator.py 2026-07-08 15:21:43 +03:00
sirmrak ff3434612b Обновить custom_components/motion_light/const.py 2026-07-08 15:20:18 +03:00
sirmrak 57bb21e5ba Обновить custom_components/motion_light/manifest.json 2026-07-08 14:48:49 +03:00
sirmrak 18b6d83af2 Обновить custom_components/motion_light/number.py 2026-07-08 14:42:07 +03:00
sirmrak f097f7dabb Обновить custom_components/motion_light/manifest.json 2026-07-08 14:32:32 +03:00
sirmrak 55488681b2 Не создаем сущности lux при отсутствии датчика освещенности 2026-07-08 14:26:08 +03:00
12 changed files with 431 additions and 189 deletions
+33
View File
@@ -0,0 +1,33 @@
name: Test Runner
on:
push:
branches:
- main
- master
env:
GIT_SSL_NO_VERIFY: true
jobs:
test:
name: Test Job
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Echo message
run: |
echo "Hello from Gitea Actions!"
echo "Runner is working correctly!"
date
pwd
ls -la
- name: Test Python
uses: actions/setup-python@v5
with:
python-version: '3.11'
- name: Check Python version
run: python --version
+57
View File
@@ -0,0 +1,57 @@
Update Versionname: Update Version
on:
push:
branches:
- main
- master
env:
GIT_SSL_NO_VERIFY: true
jobs:
update-version:
name: Update Version
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.PAT_TOKEN }}
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: Install dependencies
run: pip install python-semantic-release
- name: Configure Git
run: |
git config --local user.email "actions@gitea.local"
git config --local user.name "Gitea Actions Bot"
- name: Disable SSL verification
run: |
SITE_PACKAGES=$(python3 -c "import site; print(site.getsitepackages()[0])")
cat > "$SITE_PACKAGES/sitecustomize.py" << 'PYEOF'
import ssl
ssl._create_default_https_context = ssl._create_unverified_context
PYEOF
- name: Run Semantic Release (no publish)
env:
GITEA_TOKEN: ${{ secrets.PAT_TOKEN }}
run: |
# Запускаем semantic-release, но не публикуем релиз
# Он только обновит manifest.json и создаст тег
semantic-release version --no-vcs-release
# Пушим изменения обратно в Gitea
git push origin main
git push origin --tags
+34
View File
@@ -0,0 +1,34 @@
# CHANGELOG
<!-- version list -->
## v1.0.7 (2026-07-09)
### Bug Fixes
- Run Semantic Release
([`e10e3e7`](https://192.168.200.208:3000/sirmrak/motion_light/commit/e10e3e7c19c2da63289cd499cca5a5eacee22157))
## v1.0.6 (2026-07-09)
### Bug Fixes
- Disable SSL verification for semantic-release
([`ae301f2`](https://192.168.200.208:3000/sirmrak/motion_light/commit/ae301f25db468e56f9378582215b4dac6979722e))
## v1.0.5 (2026-07-09)
### Bug Fixes
- Configure semantic-release for Gitea with SSL
([`4587148`](https://192.168.200.208:3000/sirmrak/motion_light/commit/4587148d70e362fdd2a47523df0da959499fba2f))
- Изменил размер картинки
([`d4c2548`](https://192.168.200.208:3000/sirmrak/motion_light/commit/d4c25484981a33ab4455027ffb4ef693256aa414))
## v1.0.0 (2026-07-09)
- Initial Release
+1 -1
View File
@@ -1,5 +1,5 @@
[English](README.md) | Русский
# <img src="custom_components/motion_light/brand/icon.png" width="64"> </img> Motion Light
# <img src="custom_components/motion_light/brand/icon.png" width="32"> </img> Motion Light
Умная интеграция для Home Assistant на основе конечного автомата (FSM) для управления освещением по датчикам движения, освещенности и ручным переключениям.
+1
View File
@@ -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"
+67 -23
View File
@@ -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
@@ -439,6 +458,11 @@ class MotionLightCoordinator(DataUpdateCoordinator):
"""Handle target switch state change."""
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")
@@ -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."""
@@ -561,6 +603,11 @@ class MotionLightCoordinator(DataUpdateCoordinator):
LUX_CHECK_INTERVAL,
self._check_lux_periodically,
)
self.async_set_updated_data({
"state": self._state,
"attributes": self.attributes,
})
def _stop_lux_check_timer(self):
"""Stop periodic lux check timer."""
@@ -568,7 +615,10 @@ class MotionLightCoordinator(DataUpdateCoordinator):
self.logger.debug("Stopping lux check timer")
self._lux_check_timer()
self._lux_check_timer = None
self.async_set_updated_data({
"state": self._state,
"attributes": self.attributes,
})
@callback
def _check_lux_periodically(self, _=None):
"""Check lux periodically."""
@@ -658,11 +708,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 +721,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 +736,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 +743,6 @@ class MotionLightCoordinator(DataUpdateCoordinator):
def _reset_manual_idle_timer(self):
"""Reset manual idle timer."""
# ИЗМЕНЕНИЕ: Защита от создания таймера при значении 0
if self.manual_idle_timeout <= 0:
return
@@ -715,8 +763,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."""
self.logger.info("Turning OFF switches (manual timeout): %s", self.switch_entities)
"""Turn off switches/lights in manual mode."""
self.logger.info("Turning OFF entities (manual timeout): %s", self.switch_entities)
await self.hass.services.async_call(
"homeassistant",
"turn_off",
@@ -755,15 +803,11 @@ class MotionLightCoordinator(DataUpdateCoordinator):
self._lux_cooldown_active = False
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)
self.async_set_updated_data({
"state": self._state,
"attributes": self.attributes,
})
def _cancel_all_timers(self):
"""Cancel all timers."""
if self._motion_detect_timer:
+1 -1
View File
@@ -1,7 +1,7 @@
{
"domain": "motion_light",
"name": "Motion Light",
"version": "1.0.0",
"version": "1.0.5",
"documentation": "https://github.com/sirmrak/motion_light",
"issue_tracker": "https://github.com/sirmrak/motion_light/issues",
"dependencies": [],
+172 -164
View File
@@ -1,165 +1,173 @@
"""Number platform for Motion Light settings."""
import logging
from homeassistant.components.number import NumberEntity
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import UnitOfTime
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from homeassistant.helpers.restore_state import RestoreEntity
from homeassistant.helpers.device_registry import DeviceInfo
from .const import (
DOMAIN,
ENTITY_MOTION_FILTER,
ENTITY_OFF_DELAY,
ENTITY_LUX_THRESHOLD,
ENTITY_LUX_COOLDOWN,
ENTITY_MANUAL_IDLE_TIMEOUT,
ENTITY_MANUAL_OFF_COOLDOWN,
DEFAULT_MOTION_FILTER,
DEFAULT_OFF_DELAY,
DEFAULT_LUX_THRESHOLD,
DEFAULT_LUX_COOLDOWN,
DEFAULT_MANUAL_IDLE_TIMEOUT,
DEFAULT_MANUAL_OFF_COOLDOWN,
)
_LOGGER = logging.getLogger(__name__)
class PrefixLoggerAdapter(logging.LoggerAdapter):
"""Logger adapter that adds a prefix to log messages."""
def process(self, msg, kwargs):
"""Add prefix to the log message."""
return f"[{self.extra.get('name', 'Unknown')}] {msg}", kwargs
TRANSLATION_KEYS = {
ENTITY_MOTION_FILTER: "motion_light_motion_filter",
ENTITY_OFF_DELAY: "motion_light_off_delay",
ENTITY_LUX_THRESHOLD: "motion_light_lux_threshold",
ENTITY_LUX_COOLDOWN: "motion_light_lux_cooldown",
ENTITY_MANUAL_IDLE_TIMEOUT: "motion_light_manual_idle_timeout",
ENTITY_MANUAL_OFF_COOLDOWN: "motion_light_manual_off_cooldown",
}
ICONS = {
ENTITY_MOTION_FILTER: "mdi:timer-outline",
ENTITY_OFF_DELAY: "mdi:timer-sand",
ENTITY_LUX_THRESHOLD: "mdi:brightness-5",
ENTITY_LUX_COOLDOWN: "mdi:timer-pause",
ENTITY_MANUAL_IDLE_TIMEOUT: "mdi:timer-alert",
ENTITY_MANUAL_OFF_COOLDOWN: "mdi:timer-off",
}
UNITS = {
ENTITY_MOTION_FILTER: UnitOfTime.SECONDS,
ENTITY_OFF_DELAY: UnitOfTime.SECONDS,
ENTITY_LUX_THRESHOLD: "lx",
ENTITY_LUX_COOLDOWN: UnitOfTime.SECONDS,
ENTITY_MANUAL_IDLE_TIMEOUT: UnitOfTime.SECONDS,
ENTITY_MANUAL_OFF_COOLDOWN: UnitOfTime.SECONDS,
}
async def async_setup_entry(
hass: HomeAssistant,
entry: ConfigEntry,
async_add_entities: AddEntitiesCallback,
) -> None:
"""Set up Motion Light number entities."""
coordinator = hass.data[DOMAIN][entry.entry_id]
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_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)
class MotionLightNumber(CoordinatorEntity, NumberEntity, RestoreEntity):
"""Representation of a Motion Light setting as a number entity."""
_attr_has_entity_name = True
def __init__(self, coordinator, entry, entity_id, min_val, max_val, step, default):
"""Initialize the number entity."""
super().__init__(coordinator)
self.entry = entry
self.logger = PrefixLoggerAdapter(_LOGGER, {"name": entry.title})
self._entity_suffix = entity_id
self._attr_unique_id = f"{entry.entry_id}_{entity_id}"
self._attr_translation_key = TRANSLATION_KEYS[entity_id]
self._attr_native_min_value = min_val
self._attr_native_max_value = max_val
self._attr_native_step = step
self._attr_native_unit_of_measurement = UNITS[entity_id]
self._attr_icon = ICONS[entity_id]
self._default_value = default
self._attr_native_value = default
self._attr_device_info = DeviceInfo(
identifiers={(DOMAIN, entry.entry_id)},
name=entry.title,
manufacturer="Motion Light",
model="Switch Control Integration",
)
@property
def native_value(self) -> float:
"""Return the current value."""
return self._attr_native_value
async def async_set_native_value(self, value: float) -> None:
"""Update the current value."""
self._attr_native_value = value
self.logger.info("Setting %s to %s", self._entity_suffix, value)
if self._entity_suffix == ENTITY_MOTION_FILTER:
self.coordinator.set_motion_filter(value)
elif self._entity_suffix == ENTITY_OFF_DELAY:
self.coordinator.set_off_delay(value)
elif self._entity_suffix == ENTITY_LUX_THRESHOLD:
self.coordinator.set_lux_threshold(value)
elif self._entity_suffix == ENTITY_LUX_COOLDOWN:
self.coordinator.set_lux_cooldown(value)
elif self._entity_suffix == ENTITY_MANUAL_IDLE_TIMEOUT:
self.coordinator.set_manual_idle_timeout(value)
elif self._entity_suffix == ENTITY_MANUAL_OFF_COOLDOWN:
self.coordinator.set_manual_off_cooldown(value)
self.async_write_ha_state()
async def async_added_to_hass(self) -> None:
"""Handle entity which will be added."""
await super().async_added_to_hass()
last_state = await self.async_get_last_state()
if last_state is not None:
try:
value = float(last_state.state)
self._attr_native_value = value
self.logger.info("Restored %s: %s", self._entity_suffix, value)
if self._entity_suffix == ENTITY_MOTION_FILTER:
self.coordinator.set_motion_filter(value)
elif self._entity_suffix == ENTITY_OFF_DELAY:
self.coordinator.set_off_delay(value)
elif self._entity_suffix == ENTITY_LUX_THRESHOLD:
self.coordinator.set_lux_threshold(value)
elif self._entity_suffix == ENTITY_LUX_COOLDOWN:
self.coordinator.set_lux_cooldown(value)
elif self._entity_suffix == ENTITY_MANUAL_IDLE_TIMEOUT:
self.coordinator.set_manual_idle_timeout(value)
elif self._entity_suffix == ENTITY_MANUAL_OFF_COOLDOWN:
self.coordinator.set_manual_off_cooldown(value)
except (ValueError, TypeError):
self.logger.warning("Could not restore %s, using default", self._entity_suffix)
self.async_write_ha_state()
def _handle_coordinator_update(self) -> None:
"""Handle updated data from the coordinator."""
"""Number platform for Motion Light settings."""
import logging
from homeassistant.components.number import NumberEntity
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import UnitOfTime
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
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,
ENTITY_LUX_COOLDOWN,
ENTITY_MANUAL_IDLE_TIMEOUT,
ENTITY_MANUAL_OFF_COOLDOWN,
DEFAULT_MOTION_FILTER,
DEFAULT_OFF_DELAY,
DEFAULT_LUX_THRESHOLD,
DEFAULT_LUX_COOLDOWN,
DEFAULT_MANUAL_IDLE_TIMEOUT,
DEFAULT_MANUAL_OFF_COOLDOWN,
)
_LOGGER = logging.getLogger(__name__)
class PrefixLoggerAdapter(logging.LoggerAdapter):
"""Logger adapter that adds a prefix to log messages."""
def process(self, msg, kwargs):
"""Add prefix to the log message."""
return f"[{self.extra.get('name', 'Unknown')}] {msg}", kwargs
TRANSLATION_KEYS = {
ENTITY_MOTION_FILTER: "motion_light_motion_filter",
ENTITY_OFF_DELAY: "motion_light_off_delay",
ENTITY_LUX_THRESHOLD: "motion_light_lux_threshold",
ENTITY_LUX_COOLDOWN: "motion_light_lux_cooldown",
ENTITY_MANUAL_IDLE_TIMEOUT: "motion_light_manual_idle_timeout",
ENTITY_MANUAL_OFF_COOLDOWN: "motion_light_manual_off_cooldown",
}
ICONS = {
ENTITY_MOTION_FILTER: "mdi:timer-outline",
ENTITY_OFF_DELAY: "mdi:timer-sand",
ENTITY_LUX_THRESHOLD: "mdi:brightness-5",
ENTITY_LUX_COOLDOWN: "mdi:timer-pause",
ENTITY_MANUAL_IDLE_TIMEOUT: "mdi:timer-alert",
ENTITY_MANUAL_OFF_COOLDOWN: "mdi:timer-off",
}
UNITS = {
ENTITY_MOTION_FILTER: UnitOfTime.SECONDS,
ENTITY_OFF_DELAY: UnitOfTime.SECONDS,
ENTITY_LUX_THRESHOLD: "lx",
ENTITY_LUX_COOLDOWN: UnitOfTime.SECONDS,
ENTITY_MANUAL_IDLE_TIMEOUT: UnitOfTime.SECONDS,
ENTITY_MANUAL_OFF_COOLDOWN: UnitOfTime.SECONDS,
}
async def async_setup_entry(
hass: HomeAssistant,
entry: ConfigEntry,
async_add_entities: AddEntitiesCallback,
) -> 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_MANUAL_IDLE_TIMEOUT, 0, 3600, 30, DEFAULT_MANUAL_IDLE_TIMEOUT),
MotionLightNumber(coordinator, entry, ENTITY_MANUAL_OFF_COOLDOWN, 0, 300, 5, DEFAULT_MANUAL_OFF_COOLDOWN),
]
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."""
_attr_has_entity_name = True
def __init__(self, coordinator, entry, entity_id, min_val, max_val, step, default):
"""Initialize the number entity."""
super().__init__(coordinator)
self.entry = entry
self.logger = PrefixLoggerAdapter(_LOGGER, {"name": entry.title})
self._entity_suffix = entity_id
self._attr_unique_id = f"{entry.entry_id}_{entity_id}"
self._attr_translation_key = TRANSLATION_KEYS[entity_id]
self._attr_native_min_value = min_val
self._attr_native_max_value = max_val
self._attr_native_step = step
self._attr_native_unit_of_measurement = UNITS[entity_id]
self._attr_icon = ICONS[entity_id]
self._default_value = default
self._attr_native_value = default
self._attr_device_info = DeviceInfo(
identifiers={(DOMAIN, entry.entry_id)},
name=entry.title,
manufacturer="Motion Light",
model="Switch Control Integration",
)
@property
def native_value(self) -> float:
"""Return the current value."""
return self._attr_native_value
async def async_set_native_value(self, value: float) -> None:
"""Update the current value."""
self._attr_native_value = value
self.logger.info("Setting %s to %s", self._entity_suffix, value)
if self._entity_suffix == ENTITY_MOTION_FILTER:
self.coordinator.set_motion_filter(value)
elif self._entity_suffix == ENTITY_OFF_DELAY:
self.coordinator.set_off_delay(value)
elif self._entity_suffix == ENTITY_LUX_THRESHOLD:
self.coordinator.set_lux_threshold(value)
elif self._entity_suffix == ENTITY_LUX_COOLDOWN:
self.coordinator.set_lux_cooldown(value)
elif self._entity_suffix == ENTITY_MANUAL_IDLE_TIMEOUT:
self.coordinator.set_manual_idle_timeout(value)
elif self._entity_suffix == ENTITY_MANUAL_OFF_COOLDOWN:
self.coordinator.set_manual_off_cooldown(value)
self.async_write_ha_state()
async def async_added_to_hass(self) -> None:
"""Handle entity which will be added."""
await super().async_added_to_hass()
last_state = await self.async_get_last_state()
if last_state is not None:
try:
value = float(last_state.state)
self._attr_native_value = value
self.logger.info("Restored %s: %s", self._entity_suffix, value)
if self._entity_suffix == ENTITY_MOTION_FILTER:
self.coordinator.set_motion_filter(value)
elif self._entity_suffix == ENTITY_OFF_DELAY:
self.coordinator.set_off_delay(value)
elif self._entity_suffix == ENTITY_LUX_THRESHOLD:
self.coordinator.set_lux_threshold(value)
elif self._entity_suffix == ENTITY_LUX_COOLDOWN:
self.coordinator.set_lux_cooldown(value)
elif self._entity_suffix == ENTITY_MANUAL_IDLE_TIMEOUT:
self.coordinator.set_manual_idle_timeout(value)
elif self._entity_suffix == ENTITY_MANUAL_OFF_COOLDOWN:
self.coordinator.set_manual_off_cooldown(value)
except (ValueError, TypeError):
self.logger.warning("Could not restore %s, using default", self._entity_suffix)
self.async_write_ha_state()
def _handle_coordinator_update(self) -> None:
"""Handle updated data from the coordinator."""
self.async_write_ha_state()
+1
View File
@@ -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",
}
@@ -55,8 +55,25 @@
"off": "Off",
"manual_on": "Manual on",
"manual_off_cooldown": "Manual off cooldown",
"force_stopped": "Force stopped",
"error": "Error",
"disabled": "Disabled"
},
"attributes": {
"switch_entities": "Controlled switches",
"main_sensors": "Main triggers",
"extend_sensors": "Extend sensors",
"lux_sensor": "Illuminance sensor",
"force_stop_sensor": "Force stop sensor",
"force_stop_state": "Force stop state",
"force_stop_active": "Force stop active",
"active_main_sensors": "Active main triggers",
"active_extend_sensors": "Active extend sensors",
"lux_value": "Current illuminance",
"lux_cooldown_active": "Lux cooldown active",
"lux_check_active": "Lux check active",
"triggered_by": "Triggered by",
"last_motion_time": "Last motion time"
}
}
},
@@ -55,8 +55,25 @@
"off": "Выключено",
"manual_on": "Ручное включение",
"manual_off_cooldown": "Пауза после ручного выкл.",
"force_stopped": "Принудительная остановка",
"error": "Ошибка",
"disabled": "Отключено"
},
"attributes": {
"switch_entities": "Управляемые выключатели",
"main_sensors": "Главные триггеры",
"extend_sensors": "Датчики продления",
"lux_sensor": "Датчик освещённости",
"force_stop_sensor": "Датчик принудительной остановки",
"force_stop_state": "Состояние принудительной остановки",
"force_stop_active": "Принудительная остановка активна",
"active_main_sensors": "Активные главные триггеры",
"active_extend_sensors": "Активные датчики продления",
"lux_value": "Текущая освещённость",
"lux_cooldown_active": "Cooldown люкса активен",
"lux_check_active": "Проверка люкса активна",
"triggered_by": "Активировано",
"last_motion_time": "Последнее движение"
}
}
},
+30
View File
@@ -0,0 +1,30 @@
[tool.semantic_release]
# Формат тега С префиксом v (для совместимости с существующими тегами)
tag_format = "v{version}"
# Где обновлять версию при релизе
version_variables = [
"custom_components/motion_light/manifest.json:version",
]
# Сообщение коммита
commit_message = "chore(release): v{version}"
# Настройки для Gitea
[tool.semantic_release.remote]
type = "gitea"
# URL вашей Gitea (без trailing slash)
domain = "https://192.168.200.208:3000"
# Имя пользователя и репозитория
api_path = "/api/v1"
# Настройки веток
[tool.semantic_release.branches.main]
match = "(main|master)"
prerelease = false
# Настройки парсера коммитов
[tool.semantic_release.commit_parser_options]
allowed_tags = ["feat", "fix", "docs", "style", "refactor", "perf", "test", "chore", "revert"]
minor_tags = ["feat"]
patch_tags = ["fix", "perf"]