Skip to content

Commit

Permalink
Q400 and S300 Dual update
Browse files Browse the repository at this point in the history
  • Loading branch information
@zavodik
zavodik committed Feb 17, 2024
1 parent d7d9be9 commit 1302dc6
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 19 deletions.
17 changes: 17 additions & 0 deletions resources/definitions/z-bolt_Dual_extruder_0.def.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"version": 2,
"name": "Toolhead 1",
"inherits": "fdmextruder",
"metadata":
{
"machine": "z-bolt_base",
"position": "0"
},

"overrides":
{
"extruder_nr": { "default_value": 0 },
"machine_extruder_start_code": { "default_value": "CHECK_PARK0" },
"material_diameter": { "default_value": 1.75 }
}
}
17 changes: 17 additions & 0 deletions resources/definitions/z-bolt_Dual_extruder_1.def.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"version": 2,
"name": "Toolhead 2",
"inherits": "fdmextruder",
"metadata":
{
"machine": "z-bolt_base",
"position": "1"
},

"overrides":
{
"extruder_nr": { "default_value": 1 },
"machine_extruder_start_code": { "default_value": "CHECK_PARK1" },
"material_diameter": { "default_value": 1.75 }
}
}
29 changes: 15 additions & 14 deletions resources/definitions/z-bolt_Q400.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,22 @@
"quality_definition": "z-bolt_base",
"machine_extruder_trains":
{
"0": "z-bolt_extruder_0",
"1": "z-bolt_extruder_1"
"0": "z-bolt_Q_extruder_0",
"1": "z-bolt_Q_extruder_1"
}
},

"overrides": {
"machine_name": { "default_value": "Z-Bolt Q400" },
"machine_heated_bed": { "default_value": true },
"machine_width": { "default_value": 400 },
"machine_width": { "default_value": 450 },
"machine_height": { "default_value": 400 },
"machine_depth": { "default_value": 400 },
"retraction_amount": { "value": 1.2 },
"machine_start_gcode": { "default_value":
"G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nM140 S{material_bed_temperature_layer_0}\nM104 S160\nSET_HEATER_TEMPERATURE HEATER=chamber TARGET={build_volume_temperature}\nG1 X10 Y10 Z50 F900\nM190 S{material_bed_temperature_layer_0}\nM109 S160\nG4 P18000 ;pause\nBED_MESH_CALIBRATE PRINT_MIN=%MINX%,%MINY% PRINT_MAX=%MAXX%,%MAXY% ;auto bed level\nG1 Z3 F1200 ;move the platform up 3mm\nG1 X0 Y0 F12000\nG1 Z50 F1200 ;move the platform up to 50mm\nM104 S{material_print_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\nG1 Z3 F6000 ;move the platform up 3mm\nG92 E0 ;zero the extruded length\n;intro line\nG1 X0 Y0 F5000\nG1 Z0.2 F2000\nG1 X50 E10 F1500\nG1 X100 E18 F1000\nG92 E0"
},
"machine_end_gcode": { "default_value":
"M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off\nTURN_OFF_HEATERS\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament\nG1 Z+20 F9000 ;move Z up 20mm \nG28 X0 Y0 ;move X/Y to min endstops\nG90 ;absolute positioning\n M106 S255\nM109 S60\nM81 ;power off"
},
"machine_extruder_count": { "default_value": 2 },
"machine_depth": { "default_value": 500 },
"machine_nozzle_temp_enabled": { "value": false },
"retraction_amount": { "value": 3.4 },
"machine_start_gcode": { "default_value": "START_PRINT TOOL_NR={extruder_nr} T_BED={material_bed_temperature_layer_0} T_EXTRUDER={material_print_temperature_layer_0} T_STANDBY={material_standby_temperature} T_CHAMBER={build_volume_temperature} PRINT_MIN=%MINX%,%MINY% PRINT_MAX=%MAXX%,%MAXY%" },
"machine_end_gcode": { "default_value": "END_PRINT T_CHAMBER={build_volume_temperature} COOLDOWN_TIME=60"},
"machine_extruder_count": { "value": 2 },
"extruders_enabled_count": { "default_value": 2 },
"extruder_prime_pos_abs": { "default_value": true },
"prime_tower_enable": { "default_value": false },
Expand All @@ -38,16 +35,20 @@
"prime_tower_position_y": { "default_value": 15 },
"prime_tower_wipe_enabled": { "default_value": true },
"prime_tower_brim_enable": { "default_value": true },
"switch_extruder_retraction_amount": { "value": 8 },
"switch_extruder_retraction_speed": { "value": 40 },
"switch_extruder_retraction_amount": { "value": 3.4 },
"switch_extruder_retraction_speed": { "value": 30 },
"support_extruder_nr": { "default_value": 1 },
"adhesion_extruder_nr": { "default_value": 0 },
"retraction_hop_enabled": { "default_value": false },
"retraction_hop": { "default_value": 1 },
"speed_z_hop": { "default_value": 30 },
"retraction_hop_after_extruder_switch": { "default_value": true },
"retraction_hop_after_extruder_switch": { "enabled": "extruders_enabled_count > 1"},

"speed_travel": { "value": 150 },
"speed_travel_layer_0": { "value": 150 },

"support_bottom_line_width": { "value": "line_width * 1.1" },
"support_angle": { "value": "45 if extruders_enabled_count > 1 else 60" },
"support_pattern": { "value": "'triangles'" },
"support_infill_rate": { "value": "50 if extruders_enabled_count > 1 else 30"},
Expand Down
18 changes: 18 additions & 0 deletions resources/definitions/z-bolt_Q_extruder_0.def.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 2,
"name": "Toolhead 1",
"inherits": "fdmextruder",
"metadata":
{
"machine": "z-bolt_base",
"position": "0"
},

"overrides":
{
"extruder_nr": { "default_value": 0 },
"machine_extruder_start_code": { "default_value": "GET_extruder0 TOOL_NR={extruder_nr} T_EXTRUDER={material_print_temperature} T_STANDBY={material_standby_temperature}" },
"machine_extruder_end_code": { "default_value": "PARK_extruder0 TOOL_NR={extruder_nr} T_EXTRUDER={material_print_temperature} T_STANDBY={material_standby_temperature}" },
"material_diameter": { "default_value": 1.75 }
}
}
18 changes: 18 additions & 0 deletions resources/definitions/z-bolt_Q_extruder_1.def.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 2,
"name": "Toolhead 2",
"inherits": "fdmextruder",
"metadata":
{
"machine": "z-bolt_base",
"position": "1"
},

