refactor Voron configs a bit

SoftFever · Jul 26, 2022 · 1f95ac1 · 1f95ac1
1 parent 06dec4d
commit 1f95ac1
Show file tree

Hide file tree

Showing 15 changed files with 191 additions and 187 deletions.
diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json
@@ -119,6 +119,10 @@
  "name": "0.40mm Standard @BBL X1C 0.8 nozzle",
  "sub_path": "process/0.40mm Standard @BBL X1C 0.8 nozzle.json"
  },
+ {
+ "name": "fdm_process_voron_common",
+ "sub_path": "process/fdm_process_voron_common.json"
+ },
  {
  "name": "0.08mm Extra Fine @Voron",
  "sub_path": "process/0.08mm Extra Fine @Voron.json"
@@ -128,8 +132,8 @@
  "sub_path": "process/0.12mm Fine @Voron.json"
  },
  {
- "name": "0.16mm Optimal @Voron",
- "sub_path": "process/0.16mm Optimal @Voron.json"
+ "name": "0.15mm Optimal @Voron",
+ "sub_path": "process/0.15mm Optimal @Voron.json"
  },
  {
  "name": "0.20mm Standard @Voron",
@@ -403,6 +407,10 @@
  "name": "Bambu Lab X1 Carbon 0.8 nozzle",
  "sub_path": "machine/Bambu Lab X1 Carbon 0.8 nozzle.json"
  },
+ {
+ "name": "fdm_klipper_common",
+ "sub_path": "machine/fdm_klipper_common.json"
+ },
  {
  "name": "Voron 2.4 250 0.4 nozzle",
  "sub_path": "machine/Voron 2.4 250 0.4 nozzle.json"

diff --git a/resources/profiles/BBL/machine/Anycubic 4Max Pro 0.4 nozzle.json b/resources/profiles/BBL/machine/Anycubic 4Max Pro 0.4 nozzle.json
@@ -4,32 +4,14 @@
  "name": "Anycubic 4Max Pro 0.4 nozzle",
  "from": "system",
  "instantiation": "true",
- "inherits": "fdm_bbl_3dp_001_common",
+ "inherits": "fdm_klipper_common",
  "printer_model": "Anycubic 4Max Pro",
- "default_filament_profile": [
- "Bambu PLA Basic @BBL X1"
- ],
- "default_print_profile": "0.20mm Standard @A4MaxPro",
- "nozzle_diameter": [
- "0.4"
- ],
- "bed_exclude_area": [
- "0x0"
- ],
  "printable_area": [
  "0x0",
  "270x0",
  "270x205",
  "0x205"
  ],
- "printable_height": "200",
- "machine_start_gcode": "PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]",
- "machine_end_gcode": "PRINT_END",
- "layer_change_gcode": "",
- "scan_first_layer": "0",
- "machine_load_filament_time": "17",
- "machine_unload_filament_time": "16",
- "nozzle_type": "hardened_steel",
- "auxiliary_fan": "0"
+ "printable_height": "200"
  }
 
diff --git a/resources/profiles/BBL/machine/Voron 2.4 250 0.4 nozzle.json b/resources/profiles/BBL/machine/Voron 2.4 250 0.4 nozzle.json
@@ -4,31 +4,13 @@
  "name": "Voron 2.4 250 0.4 nozzle",
  "from": "system",
  "instantiation": "true",
- "inherits": "fdm_bbl_3dp_001_common",
+ "inherits": "fdm_klipper_common",
  "printer_model": "Voron 2.4 250",
- "default_filament_profile": [
- "Bambu PLA Basic @BBL X1"
- ],
- "default_print_profile": "0.20mm Standard @Voron",
- "nozzle_diameter": [
- "0.4"
- ],
- "bed_exclude_area": [
- "0x0"
- ],
  "printable_area": [
  "0x0",
  "250x0",
  "250x250",
  "0x250"
  ],
- "printable_height": "225",
- "machine_start_gcode": "PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]",
- "machine_end_gcode": "PRINT_END",
- "layer_change_gcode": "",
- "scan_first_layer": "0",
- "machine_load_filament_time": "17",
- "machine_unload_filament_time": "16",
- "nozzle_type": "hardened_steel",
- "auxiliary_fan": "0"
+ "printable_height": "225"
 }
diff --git a/resources/profiles/BBL/machine/Voron 2.4 300 0.4 nozzle.json b/resources/profiles/BBL/machine/Voron 2.4 300 0.4 nozzle.json
@@ -4,31 +4,13 @@
  "name": "Voron 2.4 300 0.4 nozzle",
  "from": "system",
  "instantiation": "true",
- "inherits": "fdm_bbl_3dp_001_common",
+ "inherits": "fdm_klipper_common",
  "printer_model": "Voron 2.4 300",
- "default_filament_profile": [
- "Bambu PLA Basic @BBL X1"
- ],
- "default_print_profile": "0.20mm Standard @Voron",
- "nozzle_diameter": [
- "0.4"
- ],
- "bed_exclude_area": [
- "0x0"
- ],
  "printable_area": [
  "0x0",
  "300x0",
  "300x300",
  "0x300"
  ],
- "printable_height": "275",
- "machine_start_gcode": "PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]",
- "machine_end_gcode": "PRINT_END",
- "layer_change_gcode": "",
- "scan_first_layer": "0",
- "machine_load_filament_time": "17",
- "machine_unload_filament_time": "16",
- "nozzle_type": "hardened_steel",
- "auxiliary_fan": "0"
+ "printable_height": "275"
 }
diff --git a/resources/profiles/BBL/machine/Voron 2.4 350 0.4 nozzle.json b/resources/profiles/BBL/machine/Voron 2.4 350 0.4 nozzle.json
@@ -4,31 +4,13 @@
  "name": "Voron 2.4 350 0.4 nozzle",
  "from": "system",
  "instantiation": "true",
- "inherits": "fdm_bbl_3dp_001_common",
+ "inherits": "fdm_klipper_common",
  "printer_model": "Voron 2.4 350",
- "default_filament_profile": [
- "Bambu PLA Basic @BBL X1"
- ],
- "default_print_profile": "0.20mm Standard @Voron",
- "nozzle_diameter": [
- "0.4"
- ],
- "bed_exclude_area": [
- "0x0"
- ],
  "printable_area": [
  "0x0",
  "350x0",
  "350x350",
  "0x350"
  ],
- "printable_height": "325",
- "machine_start_gcode": "PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]",
- "machine_end_gcode": "PRINT_END",
- "layer_change_gcode": "",
- "scan_first_layer": "0",
- "machine_load_filament_time": "17",
- "machine_unload_filament_time": "16",
- "nozzle_type": "hardened_steel",
- "auxiliary_fan": "0"
+ "printable_height": "325"
 }
diff --git a/resources/profiles/BBL/machine/fdm_klipper_common.json b/resources/profiles/BBL/machine/fdm_klipper_common.json
@@ -0,0 +1,24 @@
+{
+ "type": "machine",
+ "name": "fdm_klipper_common",
+ "from": "system",
+ "instantiation": "false",
+ "inherits": "fdm_bbl_3dp_001_common",
+ "default_filament_profile": [
+ "Bambu PLA Basic @BBL X1C"
+ ],
+ "default_print_profile": "0.20mm Standard @Voron",
+ "nozzle_diameter": [
+ "0.4"
+ ],
+ "bed_exclude_area": [
+ "0x0"
+ ],
+ "machine_start_gcode": "PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]",
+ "machine_end_gcode": "PRINT_END",
+ "layer_change_gcode": "",
+ "scan_first_layer": "0",
+ "nozzle_type": "hardened_steel",
+ "auxiliary_fan": "0"
+ }
+
diff --git a/resources/profiles/BBL/process/0.08mm Extra Fine @Voron.json b/resources/profiles/BBL/process/0.08mm Extra Fine @Voron.json
@@ -4,20 +4,8 @@
  "name": "0.08mm Extra Fine @Voron",
  "from": "system",
  "instantiation": "true",
- "inherits": "fdm_process_bbl_0.08",
- "initial_layer_speed": "50",
- "initial_layer_infill_speed": "105",
- "outer_wall_speed": "120",
- "inner_wall_speed": "200",
- "sparse_infill_speed": "300",
- "internal_solid_infill_speed": "200",
- "top_surface_speed": "100",
- "gap_infill_speed": "100",
- "travel_speed": "350",
- "compatible_printers": [
- "Voron 2.4 250 0.4 nozzle",
- "Voron 2.4 300 0.4 nozzle",
- "Voron 2.4 350 0.4 nozzle",
- "Voron 0.1 0.4 nozzle"
- ]
-}
+ "inherits": "fdm_process_voron_common",
+ "layer_height": "0.08",
+ "bottom_shell_layers": "7",
+ "top_shell_layers": "9"
+}
diff --git a/resources/profiles/BBL/process/0.12mm Fine @Voron.json b/resources/profiles/BBL/process/0.12mm Fine @Voron.json
@@ -4,20 +4,8 @@
  "name": "0.12mm Fine @Voron",
  "from": "system",
  "instantiation": "true",
- "inherits": "fdm_process_bbl_0.12",
- "initial_layer_speed": "50",
- "initial_layer_infill_speed": "105",
- "outer_wall_speed": "120",
- "inner_wall_speed": "200",
- "sparse_infill_speed": "300",
- "internal_solid_infill_speed": "200",
- "top_surface_speed": "100",
- "gap_infill_speed": "100",
- "travel_speed": "350",
- "compatible_printers": [
- "Voron 2.4 250 0.4 nozzle",
- "Voron 2.4 300 0.4 nozzle",
- "Voron 2.4 350 0.4 nozzle",
- "Voron 0.1 0.4 nozzle"
- ]
+ "inherits": "fdm_process_voron_common",
+ "layer_height": "0.12",
+ "bottom_shell_layers": "5",
+ "top_shell_layers": "6"
 }
