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

Merge branch 'master' into feature_pause_at_height_optional_parking

Browse source 
# Conflicts:
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
This commit is contained in:
fieldOfView 2021-08-16 12:19:49 +02:00
commit e4a04c186f
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
View file

@ -505,7 +505,7 @@ class PauseAtHeight(Script):
# Move the head back # Move the head back
if park_enabled: if park_enabled:
if current_z < 15: if current_z < 15:
prepend_gcode += self.putValue(G = 1, Z = current_z + 1, F = 300) + "\n" prepend_gcode += self.putValue(G = 1, Z = current_z, F = 300) + "\n"
prepend_gcode += self.putValue(G = 1, X = x, Y = y, F = 9000) + "\n" prepend_gcode += self.putValue(G = 1, X = x, Y = y, F = 9000) + "\n"
prepend_gcode += self.putValue(G = 1, Z = current_z, F = 300) + " ; move back down to resume height\n" prepend_gcode += self.putValue(G = 1, Z = current_z, F = 300) + " ; move back down to resume height\n"

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

@ -44,7 +44,7 @@
"material_diameter": { "default_value": 1.75 }, "material_diameter": { "default_value": 1.75 },
"acceleration_print": { "value": 1800 }, "acceleration_print": { "value": 1500 },
"acceleration_travel": { "value": 3000 }, "acceleration_travel": { "value": 3000 },
"acceleration_travel_layer_0": { "value": "acceleration_travel" }, "acceleration_travel_layer_0": { "value": "acceleration_travel" },
"acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },

5
resources/definitions/anycubic_i3_mega_x.def.json
View file

@ -12,6 +12,9 @@
"machine_name": { "default_value": "Anycubic i3 Mega X" }, "machine_name": { "default_value": "Anycubic i3 Mega X" },
"machine_width": { "default_value": 300 }, "machine_width": { "default_value": 300 },
"machine_height": { "default_value": 305 }, "machine_height": { "default_value": 305 },
"machine_depth": { "default_value": 300 } "machine_depth": { "default_value": 300 },
"acceleration_print": { "value": 400 },
"acceleration_travel": { "value": 400 }
} }
} }