GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-06 23:09:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix sorting of setting overrides

Browse Source 
Keeps it maintainable in the long run.

Contributes to issue PP-1.
This commit is contained in:
Ghostkeeper 2021-10-01 13:55:27 +02:00
parent 40fd3203b8
commit 5b923d105a
No known key found for this signature in database
GPG Key ID: D2A8871EE34EC59A
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/definitions/ultimaker3.def.json
View File

@ -120,6 +120,7 @@
"material_bed_temperature": { "maximum_value": "115" },
"material_bed_temperature_layer_0": { "maximum_value": "115" },
"material_standby_temperature": { "value": "100" },
"meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" },
"multiple_mesh_overlap": { "value": "0" },
"optimize_wall_printing_order": { "value": "True" },
"prime_tower_enable": { "default_value": true },
@ -132,6 +133,7 @@
"raft_margin": { "value": "10" },
"raft_surface_layers": { "value": "1" },
"retraction_amount": { "value": "6.5" },
"retraction_combing": { "value": "no_outer_surfaces" },
"retraction_count_max": { "value": "10" },
"retraction_extrusion_window": { "value": "1" },
"retraction_hop": { "value": "2" },
@ -161,10 +163,8 @@
"switch_extruder_retraction_amount": { "value": "8" },
"top_bottom_pattern" : {"value": "zigzag"},
"top_bottom_thickness": { "value": "1" },
"meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" },
"wall_material_flow": {"value": "90"},
"travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
"retraction_combing": { "value": "no_outer_surfaces" },
"wall_material_flow": {"value": "90"},
"wall_0_inset": { "value": "0" },
"wall_line_width_x": { "value": "round(wall_line_width * 0.3 / 0.35, 2)" },
"wall_thickness": { "value": "1" },

10
resources/definitions/ultimaker_s3.def.json
View File

@ -93,6 +93,7 @@
"infill_overlap": { "value": "0" },
"infill_pattern": { "value": "'lines'" },
"infill_wipe_dist": { "value": "0" },
"initial_layer_line_width_factor": { "value": "120" },
"jerk_enabled": { "value": "False" },
"jerk_layer_0": { "value": "jerk_topbottom" },
"jerk_prime_tower": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" },
@ -107,9 +108,12 @@
"layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
"line_width": { "value": "machine_nozzle_size * 0.875" },
"machine_min_cool_heat_time_window": { "value": "15" },
"meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" },
"meshfix_maximum_deviation": { "value": "layer_height / 4" },
"default_material_print_temperature": { "value": "200" },
"material_standby_temperature": { "value": "100" },
"multiple_mesh_overlap": { "value": "0" },
"optimize_wall_printing_order": { "value": "True" },
"prime_tower_enable": { "value": "True" },
"raft_airgap": { "value": "0" },
"raft_base_speed": { "value": "20" },
@ -123,6 +127,7 @@
"raft_speed": { "value": "25" },
"raft_surface_layers": { "value": "1" },
"retraction_amount": { "value": "6.5" },
"retraction_combing": { "value": "no_outer_surfaces" },
"retraction_count_max": { "value": "10" },
"retraction_extrusion_window": { "value": "1" },
"retraction_hop": { "value": "2" },
@ -160,11 +165,6 @@
"wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" },
"wall_thickness": { "value": "1" },
"wall_material_flow": {"value": "90"},
"meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" },
"meshfix_maximum_deviation": { "value": "layer_height / 4" },
"optimize_wall_printing_order": { "value": "True" },
"retraction_combing": { "value": "no_outer_surfaces" },
"initial_layer_line_width_factor": { "value": "120" },
"zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }
}
}

12
resources/definitions/ultimaker_s5.def.json
View File

@ -87,6 +87,7 @@
"acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 4000)" },
"acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 500 / 1000)" },
"brim_width": { "value": "3" },
"build_volume_temperature": { "maximum_value": 50 }
"cool_fan_full_at_height": { "value": "layer_height_0 + 4 * layer_height" },
"cool_fan_speed": { "value": "50" },
"cool_fan_speed_max": { "value": "100" },
@ -96,6 +97,7 @@
"infill_pattern": { "value": "'lines'" },
"infill_wipe_dist": { "value": "0" },
"infill_before_walls": { "value": "False" },
"initial_layer_line_width_factor": { "value": "120" },
"jerk_enabled": { "value": "True" },
"jerk_layer_0": { "value": "jerk_topbottom" },
"jerk_prime_tower": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" },
@ -112,7 +114,10 @@
"machine_min_cool_heat_time_window": { "value": "15" },
"default_material_print_temperature": { "value": "200" },
"material_standby_temperature": { "value": "100" },
"meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" },
"meshfix_maximum_deviation": { "value": "layer_height / 4" },
"multiple_mesh_overlap": { "value": "0" },
"optimize_wall_printing_order": { "value": "True" },
"prime_tower_enable": { "value": "True" },
"raft_airgap": { "value": "0" },
"raft_base_speed": { "value": "20" },
@ -126,6 +131,7 @@
"raft_speed": { "value": "25" },
"raft_surface_layers": { "value": "1" },
"retraction_amount": { "value": "6.5" },
"retraction_combing": { "value": "no_outer_surfaces" },
"retraction_count_max": { "value": "10" },
"retraction_extrusion_window": { "value": "1" },
"retraction_hop": { "value": "2" },
@ -163,12 +169,6 @@
"wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" },
"wall_thickness": { "value": "1" },
"wall_material_flow": {"value": "90"},
"meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" },
"meshfix_maximum_deviation": { "value": "layer_height / 4" },
"optimize_wall_printing_order": { "value": "True" },
"retraction_combing": { "value": "no_outer_surfaces" },
"initial_layer_line_width_factor": { "value": "120" },
"zig_zaggify_infill": { "value": "gradual_infill_steps == 0" },
"build_volume_temperature": { "maximum_value": 50 }
}
}