3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2026-03-05 18:14:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge branch 'main' into Z_Hop_Update

Browse source
This commit is contained in:
HellAholic 2026-01-15 20:25:16 +01:00 • committed by GitHub
commit 5bb23b77cf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
60 changed files with 6344 additions and 6436 deletions
Download patch file Download diff file Expand all files Collapse all files

24
plugins/PostProcessingPlugin/scripts/AddCoolingProfile.py
View file

@ -47,9 +47,7 @@ class AddCoolingProfile(Script):
"description": "If you have 2 or more instances of 'Advanced Cooling Fan Control' running (to cool a portion of a print differently), then you must uncheck this box or the followup instances will remove all the lines inserted by the first instance. Pay attention to the Start and Stop layers. Regardless of this setting: The script always removes M106 lines starting with the lowest layer number (when 'By Layer') or the starting layer number (when 'By Feature'). If you want to keep the M106 lines that Cura inserted up to the point where this post-processor will start making insertions, then un-check the box.",
"type": "bool",
"enabled": true,
"value": true,
"default_value": true,
"read_only": true
"default_value": true
},
"feature_fan_start_layer":
{
@ -280,13 +278,21 @@ class AddCoolingProfile(Script):
"unit": "% ",
"enabled": "fan_enable_raft"
},
"enable_off_fan_speed_enable":
{
"label": "Hidden setting",
"description": "For dual extruder printers, this enables 'enable_off_fan_speed'.",
"type": "bool",
"default_value": false,
"enabled": false
},
"enable_off_fan_speed":
{
"label": "Enable 'Off speed' of the idle fan",
"description": "For machines with independent layer cooling fans. Leaving a fan running while the other nozzle is printing can help with oozing. You can pick the speed % for the idle nozzle layer cooling fan to hold at.",
"type": "bool",
"default_value": false,
"enabled": "enable_off_fan_speed_enable and self.extruder_count > 1"
"enabled": "enable_off_fan_speed_enable"
},
"off_fan_speed":
{
@ -297,15 +303,7 @@ class AddCoolingProfile(Script):
"minimum_value": 0,
"maximum_value": 100,
"unit": "% ",
"enabled": "enable_off_fan_speed_enable and enable_off_fan_speed and self.extruder_count > 1"
},
"enable_off_fan_speed_enable":
{
"label": "Hidden setting",
"description": "For dual extruder printers, this enables 'enable_off_fan_speed'.",
"type": "bool",
"default_value": false,
"enabled": false
"enabled": "enable_off_fan_speed_enable and enable_off_fan_speed"
},
"bv_fan_speed_control_enable":
{

12
plugins/PostProcessingPlugin/scripts/ColorMix.py
View file

@ -50,7 +50,7 @@ class ColorMix(Script):
"description": "Select model to apply to for print one at a time print sequence. 0 = everything",
"type": "int",
"default_value": 0,
"minimum_value": "0"
"minimum_value": 0
},
"start_height":
{
@ -58,7 +58,7 @@ class ColorMix(Script):
"description": "Value to start at (mm or layer)",
"type": "float",
"default_value": 0,
"minimum_value": "0"
"minimum_value": 0
},
"behavior":
{
@ -74,7 +74,7 @@ class ColorMix(Script):
"description": "Value to stop at (mm or layer)",
"type": "float",
"default_value": 0,
"minimum_value": "0",
"minimum_value": 0,
"minimum_value_warning": "start_height",
"enabled": "behavior == 'blend_value'"
},
@ -84,7 +84,7 @@ class ColorMix(Script):
"description": "First extruder percentage 0-100",
"type": "float",
"default_value": 100,
"minimum_value": "0",
"minimum_value": 0,
"minimum_value_warning": "0",
"maximum_value_warning": "100"
},
@ -94,7 +94,7 @@ class ColorMix(Script):
"description": "First extruder percentage 0-100 to finish blend",
"type": "float",
"default_value": 0,
"minimum_value": "0",
"minimum_value": 0,
"minimum_value_warning": "0",
"maximum_value_warning": "100",
"enabled": "behavior == 'blend_value'"
@ -112,7 +112,7 @@ class ColorMix(Script):
m = re.search("^[+-]?[0-9]*", subPart)
else:
#the minus at the beginning allows for negative values, e.g. for delta printers
m = re.search("^[-]?[0-9]*\.?[0-9]*", subPart)
m = re.search("^[-]?[0-9]*\\.?[0-9]*", subPart)
if m == None:
return default
try:

