update

app.py

@@ -38,8 +38,8 @@ client = None
 latest_data = {
     "bed_temperature": "N/A",
     "nozzle_temperature": "N/A",
-    "status": "Disconnected",
-    "update_time": "Not connected"
+    "status": "N/A",
+    "update_time": "Waiting for data..."
 }
 
 # Initialize analysis components
@@ -97,56 +97,20 @@ def create_3mf_package(gcode_content: str, gcode_filename: str = "Metadata/plate
     zip_buffer.seek(0)
     return zip_buffer
 
-def create_client(host, port, username, password, max_retries=3):
-    """Create MQTT client with retry mechanism"""
+def create_client(host, port, username, password):
     global client
-    
-    for attempt in range(max_retries):
-        try:
-            client = mqtt.Client(protocol=mqtt.MQTTv311)
-            client.username_pw_set(username, password)
-            client.tls_set(tls_version=mqtt.ssl.PROTOCOL_TLS)
-            client.on_connect = on_connect
-            client.on_message = on_message
-            client.on_disconnect = on_disconnect
-            
-            print(f"Attempting to connect to MQTT broker (attempt {attempt + 1}/{max_retries})")
-            client.connect(host, port, keepalive=60)
-            client.loop_start()
-            return True
-            
-        except Exception as e:
-            print(f"Connection attempt {attempt + 1} failed: {e}")
-            if client:
-                client.loop_stop()
-                client = None
-            if attempt < max_retries - 1:
-                time.sleep(5)
-    
-    print("Failed to connect to MQTT broker after all attempts")
-    return False
+    client = mqtt.Client()
+    client.username_pw_set(username, password)
+    client.tls_set(tls_version=mqtt.ssl.PROTOCOL_TLS)
+    client.on_connect = on_connect
+    client.on_message = on_message
+    client.connect(host, port)
+    client.loop_start()
 
 def on_connect(client, userdata, flags, rc):
-    """Callback when connected to MQTT broker"""
-    if rc == 0:
-        print("Successfully connected to MQTT broker")
-        response_topic = f"bambu_a1_mini/response/{PRINTER_SERIAL}"
-        request_topic = f"bambu_a1_mini/request/{PRINTER_SERIAL}"
-        client.subscribe(response_topic)
-        print(f"Subscribed to {response_topic}")
-        
-        # Send initial request
-        client.publish(request_topic, json.dumps("HI"))
-        
-        # Update status
-        global latest_data
-        latest_data["status"] = "Connected"
-        latest_data["update_time"] = time.strftime("%Y-%m-%d %H:%M:%S")
-    else:
-        print(f"Failed to connect to MQTT broker with code: {rc}")
+    print(f"Connected with result code {rc}")
 
 def on_message(client, userdata, message):
-    """Handle incoming MQTT messages"""
     global latest_data
     print("Received message")
     try:
@@ -154,146 +118,45 @@ def on_message(client, userdata, message):
         latest_data["bed_temperature"] = data.get("bed_temperature", "N/A")
         latest_data["nozzle_temperature"] = data.get("nozzle_temperature", "N/A")
         latest_data["status"] = data.get("status", "N/A")
-        latest_data["update_time"] = time.strftime("%Y-%m-%d %H:%M:%S")
+        latest_data["update_time"] = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
     except Exception as e:
         print(f"Error parsing MQTT message: {e}")
 
-def on_disconnect(client, userdata, rc):
-    """Callback when disconnected from MQTT broker"""
-    print("Disconnected from MQTT broker")
-    global latest_data
-    latest_data["status"] = "Disconnected"
-    latest_data["update_time"] = time.strftime("%Y-%m-%d %H:%M:%S")
-    
-    if rc != 0:
-        print("Unexpected disconnection. Attempting to reconnect...")
-        create_client(HOST, PORT, USERNAME, PASSWORD)
-
-def send_print_command(params):
-    """Send print parameters to Pi 4B"""
-    command = create_print_command(params)
-    mqtt_client.publish(TOPICS['printer']['command'], json.dumps(command))
-    logger.info(f"Print command sent for square {params.get('square_id')}")
-    return "Print command sent successfully"
-
-def send_camera_command(square_id: str):
-    """Send capture command to Pi Zero"""
-    command = create_capture_command(square_id)
-    mqtt_client.publish(TOPICS['camera']['command'], json.dumps(command))
-    logger.info(f"Camera command sent for square {square_id}")
-    return "Camera command sent successfully"
-
-def send_print_parameters(nozzle_temp, bed_temp, print_speed, fan_speed):
-    """Send new print parameters to printer"""
-    try:
-        params = {
-            'nozzle_temp': nozzle_temp,
-            'bed_temp': bed_temp,
-            'print_speed': print_speed,
-            'fan_speed': fan_speed
-        }
-        
-        request_topic = f"bambu_a1_mini/request/{PRINTER_SERIAL}"
-        if client:
-            client.publish(request_topic, json.dumps({
-                'command': 'set_parameters',
-                'parameters': params
-            }))
-            return "Parameters sent successfully"
-        return "MQTT not connected"
-    except Exception as e:
-        return f"Error sending parameters: {e}"
-
-# Initialize MQTT client
-try:
-    mqtt_connected = create_client(HOST, PORT, USERNAME, PASSWORD)
-    if not mqtt_connected:
-        print("Warning: Starting without MQTT connection")
-except Exception as e:
-    print(f"Warning: Failed to initialize MQTT: {e}")
-
-def update_status():
-    """Update printer status display"""
+def get_data():
+    """Request data from the MQTT broker."""
+    global client
     if client is None:
-        return "N/A", "N/A", "Disconnected", "Not connected"
-    
-    try:
-        request_topic = f"bambu_a1_mini/request/{PRINTER_SERIAL}"
-        client.publish(request_topic, json.dumps("HI"))
-        
-        return (
-            latest_data["nozzle_temperature"],
-            latest_data["bed_temperature"],
-            latest_data["status"],
-            latest_data["update_time"]
-        )
-    except Exception as e:
-        print(f"Status update error: {e}")
-        return "N/A", "N/A", "Error", str(e)
+        create_client(HOST, PORT, USERNAME, PASSWORD)
 
-def analyze_print(image, nozzle_temp, bed_temp, print_speed, fan_speed):
-    """Analyze print quality and return evaluation results"""
-    if image is None:
-        return None, 0, 0, 0, 0, 0, 0, 0, 0
-    
-    # Package current parameters
-    current_params = {
-        'nozzle_temp': float(nozzle_temp),
-        'bed_temp': float(bed_temp),
-        'print_speed': float(print_speed),
-        'fan_speed': float(fan_speed)
-    }
+    serial = "0309CA471800852"
+    request_topic = f"bambu_a1_mini/request/{serial}"
+    response_topic = f"bambu_a1_mini/response/{serial}"
     
-    # Analyze print quality
-    analysis_results = detector.analyze_print(image)
+    print(f"Subscribing to {response_topic}")
+    client.subscribe(response_topic)
     
-    # Get optimization results
-    results = optimizer.evaluate_objectives(image, current_params)
-    
-    # Calculate quality metrics
-    metrics = detector.calculate_quality_metrics(image)
+    # Send a request to get data
+    client.publish(request_topic, json.dumps("HI"))
     
     return (
-        analysis_results['binary_mask'],  # Visualization
-        float(metrics['missing_rate']),
-        float(metrics['excess_rate']),
-        float(metrics['stringing_rate']),
-        float(metrics['uniformity_score']),
-        float(analysis_results['quality_score']),
-        float(results['objectives']['speed']),
-        float(results['objectives']['material']),
-        float(results['objectives']['total'])
+        latest_data["status"],
+        latest_data["bed_temperature"],
+        latest_data["nozzle_temperature"],
+        latest_data["update_time"]
     )
 
 # Gradio interface
 with gr.Blocks(title="Bambu A1 Mini Print Analysis") as demo:
     gr.Markdown("# Bambu A1 Mini Print Quality Analysis")
     
-    # Current printer parameters display
     with gr.Row():
-        current_nozzle_temp = gr.Textbox(
-            label="Current Nozzle Temperature",
-            value="N/A",
-            interactive=False
-        )
-        current_bed_temp = gr.Textbox(
-            label="Current Bed Temperature",
-            value="N/A",
-            interactive=False
-        )
-        current_status = gr.Textbox(
-            label="Printer Status",
-            value="N/A",
-            interactive=False
-        )
-        last_update = gr.Textbox(
-            label="Last Update",
-            value="N/A",
-            interactive=False
-        )
-    
+        current_nozzle_temp = gr.Textbox(label="Current Nozzle Temperature", value="N/A", interactive=False)
+        current_bed_temp = gr.Textbox(label="Current Bed Temperature", value="N/A", interactive=False)
+        current_status = gr.Textbox(label="Printer Status", value="N/A", interactive=False)
+        last_update = gr.Textbox(label="Last Update", value="N/A", interactive=False)
+
     refresh_btn = gr.Button("Refresh Status")
-    
+
     with gr.Row():
         # show S3 image
         s3_image = gr.Image(
@@ -305,37 +168,21 @@ with gr.Blocks(title="Bambu A1 Mini Print Analysis") as demo:
             label="Current Print Image",
             type="numpy"
         )
-    
+
     with gr.Row():
         with gr.Column():
             # Print parameter inputs
-            nozzle_temp = gr.Slider(
-                minimum=180, maximum=250, step=1, 
-                value=200,
-                label="Nozzle Temperature (°C)"
-            )
-            bed_temp = gr.Slider(
-                minimum=40, maximum=100, step=1,
-                value=60,
-                label="Bed Temperature (°C)"
-            )
-            print_speed = gr.Slider(
-                minimum=20, maximum=150, step=1,
-                value=60,
-                label="Print Speed (mm/s)"
-            )
-            fan_speed = gr.Slider(
-                minimum=0, maximum=100, step=1,
-                value=100,
-                label="Fan Speed (%)"
-            )
+            nozzle_temp = gr.Slider(minimum=180, maximum=250, step=1, value=200, label="Nozzle Temperature (°C)")
+            bed_temp = gr.Slider(minimum=40, maximum=100, step=1, value=60, label="Bed Temperature (°C)")
+            print_speed = gr.Slider(minimum=20, maximum=150, step=1, value=60, label="Print Speed (mm/s)")
+            fan_speed = gr.Slider(minimum=0, maximum=100, step=1, value=100, label="Fan Speed (%)")
             
             # Buttons
             with gr.Row():
                 capture_btn = gr.Button("Capture Image")
                 analyze_btn = gr.Button("Analyze Print")
-                send_params_btn = gr.Button("Send Print Parameters")  # 新增按钮
-        
+                send_params_btn = gr.Button("Send Print Parameters")
+
         with gr.Column():
             # Results visualization
             result_image = gr.Image(label="Analysis Result")
@@ -398,38 +245,17 @@ with gr.Blocks(title="Bambu A1 Mini Print Analysis") as demo:
     )
     
     # connect refresh button
