Introduced different support for switches with 20 and 22 bytes length for dev_id. Introduced name to set the entity_id and friendly_name for the frontend name.
This commit is contained in:
@@ -9,10 +9,23 @@ switch:
|
||||
local_key: 1234567891234567
|
||||
device_id: 12345678912345671234
|
||||
name: tuya_01
|
||||
friendly_name: tuya_01
|
||||
protocol_version: 3.3
|
||||
switches:
|
||||
sw01:
|
||||
name: main_plug
|
||||
friendly_name: Main Plug
|
||||
id: 1
|
||||
current: 18
|
||||
current_consumption: 19
|
||||
voltage: 20
|
||||
sw02:
|
||||
name: usb_plug
|
||||
friendly_name: USB Plug
|
||||
id: 7
|
||||
"""
|
||||
import voluptuous as vol
|
||||
from homeassistant.components.switch import SwitchDevice, PLATFORM_SCHEMA
|
||||
from homeassistant.components.switch import ENTITY_ID_FORMAT, SwitchDevice, PLATFORM_SCHEMA
|
||||
from homeassistant.const import (CONF_HOST, CONF_ID, CONF_SWITCHES, CONF_FRIENDLY_NAME, CONF_ICON, CONF_NAME)
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from time import time, sleep
|
||||
@@ -34,17 +47,29 @@ ATTR_CURRENT = 'current'
|
||||
ATTR_CURRENT_CONSUMPTION = 'current_consumption'
|
||||
ATTR_VOLTAGE = 'voltage'
|
||||
|
||||
SWITCH_SCHEMA = vol.Schema({
|
||||
vol.Optional(CONF_ID, default=DEFAULT_ID): cv.string,
|
||||
vol.Required(CONF_NAME): cv.string,
|
||||
vol.Required(CONF_FRIENDLY_NAME): cv.string,
|
||||
vol.Optional(CONF_CURRENT, default='-1'): cv.string,
|
||||
vol.Optional(CONF_CURRENT_CONSUMPTION, default='-1'): cv.string,
|
||||
vol.Optional(CONF_VOLTAGE, default='-1'): cv.string,
|
||||
})
|
||||
|
||||
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
|
||||
vol.Optional(CONF_ICON): cv.icon,
|
||||
vol.Required(CONF_HOST): cv.string,
|
||||
vol.Required(CONF_DEVICE_ID): cv.string,
|
||||
vol.Required(CONF_LOCAL_KEY): cv.string,
|
||||
vol.Required(CONF_NAME): cv.string,
|
||||
vol.Required(CONF_FRIENDLY_NAME): cv.string,
|
||||
vol.Required(CONF_PROTOCOL_VERSION, default=DEFAULT_PROTOCOL_VERSION): vol.Coerce(float),
|
||||
vol.Optional(CONF_ID, default=DEFAULT_ID): cv.string,
|
||||
vol.Optional(CONF_CURRENT, default='4'): cv.string,
|
||||
vol.Optional(CONF_CURRENT_CONSUMPTION, default='5'): cv.string,
|
||||
vol.Optional(CONF_VOLTAGE, default='6'): cv.string,
|
||||
vol.Optional(CONF_CURRENT, default='-1'): cv.string,
|
||||
vol.Optional(CONF_CURRENT_CONSUMPTION, default='-1'): cv.string,
|
||||
vol.Optional(CONF_VOLTAGE, default='-1'): cv.string,
|
||||
vol.Optional(CONF_SWITCHES, default={}):
|
||||
vol.Schema({cv.slug: SWITCH_SCHEMA}),
|
||||
})
|
||||
|
||||
|
||||
@@ -52,23 +77,43 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
|
||||
"""Set up of the Tuya switch."""
|
||||
from . import pytuya
|
||||
|
||||
devices = config.get(CONF_SWITCHES)
|
||||
|
||||
switches = []
|
||||
pytuyadevice = pytuya.OutletDevice(config.get(CONF_DEVICE_ID), config.get(CONF_HOST), config.get(CONF_LOCAL_KEY))
|
||||
pytuyadevice.set_version(float(config.get(CONF_PROTOCOL_VERSION)))
|
||||
|
||||
outlet_device = TuyaCache(pytuyadevice)
|
||||
switches.append(
|
||||
TuyaDevice(
|
||||
outlet_device,
|
||||
config.get(CONF_NAME),
|
||||
config.get(CONF_ICON),
|
||||
config.get(CONF_ID),
|
||||
config.get(CONF_CURRENT),
|
||||
config.get(CONF_CURRENT_CONSUMPTION),
|
||||
config.get(CONF_VOLTAGE)
|
||||
if len(devices) > 0:
|
||||
for object_id, device_config in devices.items():
|
||||
outlet_device = TuyaCache(pytuyadevice)
|
||||
switches.append(
|
||||
TuyaDevice(
|
||||
outlet_device,
|
||||
device_config.get(CONF_NAME),
|
||||
device_config.get(CONF_FRIENDLY_NAME, object_id),
|
||||
device_config.get(CONF_ICON),
|
||||
device_config.get(CONF_ID),
|
||||
device_config.get(CONF_CURRENT),
|
||||
device_config.get(CONF_CURRENT_CONSUMPTION),
|
||||
device_config.get(CONF_VOLTAGE)
|
||||
)
|
||||
)
|
||||
)
|
||||
#print('Setup localtuya switch [{}] with device ID [{}] '.format(config.get(CONF_NAME), config.get(CONF_ID)))
|
||||
print('Setup localtuya subswitch [{}] with device ID [{}] '.format(device_config.get(CONF_FRIENDLY_NAME, object_id), device_config.get(CONF_ID)))
|
||||
else:
|
||||
outlet_device = TuyaCache(pytuyadevice)
|
||||
switches.append(
|
||||
TuyaDevice(
|
||||
outlet_device,
|
||||
config.get(CONF_NAME),
|
||||
config.get(CONF_FRIENDLY_NAME),
|
||||
config.get(CONF_ICON),
|
||||
config.get(CONF_ID),
|
||||
config.get(CONF_CURRENT),
|
||||
config.get(CONF_CURRENT_CONSUMPTION),
|
||||
config.get(CONF_VOLTAGE)
|
||||
)
|
||||
)
|
||||
print('Setup localtuya switch [{}] with device ID [{}] '.format(config.get(CONF_FRIENDLY_NAME), config.get(CONF_ID)))
|
||||
|
||||
add_devices(switches)
|
||||
|
||||
@@ -107,7 +152,7 @@ class TuyaCache:
|
||||
self._lock.acquire()
|
||||
try:
|
||||
now = time()
|
||||
if not self._cached_status or now - self._cached_status_time > 30:
|
||||
if not self._cached_status or now - self._cached_status_time > 15:
|
||||
sleep(0.5)
|
||||
self._cached_status = self.__get_status()
|
||||
self._cached_status_time = time()
|
||||
@@ -118,10 +163,11 @@ class TuyaCache:
|
||||
class TuyaDevice(SwitchDevice):
|
||||
"""Representation of a Tuya switch."""
|
||||
|
||||
def __init__(self, device, name, icon, switchid, attr_current, attr_consumption, attr_voltage):
|
||||
def __init__(self, device, name, friendly_name, icon, switchid, attr_current, attr_consumption, attr_voltage):
|
||||
"""Initialize the Tuya switch."""
|
||||
self._device = device
|
||||
self._name = name
|
||||
self.entity_id = ENTITY_ID_FORMAT.format(name)
|
||||
self._name = friendly_name
|
||||
self._icon = icon
|
||||
self._switch_id = switchid
|
||||
self._attr_current = attr_current
|
||||
@@ -136,6 +182,7 @@ class TuyaDevice(SwitchDevice):
|
||||
"""Get name of Tuya switch."""
|
||||
return self._name
|
||||
|
||||
|
||||
@property
|
||||
def is_on(self):
|
||||
"""Check if Tuya switch is on."""
|
||||
@@ -146,11 +193,11 @@ class TuyaDevice(SwitchDevice):
|
||||
attrs = {}
|
||||
try:
|
||||
attrs[ATTR_CURRENT] = "{}".format(self._status['dps'][self._attr_current])
|
||||
#print('attrs[ATTR_CURRENT]: [{}]'.format(attrs[ATTR_CURRENT]))
|
||||
attrs[ATTR_CURRENT_CONSUMPTION] = "{}".format(self._status['dps'][self._attr_consumption]/10)
|
||||
#print('attrs[ATTR_CURRENT_CONSUMPTION]: [{}]'.format(attrs[ATTR_CURRENT_CONSUMPTION]))
|
||||
attrs[ATTR_VOLTAGE] = "{}".format(self._status['dps'][self._attr_voltage]/10)
|
||||
#print('attrs[ATTR_VOLTAGE]: [{}]'.format(attrs[ATTR_VOLTAGE]))
|
||||
# print('attrs[ATTR_CURRENT]: [{}]'.format(attrs[ATTR_CURRENT]))
|
||||
# print('attrs[ATTR_CURRENT_CONSUMPTION]: [{}]'.format(attrs[ATTR_CURRENT_CONSUMPTION]))
|
||||
# print('attrs[ATTR_VOLTAGE]: [{}]'.format(attrs[ATTR_VOLTAGE]))
|
||||
|
||||
except KeyError:
|
||||
pass
|
||||
|
Reference in New Issue
Block a user