4
plugins/PostProcessingPlugin/scripts/CreateThumbnail.py
View file

@ -70,7 +70,7 @@ class CreateThumbnail(Script):
"unit": "px",
"type": "int",
"default_value": 32,
"minimum_value": "0",
"minimum_value": 0,
"minimum_value_warning": "12",
"maximum_value_warning": "800"
},
@ -81,7 +81,7 @@ class CreateThumbnail(Script):
"unit": "px",
"type": "int",
"default_value": 32,
"minimum_value": "0",
"minimum_value": 0,
"minimum_value_warning": "12",
"maximum_value_warning": "600"
},

1
plugins/PostProcessingPlugin/scripts/DisplayInfoOnLCD.py
View file

@ -200,6 +200,7 @@ class DisplayInfoOnLCD(Script):
"label": "Enable Countdown to Pauses",
"description": "If print sequence is 'one_at_a_time' this is false. This setting is always hidden.",
"type": "bool",
"default_value": false,
"value": false,
"enabled": false
},

10
plugins/PostProcessingPlugin/scripts/FilamentChange.py
View file

@ -101,7 +101,6 @@ class FilamentChange(Script):
"type": "enum",
"options": {"U": "Marlin (M600 U)", "L": "Reprap (M600 L)"},
"default_value": "U",
"value": "\\\"L\\\" if machine_gcode_flavor==\\\"RepRap (RepRap)\\\" else \\\"U\\\"",
"enabled": "enabled and not firmware_config"
},
"machine_gcode_flavor":
@ -122,7 +121,7 @@ class FilamentChange(Script):
"Repetier": "Repetier"
},
"default_value": "RepRap (Marlin/Sprinter)",
"enabled": "false"
"enabled": false
},
"enable_before_macro":
{
@ -172,6 +171,13 @@ class FilamentChange(Script):
for key in ["machine_gcode_flavor"]:
self._instance.setProperty(key, "value", global_container_stack.getProperty(key, "value"))
# Set retract method based on gcode flavor
gcode_flavor = global_container_stack.getProperty("machine_gcode_flavor", "value")
if gcode_flavor == "RepRap (RepRap)":
self._instance.setProperty("retract_method", "value", "L")
else:
self._instance.setProperty("retract_method", "value", "U")
def execute(self, data: List[str]):
"""Inserts the filament change g-code at specific layer numbers.

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

@ -39,7 +39,7 @@ class PauseAtHeight(Script):
"unit": "mm",
"type": "float",
"default_value": 5.0,
"minimum_value": "0",
"minimum_value": 0,
"minimum_value_warning": "0.27",
"enabled": "pause_at == 'height'"
},
@ -49,7 +49,7 @@ class PauseAtHeight(Script):
"description": "Enter the Number of the LAST layer you want to finish prior to the pause. Note that 0 is the first layer printed.",
"type": "int",
"value": "math.floor((pause_height - 0.27) / 0.1) + 1",
"minimum_value": "0",
"minimum_value": 0,
"minimum_value_warning": "1",
"enabled": "pause_at == 'layer_no'"
},
@ -76,7 +76,7 @@ class PauseAtHeight(Script):
"description": "After this time steppers are going to disarm (meaning that they can easily lose their positions). Set this to 0 if you don't want to set any duration and disarm immediately.",
"type": "int",
"value": "0",
"minimum_value": "0",
"minimum_value": 0,
"minimum_value_warning": "0",
"maximum_value_warning": "1800",
"unit": "s",