-    def update_status():
-        """Update printer status display"""
-        return (
-            latest_data["nozzle_temperature"],
-            latest_data["bed_temperature"],
-            latest_data["status"],
-            latest_data["update_time"]
-        )
-
-    refresh_btn.click(
-        fn=update_status,
-        outputs=[
-            current_nozzle_temp,
-            current_bed_temp,
-            current_status,
-            last_update
-        ]
-    )
+    refresh_btn.click(fn=get_data, outputs=[current_status, current_bed_temp, current_nozzle_temp, last_update])
 
     # Auto refresh
     def auto_refresh():
         while True:
-            try:
-                time.sleep(5)
-                values = update_status()
-                current_nozzle_temp.value = values[0]
-                current_bed_temp.value = values[1]
-                current_status.value = values[2]
-                last_update.value = values[3]
-            except Exception as e:
-                print(f"Auto refresh error: {e}")
-                continue
+            time.sleep(5)
+            status, bed_temp, nozzle_temp, update_time = get_data()
+            current_status.value = status
+            current_bed_temp.value = bed_temp
+            current_nozzle_temp.value = nozzle_temp
+            last_update.value = update_time
 
     threading.Thread(target=auto_refresh, daemon=True).start()
 
@@ -440,27 +266,61 @@ with gr.Blocks(title="Bambu A1 Mini Print Analysis") as demo:
         outputs=[current_status]
     )
 
