From 95e507edd19e0ff5fb26deac6d628c112384ef57 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 12 Jan 2017 10:45:33 +0100 Subject: [PATCH 01/40] Create cartesio --- resources/definitions/cartesio | 52 ++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 resources/definitions/cartesio diff --git a/resources/definitions/cartesio b/resources/definitions/cartesio new file mode 100644 index 0000000000..3c2f9be9c7 --- /dev/null +++ b/resources/definitions/cartesio @@ -0,0 +1,52 @@ +{ + "id": "cartesio", + "name": "Cartesio", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Scheepers", + "manufacturer": "Cartesio bv", + "category": "Other", + "file_formats": "text/x-gcode", + "has_materials": true, + "has_machine_materials": true, + "has_variants": true, + "variants_name": "Nozzle size", + "machine_extruder_trains": + { + "0": "cartesio_extruder_0", + "1": "cartesio_extruder_1", + "2": "cartesio_extruder_2", + "3": "cartesio_extruder_3" + }, + "platform": "cartesio_platform.stl", + "platform_offset": [ -120, -1.5, 130], + "first_start_actions": ["MachineSettingsAction"], + "supported_actions": ["MachineSettingsAction"] + }, + + "overrides": { + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_count": { "default_value": 4 }, + "machine_heated_bed": { "default_value": true }, + "machine_center_is_zero": { "default_value": false }, + "machine_height": { "default_value": 400 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_depth": { "default_value": 270 }, + "machine_width": { "default_value": 430 }, + "machine_name": { "default_value": "Cartesio" }, + "machine_start_gcode": { + "default_value": "M92 E162:162\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\nM140 S45\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature}\nM104 S120 T1\nM109 S{material_print_temperature} T0\nM104 S21 T1\n\nM117 purging nozzle....\n\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-{retraction_amount} F600\nG92 E0\n\nM117 wiping nozzle....\n\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM117 Printing .....\n\nG1 E1 F100\nG92 E-1\n" + }, + "machine_end_gcode": { + "default_value": "; -- END GCODE --\nM106 S255\nM140 S5\nM104 S5 T0\nM104 S5 T1\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\n; -- end of END GCODE --" + }, + "machine_nozzle_heat_up_speed": {"default_value": 20}, + "machine_nozzle_cool_down_speed": {"default_value": 20}, + "machine_min_cool_heat_time_window": {"default_value": 5}, + "retraction_prime_speed": {"value": "10"}, + "switch_extruder_prime_speed": {"value": "10"}, + "extruder_prime_pos_abs": { "default_value": true } + } +} From e0a6e6334d0823131186bc388f45134b4909d582 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 12 Jan 2017 10:46:25 +0100 Subject: [PATCH 02/40] Create cartesio_extruder_0.def.json --- .../extruders/cartesio_extruder_0.def.json | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 resources/extruders/cartesio_extruder_0.def.json diff --git a/resources/extruders/cartesio_extruder_0.def.json b/resources/extruders/cartesio_extruder_0.def.json new file mode 100644 index 0000000000..f943bb7fed --- /dev/null +++ b/resources/extruders/cartesio_extruder_0.def.json @@ -0,0 +1,25 @@ +{ + "id": "cartesio_extruder_0", + "version": 2, + "name": "Extruder 0", + "inherits": "fdmextruder", + "metadata": { + "machine": "cartesio", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "3" + }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_extruder_start_code": { + "default_value": "\n;start extruder_0\nG1 X70 Y20 F9000\n" + }, + "machine_extruder_end_code": { + "default_value": "\nM104 T0 S120\n;end extruder_0\n" + } + } +} From 4a8bcc49bc4fde259db694b4be83d2d0aa2e0c8b Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 12 Jan 2017 10:47:10 +0100 Subject: [PATCH 03/40] Delete cartesio --- resources/definitions/cartesio | 52 ---------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 resources/definitions/cartesio diff --git a/resources/definitions/cartesio b/resources/definitions/cartesio deleted file mode 100644 index 3c2f9be9c7..0000000000 --- a/resources/definitions/cartesio +++ /dev/null @@ -1,52 +0,0 @@ -{ - "id": "cartesio", - "name": "Cartesio", - "version": 2, - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Scheepers", - "manufacturer": "Cartesio bv", - "category": "Other", - "file_formats": "text/x-gcode", - "has_materials": true, - "has_machine_materials": true, - "has_variants": true, - "variants_name": "Nozzle size", - "machine_extruder_trains": - { - "0": "cartesio_extruder_0", - "1": "cartesio_extruder_1", - "2": "cartesio_extruder_2", - "3": "cartesio_extruder_3" - }, - "platform": "cartesio_platform.stl", - "platform_offset": [ -120, -1.5, 130], - "first_start_actions": ["MachineSettingsAction"], - "supported_actions": ["MachineSettingsAction"] - }, - - "overrides": { - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_count": { "default_value": 4 }, - "machine_heated_bed": { "default_value": true }, - "machine_center_is_zero": { "default_value": false }, - "machine_height": { "default_value": 400 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_depth": { "default_value": 270 }, - "machine_width": { "default_value": 430 }, - "machine_name": { "default_value": "Cartesio" }, - "machine_start_gcode": { - "default_value": "M92 E162:162\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\nM140 S45\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature}\nM104 S120 T1\nM109 S{material_print_temperature} T0\nM104 S21 T1\n\nM117 purging nozzle....\n\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-{retraction_amount} F600\nG92 E0\n\nM117 wiping nozzle....\n\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM117 Printing .....\n\nG1 E1 F100\nG92 E-1\n" - }, - "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM106 S255\nM140 S5\nM104 S5 T0\nM104 S5 T1\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\n; -- end of END GCODE --" - }, - "machine_nozzle_heat_up_speed": {"default_value": 20}, - "machine_nozzle_cool_down_speed": {"default_value": 20}, - "machine_min_cool_heat_time_window": {"default_value": 5}, - "retraction_prime_speed": {"value": "10"}, - "switch_extruder_prime_speed": {"value": "10"}, - "extruder_prime_pos_abs": { "default_value": true } - } -} From a8a6ba836dc59ee8b97cc2285cc056a9fd4da6fc Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 12 Jan 2017 10:47:38 +0100 Subject: [PATCH 04/40] Create cartesio.def.json --- resources/definitions/cartesio.def.json | 52 +++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 resources/definitions/cartesio.def.json diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json new file mode 100644 index 0000000000..3c2f9be9c7 --- /dev/null +++ b/resources/definitions/cartesio.def.json @@ -0,0 +1,52 @@ +{ + "id": "cartesio", + "name": "Cartesio", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Scheepers", + "manufacturer": "Cartesio bv", + "category": "Other", + "file_formats": "text/x-gcode", + "has_materials": true, + "has_machine_materials": true, + "has_variants": true, + "variants_name": "Nozzle size", + "machine_extruder_trains": + { + "0": "cartesio_extruder_0", + "1": "cartesio_extruder_1", + "2": "cartesio_extruder_2", + "3": "cartesio_extruder_3" + }, + "platform": "cartesio_platform.stl", + "platform_offset": [ -120, -1.5, 130], + "first_start_actions": ["MachineSettingsAction"], + "supported_actions": ["MachineSettingsAction"] + }, + + "overrides": { + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_count": { "default_value": 4 }, + "machine_heated_bed": { "default_value": true }, + "machine_center_is_zero": { "default_value": false }, + "machine_height": { "default_value": 400 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_depth": { "default_value": 270 }, + "machine_width": { "default_value": 430 }, + "machine_name": { "default_value": "Cartesio" }, + "machine_start_gcode": { + "default_value": "M92 E162:162\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\nM140 S45\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature}\nM104 S120 T1\nM109 S{material_print_temperature} T0\nM104 S21 T1\n\nM117 purging nozzle....\n\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-{retraction_amount} F600\nG92 E0\n\nM117 wiping nozzle....\n\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM117 Printing .....\n\nG1 E1 F100\nG92 E-1\n" + }, + "machine_end_gcode": { + "default_value": "; -- END GCODE --\nM106 S255\nM140 S5\nM104 S5 T0\nM104 S5 T1\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\n; -- end of END GCODE --" + }, + "machine_nozzle_heat_up_speed": {"default_value": 20}, + "machine_nozzle_cool_down_speed": {"default_value": 20}, + "machine_min_cool_heat_time_window": {"default_value": 5}, + "retraction_prime_speed": {"value": "10"}, + "switch_extruder_prime_speed": {"value": "10"}, + "extruder_prime_pos_abs": { "default_value": true } + } +} From b96f45aa2acf9c637430bd0cfca96bb8c6bb7020 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 12 Jan 2017 10:48:27 +0100 Subject: [PATCH 05/40] Create cartesio_extruder_1.def.json --- .../extruders/cartesio_extruder_1.def.json | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 resources/extruders/cartesio_extruder_1.def.json diff --git a/resources/extruders/cartesio_extruder_1.def.json b/resources/extruders/cartesio_extruder_1.def.json new file mode 100644 index 0000000000..8549ffcfcb --- /dev/null +++ b/resources/extruders/cartesio_extruder_1.def.json @@ -0,0 +1,25 @@ +{ + "id": "cartesio_extruder_1", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "cartesio", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "3" + }, + "machine_nozzle_offset_x": { "default_value": 24.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_extruder_start_code": { + "default_value": "\n;start extruder_1\nG1 X70 Y20 F9000\n" + }, + "machine_extruder_end_code": { + "default_value": "\nM104 T0 S120\n;end extruder_1\n" + } + } +} From c06e97c93aab4139b00afa04fe408910d65bbac9 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 12 Jan 2017 10:48:53 +0100 Subject: [PATCH 06/40] Create cartesio_extruder_2.def.json --- .../extruders/cartesio_extruder_2.def.json | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 resources/extruders/cartesio_extruder_2.def.json diff --git a/resources/extruders/cartesio_extruder_2.def.json b/resources/extruders/cartesio_extruder_2.def.json new file mode 100644 index 0000000000..0cd520f2fc --- /dev/null +++ b/resources/extruders/cartesio_extruder_2.def.json @@ -0,0 +1,25 @@ +{ + "id": "cartesio_extruder_2", + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "cartesio", + "position": "2" + }, + + "overrides": { + "extruder_nr": { + "default_value": 2, + "maximum_value": "3" + }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 60.0 }, + "machine_extruder_start_code": { + "default_value": "\n;start extruder_2\nG1 X70 Y20 F9000\n" + }, + "machine_extruder_end_code": { + "default_value": "\nM104 T0 S120\n;end extruder_2\n" + } + } +} From 40bb5ba5606e75f0eba5321703d625ce1293dfcf Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 12 Jan 2017 10:49:20 +0100 Subject: [PATCH 07/40] Create cartesio_extruder_3.def.json --- .../extruders/cartesio_extruder_3.def.json | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 resources/extruders/cartesio_extruder_3.def.json diff --git a/resources/extruders/cartesio_extruder_3.def.json b/resources/extruders/cartesio_extruder_3.def.json new file mode 100644 index 0000000000..2de8a72eb3 --- /dev/null +++ b/resources/extruders/cartesio_extruder_3.def.json @@ -0,0 +1,25 @@ +{ + "id": "cartesio_extruder_3", + "version": 2, + "name": "Extruder 3", + "inherits": "fdmextruder", + "metadata": { + "machine": "cartesio", + "position": "3" + }, + + "overrides": { + "extruder_nr": { + "default_value": 3, + "maximum_value": "3" + }, + "machine_nozzle_offset_x": { "default_value": 24.0 }, + "machine_nozzle_offset_y": { "default_value": 60.0 }, + "machine_extruder_start_code": { + "default_value": "\n;start extruder_3\nG1 X70 Y20 F9000\n" + }, + "machine_extruder_end_code": { + "default_value": "\nM104 T0 S120\n;end extruder_3\n" + } + } +} From 0cd2030e2a420a77f3d5679c940925be863cb706 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 12 Jan 2017 10:50:09 +0100 Subject: [PATCH 08/40] Add cartesio_platform.stl --- resources/meshes/cartesio_platform.stl | Bin 0 -> 84884 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/meshes/cartesio_platform.stl diff --git a/resources/meshes/cartesio_platform.stl b/resources/meshes/cartesio_platform.stl new file mode 100644 index 0000000000000000000000000000000000000000..65f0204881879029f9e619b64c63e8bf8fa25670 GIT binary patch literal 84884 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 Date: Thu, 12 Jan 2017 10:51:00 +0100 Subject: [PATCH 09/40] Create cartesio_0.4.inst.cfg --- resources/variants/cartesio_0.4.inst.cfg | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 resources/variants/cartesio_0.4.inst.cfg diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg new file mode 100644 index 0000000000..5212b7fede --- /dev/null +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -0,0 +1,15 @@ +[general] +name = 0.4 mm +version = 2 +definition = cartesio + +[metadata] +author = Cartesio +type = variant + +[values] +machine_nozzle_size = 0.4 +machine_nozzle_tip_outer_diameter = 1.05 +speed_wall = =round(speed_print / 1.25, 1) +speed_wall_0 = =1 if speed_wall < 10 else (speed_wall - 10) +speed_topbottom = =round(speed_print / 2.25, 1) From 713cd5341d92803636fd3623d51f1a7e6811252e Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 12 Jan 2017 10:51:31 +0100 Subject: [PATCH 10/40] Create cartesio_0.6.inst.cfg --- resources/variants/cartesio_0.6.inst.cfg | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 resources/variants/cartesio_0.6.inst.cfg diff --git a/resources/variants/cartesio_0.6.inst.cfg b/resources/variants/cartesio_0.6.inst.cfg new file mode 100644 index 0000000000..458c894310 --- /dev/null +++ b/resources/variants/cartesio_0.6.inst.cfg @@ -0,0 +1,15 @@ +[general] +name = 0.6 mm +version = 2 +definition = cartesio + +[metadata] +author = Cartesio +type = variant + +[values] +machine_nozzle_size = 0.6 +machine_nozzle_tip_outer_diameter = 1.05 +speed_wall = =round(speed_print / 1.25, 1) +speed_wall_0 = =1 if speed_wall < 10 else (speed_wall - 10) +speed_topbottom = =round(speed_print / 2.25, 1) From 0b879a5e944460f3be92b6f3540d1e4b37cdd84a Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 12 Jan 2017 10:51:52 +0100 Subject: [PATCH 11/40] Create cartesio_0.8.inst.cfg --- resources/variants/cartesio_0.8.inst.cfg | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 resources/variants/cartesio_0.8.inst.cfg diff --git a/resources/variants/cartesio_0.8.inst.cfg b/resources/variants/cartesio_0.8.inst.cfg new file mode 100644 index 0000000000..24f632f5f6 --- /dev/null +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -0,0 +1,15 @@ +[general] +name = 0.8 mm +version = 2 +definition = cartesio + +[metadata] +author = Cartesio +type = variant + +[values] +machine_nozzle_size = 0.8 +machine_nozzle_tip_outer_diameter = 1.05 +speed_wall = =round(speed_print / 1.25, 1) +speed_wall_0 = =1 if speed_wall < 10 else (speed_wall - 10) +speed_topbottom = =round(speed_print / 2.25, 1) From be26aad89bec0751eeb4bb10eca1518489ff8499 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 12 Jan 2017 10:52:20 +0100 Subject: [PATCH 12/40] Create cartesio_0.25.inst.cfg --- resources/variants/cartesio_0.25.inst.cfg | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 resources/variants/cartesio_0.25.inst.cfg diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio_0.25.inst.cfg new file mode 100644 index 0000000000..a286c43381 --- /dev/null +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -0,0 +1,15 @@ +[general] +name = 0.25 mm +version = 2 +definition = cartesio + +[metadata] +author = Cartesio +type = variant + +[values] +machine_nozzle_size = 0.25 +machine_nozzle_tip_outer_diameter = 1.05 +speed_wall = =round(speed_print / 1.25, 1) +speed_wall_0 = =1 if speed_wall < 10 else (speed_wall - 10) +speed_topbottom = =round(speed_print / 2.25, 1) From 7e7031cd7feca9eb38ea14286682ced478210b0f Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 19 Jan 2017 09:25:29 +0100 Subject: [PATCH 13/40] Update cartesio.def.json --- resources/definitions/cartesio.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 3c2f9be9c7..d08b1bb79d 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -37,7 +37,7 @@ "machine_width": { "default_value": 430 }, "machine_name": { "default_value": "Cartesio" }, "machine_start_gcode": { - "default_value": "M92 E162:162\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\nM140 S45\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature}\nM104 S120 T1\nM109 S{material_print_temperature} T0\nM104 S21 T1\n\nM117 purging nozzle....\n\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-{retraction_amount} F600\nG92 E0\n\nM117 wiping nozzle....\n\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM117 Printing .....\n\nG1 E1 F100\nG92 E-1\n" + "default_value": "M92 E162\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\nM140 S{material_bed_temperature}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature}\nM104 S120 T1\nM109 S{material_print_temperature} T0\nM104 S21 T1\n\nM117 purging nozzle....\n\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-{retraction_amount} F600\nG92 E0\n\nM117 wiping nozzle....\n\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM117 Printing .....\n\nG1 E1 F100\nG92 E-1\n" }, "machine_end_gcode": { "default_value": "; -- END GCODE --\nM106 S255\nM140 S5\nM104 S5 T0\nM104 S5 T1\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\n; -- end of END GCODE --" From 8f75f9d46a290eefb7b8d1beaa38cfe1b2a011c7 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Fri, 20 Jan 2017 10:44:20 +0100 Subject: [PATCH 14/40] Update cartesio.def.json --- resources/definitions/cartesio.def.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index d08b1bb79d..a8439dafcf 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -47,6 +47,10 @@ "machine_min_cool_heat_time_window": {"default_value": 5}, "retraction_prime_speed": {"value": "10"}, "switch_extruder_prime_speed": {"value": "10"}, - "extruder_prime_pos_abs": { "default_value": true } + "retraction_speed": {"value": "40"}, + "switch_extruder_retraction_speeds": {"value": "40"}, + "retraction_min_travel": {"value": "5"}, + "switch_extruder_retraction_amount": {"value": "2"}, + "cool_fan_speed": {"value": "50"} } } From 1bb62dae6fd62c75a90baee30c44c1949fc63435 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Fri, 20 Jan 2017 10:48:34 +0100 Subject: [PATCH 15/40] Update cartesio.def.json --- resources/definitions/cartesio.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index a8439dafcf..66c70baf74 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -50,7 +50,6 @@ "retraction_speed": {"value": "40"}, "switch_extruder_retraction_speeds": {"value": "40"}, "retraction_min_travel": {"value": "5"}, - "switch_extruder_retraction_amount": {"value": "2"}, - "cool_fan_speed": {"value": "50"} + "switch_extruder_retraction_amount": {"value": "2"} } } From db8f241b6d2b8d8373e2ce7cb84cded94ef1b04c Mon Sep 17 00:00:00 2001 From: MaukCC Date: Mon, 23 Jan 2017 12:49:28 +0100 Subject: [PATCH 16/40] Update cartesio.def.json --- resources/definitions/cartesio.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 66c70baf74..6cffc38816 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -37,7 +37,7 @@ "machine_width": { "default_value": 430 }, "machine_name": { "default_value": "Cartesio" }, "machine_start_gcode": { - "default_value": "M92 E162\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\nM140 S{material_bed_temperature}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature}\nM104 S120 T1\nM109 S{material_print_temperature} T0\nM104 S21 T1\n\nM117 purging nozzle....\n\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-{retraction_amount} F600\nG92 E0\n\nM117 wiping nozzle....\n\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM117 Printing .....\n\nG1 E1 F100\nG92 E-1\n" + "default_value": "M92 E162\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\nM140 S{material_bed_temperature}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature}\nM104 S120 T1\nM109 S{material_print_temperature} T0\nM104 S21 T1\n\nM117 purging nozzle....\n\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-1 F600\nG92 E0\n\nM117 wiping nozzle....\n\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM117 Printing .....\n\nG1 E1 F100\nG92 E-1\n" }, "machine_end_gcode": { "default_value": "; -- END GCODE --\nM106 S255\nM140 S5\nM104 S5 T0\nM104 S5 T1\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\n; -- end of END GCODE --" From ada08c8cbfe1f7ef8652968f8a50a7b71109d51b Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 25 Jan 2017 12:47:46 +0100 Subject: [PATCH 17/40] Delete cartesio_0.6.inst.cfg --- resources/variants/cartesio_0.6.inst.cfg | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 resources/variants/cartesio_0.6.inst.cfg diff --git a/resources/variants/cartesio_0.6.inst.cfg b/resources/variants/cartesio_0.6.inst.cfg deleted file mode 100644 index 458c894310..0000000000 --- a/resources/variants/cartesio_0.6.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -name = 0.6 mm -version = 2 -definition = cartesio - -[metadata] -author = Cartesio -type = variant - -[values] -machine_nozzle_size = 0.6 -machine_nozzle_tip_outer_diameter = 1.05 -speed_wall = =round(speed_print / 1.25, 1) -speed_wall_0 = =1 if speed_wall < 10 else (speed_wall - 10) -speed_topbottom = =round(speed_print / 2.25, 1) From 3751117f8fffa80fdf1b41cf22df57074ca8c098 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 25 Jan 2017 12:49:00 +0100 Subject: [PATCH 18/40] Update cartesio_0.4.inst.cfg --- resources/variants/cartesio_0.4.inst.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index 5212b7fede..b871cfeec4 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -10,6 +10,6 @@ type = variant [values] machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.05 -speed_wall = =round(speed_print / 1.25, 1) -speed_wall_0 = =1 if speed_wall < 10 else (speed_wall - 10) -speed_topbottom = =round(speed_print / 2.25, 1) +speed_wall = =round(speed_print / 2, 1) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 * 3) +speed_topbottom = =round(speed_print / 5 * 3, 1) From 61d48778259e57c83758be571fbcea0fe54cc8d3 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 25 Jan 2017 12:49:18 +0100 Subject: [PATCH 19/40] Update cartesio_0.25.inst.cfg --- resources/variants/cartesio_0.25.inst.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio_0.25.inst.cfg index a286c43381..1f72527eae 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -10,6 +10,6 @@ type = variant [values] machine_nozzle_size = 0.25 machine_nozzle_tip_outer_diameter = 1.05 -speed_wall = =round(speed_print / 1.25, 1) -speed_wall_0 = =1 if speed_wall < 10 else (speed_wall - 10) -speed_topbottom = =round(speed_print / 2.25, 1) +speed_wall = =round(speed_print / 2, 1) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 * 3) +speed_topbottom = =round(speed_print / 5 * 3, 1) From 3a27deb4af4908791f66cf3e14f20aa432ea609f Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 25 Jan 2017 12:49:37 +0100 Subject: [PATCH 20/40] Update cartesio_0.8.inst.cfg --- resources/variants/cartesio_0.8.inst.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/variants/cartesio_0.8.inst.cfg b/resources/variants/cartesio_0.8.inst.cfg index 24f632f5f6..f1f4ce8f8d 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -10,6 +10,6 @@ type = variant [values] machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 1.05 -speed_wall = =round(speed_print / 1.25, 1) -speed_wall_0 = =1 if speed_wall < 10 else (speed_wall - 10) -speed_topbottom = =round(speed_print / 2.25, 1) +speed_wall = =round(speed_print / 2, 1) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 * 3) +speed_topbottom = =round(speed_print / 5 * 3, 1) From cc499ec59eb5578bc9b88d10c4bfc220ceba42c0 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 25 Jan 2017 14:57:42 +0100 Subject: [PATCH 21/40] Update cartesio.def.json --- resources/definitions/cartesio.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 6cffc38816..ca5520484f 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -37,7 +37,7 @@ "machine_width": { "default_value": 430 }, "machine_name": { "default_value": "Cartesio" }, "machine_start_gcode": { - "default_value": "M92 E162\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\nM140 S{material_bed_temperature}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature}\nM104 S120 T1\nM109 S{material_print_temperature} T0\nM104 S21 T1\n\nM117 purging nozzle....\n\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-1 F600\nG92 E0\n\nM117 wiping nozzle....\n\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM117 Printing .....\n\nG1 E1 F100\nG92 E-1\n" + "default_value": "M92 E162\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\nM140 S{material_bed_temperature}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature}\nM104 S120 T1\nM109 S{material_print_temperature} T0\nM104 S21 T1\n\nM117 purging nozzle....\n\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-1 F600\nG92 E0\n\nM117 wiping nozzle....\n\nG1 X1 Y24 F3000\nG1 X70 F6000\n\nM117 Printing .....\n\nG1 E1 F100\nG92 E-1\n" }, "machine_end_gcode": { "default_value": "; -- END GCODE --\nM106 S255\nM140 S5\nM104 S5 T0\nM104 S5 T1\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\n; -- end of END GCODE --" From 6acfa572e04ee5d5aa60f615aaee27594bacfcf9 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 25 Jan 2017 14:59:18 +0100 Subject: [PATCH 22/40] Update cartesio_extruder_0.def.json --- resources/extruders/cartesio_extruder_0.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/extruders/cartesio_extruder_0.def.json b/resources/extruders/cartesio_extruder_0.def.json index f943bb7fed..8b72e81a4d 100644 --- a/resources/extruders/cartesio_extruder_0.def.json +++ b/resources/extruders/cartesio_extruder_0.def.json @@ -16,7 +16,7 @@ "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_extruder_start_code": { - "default_value": "\n;start extruder_0\nG1 X70 Y20 F9000\n" + "default_value": "\n;start extruder_0\nM117 Heating nozzles....\nM104 S190 T0\nG1 X70 Y20 F9000\nM109 S190 T0 ;wait for nozzle to heat up\nT0\n\nM117 purging nozzle\nG92 E0\nG1 E6 F90\nG92 E0\nG1 E-2 F300\nG92 E0\nM117 wiping nozzle\nG1 X1 Y28 F3000\nG1 X70 F6000\n\nM117 printing\n" }, "machine_extruder_end_code": { "default_value": "\nM104 T0 S120\n;end extruder_0\n" From 6047f807ec1d1a612722da588dc6d517767321f3 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 25 Jan 2017 15:16:15 +0100 Subject: [PATCH 23/40] Update cartesio_extruder_1.def.json --- resources/extruders/cartesio_extruder_1.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/extruders/cartesio_extruder_1.def.json b/resources/extruders/cartesio_extruder_1.def.json index 8549ffcfcb..ee09b6d363 100644 --- a/resources/extruders/cartesio_extruder_1.def.json +++ b/resources/extruders/cartesio_extruder_1.def.json @@ -16,7 +16,7 @@ "machine_nozzle_offset_x": { "default_value": 24.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_extruder_start_code": { - "default_value": "\n;start extruder_1\nG1 X70 Y20 F9000\n" + "default_value": "\n;start extruder_1\nM117 Heating nozzles....\nM104 S190 T1\nG1 X70 Y20 F9000\nM109 S190 T1 ;wait for nozzle to heat up\n\nM117 purging nozzle\nG92 E0\nG1 E6 F90\nG92 E0\nG1 E-2 F300\nG92 E0\n\nM117 wiping nozzle\nG1 X1 Y28 F3000\nG1 X70 F6000\n\nM117 printing\n" }, "machine_extruder_end_code": { "default_value": "\nM104 T0 S120\n;end extruder_1\n" From 9a117b40299af2330211792646847aaed5e822e4 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 25 Jan 2017 15:17:03 +0100 Subject: [PATCH 24/40] Update cartesio_extruder_0.def.json --- resources/extruders/cartesio_extruder_0.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/extruders/cartesio_extruder_0.def.json b/resources/extruders/cartesio_extruder_0.def.json index 8b72e81a4d..cf413a2fc5 100644 --- a/resources/extruders/cartesio_extruder_0.def.json +++ b/resources/extruders/cartesio_extruder_0.def.json @@ -16,7 +16,7 @@ "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_extruder_start_code": { - "default_value": "\n;start extruder_0\nM117 Heating nozzles....\nM104 S190 T0\nG1 X70 Y20 F9000\nM109 S190 T0 ;wait for nozzle to heat up\nT0\n\nM117 purging nozzle\nG92 E0\nG1 E6 F90\nG92 E0\nG1 E-2 F300\nG92 E0\nM117 wiping nozzle\nG1 X1 Y28 F3000\nG1 X70 F6000\n\nM117 printing\n" + "default_value": "\n;start extruder_0\nM117 Heating nozzles....\nM104 S190 T0\nG1 X70 Y20 F9000\nM109 S190 T0\n\nM117 purging nozzle\nG92 E0\nG1 E6 F90\nG92 E0\nG1 E-2 F300\nG92 E0\n\nM117 wiping nozzle\nG1 X1 Y28 F3000\nG1 X70 F6000\n\nM117 printing\n" }, "machine_extruder_end_code": { "default_value": "\nM104 T0 S120\n;end extruder_0\n" From 873340376e7ae44ea689ba9094950f3ebcd84196 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 26 Jan 2017 12:38:26 +0100 Subject: [PATCH 25/40] Update cartesio_0.25.inst.cfg --- resources/variants/cartesio_0.25.inst.cfg | 44 +++++++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio_0.25.inst.cfg index 1f72527eae..7f828ba1b4 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -10,6 +10,44 @@ type = variant [values] machine_nozzle_size = 0.25 machine_nozzle_tip_outer_diameter = 1.05 -speed_wall = =round(speed_print / 2, 1) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 * 3) -speed_topbottom = =round(speed_print / 5 * 3, 1) + +wall_0_inset = -0.05 +fill_perimeter_gaps = nowhere +travel_compensate_overlapping_walls_enabled = + +infill_sparse_density = 25 +infill_overlap = -50 +skin_overlap = -40 + +material_print_temperature_layer_0 = =round(material_print_temperature) +material_initial_print_temperature = =round(material_print_temperature) +material_diameter = 1.75 +retraction_amount = 1 +retraction_speed = 40 +retraction_prime_speed = =round(retraction_speed / 4) +retraction_min_travel = =round(line_width * 10) +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = 40 +switch_extruder_prime_speed = =round(switch_extruder_retraction_speeds / 4) + +speed_print = =50 if layer_height < 0.4 else 30 +speed_infill = =round(speed_print) +speed_layer_0 = =round(speed_print / 5 * 4) +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_topbottom = =round(speed_print / 5 * 4) +speed_slowdown_layers = 1 +speed_travel = =round(speed_print if magic_spiralize else 150) +speed_travel_layer_0 = =round(speed_travel) + +retraction_combing = off +retraction_hop_enabled = true + +adhesion_type = skirt +skirt_gap = 0.5 +skirt_brim_minimal_length = 50 + +coasting_enable = true +coasting_volume = 0.1 +coasting_min_volume = 0.17 +coasting_speed = 90 From f68e09ce9ad65ec4134b1e5317c57b933c070355 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 26 Jan 2017 12:38:57 +0100 Subject: [PATCH 26/40] Update cartesio_0.4.inst.cfg --- resources/variants/cartesio_0.4.inst.cfg | 44 ++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index b871cfeec4..ded164c660 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -10,6 +10,44 @@ type = variant [values] machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.05 -speed_wall = =round(speed_print / 2, 1) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 * 3) -speed_topbottom = =round(speed_print / 5 * 3, 1) + +wall_0_inset = -0.05 +fill_perimeter_gaps = nowhere +travel_compensate_overlapping_walls_enabled = + +infill_sparse_density = 25 +infill_overlap = -50 +skin_overlap = -40 + +material_print_temperature_layer_0 = =round(material_print_temperature) +material_initial_print_temperature = =round(material_print_temperature) +material_diameter = 1.75 +retraction_amount = 1 +retraction_speed = 40 +retraction_prime_speed = =round(retraction_speed / 4) +retraction_min_travel = =round(line_width * 10) +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = 40 +switch_extruder_prime_speed = =round(switch_extruder_retraction_speeds / 4) + +speed_print = =50 if layer_height < 0.4 else 30 +speed_infill = =round(speed_print) +speed_layer_0 = =round(speed_print / 5 * 4) +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_topbottom = =round(speed_print / 5 * 4) +speed_slowdown_layers = 1 +speed_travel = =round(speed_print if magic_spiralize else 150) +speed_travel_layer_0 = =round(speed_travel) + +retraction_combing = off +retraction_hop_enabled = true + +adhesion_type = skirt +skirt_gap = 0.5 +skirt_brim_minimal_length = 50 + +coasting_enable = true +coasting_volume = 0.1 +coasting_min_volume = 0.17 +coasting_speed = 90 From 059c70968ea0d982fe6427430e0ec174253fe65f Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 26 Jan 2017 12:39:21 +0100 Subject: [PATCH 27/40] Update cartesio_0.8.inst.cfg --- resources/variants/cartesio_0.8.inst.cfg | 44 ++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/resources/variants/cartesio_0.8.inst.cfg b/resources/variants/cartesio_0.8.inst.cfg index f1f4ce8f8d..34381b9688 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -10,6 +10,44 @@ type = variant [values] machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 1.05 -speed_wall = =round(speed_print / 2, 1) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 * 3) -speed_topbottom = =round(speed_print / 5 * 3, 1) + +wall_0_inset = -0.05 +fill_perimeter_gaps = nowhere +travel_compensate_overlapping_walls_enabled = + +infill_sparse_density = 25 +infill_overlap = -50 +skin_overlap = -40 + +material_print_temperature_layer_0 = =round(material_print_temperature) +material_initial_print_temperature = =round(material_print_temperature) +material_diameter = 1.75 +retraction_amount = 2 +retraction_speed = 40 +retraction_prime_speed = =round(retraction_speed / 4) +retraction_min_travel = =round(line_width * 10) +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = 40 +switch_extruder_prime_speed = =round(switch_extruder_retraction_speeds / 4) + +speed_print = =50 if layer_height < 0.4 else 30 +speed_infill = =round(speed_print) +speed_layer_0 = =round(speed_print / 5 * 4) +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_topbottom = =round(speed_print / 5 * 4) +speed_slowdown_layers = 1 +speed_travel = =round(speed_print if magic_spiralize else 150) +speed_travel_layer_0 = =round(speed_travel) + +retraction_combing = off +retraction_hop_enabled = true + +adhesion_type = skirt +skirt_gap = 0.5 +skirt_brim_minimal_length = 50 + +coasting_enable = true +coasting_volume = 0.1 +coasting_min_volume = 0.17 +coasting_speed = 90 From 7586054cdf218f5c7d26d5ef12dc949799fdb0a1 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 26 Jan 2017 12:41:39 +0100 Subject: [PATCH 28/40] Update cartesio.def.json --- resources/definitions/cartesio.def.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index ca5520484f..579b1edd25 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -27,7 +27,6 @@ }, "overrides": { - "material_diameter": { "default_value": 1.75 }, "machine_extruder_count": { "default_value": 4 }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, @@ -44,12 +43,6 @@ }, "machine_nozzle_heat_up_speed": {"default_value": 20}, "machine_nozzle_cool_down_speed": {"default_value": 20}, - "machine_min_cool_heat_time_window": {"default_value": 5}, - "retraction_prime_speed": {"value": "10"}, - "switch_extruder_prime_speed": {"value": "10"}, - "retraction_speed": {"value": "40"}, - "switch_extruder_retraction_speeds": {"value": "40"}, - "retraction_min_travel": {"value": "5"}, - "switch_extruder_retraction_amount": {"value": "2"} + "machine_min_cool_heat_time_window": {"default_value": 5} } } From 7d98b98a993ed1f2b80e8191f753741c5fa804f8 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 26 Jan 2017 12:45:47 +0100 Subject: [PATCH 29/40] Update cartesio_extruder_2.def.json --- resources/extruders/cartesio_extruder_2.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/extruders/cartesio_extruder_2.def.json b/resources/extruders/cartesio_extruder_2.def.json index 0cd520f2fc..72020ced95 100644 --- a/resources/extruders/cartesio_extruder_2.def.json +++ b/resources/extruders/cartesio_extruder_2.def.json @@ -16,7 +16,7 @@ "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 60.0 }, "machine_extruder_start_code": { - "default_value": "\n;start extruder_2\nG1 X70 Y20 F9000\n" + "default_value": "\n;start extruder_2\nM117 Heating nozzles....\nM104 S190 T2\nG1 X70 Y20 F9000\nM109 S190 T2\n\nM117 purging nozzle\nG92 E0\nG1 E6 F90\nG92 E0\nG1 E-2 F300\nG92 E0\n\nM117 wiping nozzle\nG1 X1 Y28 F3000\nG1 X70 F6000\n\nM117 printing\n" }, "machine_extruder_end_code": { "default_value": "\nM104 T0 S120\n;end extruder_2\n" From 7398cdba186b6c5df7d20c5ef7a128aade6b8b02 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 26 Jan 2017 12:46:03 +0100 Subject: [PATCH 30/40] Update cartesio_extruder_2.def.json --- resources/extruders/cartesio_extruder_2.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/extruders/cartesio_extruder_2.def.json b/resources/extruders/cartesio_extruder_2.def.json index 72020ced95..9d4bfd8c42 100644 --- a/resources/extruders/cartesio_extruder_2.def.json +++ b/resources/extruders/cartesio_extruder_2.def.json @@ -19,7 +19,7 @@ "default_value": "\n;start extruder_2\nM117 Heating nozzles....\nM104 S190 T2\nG1 X70 Y20 F9000\nM109 S190 T2\n\nM117 purging nozzle\nG92 E0\nG1 E6 F90\nG92 E0\nG1 E-2 F300\nG92 E0\n\nM117 wiping nozzle\nG1 X1 Y28 F3000\nG1 X70 F6000\n\nM117 printing\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T0 S120\n;end extruder_2\n" + "default_value": "\nM104 T2 S120\n;end extruder_2\n" } } } From d6251158150f0cd81a1e58fd898665c119c70936 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 26 Jan 2017 12:46:33 +0100 Subject: [PATCH 31/40] Update cartesio_extruder_3.def.json --- resources/extruders/cartesio_extruder_3.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/extruders/cartesio_extruder_3.def.json b/resources/extruders/cartesio_extruder_3.def.json index 2de8a72eb3..cdcb392876 100644 --- a/resources/extruders/cartesio_extruder_3.def.json +++ b/resources/extruders/cartesio_extruder_3.def.json @@ -16,10 +16,10 @@ "machine_nozzle_offset_x": { "default_value": 24.0 }, "machine_nozzle_offset_y": { "default_value": 60.0 }, "machine_extruder_start_code": { - "default_value": "\n;start extruder_3\nG1 X70 Y20 F9000\n" + "default_value": "\n;start extruder_3\nM117 Heating nozzles....\nM104 S190 T3\nG1 X70 Y20 F9000\nM109 S190 T3\n\nM117 purging nozzle\nG92 E0\nG1 E6 F90\nG92 E0\nG1 E-2 F300\nG92 E0\n\nM117 wiping nozzle\nG1 X1 Y28 F3000\nG1 X70 F6000\n\nM117 printing\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T0 S120\n;end extruder_3\n" + "default_value": "\nM104 T3 S120\n;end extruder_3\n" } } } From 5ba4e3549d85f4d63d2aabe34ed6ecddd5717df5 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 26 Jan 2017 13:46:37 +0100 Subject: [PATCH 32/40] Update cartesio_0.25.inst.cfg --- resources/variants/cartesio_0.25.inst.cfg | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio_0.25.inst.cfg index 7f828ba1b4..96d8bed6b5 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -43,6 +43,11 @@ speed_travel_layer_0 = =round(speed_travel) retraction_combing = off retraction_hop_enabled = true +support_z_distance = 0 +support_xy_distance = 0.5 +support_join_distance = 10 +support_interface_enable = true + adhesion_type = skirt skirt_gap = 0.5 skirt_brim_minimal_length = 50 From 50b65da860d9562213313d2ee48b4a53bca15a9c Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 26 Jan 2017 13:46:50 +0100 Subject: [PATCH 33/40] Update cartesio_0.4.inst.cfg --- resources/variants/cartesio_0.4.inst.cfg | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index ded164c660..d31ce33152 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -43,6 +43,11 @@ speed_travel_layer_0 = =round(speed_travel) retraction_combing = off retraction_hop_enabled = true +support_z_distance = 0 +support_xy_distance = 0.5 +support_join_distance = 10 +support_interface_enable = true + adhesion_type = skirt skirt_gap = 0.5 skirt_brim_minimal_length = 50 From 06830fe16adcc0eed6111a6e5c9faa66e5aa416f Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 26 Jan 2017 13:47:03 +0100 Subject: [PATCH 34/40] Update cartesio_0.8.inst.cfg --- resources/variants/cartesio_0.8.inst.cfg | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/variants/cartesio_0.8.inst.cfg b/resources/variants/cartesio_0.8.inst.cfg index 34381b9688..b82f0436c7 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -43,6 +43,11 @@ speed_travel_layer_0 = =round(speed_travel) retraction_combing = off retraction_hop_enabled = true +support_z_distance = 0 +support_xy_distance = 0.5 +support_join_distance = 10 +support_interface_enable = true + adhesion_type = skirt skirt_gap = 0.5 skirt_brim_minimal_length = 50 From c70229ff88ba3ba9dd587eb950b11af3e0775b0e Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 26 Jan 2017 13:51:34 +0100 Subject: [PATCH 35/40] Update cartesio_0.8.inst.cfg --- resources/variants/cartesio_0.8.inst.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/variants/cartesio_0.8.inst.cfg b/resources/variants/cartesio_0.8.inst.cfg index b82f0436c7..772ede33fb 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -39,6 +39,7 @@ speed_topbottom = =round(speed_print / 5 * 4) speed_slowdown_layers = 1 speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =round(speed_travel) +speed_support_interface = =round(speed_topbottom) retraction_combing = off retraction_hop_enabled = true From e3aff8e2ac2f099a573f6c4544e8e996e3b23080 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 26 Jan 2017 13:51:45 +0100 Subject: [PATCH 36/40] Update cartesio_0.25.inst.cfg --- resources/variants/cartesio_0.25.inst.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio_0.25.inst.cfg index 96d8bed6b5..455fd7ee56 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -39,6 +39,7 @@ speed_topbottom = =round(speed_print / 5 * 4) speed_slowdown_layers = 1 speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =round(speed_travel) +speed_support_interface = =round(speed_topbottom) retraction_combing = off retraction_hop_enabled = true From 70a4d0bd521419d3daf0f5a6131e0c6764db9417 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 26 Jan 2017 13:51:57 +0100 Subject: [PATCH 37/40] Update cartesio_0.4.inst.cfg --- resources/variants/cartesio_0.4.inst.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index d31ce33152..0ac6d55f10 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -39,6 +39,7 @@ speed_topbottom = =round(speed_print / 5 * 4) speed_slowdown_layers = 1 speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =round(speed_travel) +speed_support_interface = =round(speed_topbottom) retraction_combing = off retraction_hop_enabled = true From f65ea57e80d3fb53c895c7492764202c1f97ae40 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Tue, 31 Jan 2017 09:01:14 +0100 Subject: [PATCH 38/40] Update cartesio.def.json --- resources/definitions/cartesio.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 579b1edd25..ba32a2bf9c 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -36,7 +36,7 @@ "machine_width": { "default_value": 430 }, "machine_name": { "default_value": "Cartesio" }, "machine_start_gcode": { - "default_value": "M92 E162\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\nM140 S{material_bed_temperature}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature}\nM104 S120 T1\nM109 S{material_print_temperature} T0\nM104 S21 T1\n\nM117 purging nozzle....\n\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-1 F600\nG92 E0\n\nM117 wiping nozzle....\n\nG1 X1 Y24 F3000\nG1 X70 F6000\n\nM117 Printing .....\n\nG1 E1 F100\nG92 E-1\n" + "default_value": "M92 E162\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\nM140 S{material_bed_temperature}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature}\nM104 S120 T1\nM109 S{material_print_temperature} T0\nM104 S21 T1\n\nM117 purging nozzle....\n\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-{retraction_amount} F600\nG92 E0\n\nM117 wiping nozzle....\n\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM117 Printing .....\n\nG1 E1 F100\nG92 E-1\n" }, "machine_end_gcode": { "default_value": "; -- END GCODE --\nM106 S255\nM140 S5\nM104 S5 T0\nM104 S5 T1\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\n; -- end of END GCODE --" From 26854eedcf37491ba600e025c695730fc0672dfd Mon Sep 17 00:00:00 2001 From: MaukCC Date: Tue, 31 Jan 2017 09:01:46 +0100 Subject: [PATCH 39/40] Update cartesio_extruder_0.def.json --- resources/extruders/cartesio_extruder_0.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/extruders/cartesio_extruder_0.def.json b/resources/extruders/cartesio_extruder_0.def.json index cf413a2fc5..8f71c68c43 100644 --- a/resources/extruders/cartesio_extruder_0.def.json +++ b/resources/extruders/cartesio_extruder_0.def.json @@ -16,10 +16,10 @@ "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_extruder_start_code": { - "default_value": "\n;start extruder_0\nM117 Heating nozzles....\nM104 S190 T0\nG1 X70 Y20 F9000\nM109 S190 T0\n\nM117 purging nozzle\nG92 E0\nG1 E6 F90\nG92 E0\nG1 E-2 F300\nG92 E0\n\nM117 wiping nozzle\nG1 X1 Y28 F3000\nG1 X70 F6000\n\nM117 printing\n" + "default_value": "M117 Heating nozzles....\nM104 S190 T0\nG1 X70 Y20 F9000\nM109 S270 T0 ;wait for nozzle to heat up\nT0\n\nM117 purging nozzle\nG92 E0\nG1 E6 F90\nG92 E0\nG1 E-2 F300\nG92 E0\nM117 wiping nozzle\nG1 X1 Y28 F3000\nG1 X70 F6000\n\nM117 printing\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T0 S120\n;end extruder_0\n" + "default_value": "\nM104 S160 T0\n;end extruder_0\nM117 temp is {material_print_temp}" } } } From e2b208eebd0dd2b414ac99bd8b4fe6506e9d20f6 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Tue, 31 Jan 2017 09:02:31 +0100 Subject: [PATCH 40/40] Update cartesio_0.4.inst.cfg --- resources/variants/cartesio_0.4.inst.cfg | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index 0ac6d55f10..44a09c706f 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -1,43 +1,44 @@ + [general] name = 0.4 mm version = 2 definition = cartesio [metadata] -author = Cartesio +author = Scheepers type = variant [values] machine_nozzle_size = 0.4 -machine_nozzle_tip_outer_diameter = 1.05 +machine_nozzle_tip_outer_diameter = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = +travel_compensate_overlapping_walls_enabled = infill_sparse_density = 25 infill_overlap = -50 skin_overlap = -40 + material_print_temperature_layer_0 = =round(material_print_temperature) material_initial_print_temperature = =round(material_print_temperature) material_diameter = 1.75 retraction_amount = 1 retraction_speed = 40 -retraction_prime_speed = =round(retraction_speed / 4) +retraction_prime_speed = =round(retraction_speed /4) retraction_min_travel = =round(line_width * 10) switch_extruder_retraction_amount = 2 switch_extruder_retraction_speeds = 40 -switch_extruder_prime_speed = =round(switch_extruder_retraction_speeds / 4) +switch_extruder_prime_speed = =round(switch_extruder_retraction_speeds /4) -speed_print = =50 if layer_height < 0.4 else 30 -speed_infill = =round(speed_print) +speed_print = 50 speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) +speed_wall = =round(speed_print / 2, 1) speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) speed_topbottom = =round(speed_print / 5 * 4) speed_slowdown_layers = 1 -speed_travel = =round(speed_print if magic_spiralize else 150) +speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =round(speed_travel) speed_support_interface = =round(speed_topbottom)