mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-04 20:43:58 -06:00
Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent
This commit is contained in:
Jaime van Kessel
commit
0cb83d2c92
41 changed files with 946 additions and 221 deletions
|
|
@ -66,7 +66,7 @@
|
|||
"material_print_temperature_layer_0": { "default_value": 220 },
|
||||
"material_initial_print_temperature": { "default_value": 220 },
|
||||
"material_final_print_temperature": { "default_value": 220 },
|
||||
"retraction_amount": { "default_value": 4 },
|
||||
"retraction_amount": { "default_value": 6.5 },
|
||||
|
||||
"speed_print": { "default_value": 40 },
|
||||
"speed_infill": { "default_value": 60 },
|
||||
|
|
|
|||
|
|
@ -963,20 +963,20 @@
|
|||
"maximum_value_warning": "2 * machine_nozzle_size",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
"initial_layer_line_width_factor":
|
||||
{
|
||||
"label": "Initial Layer Line Width",
|
||||
"description": "Multiplier of the line width on the first layer. Increasing this could improve bed adhesion.",
|
||||
"type": "float",
|
||||
"unit": "%",
|
||||
"default_value": 100.0,
|
||||
"minimum_value": "0.001",
|
||||
"maximum_value_warning": "150",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"initial_layer_line_width_factor":
|
||||
{
|
||||
"label": "Initial Layer Line Width",
|
||||
"description": "Multiplier of the line width on the first layer. Increasing this could improve bed adhesion.",
|
||||
"type": "float",
|
||||
"unit": "%",
|
||||
"default_value": 100.0,
|
||||
"minimum_value": "0.001",
|
||||
"maximum_value_warning": "150",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -2234,6 +2234,107 @@
|
|||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
"material_crystallinity":
|
||||
{
|
||||
"label": "Crystalline Material",
|
||||
"description": "Is this material the type that breaks off cleanly when heated (crystalline), or is it the type that produces long intertwined polymer chains (non-crystalline)?",
|
||||
"type": "bool",
|
||||
"default_value": false,
|
||||
"enabled": false,
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
"material_anti_ooze_retracted_position":
|
||||
{
|
||||
"label": "Anti-ooze Retracted Position",
|
||||
"description": "How far the material needs to be retracted before it stops oozing.",
|
||||
"type": "float",
|
||||
"unit": "mm",
|
||||
"default_value": 4,
|
||||
"enabled": false,
|
||||
"minimum_value_warning": "0",
|
||||
"maximum_value_warning": "retraction_amount",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
"material_anti_ooze_retraction_speed":
|
||||
{
|
||||
"label": "Anti-ooze Retraction Speed",
|
||||
"description": "How fast the material needs to be retracted during a filament switch to prevent oozing.",
|
||||
"type": "float",
|
||||
"unit": "mm/s",
|
||||
"default_value": 5,
|
||||
"enabled": false,
|
||||
"minimum_value": "0",
|
||||
"maximum_value": "machine_max_feedrate_e",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
"material_break_preparation_retracted_position":
|
||||
{
|
||||
"label": "Break Preparation Retracted Position",
|
||||
"description": "How far the filament can be stretched before it breaks, while heated.",
|
||||
"type": "float",
|
||||
"unit": "mm",
|
||||
"default_value": 16,
|
||||
"enabled": false,
|
||||
"minimum_value_warning": "0",
|
||||
"maximum_value_warning": "retraction_amount * 4",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
"material_break_preparation_speed":
|
||||
{
|
||||
"label": "Break Preparation Retraction Speed",
|
||||
"description": "How fast the filament needs to be retracted just before breaking it off in a retraction.",
|
||||
"type": "float",
|
||||
"unit": "mm/s",
|
||||
"default_value": 2,
|
||||
"enabled": false,
|
||||
"minimum_value": "0",
|
||||
"maximum_value": "machine_max_feedrate_e",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
"material_break_retracted_position":
|
||||
{
|
||||
"label": "Break Retracted Position",
|
||||
"description": "How far to retract the filament in order to break it cleanly.",
|
||||
"type": "float",
|
||||
"unit": "mm",
|
||||
"default_value": 50,
|
||||
"enabled": false,
|
||||
"minimum_value_warning": "0",
|
||||
"maximum_value_warning": "100",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
"material_break_speed":
|
||||
{
|
||||
"label": "Break Retraction Speed",
|
||||
"description": "The speed at which to retract the filament in order to break it cleanly.",
|
||||
"type": "float",
|
||||
"unit": "mm/s",
|
||||
"default_value": 25,
|
||||
"enabled": false,
|
||||
"minimum_value": "0",
|
||||
"maximum_value": "machine_max_feedrate_e",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
"material_break_temperature":
|
||||
{
|
||||
"label": "Break Temperature",
|
||||
"description": "The temperature at which the filament is broken for a clean break.",
|
||||
"type": "float",
|
||||
"unit": "°C",
|
||||
"default_value": 50,
|
||||
"enabled": false,
|
||||
"minimum_value": "-273.15",
|
||||
"maximum_value_warning": "300",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
"material_flow":
|
||||
{
|
||||
"label": "Flow",
|
||||
|
|
@ -2245,7 +2346,195 @@
|
|||
"minimum_value_warning": "50",
|
||||
"maximum_value_warning": "150",
|
||||
"enabled": "machine_gcode_flavor != \"UltiGCode\"",
|
||||
"settable_per_mesh": true
|
||||
"settable_per_mesh": true,
|
||||
"children":
|
||||
{
|
||||
"wall_material_flow":
|
||||
{
|
||||
"label": "Wall Flow",
|
||||
"description": "Flow compensation on wall lines.",
|
||||
"unit": "%",
|
||||
"type": "float",
|
||||
"default_value": 100,
|
||||
"value": "material_flow",
|
||||
"minimum_value": "5",
|
||||
"minimum_value_warning": "50",
|
||||
"maximum_value_warning": "150",
|
||||
"limit_to_extruder": "wall_0_extruder_nr if wall_x_extruder_nr == wall_0_extruder_nr else -1",
|
||||
"settable_per_mesh": true,
|
||||
"children":
|
||||
{
|
||||
"wall_0_material_flow":
|
||||
{
|
||||
"label": "Outer Wall Flow",
|
||||
"description": "Flow compensation on the outermost wall line.",
|
||||
"unit": "%",
|
||||
"type": "float",
|
||||
"default_value": 100,
|
||||
"value": "wall_material_flow",
|
||||
"minimum_value": "5",
|
||||
"minimum_value_warning": "50",
|
||||
"maximum_value_warning": "150",
|
||||
"limit_to_extruder": "wall_0_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"wall_x_material_flow":
|
||||
{
|
||||
"label": "Inner Wall(s) Flow",
|
||||
"description": "Flow compensation on wall lines for all wall lines except the outermost one.",
|
||||
"unit": "%",
|
||||
"type": "float",
|
||||
"default_value": 100,
|
||||
"value": "wall_material_flow",
|
||||
"minimum_value": "5",
|
||||
"minimum_value_warning": "50",
|
||||
"maximum_value_warning": "150",
|
||||
"limit_to_extruder": "wall_x_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"skin_material_flow":
|
||||
{
|
||||
"label": "Top/Bottom Flow",
|
||||
"description": "Flow compensation on top/bottom lines.",
|
||||
"unit": "%",
|
||||
"type": "float",
|
||||
"default_value": 100,
|
||||
"value": "material_flow",
|
||||
"minimum_value": "5",
|
||||
"minimum_value_warning": "50",
|
||||
"maximum_value_warning": "150",
|
||||
"enabled": "top_layers > 0 or bottom_layers > 0",
|
||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"roofing_material_flow":
|
||||
{
|
||||
"label": "Top Surface Skin Flow",
|
||||
"description": "Flow compensation on lines of the areas at the top of the print.",
|
||||
"unit": "%",
|
||||
"type": "float",
|
||||
"default_value": 100,
|
||||
"value": "skin_material_flow",
|
||||
"minimum_value": "5",
|
||||
"minimum_value_warning": "50",
|
||||
"maximum_value_warning": "150",
|
||||
"limit_to_extruder": "roofing_extruder_nr",
|
||||
"settable_per_mesh": true,
|
||||
"enabled": "roofing_layer_count > 0 and top_layers > 0"
|
||||
},
|
||||
"infill_material_flow":
|
||||
{
|
||||
"label": "Infill Flow",
|
||||
"description": "Flow compensation on infill lines.",
|
||||
"unit": "%",
|
||||
"type": "float",
|
||||
"default_value": 100,
|
||||
"value": "material_flow",
|
||||
"minimum_value": "5",
|
||||
"minimum_value_warning": "50",
|
||||
"maximum_value_warning": "150",
|
||||
"enabled": "infill_sparse_density > 0",
|
||||
"limit_to_extruder": "infill_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"skirt_brim_material_flow":
|
||||
{
|
||||
"label": "Skirt/Brim Flow",
|
||||
"description": "Flow compensation on skirt or brim lines.",
|
||||
"unit": "%",
|
||||
"type": "float",
|
||||
"default_value": 100,
|
||||
"value": "material_flow",
|
||||
"minimum_value": "5",
|
||||
"minimum_value_warning": "50",
|
||||
"maximum_value_warning": "150",
|
||||
"enabled": "resolveOrValue('adhesion_type') == 'skirt' or resolveOrValue('adhesion_type') == 'brim'",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
"support_material_flow":
|
||||
{
|
||||
"label": "Support Flow",
|
||||
"description": "Flow compensation on support structure lines.",
|
||||
"unit": "%",
|
||||
"type": "float",
|
||||
"default_value": 100,
|
||||
"value": "material_flow",
|
||||
"minimum_value": "5",
|
||||
"minimum_value_warning": "50",
|
||||
"maximum_value_warning": "150",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
"support_interface_material_flow":
|
||||
{
|
||||
"label": "Support Interface Flow",
|
||||
"description": "Flow compensation on lines of support roof or floor.",
|
||||
"unit": "%",
|
||||
"type": "float",
|
||||
"default_value": 100,
|
||||
"value": "material_flow",
|
||||
"minimum_value": "5",
|
||||
"minimum_value_warning": "50",
|
||||
"maximum_value_warning": "150",
|
||||
"enabled": "support_enable and support_interface_enable",
|
||||
"limit_to_extruder": "support_interface_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true,
|
||||
"children":
|
||||
{
|
||||
"support_roof_material_flow":
|
||||
{
|
||||
"label": "Support Roof Flow",
|
||||
"description": "Flow compensation on support roof lines.",
|
||||
"unit": "%",
|
||||
"type": "float",
|
||||
"default_value": 100,
|
||||
"value": "extruderValue(support_roof_extruder_nr, 'support_interface_material_flow')",
|
||||
"minimum_value": "5",
|
||||
"minimum_value_warning": "50",
|
||||
"maximum_value_warning": "150",
|
||||
"enabled": "support_enable and support_roof_enable",
|
||||
"limit_to_extruder": "support_roof_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
"support_bottom_material_flow":
|
||||
{
|
||||
"label": "Support Floor Flow",
|
||||
"description": "Flow compensation on support floor lines.",
|
||||
"unit": "%",
|
||||
"type": "float",
|
||||
"default_value": 100,
|
||||
"value": "extruderValue(support_bottom_extruder_nr, 'support_interface_material_flow')",
|
||||
"minimum_value": "5",
|
||||
"minimum_value_warning": "50",
|
||||
"maximum_value_warning": "150",
|
||||
"enabled": "support_enable and support_bottom_enable",
|
||||
"limit_to_extruder": "support_bottom_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"prime_tower_flow":
|
||||
{
|
||||
"label": "Prime Tower Flow",
|
||||
"description": "Flow compensation on prime tower lines.",
|
||||
"unit": "%",
|
||||
"type": "float",
|
||||
"default_value": 100,
|
||||
"value": "material_flow",
|
||||
"minimum_value": "5",
|
||||
"minimum_value_warning": "50",
|
||||
"maximum_value_warning": "150",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"material_flow_layer_0":
|
||||
{
|
||||
|
|
@ -2253,7 +2542,6 @@
|
|||
"description": "Flow compensation for the first layer: the amount of material extruded on the initial layer is multiplied by this value.",
|
||||
"unit": "%",
|
||||
"default_value": 100,
|
||||
"value": "material_flow",
|
||||
"type": "float",
|
||||
"minimum_value": "0.0001",
|
||||
"minimum_value_warning": "50",
|
||||
|
|
@ -4635,11 +4923,11 @@
|
|||
"label": "Enable Prime Blob",
|
||||
"description": "Whether to prime the filament with a blob before printing. Turning this setting on will ensure that the extruder will have material ready at the nozzle before printing. Printing Brim or Skirt can act like priming too, in which case turning this setting off saves some time.",
|
||||
"type": "bool",
|
||||
"resolve": "any(extruderValues('prime_blob_enable'))",
|
||||
"default_value": false,
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true,
|
||||
"enabled": false
|
||||
"enabled": false,
|
||||
"warning_value": "True if resolveOrValue('print_sequence') == 'one_at_a_time' else None"
|
||||
},
|
||||
"extruder_prime_pos_x":
|
||||
{
|
||||
|
|
@ -5305,7 +5593,7 @@
|
|||
"type": "float",
|
||||
"default_value": 6,
|
||||
"minimum_value": "0",
|
||||
"maximum_value_warning": "((resolveOrValue('prime_tower_size') * 0.5) ** 2 * 3.14159 * resolveOrValue('layer_height')",
|
||||
"maximum_value_warning": "(resolveOrValue('prime_tower_size') * 0.5) ** 2 * 3.14159 * resolveOrValue('layer_height')",
|
||||
"enabled": "resolveOrValue('prime_tower_enable')",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
|
|
@ -5338,21 +5626,6 @@
|
|||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": false
|
||||
},
|
||||
"prime_tower_flow":
|
||||
{
|
||||
"label": "Prime Tower Flow",
|
||||
"description": "Flow compensation: the amount of material extruded is multiplied by this value.",
|
||||
"type": "float",
|
||||
"unit": "%",
|
||||
"enabled": "resolveOrValue('prime_tower_enable')",
|
||||
"default_value": 100,
|
||||
"value": "material_flow",
|
||||
"minimum_value": "0.0001",
|
||||
"minimum_value_warning": "50",
|
||||
"maximum_value_warning": "150",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
"prime_tower_wipe_enabled":
|
||||
{
|
||||
"label": "Wipe Inactive Nozzle on Prime Tower",
|
||||
|
|
|
|||
78
resources/definitions/flsun_qq_s.def.json
Normal file
78
resources/definitions/flsun_qq_s.def.json
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
{
|
||||
"id": "flsun_qq_s",
|
||||
"version": 2,
|
||||
"name": "FLSUN QQ-S",
|
||||
"inherits": "fdmprinter",
|
||||
"metadata": {
|
||||
"visible": true,
|
||||
"author": "Cataldo URSO",
|
||||
"manufacturer": "FLSUN",
|
||||
"file_formats": "text/x-gcode",
|
||||
"has_materials": true,
|
||||
"preferred_quality_type": "draft",
|
||||
"machine_extruder_trains": {
|
||||
"0": "flsun_qq_s_extruder_0"
|
||||
}
|
||||
},
|
||||
"overrides": {
|
||||
"machine_center_is_zero": {
|
||||
"default_value": true
|
||||
},
|
||||
"machine_shape": {
|
||||
"default_value": "elliptic"
|
||||
},
|
||||
"machine_width": {
|
||||
"default_value": 260
|
||||
},
|
||||
"machine_depth": {
|
||||
"default_value": 260
|
||||
},
|
||||
"machine_height": {
|
||||
"default_value": 370
|
||||
},
|
||||
"z_seam_type": {
|
||||
"default_value": "back"
|
||||
},
|
||||
"top_thickness": {
|
||||
"default_value": 5
|
||||
},
|
||||
"bottom_layers": {
|
||||
"default_value": 4
|
||||
},
|
||||
"gantry_height": {
|
||||
"default_value": 0
|
||||
},
|
||||
"machine_nozzle_size": {
|
||||
"default_value": 0.4
|
||||
},
|
||||
"material_diameter": {
|
||||
"default_value": 1.75
|
||||
},
|
||||
"machine_start_gcode": {
|
||||
"default_value": "G21\nG90\nM82\nM107 T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG0 E3 F200\nG92 E0\n"
|
||||
},
|
||||
"machine_end_gcode": {
|
||||
"default_value": "M107 T0\nM104 S0\nM104 S0 T1\nM140 S0\nG92 E0\nG91\nG1 E-1 F300 \nG1 Z+0.5 E-5 X-20 Y-20 F9000\nG28 X0 Y0\nM84 ;steppers off\nG90 ;absolute positioning\n"
|
||||
},
|
||||
"infill_sparse_density": {
|
||||
"default_value": 10
|
||||
},
|
||||
"machine_head_with_fans_polygon": {
|
||||
"default_value": [
|
||||
[0, 0],
|
||||
[0, 0],
|
||||
[0, 0],
|
||||
[0, 0]
|
||||
]
|
||||
},
|
||||
"retraction_enable": {
|
||||
"default_value": true
|
||||
},
|
||||
"machine_heated_bed": {
|
||||
"default_value": true
|
||||
},
|
||||
"machine_gcode_flavor": {
|
||||
"default_value": "Repetier"
|
||||
}
|
||||
}
|
||||
}
|
||||
132
resources/definitions/geeetech_a30.def.json
Normal file
132
resources/definitions/geeetech_a30.def.json
Normal file
|
|
@ -0,0 +1,132 @@
|
|||
{
|
||||
"id": "geeetech_a30",
|
||||
"version": 2,
|
||||
"name": "Geeetech A30",
|
||||
"inherits": "fdmprinter",
|
||||
"metadata": {
|
||||
"author": "William & Cataldo URSO",
|
||||
"manufacturer": "Shenzhen Geeetech Technology",
|
||||
"setting_version": 8,
|
||||
"file_formats": "text/x-gcode",
|
||||
"visible": true,
|
||||
"has_materials": true,
|
||||
"preferred_quality_type": "draft",
|
||||
"machine_extruder_trains": {
|
||||
"0": "geeetech_a30_extruder_0"
|
||||
}
|
||||
},
|
||||
"overrides": {
|
||||
"machine_name": {
|
||||
"default_value": "Geeetech A30"
|
||||
},
|
||||
"machine_start_gcode": {
|
||||
"default_value": "G28 ;Home\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG1 Z15.0 F6000 ;Move the platform down 15mm\nG92 E0\nG1 F200 E3\nG92 E0"
|
||||
},
|
||||
"machine_end_gcode": {
|
||||
"default_value": "M104 S0;Cooling the heat end\nM140 S0;Cooling the heat bed\nG92 E1\nG1 E-1 F300\nG28 X0 Y0;Home X axis and Y axis\nM84"
|
||||
},
|
||||
"machine_width": {
|
||||
"default_value": 320
|
||||
},
|
||||
"machine_height": {
|
||||
"default_value": 420
|
||||
},
|
||||
"machine_depth": {
|
||||
"default_value": 320
|
||||
},
|
||||
"machine_heated_bed": {
|
||||
"default_value": true
|
||||
},
|
||||
"machine_center_is_zero": {
|
||||
"default_value": false
|
||||
},
|
||||
"material_diameter": {
|
||||
"default_value": 1.75
|
||||
},
|
||||
"material_bed_temperature": {
|
||||
"default_value": 60
|
||||
},
|
||||
"machine_nozzle_size": {
|
||||
"default_value": 0.4
|
||||
},
|
||||
"layer_height": {
|
||||
"default_value": 0.1
|
||||
},
|
||||
"layer_height_0": {
|
||||
"default_value": 0.3
|
||||
},
|
||||
"retraction_amount": {
|
||||
"default_value": 2
|
||||
},
|
||||
"retraction_speed": {
|
||||
"default_value": 25
|
||||
},
|
||||
"retraction_retract_speed": {
|
||||
"default_value": 25
|
||||
},
|
||||
"retraction_prime_speed": {
|
||||
"default_value": 25
|
||||
},
|
||||
"adhesion_type": {
|
||||
"default_value": "skirt"
|
||||
},
|
||||
"machine_head_polygon": {
|
||||
"default_value": [
|
||||
[-75, 35],
|
||||
[18, 35],
|
||||
[18, -18],
|
||||
[-75, -18]
|
||||
]
|
||||
},
|
||||
"machine_head_with_fans_polygon": {
|
||||
"default_value": [
|
||||
[-75, 35],
|
||||
[18, 35],
|
||||
[18, -18],
|
||||
[-75, -18]
|
||||
]
|
||||
},
|
||||
"gantry_height": {
|
||||
"default_value": 55
|
||||
},
|
||||
"machine_max_feedrate_x": {
|
||||
"default_value": 300
|
||||
},
|
||||
"machine_max_feedrate_y": {
|
||||
"default_value": 300
|
||||
},
|
||||
"machine_max_feedrate_z": {
|
||||
"default_value": 7
|
||||
},
|
||||
"machine_max_feedrate_e": {
|
||||
"default_value": 50
|
||||
},
|
||||
"machine_max_acceleration_x": {
|
||||
"default_value": 2000
|
||||
},
|
||||
"machine_max_acceleration_y": {
|
||||
"default_value": 2000
|
||||
},
|
||||
"machine_max_acceleration_z": {
|
||||
"default_value": 100
|
||||
},
|
||||
"machine_max_acceleration_e": {
|
||||
"default_value": 10000
|
||||
},
|
||||
"machine_acceleration": {
|
||||
"default_value": 2000
|
||||
},
|
||||
"machine_max_jerk_xy": {
|
||||
"default_value": 10
|
||||
},
|
||||
"machine_max_jerk_z": {
|
||||
"default_value": 1
|
||||
},
|
||||
"machine_max_jerk_e": {
|
||||
"default_value": 5
|
||||
},
|
||||
"machine_gcode_flavor": {
|
||||
"default_value": "Repetier"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -56,7 +56,7 @@
|
|||
"prime_tower_position_y": {"value": 70 },
|
||||
"prime_blob_enable": {"default_value": false },
|
||||
"machine_max_feedrate_z": {"default_value": 1200 },
|
||||
"machine_start_gcode": {"default_value": "\n;Neither MaukCC nor any of MaukCC representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 X150 Y10 F9000\nG30 H0\nM340 P0 S1500\n\nG1 X-20 Y-100 F9000;go to wipe point\nG1 Z0 F900\nG1 Z0.2 F900\nG1 Y-50 F9000\nG1 X150 Y10 F9000\nM117 HMS434 Printing ...\n\n" },
|
||||
"machine_start_gcode": {"default_value": "\n;Neither MaukCC nor any of MaukCC representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 X-44 Y-100 F9000;go to wipe point\nG1 Z0 F900\nG1 Z0.2 F900\nM117 HMS434 Printing ...\n\n" },
|
||||
"machine_end_gcode": {"default_value": "" },
|
||||
|
||||
"retraction_extra_prime_amount": {"minimum_value_warning": "-2.0" },
|
||||
|
|
@ -94,7 +94,7 @@
|
|||
"maximum_value_warning": "material_print_temperature + 15"},
|
||||
"material_final_print_temperature": {"value": "material_print_temperature"},
|
||||
"material_bed_temperature_layer_0": {"value": "material_bed_temperature + 1"},
|
||||
"material_flow": {"value": "120 if infill_sparse_density < 95 else 115"},
|
||||
"material_flow": {"value": "100"},
|
||||
"retraction_amount": {"value": "1"},
|
||||
"retraction_speed": {"value": "20"},
|
||||
"retraction_prime_speed": {"value": "8"},
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@
|
|||
"prime_tower_position_x": { "value": "machine_depth - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) - 30" },
|
||||
"prime_tower_wipe_enabled": { "default_value": false },
|
||||
|
||||
"prime_blob_enable": { "enabled": true, "default_value": true },
|
||||
"prime_blob_enable": { "enabled": true, "default_value": true, "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" },
|
||||
|
||||
"acceleration_enabled": { "value": "True" },
|
||||
"acceleration_layer_0": { "value": "acceleration_topbottom" },
|
||||
|
|
|
|||
16
resources/extruders/flsun_qq_s_extruder_0.def.json
Normal file
16
resources/extruders/flsun_qq_s_extruder_0.def.json
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"id": "flsun_qq_s_extruder_0",
|
||||
"version": 2,
|
||||
"name": "Extruder 1",
|
||||
"inherits": "fdmextruder",
|
||||
"metadata": {
|
||||
"machine": "flsun_qq_s",
|
||||
"position": "0"
|
||||
},
|
||||
|
||||
"overrides": {
|
||||
"extruder_nr": { "default_value": 0 },
|
||||
"machine_nozzle_size": { "default_value": 0.4 },
|
||||
"material_diameter": { "default_value": 1.75 }
|
||||
}
|
||||
}
|
||||
16
resources/extruders/geeetech_a30_extruder_0.def.json
Normal file
16
resources/extruders/geeetech_a30_extruder_0.def.json
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"id": "geeetech_a30_extruder_0",
|
||||
"version": 2,
|
||||
"name": "Extruder 1",
|
||||
"inherits": "fdmextruder",
|
||||
"metadata": {
|
||||
"machine": "geeetech_a30",
|
||||
"position": "0"
|
||||
},
|
||||
|
||||
"overrides": {
|
||||
"extruder_nr": { "default_value": 0 },
|
||||
"machine_nozzle_size": { "default_value": 0.4 },
|
||||
"material_diameter": { "default_value": 1.75 }
|
||||
}
|
||||
}
|
||||
|
|
@ -17,10 +17,10 @@
|
|||
"machine_nozzle_offset_y": { "default_value": 0.0 },
|
||||
"material_diameter": { "default_value": 1.75 },
|
||||
"machine_extruder_start_code": {
|
||||
"default_value": "\nM109 T0 S{material_print_temperature}\nG1 X-18 Y-50 F9000\nG1 X150 Y10 F9000\n\n"
|
||||
"default_value": "\n;changing to tool1\nM109 T0 S{material_print_temperature}\nG1 X-18 Y-50 F9000\nG1 X150 Y10 F9000\n\n"
|
||||
},
|
||||
"machine_extruder_end_code": {
|
||||
"default_value": "\nG1 X150 Y10 F9000\nG1 X-20 Y-50 F9000\nG1 Y-100 F3000\n\n"
|
||||
"default_value": "\nG1 X150 Y10 F9000\nG1 X-20 Y-50 F9000\nG1 Y-100 F3000\n; ending tool1\n\n"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@
|
|||
"machine_nozzle_offset_y": { "default_value": 0.0 },
|
||||
"material_diameter": { "default_value": 1.75 },
|
||||
"machine_extruder_start_code": {
|
||||
"default_value": "\nM109 T1 S{material_print_temperature}\nG1 X-18 Y-50 F9000\nG1 X150 Y10 F9000\n\n"
|
||||
"default_value": "\n;changing to tool2\nM109 T1 S{material_print_temperature}\nG1 X-18 Y-50 F9000\nG1 X150 Y10 F9000\n\n"
|
||||
},
|
||||
"machine_extruder_end_code": {
|
||||
"default_value": "\nG1 X150 Y10 F9000\nG1 X-20 Y-50 F9000\nG1 Y-100 F3000\n\n"
|
||||
"default_value": "\nG1 X150 Y10 F9000\nG1 X-20 Y-50 F9000\nG1 Y-100 F3000\n; ending tool2\n\n"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@
|
|||
"machine_nozzle_offset_y": { "default_value": 0.0 },
|
||||
"material_diameter": { "default_value": 1.75 },
|
||||
"machine_extruder_start_code": {
|
||||
"default_value": ""
|
||||
"default_value": "\n;changing to tool3"
|
||||
},
|
||||
"machine_extruder_end_code": {
|
||||
"default_value": ""
|
||||
"default_value": "\n;ending tool3"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@
|
|||
"machine_nozzle_offset_y": { "default_value": 0.0 },
|
||||
"material_diameter": { "default_value": 1.75 },
|
||||
"machine_extruder_start_code": {
|
||||
"default_value": ""
|
||||
"default_value": "\n;changing to tool4"
|
||||
},
|
||||
"machine_extruder_end_code": {
|
||||
"default_value": ""
|
||||
"default_value": "\n;ending tool4"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@
|
|||
"machine_nozzle_offset_y": { "default_value": 0.0 },
|
||||
"material_diameter": { "default_value": 1.75 },
|
||||
"machine_extruder_start_code": {
|
||||
"default_value": ""
|
||||
"default_value": "\n;changing to tool5"
|
||||
},
|
||||
"machine_extruder_end_code": {
|
||||
"default_value": ""
|
||||
"default_value": "\n;ending tool5"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@
|
|||
"machine_nozzle_offset_y": { "default_value": 0.0 },
|
||||
"material_diameter": { "default_value": 1.75 },
|
||||
"machine_extruder_start_code": {
|
||||
"default_value": ""
|
||||
"default_value": "\n;changing to tool6"
|
||||
},
|
||||
"machine_extruder_end_code": {
|
||||
"default_value": ""
|
||||
"default_value": "\n;ending tool6"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@
|
|||
"machine_nozzle_offset_y": { "default_value": 0.0 },
|
||||
"material_diameter": { "default_value": 1.75 },
|
||||
"machine_extruder_start_code": {
|
||||
"default_value": ""
|
||||
"default_value": "\n;changing to tool7"
|
||||
},
|
||||
"machine_extruder_end_code": {
|
||||
"default_value": ""
|
||||
"default_value": "\n;ending tool7"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@
|
|||
"machine_nozzle_offset_y": { "default_value": 0.0 },
|
||||
"material_diameter": { "default_value": 1.75 },
|
||||
"machine_extruder_start_code": {
|
||||
"default_value": ""
|
||||
"default_value": "\n;changing to tool8"
|
||||
},
|
||||
"machine_extruder_end_code": {
|
||||
"default_value": ""
|
||||
"default_value": "\n;ending tool8"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,51 @@ Menu
|
|||
MenuItem { action: Cura.Actions.viewRightSideCamera; }
|
||||
}
|
||||
|
||||
Menu
|
||||
{
|
||||
id: cameraViewMenu
|
||||
property string cameraMode: UM.Preferences.getValue("general/camera_perspective_mode")
|
||||
Connections
|
||||
{
|
||||
target: UM.Preferences
|
||||
onPreferenceChanged:
|
||||
{
|
||||
if (preference !== "general/camera_perspective_mode")
|
||||
{
|
||||
return
|
||||
}
|
||||
cameraViewMenu.cameraMode = UM.Preferences.getValue("general/camera_perspective_mode")
|
||||
}
|
||||
}
|
||||
|
||||
title: catalog.i18nc("@action:inmenu menubar:view","Camera view")
|
||||
MenuItem
|
||||
{
|
||||
text: catalog.i18nc("@action:inmenu menubar:view", "Perspective")
|
||||
checkable: true
|
||||
checked: cameraViewMenu.cameraMode == "perspective"
|
||||
onTriggered:
|
||||
{
|
||||
UM.Preferences.setValue("general/camera_perspective_mode", "perspective")
|
||||
checked = cameraViewMenu.cameraMode == "perspective"
|
||||
}
|
||||
exclusiveGroup: group
|
||||
}
|
||||
MenuItem
|
||||
{
|
||||
text: catalog.i18nc("@action:inmenu menubar:view", "Orthographic")
|
||||
checkable: true
|
||||
checked: cameraViewMenu.cameraMode == "orthogonal"
|
||||
onTriggered:
|
||||
{
|
||||
UM.Preferences.setValue("general/camera_perspective_mode", "orthogonal")
|
||||
checked = cameraViewMenu.cameraMode == "orthogonal"
|
||||
}
|
||||
exclusiveGroup: group
|
||||
}
|
||||
ExclusiveGroup { id: group }
|
||||
}
|
||||
|
||||
MenuSeparator
|
||||
{
|
||||
visible: UM.Preferences.getValue("cura/use_multi_build_plate")
|
||||
|
|
|
|||
|
|
@ -91,27 +91,27 @@ SettingItem
|
|||
}
|
||||
width: height
|
||||
|
||||
color:
|
||||
{
|
||||
if (!enabled)
|
||||
{
|
||||
return UM.Theme.getColor("setting_control_disabled")
|
||||
}
|
||||
if (control.containsMouse || control.activeFocus)
|
||||
{
|
||||
return UM.Theme.getColor("setting_control_highlight")
|
||||
}
|
||||
return UM.Theme.getColor("setting_control")
|
||||
}
|
||||
|
||||
radius: UM.Theme.getSize("setting_control_radius").width
|
||||
border.width: UM.Theme.getSize("default_lining").width
|
||||
|
||||
border.color:
|
||||
{
|
||||
if (!enabled)
|
||||
if(!enabled)
|
||||
{
|
||||
return UM.Theme.getColor("setting_control_disabled_border")
|
||||
}
|
||||
switch (propertyProvider.properties.validationState)
|
||||
{
|
||||
case "ValidatorState.Invalid":
|
||||
case "ValidatorState.Exception":
|
||||
case "ValidatorState.MinimumError":
|
||||
case "ValidatorState.MaximumError":
|
||||
return UM.Theme.getColor("setting_validation_error");
|
||||
case "ValidatorState.MinimumWarning":
|
||||
case "ValidatorState.MaximumWarning":
|
||||
return UM.Theme.getColor("setting_validation_warning");
|
||||
}
|
||||
// Validation is OK.
|
||||
if (control.containsMouse || control.activeFocus)
|
||||
{
|
||||
return UM.Theme.getColor("setting_control_border_highlight")
|
||||
|
|
@ -119,6 +119,30 @@ SettingItem
|
|||
return UM.Theme.getColor("setting_control_border")
|
||||
}
|
||||
|
||||
color: {
|
||||
if (!enabled)
|
||||
{
|
||||
return UM.Theme.getColor("setting_control_disabled")
|
||||
}
|
||||
switch (propertyProvider.properties.validationState)
|
||||
{
|
||||
case "ValidatorState.Invalid":
|
||||
case "ValidatorState.Exception":
|
||||
case "ValidatorState.MinimumError":
|
||||
case "ValidatorState.MaximumError":
|
||||
return UM.Theme.getColor("setting_validation_error_background")
|
||||
case "ValidatorState.MinimumWarning":
|
||||
case "ValidatorState.MaximumWarning":
|
||||
return UM.Theme.getColor("setting_validation_warning_background")
|
||||
}
|
||||
// Validation is OK.
|
||||
if (control.containsMouse || control.activeFocus)
|
||||
{
|
||||
return UM.Theme.getColor("setting_control_highlight")
|
||||
}
|
||||
return UM.Theme.getColor("setting_control")
|
||||
}
|
||||
|
||||
UM.RecolorImage
|
||||
{
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
|
|
|
|||
|
|
@ -113,6 +113,18 @@ material_bed_temperature_layer_0
|
|||
material_adhesion_tendency
|
||||
material_surface_energy
|
||||
material_flow
|
||||
wall_material_flow
|
||||
wall_0_material_flow
|
||||
wall_x_material_flow
|
||||
skin_material_flow
|
||||
roofing_material_flow
|
||||
infill_material_flow
|
||||
skirt_brim_material_flow
|
||||
support_material_flow
|
||||
support_interface_material_flow
|
||||
support_roof_material_flow
|
||||
support_bottom_material_flow
|
||||
prime_tower_flow
|
||||
material_flow_layer_0
|
||||
retraction_enable
|
||||
retract_at_layer_change
|
||||
|
|
@ -297,7 +309,6 @@ prime_tower_size
|
|||
prime_tower_min_volume
|
||||
prime_tower_position_x
|
||||
prime_tower_position_y
|
||||
prime_tower_flow
|
||||
prime_tower_wipe_enabled
|
||||
prime_tower_brim_enable
|
||||
ooze_shield_enabled
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue