From 2813ecc48dff05bc76c3e0efb02ff3994cd80479 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Thu, 5 Oct 2023 12:44:49 +0200 Subject: [PATCH 1/2] Add inner/outer walls roofing configuration settings CURA-11110 --- resources/definitions/fdmprinter.def.json | 106 ++++++++++++++++++++++ resources/setting_visibility/expert.cfg | 8 ++ 2 files changed, 114 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index ec07872e197..338447842c0 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2861,6 +2861,32 @@ "maximum_value_warning": "150", "limit_to_extruder": "wall_x_extruder_nr", "settable_per_mesh": true + }, + "wall_0_material_flow_roofing": { + "label": "Top Surface Outer Wall Flow", + "description": "Flow compensation on the top surface outermost wall line.", + "unit": "%", + "type": "float", + "default_value": 100, + "value": "wall_0_material_flow", + "minimum_value": "0.0001", + "minimum_value_warning": "50", + "maximum_value_warning": "150", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_mesh": true + }, + "wall_x_material_flow_roofing": { + "label": "Top Surface Inner Wall(s) Flow", + "description": "Flow compensation on top surface wall lines for all wall lines except the outermost one.", + "unit": "%", + "type": "float", + "default_value": 100, + "value": "wall_x_material_flow", + "minimum_value": "0.0001", + "minimum_value_warning": "50", + "maximum_value_warning": "150", + "limit_to_extruder": "wall_x_extruder_nr", + "settable_per_mesh": true } } }, @@ -3166,6 +3192,32 @@ "value": "speed_wall * 2", "limit_to_extruder": "wall_x_extruder_nr", "settable_per_mesh": true + }, + "speed_wall_0_roofing": { + "label": "Top Surface Outer Wall Speed", + "description": "The speed at which the top surface outermost walls are printed.", + "unit": "mm/s", + "type": "float", + "minimum_value": "0.1", + "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)", + "maximum_value_warning": "150", + "default_value": 30, + "value": "speed_wall_0", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_mesh": true + }, + "speed_wall_x_roofing": { + "label": "Top Surface Inner Wall Speed", + "description": "The speed at which the top surface inner walls are printed.", + "unit": "mm/s", + "type": "float", + "minimum_value": "0.1", + "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)", + "maximum_value_warning": "150", + "default_value": 60, + "value": "speed_wall_x", + "limit_to_extruder": "wall_x_extruder_nr", + "settable_per_mesh": true } } }, @@ -3509,6 +3561,34 @@ "enabled": "resolveOrValue('acceleration_enabled')", "limit_to_extruder": "wall_x_extruder_nr", "settable_per_mesh": true + }, + "acceleration_wall_0_roofing": { + "label": "Top Surface Outer Wall Acceleration", + "description": "The acceleration with which the top surface outermost walls are printed.", + "unit": "mm/s\u00b2", + "type": "float", + "minimum_value": "0.1", + "minimum_value_warning": "100", + "maximum_value_warning": "10000", + "default_value": 3000, + "value": "acceleration_wall_0", + "enabled": "resolveOrValue('acceleration_enabled')", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_mesh": true + }, + "acceleration_wall_x_roofing": { + "label": "Top Surface Inner Wall Acceleration", + "description": "The acceleration with which the top surface inner walls are printed.", + "unit": "mm/s\u00b2", + "type": "float", + "minimum_value": "0.1", + "minimum_value_warning": "100", + "maximum_value_warning": "10000", + "default_value": 3000, + "value": "acceleration_wall_x", + "enabled": "resolveOrValue('acceleration_enabled')", + "limit_to_extruder": "wall_x_extruder_nr", + "settable_per_mesh": true } } }, @@ -3808,6 +3888,32 @@ "enabled": "resolveOrValue('jerk_enabled')", "limit_to_extruder": "wall_x_extruder_nr", "settable_per_mesh": true + }, + "jerk_wall_0_roofing": { + "label": "Top Surface Outer Wall Jerk", + "description": "The maximum instantaneous velocity change with which the top surface outermost walls are printed.", + "unit": "mm/s", + "type": "float", + "minimum_value": "0", + "maximum_value_warning": "50", + "default_value": 20, + "value": "jerk_wall_0", + "enabled": "resolveOrValue('jerk_enabled')", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_mesh": true + }, + "jerk_wall_x_roofing": { + "label": "Top Surface Inner Wall Jerk", + "description": "The maximum instantaneous velocity change with which the top surface inner walls are printed.", + "unit": "mm/s", + "type": "float", + "minimum_value": "0", + "maximum_value_warning": "50", + "default_value": 20, + "value": "jerk_wall_x", + "enabled": "resolveOrValue('jerk_enabled')", + "limit_to_extruder": "wall_x_extruder_nr", + "settable_per_mesh": true } } }, diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index abb4b81dba9..ff502fd80af 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -129,6 +129,8 @@ material_flow wall_material_flow wall_0_material_flow wall_x_material_flow +wall_0_material_flow_roofing +wall_x_material_flow_roofing skin_material_flow roofing_material_flow infill_material_flow @@ -152,6 +154,8 @@ speed_infill speed_wall speed_wall_0 speed_wall_x +speed_wall_0_roofing +speed_wall_x_roofing speed_roofing speed_topbottom speed_support @@ -171,6 +175,8 @@ acceleration_infill acceleration_wall acceleration_wall_0 acceleration_wall_x +acceleration_wall_0_roofing +acceleration_wall_x_roofing acceleration_roofing acceleration_topbottom acceleration_support @@ -188,6 +194,8 @@ jerk_infill jerk_wall jerk_wall_0 jerk_wall_x +jerk_wall_0_roofing +jerk_wall_x_roofing jerk_roofing jerk_topbottom jerk_support From 81fbd252078013ff30db12e491595d6d9dac345f Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Thu, 5 Oct 2023 10:45:55 +0000 Subject: [PATCH 2/2] Applied printer-linter format --- resources/definitions/fdmprinter.def.json | 24 +++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 338447842c0..863cd07183f 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2862,7 +2862,8 @@ "limit_to_extruder": "wall_x_extruder_nr", "settable_per_mesh": true }, - "wall_0_material_flow_roofing": { + "wall_0_material_flow_roofing": + { "label": "Top Surface Outer Wall Flow", "description": "Flow compensation on the top surface outermost wall line.", "unit": "%", @@ -2875,7 +2876,8 @@ "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, - "wall_x_material_flow_roofing": { + "wall_x_material_flow_roofing": + { "label": "Top Surface Inner Wall(s) Flow", "description": "Flow compensation on top surface wall lines for all wall lines except the outermost one.", "unit": "%", @@ -3193,7 +3195,8 @@ "limit_to_extruder": "wall_x_extruder_nr", "settable_per_mesh": true }, - "speed_wall_0_roofing": { + "speed_wall_0_roofing": + { "label": "Top Surface Outer Wall Speed", "description": "The speed at which the top surface outermost walls are printed.", "unit": "mm/s", @@ -3206,7 +3209,8 @@ "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, - "speed_wall_x_roofing": { + "speed_wall_x_roofing": + { "label": "Top Surface Inner Wall Speed", "description": "The speed at which the top surface inner walls are printed.", "unit": "mm/s", @@ -3562,7 +3566,8 @@ "limit_to_extruder": "wall_x_extruder_nr", "settable_per_mesh": true }, - "acceleration_wall_0_roofing": { + "acceleration_wall_0_roofing": + { "label": "Top Surface Outer Wall Acceleration", "description": "The acceleration with which the top surface outermost walls are printed.", "unit": "mm/s\u00b2", @@ -3576,7 +3581,8 @@ "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, - "acceleration_wall_x_roofing": { + "acceleration_wall_x_roofing": + { "label": "Top Surface Inner Wall Acceleration", "description": "The acceleration with which the top surface inner walls are printed.", "unit": "mm/s\u00b2", @@ -3889,7 +3895,8 @@ "limit_to_extruder": "wall_x_extruder_nr", "settable_per_mesh": true }, - "jerk_wall_0_roofing": { + "jerk_wall_0_roofing": + { "label": "Top Surface Outer Wall Jerk", "description": "The maximum instantaneous velocity change with which the top surface outermost walls are printed.", "unit": "mm/s", @@ -3902,7 +3909,8 @@ "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, - "jerk_wall_x_roofing": { + "jerk_wall_x_roofing": + { "label": "Top Surface Inner Wall Jerk", "description": "The maximum instantaneous velocity change with which the top surface inner walls are printed.", "unit": "mm/s",