Merge pull request #79 from sourcebots/run_uuid

Include run_uuid in state messages

Author: WillB97

runusb/__main__.py

@@ -175,7 +175,7 @@ def set_status(self, value: LedStatus) -> None:
             topic_prefix = MQTT_SETTINGS.active_config.topic_prefix
             mqtt_client.publish(
                 f'{topic_prefix}/state',
-                json.dumps({"state": value.name}),
+                json.dumps(dict(state=value.name, **MQTT_SETTINGS.extra_data)),
                 qos=1,
                 retain=True,
             )
@@ -363,10 +363,10 @@ def cleanup(self) -> None:
 
     def close(self) -> None:
         self.cleanup()
+        MQTT_SETTINGS.extra_data["run_uuid"] = ""  # Reset the run UUID
         LED_CONTROLLER.set_status(LedStatus.NoUSB)
         LED_CONTROLLER.set_code(False)
         USERCODE_LOGGER.removeHandler(self.handler)
-        MQTT_SETTINGS.extra_data["run_uuid"] = ""  # Reset the run UUID
         MQTT_SETTINGS.active_usercode = None
 
     def reset(self) -> None: