From d9cdafbaa0f6f43694e62e50912506b07f0b8ce3 Mon Sep 17 00:00:00 2001 From: Heiko Liebscher Date: Thu, 6 Apr 2023 08:47:53 +0200 Subject: [PATCH] fix filename --- .../Anker/process/fdm_process_common.json | 2 +- .../Anycubic/process/fdm_process_common.json | 2 +- .../Artillery/process/fdm_process_common.json | 2 +- .../Prusa/process/fdm_process_common.json | 2 +- .../process/fdm_process_ratrig_common.json | 2 +- ...zle .json => Snapmaker J1 0.4 nozzle.json} | 7 +- .../machine/Snapmaker J1 0.6 nozzle .json | 70 ------------------- .../machine/Snapmaker J1 0.6 nozzle.json | 69 ++++++++++++++++++ .../0.20mm 0.4 Standard @Snapmaker J1.json | 8 +-- .../0.20mm 0.6 Standard @Snapmaker J1.json | 8 +-- .../Snapmaker/process/fdm_process_common.json | 1 - .../Tronxy/process/fdm_process_common.json | 2 +- .../process/fdm_process_tronxy_common.json | 2 +- .../process/fdm_process_TwoTrees_common.json | 2 +- .../TwoTrees/process/fdm_process_common.json | 1 - .../process/fdm_process_voron_common.json | 1 - 16 files changed, 88 insertions(+), 93 deletions(-) rename resources/profiles/Snapmaker/machine/{Snapmaker J1 0.4 nozzle .json => Snapmaker J1 0.4 nozzle.json} (99%) delete mode 100644 resources/profiles/Snapmaker/machine/Snapmaker J1 0.6 nozzle .json create mode 100644 resources/profiles/Snapmaker/machine/Snapmaker J1 0.6 nozzle.json diff --git a/resources/profiles/Anker/process/fdm_process_common.json b/resources/profiles/Anker/process/fdm_process_common.json index 189f78f5d7..fd05875b11 100644 --- a/resources/profiles/Anker/process/fdm_process_common.json +++ b/resources/profiles/Anker/process/fdm_process_common.json @@ -23,7 +23,7 @@ "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0", - "enable_arc_fitting": "1", + "outer_wall_line_width": "0.4", "wall_infill_order": "inner wall/outer wall/infill", "line_width": "0.4", diff --git a/resources/profiles/Anycubic/process/fdm_process_common.json b/resources/profiles/Anycubic/process/fdm_process_common.json index 189f78f5d7..fd05875b11 100644 --- a/resources/profiles/Anycubic/process/fdm_process_common.json +++ b/resources/profiles/Anycubic/process/fdm_process_common.json @@ -23,7 +23,7 @@ "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0", - "enable_arc_fitting": "1", + "outer_wall_line_width": "0.4", "wall_infill_order": "inner wall/outer wall/infill", "line_width": "0.4", diff --git a/resources/profiles/Artillery/process/fdm_process_common.json b/resources/profiles/Artillery/process/fdm_process_common.json index 189f78f5d7..fd05875b11 100644 --- a/resources/profiles/Artillery/process/fdm_process_common.json +++ b/resources/profiles/Artillery/process/fdm_process_common.json @@ -23,7 +23,7 @@ "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0", - "enable_arc_fitting": "1", + "outer_wall_line_width": "0.4", "wall_infill_order": "inner wall/outer wall/infill", "line_width": "0.4", diff --git a/resources/profiles/Prusa/process/fdm_process_common.json b/resources/profiles/Prusa/process/fdm_process_common.json index c8f387015d..ea8f5ff739 100644 --- a/resources/profiles/Prusa/process/fdm_process_common.json +++ b/resources/profiles/Prusa/process/fdm_process_common.json @@ -23,7 +23,7 @@ "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0", - "enable_arc_fitting": "1", + "enable_arc_fitting": "0", "outer_wall_line_width": "0.4", "wall_infill_order": "inner wall/outer wall/infill", "line_width": "0.4", diff --git a/resources/profiles/Ratrig/process/fdm_process_ratrig_common.json b/resources/profiles/Ratrig/process/fdm_process_ratrig_common.json index 60058dc715..951dfb0cbf 100644 --- a/resources/profiles/Ratrig/process/fdm_process_ratrig_common.json +++ b/resources/profiles/Ratrig/process/fdm_process_ratrig_common.json @@ -24,7 +24,7 @@ "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0", - "enable_arc_fitting": "1", + "outer_wall_line_width": "0.4", "wall_infill_order": "inner wall/outer wall/infill", "line_width": "0.4", diff --git a/resources/profiles/Snapmaker/machine/Snapmaker J1 0.4 nozzle .json b/resources/profiles/Snapmaker/machine/Snapmaker J1 0.4 nozzle.json similarity index 99% rename from resources/profiles/Snapmaker/machine/Snapmaker J1 0.4 nozzle .json rename to resources/profiles/Snapmaker/machine/Snapmaker J1 0.4 nozzle.json index b9e4b7fd0a..09801c1ced 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker J1 0.4 nozzle .json +++ b/resources/profiles/Snapmaker/machine/Snapmaker J1 0.4 nozzle.json @@ -11,7 +11,7 @@ "3" ], "thumbnails": [ - "400x400" + "400x400" ], "z_hop_types": [ "Auto Lift" @@ -61,10 +61,9 @@ "25" ], "max_layer_height": [ - "0.28" + "0.30" ], "scan_first_layer": "0", "nozzle_type": "hardened_steel", "auxiliary_fan": "0" -} - +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/machine/Snapmaker J1 0.6 nozzle .json b/resources/profiles/Snapmaker/machine/Snapmaker J1 0.6 nozzle .json deleted file mode 100644 index 4028cfc9b1..0000000000 --- a/resources/profiles/Snapmaker/machine/Snapmaker J1 0.6 nozzle .json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "type": "machine", - "setting_id": "GM011", - "name": "Snapmaker J1 0.6 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_machine_common", - "printer_model": "Snapmaker J1", - "default_print_profile": "0.20mm 0.6 Standard @Snapmaker J1", - "retraction_minimum_travel": [ - "3" - ], - "thumbnails": [ - "400x400" - ], - "z_hop_types": [ - "Auto Lift" - ], - "z_lift_type": [ - "SpiralLift" - ], - "nozzle_diameter": [ - "0.6" - ], - "bed_exclude_area": [ - "0x0" - ], - "printable_area": [ - "0x0", - "324x0", - "324x200", - "0x200" - ], - "printable_height": "200", - "machine_start_gcode": ";***** Snapmaker J1\n;***** Update : 20221222\n;***** Printer : [printer_preset]\n;***** Profile : [print_preset]\nM593 P1 X F35.7 \nM593 P1 Y F33.7 \nM355 S1 P16 ;------------OPTIONAL ;dim led \nM83 ;absolute extrusion mode\nM140 S[first_layer_bed_temperature] ;Start Warming Bed\nT[initial_extruder] ;switch to initial extruder\n{if total_toolchanges < 1}; Preheat one extruder (just one used)\nM104 S160 ;preheat nozzle\n{else}; Preheat both extruders used\nM104 S160 T0 ;preheat T0\nM104 S160 T1 ;preheat T1\n{endif}\nG28 ; home all axes\nG90 ;absolute positioning\nG1 Z0.8 F1800\nM201 X5000 Y5000 Z500 E5000\nM205 V5\nM900 T0 K0.02\nM900 T1 K0.02\nM190 S[first_layer_bed_temperature] ; C3 W2 Wait For Bed Temperature\n{if total_toolchanges < 1}; Heat one extruder\nM104 S[first_layer_temperature]\nM109 S[first_layer_temperature] ;Wait for Hotend Temperature\n{else}; Heat both extruders\nM104 T0 S{first_layer_temperature[0]}\nM104 T1 S{first_layer_temperature[1]}\nM109 T0 S{first_layer_temperature[0]} ;Wait for Hotend Temperature\nM109 T1 S{first_layer_temperature[1]} ;Wait for Hotend Temperature\n{endif}\n;\n{if 1==1} ;-----------OPTIONAL ;led effect\n M355 S1 P32\n G4 S1\n M355 S1 P48\n G4 S1\n M355 S1 P64\n G4 S1\n M355 S1 P96\n G4 S1\n M355 S1 P128\n G4 S1\n M355 S1 P255\n{endif}\n;\nG92 E0\n;\n{if total_toolchanges > 0 or initial_extruder == 0}; Purge line T0\nT0\nG92 E0\nG1 F1200 X5 Z0.5\nG1 F600 X100 E20\nG1 F600 Z2\nG92 E0\nG1 F1200 E-6\nG0 X-20 F12000 ; park T0\n{endif}\n{if total_toolchanges > 0 or initial_extruder == 1}; Purge line T1\nT1\nG92 E0\nG1 F1200 X295 Z0.5\nG1 F600 X200 E20\nG1 F600 Z2\nG92 E0\nG1 F1200 E-6\nG0 X350 F12000 ; park T1 (old 345)\n{endif}\n;End Start Gcode J1\n", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_num]\n", - "machine_end_gcode": ";End GCode J1 begin\nM140 S0 ;heated bed heater off \nG90 ;absolute positioning\nG92 E0\n;\nG1 E-6 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n;\nM104 S0 T0 ;extruder heater off\nM104 S0 T1 ;extruder heater off\n;\nG1 Z200 F1500 ;move bed down\nG0 Y10 F3000 ;so the head is out of the way\nM84 ;steppers off\nM355 S1 P16 ;------------OPTIONAL ;dim led \nM107\n;End of Gcode\n;\n; DON'T REMOVE these lines if you're using the smfix (https://github.com/macdylan/Snapmaker2Slic3rPostProcessor)\n; min_x = [first_layer_print_min_0]\n; min_y = [first_layer_print_min_1]\n; max_x = [first_layer_print_max_0]\n; max_y = [first_layer_print_max_1]\n; max_z = [max_layer_z]\n;", - "change_filament_gcode": ";Change Filament", - "machine_max_acceleration_e": [ - "6000", - "5000" - ], - "machine_max_acceleration_extruding": [ - "5000", - "2000" - ], - "machine_max_acceleration_retracting": [ - "6000", - "5000" - ], - "machine_max_acceleration_x": [ - "5000", - "2000" - ], - "machine_max_acceleration_y": [ - "5000", - "2000" - ], - "machine_max_speed_e": [ - "60", - "25" - ], - "max_layer_height": [ - "0.28" - ], - "scan_first_layer": "0", - "nozzle_type": "hardened_steel", - "auxiliary_fan": "0" -} - diff --git a/resources/profiles/Snapmaker/machine/Snapmaker J1 0.6 nozzle.json b/resources/profiles/Snapmaker/machine/Snapmaker J1 0.6 nozzle.json new file mode 100644 index 0000000000..1e8bc2866f --- /dev/null +++ b/resources/profiles/Snapmaker/machine/Snapmaker J1 0.6 nozzle.json @@ -0,0 +1,69 @@ +{ + "type": "machine", + "setting_id": "GM011", + "name": "Snapmaker J1 0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_common", + "printer_model": "Snapmaker J1", + "default_print_profile": "0.20mm 0.6 Standard @Snapmaker J1", + "retraction_minimum_travel": [ + "3" + ], + "thumbnails": [ + "400x400" + ], + "z_hop_types": [ + "Auto Lift" + ], + "z_lift_type": [ + "SpiralLift" + ], + "nozzle_diameter": [ + "0.6" + ], + "bed_exclude_area": [ + "0x0" + ], + "printable_area": [ + "0x0", + "324x0", + "324x200", + "0x200" + ], + "printable_height": "200", + "machine_start_gcode": ";***** Snapmaker J1\n;***** Update : 20221222\n;***** Printer : [printer_preset]\n;***** Profile : [print_preset]\nM593 P1 X F35.7 \nM593 P1 Y F33.7 \nM355 S1 P16 ;------------OPTIONAL ;dim led \nM83 ;absolute extrusion mode\nM140 S[first_layer_bed_temperature] ;Start Warming Bed\nT[initial_extruder] ;switch to initial extruder\n{if total_toolchanges < 1}; Preheat one extruder (just one used)\nM104 S160 ;preheat nozzle\n{else}; Preheat both extruders used\nM104 S160 T0 ;preheat T0\nM104 S160 T1 ;preheat T1\n{endif}\nG28 ; home all axes\nG90 ;absolute positioning\nG1 Z0.8 F1800\nM201 X5000 Y5000 Z500 E5000\nM205 V5\nM900 T0 K0.02\nM900 T1 K0.02\nM190 S[first_layer_bed_temperature] ; C3 W2 Wait For Bed Temperature\n{if total_toolchanges < 1}; Heat one extruder\nM104 S[first_layer_temperature]\nM109 S[first_layer_temperature] ;Wait for Hotend Temperature\n{else}; Heat both extruders\nM104 T0 S{first_layer_temperature[0]}\nM104 T1 S{first_layer_temperature[1]}\nM109 T0 S{first_layer_temperature[0]} ;Wait for Hotend Temperature\nM109 T1 S{first_layer_temperature[1]} ;Wait for Hotend Temperature\n{endif}\n;\n{if 1==1} ;-----------OPTIONAL ;led effect\n M355 S1 P32\n G4 S1\n M355 S1 P48\n G4 S1\n M355 S1 P64\n G4 S1\n M355 S1 P96\n G4 S1\n M355 S1 P128\n G4 S1\n M355 S1 P255\n{endif}\n;\nG92 E0\n;\n{if total_toolchanges > 0 or initial_extruder == 0}; Purge line T0\nT0\nG92 E0\nG1 F1200 X5 Z0.5\nG1 F600 X100 E20\nG1 F600 Z2\nG92 E0\nG1 F1200 E-6\nG0 X-20 F12000 ; park T0\n{endif}\n{if total_toolchanges > 0 or initial_extruder == 1}; Purge line T1\nT1\nG92 E0\nG1 F1200 X295 Z0.5\nG1 F600 X200 E20\nG1 F600 Z2\nG92 E0\nG1 F1200 E-6\nG0 X350 F12000 ; park T1 (old 345)\n{endif}\n;End Start Gcode J1\n", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_num]\n", + "machine_end_gcode": ";End GCode J1 begin\nM140 S0 ;heated bed heater off \nG90 ;absolute positioning\nG92 E0\n;\nG1 E-6 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n;\nM104 S0 T0 ;extruder heater off\nM104 S0 T1 ;extruder heater off\n;\nG1 Z200 F1500 ;move bed down\nG0 Y10 F3000 ;so the head is out of the way\nM84 ;steppers off\nM355 S1 P16 ;------------OPTIONAL ;dim led \nM107\n;End of Gcode\n;\n; DON'T REMOVE these lines if you're using the smfix (https://github.com/macdylan/Snapmaker2Slic3rPostProcessor)\n; min_x = [first_layer_print_min_0]\n; min_y = [first_layer_print_min_1]\n; max_x = [first_layer_print_max_0]\n; max_y = [first_layer_print_max_1]\n; max_z = [max_layer_z]\n;", + "change_filament_gcode": ";Change Filament", + "machine_max_acceleration_e": [ + "6000", + "5000" + ], + "machine_max_acceleration_extruding": [ + "5000", + "2000" + ], + "machine_max_acceleration_retracting": [ + "6000", + "5000" + ], + "machine_max_acceleration_x": [ + "5000", + "2000" + ], + "machine_max_acceleration_y": [ + "5000", + "2000" + ], + "machine_max_speed_e": [ + "60", + "25" + ], + "max_layer_height": [ + "0.40" + ], + "scan_first_layer": "0", + "nozzle_type": "hardened_steel", + "auxiliary_fan": "0" +} \ No newline at end of file diff --git a/resources/profiles/Snapmaker/process/0.20mm 0.4 Standard @Snapmaker J1.json b/resources/profiles/Snapmaker/process/0.20mm 0.4 Standard @Snapmaker J1.json index b29bfdbeda..53d6b73b9b 100644 --- a/resources/profiles/Snapmaker/process/0.20mm 0.4 Standard @Snapmaker J1.json +++ b/resources/profiles/Snapmaker/process/0.20mm 0.4 Standard @Snapmaker J1.json @@ -5,9 +5,6 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", - "compatible_printers": [ - "Snapmaker J1 0.4 nozzle" - ], "bottom_shell_layers": "4", "bridge_acceleration": "60%", "brim_type": "no_brim", @@ -76,5 +73,8 @@ "travel_jerk": "9", "travel_speed": "150", "tree_support_wall_count": "2", - "xy_hole_compensation": "0.08" + "xy_hole_compensation": "0.08", + "compatible_printers": [ + "Snapmaker J1 0.4 nozzle" + ] } diff --git a/resources/profiles/Snapmaker/process/0.20mm 0.6 Standard @Snapmaker J1.json b/resources/profiles/Snapmaker/process/0.20mm 0.6 Standard @Snapmaker J1.json index 00bce5f1f6..def674c97f 100644 --- a/resources/profiles/Snapmaker/process/0.20mm 0.6 Standard @Snapmaker J1.json +++ b/resources/profiles/Snapmaker/process/0.20mm 0.6 Standard @Snapmaker J1.json @@ -5,9 +5,6 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", - "compatible_printers": [ - "Snapmaker J1 0.6 nozzle" - ], "bottom_shell_layers": "4", "bridge_acceleration": "60%", "brim_type": "no_brim", @@ -76,5 +73,8 @@ "travel_jerk": "9", "travel_speed": "150", "tree_support_wall_count": "2", - "xy_hole_compensation": "0.08" + "xy_hole_compensation": "0.08", + "compatible_printers": [ + "Snapmaker J1 0.6 nozzle" + ] } diff --git a/resources/profiles/Snapmaker/process/fdm_process_common.json b/resources/profiles/Snapmaker/process/fdm_process_common.json index 189f78f5d7..877f08b9fb 100644 --- a/resources/profiles/Snapmaker/process/fdm_process_common.json +++ b/resources/profiles/Snapmaker/process/fdm_process_common.json @@ -23,7 +23,6 @@ "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0", - "enable_arc_fitting": "1", "outer_wall_line_width": "0.4", "wall_infill_order": "inner wall/outer wall/infill", "line_width": "0.4", diff --git a/resources/profiles/Tronxy/process/fdm_process_common.json b/resources/profiles/Tronxy/process/fdm_process_common.json index 9ef52a7cca..0513467cac 100644 --- a/resources/profiles/Tronxy/process/fdm_process_common.json +++ b/resources/profiles/Tronxy/process/fdm_process_common.json @@ -20,7 +20,7 @@ "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0", - "enable_arc_fitting": "1", + "enable_arc_fitting": "0", "outer_wall_line_width": "0.4", "wall_infill_order": "inner wall/outer wall/infill", "line_width": "0.4", diff --git a/resources/profiles/Tronxy/process/fdm_process_tronxy_common.json b/resources/profiles/Tronxy/process/fdm_process_tronxy_common.json index 5c99e18c16..2d6fa3ff06 100644 --- a/resources/profiles/Tronxy/process/fdm_process_tronxy_common.json +++ b/resources/profiles/Tronxy/process/fdm_process_tronxy_common.json @@ -21,7 +21,7 @@ "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0", - "enable_arc_fitting": "1", + "enable_arc_fitting": "0", "outer_wall_line_width": "0.4", "wall_infill_order": "inner wall/outer wall/infill", "line_width": "0.4", diff --git a/resources/profiles/TwoTrees/process/fdm_process_TwoTrees_common.json b/resources/profiles/TwoTrees/process/fdm_process_TwoTrees_common.json index 7db3732383..b75812651c 100644 --- a/resources/profiles/TwoTrees/process/fdm_process_TwoTrees_common.json +++ b/resources/profiles/TwoTrees/process/fdm_process_TwoTrees_common.json @@ -21,7 +21,7 @@ "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0", - "enable_arc_fitting": "1", + "enable_arc_fitting": "0", "outer_wall_line_width": "0.4", "wall_infill_order": "inner wall/outer wall/infill", "line_width": "0.4", diff --git a/resources/profiles/TwoTrees/process/fdm_process_common.json b/resources/profiles/TwoTrees/process/fdm_process_common.json index f480742c7d..57a52b7200 100644 --- a/resources/profiles/TwoTrees/process/fdm_process_common.json +++ b/resources/profiles/TwoTrees/process/fdm_process_common.json @@ -20,7 +20,6 @@ "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0", - "enable_arc_fitting": "1", "outer_wall_line_width": "0.4", "wall_infill_order": "inner wall/outer wall/infill", "line_width": "0.4", diff --git a/resources/profiles/Voron/process/fdm_process_voron_common.json b/resources/profiles/Voron/process/fdm_process_voron_common.json index 0f8e924e77..0dd70a8ac2 100644 --- a/resources/profiles/Voron/process/fdm_process_voron_common.json +++ b/resources/profiles/Voron/process/fdm_process_voron_common.json @@ -24,7 +24,6 @@ "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0", - "enable_arc_fitting": "1", "outer_wall_line_width": "0.4", "wall_infill_order": "inner wall/outer wall/infill", "line_width": "0.4",