From a70c773ae2c5f41a867521d0183ed6166e20d457 Mon Sep 17 00:00:00 2001 From: Duarte Bragadesto Date: Fri, 14 Oct 2022 17:33:41 +0100 Subject: [PATCH] Definition Blocks Files --- resources/definitions/blocks_base.def.json | 27 +++--------- resources/definitions/blocks_mkii.def.json | 6 +-- resources/definitions/blocks_one.def.json | 32 ++++++++++++++ resources/definitions/blocks_pros100.def.json | 8 ++-- resources/definitions/blocks_pros30.def.json | 6 +-- resources/definitions/blocks_r21.def.json | 6 +-- resources/definitions/blocks_rd50.def.json | 44 +++++++++++++++++++ .../definitions/blocks_rd50duplicate.def.json | 44 +++++++++++++++++++ .../definitions/blocks_rd50mirror.def.json | 44 +++++++++++++++++++ resources/definitions/blocks_zero.def.json | 6 +-- 10 files changed, 180 insertions(+), 43 deletions(-) create mode 100644 resources/definitions/blocks_one.def.json create mode 100644 resources/definitions/blocks_rd50.def.json create mode 100644 resources/definitions/blocks_rd50duplicate.def.json create mode 100644 resources/definitions/blocks_rd50mirror.def.json diff --git a/resources/definitions/blocks_base.def.json b/resources/definitions/blocks_base.def.json index 5c9b8f17cb..e871de6266 100644 --- a/resources/definitions/blocks_base.def.json +++ b/resources/definitions/blocks_base.def.json @@ -4,7 +4,7 @@ "inherits": "fdmprinter", "metadata": { "visible": false, - "author": "Blocks Dev Team - J. Grilo", + "author": "Blocks Dev Team", "manufacturer": "Blocks", "file_formats": "text/x-gcode", "first_start_actions": ["MachineSettingsAction"], @@ -43,24 +43,13 @@ "acceleration_print": { "value": 500 }, "acceleration_travel": { "value": 500 }, "acceleration_travel_layer_0": { "value": "acceleration_travel" }, - "acceleration_roofing": { - "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" - }, "jerk_print": { "value": 8 }, "jerk_travel": { "value": "jerk_print" }, "jerk_travel_layer_0": { "value": "jerk_travel" }, - "acceleration_enabled": { "value": false }, - "jerk_enabled": { "value": false }, - - "speed_print": { "value": 50.0 }, - "speed_infill": { "value": "speed_print" }, + "speed_print": { "value": 60.0 }, "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, - "speed_wall_x": { "value": "speed_wall" }, - "speed_topbottom": { "value": "speed_print / 2" }, - "speed_roofing": { "value": "speed_topbottom" }, "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, @@ -76,9 +65,6 @@ "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size" }, - "wall_line_width": { "value": "machine_nozzle_size" }, - "optimize_wall_printing_order": { "value": "True" }, "material_initial_print_temperature": { @@ -87,7 +73,6 @@ "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, "z_seam_type": { "value": "'back'" }, @@ -109,15 +94,14 @@ "retraction_speed": { "deafult_value": 40, - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", "maximum_value": 200 }, "retraction_retract_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value_warning": 130, "maximum_value": 200 }, "retraction_prime_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "deafult_value": 20, "maximum_value": 200 }, @@ -138,7 +122,6 @@ "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "value": true }, - "retraction_enable": { "value": true }, "retraction_count_max": { "value": 100 }, "retraction_min_travel": { "value": 1.5 }, @@ -197,4 +180,4 @@ "skin_monotonic" : { "value": true } } -} +} \ No newline at end of file diff --git a/resources/definitions/blocks_mkii.def.json b/resources/definitions/blocks_mkii.def.json index 93de24a694..76352cc077 100644 --- a/resources/definitions/blocks_mkii.def.json +++ b/resources/definitions/blocks_mkii.def.json @@ -20,9 +20,7 @@ "machine_height": { "default_value": 210 }, "machine_depth": { "default_value": 210 }, - "retraction_retract_speed": { "value": 50, "maximum_value_warning": 130 }, - "retraction_prime_speed": { "value": 20, "maximum_value_warning": 130 }, - "speed_print": { "value": 50 }, + "retraction_retract_speed": { "value": 50 }, "machine_start_gcode": { "default_value": "G21\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG29\nG1 X-14 Y0 F6000\nG1 Z0.1\nG92 E0 ;zero the extruded length\nG1 F2000 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Z0.2 F6000\nG1 F6000\nM117 Printing...\n" @@ -31,4 +29,4 @@ "default_value": "M104 S0 ;extruder heater off\nM140 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\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n" } } -} +} \ No newline at end of file diff --git a/resources/definitions/blocks_one.def.json b/resources/definitions/blocks_one.def.json new file mode 100644 index 0000000000..064aba4140 --- /dev/null +++ b/resources/definitions/blocks_one.def.json @@ -0,0 +1,32 @@ +{ + "name": "Blocks One", + "version": 2, + "inherits": "blocks_base", + "metadata": { + "visible": true, + + "quality_definition": "blocks_base", + + "platform": "blocks_mk2_platform.stl", + + "machine_extruder_trains": { + "0": "blocks_one_extruder_0" + } + }, + "overrides": { + "machine_name": { "default_value": "Blocks One" }, + + "machine_width": { "default_value": 200 }, + "machine_height": { "default_value": 200 }, + "machine_depth": { "default_value": 200 }, + + "retraction_retract_speed": { "value": 50 }, + + "machine_start_gcode": { + "default_value": "G21\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15 F6000\nG92 E0\nG1 F200 E3\nG92 E0\nG1 F6000\nM117 Printing...\n" + }, + "machine_end_gcode": { + "default_value": "M104 S0 ;extruder heater off\nM140 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\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n" + } + } +} \ No newline at end of file diff --git a/resources/definitions/blocks_pros100.def.json b/resources/definitions/blocks_pros100.def.json index a70f3fdb04..b829d033e6 100644 --- a/resources/definitions/blocks_pros100.def.json +++ b/resources/definitions/blocks_pros100.def.json @@ -9,7 +9,7 @@ "preferred_variant_name": "0.8mm Nozzle", - "platform": "blocks_pros100_platform.stl", + "platform": "blocks_r100_platform.stl", "machine_extruder_trains": { "0": "blocks_pros100_extruder_0" @@ -22,9 +22,7 @@ "machine_height": { "default_value": 1000 }, "machine_depth": { "default_value": 1000 }, - "retraction_retract_speed": { "value": 50, "maximum_value_warning": 130 }, - "retraction_prime_speed": { "value": 20, "maximum_value_warning": 130 }, - "speed_print": { "value": 50 }, + "retraction_retract_speed": { "value": 50 }, "machine_start_gcode": { "default_value": "G21\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG29\nG1 X-14 Y0 F6000\nG1 Z0.1\nG92 E0 ;zero the extruded length\nG1 F2000 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Z0.2 F6000\nG1 F6000\nM117 Printing...\n" @@ -33,4 +31,4 @@ "default_value": "M104 S0 ;extruder heater off\nM140 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\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n" } } -} +} \ No newline at end of file diff --git a/resources/definitions/blocks_pros30.def.json b/resources/definitions/blocks_pros30.def.json index 426cb118ca..7006c52f15 100644 --- a/resources/definitions/blocks_pros30.def.json +++ b/resources/definitions/blocks_pros30.def.json @@ -22,9 +22,7 @@ "machine_height": { "default_value": 290 }, "machine_depth": { "default_value": 310 }, - "retraction_retract_speed": { "value": 40, "maximum_value_warning": 130 }, - "retraction_prime_speed": { "value": 20, "maximum_value_warning": 130 }, - "speed_print": { "value": 50 }, + "retraction_retract_speed": { "value": 40 }, "machine_start_gcode": { "default_value": "G21\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG29\nG1 X-14 Y0 F6000\nG1 Z0.1\nG92 E0 ;zero the extruded length\nG1 F2000 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Z0.2 F6000\nG1 F6000\nM117 Printing...\n" @@ -33,4 +31,4 @@ "default_value": "M104 S0 ;extruder heater off\nM140 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\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n" } } -} +} \ No newline at end of file diff --git a/resources/definitions/blocks_r21.def.json b/resources/definitions/blocks_r21.def.json index 67eb08170e..ca7534b0f6 100644 --- a/resources/definitions/blocks_r21.def.json +++ b/resources/definitions/blocks_r21.def.json @@ -27,9 +27,7 @@ "machine_height": { "default_value": 250 }, "machine_depth": { "default_value": 210 }, - "retraction_retract_speed": { "value": 50, "maximum_value_warning": 130 }, - "retraction_prime_speed": { "value": 20, "maximum_value_warning": 130 }, - "speed_print": { "value": 50 }, + "retraction_retract_speed": { "value": 50 }, "machine_start_gcode": { "default_value": "G21\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG29\nM117 ; Purge extruder\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z1.0 F3000\nG1 X0.1 Y15 F3000.0\nG1 Z0.1 F3000.0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nM117 Printing...\n" @@ -38,4 +36,4 @@ "default_value": "M104 S0 ;extruder heater off\nM140 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\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nG28 X0;move X/Y to min endstops, so the head is out of the way\nG1 Y210 F5000.0\nG1 Z+70\nM84 ;steppers off\nG90 ;absolute positioning\n" } } -} +} \ No newline at end of file diff --git a/resources/definitions/blocks_rd50.def.json b/resources/definitions/blocks_rd50.def.json new file mode 100644 index 0000000000..3097c8a271 --- /dev/null +++ b/resources/definitions/blocks_rd50.def.json @@ -0,0 +1,44 @@ +{ + "name": "Blocks RD50", + "version": 2, + "inherits": "blocks_base", + "metadata": { + "visible": true, + "first_start_actions": ["MachineSettingsAction"], + "has_materials": true, + "has_variants": true, + "has_machine_quality": true, + "preferred_variant_name": "ST - 0.4mm", + "preferred_quality_type": "normal", + "preferred_material": "generic_pla", + "variants_name": "Print Core", + "quality_definition": "blocks_base", + + "platform": "blocks_rd50_platform.stl", + + "machine_extruder_trains": { + "0": "blocks_rd50_extruder_0", + "1": "blocks_rd50_extruder_1" + } + }, + "overrides": { + "machine_name": { "default_value": "Blocks RD50" }, + + "machine_width": { "default_value": 500 }, + "machine_height": { "default_value": 500 }, + "machine_depth": { "default_value": 500 }, + + "retraction_retract_speed": { "value": 50 }, + + "machine_extruder_count": { + "default_value": 2 + }, + + "machine_start_gcode": { + "default_value": "G21\nG90 ;absolute positioning\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\n;PREHEAT\nM140 S{material_bed_temperature_layer_0} ; Set Heat Bed temperature\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\nG1 X-60 Y0 F6000\nG92 E0 ;zero the extruded length\nM190 S{material_bed_temperature_layer_0} ; Wait for Heat Bed temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nG1 F600 E20 ;extrude 10mm of feed stock\nG1 F200 E80 ;extrude 10mm of feed stock\nG12\nG92 E0 ;zero the extruded length again\nG29\nG1 Z0.2 F6000\nG1 F6000\n" + }, + "machine_end_gcode": { + "default_value": "M104 S0 ;extruder heater off\nM140 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\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n" + } + } +} \ No newline at end of file diff --git a/resources/definitions/blocks_rd50duplicate.def.json b/resources/definitions/blocks_rd50duplicate.def.json new file mode 100644 index 0000000000..6da9bcf543 --- /dev/null +++ b/resources/definitions/blocks_rd50duplicate.def.json @@ -0,0 +1,44 @@ +{ + "name": "Blocks RD50 - Duplication Mode", + "version": 2, + "inherits": "blocks_base", + "metadata": { + "visible": true, + "first_start_actions": ["MachineSettingsAction"], + "has_materials": true, + "has_variants": true, + "has_machine_quality": true, + "preferred_variant_name": "ST - 0.4mm", + "preferred_quality_type": "normal", + "preferred_material": "generic_pla", + "variants_name": "Print Core", + "quality_definition": "blocks_base", + + "platform": "blocks_rd50_platform.stl", + + "machine_extruder_trains": { + "0": "blocks_rd50_extruder_0", + "1": "blocks_rd50_extruder_1" + } + }, + "overrides": { + "machine_name": { "default_value": "Blocks RD50 - Duplication Mode" }, + + "machine_width": { "default_value": 500 }, + "machine_height": { "default_value": 500 }, + "machine_depth": { "default_value": 500 }, + + "retraction_retract_speed": { "value": 50 }, + + "machine_extruder_count": { + "default_value": 2 + }, + + "machine_start_gcode": { + "default_value": ";INITIALIZE DUPLICATION MODE\nM605 S1 ; AUTO-PARK MODE\nT0 ; Set tool 0\nG28 ; Home all axes\nG28 X\nM605 S2 ; Set duplication mode\n; PREHEAT\nM140 S{material_bed_temperature_layer_0} ; Set Heat Bed temperature\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Heat Bed temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\n;SET DUPLICATION MODE\nM605 S2 X622 ; Set duplication mode and nozzle offset\nG28 X\nG1 X-60 F3000\nM605 S3 X622 ; Set mirror mode and nozzle offset\nM82\nG92 E0 ; Reset Extruder\nG1 F400\nG1 E40 F400 ; Prime\nG12 ; Clean Nozzle\nM605 S2 X250\nG28 X\nG92 E0 ; Reset Extruder\nG1 X0 F3000\n" + }, + "machine_end_gcode": { + "default_value": "M104 S0 ;extruder heater off\nM140 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\nG1 Z+1 E-1 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nM605 S1 ; AUTO-PARK MODE\nG28 X Y ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n" + } + } +} \ No newline at end of file diff --git a/resources/definitions/blocks_rd50mirror.def.json b/resources/definitions/blocks_rd50mirror.def.json new file mode 100644 index 0000000000..cc6f9d5a5f --- /dev/null +++ b/resources/definitions/blocks_rd50mirror.def.json @@ -0,0 +1,44 @@ +{ + "name": "Blocks RD50 - Mirror Mode", + "version": 2, + "inherits": "blocks_base", + "metadata": { + "visible": true, + "first_start_actions": ["MachineSettingsAction"], + "has_materials": true, + "has_variants": true, + "has_machine_quality": true, + "preferred_variant_name": "ST - 0.4mm", + "preferred_quality_type": "normal", + "preferred_material": "generic_pla", + "variants_name": "Print Core", + "quality_definition": "blocks_base", + + "platform": "blocks_rd50_platform.stl", + + "machine_extruder_trains": { + "0": "blocks_rd50_extruder_0", + "1": "blocks_rd50_extruder_1" + } + }, + "overrides": { + "machine_name": { "default_value": "Blocks RD50 - Mirror Mode" }, + + "machine_width": { "default_value": 500 }, + "machine_height": { "default_value": 500 }, + "machine_depth": { "default_value": 500 }, + + "retraction_retract_speed": { "value": 50 }, + + "machine_extruder_count": { + "default_value": 2 + }, + + "machine_start_gcode": { + "default_value": ";INITIALIZE MIRROR MODE\nM605 S1 ; AUTO-PARK MODE\nT0 ; Set tool 0\nG28 ; Home all axes\nG28 X ; Home x axes\nM605 S2 ; Set duplication mode\n; PREHEAT\nM140 S{material_bed_temperature_layer_0} ; Set Heat Bed temperature\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Heat Bed temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\n;SET MIRROR MODE\nM605 S2 X622 ; Set duplication mode and nozzle offset\nG28 X\nG1 X-60 F3000\nM605 S3 X622 ; Set mirror mode and nozzle offset\nM82\nG92 E0 ; Reset Extruder\nG1 F200\nG1 E30 F200 ; Prime\nG12 ; Clean Nozzle\nG1 X125 F3000\nG92 E0 ; Reset Extruder\n" + }, + "machine_end_gcode": { + "default_value": "M104 S0 ;extruder heater off\nM140 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\nG1 Z+1 E-1 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nM605 S1 ; AUTO-PARK MODE\nG28 X Y ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n" + } + } +} \ No newline at end of file diff --git a/resources/definitions/blocks_zero.def.json b/resources/definitions/blocks_zero.def.json index 40d74abf81..9ac0314f50 100644 --- a/resources/definitions/blocks_zero.def.json +++ b/resources/definitions/blocks_zero.def.json @@ -22,9 +22,7 @@ "machine_height": { "default_value": 120 }, "machine_depth": { "default_value": 140 }, - "retraction_retract_speed": { "value": 50, "maximum_value_warning": 130 }, - "retraction_prime_speed": { "value": 20, "maximum_value_warning": 130 }, - "speed_print": { "value": 50 }, + "retraction_retract_speed": { "value": 50 }, "machine_start_gcode": { "default_value": "G21\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 X-14 Y0 F6000\nG1 Z0.1\nG92 E0 ;zero the extruded length\nG1 F2000 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Z0.2 F6000\nG1 F6000\nM117 Printing...\n" @@ -33,4 +31,4 @@ "default_value": "M104 S0 ;extruder heater off\nM140 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\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n" } } -} +} \ No newline at end of file