diff --git a/resources/profiles/Flashforge/flashfoge_adventurer5m_series_buildplate_model.STL b/resources/profiles/Flashforge/flashfoge_adventurer5m_series_buildplate_model.STL deleted file mode 100644 index 810b7f9007..0000000000 Binary files a/resources/profiles/Flashforge/flashfoge_adventurer5m_series_buildplate_model.STL and /dev/null differ diff --git a/resources/profiles/Flashforge/flashforge_adventurer5m_series_buildplate_model.STL b/resources/profiles/Flashforge/flashforge_adventurer5m_series_buildplate_model.STL new file mode 100644 index 0000000000..ba3120726a Binary files /dev/null and b/resources/profiles/Flashforge/flashforge_adventurer5m_series_buildplate_model.STL differ diff --git a/resources/profiles/Flashforge/flashfoge_adventurer_5m_series_hotend.stl b/resources/profiles/Flashforge/flashforge_adventurer_5m_series_hotend.stl similarity index 100% rename from resources/profiles/Flashforge/flashfoge_adventurer_5m_series_hotend.stl rename to resources/profiles/Flashforge/flashforge_adventurer_5m_series_hotend.stl diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.6 Nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.6 Nozzle.json index 5d12cff14a..ebd4b9d7f4 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.6 Nozzle.json @@ -61,7 +61,7 @@ "extruder_clearance_radius": [ "76" ], "extruder_clearance_height_to_rod": [ "27" ], "extruder_clearance_height_to_lid": [ "150" ], - "nozzle_type": "stainless_steel" + "nozzle_type": "hardened_steel" } diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.6 Nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.6 Nozzle.json index 16a9e3011a..c0a024542f 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.6 Nozzle.json @@ -61,6 +61,6 @@ "extruder_clearance_radius": [ "76" ], "extruder_clearance_height_to_rod": [ "27" ], "extruder_clearance_height_to_lid": [ "150" ], - "nozzle_type": "stainless_steel" + "nozzle_type": "hardened_steel" } diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro.json index 6420bf5383..6e4d1e81e2 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro.json @@ -5,8 +5,8 @@ "nozzle_diameter": "0.4;0.6", "machine_tech": "FFF", "family": "Flashforge", - "bed_model": "flashfoge_adventurer5m_series_buildplate_model.STL", + "bed_model": "flashforge_adventurer5m_series_buildplate_model.STL", "bed_texture": "flashforge_adventurer5m_buildplate_texture.png", - "hotend_model": "", + "hotend_model": "flashforge_adventurer_5m_series_hotend.STL", "default_materials": "Flashforge Generic ABS;Flashforge Generic PETG;Flashforge Generic PLA" } diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M.json index dc9023abb2..bd95c9a1f0 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M.json @@ -5,8 +5,8 @@ "nozzle_diameter": "0.4;0.6", "machine_tech": "FFF", "family": "Flashforge", - "bed_model": "flashfoge_adventurer5m_series_buildplate_model.STL", + "bed_model": "flashforge_adventurer5m_series_buildplate_model.STL", "bed_texture": "flashforge_adventurer5m_buildplate_texture.png", - "hotend_model": "", + "hotend_model": "flashforge_adventurer_5m_series_hotend.STL", "default_materials": "Flashforge Generic ABS;Flashforge Generic PETG;Flashforge Generic PLA" } diff --git a/resources/profiles/Flashforge/machine/fdm_adventurer3_common.json b/resources/profiles/Flashforge/machine/fdm_adventurer3_common.json index 5777b8ff91..537a691ccb 100644 --- a/resources/profiles/Flashforge/machine/fdm_adventurer3_common.json +++ b/resources/profiles/Flashforge/machine/fdm_adventurer3_common.json @@ -19,10 +19,10 @@ "machine_max_acceleration_x": [ "500" ], "machine_max_acceleration_y": [ "500" ], "machine_max_acceleration_z": [ "100" ], - "machine_max_speed_e": [ "60" ], + "machine_max_speed_e": [ "30" ], "machine_max_speed_x": [ "150" ], "machine_max_speed_y": [ "150" ], - "machine_max_speed_z": [ "10" ], + "machine_max_speed_z": [ "20" ], "machine_max_jerk_e": [ "2.5" ], "machine_max_jerk_x": [ "8" ], "machine_max_jerk_y": [ "8" ], @@ -36,11 +36,13 @@ "deretraction_speed": [ "25" ], "z_hop": [ "0.4" ], "single_extruder_multi_material": "1", + "enable_filament_ramming": "0", + "purge_in_prime_tower": "0", "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ "Flashforge PLA" ], - "machine_start_gcode": "M140 S[bed_temperature_initial_layer] T0\nM104 S[nozzle_temperature_initial_layer] T0\nM104 S0 T1\nM107\nM900 K[pressure_advance] T0\nG90\nG28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651 S255", - "machine_end_gcode": "M104 S0 T0\nM140 S0 T0\nG162 Z F1800\nG28 X Y\nM132 X Y A B\nM652\nG91\nM18", + "machine_start_gcode": "M140 S[bed_temperature_initial_layer] T0\nM104 S[nozzle_temperature_initial_layer] T0\nM104 S0 T1\nM107\nM900 K[pressure_advance] T0\nG90\nG28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651 S255\n;pre-extrude\nM108 T0\nG1 X-37.50 Y-75.00 F6000\nM106\nG1 Z0.200 F420\nG1 X-37.50 Y-75.00 F6000\nG1 X37.50 Y-75.00 E9.5 F1200\n", + "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F9000\nM104 S0 T0\nM140 S0 T0\nG162 Z F1800\nG28 X Y\nM132 X Y A B\nM652\nG91\nM18", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", "scan_first_layer": "0", @@ -53,5 +55,10 @@ "extruder_clearance_height_to_lid": "150", "manual_filament_change": "1", "nozzle_type": "stainless_steel", - "auxiliary_fan": "0" + "auxiliary_fan": "1", + "parking_pos_retraction": "0", + "cooling_tube_length": "0", + "cooling_tube_retraction": "0", + "extra_loading_move": "0", + "version": "2.0.2.0" } diff --git a/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD3 0.4 Nozzle.json b/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD3 0.4 Nozzle.json index 1f070a7519..a60d3b2227 100644 --- a/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD3 0.4 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD3 0.4 Nozzle.json @@ -43,8 +43,7 @@ "enable_arc_fitting": "0", "initial_layer_min_bead_width": "100", "min_bead_width": "100", - "detect_thin_wall": "1", - "elefant_foot_compensation": "0", + "elefant_foot_compensation": "0.15", "small_perimeter_speed": "50%", "overhang_speed_classic": "0", "internal_bridge_speed": "48", @@ -54,6 +53,7 @@ "slow_down_layers": "1", "wipe_speed": "200", "reduce_crossing_wall": "1", + "max_travel_detour_distance": "50", "compatible_printers": [ "Flashforge Adventurer 3 Series 0.4 Nozzle" ], diff --git a/resources/profiles/Flashforge/process/0.30mm Fast @Flashforge AD3 0.4 Nozzle.json b/resources/profiles/Flashforge/process/0.30mm Fast @Flashforge AD3 0.4 Nozzle.json index f254113bc6..9fb5571ceb 100644 --- a/resources/profiles/Flashforge/process/0.30mm Fast @Flashforge AD3 0.4 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.30mm Fast @Flashforge AD3 0.4 Nozzle.json @@ -43,8 +43,7 @@ "enable_arc_fitting": "0", "initial_layer_min_bead_width": "100", "min_bead_width": "100", - "detect_thin_wall": "1", - "elefant_foot_compensation": "0", + "elefant_foot_compensation": "0.15", "small_perimeter_speed": "50%", "overhang_speed_classic": "0", "internal_bridge_speed": "64", @@ -54,6 +53,7 @@ "slow_down_layers": "1", "wipe_speed": "200", "reduce_crossing_wall": "1", + "max_travel_detour_distance": "50", "compatible_printers": [ "Flashforge Adventurer 3 Series 0.4 Nozzle" ], diff --git a/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD3 0.6 Nozzle.json b/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD3 0.6 Nozzle.json index 92dcb51b0f..972ad604de 100644 --- a/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD3 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD3 0.6 Nozzle.json @@ -43,8 +43,7 @@ "enable_arc_fitting": "0", "initial_layer_min_bead_width": "100", "min_bead_width": "100", - "detect_thin_wall": "1", - "elefant_foot_compensation": "0", + "elefant_foot_compensation": "0.15", "small_perimeter_speed": "50%", "overhang_speed_classic": "0", "internal_bridge_speed": "50", @@ -54,6 +53,7 @@ "slow_down_layers": "1", "wipe_speed": "200", "reduce_crossing_wall": "1", + "max_travel_detour_distance": "50", "compatible_printers": [ "Flashforge Adventurer 3 Series 0.6 Nozzle" ],