j-woo commited on
Commit
57c979c
·
1 Parent(s): f5e0dd0
Files changed (1) hide show
  1. app.py +21 -10
app.py CHANGED
@@ -34,6 +34,12 @@ RPI_PORT = int(os.environ.get("RPI_PORT", 1883))
34
  RPI_USERNAME = os.environ.get("RPI_USERNAME", "default_user")
35
  RPI_PASSWORD = os.environ.get("RPI_PASSWORD", "default_pass")
36
 
 
 
 
 
 
 
37
  logger.info(
38
  f"MQTT Configuration: HOST={BAMBU_HOST}, PORT={BAMBU_PORT}, USERNAME={BAMBU_USERNAME}"
39
  )
@@ -51,23 +57,23 @@ rpi_client = None
51
  response_topic = None # Will be set dynamically
52
 
53
 
54
- def create_client(client_type, host, port, username, password):
55
  global bambu_client, rpi_client
56
  if client_type == "bambu":
57
  bambu_client = mqtt.Client()
58
- bambu_client.username_pw_set(username, password)
59
  bambu_client.tls_set(tls_version=mqtt.ssl.PROTOCOL_TLS)
60
  bambu_client.on_connect = on_connect
61
  bambu_client.on_message = bambu_on_message
62
- bambu_client.connect(host, port)
63
  bambu_client.loop_start()
64
  elif client_type == "rpi":
65
  rpi_client = mqtt.Client()
66
- rpi_client.username_pw_set(username, password)
67
  rpi_client.tls_set(tls_version=mqtt.ssl.PROTOCOL_TLS)
68
  rpi_client.on_connect = on_connect
69
  rpi_client.on_message = rpi_on_message
70
- rpi_client.connect(host, port)
71
  rpi_client.loop_start()
72
 
73
 
@@ -105,7 +111,7 @@ def get_data(serial=DEFAULT_SERIAL):
105
  global bambu_client, response_topic
106
 
107
  if bambu_client is None:
108
- create_client("bambu", BAMBU_HOST, BAMBU_PORT, BAMBU_USERNAME, BAMBU_PASSWORD)
109
 
110
  request_topic = f"bambu_a1_mini/request/{serial}"
111
  response_topic = f"bambu_a1_mini/response/{serial}"
@@ -217,7 +223,7 @@ def capture_image(url=None, use_test_image=False, test_image_name=None):
217
  global rpi_client, latest_data
218
 
219
  if rpi_client is None:
220
- create_client("rpi", BAMBU_HOST, BAMBU_PORT, BAMBU_USERNAME, BAMBU_PASSWORD)
221
 
222
  serial = DEFAULT_SERIAL
223
  request_topic = f"bambu_a1_mini/request/{serial}"
@@ -562,9 +568,14 @@ if __name__ == "__main__":
562
  logger.info("Starting Bambu A1 Mini Print Control application")
563
 
564
  try:
565
- logger.info("Initializing MQTT client")
566
- create_client("bambu", BAMBU_HOST, BAMBU_PORT, BAMBU_USERNAME, BAMBU_PASSWORD)
567
- create_client("rpi", RPI_HOST, RPI_PORT, RPI_USERNAME, RPI_PASSWORD)
 
 
 
 
 
568
  except Exception as e:
569
  logger.error(f"Failed to initialize MQTT: {e}")
570
 
 
34
  RPI_USERNAME = os.environ.get("RPI_USERNAME", "default_user")
35
  RPI_PASSWORD = os.environ.get("RPI_PASSWORD", "default_pass")
36
 
37
+ RPI_HOST = "248cc294c37642359297f75b7b023374.s2.eu.hivemq.cloud"
38
+ RPI_PORT = 8883
39
+ RPI_USERNAME = "sgbaird"
40
+ RPI_PASSWORD = "D.Pq5gYtejYbU#L"
41
+ DEFAULT_SERIAL = "0309CA471800852"
42
+
43
  logger.info(
44
  f"MQTT Configuration: HOST={BAMBU_HOST}, PORT={BAMBU_PORT}, USERNAME={BAMBU_USERNAME}"
45
  )
 
57
  response_topic = None # Will be set dynamically
58
 
59
 
60
+ def create_client(client_type):
61
  global bambu_client, rpi_client
62
  if client_type == "bambu":
63
  bambu_client = mqtt.Client()
64
+ bambu_client.username_pw_set(BAMBU_USERNAME, BAMBU_PASSWORD)
65
  bambu_client.tls_set(tls_version=mqtt.ssl.PROTOCOL_TLS)
66
  bambu_client.on_connect = on_connect
67
  bambu_client.on_message = bambu_on_message
68
+ bambu_client.connect(BAMBU_HOST, BAMBU_PORT)
69
  bambu_client.loop_start()
70
  elif client_type == "rpi":
71
  rpi_client = mqtt.Client()
72
+ rpi_client.username_pw_set(RPI_USERNAME, RPI_PASSWORD)
73
  rpi_client.tls_set(tls_version=mqtt.ssl.PROTOCOL_TLS)
74
  rpi_client.on_connect = on_connect
75
  rpi_client.on_message = rpi_on_message
76
+ rpi_client.connect(RPI_HOST, RPI_PORT)
77
  rpi_client.loop_start()
78
 
79
 
 
111
  global bambu_client, response_topic
112
 
113
  if bambu_client is None:
114
+ create_client("bambu")
115
 
116
  request_topic = f"bambu_a1_mini/request/{serial}"
117
  response_topic = f"bambu_a1_mini/response/{serial}"
 
223
  global rpi_client, latest_data
224
 
225
  if rpi_client is None:
226
+ create_client("rpi")
227
 
228
  serial = DEFAULT_SERIAL
229
  request_topic = f"bambu_a1_mini/request/{serial}"
 
568
  logger.info("Starting Bambu A1 Mini Print Control application")
569
 
570
  try:
571
+ logger.info("Initializing Bambu MQTT client")
572
+ create_client("bambu")
573
+ except Exception as e:
574
+ logger.error(f"Failed to initialize Bambu MQTT: {e}")
575
+
576
+ try:
577
+ logger.info("Initializing RPI MQTT client")
578
+ create_client("rpi")
579
  except Exception as e:
580
  logger.error(f"Failed to initialize MQTT: {e}")
581