Local routine for subscribe_all fixed, us/ms fixed
This commit is contained in:
@@ -108,7 +108,7 @@ class Gauge:
|
|||||||
else:
|
else:
|
||||||
for _ in range(abs(delta)):
|
for _ in range(abs(delta)):
|
||||||
self._step(1 if delta > 0 else -1)
|
self._step(1 if delta > 0 else -1)
|
||||||
utime.sleep_ms(self._step_us)
|
utime.sleep_us(self._step_us)
|
||||||
|
|
||||||
self._current_step = target_step
|
self._current_step = target_step
|
||||||
|
|
||||||
|
|||||||
@@ -553,6 +553,21 @@ def on_message(topic, payload):
|
|||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
def _subscribe_all(c):
|
||||||
|
c.subscribe(f"{MQTT_PREFIX}/set")
|
||||||
|
c.subscribe(f"{MQTT_PREFIX}/zero")
|
||||||
|
c.subscribe(f"{MQTT_PREFIX}/resetdiscovery")
|
||||||
|
for i in range(num_gauges):
|
||||||
|
prefix = f"{MQTT_PREFIX}/gauge{i}"
|
||||||
|
c.subscribe(f"{prefix}/set")
|
||||||
|
c.subscribe(f"{prefix}/zero")
|
||||||
|
c.subscribe(f"{prefix}/led/red/set")
|
||||||
|
c.subscribe(f"{prefix}/led/green/set")
|
||||||
|
c.subscribe(f"{prefix}/led/backlight/set")
|
||||||
|
c.subscribe(f"{prefix}/status_led/red/set")
|
||||||
|
c.subscribe(f"{prefix}/status_led/green/set")
|
||||||
|
|
||||||
|
|
||||||
def connect_mqtt():
|
def connect_mqtt():
|
||||||
global client_ref, _mqtt_connected
|
global client_ref, _mqtt_connected
|
||||||
info(f"Connecting to MQTT broker {MQTT_BROKER}:{MQTT_PORT} ...")
|
info(f"Connecting to MQTT broker {MQTT_BROKER}:{MQTT_PORT} ...")
|
||||||
@@ -569,22 +584,6 @@ def connect_mqtt():
|
|||||||
client.set_callback(on_message)
|
client.set_callback(on_message)
|
||||||
client.connect()
|
client.connect()
|
||||||
client_ref = client
|
client_ref = client
|
||||||
|
|
||||||
# Subscriptions - skip state/status topics to avoid receiving own publishes
|
|
||||||
def _subscribe_all(c):
|
|
||||||
c.subscribe(f"{MQTT_PREFIX}/set")
|
|
||||||
c.subscribe(f"{MQTT_PREFIX}/zero")
|
|
||||||
c.subscribe(f"{MQTT_PREFIX}/resetdiscovery")
|
|
||||||
for i in range(num_gauges):
|
|
||||||
prefix = f"{MQTT_PREFIX}/gauge{i}"
|
|
||||||
c.subscribe(f"{prefix}/set")
|
|
||||||
c.subscribe(f"{prefix}/zero")
|
|
||||||
c.subscribe(f"{prefix}/led/red/set")
|
|
||||||
c.subscribe(f"{prefix}/led/green/set")
|
|
||||||
c.subscribe(f"{prefix}/led/backlight/set")
|
|
||||||
c.subscribe(f"{prefix}/status_led/red/set")
|
|
||||||
c.subscribe(f"{prefix}/status_led/green/set")
|
|
||||||
|
|
||||||
_subscribe_all(client)
|
_subscribe_all(client)
|
||||||
|
|
||||||
_mqtt_connected = True
|
_mqtt_connected = True
|
||||||
|
|||||||
Reference in New Issue
Block a user