3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-11 16:00:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/master' into feature_intent

Browse source
This commit is contained in:
Lipu Fei 2019-10-01 09:41:05 +02:00
commit 96a9bcccbb
55 changed files with 551 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

3
resources/definitions/bibo2_dual.def.json
View file

@ -78,6 +78,9 @@
"machine_end_gcode": {
"default_value": ";End GCode\nM104 T0 S0 ;extruder heater off\nM104 T1 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91\nG1 Z1 F100 ;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-2 X-20 Y-20 F300 ;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"
},
"speed_print": {
"default_value": 40
},
"machine_extruder_count": {
"default_value": 2
},

15
resources/definitions/fdmprinter.def.json
View file

@ -4304,7 +4304,7 @@
"default_value": 8.0,
"minimum_value": "0.0",
"maximum_value_warning": "50.0",
"enabled": "support_enable or support_tree_enable",
"enabled": "(support_enable or support_tree_enable) and support_brim_enable",
"settable_per_mesh": false,
"settable_per_extruder": true,
"limit_to_extruder": "support_infill_extruder_nr",
@ -4319,7 +4319,7 @@
"minimum_value": "0",
"maximum_value_warning": "50 / skirt_brim_line_width",
"value": "math.ceil(support_brim_width / (skirt_brim_line_width * initial_layer_line_width_factor / 100.0))",
"enabled": "support_enable or support_tree_enable",
"enabled": "(support_enable or support_tree_enable) and support_brim_enable",
"settable_per_mesh": false,
"settable_per_extruder": true,
"limit_to_extruder": "support_infill_extruder_nr"
@ -4405,6 +4405,7 @@
"unit": "mm",
"type": "float",
"minimum_value": "0",
"minimum_value_warning": "support_xy_distance - support_line_width * 2",
"maximum_value_warning": "support_xy_distance",
"default_value": 0.2,
"value": "machine_nozzle_size / 2",
@ -4759,7 +4760,7 @@
"minimum_interface_area":
{
"label": "Minimum Support Interface Area",
"description": "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated.",
"description": "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support.",
"unit": "mm²",
"type": "float",
"default_value": 1.0,
@ -4773,7 +4774,7 @@
"minimum_roof_area":
{
"label": "Minimum Support Roof Area",
"description": "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated.",
"description": "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support.",
"unit": "mm²",
"type": "float",
"default_value": 1.0,
@ -4787,7 +4788,7 @@
"minimum_bottom_area":
{
"label": "Minimum Support Floor Area",
"description": "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated.",
"description": "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support.",
"unit": "mm²",
"type": "float",
"default_value": 1.0,
@ -4862,6 +4863,7 @@
"description": "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees).",
"type": "[int]",
"default_value": "[ ]",
"value": "support_interface_angles",
"limit_to_extruder": "support_roof_extruder_nr",
"enabled": "support_roof_enable and support_roof_pattern != 'concentric'",
"settable_per_mesh": false,
@ -4873,6 +4875,7 @@
"description": "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees).",
"type": "[int]",
"default_value": "[ ]",
"value": "support_interface_angles",
"limit_to_extruder": "support_bottom_extruder_nr",
"enabled": "support_bottom_enable and support_bottom_pattern != 'concentric'",
"settable_per_mesh": false,
@ -7084,7 +7087,7 @@
"wall_overhang_angle":
{
"label": "Overhanging Wall Angle",
"description": "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging.",
"description": "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either.",
"unit": "°",
"type": "float",
"minimum_value": "0",

32
resources/definitions/hellbot_adonis.def.json Normal file
View file

@ -0,0 +1,32 @@
{
"version": 2,
"name": "Hellbot Adonis",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "MUX team",
"manufacturer": "Hellbot",
"file_formats": "text/x-gcode",
"platform": "hellbot_adonis.obj",
"platform_texture": "hellbot.png",
"platform_offset": [0, -1, 0],
"has_materials": true,
"machine_extruder_trains": {
"0": "hellbot_adonis_extruder"
}
},
"overrides": {
"machine_name": {
"default_value": "Hellbot Adonis"
},
"machine_width": {
"default_value": 160
},
"machine_depth": {
"default_value": 160
},
"machine_height": {
"default_value": 160
}
}
}

32
resources/definitions/hellbot_magna_I.def.json Normal file
View file

@ -0,0 +1,32 @@
{
"version": 2,
"name": "Hellbot Magna 1",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "MUX team",
"manufacturer": "Hellbot",
"file_formats": "text/x-gcode",
"platform": "hellbot_magna.obj",
"platform_texture": "hellbot.png",
"platform_offset": [0, -1, 0],
"has_materials": true,
"machine_extruder_trains": {
"0": "hellbot_magna_i_extruder"
}
},
"overrides": {
"machine_name": {
"default_value": "Hellbot Magna 1"
},
"machine_width": {
"default_value": 220
},
"machine_depth": {
"default_value": 220
},
"machine_height": {
"default_value": 260
}
}
}

36
resources/definitions/hellbot_magna_dual.def.json Normal file
View file

@ -0,0 +1,36 @@
{
"version": 2,
"name": "Hellbot Magna DUAL",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "MUX team",
"manufacturer": "Hellbot",
"file_formats": "text/x-gcode",
"platform": "hellbot_magna.obj",
"platform_texture": "hellbot.png",
"platform_offset": [0, -1, 0],
"has_materials": true,
"machine_extruder_trains": {
"0": "hellbot_magna_dual_extruder_1",
"1": "hellbot_magna_dual_extruder_2"
}
},
"overrides": {
"machine_name": {
"default_value": "Hellbot Magna DUAL"
},
"machine_width": {
"default_value": 220
},
"machine_depth": {
"default_value": 220
},
"machine_height": {
"default_value": 260
},
"machine_extruder_count": {
"default_value": 2
}
}
}

14
resources/definitions/hms434.def.json
View file

@ -19,7 +19,7 @@
"fiberlogy_hd_pla",
"filo3d_pla", "filo3d_pla_green", "filo3d_pla_red",
"generic_abs_175", "generic_cpe_175", "generic_hips_175", "generic_nylon_175", "generic_pc_175", "generic_petg_175", "generic_pva_175", "generic_tpu_175",
"imade3d_generic_petg_175", "imade3d_generic_pla_175",
"imade3d_petg_175", "imade3d_pla_175",
"innofill_innoflex60_175",
"octofiber_pla",
"polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla",
@ -67,7 +67,8 @@
"machine_gcode_flavor": {"default_value": "RepRap (RepRap)" },
"material_print_temp_wait": {"default_value": false },
"material_bed_temp_wait": {"default_value": false },
"machine_max_feedrate_z": {"default_value": 1200 },
"machine_max_feedrate_z": {"default_value": 10 },
"machine_acceleration": {"default_value": 1000 },
"machine_start_gcode": {"default_value": "\n;Neither Hybrid AM Systems nor any of Hybrid AM Systems 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": "" },
@ -130,11 +131,12 @@
"speed_travel": {"value": "150"},
"speed_travel_layer_0": {"value": "speed_travel"},
"speed_support_interface": {"value": "speed_topbottom"},
"speed_z_hop": {"value": 10},
"speed_slowdown_layers": {"value": 1},
"acceleration_print": {"value": 200},
"acceleration_travel": {"value": 200},
"jerk_print": {"value": 5},
"jerk_travel": {"value": 5},
"acceleration_print": {"value": 1000},
"acceleration_travel": {"value": 1000},
"jerk_print": {"value": 10},
"jerk_travel": {"value": 10},
"retraction_hop_enabled": {"value": false},
"retraction_hop": {"value": 1},

2
resources/definitions/jgaurora_z_603s.def.json
View file

@ -21,7 +21,7 @@
"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\nM420 S1 ;turn on mesh bed levelling if enabled in firmware\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 Y280 F600 ;bring the bed to the front for easy print removal\nM84 ;turn off stepper motors\n; -- end of 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 Y0 F600 ;move to the X/Y-axis origin (Home)\nM84 ;turn off stepper motors\n; -- end of END GCODE --"
},
"machine_width": {
"default_value": 280