summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/home/mqtt/module/temphum.py42
-rwxr-xr-xsrc/mqtt_node_util.py2
-rwxr-xr-xsrc/relay_mqtt_bot.py2
-rwxr-xr-xsrc/relay_mqtt_http_proxy.py5
4 files changed, 26 insertions, 25 deletions
diff --git a/src/home/mqtt/module/temphum.py b/src/home/mqtt/module/temphum.py
index 9cdfedb..5501f91 100644
--- a/src/home/mqtt/module/temphum.py
+++ b/src/home/mqtt/module/temphum.py
@@ -1,8 +1,8 @@
-from enum import auto
+# from enum import auto
from .._node import MqttNode
from .._module import MqttModule
from .._payload import MqttPayload
-from ...util import HashableEnum
+# from ...util import HashableEnum
from typing import Optional
from ...temphum import BaseSensor
@@ -23,25 +23,25 @@ class MqttTemphumDataPayload(MqttPayload):
error: int
-class MqttTempHumNodes(HashableEnum):
- KBN_SH_HALL = auto()
- KBN_SH_BATHROOM = auto()
- KBN_SH_LIVINGROOM = auto()
- KBN_SH_BEDROOM = auto()
-
- KBN_BH_2FL = auto()
- KBN_BH_2FL_STREET = auto()
- KBN_BH_1FL_LIVINGROOM = auto()
- KBN_BH_1FL_BEDROOM = auto()
- KBN_BH_1FL_BATHROOM = auto()
-
- KBN_NH_1FL_INV = auto()
- KBN_NH_1FL_CENTER = auto()
- KBN_NH_1LF_KT = auto()
- KBN_NH_1FL_DS = auto()
- KBN_NH_1FS_EZ = auto()
-
- SPB_FLAT120_CABINET = auto()
+# class MqttTempHumNodes(HashableEnum):
+# KBN_SH_HALL = auto()
+# KBN_SH_BATHROOM = auto()
+# KBN_SH_LIVINGROOM = auto()
+# KBN_SH_BEDROOM = auto()
+#
+# KBN_BH_2FL = auto()
+# KBN_BH_2FL_STREET = auto()
+# KBN_BH_1FL_LIVINGROOM = auto()
+# KBN_BH_1FL_BEDROOM = auto()
+# KBN_BH_1FL_BATHROOM = auto()
+#
+# KBN_NH_1FL_INV = auto()
+# KBN_NH_1FL_CENTER = auto()
+# KBN_NH_1LF_KT = auto()
+# KBN_NH_1FL_DS = auto()
+# KBN_NH_1FS_EZ = auto()
+#
+# SPB_FLAT120_CABINET = auto()
class MqttTempHumModule(MqttModule):
diff --git a/src/mqtt_node_util.py b/src/mqtt_node_util.py
index d7ee127..0af430a 100755
--- a/src/mqtt_node_util.py
+++ b/src/mqtt_node_util.py
@@ -5,7 +5,7 @@ from typing import Optional
from argparse import ArgumentParser, ArgumentError
from home.config import config
-from home.mqtt import MqttNode, MqttModule, MqttWrapper, get_mqtt_modules
+from home.mqtt import MqttNode, MqttWrapper, get_mqtt_modules
mqtt_node: Optional[MqttNode] = None
mqtt: Optional[MqttWrapper] = None
diff --git a/src/relay_mqtt_bot.py b/src/relay_mqtt_bot.py
index ebbff82..de5671c 100755
--- a/src/relay_mqtt_bot.py
+++ b/src/relay_mqtt_bot.py
@@ -34,6 +34,8 @@ status_emoji = {
'on': '✅',
'off': '❌'
}
+
+
mqtt_relay: Optional[MqttRelay] = None
relay_states: dict[str, MqttRelayState] = {}
diff --git a/src/relay_mqtt_http_proxy.py b/src/relay_mqtt_http_proxy.py
index 098facc..60d2963 100755
--- a/src/relay_mqtt_http_proxy.py
+++ b/src/relay_mqtt_http_proxy.py
@@ -2,9 +2,8 @@
from home import http
from home.config import config
from home.mqtt import MqttRelay, MqttRelayState
-from home.mqtt.esp import MqttEspDevice
-from home.mqtt.payload import MqttPayload
-from home.mqtt.payload.relay import InitialDiagnosticsPayload, DiagnosticsPayload
+from home.mqtt import MqttPayload
+from home.mqtt.module.diagnostics import InitialDiagnosticsPayload, DiagnosticsPayload
from typing import Optional
mqtt_relay: Optional[MqttRelay] = None