"overrides":
{
"extruder_nr": { "default_value": 1 },
"machine_extruder_start_code": { "default_value": "GET_extruder1 TOOL_NR={extruder_nr} T_EXTRUDER={material_print_temperature} T_STANDBY={material_standby_temperature}" },
"machine_extruder_end_code": { "default_value": "PARK_extruder1 TOOL_NR={extruder_nr} T_EXTRUDER={material_print_temperature} T_STANDBY={material_standby_temperature}" },
"material_diameter": { "default_value": 1.75 }
}
}
8 changes: 3 additions & 5 deletions resources/definitions/z-bolt_S300_Dual.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@
"quality_definition": "z-bolt_base",
"machine_extruder_trains":
{
"0": "z-bolt_extruder_0",
"1": "z-bolt_extruder_1",
"2": "z-bolt_extruder_2",
"3": "z-bolt_extruder_3"
"0": "z-bolt_Dual_extruder_0",
"1": "z-bolt_Dual_extruder_1"
}
},

Expand Down Expand Up @@ -43,7 +41,7 @@
"retraction_amount": { "value": 2 },
"machine_start_gcode": { "default_value": "START_PRINT TOOL_NR={extruder_nr} T_BED={material_bed_temperature_layer_0} T_EXTRUDER={material_print_temperature_layer_0} T_CHAMBER={build_volume_temperature} PRINT_MIN=%MINX%,%MINY% PRINT_MAX=%MAXX%,%MAXY%"},
"machine_end_gcode": { "default_value": "END_PRINT"},
"machine_extruder_count": { "default_value": 2 },
"machine_extruder_count": { "value": 2 },
"extruders_enabled_count": { "default_value": 2 },
"extruder_prime_pos_abs": { "default_value": true },
"prime_tower_enable": { "default_value": true },
Expand Down
2 changes: 2 additions & 0 deletions resources/definitions/z-bolt_base.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@
"travel_retract_before_outer_wall": { "value": true },
"travel_avoid_other_parts": { "value": true },

"cool_fan_full_layer": { "default_value": 4 },

"support_enable": { "default_value": true },
"support_type": { "value": "'everywhere'" },
"support_angle": { "value": 60 },
Expand Down

0 comments on commit 1302dc6

Please sign in to comment.