mirror of
https://github.com/andvikt/mega_hacs.git
synced 2025-12-12 01:24:29 +05:00
Compare commits
17 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c8b3cb60de | ||
|
|
bd550442d4 | ||
|
|
8903628b36 | ||
|
|
e1a6637f28 | ||
|
|
a346cb3fd7 | ||
|
|
d6ef137e75 | ||
|
|
d7180c0477 | ||
|
|
1ceb7e4766 | ||
|
|
ef46ac2b2b | ||
|
|
e44aef35fb | ||
|
|
a860ba9822 | ||
|
|
2463b270e5 | ||
|
|
ce2969c1e7 | ||
|
|
34056273f3 | ||
|
|
19313d3b35 | ||
|
|
cb14f9aa2a | ||
|
|
b908068315 |
@@ -1,5 +1,5 @@
|
|||||||
[bumpversion]
|
[bumpversion]
|
||||||
current_version = 1.1.1b1
|
current_version = 1.1.5b0
|
||||||
parse = (?P<major>\d+)(\.(?P<minor>\d+))(\.(?P<patch>\d+))(?P<release>[bf]*)(?P<build>\d*)
|
parse = (?P<major>\d+)(\.(?P<minor>\d+))(\.(?P<patch>\d+))(?P<release>[bf]*)(?P<build>\d*)
|
||||||
commit = True
|
commit = True
|
||||||
tag = True
|
tag = True
|
||||||
|
|||||||
@@ -18,7 +18,8 @@ from .const import DOMAIN, CONF_INVERT, CONF_RELOAD, PLATFORMS, CONF_PORTS, CONF
|
|||||||
CONF_MQTT_INPUTS, CONF_HTTP, CONF_RESPONSE_TEMPLATE, CONF_ACTION, CONF_GET_VALUE, CONF_ALLOW_HOSTS, \
|
CONF_MQTT_INPUTS, CONF_HTTP, CONF_RESPONSE_TEMPLATE, CONF_ACTION, CONF_GET_VALUE, CONF_ALLOW_HOSTS, \
|
||||||
CONF_CONV_TEMPLATE, CONF_ALL, CONF_FORCE_D, CONF_DEF_RESPONSE, CONF_FORCE_I2C_SCAN, CONF_HEX_TO_FLOAT, \
|
CONF_CONV_TEMPLATE, CONF_ALL, CONF_FORCE_D, CONF_DEF_RESPONSE, CONF_FORCE_I2C_SCAN, CONF_HEX_TO_FLOAT, \
|
||||||
RGB_COMBINATIONS, CONF_WS28XX, CONF_ORDER, CONF_SMOOTH, CONF_LED, CONF_WHITE_SEP, CONF_CHIP, CONF_RANGE, \
|
RGB_COMBINATIONS, CONF_WS28XX, CONF_ORDER, CONF_SMOOTH, CONF_LED, CONF_WHITE_SEP, CONF_CHIP, CONF_RANGE, \
|
||||||
CONF_FILTER_VALUES, CONF_FILTER_SCALE, CONF_FILTER_LOW, CONF_FILTER_HIGH, CONF_FILL_NA
|
CONF_FILTER_VALUES, CONF_FILTER_SCALE, CONF_FILTER_LOW, CONF_FILTER_HIGH, CONF_FILL_NA, CONF_MEGA_ID, CONF_ADDR, \
|
||||||
|
CONF_1WBUS
|
||||||
from .hub import MegaD
|
from .hub import MegaD
|
||||||
from .config_flow import ConfigFlow
|
from .config_flow import ConfigFlow
|
||||||
from .http import MegaView
|
from .http import MegaView
|
||||||
@@ -108,6 +109,11 @@ def extender(x):
|
|||||||
else:
|
else:
|
||||||
raise ValueError('must has "e" in port name')
|
raise ValueError('must has "e" in port name')
|
||||||
|
|
||||||
|
OWBUS = vol.Schema({
|
||||||
|
vol.Required(CONF_PORT): vol.Any(vol.Coerce(int), vol.Coerce(str)),
|
||||||
|
vol.Required(CONF_MEGA_ID): vol.Coerce(str),
|
||||||
|
vol.Required(CONF_ADDR): [str],
|
||||||
|
})
|
||||||
|
|
||||||
CONFIG_SCHEMA = vol.Schema(
|
CONFIG_SCHEMA = vol.Schema(
|
||||||
{
|
{
|
||||||
@@ -130,11 +136,12 @@ CONFIG_SCHEMA = vol.Schema(
|
|||||||
CUSTOMIZE_PORT,
|
CUSTOMIZE_PORT,
|
||||||
CUSTOMIZE_DS2413,
|
CUSTOMIZE_DS2413,
|
||||||
),
|
),
|
||||||
vol.Optional(CONF_FILTER_VALUES): [cv.positive_float],
|
vol.Optional(CONF_FILTER_VALUES): [vol.Coerce(float)],
|
||||||
vol.Optional(CONF_FILTER_SCALE): cv.positive_float,
|
vol.Optional(CONF_FILTER_SCALE): vol.Coerce(float),
|
||||||
vol.Optional(CONF_FILTER_LOW): cv.positive_float,
|
vol.Optional(CONF_FILTER_LOW): vol.Coerce(float),
|
||||||
vol.Optional(CONF_FILTER_HIGH): cv.positive_float,
|
vol.Optional(CONF_FILTER_HIGH): vol.Coerce(float),
|
||||||
}
|
},
|
||||||
|
vol.Optional(CONF_1WBUS): [OWBUS]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
extra=vol.ALLOW_EXTRA,
|
extra=vol.ALLOW_EXTRA,
|
||||||
|
|||||||
@@ -50,6 +50,8 @@ CONF_FILTER_VALUES = 'filter_values'
|
|||||||
CONF_FILTER_SCALE = 'filter_scale'
|
CONF_FILTER_SCALE = 'filter_scale'
|
||||||
CONF_FILTER_LOW = 'filter_low'
|
CONF_FILTER_LOW = 'filter_low'
|
||||||
CONF_FILTER_HIGH = 'filter_high'
|
CONF_FILTER_HIGH = 'filter_high'
|
||||||
|
CONF_1WBUS = '1wbus'
|
||||||
|
CONF_ADDR = 'addr'
|
||||||
PLATFORMS = [
|
PLATFORMS = [
|
||||||
"light",
|
"light",
|
||||||
"switch",
|
"switch",
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ from functools import partial
|
|||||||
from homeassistant.config_entries import ConfigEntry
|
from homeassistant.config_entries import ConfigEntry
|
||||||
from homeassistant.const import CONF_NAME
|
from homeassistant.const import CONF_NAME
|
||||||
from homeassistant.core import State
|
from homeassistant.core import State
|
||||||
|
from homeassistant.helpers.entity import DeviceInfo
|
||||||
from homeassistant.helpers.update_coordinator import CoordinatorEntity
|
from homeassistant.helpers.update_coordinator import CoordinatorEntity
|
||||||
from homeassistant.helpers.restore_state import RestoreEntity
|
from homeassistant.helpers.restore_state import RestoreEntity
|
||||||
from . import hub as h
|
from . import hub as h
|
||||||
@@ -142,7 +143,7 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
|
|||||||
return self._customize
|
return self._customize
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def device_info(self):
|
def device_info(self) -> DeviceInfo:
|
||||||
if isinstance(self.port, list):
|
if isinstance(self.port, list):
|
||||||
pt_idx = self.id_suffix
|
pt_idx = self.id_suffix
|
||||||
else:
|
else:
|
||||||
@@ -151,25 +152,19 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
|
|||||||
pt_idx, _ = _pt.split('e')
|
pt_idx, _ = _pt.split('e')
|
||||||
else:
|
else:
|
||||||
pt_idx = _pt
|
pt_idx = _pt
|
||||||
return {
|
return DeviceInfo(
|
||||||
"identifiers": {
|
identifiers={
|
||||||
# Serial numbers are unique identifiers within a specific domain
|
# Serial numbers are unique identifiers within a specific domain
|
||||||
(DOMAIN, f'{self._mega_id}', pt_idx),
|
(DOMAIN, f'{self._mega_id}'), #pt_idx
|
||||||
},
|
},
|
||||||
"config_entries": [
|
name=self.name,
|
||||||
self.config_entry,
|
manufacturer='ab-log.ru',
|
||||||
],
|
sw_version=self.mega.fw,
|
||||||
"name": f'{self._mega_id} port {pt_idx}' if not isinstance(self.port, list) else f'{self._mega_id} {pt_idx}',
|
via_device=(DOMAIN, self._mega_id),
|
||||||
"manufacturer": 'ab-log.ru',
|
)
|
||||||
# "model": self.light.productname,
|
|
||||||
"sw_version": self.mega.fw,
|
|
||||||
"via_device": (DOMAIN, self._mega_id),
|
|
||||||
}
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def lg(self) -> logging.Logger:
|
def lg(self) -> logging.Logger:
|
||||||
# if self._lg is None:
|
|
||||||
# self._lg = self.mega.lg.getChild(self._name or self.unique_id)
|
|
||||||
return _LOGGER
|
return _LOGGER
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
|||||||
@@ -134,7 +134,8 @@ class MegaView(HomeAssistantView):
|
|||||||
if ret == 'd' and act:
|
if ret == 'd' and act:
|
||||||
await hub.request(cmd=act.replace(':3', f':{v}'))
|
await hub.request(cmd=act.replace(':3', f':{v}'))
|
||||||
ret = 'd' if hub.force_d else ''
|
ret = 'd' if hub.force_d else ''
|
||||||
elif port in hub.binary_sensors:
|
else:
|
||||||
|
# elif port in hub.binary_sensors:
|
||||||
hub.values[port] = data
|
hub.values[port] = data
|
||||||
for cb in self.callbacks[hub.id][port]:
|
for cb in self.callbacks[hub.id][port]:
|
||||||
cb(data)
|
cb(data)
|
||||||
|
|||||||
@@ -9,10 +9,10 @@ import re
|
|||||||
import json
|
import json
|
||||||
|
|
||||||
from bs4 import BeautifulSoup
|
from bs4 import BeautifulSoup
|
||||||
|
|
||||||
|
from homeassistant.components.sensor import SensorDeviceClass
|
||||||
from homeassistant.config_entries import ConfigEntry
|
from homeassistant.config_entries import ConfigEntry
|
||||||
from homeassistant.const import (
|
from homeassistant.const import ( TEMP_CELSIUS, PERCENTAGE, LIGHT_LUX
|
||||||
DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_PRESSURE,
|
|
||||||
DEVICE_CLASS_ILLUMINANCE, TEMP_CELSIUS, PERCENTAGE, LIGHT_LUX
|
|
||||||
)
|
)
|
||||||
from homeassistant.core import HomeAssistant
|
from homeassistant.core import HomeAssistant
|
||||||
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
|
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
|
||||||
@@ -45,10 +45,10 @@ UNITS = {
|
|||||||
LUX: LIGHT_LUX
|
LUX: LIGHT_LUX
|
||||||
}
|
}
|
||||||
CLASSES = {
|
CLASSES = {
|
||||||
TEMP: DEVICE_CLASS_TEMPERATURE,
|
TEMP: SensorDeviceClass.TEMPERATURE,
|
||||||
HUM: DEVICE_CLASS_HUMIDITY,
|
HUM: SensorDeviceClass.HUMIDITY,
|
||||||
PRESS: DEVICE_CLASS_PRESSURE,
|
PRESS: SensorDeviceClass.PRESSURE,
|
||||||
LUX: DEVICE_CLASS_ILLUMINANCE
|
LUX: SensorDeviceClass.ILLUMINANCE
|
||||||
}
|
}
|
||||||
I2C_DEVICE_TYPES = {
|
I2C_DEVICE_TYPES = {
|
||||||
"2": LUX, # BH1750
|
"2": LUX, # BH1750
|
||||||
|
|||||||
@@ -1,13 +1,10 @@
|
|||||||
import typing
|
import typing
|
||||||
from dataclasses import dataclass, field, astuple
|
from dataclasses import dataclass, astuple
|
||||||
from urllib.parse import parse_qsl, urlparse
|
from urllib.parse import parse_qsl, urlparse
|
||||||
from bs4 import BeautifulSoup
|
from bs4 import BeautifulSoup
|
||||||
|
|
||||||
|
from homeassistant.components.sensor import SensorDeviceClass
|
||||||
from homeassistant.const import (
|
from homeassistant.const import (
|
||||||
DEVICE_CLASS_HUMIDITY,
|
|
||||||
DEVICE_CLASS_TEMPERATURE,
|
|
||||||
DEVICE_CLASS_ILLUMINANCE,
|
|
||||||
DEVICE_CLASS_PRESSURE,
|
|
||||||
DEVICE_CLASS_CO2,
|
|
||||||
PERCENTAGE,
|
PERCENTAGE,
|
||||||
LIGHT_LUX,
|
LIGHT_LUX,
|
||||||
TEMP_CELSIUS,
|
TEMP_CELSIUS,
|
||||||
@@ -16,11 +13,11 @@ from homeassistant.const import (
|
|||||||
)
|
)
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
|
|
||||||
# DeviceType = namedtuple('DeviceType', 'device_class,unit_of_measurement,suffix')
|
# DeviceType = namedtuple('DeviceType', 'device_class,unit_of_measurement,suffix')
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class DeviceType:
|
class DeviceType:
|
||||||
|
|
||||||
device_class: typing.Optional[str] = None
|
device_class: typing.Optional[str] = None
|
||||||
unit_of_measurement: typing.Optional[str] = None
|
unit_of_measurement: typing.Optional[str] = None
|
||||||
suffix: typing.Optional[str] = None
|
suffix: typing.Optional[str] = None
|
||||||
@@ -89,55 +86,55 @@ class Request:
|
|||||||
|
|
||||||
i2c_classes = {
|
i2c_classes = {
|
||||||
'htu21d': [
|
'htu21d': [
|
||||||
DeviceType(DEVICE_CLASS_HUMIDITY, PERCENTAGE, None),
|
DeviceType(SensorDeviceClass.HUMIDITY, PERCENTAGE, None),
|
||||||
DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),
|
DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
|
||||||
],
|
],
|
||||||
'sht31': [
|
'sht31': [
|
||||||
DeviceType(DEVICE_CLASS_HUMIDITY, PERCENTAGE, None, delay=0.5),
|
DeviceType(SensorDeviceClass.HUMIDITY, PERCENTAGE, None, delay=1.5),
|
||||||
DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),
|
DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
|
||||||
],
|
],
|
||||||
'max44009': [
|
'max44009': [
|
||||||
DeviceType(DEVICE_CLASS_ILLUMINANCE, LIGHT_LUX, None)
|
DeviceType(SensorDeviceClass.ILLUMINANCE, LIGHT_LUX, None)
|
||||||
],
|
],
|
||||||
'bh1750': [
|
'bh1750': [
|
||||||
DeviceType(DEVICE_CLASS_ILLUMINANCE, LIGHT_LUX, None)
|
DeviceType(SensorDeviceClass.ILLUMINANCE, LIGHT_LUX, None)
|
||||||
],
|
],
|
||||||
'tsl2591': [
|
'tsl2591': [
|
||||||
DeviceType(DEVICE_CLASS_ILLUMINANCE, LIGHT_LUX, None)
|
DeviceType(SensorDeviceClass.ILLUMINANCE, LIGHT_LUX, None)
|
||||||
],
|
],
|
||||||
'bmp180': [
|
'bmp180': [
|
||||||
DeviceType(DEVICE_CLASS_PRESSURE, PRESSURE_BAR, None),
|
DeviceType(SensorDeviceClass.PRESSURE, PRESSURE_BAR, None),
|
||||||
DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),
|
DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
|
||||||
],
|
],
|
||||||
'bmx280': [
|
'bmx280': [
|
||||||
DeviceType(DEVICE_CLASS_PRESSURE, PRESSURE_BAR, None),
|
DeviceType(SensorDeviceClass.PRESSURE, PRESSURE_BAR, None),
|
||||||
DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),
|
DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
|
||||||
DeviceType(DEVICE_CLASS_HUMIDITY, PERCENTAGE, None)
|
DeviceType(SensorDeviceClass.HUMIDITY, PERCENTAGE, None)
|
||||||
],
|
],
|
||||||
'dps368': [
|
'dps368': [
|
||||||
DeviceType(DEVICE_CLASS_PRESSURE, PRESSURE_BAR, None),
|
DeviceType(SensorDeviceClass.PRESSURE, PRESSURE_BAR, None),
|
||||||
DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),
|
DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
|
||||||
],
|
],
|
||||||
'mlx90614': [
|
'mlx90614': [
|
||||||
Skip,
|
Skip,
|
||||||
DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, 'temp'),
|
DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, 'temp'),
|
||||||
DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, 'object'),
|
DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, 'object'),
|
||||||
],
|
],
|
||||||
'ptsensor': [
|
'ptsensor': [
|
||||||
Skip,
|
Skip,
|
||||||
Request(delay=1), # запрос на измерение
|
Request(delay=3), # запрос на измерение
|
||||||
DeviceType(DEVICE_CLASS_PRESSURE, PRESSURE_BAR, None),
|
DeviceType(SensorDeviceClass.PRESSURE, PRESSURE_BAR, None),
|
||||||
DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),
|
DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
|
||||||
],
|
],
|
||||||
'mcp9600': [
|
'mcp9600': [
|
||||||
DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None), # термопара
|
DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None), # термопара
|
||||||
DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None), # сенсор встроенный в микросхему
|
DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None), # сенсор встроенный в микросхему
|
||||||
],
|
],
|
||||||
't67xx': [
|
't67xx': [
|
||||||
DeviceType(DEVICE_CLASS_CO2, CONCENTRATION_PARTS_PER_MILLION, None)
|
DeviceType(SensorDeviceClass.CO2, CONCENTRATION_PARTS_PER_MILLION, None)
|
||||||
],
|
],
|
||||||
'tmp117': [
|
'tmp117': [
|
||||||
DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),
|
DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
|
||||||
],
|
],
|
||||||
'ads1115': [
|
'ads1115': [
|
||||||
DeviceType(None, None, 'ch0'),
|
DeviceType(None, None, 'ch0'),
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
"""Platform for light integration."""
|
"""Platform for light integration."""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
import asyncio
|
import asyncio
|
||||||
import logging
|
import logging
|
||||||
import typing
|
import typing
|
||||||
@@ -14,8 +16,8 @@ from homeassistant.components.light import (
|
|||||||
SUPPORT_BRIGHTNESS,
|
SUPPORT_BRIGHTNESS,
|
||||||
LightEntity,
|
LightEntity,
|
||||||
SUPPORT_TRANSITION,
|
SUPPORT_TRANSITION,
|
||||||
SUPPORT_COLOR,
|
SUPPORT_COLOR, ColorMode, LightEntityFeature,
|
||||||
SUPPORT_WHITE_VALUE
|
# SUPPORT_WHITE_VALUE
|
||||||
)
|
)
|
||||||
from homeassistant.config_entries import ConfigEntry
|
from homeassistant.config_entries import ConfigEntry
|
||||||
from homeassistant.const import (
|
from homeassistant.const import (
|
||||||
@@ -116,6 +118,7 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
|
|||||||
self._is_on = None
|
self._is_on = None
|
||||||
self._brightness = None
|
self._brightness = None
|
||||||
self._hs_color = None
|
self._hs_color = None
|
||||||
|
self._rgb_color: tuple[int, int, int] | None = None
|
||||||
self._white_value = None
|
self._white_value = None
|
||||||
self._task: asyncio.Task = None
|
self._task: asyncio.Task = None
|
||||||
self._restore = None
|
self._restore = None
|
||||||
@@ -128,7 +131,7 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
|
|||||||
def max_values(self) -> list:
|
def max_values(self) -> list:
|
||||||
if self._max_values is None:
|
if self._max_values is None:
|
||||||
if self.is_ws:
|
if self.is_ws:
|
||||||
self._max_values = [255] * 3
|
self._max_values = [255] * 4
|
||||||
else:
|
else:
|
||||||
self._max_values = [
|
self._max_values = [
|
||||||
255 if isinstance(x, int) else 4095 for x in self.port
|
255 if isinstance(x, int) else 4095 for x in self.port
|
||||||
@@ -143,10 +146,34 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
|
|||||||
def is_ws(self):
|
def is_ws(self):
|
||||||
return self.customize.get(CONF_WS28XX)
|
return self.customize.get(CONF_WS28XX)
|
||||||
|
|
||||||
|
|
||||||
|
@property
|
||||||
|
def supported_color_modes(self) -> set[ColorMode] | set[str] | None:
|
||||||
|
return {
|
||||||
|
ColorMode.BRIGHTNESS,
|
||||||
|
ColorMode.RGB if len(self.port) != 4 else ColorMode.RGBW
|
||||||
|
}
|
||||||
|
|
||||||
|
@property
|
||||||
|
def color_mode(self) -> ColorMode | str | None:
|
||||||
|
if len(self.port) == 4:
|
||||||
|
return ColorMode.RGBW
|
||||||
|
else:
|
||||||
|
return ColorMode.RGB
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def white_value(self):
|
def white_value(self):
|
||||||
if self.supported_features & SUPPORT_WHITE_VALUE:
|
# if self.supported_features & SUPPORT_WHITE_VALUE:
|
||||||
return float(self.get_attribute('white_value', 0))
|
return float(self.get_attribute('white_value', 0))
|
||||||
|
|
||||||
|
@property
|
||||||
|
def rgb_color(self) -> tuple[int, int, int] | None:
|
||||||
|
return self._rgb_color
|
||||||
|
|
||||||
|
@property
|
||||||
|
def rgbw_color(self) -> tuple[int, int, int, int] | None:
|
||||||
|
if self._white_value is not None and self._rgb_color is not None:
|
||||||
|
return (*self._rgb_color, self._white_value)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def brightness(self):
|
def brightness(self):
|
||||||
@@ -162,12 +189,7 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def supported_features(self):
|
def supported_features(self):
|
||||||
return (
|
return LightEntityFeature.TRANSITION
|
||||||
SUPPORT_BRIGHTNESS |
|
|
||||||
SUPPORT_TRANSITION |
|
|
||||||
SUPPORT_COLOR |
|
|
||||||
(SUPPORT_WHITE_VALUE if len(self.port) == 4 else 0)
|
|
||||||
)
|
|
||||||
|
|
||||||
def get_rgbw(self):
|
def get_rgbw(self):
|
||||||
if not self.is_on:
|
if not self.is_on:
|
||||||
@@ -225,6 +247,7 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
|
|||||||
for item, value in kwargs.items():
|
for item, value in kwargs.items():
|
||||||
setattr(self, f'_{item}', value)
|
setattr(self, f'_{item}', value)
|
||||||
_after = self.get_rgbw()
|
_after = self.get_rgbw()
|
||||||
|
self._rgb_color = tuple(_after[:3])
|
||||||
if transition is None:
|
if transition is None:
|
||||||
transition = self.smooth.total_seconds()
|
transition = self.smooth.total_seconds()
|
||||||
ratio = self.calc_speed_ratio(_before, _after)
|
ratio = self.calc_speed_ratio(_before, _after)
|
||||||
|
|||||||
@@ -15,5 +15,5 @@
|
|||||||
"@andvikt"
|
"@andvikt"
|
||||||
],
|
],
|
||||||
"issue_tracker": "https://github.com/andvikt/mega_hacs/issues",
|
"issue_tracker": "https://github.com/andvikt/mega_hacs/issues",
|
||||||
"version": "v1.1.1b1"
|
"version": "v1.1.5b0"
|
||||||
}
|
}
|
||||||
@@ -4,9 +4,7 @@ import voluptuous as vol
|
|||||||
import struct
|
import struct
|
||||||
|
|
||||||
from homeassistant.components.sensor import (
|
from homeassistant.components.sensor import (
|
||||||
PLATFORM_SCHEMA as SENSOR_SCHEMA,
|
PLATFORM_SCHEMA as SENSOR_SCHEMA, SensorEntity, SensorDeviceClass
|
||||||
DEVICE_CLASS_TEMPERATURE,
|
|
||||||
DEVICE_CLASS_HUMIDITY
|
|
||||||
)
|
)
|
||||||
from homeassistant.config_entries import ConfigEntry
|
from homeassistant.config_entries import ConfigEntry
|
||||||
from homeassistant.const import (
|
from homeassistant.const import (
|
||||||
@@ -40,8 +38,8 @@ UNITS = {
|
|||||||
HUM: '%'
|
HUM: '%'
|
||||||
}
|
}
|
||||||
CLASSES = {
|
CLASSES = {
|
||||||
TEMP: DEVICE_CLASS_TEMPERATURE,
|
TEMP: SensorDeviceClass.TEMPERATURE,
|
||||||
HUM: DEVICE_CLASS_HUMIDITY
|
HUM: SensorDeviceClass.HUMIDITY
|
||||||
}
|
}
|
||||||
# Validation of the user's configuration
|
# Validation of the user's configuration
|
||||||
_ITEM = {
|
_ITEM = {
|
||||||
@@ -108,30 +106,34 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
|
|||||||
async_add_devices(devices)
|
async_add_devices(devices)
|
||||||
|
|
||||||
|
|
||||||
class FilterBadValues(MegaPushEntity):
|
class FilterBadValues(MegaPushEntity, SensorEntity):
|
||||||
|
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
self._prev_value = None
|
self._prev_value = None
|
||||||
super().__init__(*args, **kwargs)
|
super().__init__(*args, **kwargs)
|
||||||
|
|
||||||
def filter_value(self, value):
|
def filter_value(self, value):
|
||||||
if value \
|
try:
|
||||||
in self.filter_values \
|
if value \
|
||||||
or (self.filter_low is not None and value < self.filter_low) \
|
in self.filter_values \
|
||||||
or (self.filter_high is not None and value > self.filter_high) \
|
or (self.filter_low is not None and value < self.filter_low) \
|
||||||
or (
|
or (self.filter_high is not None and value > self.filter_high) \
|
||||||
self._prev_value is not None
|
or (
|
||||||
and self.filter_scale is not None
|
self._prev_value is not None
|
||||||
and (
|
and self.filter_scale is not None
|
||||||
abs(value - self._prev_value) / self._prev_value > self.filter_scale
|
and (
|
||||||
)
|
abs(value - self._prev_value) / self._prev_value > self.filter_scale
|
||||||
|
)
|
||||||
):
|
):
|
||||||
if self.fill_na == 'last':
|
if self.fill_na == 'last':
|
||||||
value = self._prev_value
|
value = self._prev_value
|
||||||
else:
|
else:
|
||||||
value = None
|
value = None
|
||||||
self._prev_value = value
|
self._prev_value = value
|
||||||
return value
|
return value
|
||||||
|
except Exception as exc:
|
||||||
|
lg.exception(f'while parsing value')
|
||||||
|
return None
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def filter_values(self):
|
def filter_values(self):
|
||||||
@@ -191,28 +193,32 @@ class MegaI2C(FilterBadValues):
|
|||||||
return self._device_class
|
return self._device_class
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def unit_of_measurement(self):
|
def native_unit_of_measurement(self):
|
||||||
return self._unit_of_measurement
|
return self._unit_of_measurement
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def state(self):
|
def native_value(self):
|
||||||
ret = self.mega.values.get(self._params)
|
|
||||||
if self.customize.get(CONF_HEX_TO_FLOAT):
|
|
||||||
try:
|
|
||||||
ret = struct.unpack('!f', bytes.fromhex(ret))[0]
|
|
||||||
except:
|
|
||||||
self.lg.warning(f'could not convert {ret} form hex to float')
|
|
||||||
tmpl: Template = self.customize.get(CONF_CONV_TEMPLATE, self.customize.get(CONF_VALUE_TEMPLATE))
|
|
||||||
try:
|
try:
|
||||||
ret = float(ret)
|
ret = self.mega.values.get(self._params)
|
||||||
if tmpl is not None and self.hass is not None:
|
if self.customize.get(CONF_HEX_TO_FLOAT):
|
||||||
tmpl.hass = self.hass
|
try:
|
||||||
ret = tmpl.async_render({'value': ret})
|
ret = struct.unpack('!f', bytes.fromhex(ret))[0]
|
||||||
except:
|
except:
|
||||||
ret = ret
|
self.lg.warning(f'could not convert {ret} form hex to float')
|
||||||
ret = self.filter_value(ret)
|
tmpl: Template = self.customize.get(CONF_CONV_TEMPLATE, self.customize.get(CONF_VALUE_TEMPLATE))
|
||||||
if ret is not None:
|
try:
|
||||||
return str(ret)
|
ret = float(ret)
|
||||||
|
if tmpl is not None and self.hass is not None:
|
||||||
|
tmpl.hass = self.hass
|
||||||
|
ret = tmpl.async_render({'value': ret})
|
||||||
|
except:
|
||||||
|
ret = ret
|
||||||
|
ret = self.filter_value(ret)
|
||||||
|
if ret is not None:
|
||||||
|
return str(ret)
|
||||||
|
except Exception:
|
||||||
|
lg.exception('while getting value')
|
||||||
|
return None
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def device_class(self):
|
def device_class(self):
|
||||||
@@ -223,8 +229,8 @@ class Mega1WSensor(FilterBadValues):
|
|||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
unit_of_measurement,
|
unit_of_measurement=None,
|
||||||
device_class,
|
device_class=None,
|
||||||
key=None,
|
key=None,
|
||||||
*args,
|
*args,
|
||||||
**kwargs
|
**kwargs
|
||||||
@@ -244,7 +250,7 @@ class Mega1WSensor(FilterBadValues):
|
|||||||
self.prev_value = None
|
self.prev_value = None
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def unit_of_measurement(self):
|
def native_unit_of_measurement(self):
|
||||||
_u = self.customize.get(CONF_UNIT_OF_MEASUREMENT, None)
|
_u = self.customize.get(CONF_UNIT_OF_MEASUREMENT, None)
|
||||||
if _u is None:
|
if _u is None:
|
||||||
return self._unit_of_measurement
|
return self._unit_of_measurement
|
||||||
@@ -275,49 +281,53 @@ class Mega1WSensor(FilterBadValues):
|
|||||||
return self._device_class
|
return self._device_class
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def state(self):
|
def native_value(self):
|
||||||
ret = None
|
try:
|
||||||
if not hasattr(self, 'key'):
|
ret = None
|
||||||
return None
|
if not hasattr(self, 'key'):
|
||||||
if self.key:
|
return None
|
||||||
try:
|
if self.key:
|
||||||
ret = self.mega.values.get(self.port, {})
|
try:
|
||||||
if isinstance(ret, dict):
|
ret = self.mega.values.get(self.port, {})
|
||||||
ret = ret.get('value', {})
|
|
||||||
if isinstance(ret, dict):
|
if isinstance(ret, dict):
|
||||||
ret = ret.get(self.key)
|
ret = ret.get('value', {})
|
||||||
except:
|
if isinstance(ret, dict):
|
||||||
self.lg.error(self.mega.values.get(self.port, {}).get('value', {}))
|
ret = ret.get(self.key)
|
||||||
return
|
except:
|
||||||
else:
|
self.lg.error(self.mega.values.get(self.port, {}).get('value', {}))
|
||||||
ret = self.mega.values.get(self.port, {}).get('value')
|
return
|
||||||
if ret is None and self.fill_na == 'fill_na' and self.prev_value is not None:
|
else:
|
||||||
ret = self.prev_value
|
ret = self.mega.values.get(self.port, {}).get('value')
|
||||||
elif ret is None and self.fill_na == 'fill_na' and self._state is not None:
|
if ret is None and self.fill_na == 'fill_na' and self.prev_value is not None:
|
||||||
ret = self._state.state
|
ret = self.prev_value
|
||||||
try:
|
elif ret is None and self.fill_na == 'fill_na' and self._state is not None:
|
||||||
ret = float(ret)
|
ret = self._state.state
|
||||||
ret = str(ret)
|
|
||||||
except:
|
|
||||||
self.lg.debug(f'could not convert to float "{ret}"')
|
|
||||||
ret = self.prev_value
|
|
||||||
if self.customize.get(CONF_HEX_TO_FLOAT):
|
|
||||||
try:
|
try:
|
||||||
ret = struct.unpack('!f', bytes.fromhex(ret))[0]
|
ret = float(ret)
|
||||||
|
ret = str(ret)
|
||||||
except:
|
except:
|
||||||
self.lg.warning(f'could not convert {ret} form hex to float')
|
self.lg.debug(f'could not convert to float "{ret}"')
|
||||||
tmpl: Template = self.customize.get(CONF_CONV_TEMPLATE, self.customize.get(CONF_VALUE_TEMPLATE))
|
ret = self.prev_value
|
||||||
try:
|
if self.customize.get(CONF_HEX_TO_FLOAT):
|
||||||
ret = float(ret)
|
try:
|
||||||
if tmpl is not None and self.hass is not None:
|
ret = struct.unpack('!f', bytes.fromhex(ret))[0]
|
||||||
tmpl.hass = self.hass
|
except:
|
||||||
ret = tmpl.async_render({'value': ret})
|
self.lg.warning(f'could not convert {ret} form hex to float')
|
||||||
except:
|
tmpl: Template = self.customize.get(CONF_CONV_TEMPLATE, self.customize.get(CONF_VALUE_TEMPLATE))
|
||||||
pass
|
try:
|
||||||
ret = self.filter_value(ret)
|
ret = float(ret)
|
||||||
self.prev_value = ret
|
if tmpl is not None and self.hass is not None:
|
||||||
if ret is not None:
|
tmpl.hass = self.hass
|
||||||
return str(ret)
|
ret = tmpl.async_render({'value': ret})
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
ret = self.filter_value(ret)
|
||||||
|
self.prev_value = ret
|
||||||
|
if ret is not None:
|
||||||
|
return str(ret)
|
||||||
|
except Exception:
|
||||||
|
lg.exception('while parsing state')
|
||||||
|
return None
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def name(self):
|
def name(self):
|
||||||
|
|||||||
@@ -50,6 +50,10 @@ class PriorityLock(asyncio.Lock):
|
|||||||
finally:
|
finally:
|
||||||
self.release()
|
self.release()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def _loop(self):
|
||||||
|
return asyncio.get_event_loop()
|
||||||
|
|
||||||
async def acquire(self, priority=0) -> bool:
|
async def acquire(self, priority=0) -> bool:
|
||||||
"""Acquire a lock.
|
"""Acquire a lock.
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user