mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-05 04:54:04 -06:00
Merge branch 'main' into PP-370-Fix-horizonal-expansion-for-tree-support
This commit is contained in:
Saumya Jain
GitHub
commit
81c44d8709
163 changed files with 1920 additions and 767 deletions
|
|
@ -59,7 +59,7 @@
|
|||
"machine_width": { "default_value": 280 },
|
||||
"material_diameter": { "default_value": 1.75 },
|
||||
"material_initial_print_temperature": { "value": "material_print_temperature" },
|
||||
"prime_tower_min_volume": { "value": "((reveOrValue('layer_height'))/2" },
|
||||
"prime_tower_min_volume": { "value": "((resolveOrValue('layer_height'))/2" },
|
||||
"prime_tower_position_x": { "value": "240" },
|
||||
"prime_tower_position_y": { "value": "190" },
|
||||
"prime_tower_size": { "value": "30" },
|
||||
|
|
|
|||
29
resources/definitions/anycubic_kobra_plus.def.json
Normal file
29
resources/definitions/anycubic_kobra_plus.def.json
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{
|
||||
"version": 2,
|
||||
"name": "Anycubic Kobra Plus",
|
||||
"inherits": "fdmprinter",
|
||||
"metadata":
|
||||
{
|
||||
"visible": true,
|
||||
"author": "Jordon Brooks",
|
||||
"manufacturer": "Anycubic",
|
||||
"file_formats": "text/x-gcode",
|
||||
"has_machine_quality": true,
|
||||
"has_materials": true,
|
||||
"machine_extruder_trains": { "0": "anycubic_kobra_plus_extruder_0" },
|
||||
"preferred_material": "generic_pla",
|
||||
"preferred_quality_type": "normal",
|
||||
"quality_definition": "anycubic_kobra_plus"
|
||||
},
|
||||
"overrides":
|
||||
{
|
||||
"machine_depth": { "default_value": 302 },
|
||||
"machine_end_gcode": { "default_value": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84\nM355 S0; led off" },
|
||||
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
|
||||
"machine_heated_bed": { "default_value": true },
|
||||
"machine_height": { "default_value": 352 },
|
||||
"machine_name": { "default_value": "Anycubic Kobra Plus" },
|
||||
"machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nM355 S1; Turn LED on\n; Add Custom purge lines\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X1.0 Y30 Z0.3 F5000.0 ; Move to start position\nG1 X1.0 Y100.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X1.3 Y100.0 Z0.3 F5000.0 ; Move to side a little\nG1 X1.3 Y30 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 E-2 F500 ; Retract a little \nG1 X50 F500 ; wipe away from the filament line\nG1 X100 F9000 ; Quickly wipe away from the filament line\nG1 Z5.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n; End custom purge lines" },
|
||||
"machine_width": { "default_value": 302 }
|
||||
}
|
||||
}
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
"material_print_temperature_layer_0": { "value": "210 if material_print_temperature < 210 else material_print_temperature" },
|
||||
"min_infill_area": { "value": "5" },
|
||||
"minimum_interface_area": { "default_value": 10 },
|
||||
"minimum_support_area": { "default_value": 3 },
|
||||
"minimum_support_area": { "value": "3 if support_structure == 'normal' else 0" },
|
||||
"optimize_wall_printing_order": { "default_value": true },
|
||||
"prime_tower_brim_enable": { "default_value": true },
|
||||
"prime_tower_min_volume": { "value": "(layer_height) * (prime_tower_size / 2)**2 * 3 * 0.5 " },
|
||||
|
|
|
|||
|
|
@ -1664,17 +1664,27 @@
|
|||
"small_skin_width":
|
||||
{
|
||||
"label": "Small Top/Bottom Width",
|
||||
"description": "Small top/bottom regions are filled with walls instead of the default top/bottom pattern. This helps to avoids jerky motions.",
|
||||
"value": "0",
|
||||
"default_value": 0,
|
||||
"description": "Small top/bottom regions are filled with walls instead of the default top/bottom pattern. This helps to avoids jerky motions. Off for the topmost (air-exposed) layer by default (see 'Small Top/Bottom On Surface').",
|
||||
"value": "skin_line_width * 2",
|
||||
"default_value": 1,
|
||||
"minimum_value": "0",
|
||||
"maximum_value_warning": "skin_line_width * 10",
|
||||
"maximum_value_warning": "skin_line_width * 3",
|
||||
"type": "float",
|
||||
"enabled": false,
|
||||
"enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern != 'concentric'",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true,
|
||||
"unit": "mm",
|
||||
"comment": "Disabled for 5.4.x, as we're worried about micro-segments in the infill. Also disabled in the engine, so forcing this > 0 will not do anything at the moment."
|
||||
"unit": "mm"
|
||||
},
|
||||
"small_skin_on_surface":
|
||||
{
|
||||
"label": "Small Top/Bottom On Surface",
|
||||
"description": "Enable small (up to 'Small Top/Bottom Width') regions on the topmost skinned layer (exposed to air) to be filled with walls instead of the default pattern.",
|
||||
"value": "False",
|
||||
"default_value": false,
|
||||
"type": "bool",
|
||||
"enabled": "small_skin_width > 0 and top_layers > 0",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"skin_no_small_gaps_heuristic":
|
||||
{
|
||||
|
|
@ -4490,7 +4500,7 @@
|
|||
"type": "extruder",
|
||||
"default_value": "0",
|
||||
"enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1",
|
||||
"value": "int(defaultExtruderPosition())",
|
||||
"value": "int(anyExtruderWithMaterial('material_is_support_material'))",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": false,
|
||||
"children":
|
||||
|
|
@ -6811,6 +6821,48 @@
|
|||
"minimum_value_warning": "500",
|
||||
"maximum_value_warning": "100000",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"meshfix_fluid_motion_enabled":
|
||||
{
|
||||
"label": "Enable Fluid Motion",
|
||||
"description": "When enabled tool paths are corrected for printers with smooth motion planners. Small movements that deviate from the general tool path direction are smoothed to improve fluid motions.",
|
||||
"type": "bool",
|
||||
"default_value": true
|
||||
},
|
||||
"meshfix_fluid_motion_shift_distance":
|
||||
{
|
||||
"label": "Fluid Motion Shift Distance",
|
||||
"description": "Distance points are shifted to smooth the path",
|
||||
"enabled": "meshfix_fluid_motion_enabled",
|
||||
"type": "float",
|
||||
"unit": "mm",
|
||||
"default_value": 0.1,
|
||||
"minimum_value": "0.01",
|
||||
"maximum_value": "1"
|
||||
},
|
||||
"meshfix_fluid_motion_small_distance":
|
||||
{
|
||||
"label": "Fluid Motion Small Distance",
|
||||
"description": "Distance points are shifted to smooth the path",
|
||||
"enabled": "meshfix_fluid_motion_enabled",
|
||||
"unit": "mm",
|
||||
"type": "float",
|
||||
"default_value": 0.01,
|
||||
"minimum_value": "0.01",
|
||||
"maximum_value": "0.1"
|
||||
},
|
||||
"meshfix_fluid_motion_angle":
|
||||
{
|
||||
"label": "Fluid Motion Angle",
|
||||
"description": "If a toolpath-segment deviates more than this angle from the general motion it is smoothed.",
|
||||
"enabled": "meshfix_fluid_motion_enabled",
|
||||
"type": "float",
|
||||
"unit": "\u00b0",
|
||||
"default_value": 15,
|
||||
"maximum_value": "90",
|
||||
"minimum_value": "0",
|
||||
"minimum_value_warning": "1",
|
||||
"maximum_value_warning": "35"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -5,13 +5,14 @@
|
|||
"metadata":
|
||||
{
|
||||
"visible": true,
|
||||
"author": "willuhmjs",
|
||||
"platform": "kingroon_kp3s.stl",
|
||||
"quality_definition": "kingroon_base",
|
||||
"author": "willuhmjs"
|
||||
"quality_definition": "kingroon_base"
|
||||
},
|
||||
"overrides":
|
||||
{
|
||||
"machine_acceleration": { "value": 1000 },
|
||||
"machine_depth": { "default_value": 200 },
|
||||
"machine_height": { "default_value": 200 },
|
||||
"machine_max_acceleration_e": { "value": 1000 },
|
||||
"machine_max_acceleration_x": { "value": 1000 },
|
||||
|
|
@ -23,7 +24,7 @@
|
|||
"machine_max_feedrate_z": { "value": 4 },
|
||||
"machine_max_jerk_xy": { "value": 15 },
|
||||
"machine_max_jerk_z": { "value": 0.4 },
|
||||
"machine_name": { "default_value": "Kingroon KP3S" },
|
||||
"machine_name": { "default_value": "Kingroon KP3S Pro" },
|
||||
"machine_steps_per_mm_e": { "value": 764 },
|
||||
"machine_steps_per_mm_x": { "value": 160 },
|
||||
"machine_steps_per_mm_y": { "value": 160 },
|
||||
|
|
@ -34,4 +35,4 @@
|
|||
"retraction_speed": { "value": 40 },
|
||||
"speed_z_hop": { "value": 4 }
|
||||
}
|
||||
}
|
||||
}
|
||||
60
resources/definitions/matterhackers_pulsexe_e444m.def.json
Normal file
60
resources/definitions/matterhackers_pulsexe_e444m.def.json
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
{
|
||||
"version": 2,
|
||||
"name": "Pulse XE E-444M",
|
||||
"inherits": "fdmprinter",
|
||||
"metadata":
|
||||
{
|
||||
"visible": true,
|
||||
"author": "Zwitch Guitars",
|
||||
"manufacturer": "MatterHackers",
|
||||
"file_formats": "text/x-gcode",
|
||||
"first_start_actions": [ "MachineSettingsAction" ],
|
||||
"has_machine_quality": false,
|
||||
"has_materials": true,
|
||||
"has_variants": false,
|
||||
"machine_extruder_trains": { "0": "matterhackers_extruder" },
|
||||
"preferred_material": "generic_pla",
|
||||
"preferred_quality_type": "normal"
|
||||
},
|
||||
"overrides":
|
||||
{
|
||||
"adhesion_type": { "value": "skirt" },
|
||||
"cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
|
||||
"cool_min_layer_time": { "value": 10 },
|
||||
"gantry_height": { "value": 23 },
|
||||
"machine_acceleration": { "value": 1300 },
|
||||
"machine_depth": { "default_value": 220 },
|
||||
"machine_end_gcode": { "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y{machine_depth}; home X axis and push Y forward\nG28 Z0\nM84 ; disable motors" },
|
||||
"machine_gcode_flavor": { "default_value": "Marlin" },
|
||||
"machine_head_with_fans_polygon":
|
||||
{
|
||||
"default_value": [
|
||||
[-28, 45],
|
||||
[-28, -18],
|
||||
[40, 45],
|
||||
[40, -18]
|
||||
]
|
||||
},
|
||||
"machine_heated_bed": { "default_value": true },
|
||||
"machine_height": { "default_value": 215 },
|
||||
"machine_max_feedrate_e": { "value": 75 },
|
||||
"machine_max_feedrate_x": { "value": 300 },
|
||||
"machine_max_feedrate_y": { "value": 300 },
|
||||
"machine_max_feedrate_z": { "value": 30 },
|
||||
"machine_name": { "default_value": "Pulse XE E-444M" },
|
||||
"machine_start_gcode": { "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nG28 ; home axes\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM190 S{material_bed_temperature_layer_0} ; wait for bed temp\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG29 ; mesh bed leveling\n\nG92 E0\nG1 X5 Y5 Z0.8 F1800\nG1 X100 Z0.3 E25 F900\nG92 E0\nG1 E-2 F2400" },
|
||||
"machine_steps_per_mm_e": { "value": 415 },
|
||||
"machine_steps_per_mm_x": { "value": 80 },
|
||||
"machine_steps_per_mm_y": { "value": 80 },
|
||||
"machine_steps_per_mm_z": { "value": 400 },
|
||||
"machine_width": { "default_value": 250 },
|
||||
"material_diameter": { "value": 1.75 },
|
||||
"optimize_wall_printing_order": { "value": true },
|
||||
"speed_layer_0": { "value": 20.0 },
|
||||
"speed_print": { "value": 50 },
|
||||
"top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" },
|
||||
"travel_retract_before_outer_wall": { "value": true },
|
||||
"wall_thickness": { "value": "line_width * 2" },
|
||||
"z_seam_type": { "value": "back" }
|
||||
}
|
||||
}
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
[25, 49],
|
||||
[25, -49],
|
||||
[-25, -49],
|
||||
[25, 49]
|
||||
[-25, 49]
|
||||
]
|
||||
},
|
||||
"machine_heated_bed": { "default_value": true },
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@
|
|||
[25, 49],
|
||||
[25, -49],
|
||||
[-25, -49],
|
||||
[25, 49]
|
||||
[-25, 49]
|
||||
]
|
||||
},
|
||||
"machine_heated_bed": { "default_value": true },
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
[25, 49],
|
||||
[25, -49],
|
||||
[-25, -49],
|
||||
[25, 49]
|
||||
[-25, 49]
|
||||
]
|
||||
},
|
||||
"machine_heated_bed": { "default_value": true },
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue