Skip to content

Commit

Permalink
Add Flashforge guider 2s (#5165)
Browse files Browse the repository at this point in the history
* Add Guider 2s 0.4

* Add Guider 2s cover & build plate texture/model & fix missing Guider 3 Ultra build plate model

* Add extruder_offset

* Change G-Code

* Misc

Add 0.3, 0.6, & 0.8 nozzle sizes
Add supported filaments

* Revert "Misc"

This reverts commit 94ebc2c.

* Re-add filaments

* G-Code fixes

* Fix printable area

* Resolve merge conflicts part 1

* Revert "Resolve merge conflicts part 1"

This reverts commit 2d6132a.

* fix merge conflict part 1.5

* Fix merge conflicts 1.75

* Fix merge conflicts part 2

* Remove old buildplate model

* Fix old buildplate model

* Change bed origin, max speeds, & max/min layer heights

* Remove absolute positioning in G-Code

* Lower acceleration

* Add lid clearance info

* Revert "Remove absolute positioning in G-Code"

This reverts commit 5253d32.

* Re-enable absolute distances

* Fix syntax

* Change these too...

* Bring closer to original slicer

* forgot these

* Change to match @AC5SHOT optimal settings

* Bring closer to original slicer

* Bring closer to original slicer

* Update machine limits/functionality
  • Loading branch information
cochcoder authored May 28, 2024
1 parent 54be09c commit 1c56d53
Show file tree
Hide file tree
Showing 18 changed files with 574 additions and 42 deletions.
84 changes: 54 additions & 30 deletions resources/profiles/Flashforge.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,17 @@
"name": "Flashforge Adventurer 5M Pro",
"sub_path": "machine/Flashforge Adventurer 5M Pro.json"
},
{
{
"name": "Flashforge Adventurer 3 Series",
"sub_path": "machine/Flashforge Adventurer 3 Series.json"
},
{
"name": "Flashforge Guider 3 Ultra",
"sub_path": "machine/Flashforge Guider 3 Ultra.json"
},
{
"name": "Flashforge Guider 2s",
"sub_path": "machine/Flashforge Guider 2s.json"
}
],
"process_list": [
Expand Down Expand Up @@ -55,27 +59,27 @@
"name": "0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle",
"sub_path": "process/0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json"
},
{
{
"name": "0.12mm Standard @Flashforge AD5M 0.25 Nozzle",
"sub_path": "process/0.12mm Standard @Flashforge AD5M 0.25 Nozzle.json"
},
{
},
{
"name": "0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle",
"sub_path": "process/0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json"
},
{
},
{
"name": "0.40mm Standard @Flashforge AD5M 0.8 Nozzle",
"sub_path": "process/0.40mm Standard @Flashforge AD5M 0.8 Nozzle.json"
},
{
},
{
"name": "0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle",
"sub_path": "process/0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle.json"
},
{
},
{
"name": "0.20mm Standard @Flashforge AD3 0.4 Nozzle",
"sub_path": "process/0.20mm Standard @Flashforge AD3 0.4 Nozzle.json"
},
{
{
"name": "0.30mm Fast @Flashforge AD3 0.4 Nozzle",
"sub_path": "process/0.30mm Fast @Flashforge AD3 0.4 Nozzle.json"
},
Expand All @@ -86,6 +90,22 @@
{
"name": "0.20mm Standard @Flashforge G3U 0.4 Nozzle",
"sub_path": "process/0.20mm Standard @Flashforge G3U 0.4 Nozzle.json"
},
{
"name": "0.30mm Draft @Flashforge Guider 2s 0.4 nozzle",
"sub_path": "process/0.30mm Draft @Flashforge Guider 2s 0.4 nozzle.json"
},
{
"name": "0.20mm Standard @Flashforge Guider 2s 0.4 nozzle",
"sub_path": "process/0.20mm Standard @Flashforge Guider 2s 0.4 nozzle.json"
},
{
"name": "0.16mm Optimal @Flashforge Guider 2s 0.4 nozzle",
"sub_path": "process/0.16mm Optimal @Flashforge Guider 2s 0.4 nozzle.json"
},
{
"name": "0.12mm Detail @Flashforge Guider 2s 0.4 nozzle",
"sub_path": "process/0.12mm Detail @Flashforge Guider 2s 0.4 nozzle.json"
}
],
"filament_list": [
Expand Down Expand Up @@ -117,26 +137,26 @@
"name": "Flashforge Generic ABS",
"sub_path": "filament/Flashforge Generic ABS.json"
},
{
{
"name": "Flashforge ABS @FF AD5M 0.25 Nozzle",
"sub_path": "filament/Flashforge ABS @FF AD5M 0.25 Nozzle.json"
},
},
{
"name": "Flashforge Generic PETG",
"sub_path": "filament/Flashforge Generic PETG.json"
},
{
{
"name": "Flashforge PETG @FF AD5M 0.25 Nozzle",
"sub_path": "filament/Flashforge PETG @FF AD5M 0.25 Nozzle.json"
},
},
{
"name": "Flashforge Generic PLA",
"sub_path": "filament/Flashforge Generic PLA.json"
},
{
{
"name": "Flashforge PLA @FF AD5M 0.25 Nozzle",
"sub_path": "filament/Flashforge PLA @FF AD5M 0.25 Nozzle.json"
},
},
{
"name": "Flashforge Generic PLA-CF10",
"sub_path": "filament/Flashforge Generic PLA-CF10.json"
Expand All @@ -145,26 +165,26 @@
"name": "Flashforge Generic PLA-Silk",
"sub_path": "filament/Flashforge Generic PLA-Silk.json"
},
{
{
"name": "Flashforge PLA-SILK @FF AD5M 0.25 Nozzle",
"sub_path": "filament/Flashforge PLA-SILK @FF AD5M 0.25 Nozzle.json"
},
},
{
"name": "Flashforge Generic HS PLA",
"sub_path": "filament/Flashforge Generic HS PLA.json"
},
{
{
"name": "Flashforge HS PLA @FF AD5M 0.25 Nozzle",
"sub_path": "filament/Flashforge HS PLA @FF AD5M 0.25 Nozzle.json"
},
},
{
"name": "Flashforge Generic ASA",
"sub_path": "filament/Flashforge Generic ASA.json"
},
{
{
"name": "Flashforge ASA @FF AD5M 0.25 Nozzle",
"sub_path": "filament/Flashforge ASA @FF AD5M 0.25 Nozzle.json"
},
},
{
"name": "Flashforge Generic PETG-CF10",
"sub_path": "filament/Flashforge Generic PETG-CF10.json"
Expand Down Expand Up @@ -255,11 +275,11 @@
"name": "fdm_flashforge_common",
"sub_path": "machine/fdm_flashforge_common.json"
},
{
{
"name": "fdm_adventurer5m_common",
"sub_path": "machine/fdm_adventurer5m_common.json"
},
{
{
"name": "Flashforge Adventurer 5M 0.25 Nozzle",
"sub_path": "machine/Flashforge Adventurer 5M 0.25 Nozzle.json"
},
Expand All @@ -271,11 +291,11 @@
"name": "Flashforge Adventurer 5M 0.6 Nozzle",
"sub_path": "machine/Flashforge Adventurer 5M 0.6 Nozzle.json"
},
{
{
"name": "Flashforge Adventurer 5M 0.8 Nozzle",
"sub_path": "machine/Flashforge Adventurer 5M 0.8 Nozzle.json"
},
{
{
"name": "Flashforge Adventurer 5M Pro 0.25 Nozzle",
"sub_path": "machine/Flashforge Adventurer 5M Pro 0.25 Nozzle.json"
},
Expand All @@ -287,15 +307,15 @@
"name": "Flashforge Adventurer 5M Pro 0.6 Nozzle",
"sub_path": "machine/Flashforge Adventurer 5M Pro 0.6 Nozzle.json"
},
{
{
"name": "Flashforge Adventurer 5M Pro 0.8 Nozzle",
"sub_path": "machine/Flashforge Adventurer 5M Pro 0.8 Nozzle.json"
},
{
{
"name": "fdm_flashforge_common",
"sub_path": "machine/fdm_adventurer3_common.json"
},
{
{
"name": "Flashforge Adventurer 3 Series 0.4 Nozzle",
"sub_path": "machine/Flashforge Adventurer 3 Series 0.4 nozzle.json"
},
Expand All @@ -310,6 +330,10 @@
{
"name": "Flashforge Guider 3 Ultra 0.4 Nozzle",
"sub_path": "machine/Flashforge Guider 3 Ultra 0.4 Nozzle.json"
},
{
"name": "Flashforge Guider 2s 0.4 nozzle",
"sub_path": "machine/Flashforge Guider 2s 0.4 nozzle.json"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"compatible_printers": [
"Flashforge Adventurer 5M Pro 0.4 Nozzle",
"Flashforge Adventurer 5M Pro 0.6 Nozzle",
"Flashforge Adventurer 5M Pro 0.8 Nozzle"
"Flashforge Adventurer 5M Pro 0.8 Nozzle",
"Flashforge Guider 2s 0.4 nozzle"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"compatible_printers": [
"Flashforge Adventurer 5M Pro 0.4 Nozzle",
"Flashforge Adventurer 5M Pro 0.6 Nozzle",
"Flashforge Adventurer 5M Pro 0.8 Nozzle"
"Flashforge Adventurer 5M Pro 0.8 Nozzle",
"Flashforge Guider 2s 0.4 nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,10 @@
"compatible_printers": [
"Flashforge Adventurer 5M 0.4 Nozzle",
"Flashforge Adventurer 5M 0.6 Nozzle",
"Flashforge Adventurer 5M 0.8 Nozzle",
"Flashforge Adventurer 5M 0.8 Nozzle",
"Flashforge Adventurer 5M Pro 0.4 Nozzle",
"Flashforge Adventurer 5M Pro 0.6 Nozzle",
"Flashforge Adventurer 5M Pro 0.8 Nozzle"
"Flashforge Adventurer 5M Pro 0.8 Nozzle",
"Flashforge Guider 2s 0.4 nozzle"
]
}
3 changes: 2 additions & 1 deletion resources/profiles/Flashforge/filament/Flashforge PLA.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
],
"compatible_printers": [
"Flashforge Adventurer 3 Series 0.4 Nozzle",
"Flashforge Adventurer 3 Series 0.6 Nozzle"
"Flashforge Adventurer 3 Series 0.6 Nozzle",
"Flashforge Guider 2s 0.4 nozzle"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@
"compatible_printers": [
"Flashforge Adventurer 5M 0.4 Nozzle",
"Flashforge Adventurer 5M 0.6 Nozzle",
"Flashforge Adventurer 5M 0.8 Nozzle",
"Flashforge Adventurer 5M 0.8 Nozzle",
"Flashforge Adventurer 5M Pro 0.4 Nozzle",
"Flashforge Adventurer 5M Pro 0.6 Nozzle",
"Flashforge Adventurer 5M Pro 0.8 Nozzle",
"Flashforge Guider 3 Ultra 0.4 Nozzle"
"Flashforge Adventurer 5M Pro 0.8 Nozzle",
"Flashforge Guider 3 Ultra 0.4 Nozzle",
"Flashforge Guider 2s 0.4 nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@
"compatible_printers": [
"Flashforge Adventurer 5M 0.4 Nozzle",
"Flashforge Adventurer 5M 0.6 Nozzle",
"Flashforge Adventurer 5M 0.8 Nozzle",
"Flashforge Adventurer 5M 0.8 Nozzle",
"Flashforge Adventurer 5M Pro 0.4 Nozzle",
"Flashforge Adventurer 5M Pro 0.6 Nozzle",
"Flashforge Adventurer 5M Pro 0.8 Nozzle",
"Flashforge Guider 3 Ultra 0.4 Nozzle"
"Flashforge Adventurer 5M Pro 0.8 Nozzle",
"Flashforge Guider 3 Ultra 0.4 Nozzle",
"Flashforge Guider 2s 0.4 nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],
Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{
"type": "machine",
"setting_id": "GM001",
"name": "Flashforge Guider 2s 0.4 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_flashforge_common",
"printer_model": "Flashforge Guider 2s",
"gcode_flavor": "marlin",
"default_print_profile": "0.20mm Standard @Flashforge Guider 2s 0.4 nozzle",
"nozzle_diameter": [ "0.4" ],
"printer_variant": "0.4",
"printable_area": [
"-140x-125",
"140x-125",
"140x125",
"-140x125"
],
"printable_height": "300",
"extruder_offset": [ "-20", "10" ],
"extruder_clearance_height_to_lid": "70",
"extruder_clearance_height_to_rod": "23",
"extruder_clearance_radius": "40",
"use_relative_e_distances": "0",
"auxiliary_fan": "1",
"machine_max_acceleration_e": [ "200", "200" ],
"machine_max_acceleration_extruding": [ "200", "200" ],
"machine_max_acceleration_retracting": [ "200", "200" ],
"machine_max_acceleration_travel": [ "200", "200" ],
"machine_max_acceleration_x": [ "200", "200" ],
"machine_max_acceleration_y": [ "200", "200" ],
"machine_max_acceleration_z": [ "200", "200" ],
"machine_max_speed_e": [ "100", "100" ],
"machine_max_speed_x": [ "200", "200" ],
"machine_max_speed_y": [ "200", "200" ],
"machine_max_speed_z": [ "20", "20" ],
"machine_max_jerk_e": [ "2.5", "2.5" ],
"machine_max_jerk_x": [ "9", "9" ],
"machine_max_jerk_y": [ "9", "9" ],
"machine_max_jerk_z": [ "3", "3" ],
"max_layer_height": [ "0.8" ],
"min_layer_height": [ "0.02" ],
"printer_settings_id": "Flashforge",
"retraction_minimum_travel": [ "1" ],
"retract_before_wipe": [ "100%" ],
"retraction_length": [ "1" ],
"retract_length_toolchange": [ "2" ],
"retraction_speed": [ "100" ],
"z_hop": [ "0" ],
"single_extruder_multi_material": "0",
"change_filament_gcode": "",
"machine_pause_gcode": "M25",
"default_filament_profile": [ "Flashforge Generic PLA" ],
"machine_start_gcode": "M118 X10 Y10 Z10\nM140 S[bed_temperature_initial_layer_single]; set initial bed temp\nM104 S[nozzle_temperature_initial_layer] T0; set initial extruder temp\nM107; disable cooling fan\nG90; set to absolute positioning\nG28; home axes\nM132 X Y A B; recall home offsets from EPROM\nG1 Z50.0 F420; adjust Z\nG161 X Y F3300\nM7; wait for bed to stabilize\nM6 T0; wait for extruder to stabilize\nM651 S255; start case fan\nG1 Z0.3 F3600; move down to purge\nG92 E0; zero extruders\nG1 X120 Y-125 E20 F2000; extrude a line of filament across the front edge of the bed\nG1 X130 Y-125 F180; wait for ooze\nG1 X140 Y-125 F5000; fast wipe\nG1 Z1 F100; lift\nG92 E0; zero extruders again\nG1 E-1.0000 F1800",
"machine_end_gcode": "M104 S0 T0; cool down extruder\nM140 S0 T0; cool down bed\nG162 Z F1800\nG28 X Y; home axes\nM132 X Y A B; recall home offsets from EPROM\nM652; turn off rear fan\nG91; set to relative positioning\nM18; disable stepper motors",
"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]",
"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
"wipe_distance": "2",
"nozzle_type": "undefined"
}
12 changes: 12 additions & 0 deletions resources/profiles/Flashforge/machine/Flashforge Guider 2s.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"type": "machine_model",
"name": "Flashforge Guider 2s",
"model_id": "Flashforge-Guider-2s",
"nozzle_diameter": "0.4",
"machine_tech": "FFF",
"family": "Flashforge",
"bed_model": "flashforge_g2s_buildplate_model.stl",
"bed_texture": "flashforge_g2s_buildplate_texture.png",
"hotend_model": "",
"default_materials": "Flashforge Generic PVA;Flashforge Generic HIPS;Flashforge Generic PETG-CF @G3U;Flashforge Generic PETG @G3U;Flashforge Generic PLA-CF @G3U;Flashforge Generic PLA @G3U;Flashforge Generic ASA @G3U;Flashforge Generic ABS @G3U;FusRock Generic PET-CF;FusRock Generic PAHT-CF;FusRock Generic NexPA-CF25;FusRock Generic S-Multi;FusRock Generic S-PAHT;Polymaker Generic CoPA;Polymaker Generic S1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"nozzle_diameter": "0.4",
"machine_tech": "FFF",
"family": "Flashforge",
"bed_model": "flashfoge_g3u_buildplate_model.STL",
"bed_model": "flashforge_g3u_buildplate_model.stl",
"bed_texture": "flashforge_g3u_buildplate_texture.png",
"hotend_model": "",
"default_materials": "Flashforge Generic PVA;Flashforge Generic HIPS;Flashforge Generic PETG-CF @G3U;Flashforge Generic PETG @G3U;Flashforge Generic PLA-CF @G3U;Flashforge Generic PLA @G3U;Flashforge Generic ASA @G3U;Flashforge Generic ABS @G3U;FusRock Generic PET-CF;FusRock Generic PAHT-CF;FusRock Generic NexPA-CF25;FusRock Generic S-Multi;FusRock Generic S-PAHT;Polymaker Generic CoPA;Polymaker Generic S1"
Expand Down
Loading

0 comments on commit 1c56d53

Please sign in to comment.