Merge pull request #5967 from Ultimaker/CURA-6625-Remove-Max-Z-Speed-Overide

Remove the max-z-speed-override
This commit is contained in:
Remco Burema 2019-07-04 16:17:41 +02:00 committed by GitHub
commit 52d4875a68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 4 additions and 34 deletions

View File

@ -11,7 +11,7 @@ from UM.VersionUpgrade import VersionUpgrade
_renamed_settings = {
"support_minimal_diameter": "support_tower_maximum_supported_diameter"
} #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 = {
#Include CreawsomeMod profiles here as well for the people who installed that.
#Definitions.

View File

@ -3085,19 +3085,6 @@
"settable_per_mesh": false,
"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":
{
"label": "Number of Slower Layers",
@ -6672,7 +6659,7 @@
"type": "float",
"default_value": 5,
"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",
"enabled": "wireframe_enabled",
"settable_per_mesh": false,
@ -6704,7 +6691,7 @@
"type": "float",
"default_value": 5,
"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",
"enabled": "wireframe_enabled",
"value": "wireframe_printspeed",
@ -6720,7 +6707,7 @@
"type": "float",
"default_value": 5,
"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",
"enabled": "wireframe_enabled",
"value": "wireframe_printspeed",

View File

@ -50,11 +50,6 @@
"machine_gcode_flavor": {"default_value": "RepRap (RepRap)" },
"material_print_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_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": "" },
@ -112,7 +107,6 @@
"speed_travel": {"value": "100"},
"speed_travel_layer_0": {"value": "speed_travel"},
"speed_support_interface": {"value": "speed_topbottom"},
"max_feedrate_z_override": {"value": 10},
"speed_slowdown_layers": {"value": 1},
"acceleration_print": {"value": 200},
"acceleration_travel": {"value": 200},

View File

@ -126,9 +126,6 @@
"adhesion_type": {
"value": "'none'"
},
"acceleration_enabled": {
"value": "False"
},
"print_sequence": {
"enabled": false
},
@ -251,10 +248,6 @@
"expand_skins_expand_distance": {
"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": {
"enabled": false
},

View File

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

View File

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

View File

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

View File

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