diff options
20 files changed, 46 insertions, 34 deletions
diff --git a/resources/definitions/deltacomb_base.def.json b/resources/definitions/deltacomb_base.def.json index 3c681295d5..936de23f5d 100644 --- a/resources/definitions/deltacomb_base.def.json +++ b/resources/definitions/deltacomb_base.def.json @@ -29,7 +29,7 @@ "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": true }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { "default_value": ";---------------------------------------\n;Deltacomb start script\n;---------------------------------------\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG92 E0 ;zero the extruded length\nG1 Z15.0 F9000 ;move to the platform down 15mm\nG1 F9000\n\n;Put printing message on LCD screen\nM117 In stampa...\nM140 S{print_bed_temperature} ;set the target bed temperature\n;---------------------------------------"}, + "machine_start_gcode": { "default_value": ";---------------------------------------\n;Deltacomb start script\n;---------------------------------------\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nM420 S1; Bed Level Enable\nG92 E0 ;zero the extruded length\nG1 Z15.0 F9000 ;move to the platform down 15mm\nG1 F9000\n\n;Put printing message on LCD screen\nM117 In stampa...\nM140 S{print_bed_temperature} ;set the target bed temperature\n;---------------------------------------"}, "machine_end_gcode": { "default_value": ";---------------------------------------\n;Deltacomb end script\n;---------------------------------------\nG91 ;relative positioning\nG1 F15000 X8.0 E-4.5 ;Wipe filament+material retraction\nG1 F15000 E4.0 Z1 ;Retraction compensation\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\n" }, "machine_shape": { "default_value": "elliptic" }, @@ -68,7 +68,7 @@ "travel_avoid_distance": { "value": "1" }, "retraction_hop_only_when_collides": { "value": "1" }, - "switch_extruder_retraction_amount": { "value": "5" }, + "switch_extruder_retraction_amount": { "default_value": 5, "value": "5" }, "switch_extruder_retraction_speeds": { "default_value": 70 }, "top_bottom_thickness": { "default_value": 0.8 }, diff --git a/resources/definitions/deltacomb_dc20dual.def.json b/resources/definitions/deltacomb_dc20dual.def.json index a78415331c..b2a21b4e7a 100644 --- a/resources/definitions/deltacomb_dc20dual.def.json +++ b/resources/definitions/deltacomb_dc20dual.def.json @@ -19,6 +19,20 @@ "machine_extruder_count": { "default_value": 2, "maximum_value": "2" }, "machine_width": { "default_value": 190 }, "machine_depth": { "default_value": 190 }, - "machine_height": { "default_value": 250 } + "machine_height": { "default_value": 250 }, + "machine_disallowed_areas":{ "default_value": [ + [[ 53, 78], [ 63, 78], [ 73, 70], [ 62, 70]], + [[ 62, 70], [ 73, 70], [ 81, 61], [ 70, 61]], + [[ 70, 61], [ 81, 61], [ 88, 51], [ 76, 51]], + [[ 76, 51], [ 88, 51], [ 93, 40], [ 81, 40]], + [[ 81, 40], [ 93, 40], [ 97, 29], [ 85, 29]], + [[ 85, 29], [ 97, 29], [ 101, 17], [ 88, 17]], + [[-37, 78], [-47, 78], [-57, 70], [-46, 70]], + [[-46, 70], [-57, 70], [-69, 61], [-54, 61]], + [[-54, 61], [-69, 61], [-72, 51], [-60, 51]], + [[-60, 51], [-72, 51], [-77, 40], [-65, 40]], + [[-65, 40], [-77, 40], [-81, 29], [-69, 29]], + [[-69, 29], [-81, 29], [-85, 17], [-72, 17]] + ]} } } diff --git a/resources/extruders/deltacomb_dc20dual_extruder_0.def.json b/resources/extruders/deltacomb_dc20dual_extruder_0.def.json index 510f8a3562..f01a416224 100644 --- a/resources/extruders/deltacomb_dc20dual_extruder_0.def.json +++ b/resources/extruders/deltacomb_dc20dual_extruder_0.def.json @@ -11,7 +11,7 @@ "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_x": { "default_value": -8.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_extruder_start_code": { "default_value": ";DC20 Dual Extruder 1\n;Put your custom code here"}, "machine_extruder_end_code": { "default_value": ";DC20 Dual Extruder 1\n;Put your custom code here"} diff --git a/resources/extruders/deltacomb_dc20dual_extruder_1.def.json b/resources/extruders/deltacomb_dc20dual_extruder_1.def.json index 75a79f9aaf..2749254242 100644 --- a/resources/extruders/deltacomb_dc20dual_extruder_1.def.json +++ b/resources/extruders/deltacomb_dc20dual_extruder_1.def.json @@ -11,7 +11,7 @@ "extruder_nr": { "default_value": 1 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_x": { "default_value": -8.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_extruder_start_code": { "default_value": ";DC20 Dual Extruder 2\n;Put your custom code here"}, "machine_extruder_end_code": { "default_value": ";DC20 Dual Extruder 2\n;Put your custom code here"} diff --git a/resources/extruders/deltacomb_dc20flux_extruder_0.def.json b/resources/extruders/deltacomb_dc20flux_extruder_0.def.json index c74fad99e0..b36879898c 100644 --- a/resources/extruders/deltacomb_dc20flux_extruder_0.def.json +++ b/resources/extruders/deltacomb_dc20flux_extruder_0.def.json @@ -16,4 +16,4 @@ "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 1 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 1 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"} } -}
\ No newline at end of file +} diff --git a/resources/extruders/deltacomb_dc20flux_extruder_1.def.json b/resources/extruders/deltacomb_dc20flux_extruder_1.def.json index 278bd537fc..d1232c24a8 100644 --- a/resources/extruders/deltacomb_dc20flux_extruder_1.def.json +++ b/resources/extruders/deltacomb_dc20flux_extruder_1.def.json @@ -17,4 +17,4 @@ "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 2 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, "prime_tower_flow": { "value": "200" } } -}
\ No newline at end of file +} diff --git a/resources/extruders/deltacomb_dc30dual_extruder_0.def.json b/resources/extruders/deltacomb_dc30dual_extruder_0.def.json index d404e488bc..45cd65ea8a 100644 --- a/resources/extruders/deltacomb_dc30dual_extruder_0.def.json +++ b/resources/extruders/deltacomb_dc30dual_extruder_0.def.json @@ -11,7 +11,7 @@ "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_x": { "default_value": -8.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_extruder_start_code": { "default_value": ";DC30 Dual Extruder 1\n;Put your custom code here"}, "machine_extruder_end_code": { "default_value": ";DC30 Dual Extruder 1\n;Put your custom code here"} diff --git a/resources/extruders/deltacomb_dc30dual_extruder_1.def.json b/resources/extruders/deltacomb_dc30dual_extruder_1.def.json index 7c762e7eea..74d2b3d39d 100644 --- a/resources/extruders/deltacomb_dc30dual_extruder_1.def.json +++ b/resources/extruders/deltacomb_dc30dual_extruder_1.def.json @@ -11,7 +11,7 @@ "extruder_nr": { "default_value": 1 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_x": { "default_value": -8.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_extruder_start_code": { "default_value": ";DC30 Dual Extruder 2\n;Put your custom code here"}, "machine_extruder_end_code": { "default_value": ";DC30 Dual Extruder 2\n;Put your custom code here"} diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_C.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_C.inst.cfg index e546821d34..c7c28aab5f 100644 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_C.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_C.inst.cfg @@ -6,7 +6,7 @@ definition = deltacomb_base [metadata] setting_version = 16 type = quality -quality_type = D010 +quality_type = D015 material = generic_abs variant = DBE 0.25mm @@ -19,4 +19,4 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 32
\ No newline at end of file +speed_print = 32 diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_D.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_D.inst.cfg index 5e5da99878..7ba2d36323 100644 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_D.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_D.inst.cfg @@ -8,7 +8,7 @@ setting_version = 16 type = quality quality_type = D020 material = generic_abs -variant = FBE 0.40mm +variant = DBE 0.40mm [values] adhesion_type = brim @@ -18,4 +18,4 @@ cool_fan_speed_max = 50 cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 -material_print_temperature = 240
\ No newline at end of file +material_print_temperature = 240 diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_D.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_D.inst.cfg index 13edfffdd5..0063975308 100644 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_D.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_D.inst.cfg @@ -8,7 +8,7 @@ setting_version = 16 type = quality quality_type = D020 material = generic_abs -variant = FBE 0.60mm +variant = DBE 0.60mm [values] adhesion_type = brim @@ -18,4 +18,4 @@ cool_fan_speed_max = 50 cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 -material_print_temperature = 240
\ No newline at end of file +material_print_temperature = 240 diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_F.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_F.inst.cfg index f01b36426a..a36f6f84d5 100644 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_F.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_F.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = A +name = F definition = deltacomb_base [metadata] @@ -19,4 +19,4 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 45
\ No newline at end of file +speed_print = 45 diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_F.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_F.inst.cfg index d6e6cb9acc..6343cff822 100644 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_F.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_F.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = A +name = F definition = deltacomb_base [metadata] @@ -19,4 +19,4 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 45
\ No newline at end of file +speed_print = 45 diff --git a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_D.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_D.inst.cfg index ffe0de9fb0..3e70ec82da 100644 --- a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_D.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_D.inst.cfg @@ -8,7 +8,7 @@ setting_version = 16 type = quality quality_type = D020 material = generic_abs -variant = V-FBE 0.80mm +variant = V-DBE 0.80mm [values] adhesion_type = brim @@ -19,4 +19,4 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 150
\ No newline at end of file +speed_print = 150 diff --git a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_F.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_F.inst.cfg index d6690d9efb..074f2c9852 100644 --- a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_F.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_F.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = A +name = F definition = deltacomb_base [metadata] @@ -19,4 +19,4 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 75
\ No newline at end of file +speed_print = 75 diff --git a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_G.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_G.inst.cfg index ac346c372b..813e677598 100644 --- a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_G.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_G.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = C +name = G definition = deltacomb_base [metadata] setting_version = 16 type = quality -quality_type = D015 +quality_type = D060 material = generic_abs variant = V-DBE 0.80mm @@ -19,4 +19,4 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 55
\ No newline at end of file +speed_print = 55 diff --git a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_F.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_F.inst.cfg index d0825a8a4c..671dc8a9ca 100644 --- a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_F.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_F.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = A +name = F definition = deltacomb_base [metadata] @@ -19,4 +19,4 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 75
\ No newline at end of file +speed_print = 75 diff --git a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_G.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_G.inst.cfg index acca7b5126..011303e0b1 100644 --- a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_G.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_G.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = C +name = G definition = deltacomb_base [metadata] @@ -19,4 +19,4 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 55
\ No newline at end of file +speed_print = 55 diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_C.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_C.inst.cfg index 30d80c2946..68fe819dd2 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_C.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_C.inst.cfg @@ -15,7 +15,6 @@ brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False support_brim_enable = True -skin_overlap = 15 support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height @@ -24,4 +23,4 @@ support_xy_distance = =line_width * 0.5 support_xy_distance_overhang = =line_width*0 support_offset = 3 support_pattern = grid -support_interface_density = 100
\ No newline at end of file +support_interface_density = 100 diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_C.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_C.inst.cfg index daa7d3f07a..6bf2f5e2d1 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_C.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_C.inst.cfg @@ -15,7 +15,6 @@ brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False support_brim_enable = True -skin_overlap = 15 support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height @@ -24,4 +23,4 @@ support_xy_distance = =line_width * 0.5 support_xy_distance_overhang = =line_width*0 support_offset = 3 support_pattern = grid -support_interface_density = 100
\ No newline at end of file +support_interface_density = 100 |