From 86cb9c2f996e99e654b71b4c9b77f3aecc5913ab Mon Sep 17 00:00:00 2001 From: maukcc Date: Thu, 23 May 2019 11:02:11 +0200 Subject: [PATCH 1/4] HMS434 update HMS434 multi tool update --- resources/definitions/hms434.def.json | 39 ++++++++++++---------- resources/extruders/hms434_tool_1.def.json | 4 +-- resources/extruders/hms434_tool_2.def.json | 4 +-- resources/extruders/hms434_tool_3.def.json | 4 +-- resources/extruders/hms434_tool_4.def.json | 4 +-- resources/extruders/hms434_tool_5.def.json | 4 +-- resources/extruders/hms434_tool_6.def.json | 4 +-- resources/extruders/hms434_tool_7.def.json | 4 +-- resources/extruders/hms434_tool_8.def.json | 4 +-- 9 files changed, 37 insertions(+), 34 deletions(-) diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index 51869b6955..fc84912082 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -39,28 +39,31 @@ }, "overrides": { - "machine_extruder_count": {"default_value": 2 }, - "material_diameter": {"default_value": 1.75 }, - "machine_heated_bed": {"default_value": true }, - "machine_center_is_zero": {"default_value": false }, - "gantry_height": {"value": 35 }, - "machine_height": {"default_value": 400 }, - "machine_depth": {"default_value": 325 }, - "machine_width": {"default_value": 450 }, + "machine_extruder_count": {"value": 2 }, + "material_diameter": {"value": 1.75 }, + "machine_heated_bed": {"value": true }, + "machine_center_is_zero": {"value": false }, + "gantry_height": {"value": "35" }, + "machine_height": {"value": 400 }, + "machine_depth": {"value": 325 }, + "machine_width": {"value": 450 }, "machine_gcode_flavor": {"default_value": "RepRap (RepRap)" }, - "material_print_temp_wait": {"default_value": true}, - "material_bed_temp_wait": {"default_value": true }, - "machine_max_feedrate_z": {"default_value": 1200 }, - "machine_start_gcode": {"default_value": "\n;Neither MaukCC nor any of MaukCC representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file. \nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\n\nG1 X-71 F9000;go to wipe point\nG1 Y-100 F9000\nG1 Z0 F900\n\nG1 Z0.2 F900\n\nG1 Y-65 F12000\nG1 X50 Y0 F9000\nM117 HMS434 Printing ...\n\n" }, + "material_print_temp_wait": {"value": true}, + "material_bed_temp_wait": {"value": true }, + "prime_tower_enable": {"value": false }, + "prime_tower_size": {"value": 20.6 }, + "prime_tower_position_x": {"value": 125 }, + "prime_tower_position_y": {"value": 70 }, + "prime_blob_enable": {"value": false }, + "machine_max_feedrate_z": {"value": 1200 }, + "machine_start_gcode": {"default_value": "\n;Neither MaukCC nor any of MaukCC representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z0 F900\nG1 Z0.2 F900\n\nG1 X-20 Y-100 F9000;go to wipe point\nG1 Y-50 F9000\nG1 X150 Y10 F9000\nM117 HMS434 Printing ...\n\n" }, "machine_end_gcode": {"default_value": "" }, - "retraction_extra_prime_amount": {"minimum_value_warning": "-2.0" }, - "optimize_wall_printing_order": {"default_value": true }, - "material_initial_print_temperature": {"maximum_value_warning": "material_print_temperature + 15" }, - "machine_nozzle_heat_up_speed": {"default_value": 12}, - "machine_nozzle_cool_down_speed": {"default_value": 20}, - "machine_min_cool_heat_time_window": {"default_value": 5}, + "optimize_wall_printing_order": {"value": true }, + "machine_nozzle_heat_up_speed": {"value": 12}, + "machine_nozzle_cool_down_speed": {"value": 20}, + "machine_min_cool_heat_time_window": {"value": 5}, "layer_height": {"maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, diff --git a/resources/extruders/hms434_tool_1.def.json b/resources/extruders/hms434_tool_1.def.json index c07a89bf44..bf5cefe5b3 100644 --- a/resources/extruders/hms434_tool_1.def.json +++ b/resources/extruders/hms434_tool_1.def.json @@ -17,10 +17,10 @@ "machine_nozzle_offset_y": { "default_value": 0.0 }, "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { - "default_value": "\n;start T0\n\nM117 changing tool....\nM109 T0 S{material_print_temperature}\n\nG1 Y-47 F9000; wipe\nG1 X150 Y10 F9000\n\nM117 printing...\n" + "default_value": "\nM109 T0 S{material_print_temperature}\nG1 X-18 Y-50 F9000\nG1 X150 Y10 F9000\n\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T0 S{material_standby_temperature}\nG1 X150 Y10 F9000\nG1 X-47 Y47 F9000 ; go to wipe position\nG1 X0 Y-100 F3000; wipe\nG1 X-44 F9000\n;end T0\n\n" + "default_value": "\nG1 X150 Y10 F9000\nG1 X-20 Y-50 F9000\nG1 Y-100 F3000\n\n" } } } diff --git a/resources/extruders/hms434_tool_2.def.json b/resources/extruders/hms434_tool_2.def.json index c581d0b035..06e6ff98b7 100644 --- a/resources/extruders/hms434_tool_2.def.json +++ b/resources/extruders/hms434_tool_2.def.json @@ -17,10 +17,10 @@ "machine_nozzle_offset_y": { "default_value": 0.0 }, "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { - "default_value": "\n;start T1\n\nM117 changing tool....\nM109 T1 S{material_print_temperature}\n\nG1 Y-47 F9000; wipe\nG1 X150 Y10 F9000\n\nM117 printing...\n" + "default_value": "\nM109 T1 S{material_print_temperature}\nG1 X-18 Y-50 F9000\nG1 X150 Y10 F9000\n\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T1 S{material_standby_temperature}\nG1 X150 Y10 F9000\nG1 X-47 Y47 F9000 ; go to wipe position\nG1 X0 Y-100 F3000; wipe\nG1 X-44 F9000\n;end T1\n\n" + "default_value": "\nG1 X150 Y10 F9000\nG1 X-20 Y-50 F9000\nG1 Y-100 F3000\n\n" } } } diff --git a/resources/extruders/hms434_tool_3.def.json b/resources/extruders/hms434_tool_3.def.json index 95f774fe54..df0024c4ac 100644 --- a/resources/extruders/hms434_tool_3.def.json +++ b/resources/extruders/hms434_tool_3.def.json @@ -17,10 +17,10 @@ "machine_nozzle_offset_y": { "default_value": 0.0 }, "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { - "default_value": "\n;start Tool 3\n\n" + "default_value": "" }, "machine_extruder_end_code": { - "default_value": "\n;end Tool 3\n\n" + "default_value": "" } } } diff --git a/resources/extruders/hms434_tool_4.def.json b/resources/extruders/hms434_tool_4.def.json index bab0a4659a..351f37dd7b 100644 --- a/resources/extruders/hms434_tool_4.def.json +++ b/resources/extruders/hms434_tool_4.def.json @@ -17,10 +17,10 @@ "machine_nozzle_offset_y": { "default_value": 0.0 }, "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { - "default_value": "\n;start T0\n\nM104 T0 S{material_print_temperature_layer_0}\nG1 X65 Y35 F9000 ; go to wipe position\nM109 T0 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X45 Y15 F3000; wipe\nG1 X55 F9000\nG1 Y35 F6000; wipe again\n\nM117 printing...\n" + "default_value": "" }, "machine_extruder_end_code": { - "default_value": "\nM104 T0 S{material_standby_temperature}\nG1 X65 Y35 F9000 ; go to wipe position\nM109 T0 R{material_standby_temperature}; wait for temp\nG1 X45 Y15 F3000; wipe\nG1 X55 F9000\nG1 Y35 F6000; wipe again\n\n;end T0\n\n" + "default_value": "" } } } diff --git a/resources/extruders/hms434_tool_5.def.json b/resources/extruders/hms434_tool_5.def.json index 30f44a2d65..4e27173223 100644 --- a/resources/extruders/hms434_tool_5.def.json +++ b/resources/extruders/hms434_tool_5.def.json @@ -17,10 +17,10 @@ "machine_nozzle_offset_y": { "default_value": 0.0 }, "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { - "default_value": "\n;start T0\n\nM104 T0 S{material_print_temperature_layer_0}\nG1 X65 Y35 F9000 ; go to wipe position\nM109 T0 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X45 Y15 F3000; wipe\nG1 X55 F9000\nG1 Y35 F6000; wipe again\n\nM117 printing...\n" + "default_value": "" }, "machine_extruder_end_code": { - "default_value": "\nM104 T0 S{material_standby_temperature}\nG1 X65 Y35 F9000 ; go to wipe position\nM109 T0 R{material_standby_temperature}; wait for temp\nG1 X45 Y15 F3000; wipe\nG1 X55 F9000\nG1 Y35 F6000; wipe again\n\n;end T0\n\n" + "default_value": "" } } } diff --git a/resources/extruders/hms434_tool_6.def.json b/resources/extruders/hms434_tool_6.def.json index 221c3135fc..80abc23f0d 100644 --- a/resources/extruders/hms434_tool_6.def.json +++ b/resources/extruders/hms434_tool_6.def.json @@ -17,10 +17,10 @@ "machine_nozzle_offset_y": { "default_value": 0.0 }, "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { - "default_value": "\n;start T0\n\nM104 T0 S{material_print_temperature_layer_0}\nG1 X65 Y35 F9000 ; go to wipe position\nM109 T0 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X45 Y15 F3000; wipe\nG1 X55 F9000\nG1 Y35 F6000; wipe again\n\nM117 printing...\n" + "default_value": "" }, "machine_extruder_end_code": { - "default_value": "\nM104 T0 S{material_standby_temperature}\nG1 X65 Y35 F9000 ; go to wipe position\nM109 T0 R{material_standby_temperature}; wait for temp\nG1 X45 Y15 F3000; wipe\nG1 X55 F9000\nG1 Y35 F6000; wipe again\n\n;end T0\n\n" + "default_value": "" } } } diff --git a/resources/extruders/hms434_tool_7.def.json b/resources/extruders/hms434_tool_7.def.json index 56f0e7f14b..9806a29fae 100644 --- a/resources/extruders/hms434_tool_7.def.json +++ b/resources/extruders/hms434_tool_7.def.json @@ -17,10 +17,10 @@ "machine_nozzle_offset_y": { "default_value": 0.0 }, "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { - "default_value": "\n;start T0\n\nM104 T0 S{material_print_temperature_layer_0}\nG1 X65 Y35 F9000 ; go to wipe position\nM109 T0 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X45 Y15 F3000; wipe\nG1 X55 F9000\nG1 Y35 F6000; wipe again\n\nM117 printing...\n" + "default_value": "" }, "machine_extruder_end_code": { - "default_value": "\nM104 T0 S{material_standby_temperature}\nG1 X65 Y35 F9000 ; go to wipe position\nM109 T0 R{material_standby_temperature}; wait for temp\nG1 X45 Y15 F3000; wipe\nG1 X55 F9000\nG1 Y35 F6000; wipe again\n\n;end T0\n\n" + "default_value": "" } } } diff --git a/resources/extruders/hms434_tool_8.def.json b/resources/extruders/hms434_tool_8.def.json index 6b08aab9c4..612d670b5d 100644 --- a/resources/extruders/hms434_tool_8.def.json +++ b/resources/extruders/hms434_tool_8.def.json @@ -17,10 +17,10 @@ "machine_nozzle_offset_y": { "default_value": 0.0 }, "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { - "default_value": "\n;start T0\n\nM104 T0 S{material_print_temperature_layer_0}\nG1 X65 Y35 F9000 ; go to wipe position\nM109 T0 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X45 Y15 F3000; wipe\nG1 X55 F9000\nG1 Y35 F6000; wipe again\n\nM117 printing...\n" + "default_value": "" }, "machine_extruder_end_code": { - "default_value": "\nM104 T0 S{material_standby_temperature}\nG1 X65 Y35 F9000 ; go to wipe position\nM109 T0 R{material_standby_temperature}; wait for temp\nG1 X45 Y15 F3000; wipe\nG1 X55 F9000\nG1 Y35 F6000; wipe again\n\n;end T0\n\n" + "default_value": "" } } } From 27837feb73ccf814ba743f40823ed5042ce475f4 Mon Sep 17 00:00:00 2001 From: maukcc Date: Thu, 23 May 2019 11:14:12 +0200 Subject: [PATCH 2/4] HMS434 update start gcode update --- resources/definitions/hms434.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index fc84912082..0e879272fe 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -56,7 +56,7 @@ "prime_tower_position_y": {"value": 70 }, "prime_blob_enable": {"value": false }, "machine_max_feedrate_z": {"value": 1200 }, - "machine_start_gcode": {"default_value": "\n;Neither MaukCC nor any of MaukCC representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z0 F900\nG1 Z0.2 F900\n\nG1 X-20 Y-100 F9000;go to wipe point\nG1 Y-50 F9000\nG1 X150 Y10 F9000\nM117 HMS434 Printing ...\n\n" }, + "machine_start_gcode": {"default_value": "\n;Neither MaukCC nor any of MaukCC representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 X150 Y10 F9000\nG30 H0\nM340 P0 S1500\n\nG1 X-20 Y-100 F9000;go to wipe point\nG1 Z0 F900\nG1 Z0.2 F900\nG1 Y-50 F9000\nG1 X150 Y10 F9000\nM117 HMS434 Printing ...\n\n" }, "machine_end_gcode": {"default_value": "" }, "retraction_extra_prime_amount": {"minimum_value_warning": "-2.0" }, From 6af43f649765dcdb257eeace792e8665eacba098 Mon Sep 17 00:00:00 2001 From: maukcc Date: Thu, 23 May 2019 11:18:53 +0200 Subject: [PATCH 3/4] HMS434 update gantry height set --- resources/definitions/hms434.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index 0e879272fe..9cfc7e9c24 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -43,7 +43,7 @@ "material_diameter": {"value": 1.75 }, "machine_heated_bed": {"value": true }, "machine_center_is_zero": {"value": false }, - "gantry_height": {"value": "35" }, + "gantry_height": {"value": 35 }, "machine_height": {"value": 400 }, "machine_depth": {"value": 325 }, "machine_width": {"value": 450 }, From 62d0c44e146f419aeb6c5b4e7195777e0d1c0859 Mon Sep 17 00:00:00 2001 From: maukcc Date: Mon, 27 May 2019 13:53:19 +0200 Subject: [PATCH 4/4] HMS434 update --- resources/definitions/hms434.def.json | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index 9cfc7e9c24..bd229a305b 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -39,31 +39,31 @@ }, "overrides": { - "machine_extruder_count": {"value": 2 }, - "material_diameter": {"value": 1.75 }, - "machine_heated_bed": {"value": true }, - "machine_center_is_zero": {"value": false }, + "machine_extruder_count": {"default_value": 2 }, + "material_diameter": {"default_value": 1.75 }, + "machine_heated_bed": {"default_value": true }, + "machine_center_is_zero": {"default_value": false }, "gantry_height": {"value": 35 }, - "machine_height": {"value": 400 }, - "machine_depth": {"value": 325 }, - "machine_width": {"value": 450 }, + "machine_height": {"default_value": 400 }, + "machine_depth": {"default_value": 325 }, + "machine_width": {"default_value": 450 }, "machine_gcode_flavor": {"default_value": "RepRap (RepRap)" }, - "material_print_temp_wait": {"value": true}, - "material_bed_temp_wait": {"value": true }, - "prime_tower_enable": {"value": false }, + "material_print_temp_wait": {"default_value": true}, + "material_bed_temp_wait": {"default_value": true }, + "prime_tower_enable": {"default_value": false }, "prime_tower_size": {"value": 20.6 }, "prime_tower_position_x": {"value": 125 }, "prime_tower_position_y": {"value": 70 }, - "prime_blob_enable": {"value": false }, - "machine_max_feedrate_z": {"value": 1200 }, + "prime_blob_enable": {"default_value": false }, + "machine_max_feedrate_z": {"default_value": 1200 }, "machine_start_gcode": {"default_value": "\n;Neither MaukCC nor any of MaukCC representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 X150 Y10 F9000\nG30 H0\nM340 P0 S1500\n\nG1 X-20 Y-100 F9000;go to wipe point\nG1 Z0 F900\nG1 Z0.2 F900\nG1 Y-50 F9000\nG1 X150 Y10 F9000\nM117 HMS434 Printing ...\n\n" }, "machine_end_gcode": {"default_value": "" }, "retraction_extra_prime_amount": {"minimum_value_warning": "-2.0" }, - "optimize_wall_printing_order": {"value": true }, - "machine_nozzle_heat_up_speed": {"value": 12}, - "machine_nozzle_cool_down_speed": {"value": 20}, - "machine_min_cool_heat_time_window": {"value": 5}, + "optimize_wall_printing_order": {"default_value": true }, + "machine_nozzle_heat_up_speed": {"default_value": 12}, + "machine_nozzle_cool_down_speed": {"default_value": 20}, + "machine_min_cool_heat_time_window": {"default_value": 5}, "layer_height": {"maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" },