diff --git a/resources/profiles/BBL/process/0.15mm Optimal @Voron.json b/resources/profiles/BBL/process/0.15mm Optimal @Voron.json
@@ -0,0 +1,11 @@
+{
+ "type": "process",
+ "setting_id": "GP003",
+ "name": "0.15mm Optimal @Voron",
+ "from": "system",
+ "instantiation": "true",
+ "inherits": "fdm_process_voron_common",
+ "bottom_shell_layers": "4",
+ "top_shell_layers": "5",
+ "layer_height": "0.15"
+}
diff --git a/resources/profiles/BBL/process/0.16mm Optimal @Voron.json b/resources/profiles/BBL/process/0.16mm Optimal @Voron.json
diff --git a/resources/profiles/BBL/process/0.20mm Standard @A4MaxPro.json b/resources/profiles/BBL/process/0.20mm Standard @A4MaxPro.json
@@ -7,13 +7,19 @@
  "inherits": "fdm_process_bbl_0.20",
  "initial_layer_speed": "45",
  "initial_layer_infill_speed": "60",
- "outer_wall_speed": "60",
+ "outer_wall_speed": "50",
  "inner_wall_speed": "80",
  "sparse_infill_speed": "80",
  "internal_solid_infill_speed": "80",
  "top_surface_speed": "50",
  "gap_infill_speed": "40",
  "travel_speed": "200",
+ "brim_type": "no_brim",
+ "default_acceleration": "1900",
+ "enable_prime_tower": "0",
+ "enable_support": "0",
+ "initial_layer_acceleration": "1900",
+ "top_surface_acceleration": "1900",
  "compatible_printers": [
  "Anycubic 4Max Pro 0.4 nozzle"
  ]

diff --git a/resources/profiles/BBL/process/0.20mm Standard @Voron.json b/resources/profiles/BBL/process/0.20mm Standard @Voron.json
@@ -3,21 +3,9 @@
  "setting_id": "GP004",
  "name": "0.20mm Standard @Voron",
  "from": "system",
+ "inherits": "fdm_process_voron_common",
  "instantiation": "true",
- "inherits": "fdm_process_bbl_0.20",
- "initial_layer_speed": "50",
- "initial_layer_infill_speed": "105",
- "outer_wall_speed": "120",
- "inner_wall_speed": "200",
- "sparse_infill_speed": "300",
- "internal_solid_infill_speed": "200",
- "top_surface_speed": "100",
- "gap_infill_speed": "100",
- "travel_speed": "350",
- "compatible_printers": [
- "Voron 2.4 250 0.4 nozzle",
- "Voron 2.4 300 0.4 nozzle",
- "Voron 2.4 350 0.4 nozzle",
- "Voron 0.1 0.4 nozzle"
- ]
+ "layer_height": "0.2",
+ "bottom_shell_layers": "3",
+ "top_shell_layers": "4"
 }
diff --git a/resources/profiles/BBL/process/0.24mm Draft @Voron.json b/resources/profiles/BBL/process/0.24mm Draft @Voron.json
@@ -4,20 +4,9 @@
  "name": "0.24mm Draft @Voron",
  "from": "system",
  "instantiation": "true",
- "inherits": "fdm_process_bbl_0.24",
- "initial_layer_speed": "50",
- "initial_layer_infill_speed": "105",
- "outer_wall_speed": "120",
- "inner_wall_speed": "200",
- "sparse_infill_speed": "300",
- "internal_solid_infill_speed": "200",
- "top_surface_speed": "100",
- "gap_infill_speed": "100",
- "travel_speed": "350",
- "compatible_printers": [
- "Voron 2.4 250 0.4 nozzle",
- "Voron 2.4 300 0.4 nozzle",
- "Voron 2.4 350 0.4 nozzle",
- "Voron 0.1 0.4 nozzle"
- ]
+ "inherits": "fdm_process_voron_common",
+ "layer_height": "0.24",
+ "top_surface_line_width": "0.45",
+ "bottom_shell_layers": "3",
+ "top_shell_layers": "4"
 }
diff --git a/resources/profiles/BBL/process/0.28mm Extra Draft @Voron.json b/resources/profiles/BBL/process/0.28mm Extra Draft @Voron.json
@@ -4,20 +4,9 @@
  "name": "0.28mm Extra Draft @Voron",
  "from": "system",
  "instantiation": "true",
- "inherits": "fdm_process_bbl_0.28",
- "initial_layer_speed": "50",
- "initial_layer_infill_speed": "105",
- "outer_wall_speed": "120",
- "inner_wall_speed": "200",
- "sparse_infill_speed": "300",
- "internal_solid_infill_speed": "200",
- "top_surface_speed": "100",
- "gap_infill_speed": "100",
- "travel_speed": "350",
- "compatible_printers": [
- "Voron 2.4 250 0.4 nozzle",
- "Voron 2.4 300 0.4 nozzle",
- "Voron 2.4 350 0.4 nozzle",
- "Voron 0.1 0.4 nozzle"
- ]
+ "inherits": "fdm_process_voron_common",
+ "layer_height": "0.28",
+ "top_surface_line_width": "0.45",
+ "bottom_shell_layers": "3",
+ "top_shell_layers": "4"
 }