From 7e8229a9766c84efdb73c13c4d155448d6ebbc60 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Thu, 23 Mar 2023 16:20:18 +0100 Subject: [PATCH] Fix gcode flavors in profiles For some printer definitions the `machine_gcode_flavor` was entered incorrectly (the display name was used rather than the flavor-key). Previously in combo boxes the flavour would default to the first key (which is "marlin"). Due to recent changes we will not default anymore to the first option, but instead show nothing. By changing the flavor to the correct key the flavors will show up correctly again. CURA-10374 (cherry picked from commit 2181bbceb3091ce00e24bdd88e4bdcb395402f9b) --- resources/definitions/abax_pri3.def.json | 56 +++++++++---- resources/definitions/abax_pri5.def.json | 56 +++++++++---- resources/definitions/abax_titan.def.json | 56 +++++++++---- resources/definitions/arjun300.def.json | 76 ++++++++++++----- .../definitions/arjun_duplication.def.json | 76 ++++++++++++----- resources/definitions/arjun_mirrored.def.json | 76 ++++++++++++----- resources/definitions/arjunpro300.def.json | 76 ++++++++++++----- .../definitions/arjunpro_duplication.def.json | 76 ++++++++++++----- .../definitions/arjunpro_mirrored.def.json | 76 ++++++++++++----- .../atmat_signal_pro_base.def.json | 71 ++++++++++++---- resources/definitions/atom3.def.json | 60 +++++++++---- .../definitions/dagoma_pro_430_base.def.json | 59 +++++++++---- resources/definitions/diy220.def.json | 64 ++++++++++---- resources/definitions/easyarts_ares.def.json | 56 +++++++++---- resources/definitions/eazao_zero.def.json | 84 ++++++++++++++----- resources/definitions/flsun_sr.def.json | 55 ++++++++---- resources/definitions/kosher.def.json | 80 +++++++++++++----- .../definitions/kosher_duplication.def.json | 80 +++++++++++++----- resources/definitions/kosher_mirror.def.json | 80 +++++++++++++----- .../definitions/leapfrog_creatr_hs.def.json | 55 ++++++++---- .../leapfrog_creatr_hs_xl.def.json | 55 ++++++++---- .../definitions/makeblock_mcreate.def.json | 47 ++++++++--- resources/definitions/strateo3d.def.json | 63 ++++++++++---- .../definitions/trimaker_nebula_plus.def.json | 72 ++++++++++++---- resources/definitions/vzbot_base.def.json | 71 ++++++++++++---- resources/definitions/winbo_dragonl4.def.json | 71 ++++++++++++---- resources/definitions/winbo_mini2.def.json | 71 ++++++++++++---- .../definitions/winbo_superhelper105.def.json | 71 ++++++++++++---- 28 files changed, 1412 insertions(+), 477 deletions(-) diff --git a/resources/definitions/abax_pri3.def.json b/resources/definitions/abax_pri3.def.json index 7e1aefe90f..92eec7c06e 100644 --- a/resources/definitions/abax_pri3.def.json +++ b/resources/definitions/abax_pri3.def.json @@ -13,19 +13,47 @@ }, "overrides": { - "layer_height": { "default_value": 0.2 }, - "layer_height_0": { "default_value": 0.2 }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 220 }, - "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nM140 S0 ;set temp of bed to Zero \nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y215 ;move X to min and Y to max \nG90 ;set to absolute positioning\nM84 ;turn off steppers\n; -- end of END GCODE --" }, - "machine_gcode_flavor": { "default_value": "RepRap" }, - "machine_heated_bed": { "default_value": false }, - "machine_height": { "default_value": 200 }, - "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z5.0 F200 ;move Z to position 5.0 mm\nG92 E0 ;zero the extruded length\n; -- end of START GCODE --" }, - "machine_width": { "default_value": 225 }, - "speed_print": { "default_value": 40 }, - "support_enable": { "default_value": true }, - "top_bottom_thickness": { "default_value": 1 }, - "wall_thickness": { "value": "1" } + "layer_height": { + "default_value": 0.2 + }, + "layer_height_0": { + "default_value": 0.2 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_depth": { + "default_value": 220 + }, + "machine_end_gcode": { + "default_value": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nM140 S0 ;set temp of bed to Zero \nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y215 ;move X to min and Y to max \nG90 ;set to absolute positioning\nM84 ;turn off steppers\n; -- end of END GCODE --" + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_heated_bed": { + "default_value": false + }, + "machine_height": { + "default_value": 200 + }, + "machine_start_gcode": { + "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z5.0 F200 ;move Z to position 5.0 mm\nG92 E0 ;zero the extruded length\n; -- end of START GCODE --" + }, + "machine_width": { + "default_value": 225 + }, + "speed_print": { + "default_value": 40 + }, + "support_enable": { + "default_value": true + }, + "top_bottom_thickness": { + "default_value": 1 + }, + "wall_thickness": { + "value": "1" + } } } \ No newline at end of file diff --git a/resources/definitions/abax_pri5.def.json b/resources/definitions/abax_pri5.def.json index 64bf28d948..d046698f5e 100644 --- a/resources/definitions/abax_pri5.def.json +++ b/resources/definitions/abax_pri5.def.json @@ -13,19 +13,47 @@ }, "overrides": { - "layer_height": { "default_value": 0.2 }, - "layer_height_0": { "default_value": 0.2 }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 310 }, - "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nM140 S0 ;set temp of bed to Zero \nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y300 ;move X to min and Y to max \nG90 ;set to absolute positioning\nM84 ;turn off steppers\n; -- end of END GCODE --" }, - "machine_gcode_flavor": { "default_value": "RepRap" }, - "machine_heated_bed": { "default_value": false }, - "machine_height": { "default_value": 300 }, - "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z5.0 F200 ;move Z to position 5.0 mm\nG92 E0 ;zero the extruded length\n; -- end of START GCODE --" }, - "machine_width": { "default_value": 310 }, - "speed_print": { "default_value": 40 }, - "support_enable": { "default_value": true }, - "top_bottom_thickness": { "default_value": 1 }, - "wall_thickness": { "value": "1" } + "layer_height": { + "default_value": 0.2 + }, + "layer_height_0": { + "default_value": 0.2 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_depth": { + "default_value": 310 + }, + "machine_end_gcode": { + "default_value": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nM140 S0 ;set temp of bed to Zero \nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y300 ;move X to min and Y to max \nG90 ;set to absolute positioning\nM84 ;turn off steppers\n; -- end of END GCODE --" + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_heated_bed": { + "default_value": false + }, + "machine_height": { + "default_value": 300 + }, + "machine_start_gcode": { + "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z5.0 F200 ;move Z to position 5.0 mm\nG92 E0 ;zero the extruded length\n; -- end of START GCODE --" + }, + "machine_width": { + "default_value": 310 + }, + "speed_print": { + "default_value": 40 + }, + "support_enable": { + "default_value": true + }, + "top_bottom_thickness": { + "default_value": 1 + }, + "wall_thickness": { + "value": "1" + } } } \ No newline at end of file diff --git a/resources/definitions/abax_titan.def.json b/resources/definitions/abax_titan.def.json index 1c17ea8c8b..ca013583cd 100644 --- a/resources/definitions/abax_titan.def.json +++ b/resources/definitions/abax_titan.def.json @@ -12,19 +12,47 @@ }, "overrides": { - "layer_height": { "default_value": 0.2 }, - "layer_height_0": { "default_value": 0.2 }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 310 }, - "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nM140 S0 ;set temp of bed to Zero \nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y300 ;move X to min and Y to max \nG90 ;set to absolute positioning\nM84 ;turn off steppers\n; -- end of END GCODE --" }, - "machine_gcode_flavor": { "default_value": "RepRap" }, - "machine_heated_bed": { "default_value": false }, - "machine_height": { "default_value": 300 }, - "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z5.0 F200 ;move Z to position 5.0 mm\nG92 E0 ;zero the extruded length\n; -- end of START GCODE --" }, - "machine_width": { "default_value": 310 }, - "speed_print": { "default_value": 40 }, - "support_enable": { "default_value": true }, - "top_bottom_thickness": { "default_value": 1 }, - "wall_thickness": { "value": "1" } + "layer_height": { + "default_value": 0.2 + }, + "layer_height_0": { + "default_value": 0.2 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_depth": { + "default_value": 310 + }, + "machine_end_gcode": { + "default_value": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nM140 S0 ;set temp of bed to Zero \nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y300 ;move X to min and Y to max \nG90 ;set to absolute positioning\nM84 ;turn off steppers\n; -- end of END GCODE --" + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_heated_bed": { + "default_value": false + }, + "machine_height": { + "default_value": 300 + }, + "machine_start_gcode": { + "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z5.0 F200 ;move Z to position 5.0 mm\nG92 E0 ;zero the extruded length\n; -- end of START GCODE --" + }, + "machine_width": { + "default_value": 310 + }, + "speed_print": { + "default_value": 40 + }, + "support_enable": { + "default_value": true + }, + "top_bottom_thickness": { + "default_value": 1 + }, + "wall_thickness": { + "value": "1" + } } } \ No newline at end of file diff --git a/resources/definitions/arjun300.def.json b/resources/definitions/arjun300.def.json index 564d2b7278..9015bcb15c 100644 --- a/resources/definitions/arjun300.def.json +++ b/resources/definitions/arjun300.def.json @@ -26,25 +26,63 @@ }, "overrides": { - "adhesion_type": { "default_value": "skirt" }, - "ironing_enabled": { "default_value": true }, - "line_width": { "value": "machine_nozzle_size" }, - "machine_acceleration": { "default_value": 2000 }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 310 }, - "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_heated_bed": { "default_value": true }, - "machine_height": { "default_value": 290 }, - "machine_max_feedrate_e": { "value": 150 }, - "machine_max_feedrate_x": { "value": 300 }, - "machine_max_feedrate_y": { "value": 300 }, - "machine_max_feedrate_z": { "value": 15 }, - "machine_name": { "default_value": "Arjun 300" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "machine_show_variants": { "default_value": true }, - "machine_start_gcode": { "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28\nG1 Z0.3 F150\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n" }, + "adhesion_type": { + "default_value": "skirt" + }, + "ironing_enabled": { + "default_value": true + }, + "line_width": { + "value": "machine_nozzle_size" + }, + "machine_acceleration": { + "default_value": 2000 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_depth": { + "default_value": 310 + }, + "machine_end_gcode": { + "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84" + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_height": { + "default_value": 290 + }, + "machine_max_feedrate_e": { + "value": 150 + }, + "machine_max_feedrate_x": { + "value": 300 + }, + "machine_max_feedrate_y": { + "value": 300 + }, + "machine_max_feedrate_z": { + "value": 15 + }, + "machine_name": { + "default_value": "Arjun 300" + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "machine_show_variants": { + "default_value": true + }, + "machine_start_gcode": { + "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28\nG1 Z0.3 F150\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n" + }, "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, "machine_width": { "default_value": 317 }, "material_diameter": { "default_value": 1.75 }, diff --git a/resources/definitions/arjun_duplication.def.json b/resources/definitions/arjun_duplication.def.json index c261a453cd..ef5ff21295 100644 --- a/resources/definitions/arjun_duplication.def.json +++ b/resources/definitions/arjun_duplication.def.json @@ -16,25 +16,63 @@ }, "overrides": { - "adhesion_type": { "default_value": "skirt" }, - "ironing_enabled": { "default_value": true }, - "line_width": { "value": "machine_nozzle_size" }, - "machine_acceleration": { "default_value": 2000 }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 310 }, - "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_heated_bed": { "default_value": true }, - "machine_height": { "default_value": 290 }, - "machine_max_feedrate_e": { "value": 150 }, - "machine_max_feedrate_x": { "value": 300 }, - "machine_max_feedrate_y": { "value": 300 }, - "machine_max_feedrate_z": { "value": 15 }, - "machine_name": { "default_value": "Arjun 300 Duplication" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "machine_show_variants": { "default_value": true }, - "machine_start_gcode": { "default_value": "M605 S2 R0 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n" }, + "adhesion_type": { + "default_value": "skirt" + }, + "ironing_enabled": { + "default_value": true + }, + "line_width": { + "value": "machine_nozzle_size" + }, + "machine_acceleration": { + "default_value": 2000 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_depth": { + "default_value": 310 + }, + "machine_end_gcode": { + "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" + }, + "machine_extruder_count": { + "default_value": 1 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_height": { + "default_value": 290 + }, + "machine_max_feedrate_e": { + "value": 150 + }, + "machine_max_feedrate_x": { + "value": 300 + }, + "machine_max_feedrate_y": { + "value": 300 + }, + "machine_max_feedrate_z": { + "value": 15 + }, + "machine_name": { + "default_value": "Arjun 300 Duplication" + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "machine_show_variants": { + "default_value": true + }, + "machine_start_gcode": { + "default_value": "M605 S2 R0 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n" + }, "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, "machine_width": { "default_value": 158.5 }, "material_diameter": { "default_value": 1.75 }, diff --git a/resources/definitions/arjun_mirrored.def.json b/resources/definitions/arjun_mirrored.def.json index 586fe5f994..743c356ed5 100644 --- a/resources/definitions/arjun_mirrored.def.json +++ b/resources/definitions/arjun_mirrored.def.json @@ -16,25 +16,63 @@ }, "overrides": { - "adhesion_type": { "default_value": "skirt" }, - "ironing_enabled": { "default_value": true }, - "line_width": { "value": "machine_nozzle_size" }, - "machine_acceleration": { "default_value": 2000 }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 310 }, - "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_heated_bed": { "default_value": true }, - "machine_height": { "default_value": 290 }, - "machine_max_feedrate_e": { "value": 150 }, - "machine_max_feedrate_x": { "value": 300 }, - "machine_max_feedrate_y": { "value": 300 }, - "machine_max_feedrate_z": { "value": 15 }, - "machine_name": { "default_value": "Arjun 300 Mirror" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "machine_show_variants": { "default_value": true }, - "machine_start_gcode": { "default_value": "M605 S2 R0 X155\nM605 S3 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n" }, + "adhesion_type": { + "default_value": "skirt" + }, + "ironing_enabled": { + "default_value": true + }, + "line_width": { + "value": "machine_nozzle_size" + }, + "machine_acceleration": { + "default_value": 2000 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_depth": { + "default_value": 310 + }, + "machine_end_gcode": { + "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" + }, + "machine_extruder_count": { + "default_value": 1 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_height": { + "default_value": 290 + }, + "machine_max_feedrate_e": { + "value": 150 + }, + "machine_max_feedrate_x": { + "value": 300 + }, + "machine_max_feedrate_y": { + "value": 300 + }, + "machine_max_feedrate_z": { + "value": 15 + }, + "machine_name": { + "default_value": "Arjun 300 Mirror" + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "machine_show_variants": { + "default_value": true + }, + "machine_start_gcode": { + "default_value": "M605 S2 R0 X155\nM605 S3 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n" + }, "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, "machine_width": { "default_value": 158.5 }, "material_diameter": { "default_value": 1.75 }, diff --git a/resources/definitions/arjunpro300.def.json b/resources/definitions/arjunpro300.def.json index 6ef916d9d2..40e0029b28 100644 --- a/resources/definitions/arjunpro300.def.json +++ b/resources/definitions/arjunpro300.def.json @@ -26,25 +26,63 @@ }, "overrides": { - "adhesion_type": { "default_value": "skirt" }, - "ironing_enabled": { "default_value": true }, - "line_width": { "value": "machine_nozzle_size" }, - "machine_acceleration": { "default_value": 2000 }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 300 }, - "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_heated_bed": { "default_value": true }, - "machine_height": { "default_value": 293 }, - "machine_max_feedrate_e": { "value": 150 }, - "machine_max_feedrate_x": { "value": 300 }, - "machine_max_feedrate_y": { "value": 300 }, - "machine_max_feedrate_z": { "value": 15 }, - "machine_name": { "default_value": "Arjun Pro 300" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "machine_show_variants": { "default_value": true }, - "machine_start_gcode": { "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28 \nG29 \nG1 X0 Y5 F2000\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n" }, + "adhesion_type": { + "default_value": "skirt" + }, + "ironing_enabled": { + "default_value": true + }, + "line_width": { + "value": "machine_nozzle_size" + }, + "machine_acceleration": { + "default_value": 2000 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_depth": { + "default_value": 300 + }, + "machine_end_gcode": { + "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84" + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_height": { + "default_value": 293 + }, + "machine_max_feedrate_e": { + "value": 150 + }, + "machine_max_feedrate_x": { + "value": 300 + }, + "machine_max_feedrate_y": { + "value": 300 + }, + "machine_max_feedrate_z": { + "value": 15 + }, + "machine_name": { + "default_value": "Arjun Pro 300" + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "machine_show_variants": { + "default_value": true + }, + "machine_start_gcode": { + "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28 \nG29 \nG1 X0 Y5 F2000\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n" + }, "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, "machine_width": { "default_value": 300 }, "material_diameter": { "default_value": 1.75 }, diff --git a/resources/definitions/arjunpro_duplication.def.json b/resources/definitions/arjunpro_duplication.def.json index 73572c70de..09aa197d6a 100644 --- a/resources/definitions/arjunpro_duplication.def.json +++ b/resources/definitions/arjunpro_duplication.def.json @@ -16,25 +16,63 @@ }, "overrides": { - "adhesion_type": { "default_value": "skirt" }, - "ironing_enabled": { "default_value": true }, - "line_width": { "value": "machine_nozzle_size" }, - "machine_acceleration": { "default_value": 2000 }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 300 }, - "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_heated_bed": { "default_value": true }, - "machine_height": { "default_value": 293 }, - "machine_max_feedrate_e": { "value": 150 }, - "machine_max_feedrate_x": { "value": 300 }, - "machine_max_feedrate_y": { "value": 300 }, - "machine_max_feedrate_z": { "value": 15 }, - "machine_name": { "default_value": "Arjunpro 300 Duplication" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "machine_show_variants": { "default_value": true }, - "machine_start_gcode": { "default_value": "M605 S2 R0 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n" }, + "adhesion_type": { + "default_value": "skirt" + }, + "ironing_enabled": { + "default_value": true + }, + "line_width": { + "value": "machine_nozzle_size" + }, + "machine_acceleration": { + "default_value": 2000 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_depth": { + "default_value": 300 + }, + "machine_end_gcode": { + "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" + }, + "machine_extruder_count": { + "default_value": 1 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_height": { + "default_value": 293 + }, + "machine_max_feedrate_e": { + "value": 150 + }, + "machine_max_feedrate_x": { + "value": 300 + }, + "machine_max_feedrate_y": { + "value": 300 + }, + "machine_max_feedrate_z": { + "value": 15 + }, + "machine_name": { + "default_value": "Arjunpro 300 Duplication" + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "machine_show_variants": { + "default_value": true + }, + "machine_start_gcode": { + "default_value": "M605 S2 R0 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n" + }, "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, "machine_width": { "default_value": 120 }, "material_diameter": { "default_value": 1.75 }, diff --git a/resources/definitions/arjunpro_mirrored.def.json b/resources/definitions/arjunpro_mirrored.def.json index 7d37ccc6c2..f2894d6dd3 100644 --- a/resources/definitions/arjunpro_mirrored.def.json +++ b/resources/definitions/arjunpro_mirrored.def.json @@ -16,25 +16,63 @@ }, "overrides": { - "adhesion_type": { "default_value": "skirt" }, - "ironing_enabled": { "default_value": true }, - "line_width": { "value": "machine_nozzle_size" }, - "machine_acceleration": { "default_value": 2000 }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 300 }, - "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_heated_bed": { "default_value": true }, - "machine_height": { "default_value": 293 }, - "machine_max_feedrate_e": { "value": 150 }, - "machine_max_feedrate_x": { "value": 300 }, - "machine_max_feedrate_y": { "value": 300 }, - "machine_max_feedrate_z": { "value": 15 }, - "machine_name": { "default_value": "Arjunpro 300 Mirror" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "machine_show_variants": { "default_value": true }, - "machine_start_gcode": { "default_value": "M605 S2 R0 X125\nM605 S3 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n" }, + "adhesion_type": { + "default_value": "skirt" + }, + "ironing_enabled": { + "default_value": true + }, + "line_width": { + "value": "machine_nozzle_size" + }, + "machine_acceleration": { + "default_value": 2000 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_depth": { + "default_value": 300 + }, + "machine_end_gcode": { + "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" + }, + "machine_extruder_count": { + "default_value": 1 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_height": { + "default_value": 293 + }, + "machine_max_feedrate_e": { + "value": 150 + }, + "machine_max_feedrate_x": { + "value": 300 + }, + "machine_max_feedrate_y": { + "value": 300 + }, + "machine_max_feedrate_z": { + "value": 15 + }, + "machine_name": { + "default_value": "Arjunpro 300 Mirror" + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "machine_show_variants": { + "default_value": true + }, + "machine_start_gcode": { + "default_value": "M605 S2 R0 X125\nM605 S3 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n" + }, "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, "machine_width": { "default_value": 120 }, "material_diameter": { "default_value": 1.75 }, diff --git a/resources/definitions/atmat_signal_pro_base.def.json b/resources/definitions/atmat_signal_pro_base.def.json index 3c581ff654..1c9400df23 100644 --- a/resources/definitions/atmat_signal_pro_base.def.json +++ b/resources/definitions/atmat_signal_pro_base.def.json @@ -129,27 +129,62 @@ "jerk_support": { "value": "jerk_print" }, "jerk_support_interface": { "value": "jerk_print" }, "jerk_topbottom": { "value": "jerk_print" }, - "jerk_travel": { "value": "jerk_layer_0" }, - "jerk_travel_layer_0": { "value": "jerk_layer_0" }, - "jerk_wall": { "value": "jerk_print" }, - "jerk_wall_0": { "value": "jerk_print" }, - "layer_height_0": { "resolve": "max(0.2, min(extruderValues('layer_height')))" }, - "line_width": { "value": "machine_nozzle_size * 1.125" }, - "machine_acceleration": { "default_value": 1500 }, - "machine_depth": { "default_value": 300 }, - "machine_end_gcode": { "default_value": "M104 T0 S0 ;extruder heater off\nM104 T1 S0 ;extruder heater off\nM140 S0 ;heated bed heater off\nG91\nG1 Z1 F420 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+1 E-1 F300 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nG1 X0 Y300 F6000 ;move the head out of the way\nM84 ;steppers off" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_head_with_fans_polygon": - { + "jerk_travel": { + "value": "jerk_layer_0" + }, + "jerk_travel_layer_0": { + "value": "jerk_layer_0" + }, + "jerk_wall": { + "value": "jerk_print" + }, + "jerk_wall_0": { + "value": "jerk_print" + }, + "layer_height_0": { + "resolve": "max(0.2, min(extruderValues('layer_height')))" + }, + "line_width": { + "value": "machine_nozzle_size * 1.125" + }, + "machine_acceleration": { + "default_value": 1500 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_end_gcode": { + "default_value": "M104 T0 S0 ;extruder heater off\nM104 T1 S0 ;extruder heater off\nM140 S0 ;heated bed heater off\nG91\nG1 Z1 F420 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+1 E-1 F300 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nG1 X0 Y300 F6000 ;move the head out of the way\nM84 ;steppers off" + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_head_with_fans_polygon": { "default_value": [ - [-35, 65], - [-35, -50], - [35, -50], - [35, 65] + [ + -35, + 65 + ], + [ + -35, + -50 + ], + [ + 35, + -50 + ], + [ + 35, + 65 + ] ] }, - "machine_heated_bed": { "default_value": true }, + "machine_heated_bed": { + "default_value": true + }, "machine_heated_build_volume": { "default_value": true }, "machine_height": { "default_value": 300 }, "machine_max_acceleration_x": { "default_value": 1500 }, diff --git a/resources/definitions/atom3.def.json b/resources/definitions/atom3.def.json index aff4dfd3fb..a72e2b98ef 100644 --- a/resources/definitions/atom3.def.json +++ b/resources/definitions/atom3.def.json @@ -40,26 +40,54 @@ "infill_before_walls": { "value": false }, "infill_sparse_density": { "default_value": 17 }, "initial_layer_line_width_factor": { "default_value": 100 }, - "layer_height": { "default_value": 0.2 }, - "layer_height_0": - { + "layer_height": { + "default_value": 0.2 + }, + "layer_height_0": { "default_value": 0.2, "value": "layer_height" }, - "line_width": { "value": "machine_nozzle_size" }, - "machine_center_is_zero": { "default_value": true }, - "machine_depth": { "default_value": 270 }, - "machine_end_gcode": { "default_value": ";MACHINE END CODE\nG91 ;relative positioning\nG1 E-1 F300 ;retract filament release pressure\nG1 Z+1.0 E-5 F9000 ;move up a and retract more\nG90 ;absolute positioning\nG28; home\nM84 ;steppers off\n;MACHINE END CODE" }, - "machine_gcode_flavor": { "RepRap (Marlin/Sprinter)": "Marlin" }, - "machine_head_with_fans_polygon": - { + "line_width": { + "value": "machine_nozzle_size" + }, + "machine_center_is_zero": { + "default_value": true + }, + "machine_depth": { + "default_value": 270 + }, + "machine_end_gcode": { + "default_value": ";MACHINE END CODE\nG91 ;relative positioning\nG1 E-1 F300 ;retract filament release pressure\nG1 Z+1.0 E-5 F9000 ;move up a and retract more\nG90 ;absolute positioning\nG28; home\nM84 ;steppers off\n;MACHINE END CODE" + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_head_with_fans_polygon": { "default_value": [ - [-23.82, 51.25], - [23.82, 51.25], - [56.292, -5.0], - [32.476, -46.25], - [-32.476, -46.25], - [-56.292, -5.0] + [ + -23.82, + 51.25 + ], + [ + 23.82, + 51.25 + ], + [ + 56.292, + -5.0 + ], + [ + 32.476, + -46.25 + ], + [ + -32.476, + -46.25 + ], + [ + -56.292, + -5.0 + ] ] }, "machine_heated_bed": { "default_value": true }, diff --git a/resources/definitions/dagoma_pro_430_base.def.json b/resources/definitions/dagoma_pro_430_base.def.json index fd8de61ad0..f76328a548 100644 --- a/resources/definitions/dagoma_pro_430_base.def.json +++ b/resources/definitions/dagoma_pro_430_base.def.json @@ -17,24 +17,51 @@ }, "overrides": { - "default_material_bed_temperature": { "default_value": 50 }, - "default_material_print_temperature": - { + "default_material_bed_temperature": { + "default_value": 50 + }, + "default_material_print_temperature": { "default_value": 205, "maximum_value": "430" }, - "infill_before_walls": { "value": "False" }, - "inset_direction": { "value": "'inside_out'" }, - "machine_depth": { "default_value": 320 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 430 }, - "material_break_preparation_temperature": { "maximum_value": "430" }, - "material_break_temperature": { "maximum_value": "430" }, - "material_final_print_temperature": { "maximum_value": "430" }, - "material_initial_print_temperature": { "maximum_value": "430" }, - "material_print_temperature": { "maximum_value": "430" }, - "material_print_temperature_layer_0": { "maximum_value": "430" }, - "material_standby_temperature": { "maximum_value": "430" } + "infill_before_walls": { + "value": "False" + }, + "inset_direction": { + "value": "'inside_out'" + }, + "machine_depth": { + "default_value": 320 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_width": { + "default_value": 430 + }, + "material_break_preparation_temperature": { + "maximum_value": "430" + }, + "material_break_temperature": { + "maximum_value": "430" + }, + "material_final_print_temperature": { + "maximum_value": "430" + }, + "material_initial_print_temperature": { + "maximum_value": "430" + }, + "material_print_temperature": { + "maximum_value": "430" + }, + "material_print_temperature_layer_0": { + "maximum_value": "430" + }, + "material_standby_temperature": { + "maximum_value": "430" + } } } \ No newline at end of file diff --git a/resources/definitions/diy220.def.json b/resources/definitions/diy220.def.json index 324aee4936..b809b7c1f6 100644 --- a/resources/definitions/diy220.def.json +++ b/resources/definitions/diy220.def.json @@ -23,22 +23,54 @@ }, "overrides": { - "gantry_height": { "value": "48" }, - "machine_acceleration": { "default_value": 3000 }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 220 }, - "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nM84" }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_heated_bed": { "default_value": true }, - "machine_height": { "default_value": 305 }, - "machine_max_feedrate_x": { "default_value": 300 }, - "machine_max_feedrate_y": { "default_value": 300 }, - "machine_max_feedrate_z": { "default_value": 40 }, - "machine_name": { "default_value": "Diytech 220" }, - "machine_nozzle_head_distance": { "default_value": 3 }, - "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, - "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nG28\nG1 Z15 F200\nT0\nG92 E0\nG1 E16 F250\nG92 E0\n" }, - "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "gantry_height": { + "value": "48" + }, + "machine_acceleration": { + "default_value": 3000 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_depth": { + "default_value": 220 + }, + "machine_end_gcode": { + "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nM84" + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_height": { + "default_value": 305 + }, + "machine_max_feedrate_x": { + "default_value": 300 + }, + "machine_max_feedrate_y": { + "default_value": 300 + }, + "machine_max_feedrate_z": { + "default_value": 40 + }, + "machine_name": { + "default_value": "Diytech 220" + }, + "machine_nozzle_head_distance": { + "default_value": 3 + }, + "machine_nozzle_tip_outer_diameter": { + "default_value": 1 + }, + "machine_start_gcode": { + "default_value": "G21\nG90\nM82\nM107\nG28\nG1 Z15 F200\nT0\nG92 E0\nG1 E16 F250\nG92 E0\n" + }, + "machine_use_extruder_offset_to_offset_coords": { + "default_value": true + }, "machine_width": { "default_value": 220 } } } \ No newline at end of file diff --git a/resources/definitions/easyarts_ares.def.json b/resources/definitions/easyarts_ares.def.json index cac0ffcb39..2821f706f0 100644 --- a/resources/definitions/easyarts_ares.def.json +++ b/resources/definitions/easyarts_ares.def.json @@ -12,19 +12,47 @@ }, "overrides": { - "layer_height": { "default_value": 0.2 }, - "layer_height_0": { "default_value": 0.2 }, - "machine_center_is_zero": { "default_value": true }, - "machine_depth": { "default_value": 180 }, - "machine_end_gcode": { "default_value": "; -- START GCODE --\nG28 ; Home all axes\nM104 S0 ;extruder heater off\n;M140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n;M84 ;steppers off\nG90 ;absolute positioning\n; -- end of START GCODE --" }, - "machine_gcode_flavor": { "default_value": "RepRap" }, - "machine_heated_bed": { "default_value": false }, - "machine_height": { "default_value": 200 }, - "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 \nG29 Z0.12 ;Auto-bedleveling with Z offset \nG92 E0 ;zero the extruded length \nG1 F2000 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing...\n; -- end of START GCODE --" }, - "machine_width": { "default_value": 180 }, - "speed_print": { "default_value": 75 }, - "support_enable": { "default_value": true }, - "top_bottom_thickness": { "default_value": 1 }, - "wall_thickness": { "value": "1" } + "layer_height": { + "default_value": 0.2 + }, + "layer_height_0": { + "default_value": 0.2 + }, + "machine_center_is_zero": { + "default_value": true + }, + "machine_depth": { + "default_value": 180 + }, + "machine_end_gcode": { + "default_value": "; -- START GCODE --\nG28 ; Home all axes\nM104 S0 ;extruder heater off\n;M140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n;M84 ;steppers off\nG90 ;absolute positioning\n; -- end of START GCODE --" + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_heated_bed": { + "default_value": false + }, + "machine_height": { + "default_value": 200 + }, + "machine_start_gcode": { + "default_value": "; -- START GCODE --\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 \nG29 Z0.12 ;Auto-bedleveling with Z offset \nG92 E0 ;zero the extruded length \nG1 F2000 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing...\n; -- end of START GCODE --" + }, + "machine_width": { + "default_value": 180 + }, + "speed_print": { + "default_value": 75 + }, + "support_enable": { + "default_value": true + }, + "top_bottom_thickness": { + "default_value": 1 + }, + "wall_thickness": { + "value": "1" + } } } \ No newline at end of file diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index 4441984dd6..4ab09bd5ec 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -25,27 +25,69 @@ "infill_sparse_density": { "value": 0 }, "initial_bottom_layers": { "value": 2 }, "jerk_enabled": { "value": false }, - "jerk_print": { "value": 10 }, - "jerk_travel": { "value": "jerk_print" }, - "jerk_travel_layer_0": { "value": "jerk_travel" }, - "layer_height": { "value": 1.0 }, - "layer_height_0": { "value": 1.0 }, - "line_width": { "value": 3.0 }, - "machine_acceleration": { "value": 300 }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 150 }, - "machine_end_gcode": { "default_value": "G92 E10\nG1 E-10 F300\nG28 X0 Y0 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" }, - "machine_gcode_flavor": { "default_value": "Marlin (Marlin/Sprinter)" }, - "machine_heated_bed": { "default_value": false }, - "machine_height": { "default_value": 240 }, - "machine_max_acceleration_e": { "value": 500 }, - "machine_max_acceleration_x": { "value": 500 }, - "machine_max_acceleration_y": { "value": 500 }, - "machine_max_acceleration_z": { "value": 50 }, - "machine_max_feedrate_e": { "value": 25 }, - "machine_max_feedrate_x": { "value": 100 }, - "machine_max_feedrate_y": { "value": 100 }, - "machine_max_feedrate_z": { "value": 5 }, + "jerk_print": { + "value": 10 + }, + "jerk_travel": { + "value": "jerk_print" + }, + "jerk_travel_layer_0": { + "value": "jerk_travel" + }, + "layer_height": { + "value": 1.0 + }, + "layer_height_0": { + "value": 1.0 + }, + "line_width": { + "value": 3.0 + }, + "machine_acceleration": { + "value": 300 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_depth": { + "default_value": 150 + }, + "machine_end_gcode": { + "default_value": "G92 E10\nG1 E-10 F300\nG28 X0 Y0 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_heated_bed": { + "default_value": false + }, + "machine_height": { + "default_value": 240 + }, + "machine_max_acceleration_e": { + "value": 500 + }, + "machine_max_acceleration_x": { + "value": 500 + }, + "machine_max_acceleration_y": { + "value": 500 + }, + "machine_max_acceleration_z": { + "value": 50 + }, + "machine_max_feedrate_e": { + "value": 25 + }, + "machine_max_feedrate_x": { + "value": 100 + }, + "machine_max_feedrate_y": { + "value": 100 + }, + "machine_max_feedrate_z": { + "value": 5 + }, "machine_max_jerk_e": { "value": 5 }, "machine_max_jerk_xy": { "value": 10 }, "machine_max_jerk_z": { "value": 0.3 }, diff --git a/resources/definitions/flsun_sr.def.json b/resources/definitions/flsun_sr.def.json index a926816617..bcef9b3abe 100644 --- a/resources/definitions/flsun_sr.def.json +++ b/resources/definitions/flsun_sr.def.json @@ -21,23 +21,50 @@ }, "overrides": { - "gantry_height": { "value": "0" }, - "infill_sparse_density": { "default_value": 15 }, - "machine_center_is_zero": { "default_value": true }, - "machine_depth": { "default_value": 264 }, - "machine_end_gcode": { "default_value": "G91 ; relative coordinates\nG1 E-1 F300 ; retract filament a bit before lifting\nG1 Z+5 E-5 F6000 ; raise platform from current position\nG28 X0 Y0 ; home axis\nG90 ; absolute coordinates\nG92 E0 ; reset extruder\nM104 S0 ; turn off hotend\nM140 S0 ; turn off heat bed\nM107 ; turn off fans\nM84 ; disable motors\n" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_head_with_fans_polygon": - { + "gantry_height": { + "value": "0" + }, + "infill_sparse_density": { + "default_value": 15 + }, + "machine_center_is_zero": { + "default_value": true + }, + "machine_depth": { + "default_value": 264 + }, + "machine_end_gcode": { + "default_value": "G91 ; relative coordinates\nG1 E-1 F300 ; retract filament a bit before lifting\nG1 Z+5 E-5 F6000 ; raise platform from current position\nG28 X0 Y0 ; home axis\nG90 ; absolute coordinates\nG92 E0 ; reset extruder\nM104 S0 ; turn off hotend\nM140 S0 ; turn off heat bed\nM107 ; turn off fans\nM84 ; disable motors\n" + }, + "machine_extruder_count": { + "default_value": 1 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_head_with_fans_polygon": { "default_value": [ - [0, 0], - [0, 0], - [0, 0], - [0, 0] + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ] ] }, - "machine_heated_bed": { "default_value": true }, + "machine_heated_bed": { + "default_value": true + }, "machine_height": { "default_value": 320 }, "machine_nozzle_size": { "default_value": 0.4 }, "machine_shape": { "default_value": "elliptic" }, diff --git a/resources/definitions/kosher.def.json b/resources/definitions/kosher.def.json index ea483a3e34..531d9a101e 100644 --- a/resources/definitions/kosher.def.json +++ b/resources/definitions/kosher.def.json @@ -27,26 +27,66 @@ }, "overrides": { - "adhesion_type": { "default_value": "skirt" }, - "gantry_height": { "value": "48" }, - "ironing_enabled": { "default_value": true }, - "line_width": { "value": "machine_nozzle_size" }, - "machine_acceleration": { "default_value": 3000 }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 220 }, - "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nG28 X0 Y0\nT0\nM605 S1\nM84" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_heated_bed": { "default_value": true }, - "machine_height": { "default_value": 300 }, - "machine_max_feedrate_e": { "value": 150 }, - "machine_max_feedrate_x": { "value": 300 }, - "machine_max_feedrate_y": { "value": 300 }, - "machine_max_feedrate_z": { "value": 40 }, - "machine_name": { "default_value": "Kosher" }, - "machine_start_gcode": { "default_value": "M605 S0\nG21\nG90\nM82\nM107\nG28\nT1\nG92 E0\nG1 E16 F210\nG92 E0\nT0\nG92 E0\nG1 E16 F210\nG92 E0\n" }, - "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, - "machine_width": { "default_value": 220 }, + "adhesion_type": { + "default_value": "skirt" + }, + "gantry_height": { + "value": "48" + }, + "ironing_enabled": { + "default_value": true + }, + "line_width": { + "value": "machine_nozzle_size" + }, + "machine_acceleration": { + "default_value": 3000 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_depth": { + "default_value": 220 + }, + "machine_end_gcode": { + "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nG28 X0 Y0\nT0\nM605 S1\nM84" + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_height": { + "default_value": 300 + }, + "machine_max_feedrate_e": { + "value": 150 + }, + "machine_max_feedrate_x": { + "value": 300 + }, + "machine_max_feedrate_y": { + "value": 300 + }, + "machine_max_feedrate_z": { + "value": 40 + }, + "machine_name": { + "default_value": "Kosher" + }, + "machine_start_gcode": { + "default_value": "M605 S0\nG21\nG90\nM82\nM107\nG28\nT1\nG92 E0\nG1 E16 F210\nG92 E0\nT0\nG92 E0\nG1 E16 F210\nG92 E0\n" + }, + "machine_use_extruder_offset_to_offset_coords": { + "default_value": false + }, + "machine_width": { + "default_value": 220 + }, "material_diameter": { "default_value": 1.75 }, "optimize_wall_printing_order": { "value": "True" }, "retraction_amount": { "default_value": 6.5 }, diff --git a/resources/definitions/kosher_duplication.def.json b/resources/definitions/kosher_duplication.def.json index 4abc9c081c..2ea988a7e3 100644 --- a/resources/definitions/kosher_duplication.def.json +++ b/resources/definitions/kosher_duplication.def.json @@ -23,26 +23,66 @@ }, "overrides": { - "adhesion_type": { "default_value": "skirt" }, - "gantry_height": { "value": "48" }, - "ironing_enabled": { "default_value": true }, - "line_width": { "value": "machine_nozzle_size" }, - "machine_acceleration": { "default_value": 3000 }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 220 }, - "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM605 S1\nG28 X\nM84" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_heated_bed": { "default_value": true }, - "machine_height": { "default_value": 300 }, - "machine_max_feedrate_e": { "value": 150 }, - "machine_max_feedrate_x": { "value": 300 }, - "machine_max_feedrate_y": { "value": 300 }, - "machine_max_feedrate_z": { "value": 40 }, - "machine_name": { "default_value": "Kosher_Duplication" }, - "machine_start_gcode": { "default_value": "M605 S0\nT0\nM605 S2 R0 X266\nG28 X\nG28 Y\nG1 X-30 F9000\nG1 Y20 F9000\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature};\nM105\nM109 S{material_print_temperature};\nG92 E0\nG1 E16 F210\nG92 E0\nM605 S2 X100\nG28 X\nG28 Z\n" }, - "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, - "machine_width": { "default_value": 100 }, + "adhesion_type": { + "default_value": "skirt" + }, + "gantry_height": { + "value": "48" + }, + "ironing_enabled": { + "default_value": true + }, + "line_width": { + "value": "machine_nozzle_size" + }, + "machine_acceleration": { + "default_value": 3000 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_depth": { + "default_value": 220 + }, + "machine_end_gcode": { + "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM605 S1\nG28 X\nM84" + }, + "machine_extruder_count": { + "default_value": 1 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_height": { + "default_value": 300 + }, + "machine_max_feedrate_e": { + "value": 150 + }, + "machine_max_feedrate_x": { + "value": 300 + }, + "machine_max_feedrate_y": { + "value": 300 + }, + "machine_max_feedrate_z": { + "value": 40 + }, + "machine_name": { + "default_value": "Kosher_Duplication" + }, + "machine_start_gcode": { + "default_value": "M605 S0\nT0\nM605 S2 R0 X266\nG28 X\nG28 Y\nG1 X-30 F9000\nG1 Y20 F9000\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature};\nM105\nM109 S{material_print_temperature};\nG92 E0\nG1 E16 F210\nG92 E0\nM605 S2 X100\nG28 X\nG28 Z\n" + }, + "machine_use_extruder_offset_to_offset_coords": { + "default_value": false + }, + "machine_width": { + "default_value": 100 + }, "material_diameter": { "default_value": 1.75 }, "optimize_wall_printing_order": { "value": "True" }, "retraction_amount": { "default_value": 6.5 }, diff --git a/resources/definitions/kosher_mirror.def.json b/resources/definitions/kosher_mirror.def.json index 66edd3ba68..3f121da777 100644 --- a/resources/definitions/kosher_mirror.def.json +++ b/resources/definitions/kosher_mirror.def.json @@ -23,26 +23,66 @@ }, "overrides": { - "adhesion_type": { "default_value": "skirt" }, - "gantry_height": { "value": "48" }, - "ironing_enabled": { "default_value": true }, - "line_width": { "value": "machine_nozzle_size" }, - "machine_acceleration": { "default_value": 3000 }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 220 }, - "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM605 S1\nG28 X\nM84" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_heated_bed": { "default_value": true }, - "machine_height": { "default_value": 300 }, - "machine_max_feedrate_e": { "value": 150 }, - "machine_max_feedrate_x": { "value": 300 }, - "machine_max_feedrate_y": { "value": 300 }, - "machine_max_feedrate_z": { "value": 40 }, - "machine_name": { "default_value": "Kosher_Mirror" }, - "machine_start_gcode": { "default_value": "M605 S0\nT0\nM605 S2 R0 X220\nM605 S3 X220\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature};\nM105\nM109 S{material_print_temperature};\nG28\nG1 X-50 F9000\nG92 E0\nG1 E16 F210\nG92 E0\n" }, - "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, - "machine_width": { "default_value": 75 }, + "adhesion_type": { + "default_value": "skirt" + }, + "gantry_height": { + "value": "48" + }, + "ironing_enabled": { + "default_value": true + }, + "line_width": { + "value": "machine_nozzle_size" + }, + "machine_acceleration": { + "default_value": 3000 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_depth": { + "default_value": 220 + }, + "machine_end_gcode": { + "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM605 S1\nG28 X\nM84" + }, + "machine_extruder_count": { + "default_value": 1 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_height": { + "default_value": 300 + }, + "machine_max_feedrate_e": { + "value": 150 + }, + "machine_max_feedrate_x": { + "value": 300 + }, + "machine_max_feedrate_y": { + "value": 300 + }, + "machine_max_feedrate_z": { + "value": 40 + }, + "machine_name": { + "default_value": "Kosher_Mirror" + }, + "machine_start_gcode": { + "default_value": "M605 S0\nT0\nM605 S2 R0 X220\nM605 S3 X220\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature};\nM105\nM109 S{material_print_temperature};\nG28\nG1 X-50 F9000\nG92 E0\nG1 E16 F210\nG92 E0\n" + }, + "machine_use_extruder_offset_to_offset_coords": { + "default_value": false + }, + "machine_width": { + "default_value": 75 + }, "material_diameter": { "default_value": 1.75 }, "optimize_wall_printing_order": { "value": "True" }, "retraction_amount": { "default_value": 6.5 }, diff --git a/resources/definitions/leapfrog_creatr_hs.def.json b/resources/definitions/leapfrog_creatr_hs.def.json index be417802ec..4455952d98 100644 --- a/resources/definitions/leapfrog_creatr_hs.def.json +++ b/resources/definitions/leapfrog_creatr_hs.def.json @@ -17,23 +17,50 @@ }, "overrides": { - "build_volume_temperature": { "enabled": false }, - "gantry_height": { "value": "2" }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 280 }, - "machine_end_gcode": { "default_value": "M104 S0 T0 ; turn off right extruder\nM104 S0 T1 ; turn off left extruder\nM140 S0 T0 ; turn off bed\nG1 Z200 F1200 ; drop bed\nG28 X0 ; home X axis\nM84 ; disable motors" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_head_with_fans_polygon": - { + "build_volume_temperature": { + "enabled": false + }, + "gantry_height": { + "value": "2" + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_depth": { + "default_value": 280 + }, + "machine_end_gcode": { + "default_value": "M104 S0 T0 ; turn off right extruder\nM104 S0 T1 ; turn off left extruder\nM140 S0 T0 ; turn off bed\nG1 Z200 F1200 ; drop bed\nG28 X0 ; home X axis\nM84 ; disable motors" + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_head_with_fans_polygon": { "default_value": [ - [-40, -50], - [-40, 100], - [40, -50], - [40, 100] + [ + -40, + -50 + ], + [ + -40, + 100 + ], + [ + 40, + -50 + ], + [ + 40, + 100 + ] ] }, - "machine_heated_bed": { "default_value": true }, + "machine_heated_bed": { + "default_value": true + }, "machine_height": { "default_value": 180 }, "machine_name": { "default_value": "Leapfrog Creatr HS" }, "machine_shape": { "default_value": "Rectangular" }, diff --git a/resources/definitions/leapfrog_creatr_hs_xl.def.json b/resources/definitions/leapfrog_creatr_hs_xl.def.json index a22494bc93..4d24019253 100644 --- a/resources/definitions/leapfrog_creatr_hs_xl.def.json +++ b/resources/definitions/leapfrog_creatr_hs_xl.def.json @@ -17,23 +17,50 @@ }, "overrides": { - "build_volume_temperature": { "enabled": false }, - "gantry_height": { "value": "2" }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 280 }, - "machine_end_gcode": { "default_value": "G92 E0 ; Zero extruder\nG1 E-6.00 F1500 ; Retract filament\nM104 S0 T0 ; turn off right extruder\nM104 S0 T1 ; turn off left extruder\nM140 S0 T0 ; turn off bed\nG1 Z590 F1200 ; drop bed\nG28 X0 ; home X axis\nG1 Y270 F12000 ; Move Y axis to the backside\nM84 ; disable motors" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_head_with_fans_polygon": - { + "build_volume_temperature": { + "enabled": false + }, + "gantry_height": { + "value": "2" + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_depth": { + "default_value": 280 + }, + "machine_end_gcode": { + "default_value": "G92 E0 ; Zero extruder\nG1 E-6.00 F1500 ; Retract filament\nM104 S0 T0 ; turn off right extruder\nM104 S0 T1 ; turn off left extruder\nM140 S0 T0 ; turn off bed\nG1 Z590 F1200 ; drop bed\nG28 X0 ; home X axis\nG1 Y270 F12000 ; Move Y axis to the backside\nM84 ; disable motors" + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_head_with_fans_polygon": { "default_value": [ - [-40, -50], - [-40, 100], - [40, -50], - [40, 100] + [ + -40, + -50 + ], + [ + -40, + 100 + ], + [ + 40, + -50 + ], + [ + 40, + 100 + ] ] }, - "machine_heated_bed": { "default_value": true }, + "machine_heated_bed": { + "default_value": true + }, "machine_height": { "default_value": 590 }, "machine_name": { "default_value": "Leapfrog Creatr HS XL" }, "machine_shape": { "default_value": "Rectangular" }, diff --git a/resources/definitions/makeblock_mcreate.def.json b/resources/definitions/makeblock_mcreate.def.json index e2970943be..d8537b51b8 100644 --- a/resources/definitions/makeblock_mcreate.def.json +++ b/resources/definitions/makeblock_mcreate.def.json @@ -14,21 +14,44 @@ }, "overrides": { - "gantry_height": { "value": 15.0 }, - "machine_depth": { "default_value": 225 }, - "machine_end_gcode": { "default_value": "; Mcreate end Gcode \nG4 ; Wait command in buffer have finished \nG92 E0 \nG1 E-2 F300; retract filament \nG28 X Z; home x z axis \nG1 F3000 Y220;Move Heat Bed to the front for easy print removal \nM104 S0; Turn off the nozzle heat \nM140 S0; Turn off the bed heat \nM107 ; Turn off the Fan \nM84 ; Disable stepper motors \n; End of GCode" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_head_with_fans_polygon": - { + "gantry_height": { + "value": 15.0 + }, + "machine_depth": { + "default_value": 225 + }, + "machine_end_gcode": { + "default_value": "; Mcreate end Gcode \nG4 ; Wait command in buffer have finished \nG92 E0 \nG1 E-2 F300; retract filament \nG28 X Z; home x z axis \nG1 F3000 Y220;Move Heat Bed to the front for easy print removal \nM104 S0; Turn off the nozzle heat \nM140 S0; Turn off the bed heat \nM107 ; Turn off the Fan \nM84 ; Disable stepper motors \n; End of GCode" + }, + "machine_extruder_count": { + "default_value": 1 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_head_with_fans_polygon": { "default_value": [ - [0, 0], - [0, 0], - [0, 0], - [0, 0] + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ] ] }, - "machine_heated_bed": { "default_value": true }, + "machine_heated_bed": { + "default_value": true + }, "machine_height": { "default_value": 300 }, "machine_name": { "default_value": "Makeblock mCreate" }, "machine_start_gcode": { "default_value": "; Mcreate Start Gcode \nG28 ; Home all axes \nG92 E0 ; Reset Extruder\nG1 X0 Y0 Z15 F3000.0 ; Move to start position \nG1 E10 F400 ;load filament \nG1 E2 F400 ;retarct filament \nG92 E0 ; Reset Extruder \nG1 X0 Y130 Z15 F3000.0 \nG12 ; clean nozzle \nG1 X0 Y0 Z0.3 F3000.0 ; Move to start position \nG1 E9.0 F400 ;loadsome filament \nG92 E0 ; Reset Extruder \n; End of start GCode" }, diff --git a/resources/definitions/strateo3d.def.json b/resources/definitions/strateo3d.def.json index 0592e718cb..c7f895c515 100644 --- a/resources/definitions/strateo3d.def.json +++ b/resources/definitions/strateo3d.def.json @@ -162,25 +162,56 @@ "maximum_value_warning": "0.01", "value": "jerk_wall * 5 / 10" }, - "jerk_wall_x": { "maximum_value_warning": "0.01" }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, - "machine_acceleration": { "default_value": 1500 }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 420 }, - "machine_end_gcode": { "default_value": "T1 \nM104 S0 \nT0 \nM104 S0 \nM140 S0 \nM141 S0 \nG91 \nG0 z1 \nG90 \nG28 \nM801.0 \nM84 \nM192" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_head_with_fans_polygon": - { + "jerk_wall_x": { + "maximum_value_warning": "0.01" + }, + "layer_start_x": { + "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" + }, + "layer_start_y": { + "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" + }, + "machine_acceleration": { + "default_value": 1500 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_depth": { + "default_value": 420 + }, + "machine_end_gcode": { + "default_value": "T1 \nM104 S0 \nT0 \nM104 S0 \nM140 S0 \nM141 S0 \nG91 \nG0 z1 \nG90 \nG28 \nM801.0 \nM84 \nM192" + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_head_with_fans_polygon": { "default_value": [ - [-76, -51.8], - [25, -51.8], - [25, 38.2], - [-76, 38.2] + [ + -76, + -51.8 + ], + [ + 25, + -51.8 + ], + [ + 25, + 38.2 + ], + [ + -76, + 38.2 + ] ] }, - "machine_heat_zone_length": { "default_value": 7 }, + "machine_heat_zone_length": { + "default_value": 7 + }, "machine_heated_bed": { "default_value": true }, "machine_heated_build_volume": { "default_value": true }, "machine_height": { "default_value": 495 }, diff --git a/resources/definitions/trimaker_nebula_plus.def.json b/resources/definitions/trimaker_nebula_plus.def.json index afddeff91d..bfda2e7a4b 100644 --- a/resources/definitions/trimaker_nebula_plus.def.json +++ b/resources/definitions/trimaker_nebula_plus.def.json @@ -81,24 +81,60 @@ "minimum_value_warning": 20, "value": "jerk_wall" }, - "layer_height": { "default_value": 0.2 }, - "line_width": { "value": "machine_nozzle_size * 0.875" }, - "machine_acceleration": { "default_value": 3000 }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 230 }, - "machine_end_gcode": { "default_value": ";Trimaker Nebula End Code\n M107; Apagamos fan\n G90\n G92 E0\n G1 X0 Y200\n G91\n G1 Z5\n G92 E0\n M140 S0; Enfriamos\n M104 S0; Enfriamos\n M84\n G90\n M117 Impresion finalizada\n M300 S440 P700\n" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_gcode_flavor": { "default_value": "Marlin (Volumetric)" }, - "machine_heated_bed": { "default_value": true }, - "machine_height": { "default_value": 260 }, - "machine_max_feedrate_x": { "default_value": 300 }, - "machine_max_feedrate_y": { "default_value": 300 }, - "machine_max_feedrate_z": { "default_value": 40 }, - "machine_name": { "default_value": "Trimaker Nebula" }, - "machine_start_gcode": { "default_value": ";Trimaker Nebula Start Code\n G21; Unidades en mm\n G90; Posicion absoluta\n M82; Extrusor en modo absoluto\n M107; Fan apagado\n G28 X Y Z; Enviamos a home a todos los ejes\n M900 K=0; Linear advance desactivado\n M104 S110; Precalentamos el extrusor hasta 110 grados\n M190 S{material_bed_temperature_layer_0};\n G29; Senso la cama\n M500\n G1 F5000 X0.5 Y0.5\n Calentamos cama y esperamos\n M109 S{material_print_temperature}; Calentamos extrusor y esperamos\n G92 E0; E=0\n G1 F200 X0.5 Y0.5 Z0.300\n G1 F900 X0.5 Y51.5 E2.56436; Hacemos una linea para limpiar extrusor\n" }, - "machine_width": { "default_value": 230 }, - "material_diameter": { "default_value": 1.75 }, - "material_flow": { "value": 100 }, + "layer_height": { + "default_value": 0.2 + }, + "line_width": { + "value": "machine_nozzle_size * 0.875" + }, + "machine_acceleration": { + "default_value": 3000 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_depth": { + "default_value": 230 + }, + "machine_end_gcode": { + "default_value": ";Trimaker Nebula End Code\n M107; Apagamos fan\n G90\n G92 E0\n G1 X0 Y200\n G91\n G1 Z5\n G92 E0\n M140 S0; Enfriamos\n M104 S0; Enfriamos\n M84\n G90\n M117 Impresion finalizada\n M300 S440 P700\n" + }, + "machine_extruder_count": { + "default_value": 1 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_height": { + "default_value": 260 + }, + "machine_max_feedrate_x": { + "default_value": 300 + }, + "machine_max_feedrate_y": { + "default_value": 300 + }, + "machine_max_feedrate_z": { + "default_value": 40 + }, + "machine_name": { + "default_value": "Trimaker Nebula" + }, + "machine_start_gcode": { + "default_value": ";Trimaker Nebula Start Code\n G21; Unidades en mm\n G90; Posicion absoluta\n M82; Extrusor en modo absoluto\n M107; Fan apagado\n G28 X Y Z; Enviamos a home a todos los ejes\n M900 K=0; Linear advance desactivado\n M104 S110; Precalentamos el extrusor hasta 110 grados\n M190 S{material_bed_temperature_layer_0};\n G29; Senso la cama\n M500\n G1 F5000 X0.5 Y0.5\n Calentamos cama y esperamos\n M109 S{material_print_temperature}; Calentamos extrusor y esperamos\n G92 E0; E=0\n G1 F200 X0.5 Y0.5 Z0.300\n G1 F900 X0.5 Y51.5 E2.56436; Hacemos una linea para limpiar extrusor\n" + }, + "machine_width": { + "default_value": 230 + }, + "material_diameter": { + "default_value": 1.75 + }, + "material_flow": { + "value": 100 + }, "optimize_wall_printing_order": { "value": "True" }, "retraction_amount": { "default_value": 1 }, "retraction_enable": { "default_value": true }, diff --git a/resources/definitions/vzbot_base.def.json b/resources/definitions/vzbot_base.def.json index 7d10fceda3..c145ce075d 100644 --- a/resources/definitions/vzbot_base.def.json +++ b/resources/definitions/vzbot_base.def.json @@ -88,27 +88,62 @@ "infill_pattern": { "value": "'grid' if infill_sparse_density > 40 else 'cubic'" }, "infill_sparse_density": { "value": 35 }, "jerk_roofing": { "value": 10 }, - "jerk_wall_0": { "value": 10 }, - "layer_height_0": { "resolve": "max(0.2, min(extruderValues('layer_height')))" }, - "line_width": { "value": "machine_nozzle_size * 1.125" }, - "machine_acceleration": { "default_value": 15000 }, - "machine_depth": { "default_value": 330 }, - "machine_end_gcode": { "default_value": "end_print" }, - "machine_endstop_positive_direction_x": { "default_value": true }, - "machine_endstop_positive_direction_y": { "default_value": true }, - "machine_endstop_positive_direction_z": { "default_value": false }, - "machine_feeder_wheel_diameter": { "default_value": 7.5 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_head_with_fans_polygon": - { + "jerk_wall_0": { + "value": 10 + }, + "layer_height_0": { + "resolve": "max(0.2, min(extruderValues('layer_height')))" + }, + "line_width": { + "value": "machine_nozzle_size * 1.125" + }, + "machine_acceleration": { + "default_value": 15000 + }, + "machine_depth": { + "default_value": 330 + }, + "machine_end_gcode": { + "default_value": "end_print" + }, + "machine_endstop_positive_direction_x": { + "default_value": true + }, + "machine_endstop_positive_direction_y": { + "default_value": true + }, + "machine_endstop_positive_direction_z": { + "default_value": false + }, + "machine_feeder_wheel_diameter": { + "default_value": 7.5 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_head_with_fans_polygon": { "default_value": [ - [-35, 65], - [-35, -50], - [35, -50], - [35, 65] + [ + -35, + 65 + ], + [ + -35, + -50 + ], + [ + 35, + -50 + ], + [ + 35, + 65 + ] ] }, - "machine_heated_bed": { "default_value": true }, + "machine_heated_bed": { + "default_value": true + }, "machine_height": { "default_value": 400 }, "machine_max_acceleration_x": { "default_value": 15000 }, "machine_max_acceleration_y": { "default_value": 15000 }, diff --git a/resources/definitions/winbo_dragonl4.def.json b/resources/definitions/winbo_dragonl4.def.json index 097fb8e5ea..43a5adaf92 100644 --- a/resources/definitions/winbo_dragonl4.def.json +++ b/resources/definitions/winbo_dragonl4.def.json @@ -41,27 +41,62 @@ "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" }, "jerk_print": { "value": "25" }, "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" }, - "jerk_support_interface": { "value": "jerk_topbottom" }, - "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, - "jerk_travel": { "value": "25" }, - "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, - "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, - "line_width": { "value": "extruderValue(-1, 'machine_nozzle_size')" }, - "machine_acceleration": { "default_value": 2000 }, - "machine_depth": { "default_value": 463 }, - "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_head_with_fans_polygon": - { + "jerk_support_interface": { + "value": "jerk_topbottom" + }, + "jerk_topbottom": { + "value": "math.ceil(jerk_print * 5 / 25)" + }, + "jerk_travel": { + "value": "25" + }, + "jerk_wall": { + "value": "math.ceil(jerk_print * 10 / 25)" + }, + "jerk_wall_0": { + "value": "math.ceil(jerk_wall * 5 / 10)" + }, + "line_width": { + "value": "extruderValue(-1, 'machine_nozzle_size')" + }, + "machine_acceleration": { + "default_value": 2000 + }, + "machine_depth": { + "default_value": 463 + }, + "machine_end_gcode": { + "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" + }, + "machine_extruder_count": { + "default_value": 1 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_head_with_fans_polygon": { "default_value": [ - [-50, 90], - [-50, -60], - [50, -60], - [50, 90] + [ + -50, + 90 + ], + [ + -50, + -60 + ], + [ + 50, + -60 + ], + [ + 50, + 90 + ] ] }, - "machine_heated_bed": { "default_value": true }, + "machine_heated_bed": { + "default_value": true + }, "machine_height": { "default_value": 615 }, "machine_max_feedrate_x": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 }, diff --git a/resources/definitions/winbo_mini2.def.json b/resources/definitions/winbo_mini2.def.json index fcb782d339..43c0b54e7b 100644 --- a/resources/definitions/winbo_mini2.def.json +++ b/resources/definitions/winbo_mini2.def.json @@ -41,27 +41,62 @@ "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" }, "jerk_print": { "value": "25" }, "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" }, - "jerk_support_interface": { "value": "jerk_topbottom" }, - "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, - "jerk_travel": { "value": "25" }, - "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, - "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, - "line_width": { "value": "extruderValue(-1,'machine_nozzle_size')" }, - "machine_acceleration": { "default_value": 3000 }, - "machine_depth": { "default_value": 155 }, - "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_head_with_fans_polygon": - { + "jerk_support_interface": { + "value": "jerk_topbottom" + }, + "jerk_topbottom": { + "value": "math.ceil(jerk_print * 5 / 25)" + }, + "jerk_travel": { + "value": "25" + }, + "jerk_wall": { + "value": "math.ceil(jerk_print * 10 / 25)" + }, + "jerk_wall_0": { + "value": "math.ceil(jerk_wall * 5 / 10)" + }, + "line_width": { + "value": "extruderValue(-1,'machine_nozzle_size')" + }, + "machine_acceleration": { + "default_value": 3000 + }, + "machine_depth": { + "default_value": 155 + }, + "machine_end_gcode": { + "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" + }, + "machine_extruder_count": { + "default_value": 1 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_head_with_fans_polygon": { "default_value": [ - [-52, 30], - [-52, -40], - [13, -40], - [13, 30] + [ + -52, + 30 + ], + [ + -52, + -40 + ], + [ + 13, + -40 + ], + [ + 13, + 30 + ] ] }, - "machine_heated_bed": { "default_value": false }, + "machine_heated_bed": { + "default_value": false + }, "machine_height": { "default_value": 205 }, "machine_max_feedrate_x": { "default_value": 250 }, "machine_max_feedrate_y": { "default_value": 200 }, diff --git a/resources/definitions/winbo_superhelper105.def.json b/resources/definitions/winbo_superhelper105.def.json index 6314750746..d566d7a250 100644 --- a/resources/definitions/winbo_superhelper105.def.json +++ b/resources/definitions/winbo_superhelper105.def.json @@ -40,27 +40,62 @@ "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" }, "jerk_print": { "value": "25" }, "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" }, - "jerk_support_interface": { "value": "jerk_topbottom" }, - "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, - "jerk_travel": { "value": "25" }, - "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, - "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, - "line_width": { "value": "extruderValue(-1,'machine_nozzle_size')" }, - "machine_acceleration": { "default_value": 2000 }, - "machine_depth": { "default_value": 108 }, - "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_head_with_fans_polygon": - { + "jerk_support_interface": { + "value": "jerk_topbottom" + }, + "jerk_topbottom": { + "value": "math.ceil(jerk_print * 5 / 25)" + }, + "jerk_travel": { + "value": "25" + }, + "jerk_wall": { + "value": "math.ceil(jerk_print * 10 / 25)" + }, + "jerk_wall_0": { + "value": "math.ceil(jerk_wall * 5 / 10)" + }, + "line_width": { + "value": "extruderValue(-1,'machine_nozzle_size')" + }, + "machine_acceleration": { + "default_value": 2000 + }, + "machine_depth": { + "default_value": 108 + }, + "machine_end_gcode": { + "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" + }, + "machine_extruder_count": { + "default_value": 1 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_head_with_fans_polygon": { "default_value": [ - [-110, 50], - [-110, -30], - [110, -30], - [110, 50] + [ + -110, + 50 + ], + [ + -110, + -30 + ], + [ + 110, + -30 + ], + [ + 110, + 50 + ] ] }, - "machine_heated_bed": { "default_value": false }, + "machine_heated_bed": { + "default_value": false + }, "machine_height": { "default_value": 158 }, "machine_max_feedrate_x": { "default_value": 250 }, "machine_max_feedrate_y": { "default_value": 200 },