diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 98dbf206bd..9f956edbea 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -255,8 +255,7 @@ class BuildVolume(SceneNode): skirt_line_count = profile.getSettingValue("skirt_line_count") skirt_size = skirt_distance + (skirt_line_count * profile.getSettingValue("skirt_line_width")) elif adhesion_type == "brim": - brim_line_count = profile.getSettingValue("brim_line_count") - skirt_size = brim_line_count * profile.getSettingValue("skirt_line_width") + skirt_size = profile.getSettingValue("brim_width") elif adhesion_type == "raft": skirt_size = profile.getSettingValue("raft_margin") @@ -270,4 +269,4 @@ class BuildVolume(SceneNode): def _clamp(self, value, min_value, max_value): return max(min(value, max_value), min_value) - _skirt_settings = ["adhesion_type", "skirt_gap", "skirt_line_count", "skirt_line_width", "brim_line_count", "raft_margin", "draft_shield_enabled", "draft_shield_dist", "xy_offset"] + _skirt_settings = ["adhesion_type", "skirt_gap", "skirt_line_count", "skirt_line_width", "brim_width", "brim_line_count", "raft_margin", "draft_shield_enabled", "draft_shield_dist", "xy_offset"] diff --git a/resources/machines/RigidBot.json b/resources/machines/RigidBot.json index ccdd6475f8..8e3793bec6 100644 --- a/resources/machines/RigidBot.json +++ b/resources/machines/RigidBot.json @@ -28,7 +28,7 @@ "machine_gcode_flavor": { "default": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { - "default": ";Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_density}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Filament cost: {filament_cost}\n;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line\n;M109 S{print_temperature} ;Uncomment to add your own temperature line\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM205 X8 ;X/Y Jerk settings\nG1 Z15.0 F{travel_speed} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E7 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{travel_speed}\n;Put printing message on LCD screen\nM117 Rigibot Printing..." + "default": ";Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Filament cost: {filament_cost}\n;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line\n;M109 S{print_temperature} ;Uncomment to add your own temperature line\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM205 X8 ;X/Y Jerk settings\nG1 Z15.0 F{travel_speed} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E7 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{travel_speed}\n;Put printing message on LCD screen\nM117 Rigibot Printing..." }, "machine_end_gcode": { "default": ";End GCode\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+10 E-1 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y230 F3000 ;move Y so the head is out of the way and Plate is moved forward\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}" diff --git a/resources/machines/RigidBotBig.json b/resources/machines/RigidBotBig.json index b3f3f29728..6518444db0 100644 --- a/resources/machines/RigidBotBig.json +++ b/resources/machines/RigidBotBig.json @@ -26,7 +26,7 @@ "machine_gcode_flavor": { "default": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { - "default": ";Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_density}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Filament cost: {filament_cost}\n;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line\n;M109 S{print_temperature} ;Uncomment to add your own temperature line\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM205 X8 ;X/Y Jerk settings\nG1 Z15.0 F{travel_speed} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E7 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{travel_speed}\n;Put printing message on LCD screen\nM117 Rigibot Printing..." + "default": ";Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Filament cost: {filament_cost}\n;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line\n;M109 S{print_temperature} ;Uncomment to add your own temperature line\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM205 X8 ;X/Y Jerk settings\nG1 Z15.0 F{travel_speed} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E7 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{travel_speed}\n;Put printing message on LCD screen\nM117 Rigibot Printing..." }, "machine_end_gcode": { "default": ";End GCode\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+10 E-1 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y230 F3000 ;move Y so the head is out of the way and Plate is moved forward\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}" diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 1cff22e46c..ba5f991884 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -701,7 +701,7 @@ "retraction_count_max": { "label": "Maximum Retraction Count", "description": "This setting limits the number of retractions occurring within the Minimum Extrusion Distance Window. Further retractions within this window will be ignored. This avoids retracting repeatedly on the same piece of filament, as that can flatten the filament and cause grinding issues.", - "default": 4, + "default": 8, "type": "int", "visible": false, "inherit": false, @@ -925,12 +925,12 @@ }, "coasting_min_volume": { "label": "Minimal Volume Before Coasting", - "description": "The least volume an extrusion path should have to coast the full amount. For smaller extrusion paths, less pressure has been built up in the bowden tube and so the coasted volume is scaled linearly.", + "description": "The least volume an extrusion path should have to coast the full amount. For smaller extrusion paths, less pressure has been built up in the bowden tube and so the coasted volume is scaled linearly. This value should always be larger than the Coasting Volume.", "unit": "mm³", "type": "float", "default": 0.8, + "min_value": "0", "visible": false, - "inherit": false, "enabled": "coasting_enable" }, "coasting_speed": { @@ -1244,7 +1244,7 @@ "enabled": "support_roof_enable" }, "support_use_towers": { - "label": "Use towers.", + "label": "Use towers", "description": "Use specialized towers to support tiny overhang areas. These towers have a larger diameter than the region they support. Near the overhang the towers' diameter decreases, forming a roof.", "type": "boolean", "default": true, @@ -1369,12 +1369,23 @@ "default": 250, "enabled": "adhesion_type == \"skirt\"" }, - "brim_line_count": { - "label": "Brim Line Count", - "description": "The number of lines used for a brim: More lines means a larger brim which sticks better, but this also makes your effective print area smaller.", - "type": "int", - "default": 10, - "enabled": "adhesion_type == \"brim\"" + "brim_width": { + "label": "Brim Width", + "description": "The distance from the model to the end of the brim. A larger brim sticks better to the build platform, but also makes your effective print area smaller.", + "type": "float", + "unit": "mm", + "default": 5.0, + "enabled": "adhesion_type == \"brim\"", + "children": { + "brim_line_count": { + "label": "Brim Line Count", + "description": "The number of lines used for a brim. More lines means a larger brim which sticks better to the build plate, but this also makes your effective print area smaller.", + "type": "int", + "default": 13, + "inherit_function": "math.ceil(parent_value / skirt_line_width)", + "enabled": "adhesion_type == \"brim\"" + } + } }, "raft_margin": { "label": "Raft Extra Margin", diff --git a/resources/profiles/High+Quality.cfg b/resources/profiles/High+Quality.cfg index 2eb80dfb61..7561444bbe 100644 --- a/resources/profiles/High+Quality.cfg +++ b/resources/profiles/High+Quality.cfg @@ -3,4 +3,6 @@ version = 1 name = High Quality [settings] -layer_height = 0.08 +layer_height = 0.06 +infill_sparse_density = 12 + diff --git a/resources/profiles/Low+Quality.cfg b/resources/profiles/Low+Quality.cfg index 159ac5144c..96aec9674a 100644 --- a/resources/profiles/Low+Quality.cfg +++ b/resources/profiles/Low+Quality.cfg @@ -4,3 +4,12 @@ name = Low Quality [settings] layer_height = 0.15 +shell_thickness = 0.8 +infill_sparse_density = 8 +speed_print = 60 +speed_wall_0 = 40 +speed_wall_x = 50 +speed_topbottom = 30 +speed_travel = 150 +speed_layer_0 = 30 +skirt_speed = 30 diff --git a/resources/profiles/Normal+Quality.cfg b/resources/profiles/Normal+Quality.cfg index c6a82b4910..0ad945af31 100644 --- a/resources/profiles/Normal+Quality.cfg +++ b/resources/profiles/Normal+Quality.cfg @@ -3,4 +3,3 @@ version = 1 name = Normal Quality [settings] -layer_height = 0.1 diff --git a/resources/profiles/Ulti+Quality.cfg b/resources/profiles/Ulti+Quality.cfg index 86feb14e73..589e2cfeee 100644 --- a/resources/profiles/Ulti+Quality.cfg +++ b/resources/profiles/Ulti+Quality.cfg @@ -3,4 +3,7 @@ version = 1 name = Ulti Quality [settings] -layer_height = 0.06 +layer_height = 0.04 +shell_thickness = 1.6 +top_bottom_thickness = 0.8 +infill_sparse_density = 14 diff --git a/resources/qml/ProfileSetup.qml b/resources/qml/ProfileSetup.qml index d9869d62b7..f9a78ca2df 100644 --- a/resources/qml/ProfileSetup.qml +++ b/resources/qml/ProfileSetup.qml @@ -48,14 +48,14 @@ Item{ id: variantsSelectionMenu Instantiator { - model: UM.MachineVariantsModel { } + model: UM.MachineVariantsModel { id: variantsModel } MenuItem { text: model.name; checkable: true; checked: model.active; exclusiveGroup: variantSelectionMenuGroup; - onTriggered: UM.MachineManager.setActiveMachineVariant(model.getItem(index).name) + onTriggered: UM.MachineManager.setActiveMachineVariant(variantsModel.getItem(index).name) } onObjectAdded: variantsSelectionMenu.insertItem(index, object) onObjectRemoved: variantsSelectionMenu.removeItem(object) @@ -148,4 +148,4 @@ Item{ // } } } -} \ No newline at end of file +}