Removing troubleshooting artifacts
This commit is contained in:
@@ -486,12 +486,11 @@ def connect_mqtt():
|
|||||||
client.connect()
|
client.connect()
|
||||||
client_ref = client
|
client_ref = client
|
||||||
|
|
||||||
# Explicit subscriptions
|
# Subscriptions
|
||||||
client.subscribe(T_SET)
|
def _subscribe_all(c):
|
||||||
client.subscribe(T_ZERO)
|
c.subscribe("#")
|
||||||
client.subscribe(T_RESET_DISCOVERY) # Reset discovery flag
|
|
||||||
for gt in gauge_topics:
|
_subscribe_all(client)
|
||||||
client.subscribe(gt["set"])
|
|
||||||
|
|
||||||
_mqtt_connected = True
|
_mqtt_connected = True
|
||||||
info(f"MQTT connected client_id={MQTT_CLIENT_ID}")
|
info(f"MQTT connected client_id={MQTT_CLIENT_ID}")
|
||||||
@@ -535,17 +534,7 @@ def check_mqtt():
|
|||||||
client_ref.set_last_will(T_STATUS, b"offline", retain=True, qos=0)
|
client_ref.set_last_will(T_STATUS, b"offline", retain=True, qos=0)
|
||||||
client_ref.set_callback(on_message)
|
client_ref.set_callback(on_message)
|
||||||
client_ref.connect()
|
client_ref.connect()
|
||||||
client_ref.subscribe(T_SET)
|
_subscribe_all(client_ref)
|
||||||
client_ref.subscribe(T_ZERO)
|
|
||||||
client_ref.subscribe(T_RESET_DISCOVERY)
|
|
||||||
for gt in gauge_topics:
|
|
||||||
client_ref.subscribe(gt["set"])
|
|
||||||
client_ref.subscribe(gt["zero"])
|
|
||||||
client_ref.subscribe(gt["led_red"])
|
|
||||||
client_ref.subscribe(gt["led_green"])
|
|
||||||
client_ref.subscribe(gt["led_bl"])
|
|
||||||
client_ref.subscribe(gt["status_red"])
|
|
||||||
client_ref.subscribe(gt["status_green"])
|
|
||||||
_mqtt_connected = True
|
_mqtt_connected = True
|
||||||
info("MQTT reconnected!")
|
info("MQTT reconnected!")
|
||||||
publish_discovery(client_ref)
|
publish_discovery(client_ref)
|
||||||
|
|||||||
Reference in New Issue
Block a user