-def handle_print_workflow(params):
-    """Coordinate print and capture workflow"""
+def analyze_print(image, nozzle_temp, bed_temp, print_speed, fan_speed):
+    """Analyze print quality and return evaluation results"""
+    if image is None:
+        return None, 0, 0, 0, 0, 0, 0, 0, 0
+    
+    # Package current parameters
+    current_params = {
+        'nozzle_temp': float(nozzle_temp),
+        'bed_temp': float(bed_temp),
+        'print_speed': float(print_speed),
+        'fan_speed': float(fan_speed)
+    }
+    
+    # Analyze print quality
+    analysis_results = detector.analyze_print(image)
+    
+    # Get optimization results
+    results = optimizer.evaluate_objectives(image, current_params)
+    
+    # Calculate quality metrics
+    metrics = detector.calculate_quality_metrics(image)
+    
+    return (
+        analysis_results['binary_mask'],  # Visualization
+        float(metrics['missing_rate']),
+        float(metrics['excess_rate']),
+        float(metrics['stringing_rate']),
+        float(metrics['uniformity_score']),
+        float(analysis_results['quality_score']),
+        float(results['objectives']['speed']),
+        float(results['objectives']['material']),
+        float(results['objectives']['total'])
+    )
+
+def send_print_parameters(nozzle_temp, bed_temp, print_speed, fan_speed):
+    """Send new print parameters to printer"""
     try:
-        # 1. Send print command to Pi 4B
-        printer_command = create_print_command(params)
-        mqtt_client.publish(TOPICS['printer']['command'], json.dumps(printer_command))
-        
-        # 2. Wait for printer ready status
-        # (handle by on_message callback)
-        
-        # 3. Send capture command to Pi Zero
-        camera_command = create_capture_command(params['square_id'])
-        mqtt_client.publish(TOPICS['camera']['command'], json.dumps(camera_command))
-        
-        # 4. Wait for image URL
-        # (handle by on_message callback)
+        params = {
+            'nozzle_temp': nozzle_temp,
+            'bed_temp': bed_temp,
+            'print_speed': print_speed,
+            'fan_speed': fan_speed
+        }
         
-        return "Workflow started successfully"
+        request_topic = f"bambu_a1_mini/request/{PRINTER_SERIAL}"
+        if client:
+            client.publish(request_topic, json.dumps({
+                'command': 'set_parameters',
+                'parameters': params
+            }))
+            return "Parameters sent successfully"
+        return "MQTT not connected"
     except Exception as e:
-        return f"Error: {str(e)}"
+        return f"Error sending parameters: {e}"
 
 # Launch the app
 if __name__ == "__main__":
-    demo.launch(ssr=False) 
+    demo.launch()