diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index cd20906ccc..8d70b065c7 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -81,9 +81,6 @@ "layer_height": {"maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, "layer_height_0": {"maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, - "line_width": {"value": "(machine_nozzle_size + 0.2)" }, - "wall_line_width_0": {"value": "(machine_nozzle_size)" }, - "infill_line_width": {"value": "(line_width)" }, "initial_layer_line_width_factor": {"value": 110 }, "wall_thickness": {"value": "(line_width * 3) if infill_sparse_density < 95 else line_width" }, @@ -111,17 +108,24 @@ "infill_pattern": {"value": "'lines'"}, "infill_before_walls": {"value": true}, - "material_print_temperature_layer_0": {"value": "material_print_temperature"}, - "material_initial_print_temperature": {"value": "material_print_temperature", - "maximum_value_warning": "material_print_temperature + 15"}, - "material_final_print_temperature": {"value": "material_print_temperature"}, - "material_bed_temperature_layer_0": {"value": "material_bed_temperature"}, - "material_flow_layer_0": {"value": "material_flow"}, - "retraction_enable": {"value": true }, - "retract_at_layer_change": {"value": false }, - "retraction_min_travel": {"value": "(round(line_width * 10))"}, - "switch_extruder_retraction_speeds": {"value": "(retraction_speed)"}, - "switch_extruder_prime_speed": {"value": "(retraction_prime_speed)"}, + "default_material_print_temperature": {"maximum_value": "401" }, + "material_print_temperature": {"maximum_value": "401" }, + "material_print_temperature_layer_0": {"value": "material_print_temperature", + "maximum_value": "401" }, + "material_initial_print_temperature": {"value": "material_print_temperature", + "maximum_value_warning": "material_print_temperature + 15", + "maximum_value": "401" }, + "material_initial_print_temperature": {"maximum_value": "401" }, + "material_final_print_temperature": {"value": "material_print_temperature", + "maximum_value": "401" }, + "material_break_preparation_temperature": {"maximum_value": "401" }, + "material_bed_temperature_layer_0": {"value": "material_bed_temperature"}, + "material_flow_layer_0": {"value": "material_flow"}, + "retraction_enable": {"value": true }, + "retract_at_layer_change": {"value": false }, + "retraction_min_travel": {"value": "(round(line_width * 10))"}, + "switch_extruder_retraction_speeds": {"value": "(retraction_speed)"}, + "switch_extruder_prime_speed": {"value": "(retraction_prime_speed)"}, "speed_print": {"value": "50"}, "speed_infill": {"value": "speed_print"}, diff --git a/resources/extruders/hms434_tool_1.def.json b/resources/extruders/hms434_tool_1.def.json index 2a36dd4c2b..17f4cbc6f0 100644 --- a/resources/extruders/hms434_tool_1.def.json +++ b/resources/extruders/hms434_tool_1.def.json @@ -16,7 +16,7 @@ "machine_nozzle_offset_y": { "default_value": 0.0 }, "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { - "default_value": "\n;changing to tool1\nM83\nM109 T0 S{material_print_temperature}\nM114\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E-{switch_extruder_retraction_amount} F2400\nG1 Y40 F3000\nG1 X10 F12000\n\n" + "default_value": "\n;changing to tool1\nT0\nM83\nM109 T0 S{material_print_temperature}\nM114\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E-{switch_extruder_retraction_amount} F2400\nG1 Y40 F3000\nG1 X10 F12000\n\n" }, "machine_extruder_end_code": { "default_value": "\nG1 X10 Y40 F12000\nG1 X-25 F12000\nM109 T0 R{material_standby_temperature}\nG1 Y20 F3000\n; ending tool1\n\n" diff --git a/resources/extruders/hms434_tool_2.def.json b/resources/extruders/hms434_tool_2.def.json index 110695a8fc..00e92613e4 100644 --- a/resources/extruders/hms434_tool_2.def.json +++ b/resources/extruders/hms434_tool_2.def.json @@ -16,7 +16,7 @@ "machine_nozzle_offset_y": { "default_value": 0.0 }, "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { - "default_value": "\n;changing to tool2\nM83\nM109 T1 S{material_print_temperature}\nM114\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E-{switch_extruder_retraction_amount} F2400\nG1 Y40 F3000\nG1 X10 F12000\n\n" + "default_value": "\n;changing to tool2\nT1\nM83\nM109 T1 S{material_print_temperature}\nM114\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E-{switch_extruder_retraction_amount} F2400\nG1 Y40 F3000\nG1 X10 F12000\n\n" }, "machine_extruder_end_code": { "default_value": "\nG1 X10 Y40 F12000\nG1 X-25 F12000\nM109 T1 R{material_standby_temperature}\nG1 Y20 F3000\n; ending tool2\n\n"