Merge pull request #193 from josh-shaw-dev/bug/circ-import-fix

Fix circ reference, import from pychonet #192
scottyphillips · Sep 15, 2024 · 68bbfa6 · 68bbfa6
2 parents 8fb3820 + c43479c
commit 68bbfa6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/custom_components/echonetlite/const.py b/custom_components/echonetlite/const.py
@@ -47,11 +47,10 @@
 from pychonet.EchonetInstance import ENL_STATUS, ENL_ON, ENL_OFF
 from pychonet.lib.const import ENL_CUMULATIVE_POWER, ENL_INSTANTANEOUS_POWER
 from pychonet.lib.epc_functions import DATA_STATE_CLOSE, DATA_STATE_OPEN
-
-from custom_components.echonetlite.fan import (
+from pychonet.CeilingFan import (
+    ENL_FANSPEED_PERCENT,
     ENL_FAN_DIRECTION,
     ENL_FAN_OSCILLATION,
-    ENL_FANSPEED_PERCENT,
 )
 
 DOMAIN = "echonetlite"

diff --git a/custom_components/echonetlite/fan.py b/custom_components/echonetlite/fan.py
@@ -8,15 +8,18 @@
     PRECISION_WHOLE,
 )
 from . import get_device_name
-from .const import CONF_FORCE_POLLING, DATA_STATE_ON, DOMAIN
+from .const import (
+    CONF_FORCE_POLLING,
+    DATA_STATE_ON,
+    DOMAIN,
+    ENL_FANSPEED,
+    ENL_FANSPEED_PERCENT,
+    ENL_FAN_DIRECTION,
+    ENL_FAN_OSCILLATION,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
-ENL_FANSPEED = 0xA0
-ENL_FANSPEED_PERCENT = 0xF0
-ENL_FAN_DIRECTION = 0xF1
-ENL_FAN_OSCILLATION = 0xF2
-
 DEFAULT_FAN_MODES = list(
     FAN_SPEED.keys()
 )  # ["auto","minimum","low","medium-low","medium","medium-high","high","very-high","max"]