diff --git a/rpi/main.py b/rpi/main.py index 98625534..eb500f77 100644 --- a/rpi/main.py +++ b/rpi/main.py @@ -7,9 +7,9 @@ from services.mqtt_service import MQTTService screen = Screen() service = MQTTService("127.0.0.1", 1883) -def publish(uid : int) : - screen.displayMessage(str(uid)) - service.publish("app", "/board-mate/rfid/scan", str(uid), 0) +def publish(chip_id : int) : + screen.displayMessage(str(chip_id)) + service.publish("app", "/board-mate/rfid/scan", str(chip_id), 0) if __name__ == "__main__": screen.enableBackground() diff --git a/rpi/services/mqtt_service.py b/rpi/services/mqtt_service.py index a69525e9..ffcb2530 100644 --- a/rpi/services/mqtt_service.py +++ b/rpi/services/mqtt_service.py @@ -9,16 +9,15 @@ class MQTTService: self.address = address self.port = port - def publish(self, client_id: str, topic: str, message: str, qos: int = 0): + def publish(self, client_id: str, topic: str, data: str, qos: int = 0): client = mqtt.Client(client_id=client_id) try: client.connect(self.address, self.port) client.loop_start() - data = str(message).encode() payload = { "timestamp": int(time.time()), - "data": base64.b64encode(data).decode('utf-8') + "data": data } result = client.publish(topic, json.dumps(payload), qos=qos) result.wait_for_publish()