Refactor anker (#3845)

* Bring over bed and cover files

* Initial refactored configuration file with placeholders for adding more nozzles

* Uniqueify filament profiles

* Initial refactored machine profiles

* Remove placeholders

* Correct machine selection flow

* Correct Typo

* Add placeholders to bring CE profile settings current with new format

* Fixes #3326

* Port 0.4 Normal Mode Profiles

* Port fast mode profiles

* Remove superfluous settings

* Migrate existing filament profiles

* Update available nozzles and default materials

* Remove 'with' from file names

* Remove 'with' from file names

* Correct support object distance default

* Correct transcription errors

* Correct transcription error

* Bring max_travel_detour_distance into convention with other profiles

* Replace old profiles with the refactored profiles

* Correct name used from Extra Draft to Superdraft

* Re-use original names so printer profiles don't break

---------

Co-authored-by: Geofrey Ward <Xelinor@mail.com>
This commit is contained in:
Geoffrey Ward 2024-01-27 18:01:44 -08:00 committed by GitHub
parent 3ae8cca5cf
commit d70fcc143f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
58 changed files with 1170 additions and 1082 deletions

View file

@ -1,30 +1,37 @@
{
"type": "machine",
"setting_id": "GM003",
"name": "Anker M5 0.4 nozzle",
"inherits": "fdm_marlin_common",
"from": "system",
"setting_id": "GM001",
"instantiation": "true",
"inherits": "fdm_machine_common",
"printer_model": "Anker M5",
"default_print_profile": "0.20mm Standard @Anker",
"default_filament_profile": [
"Anker Generic PLA"
],
"nozzle_diameter": [
"0.4"
],
"bed_exclude_area": [
"0x0"
"printer_model": "Anker M5",
"printer_variant": "0.4",
"auxiliary_fan": "0",
"bed_exclude_area": [],
"printer_structure": "i3",
"default_filament_profile": [
"Anker Generic PLA+"
],
"default_print_profile": "0.20mm Standard @Anker",
"extruder_clearance_height_to_lid": "250",
"extruder_clearance_height_to_rod": "30",
"extruder_clearance_max_radius": "45",
"extruder_clearance_radius": "45",
"printer_structure": "i3",
"nozzle_type": "brass",
"printable_height": "250",
"printable_area": [
"0x0",
"235x0",
"235x235",
"0x235"
],
"printable_height": "250",
"layer_change_gcode": "",
"scan_first_layer": "0",
"nozzle_type": "hardened_steel",
"auxiliary_fan": "0"
}
"retraction_length": [
"1.5"
],
"upward_compatible_machine": []
}

View file

@ -0,0 +1,37 @@
{
"type": "machine",
"name": "Anker M5 All-Metal 0.4 nozzle",
"inherits": "fdm_marlin_common",
"from": "system",
"setting_id": "GM002",
"instantiation": "true",
"nozzle_diameter": [
"0.4"
],
"printer_model": "Anker M5 All-Metal Hot End",
"printer_variant": "0.4",
"auxiliary_fan": "0",
"bed_exclude_area": [],
"printer_structure": "i3",
"default_filament_profile": [
"Anker Generic PLA+"
],
"default_print_profile": "0.20mm Standard @Anker",
"extruder_clearance_height_to_lid": "250",
"extruder_clearance_height_to_rod": "30",
"extruder_clearance_max_radius": "45",
"extruder_clearance_radius": "45",
"printer_structure": "i3",
"nozzle_type": "brass",
"printable_height": "250",
"printable_area": [
"0x0",
"235x0",
"235x235",
"0x235"
],
"retraction_length": [
"0.5"
],
"upward_compatible_machine": []
}

View file

@ -0,0 +1,11 @@
{
"type": "machine_model",
"name": "Anker M5 All-Metal Hot End",
"nozzle_diameter": "0.4",
"bed_model": "M5-CE-bed.stl",
"bed_texture": "M5-CE-texture.svg",
"family": "Anker",
"machine_tech": "FFF",
"model_id": "V8111v2",
"default_materials": "Anker Generic PLA;Anker Generic PLA+;Anker Generic PLA Silk;Anker Generic TPU;Anker Generic PETG"
}

View file

@ -1,15 +1,11 @@
{
"type": "machine_model",
"name": "Anker M5",
"model_id": "Anker-M5",
"nozzle_diameter": "0.4",
"machine_tech": "FFF",
"family": "Anker",
"bed_model": "M5-CE-bed.stl",
"bed_texture": "M5-CE-texture.svg",
"hotend_model": "",
"default_materials": "Anker Generic ABS;Anker Generic PLA;Anker Generic PLA-CF;Anker Generic PETG;Anker Generic TPU;Anker Generic ASA;Anker Generic PVA",
"retraction_length": [
"1.5"
]
"family": "Anker",
"machine_tech": "FFF",
"model_id": "V8111",
"default_materials": "Anker Generic PLA;Anker Generic PLA+;Anker Generic PLA Silk;Anker Generic TPU;Anker Generic PETG"
}

View file

@ -1,30 +1,37 @@
{
"type": "machine",
"setting_id": "GM_Anker_001",
"name": "Anker M5C 0.4 nozzle",
"inherits": "fdm_marlin_common",
"from": "system",
"setting_id": "GM003",
"instantiation": "true",
"inherits": "fdm_machine_common",
"printer_model": "Anker M5C",
"default_print_profile": "0.20mm Standard @Anker",
"default_filament_profile": [
"Anker Generic PLA"
],
"nozzle_diameter": [
"0.4"
],
"bed_exclude_area": [
"0x0"
"printer_model": "Anker M5C",
"printer_variant": "0.4",
"auxiliary_fan": "0",
"bed_exclude_area": [],
"printer_structure": "i3",
"default_filament_profile": [
"Anker Generic PLA+"
],
"default_print_profile": "0.20mm Standard @Anker",
"extruder_clearance_height_to_lid": "250",
"extruder_clearance_height_to_rod": "30",
"extruder_clearance_max_radius": "45",
"extruder_clearance_radius": "45",
"printer_structure": "i3",
"nozzle_type": "brass",
"printable_height": "250",
"printable_area": [
"0x0",
"220x0",
"220x220",
"0x220"
],
"printable_height": "250",
"layer_change_gcode": "",
"scan_first_layer": "0",
"nozzle_type": "hardened_steel",
"auxiliary_fan": "0"
}
"retraction_length": [
"0.8"
],
"upward_compatible_machine": []
}

View file

@ -1,15 +1,11 @@
{
"type": "machine_model",
"name": "Anker M5C",
"model_id": "Anker-M5C",
"nozzle_diameter": "0.4",
"machine_tech": "FFF",
"family": "Anker",
"bed_model": "M5C-CE-bed.stl",
"bed_texture": "M5-CE-texture.svg",
"hotend_model": "",
"default_materials": "Anker Generic ABS;Anker Generic PLA;Anker Generic PLA-CF;Anker Generic PETG;Anker Generic TPU;Anker Generic ASA;Anker Generic PVA;Anker Generic PC;Anker Generic PA;Anker Generic PA-CF",
"retraction_length": [
"0.8"
]
"family": "Anker",
"machine_tech": "FFF",
"model_id": "V81101C3",
"default_materials": "Anker Generic PLA;Anker Generic PLA+;Anker Generic PLA Silk;Anker Generic TPU;Anker Generic PETG"
}

View file

@ -3,18 +3,18 @@
"name": "fdm_machine_common",
"from": "system",
"instantiation": "false",
"gcode_flavor": "marlin2",
"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]\n\n",
"machine_start_gcode": "M4899 T3 ; Enable v3 jerk and S-curve acceleration \nM104 S150 ; Set hotend temp to 150 degrees to prevent ooze\nM190 S{first_layer_bed_temperature[0]} ; set and wait for bed temp to stabilize\nM109 S{first_layer_temperature[0]} ; set final nozzle temp to stabilize\nG28 ;Home",
"machine_end_gcode": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM18",
"change_filament_gcode": "M600",
"machine_pause_gcode": "M601",
"support_chamber_temp_control": "0",
"printer_technology": "FFF",
"deretraction_speed": [
"60"
],
"extruder_colour": [
"#018001"
],
"extruder_offset": [
"0x0"
],
"silent_mode": "0",
"machine_max_acceleration_e": [
"4000"
],
@ -22,10 +22,7 @@
"6000"
],
"machine_max_acceleration_retracting": [
"6000"
],
"machine_max_acceleration_travel": [
"6000"
"1000"
],
"machine_max_acceleration_x": [
"6000"
@ -34,7 +31,10 @@
"6000"
],
"machine_max_acceleration_z": [
"500"
"300"
],
"machine_max_acceleration_travel": [
"6000"
],
"machine_max_speed_e": [
"50"
@ -46,16 +46,16 @@
"600"
],
"machine_max_speed_z": [
"80"
"30"
],
"machine_max_jerk_e": [
"18"
"3"
],
"machine_max_jerk_x": [
"15"
"8"
],
"machine_max_jerk_y": [
"15"
"8"
],
"machine_max_jerk_z": [
"0.3"
@ -72,49 +72,37 @@
"min_layer_height": [
"0.05"
],
"printable_height": "250",
"nozzle_diameter": [
"0.4"
],
"printer_settings_id": "",
"printer_technology": "FFF",
"printer_variant": "0.4",
"retraction_minimum_travel": [
"3"
"1"
],
"retract_before_wipe": [
"0%"
],
"retract_when_changing_layer": [
"0"
"1"
],
"retraction_length": [
"0.5"
],
"retract_length_toolchange": [
"2"
],
"z_hop": [
"0"
],
"retract_restart_extra": [
"0"
],
"default_print_profile": "0.20mm Standard @Anker",
"retract_restart_extra_toolchange": [
"0"
],
"retraction_speed": [
"60"
],
"deretraction_speed": [
"60"
],
"silent_mode": "0",
"single_extruder_multi_material": "1",
"use_relative_e_distances": "1",
"wipe_distance": [
"0"
],
"support_air_filtration": "0",
"wipe": [
"0"
],
"z_hop": [
"0"
],
"z_hop_types": "Normal Lift"
"1"
]
}

View file

@ -0,0 +1,13 @@
{
"type": "machine",
"name": "fdm_marlin_common",
"inherits": "fdm_machine_common",
"from": "system",
"instantiation": "false",
"gcode_flavor": "marlin2",
"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]\n\n",
"machine_start_gcode": "M4899 T3 ; Enable v3 jerk and S-curve acceleration \nM104 S150 ; Set hotend temp to 150 degrees to prevent ooze\nM190 S{first_layer_bed_temperature[0]} ; set and wait for bed temp to stabilize\nM109 S{first_layer_temperature[0]} ; set final nozzle temp to stabilize\nG28 ;Home",
"machine_end_gcode": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM18",
"change_filament_gcode": "M600",
"machine_pause_gcode": "M601"
}