mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-08 14:34:01 -06:00
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent_container_tree
This commit is contained in:
Jaime van Kessel
commit
d1a8ce54a1
52 changed files with 774 additions and 290 deletions
|
|
@ -107,8 +107,8 @@
|
|||
"cool_fan_enabled": { "value": true },
|
||||
"cool_min_layer_time": { "value": 10 },
|
||||
|
||||
"adhesion_type": { "value": "'none' if support_enable else 'skirt'" },
|
||||
"brim_replaces_support": { "value": false},
|
||||
"adhesion_type": { "value": "'skirt'" },
|
||||
"brim_replaces_support": { "value": false },
|
||||
"skirt_gap": { "value": 10.0 },
|
||||
"skirt_line_count": { "value": 4 },
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,11 @@
|
|||
"name": "Creality Ender-3",
|
||||
"version": 2,
|
||||
"inherits": "creality_base",
|
||||
"metadata": {
|
||||
"quality_definition": "creality_base",
|
||||
"visible": true,
|
||||
"platform": "creality_ender3.stl"
|
||||
},
|
||||
"overrides": {
|
||||
"machine_name": { "default_value": "Creality Ender-3" },
|
||||
"machine_width": { "default_value": 220 },
|
||||
|
|
@ -23,10 +28,5 @@
|
|||
},
|
||||
|
||||
"gantry_height": { "value": 25 }
|
||||
|
||||
},
|
||||
"metadata": {
|
||||
"quality_definition": "creality_base",
|
||||
"visible": true
|
||||
}
|
||||
}
|
||||
|
|
@ -205,6 +205,16 @@
|
|||
"settable_per_extruder": false,
|
||||
"settable_per_meshgroup": false
|
||||
},
|
||||
"machine_heated_build_volume":
|
||||
{
|
||||
"label": "Has Build Volume Temperature Stabilization",
|
||||
"description": "Whether the machine is able to stabilize the build volume temperature.",
|
||||
"default_value": false,
|
||||
"type": "bool",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": false,
|
||||
"settable_per_meshgroup": false
|
||||
},
|
||||
"machine_center_is_zero":
|
||||
{
|
||||
"label": "Is Center Origin",
|
||||
|
|
@ -2088,7 +2098,7 @@
|
|||
"default_value": 210,
|
||||
"minimum_value_warning": "0",
|
||||
"maximum_value_warning": "285",
|
||||
"enabled": "machine_nozzle_temp_enabled",
|
||||
"enabled": false,
|
||||
"settable_per_extruder": true,
|
||||
"settable_per_mesh": false,
|
||||
"minimum_value": "-273.15"
|
||||
|
|
@ -2104,7 +2114,7 @@
|
|||
"minimum_value": "-273.15",
|
||||
"minimum_value_warning": "0",
|
||||
"maximum_value_warning": "285",
|
||||
"enabled": true,
|
||||
"enabled": "machine_heated_build_volume",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": false
|
||||
},
|
||||
|
|
@ -2191,9 +2201,9 @@
|
|||
"resolve": "max(extruderValues('default_material_bed_temperature'))",
|
||||
"default_value": 60,
|
||||
"minimum_value": "-273.15",
|
||||
"minimum_value_warning": "0",
|
||||
"minimum_value_warning": "build_volume_temperature",
|
||||
"maximum_value_warning": "130",
|
||||
"enabled": "machine_heated_bed and machine_gcode_flavor != \"UltiGCode\"",
|
||||
"enabled": false,
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": false,
|
||||
"settable_per_meshgroup": false
|
||||
|
|
@ -2208,7 +2218,7 @@
|
|||
"value": "default_material_bed_temperature",
|
||||
"resolve": "max(extruderValues('material_bed_temperature'))",
|
||||
"minimum_value": "-273.15",
|
||||
"minimum_value_warning": "0",
|
||||
"minimum_value_warning": "build_volume_temperature",
|
||||
"maximum_value_warning": "130",
|
||||
"enabled": "machine_heated_bed and machine_gcode_flavor != \"UltiGCode\"",
|
||||
"settable_per_mesh": false,
|
||||
|
|
@ -2225,7 +2235,7 @@
|
|||
"default_value": 60,
|
||||
"value": "resolveOrValue('material_bed_temperature')",
|
||||
"minimum_value": "-273.15",
|
||||
"minimum_value_warning": "max(extruderValues('material_bed_temperature'))",
|
||||
"minimum_value_warning": "max(build_volume_temperature, max(extruderValues('material_bed_temperature')))",
|
||||
"maximum_value_warning": "130",
|
||||
"enabled": "machine_heated_bed and machine_gcode_flavor != \"UltiGCode\"",
|
||||
"settable_per_mesh": false,
|
||||
|
|
|
|||
93
resources/definitions/jgaurora_a3s.def.json
Normal file
93
resources/definitions/jgaurora_a3s.def.json
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
{
|
||||
"name": "JGAurora A3S",
|
||||
"version": 2,
|
||||
"inherits": "fdmprinter",
|
||||
"metadata": {
|
||||
"visible": true,
|
||||
"author": "Samuel Pinches",
|
||||
"manufacturer": "JGAurora",
|
||||
"file_formats": "text/x-gcode",
|
||||
"preferred_quality_type": "normal",
|
||||
"machine_extruder_trains":
|
||||
{
|
||||
"0": "jgaurora_a3s_extruder_0"
|
||||
}
|
||||
},
|
||||
"overrides": {
|
||||
"machine_name": {
|
||||
"default_value": "JGAurora A3S"
|
||||
},
|
||||
"machine_start_gcode": {
|
||||
"default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 ;home all axis\nG92 E0 ;zero the extruded length\nG1 Z1 F1000 ;move up slightly\nG1 X60.0 Z0 E9.0 F1000.0;intro line\nG1 X100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --"
|
||||
},
|
||||
"machine_end_gcode": {
|
||||
"default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 ;move to the X-axis origin (Home)\nG0 Y200 F600 ;bring the bed to the front for easy print removal\nM84 ;turn off stepper motors\n; -- end of END GCODE --"
|
||||
},
|
||||
"machine_width": {
|
||||
"default_value": 205
|
||||
},
|
||||
"machine_height": {
|
||||
"default_value": 205
|
||||
},
|
||||
"machine_depth": {
|
||||
"default_value": 205
|
||||
},
|
||||
"machine_heated_bed": {
|
||||
"default_value": true
|
||||
},
|
||||
"machine_center_is_zero": {
|
||||
"default_value": false
|
||||
},
|
||||
"gantry_height": {
|
||||
"value": "10"
|
||||
},
|
||||
"machine_gcode_flavor": {
|
||||
"default_value": "RepRap (Marlin/Sprinter)"
|
||||
},
|
||||
"material_diameter": {
|
||||
"default_value": 1.75
|
||||
},
|
||||
"material_print_temperature": {
|
||||
"default_value": 210
|
||||
},
|
||||
"material_bed_temperature": {
|
||||
"default_value": 65
|
||||
},
|
||||
"layer_height_0": {
|
||||
"default_value": 0.12
|
||||
},
|
||||
"wall_thickness": {
|
||||
"default_value": 1.2
|
||||
},
|
||||
"speed_print": {
|
||||
"default_value": 35
|
||||
},
|
||||
"speed_infill": {
|
||||
"default_value": 40
|
||||
},
|
||||
"speed_wall": {
|
||||
"default_value": 30
|
||||
},
|
||||
"speed_topbottom": {
|
||||
"default_value": 20
|
||||
},
|
||||
"speed_travel": {
|
||||
"default_value": 100
|
||||
},
|
||||
"speed_layer_0": {
|
||||
"default_value": 12
|
||||
},
|
||||
"support_enable": {
|
||||
"default_value": true
|
||||
},
|
||||
"retraction_enable": {
|
||||
"default_value": true
|
||||
},
|
||||
"retraction_amount": {
|
||||
"default_value": 8
|
||||
},
|
||||
"retraction_speed": {
|
||||
"default_value": 45
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
"id": 9066,
|
||||
"check_urls":
|
||||
[
|
||||
"http://software.ultimaker.com/releases/firmware/9066/stable/um-update.swu.version"
|
||||
"https://software.ultimaker.com/releases/firmware/9066/stable/um-update.swu.version"
|
||||
],
|
||||
"update_url": "https://ultimaker.com/firmware"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
"id": 9511,
|
||||
"check_urls":
|
||||
[
|
||||
"http://software.ultimaker.com/releases/firmware/9066/stable/um-update.swu.version"
|
||||
"https://software.ultimaker.com/releases/firmware/9066/stable/um-update.swu.version"
|
||||
],
|
||||
"update_url": "https://ultimaker.com/firmware"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
"weight": -2,
|
||||
"firmware_update_info": {
|
||||
"id": 9051,
|
||||
"check_urls": ["http://software.ultimaker.com/releases/firmware/9051/stable/um-update.swu.version"],
|
||||
"check_urls": ["https://software.ultimaker.com/releases/firmware/9051/stable/um-update.swu.version"],
|
||||
"update_url": "https://ultimaker.com/firmware"
|
||||
}
|
||||
},
|
||||
|
|
@ -44,6 +44,7 @@
|
|||
"machine_depth": { "default_value": 240 },
|
||||
"machine_height": { "default_value": 300 },
|
||||
"machine_heated_bed": { "default_value": true },
|
||||
"machine_heated_build_volume": { "default_value": true },
|
||||
"machine_nozzle_heat_up_speed": { "default_value": 1.4 },
|
||||
"machine_nozzle_cool_down_speed": { "default_value": 0.8 },
|
||||
"machine_head_with_fans_polygon":
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue