mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-17 11:05:55 +08:00
Keep Ironing settings together while in experimental
This commit is contained in:
parent
7f1dfcf433
commit
7019d57db2
@ -2023,21 +2023,6 @@
|
|||||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||||
"settable_per_mesh": true
|
"settable_per_mesh": true
|
||||||
},
|
},
|
||||||
"speed_ironing":
|
|
||||||
{
|
|
||||||
"label": "Ironing Speed",
|
|
||||||
"description": "The speed at which to pass over the top surface.",
|
|
||||||
"type": "float",
|
|
||||||
"unit": "mm/s",
|
|
||||||
"default_value": 20.0,
|
|
||||||
"value": "speed_topbottom * 20 / 30",
|
|
||||||
"minimum_value": "0.001",
|
|
||||||
"maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
|
|
||||||
"maximum_value_warning": "100",
|
|
||||||
"enabled": "ironing_enabled",
|
|
||||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
|
||||||
"settable_per_mesh": true
|
|
||||||
},
|
|
||||||
"speed_support":
|
"speed_support":
|
||||||
{
|
{
|
||||||
"label": "Support Speed",
|
"label": "Support Speed",
|
||||||
@ -2364,21 +2349,6 @@
|
|||||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||||
"settable_per_mesh": true
|
"settable_per_mesh": true
|
||||||
},
|
},
|
||||||
"acceleration_ironing":
|
|
||||||
{
|
|
||||||
"label": "Ironing Acceleration",
|
|
||||||
"description": "The acceleration with which ironing is performed.",
|
|
||||||
"unit": "mm/s²",
|
|
||||||
"type": "float",
|
|
||||||
"minimum_value": "0.1",
|
|
||||||
"minimum_value_warning": "100",
|
|
||||||
"maximum_value_warning": "10000",
|
|
||||||
"default_value": 3000,
|
|
||||||
"value": "acceleration_topbottom",
|
|
||||||
"enabled": "resolveOrValue('acceleration_enabled') and ironing_enabled",
|
|
||||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
|
||||||
"settable_per_mesh": true
|
|
||||||
},
|
|
||||||
"acceleration_support":
|
"acceleration_support":
|
||||||
{
|
{
|
||||||
"label": "Support Acceleration",
|
"label": "Support Acceleration",
|
||||||
@ -2652,20 +2622,6 @@
|
|||||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||||
"settable_per_mesh": true
|
"settable_per_mesh": true
|
||||||
},
|
},
|
||||||
"jerk_ironing":
|
|
||||||
{
|
|
||||||
"label": "Ironing Jerk",
|
|
||||||
"description": "The maximum instantaneous velocity change while performing ironing.",
|
|
||||||
"unit": "mm/s",
|
|
||||||
"type": "float",
|
|
||||||
"minimum_value": "0.1",
|
|
||||||
"maximum_value_warning": "50",
|
|
||||||
"default_value": 20,
|
|
||||||
"value": "jerk_topbottom",
|
|
||||||
"enabled": "resolveOrValue('jerk_enabled') and ironing_enabled",
|
|
||||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
|
||||||
"settable_per_mesh": true
|
|
||||||
},
|
|
||||||
"jerk_support":
|
"jerk_support":
|
||||||
{
|
{
|
||||||
"label": "Support Jerk",
|
"label": "Support Jerk",
|
||||||
@ -5574,6 +5530,50 @@
|
|||||||
"enabled": "ironing_enabled",
|
"enabled": "ironing_enabled",
|
||||||
"limit_to_extruder": "top_bottom_extruder_nr",
|
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||||
"settable_per_mesh": true
|
"settable_per_mesh": true
|
||||||
|
},
|
||||||
|
"speed_ironing":
|
||||||
|
{
|
||||||
|
"label": "Ironing Speed",
|
||||||
|
"description": "The speed at which to pass over the top surface.",
|
||||||
|
"type": "float",
|
||||||
|
"unit": "mm/s",
|
||||||
|
"default_value": 20.0,
|
||||||
|
"value": "speed_topbottom * 20 / 30",
|
||||||
|
"minimum_value": "0.001",
|
||||||
|
"maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
|
||||||
|
"maximum_value_warning": "100",
|
||||||
|
"enabled": "ironing_enabled",
|
||||||
|
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||||
|
"settable_per_mesh": true
|
||||||
|
},
|
||||||
|
"acceleration_ironing":
|
||||||
|
{
|
||||||
|
"label": "Ironing Acceleration",
|
||||||
|
"description": "The acceleration with which ironing is performed.",
|
||||||
|
"unit": "mm/s²",
|
||||||
|
"type": "float",
|
||||||
|
"minimum_value": "0.1",
|
||||||
|
"minimum_value_warning": "100",
|
||||||
|
"maximum_value_warning": "10000",
|
||||||
|
"default_value": 3000,
|
||||||
|
"value": "acceleration_topbottom",
|
||||||
|
"enabled": "resolveOrValue('acceleration_enabled') and ironing_enabled",
|
||||||
|
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||||
|
"settable_per_mesh": true
|
||||||
|
},
|
||||||
|
"jerk_ironing":
|
||||||
|
{
|
||||||
|
"label": "Ironing Jerk",
|
||||||
|
"description": "The maximum instantaneous velocity change while performing ironing.",
|
||||||
|
"unit": "mm/s",
|
||||||
|
"type": "float",
|
||||||
|
"minimum_value": "0.1",
|
||||||
|
"maximum_value_warning": "50",
|
||||||
|
"default_value": 20,
|
||||||
|
"value": "jerk_topbottom",
|
||||||
|
"enabled": "resolveOrValue('jerk_enabled') and ironing_enabled",
|
||||||
|
"limit_to_extruder": "top_bottom_extruder_nr",
|
||||||
|
"settable_per_mesh": true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user