Merge branch 'protocol_3.4' of github.com:rospogrigio/localtuya into protocol_3.4

custom_components/localtuya/common.py

@@ -25,18 +25,18 @@ from homeassistant.helpers.restore_state import RestoreEntity
 
 from . import pytuya
 from .const import (
+    ATTR_STATE,
     ATTR_UPDATED_AT,
+    CONF_DEFAULT_VALUE,
     CONF_LOCAL_KEY,
     CONF_MODEL,
+    CONF_PASSIVE_ENTITY,
     CONF_PROTOCOL_VERSION,
+    CONF_RESET_DPIDS,
+    CONF_RESTORE_ON_RECONNECT,
     DATA_CLOUD,
     DOMAIN,
     TUYA_DEVICES,
-    CONF_DEFAULT_VALUE,
-    ATTR_STATE,
-    CONF_RESTORE_ON_RECONNECT,
-    CONF_RESET_DPIDS,
-    CONF_PASSIVE_ENTITY,
 )
 
 _LOGGER = logging.getLogger(__name__)

custom_components/localtuya/config_flow.py

@@ -34,6 +34,7 @@ from .const import (
     CONF_DPS_STRINGS,
     CONF_EDIT_DEVICE,
     CONF_LOCAL_KEY,
+    CONF_MANUAL_DPS,
     CONF_MODEL,
     CONF_NO_CLOUD,
     CONF_PRODUCT_NAME,
@@ -45,7 +46,6 @@ from .const import (
     DATA_DISCOVERY,
     DOMAIN,
     PLATFORMS,
-    CONF_MANUAL_DPS,
 )
 from .discovery import discover
 

custom_components/localtuya/fan.py

@@ -27,12 +27,12 @@ from .const import (
     CONF_FAN_DIRECTION,
     CONF_FAN_DIRECTION_FWD,
     CONF_FAN_DIRECTION_REV,
+    CONF_FAN_DPS_TYPE,
     CONF_FAN_ORDERED_LIST,
     CONF_FAN_OSCILLATING_CONTROL,
     CONF_FAN_SPEED_CONTROL,
     CONF_FAN_SPEED_MAX,
     CONF_FAN_SPEED_MIN,
-    CONF_FAN_DPS_TYPE,
 )
 
 _LOGGER = logging.getLogger(__name__)

custom_components/localtuya/number.py

@@ -7,14 +7,13 @@ from homeassistant.components.number import DOMAIN, NumberEntity
 from homeassistant.const import CONF_DEVICE_CLASS, STATE_UNKNOWN
 
 from .common import LocalTuyaEntity, async_setup_entry
-
 from .const import (
-    CONF_MIN_VALUE,
-    CONF_MAX_VALUE,
     CONF_DEFAULT_VALUE,
+    CONF_MAX_VALUE,
+    CONF_MIN_VALUE,
+    CONF_PASSIVE_ENTITY,
     CONF_RESTORE_ON_RECONNECT,
     CONF_STEPSIZE_VALUE,
-    CONF_PASSIVE_ENTITY,
 )
 
 _LOGGER = logging.getLogger(__name__)

custom_components/localtuya/select.py

@@ -4,19 +4,15 @@ from functools import partial
 
 import voluptuous as vol
 from homeassistant.components.select import DOMAIN, SelectEntity
-from homeassistant.const import (
-    CONF_DEVICE_CLASS,
-    STATE_UNKNOWN,
-)
+from homeassistant.const import CONF_DEVICE_CLASS, STATE_UNKNOWN
 
 from .common import LocalTuyaEntity, async_setup_entry
-
 from .const import (
+    CONF_DEFAULT_VALUE,
     CONF_OPTIONS,
     CONF_OPTIONS_FRIENDLY,
-    CONF_DEFAULT_VALUE,
-    CONF_RESTORE_ON_RECONNECT,
     CONF_PASSIVE_ENTITY,
+    CONF_RESTORE_ON_RECONNECT,
 )
 
 

custom_components/localtuya/switch.py

@@ -9,14 +9,14 @@ from .common import LocalTuyaEntity, async_setup_entry
 from .const import (
     ATTR_CURRENT,
     ATTR_CURRENT_CONSUMPTION,
-    ATTR_VOLTAGE,
     ATTR_STATE,
+    ATTR_VOLTAGE,
     CONF_CURRENT,
     CONF_CURRENT_CONSUMPTION,
-    CONF_VOLTAGE,
     CONF_DEFAULT_VALUE,
-    CONF_RESTORE_ON_RECONNECT,
     CONF_PASSIVE_ENTITY,
+    CONF_RESTORE_ON_RECONNECT,
+    CONF_VOLTAGE,
 )
 
 _LOGGER = logging.getLogger(__name__)