dxspot.py: refactor to use v1 api

这个提交包含在:
Gong Zhile 2025-07-14 00:52:02 +08:00
父节点 993dd0a7bd
当前提交 6612fda856

查看文件

@ -44,14 +44,14 @@ class EsStatusTracker:
ALL_TRACKERS = [EsStatusTracker(DX_BAND_OPEN_WINDOW, DX_BAND_OPEN_THRESHOLD)] ALL_TRACKERS = [EsStatusTracker(DX_BAND_OPEN_WINDOW, DX_BAND_OPEN_THRESHOLD)]
def on_connect(client, userdata, flags, reason_code, properties): def on_connect(client, userdata, flags, rc):
logging.info(f'Connected to MQTT broker: {reason_code}') logging.info(f'Connected to MQTT broker: {str(rc)}')
for topic in PSKREPORT_TOPICS: for topic in PSKREPORT_TOPICS:
client.subscribe(topic) client.subscribe(topic)
def on_message(client, userdata, msg): def on_message(client, userdata, msg):
try: try:
spot = json.loads(msg.payload) spot = json.loads(msg.payload.decode())
tracker = ALL_TRACKERS[0] tracker = ALL_TRACKERS[0]
except: except:
logging.warning('Failed to parse MQTT message, payload busted') 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 margin = 6
height = margin + 22 + 12 * 2 + margin height = margin + 22 + 12 * 2 + margin
font_path = "FSEX302.ttf"
img = Image.new("RGB", (width, height), '#000000') img = Image.new("RGB", (width, height), '#000000')
draw = ImageDraw.Draw(img) draw = ImageDraw.Draw(img)
@ -103,8 +101,7 @@ def update_image(state, font_path=IMG_FONT, output=IMG_OUT_PATH):
img.save(output) img.save(output)
mqttc = mqtt_client.Client( mqttc = mqtt_client.Client(
mqtt_client.CallbackAPIVersion.VERSION2, client_id=f'dxspot-{MY_CALL}-{random.randint(0, 1000)}'
f'dxspot-{MY_CALL}-{random.randint(0, 1000)}'
) )
mqttc.on_connect = on_connect mqttc.on_connect = on_connect