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

Make prime tower automatic formula the default for all FDM printers

Browse Source 
The Custom FDM Printer had wrong positions by default as well.
This commit is contained in:
Ghostkeeper 2017-07-21 11:14:17 +02:00
parent ed91bf816f
commit 66c97259c2
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/definitions/cartesio.def.json
View File

@ -48,8 +48,8 @@
"material_bed_temp_wait": { "default_value": false }, "material_bed_temp_wait": { "default_value": false },
"prime_tower_enable": { "default_value": true }, "prime_tower_enable": { "default_value": true },
"prime_tower_wall_thickness": { "resolve": 0.7 }, "prime_tower_wall_thickness": { "resolve": 0.7 },
"prime_tower_position_x": { "default_value": 50 }, "prime_tower_position_x": { "value": "50" },
"prime_tower_position_y": { "default_value": 150 }, "prime_tower_position_y": { "value": "150" },
"prime_blob_enable": { "default_value": false }, "prime_blob_enable": { "default_value": false },
"machine_max_feedrate_z": { "default_value": 20 }, "machine_max_feedrate_z": { "default_value": 20 },
"machine_disallowed_areas": { "default_value": [ "machine_disallowed_areas": { "default_value": [

2
resources/definitions/fdmprinter.def.json
View File

@ -4462,6 +4462,7 @@
"unit": "mm", "unit": "mm",
"enabled": "resolveOrValue('prime_tower_enable')", "enabled": "resolveOrValue('prime_tower_enable')",
"default_value": 200, "default_value": 200,
"value": "machine_width - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) - 1",
"maximum_value": "machine_width / 2 if machine_center_is_zero else machine_width", "maximum_value": "machine_width / 2 if machine_center_is_zero else machine_width",
"minimum_value": "resolveOrValue('prime_tower_size') - machine_width / 2 if machine_center_is_zero else resolveOrValue('prime_tower_size')", "minimum_value": "resolveOrValue('prime_tower_size') - machine_width / 2 if machine_center_is_zero else resolveOrValue('prime_tower_size')",
"settable_per_mesh": false, "settable_per_mesh": false,
@ -4475,6 +4476,7 @@
"unit": "mm", "unit": "mm",
"enabled": "resolveOrValue('prime_tower_enable')", "enabled": "resolveOrValue('prime_tower_enable')",
"default_value": 200, "default_value": 200,
"value": "machine_depth - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) - 1",
"maximum_value": "machine_depth / 2 - resolveOrValue('prime_tower_size') if machine_center_is_zero else machine_depth - resolveOrValue('prime_tower_size')", "maximum_value": "machine_depth / 2 - resolveOrValue('prime_tower_size') if machine_center_is_zero else machine_depth - resolveOrValue('prime_tower_size')",
"minimum_value": "machine_depth / -2 if machine_center_is_zero else 0", "minimum_value": "machine_depth / -2 if machine_center_is_zero else 0",
"settable_per_mesh": false, "settable_per_mesh": false,

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

@ -72,10 +72,10 @@
"enabled": true "enabled": true
}, },
"prime_tower_position_x": { "prime_tower_position_x": {
"default_value": 185 "value": "185"
}, },
"prime_tower_position_y": { "prime_tower_position_y": {
"default_value": 160 "value": "160"
}, },
"material_diameter": { "material_diameter": {
"default_value": 1.75 "default_value": 1.75

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

@ -72,10 +72,10 @@
"enabled": false "enabled": false
}, },
"prime_tower_position_x": { "prime_tower_position_x": {
"default_value": 185 "value": "185"
}, },
"prime_tower_position_y": { "prime_tower_position_y": {
"default_value": 160 "value": "160"
}, },
"material_diameter": { "material_diameter": {
"default_value": 1.75 "default_value": 1.75

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

@ -69,8 +69,7 @@
"extruder_prime_pos_abs": { "default_value": true }, "extruder_prime_pos_abs": { "default_value": true },
"machine_start_gcode": { "default_value": "" }, "machine_start_gcode": { "default_value": "" },
"machine_end_gcode": { "default_value": "" }, "machine_end_gcode": { "default_value": "" },
"prime_tower_position_x": { "default_value": 170 }, "prime_tower_position_x": { "value": "machine_depth - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) - 30" },
"prime_tower_position_y": { "value": "machine_depth - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) - 1" },
"prime_tower_wipe_enabled": { "default_value": false }, "prime_tower_wipe_enabled": { "default_value": false },
"prime_blob_enable": { "enabled": true }, "prime_blob_enable": { "enabled": true },

4
resources/definitions/ultimaker_original_dual.def.json
View File

@ -73,10 +73,10 @@
"default_value": 2 "default_value": 2
}, },
"prime_tower_position_x": { "prime_tower_position_x": {
"default_value": 195 "value": "195"
}, },
"prime_tower_position_y": { "prime_tower_position_y": {
"default_value": 149 "value": "149"
} }
} }
} }