From 6612fda85658fdaf0cd9e7e5c81717140ae7165e Mon Sep 17 00:00:00 2001 From: Gong Zhile Date: Mon, 14 Jul 2025 00:52:02 +0800 Subject: [PATCH] dxspot.py: refactor to use v1 api --- dxspot.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dxspot.py b/dxspot.py index 2a1f6c1..3dba430 100644 --- a/dxspot.py +++ b/dxspot.py @@ -44,14 +44,14 @@ class EsStatusTracker: ALL_TRACKERS = [EsStatusTracker(DX_BAND_OPEN_WINDOW, DX_BAND_OPEN_THRESHOLD)] -def on_connect(client, userdata, flags, reason_code, properties): - logging.info(f'Connected to MQTT broker: {reason_code}') +def on_connect(client, userdata, flags, rc): + logging.info(f'Connected to MQTT broker: {str(rc)}') for topic in PSKREPORT_TOPICS: client.subscribe(topic) def on_message(client, userdata, msg): try: - spot = json.loads(msg.payload) + spot = json.loads(msg.payload.decode()) tracker = ALL_TRACKERS[0] except: logging.warning('Failed to parse MQTT message, payload busted') @@ -71,8 +71,6 @@ def update_image(state, font_path=IMG_FONT, output=IMG_OUT_PATH): margin = 6 height = margin + 22 + 12 * 2 + margin - font_path = "FSEX302.ttf" - img = Image.new("RGB", (width, height), '#000000') draw = ImageDraw.Draw(img) @@ -103,8 +101,7 @@ def update_image(state, font_path=IMG_FONT, output=IMG_OUT_PATH): img.save(output) mqttc = mqtt_client.Client( - mqtt_client.CallbackAPIVersion.VERSION2, - f'dxspot-{MY_CALL}-{random.randint(0, 1000)}' + client_id=f'dxspot-{MY_CALL}-{random.randint(0, 1000)}' ) mqttc.on_connect = on_connect