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

Merge remote-tracking branch 'origin/master' into CURA-6590_continue_fix_diameter_reset

Browse source
This commit is contained in:
Lipu Fei 2019-07-08 12:49:58 +02:00
commit 1f542d1bc8
14 changed files with 14 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -22,10 +22,10 @@ set(CURA_VERSION "master" CACHE STRING "Version name of Cura")
set(CURA_BUILDTYPE "" CACHE STRING "Build type of Cura, eg. 'PPA'") set(CURA_BUILDTYPE "" CACHE STRING "Build type of Cura, eg. 'PPA'")
set(CURA_CLOUD_API_ROOT "" CACHE STRING "Alternative Cura cloud API root") set(CURA_CLOUD_API_ROOT "" CACHE STRING "Alternative Cura cloud API root")
set(CURA_CLOUD_API_VERSION "" CACHE STRING "Alternative Cura cloud API version") set(CURA_CLOUD_API_VERSION "" CACHE STRING "Alternative Cura cloud API version")
set(CURA_CLOUD_ACCOUNT_API_ROOT "" CACHE STRING "Alternative Cura cloud account API version")
configure_file(${CMAKE_SOURCE_DIR}/cura.desktop.in ${CMAKE_BINARY_DIR}/cura.desktop @ONLY) configure_file(${CMAKE_SOURCE_DIR}/cura.desktop.in ${CMAKE_BINARY_DIR}/cura.desktop @ONLY)
configure_file(cura/CuraVersion.py.in CuraVersion.py @ONLY) configure_file(cura/CuraVersion.py.in CuraVersion.py @ONLY)

2
plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py
View file

