williamp/localtuya-modded
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduced pytuya 7.0.9: Unified dev_type (device20 or device22) handling for all devices

Browse Source
This commit is contained in:
rospogrigio
2020-09-03 21:51:27 +02:00
parent fdefd70043
commit 16d8d4dcf9
4 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
custom_components/localtuya/cover.py
View File

@@ -39,7 +39,7 @@ _LOGGER = logging.getLogger(__name__)
DEFAULT_NAME = 'localtuyacover' DEFAULT_NAME = 'localtuyacover'
REQUIREMENTS = ['pytuya==7.0.8'] REQUIREMENTS = ['pytuya==7.0.9']
CONF_DEVICE_ID = 'device_id' CONF_DEVICE_ID = 'device_id'
CONF_LOCAL_KEY = 'local_key' CONF_LOCAL_KEY = 'local_key'

2
custom_components/localtuya/light.py
View File

@@ -31,7 +31,7 @@ from homeassistant.components.light import (
from homeassistant.util import color as colorutil from homeassistant.util import color as colorutil
import socket import socket
REQUIREMENTS = ['pytuya==7.0.8'] REQUIREMENTS = ['pytuya==7.0.9']
CONF_DEVICE_ID = 'device_id' CONF_DEVICE_ID = 'device_id'
CONF_LOCAL_KEY = 'local_key' CONF_LOCAL_KEY = 'local_key'

25
custom_components/localtuya/pytuya/__init__.py
View File

@@ -28,7 +28,7 @@ except ImportError:
import pyaes # https://github.com/ricmoo/pyaes import pyaes # https://github.com/ricmoo/pyaes
version_tuple = (7, 0, 8) version_tuple = (7, 0, 9)
version = version_string = __version__ = '%d.%d.%d' % version_tuple version = version_string = __version__ = '%d.%d.%d' % version_tuple
__author__ = 'rospogrigio' __author__ = 'rospogrigio'
@@ -149,7 +149,7 @@ payload_dict = {
} }
class XenonDevice(object): class XenonDevice(object):
def __init__(self, dev_id, address, local_key=None, dev_type=None, connection_timeout=10): def __init__(self, dev_id, address, local_key=None, connection_timeout=10):
""" """
Represents a Tuya device. Represents a Tuya device.
@@ -157,20 +157,21 @@ class XenonDevice(object):
dev_id (str): The device id. dev_id (str): The device id.
address (str): The network address. address (str): The network address.
local_key (str, optional): The encryption key. Defaults to None. local_key (str, optional): The encryption key. Defaults to None.
dev_type (str, optional): The device type.
It will be used as key for lookups in payload_dict.
Defaults to None.
Attributes: Attributes:
port (int): The port to connect to. port (int): The port to connect to.
""" """
self.id = dev_id self.id = dev_id
self.address = address self.address = address
self.local_key = local_key self.local_key = local_key
self.local_key = local_key.encode('latin1') self.local_key = local_key.encode('latin1')
self.dev_type = dev_type
self.connection_timeout = connection_timeout self.connection_timeout = connection_timeout
self.version = 3.1 self.version = 3.1
if len(dev_id) == 22:
self.dev_type = 'device22'
else:
self.dev_type = 'device20'
self.port = 6668 # default - do not expect caller to pass in self.port = 6668 # default - do not expect caller to pass in
@@ -433,11 +434,7 @@ class Device(XenonDevice):
class OutletDevice(Device): class OutletDevice(Device):
def __init__(self, dev_id, address, local_key=None): def __init__(self, dev_id, address, local_key=None):
if len(dev_id) == 22: super(OutletDevice, self).__init__(dev_id, address, local_key)
dev_type = 'device22'
else:
dev_type = 'device20'
super(OutletDevice, self).__init__(dev_id, address, local_key, dev_type)
class CoverEntity(Device): class CoverEntity(Device):
@@ -450,7 +447,6 @@ class CoverEntity(Device):
} }
def __init__(self, dev_id, address, local_key=None): def __init__(self, dev_id, address, local_key=None):
dev_type = 'device22'
print('%s version %s' % ( __name__, version)) print('%s version %s' % ( __name__, version))
print('Python %s on %s' % (sys.version, sys.platform)) print('Python %s on %s' % (sys.version, sys.platform))
if Crypto is None: if Crypto is None:
@@ -459,7 +455,7 @@ class CoverEntity(Device):
else: else:
print('Using PyCrypto ', Crypto.version_info) print('Using PyCrypto ', Crypto.version_info)
print('Using PyCrypto from ', Crypto.__file__) print('Using PyCrypto from ', Crypto.__file__)
super(CoverEntity, self).__init__(dev_id, address, local_key, dev_type) super(CoverEntity, self).__init__(dev_id, address, local_key)
def open_cover(self, switch=1): def open_cover(self, switch=1):
"""Turn the device on""" """Turn the device on"""
@@ -494,8 +490,7 @@ class BulbDevice(Device):
} }
def __init__(self, dev_id, address, local_key=None): def __init__(self, dev_id, address, local_key=None):
dev_type = 'device20' super(BulbDevice, self).__init__(dev_id, address, local_key)
super(BulbDevice, self).__init__(dev_id, address, local_key, dev_type)
@staticmethod @staticmethod
def _rgb_to_hexvalue(r, g, b): def _rgb_to_hexvalue(r, g, b):

2
custom_components/localtuya/switch.py
View File

@@ -35,7 +35,7 @@ from threading import Lock
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
REQUIREMENTS = ['pytuya==7.0.8'] REQUIREMENTS = ['pytuya==7.0.9']
CONF_DEVICE_ID = 'device_id' CONF_DEVICE_ID = 'device_id'
CONF_LOCAL_KEY = 'local_key' CONF_LOCAL_KEY = 'local_key'