Merge branch 'main' into profile-fixes

resources/profiles/BBL.json

@@ -1,7 +1,7 @@
 {
     "name": "Bambulab",
     "url": "http://www.bambulab.com/Parameters/vendor/BBL.json",
-    "version": "01.09.00.04",
+    "version": "01.09.00.07",
     "force_update": "0",
     "description": "the initial version of BBL configurations",
     "machine_model_list": [

resources/profiles/BBL/filament/P1P/Bambu PLA Basic @BBL P1P 0.2 nozzle.json

@@ -11,6 +11,12 @@
     "fan_min_speed": [
         "50"
     ],
+    "filament_long_retractions_when_cut": [
+        "1"
+    ],
+    "filament_retraction_distances_when_cut": [
+        "18"
+    ],
     "filament_max_volumetric_speed": [
         "2"
     ],

resources/profiles/BBL/filament/P1P/Bambu PLA Basic @BBL P1P.json

@@ -8,6 +8,12 @@
     "fan_cooling_layer_time": [
         "80"
     ],
+    "filament_long_retractions_when_cut": [
+        "1"
+    ],
+    "filament_retraction_distances_when_cut": [
+        "18"
+    ],
     "fan_min_speed": [
         "50"
     ],

resources/profiles/BBL/filament/fdm_filament_abs.json

@@ -5,7 +5,7 @@
     "from": "system",
     "instantiation": "false",
     "activate_air_filtration": [
-        "1"
+        "0"
     ],
     "cool_plate_temp": [
         "0"

resources/profiles/BBL/filament/fdm_filament_asa.json

@@ -5,7 +5,7 @@
     "from": "system",
     "instantiation": "false",
     "activate_air_filtration": [
-        "1"
+        "0"
     ],
     "cool_plate_temp": [
         "0"

resources/profiles/BBL/machine/fdm_machine_common.json

@@ -12,6 +12,7 @@
     "deretraction_speed": [
         "40"
     ],
+    "enable_long_retraction_when_cut" : "0",
     "extruder_colour": [
         "#FCE94F"
     ],
@@ -20,6 +21,9 @@
     ],
     "gcode_flavor": "marlin",
     "silent_mode": "0",
+    "long_retractions_when_cut": [
+        "0"
+    ],
     "machine_max_acceleration_e": [
         "5000"
     ],
@@ -88,6 +92,9 @@
     "retract_when_changing_layer": [
         "1"
     ],
+    "retraction_distances_when_cut": [
+        "18"
+    ],
     "retraction_length": [
         "5"
     ],

resources/profiles/CONSTRUCT3D/machine/Construct 1 0.4 nozzle.json

@@ -14,8 +14,8 @@
 	"printer_variant": "0.4",
     "printable_area": [
         "0x0",
-        "230x0",
-        "230x260",
+        "225x0",
+        "225x260",
         "0x260"
     ],
 	"printable_height": "180",
@@ -62,7 +62,7 @@
         "40"
     ],
     "machine_end_gcode": ";Retract the filament\nG92 E1\nG1 E-5 F900\n;Move nozzle fast\nG1 X5 Y258 F15000\n;Move Bed Down\nG1 Z180 F6000\n\n;Set machine to idle\nM104 S0\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM84 ; disable motors",
-    "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM106 S0 ; Turn Fan off\nM204 S[machine_max_acceleration_extruding] T[machine_max_acceleration_retracting]\nM190 S[first_layer_bed_temperature] ; set bed temp\nM109 S160 ; set extruder temp\nG28 ; home all\nG1 Z15 F6000 ; move the printer down 15mm\nG1 Y1.0 Z0.3 F4000 ; move print head up\nM109 S[first_layer_temperature] ; set extruder temp\n\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\n;prime the extruder\nG1 X5 Y2 Z0.3 F6000; go to edge of build volume\nG1 X60 E10 F1000 ;gentle purge start\nG1 X110 E25 F1000; heavy purge\nG1 X60;",
+    "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM106 S0 ; Turn Fan off\nM204 S[machine_max_acceleration_extruding] T[machine_max_acceleration_retracting]\nM190 S[first_layer_bed_temperature] ; set bed temp\nM109 S160 ; set extruder temp\nM557 P5 X{adaptive_bed_mesh_min[0]}:{adaptive_bed_mesh_max[0]} Y{adaptive_bed_mesh_min[1]}:{adaptive_bed_mesh_max[1]} ; dynamic meshing\nG28 ; home all\nG1 Z15 F6000 ; move the printer down 15mm\nG1 Y1.0 Z0.3 F4000 ; move print head up\nM109 S[first_layer_temperature] ; set extruder temp\n\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\n;prime the extruder\nG1 X5 Y2 Z0.3 F6000; go to edge of build volume\nG1 X60 E10 F1000 ;gentle purge start\nG1 X110 E25 F1000; heavy purge\nG1 X60;",
     "max_layer_height": [
         "0.38"
     ],
@@ -73,11 +73,15 @@
         "0.7"
     ],
     "retraction_speed": [
-        "65"
+        "50"
     ],
 	    "z_hop": [
         "0.2"
     ],
+    "bed_mesh_max": "200,235",
+    "bed_mesh_min": "10,20",
+    "fan_kickstart": "0.5",
+    "fan_speedup_time": "1",
     "z_hop_types": [
         "Auto Lift"
     ]

resources/profiles/CONSTRUCT3D/machine/Construct 1 XL 0.6 nozzle.json

@@ -62,7 +62,7 @@
         "40"
     ],
 	"machine_end_gcode": ";Retract the filament\nG92 E1\nG1 E-5 F900\n;Move nozzle fast\nG1 X5 Y369 F15000\n;Move Bed Down\nG1 Z400 F6000\n\n;Set machine to idle\nT-1\nM104 S0\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM84 ; disable motors\n",