@ -11,7 +11,7 @@ from UM.VersionUpgrade import VersionUpgrade
_renamed_settings = { _renamed_settings = {
"support_minimal_diameter": "support_tower_maximum_supported_diameter" "support_minimal_diameter": "support_tower_maximum_supported_diameter"
} #type: Dict[str, str] } #type: Dict[str, str]
_removed_settings = ["prime_tower_circular"] # type: List[str] _removed_settings = ["prime_tower_circular", "max_feedrate_z_override"] # type: List[str]
_renamed_profiles = { _renamed_profiles = {
#Include CreawsomeMod profiles here as well for the people who installed that. #Include CreawsomeMod profiles here as well for the people who installed that.
#Definitions. #Definitions.

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

@ -5,7 +5,7 @@
"inherits": "fdmprinter", "inherits": "fdmprinter",
"metadata": { "metadata": {
"visible": true, "visible": true,
"author": "na", "author": "unknown",
"manufacturer": "BIBO", "manufacturer": "BIBO",
"category": "Other", "category": "Other",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",

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

@ -5,7 +5,7 @@
"metadata": { "metadata": {
"visible": true, "visible": true,
"author": "Ultimaker", "author": "Ultimaker",
"manufacturer": "Danny Lu", "manufacturer": "Custom",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"platform_offset": [ 0, 0, 0], "platform_offset": [ 0, 0, 0],
"machine_extruder_trains": "machine_extruder_trains":

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

@ -2686,7 +2686,7 @@
"limit_support_retractions": "limit_support_retractions":
{ {
"label": "Limit Support Retractions", "label": "Limit Support Retractions",
"description": "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure.", "description": "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excessive stringing within the support structure.",
"type": "bool", "type": "bool",
"default_value": true, "default_value": true,
"enabled": "retraction_enable and (support_enable or support_tree_enable)", "enabled": "retraction_enable and (support_enable or support_tree_enable)",
@ -3085,19 +3085,6 @@
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true "settable_per_extruder": true
}, },
"max_feedrate_z_override":
{
"label": "Maximum Z Speed",
"description": "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed.",
"unit": "mm/s",
"type": "float",
"default_value": 0,
"minimum_value": "0",
"maximum_value": "299792458000",
"maximum_value_warning": "machine_max_feedrate_z",
"settable_per_mesh": false,
"settable_per_extruder": true
},
"speed_slowdown_layers": "speed_slowdown_layers":
{ {
"label": "Number of Slower Layers", "label": "Number of Slower Layers",
@ -5929,7 +5916,7 @@
"smooth_spiralized_contours": "smooth_spiralized_contours":
{ {
"label": "Smooth Spiralized Contours", "label": "Smooth Spiralized Contours",
"description": "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details.", "description": "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details.",
"type": "bool", "type": "bool",
"default_value": true, "default_value": true,
"enabled": "magic_spiralize", "enabled": "magic_spiralize",
@ -6672,7 +6659,7 @@
"type": "float", "type": "float",
"default_value": 5, "default_value": 5,
"minimum_value": "0.1", "minimum_value": "0.1",
"maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + max(max_feedrate_z_override, machine_max_feedrate_z) ** 2)", "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + machine_max_feedrate_z ** 2)",
"maximum_value_warning": "50", "maximum_value_warning": "50",
"enabled": "wireframe_enabled", "enabled": "wireframe_enabled",
"settable_per_mesh": false, "settable_per_mesh": false,
@ -6704,7 +6691,7 @@
"type": "float", "type": "float",
"default_value": 5, "default_value": 5,
"minimum_value": "0.1", "minimum_value": "0.1",
"maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + max(max_feedrate_z_override, machine_max_feedrate_z) ** 2)", "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + machine_max_feedrate_z ** 2)",
"maximum_value_warning": "50", "maximum_value_warning": "50",
"enabled": "wireframe_enabled", "enabled": "wireframe_enabled",
"value": "wireframe_printspeed", "value": "wireframe_printspeed",
@ -6720,7 +6707,7 @@
"type": "float", "type": "float",
"default_value": 5, "default_value": 5,
"minimum_value": "0.1", "minimum_value": "0.1",
"maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + max(max_feedrate_z_override, machine_max_feedrate_z) ** 2)", "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + machine_max_feedrate_z ** 2)",
"maximum_value_warning": "50", "maximum_value_warning": "50",
"enabled": "wireframe_enabled", "enabled": "wireframe_enabled",
"value": "wireframe_printspeed", "value": "wireframe_printspeed",

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

@ -50,11 +50,6 @@
"machine_gcode_flavor": {"default_value": "RepRap (RepRap)" }, "machine_gcode_flavor": {"default_value": "RepRap (RepRap)" },
"material_print_temp_wait": {"default_value": true}, "material_print_temp_wait": {"default_value": true},
"material_bed_temp_wait": {"default_value": true }, "material_bed_temp_wait": {"default_value": true },
"prime_tower_enable": {"default_value": false },
"prime_tower_size": {"value": 20.6 },
"prime_tower_position_x": {"value": 125 },
"prime_tower_position_y": {"value": 70 },
"prime_blob_enable": {"default_value": false },
"machine_max_feedrate_z": {"default_value": 1200 }, "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 X-44 Y-100 F9000;go to wipe point\nG1 Z0 F900\nG1 Z0.2 F900\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": "" }, "machine_end_gcode": {"default_value": "" },
@ -112,7 +107,6 @@
"speed_travel": {"value": "100"}, "speed_travel": {"value": "100"},
"speed_travel_layer_0": {"value": "speed_travel"}, "speed_travel_layer_0": {"value": "speed_travel"},
"speed_support_interface": {"value": "speed_topbottom"}, "speed_support_interface": {"value": "speed_topbottom"},
"max_feedrate_z_override": {"value": 10},
"speed_slowdown_layers": {"value": 1}, "speed_slowdown_layers": {"value": 1},
"acceleration_print": {"value": 200}, "acceleration_print": {"value": 200},
"acceleration_travel": {"value": 200}, "acceleration_travel": {"value": 200},

4
resources/definitions/makeit_pro_l.def.json
View file

@ -4,8 +4,8 @@
"inherits": "fdmprinter", "inherits": "fdmprinter",
"metadata": { "metadata": {
"visible": true, "visible": true,
"author": "NA", "author": "unknown",
"manufacturer": "NA", "manufacturer": "MAKEiT 3D",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"has_materials": false, "has_materials": false,
"machine_extruder_trains": "machine_extruder_trains":

4
resources/definitions/makeit_pro_m.def.json
View file

@ -4,8 +4,8 @@
"inherits": "fdmprinter", "inherits": "fdmprinter",
"metadata": { "metadata": {
"visible": true, "visible": true,
"author": "NA", "author": "unknown",
"manufacturer": "NA", "manufacturer": "MAKEiT 3D",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"has_materials": false, "has_materials": false,
"machine_extruder_trains": "machine_extruder_trains":

7
resources/definitions/peopoly_moai.def.json
View file

@ -126,9 +126,6 @@
"adhesion_type": { "adhesion_type": {
"value": "'none'" "value": "'none'"
}, },
"acceleration_enabled": {
"value": "False"
},
"print_sequence": { "print_sequence": {
"enabled": false "enabled": false
}, },
@ -251,10 +248,6 @@
"expand_skins_expand_distance": { "expand_skins_expand_distance": {
"value": "( wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x ) / 2" "value": "( wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x ) / 2"
}, },
"max_feedrate_z_override": {
"value": 0,
"enabled": false
},
"flow_rate_max_extrusion_offset": { "flow_rate_max_extrusion_offset": {
"enabled": false "enabled": false
}, },

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

@ -5,7 +5,7 @@
"metadata": { "metadata": {
"visible": true, "visible": true,
"author": "Ultimaker", "author": "Ultimaker",
"manufacturer": "Unknown", "manufacturer": "Zone3D",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"platform_offset": [ 0, 0, 0], "platform_offset": [ 0, 0, 0],
"machine_extruder_trains": "machine_extruder_trains":

1
resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg
View file

@ -75,7 +75,6 @@ speed_print = 30
speed_travel = 150 speed_travel = 150
speed_layer_0 = 10 speed_layer_0 = 10
speed_travel_layer_0 = 50 speed_travel_layer_0 = 50
max_feedrate_z_override = 0
speed_slowdown_layers = 2 speed_slowdown_layers = 2
speed_equalize_flow_enabled = False speed_equalize_flow_enabled = False
acceleration_enabled = False acceleration_enabled = False

1
resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg
View file

@ -75,7 +75,6 @@ speed_print = 60
speed_travel = 150 speed_travel = 150
speed_layer_0 = 10 speed_layer_0 = 10
speed_travel_layer_0 = 50 speed_travel_layer_0 = 50
max_feedrate_z_override = 0
speed_slowdown_layers = 2 speed_slowdown_layers = 2
speed_equalize_flow_enabled = False speed_equalize_flow_enabled = False
acceleration_enabled = False acceleration_enabled = False

1
resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg
View file

@ -75,7 +75,6 @@ speed_print = 50
speed_travel = 150 speed_travel = 150
speed_layer_0 = 10 speed_layer_0 = 10
speed_travel_layer_0 = 50 speed_travel_layer_0 = 50
max_feedrate_z_override = 0
speed_slowdown_layers = 2 speed_slowdown_layers = 2
speed_equalize_flow_enabled = False speed_equalize_flow_enabled = False
acceleration_enabled = False acceleration_enabled = False

1
resources/setting_visibility/expert.cfg
View file

@ -159,7 +159,6 @@ speed_layer_0
speed_print_layer_0 speed_print_layer_0
speed_travel_layer_0 speed_travel_layer_0
skirt_brim_speed skirt_brim_speed
max_feedrate_z_override
speed_slowdown_layers speed_slowdown_layers
speed_equalize_flow_enabled speed_equalize_flow_enabled
speed_equalize_flow_max speed_equalize_flow_max