SissiFeng commited on
Commit
9804efa
·
verified ·
1 Parent(s): 60f3628

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +16 -9
app.py CHANGED
@@ -134,30 +134,36 @@ def get_data(serial=DEFAULT_SERIAL):
134
  )
135
 
136
 
137
- def send_print_parameters(nozzle_temp, bed_temp, print_speed, fan_speed):
138
- global bambu_client
 
139
 
140
  serial = DEFAULT_SERIAL
 
141
  logger.info(
142
- f"Sending parameters to {serial}: nozzle={nozzle_temp}, bed={bed_temp}, speed={print_speed}, fan={fan_speed}"
 
143
  )
 
144
  try:
145
  params = {
146
  "nozzle_temp": nozzle_temp,
147
  "bed_temp": bed_temp,
148
  "print_speed": print_speed,
149
  "fan_speed": fan_speed,
 
 
150
  }
151
 
152
  request_topic = f"bambu_a1_mini/request/{serial}"
153
 
154
- if bambu_client:
155
- bambu_client.publish(
156
  request_topic,
157
- json.dumps({"command": "set_parameters", "parameters": params}),
158
  )
159
- logger.info("Parameters sent successfully")
160
- return "Parameters sent successfully"
161
  else:
162
  logger.warning("MQTT not connected, parameters not sent")
163
  return "MQTT not connected, parameters not sent"
@@ -166,6 +172,7 @@ def send_print_parameters(nozzle_temp, bed_temp, print_speed, fan_speed):
166
  return f"Error sending parameters: {e}"
167
 
168
 
 
169
  def get_image_base64(image):
170
  if image is None:
171
  logger.warning("No image to encode")
@@ -314,7 +321,7 @@ with demo:
314
  <div style="position: relative; width: 100%; padding-top: 56.25%;">
315
  <iframe
316
  style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"
317
- src="https://www.youtube.com/embed/K1TJie3NmHM"
318
  title="Bambu A1mini Livestream"
319
  frameborder="0"
320
  allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
 
134
  )
135
 
136
 
137
+ def send_print_parameters(nozzle_temp, bed_temp, print_speed, fan_speed, infill_density, layer_height):
138
+
139
+ global rpi_client
140
 
141
  serial = DEFAULT_SERIAL
142
+
143
  logger.info(
144
+ f"Sending parameters to RPi for G-code generation: nozzle={nozzle_temp}, bed={bed_temp}, "
145
+ f"speed={print_speed}, fan={fan_speed}, infill={infill_density}, layer={layer_height}"
146
  )
147
+
148
  try:
149
  params = {
150
  "nozzle_temp": nozzle_temp,
151
  "bed_temp": bed_temp,
152
  "print_speed": print_speed,
153
  "fan_speed": fan_speed,
154
+ "infill_density": infill_density,
155
+ "layer_height": layer_height
156
  }
157
 
158
  request_topic = f"bambu_a1_mini/request/{serial}"
159
 
160
+ if rpi_client:
161
+ rpi_client.publish(
162
  request_topic,
163
+ json.dumps({"command": "generate_gcode", "parameters": params}),
164
  )
165
+ logger.info("Parameters sent successfully to RPi for G-code generation")
166
+ return "Parameters sent successfully to RPi"
167
  else:
168
  logger.warning("MQTT not connected, parameters not sent")
169
  return "MQTT not connected, parameters not sent"
 
172
  return f"Error sending parameters: {e}"
173
 
174
 
175
+
176
  def get_image_base64(image):
177
  if image is None:
178
  logger.warning("No image to encode")
 
321
  <div style="position: relative; width: 100%; padding-top: 56.25%;">
322
  <iframe
323
  style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"
324
+ src="https://www.youtube.com/embed/x8Iii1cKWB8"
325
  title="Bambu A1mini Livestream"
326
  frameborder="0"
327
  allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"