-    "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM106 S0 ; Turn Fan off\nM204 S[machine_max_acceleration_extruding] T[machine_max_acceleration_retracting]\nM190 S[first_layer_bed_temperature] ; set bed temp\nM109 S160 ; set extruder temp\nG28 ; home all\nG1 Z15 F6000 ; move the printer down 15mm\nG1 Y1.0 Z0.3 F4000 ; move print head up\nM109 S[first_layer_temperature] ; set extruder temp\n\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] T0 ; wait for extruder temp\n;prime the extruder\nG1 X5 Y2 Z0.3 F6000; go to edge of build volume\nG1 X60 E10 F1000 ;gentle purge start\nG1 X110 E25 F1000; heavy purge\nG1 X60;",
+    "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM106 S0 ; Turn Fan off\nM204 S[machine_max_acceleration_extruding] T[machine_max_acceleration_retracting]\nM190 S[first_layer_bed_temperature] ; set bed temp\nM109 S160 ; set extruder temp\nM557 P5 X{adaptive_bed_mesh_min[0]}:{adaptive_bed_mesh_max[0]} Y{adaptive_bed_mesh_min[1]}:{adaptive_bed_mesh_max[1]} ; dynamic meshing\nG28 ; home all\nG1 Z15 F6000 ; move the printer down 15mm\nG1 Y1.0 Z0.3 F4000 ; move print head up\nM109 S[first_layer_temperature] ; set extruder temp\n\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] T0 ; wait for extruder temp\n;prime the extruder\nG1 X5 Y2 Z0.3 F6000; go to edge of build volume\nG1 X60 E10 F1000 ;gentle purge start\nG1 X110 E25 F1000; heavy purge\nG1 X60;",
     "max_layer_height": [
         "0.6"
     ],
@@ -70,11 +70,15 @@
         "0.7"
     ],
     "retraction_speed": [
-        "65"
+        "50"
     ],
 	    "z_hop": [
         "0.2"
     ],
+    "bed_mesh_max": "320,330",
+    "bed_mesh_min": "10,20",
+    "fan_kickstart": "0.5",
+    "fan_speedup_time": "1",
     "z_hop_types": [
         "Auto Lift"
     ]

resources/profiles/CONSTRUCT3D/machine/fdm_machine_common.json

@@ -5,7 +5,7 @@
     "instantiation": "false",
     "printer_technology": "FFF",
     "deretraction_speed": [
-        "70"
+        "50"
     ],
     "extruder_colour": [
         "#003f87"
@@ -63,7 +63,7 @@
         "20"
     ],
     "machine_max_jerk_z": [
-        "0.5"
+        "0.2"
     ],
     "machine_min_extruding_rate": [
         "0"
@@ -86,7 +86,7 @@
     ],
     "printer_settings_id": "",
     "retraction_minimum_travel": [
-        "2"
+        "2.6"
     ],
     "retract_before_wipe": [
         "70%"
@@ -110,7 +110,7 @@
         "0"
     ],
     "retraction_speed": [
-        "70"
+        "50"
     ],
     "single_extruder_multi_material": "1",
     "change_filament_gcode": "",
@@ -119,7 +119,7 @@
     ],
 	"thumbnails_format": "QOI",
 	    "thumbnails": [
-        "300x300"
+        "160x160"
     ],
     "z_lift_type": "Auto Lift",
     "default_print_profile": "",