Merge branch 'main' into NP-208_various_fixes

conandata.yml

@@ -1,9 +1,9 @@
-version: "5.8.0-beta.1"
+version: "5.9.0-alpha.0"
 requirements:
   - "scripta/0.1.0@ultimaker/testing"
 requirements_arcus:
   - "arcus/5.3.1"
 requirements_plugins:
   - "curaengine_grpc_definitions/0.2.1"
 requirements_cura_resources:
-  - "cura_resources/5.8.0-beta.1"
+  - "cura_resources/(latest)@ultimaker/testing"

include/TreeSupportSettings.h

@@ -54,7 +54,7 @@ struct TreeSupportSettings
                                                                                                                              : RestPreference::BUILDPLATE)
         , xy_distance(mesh_group_settings.get<coord_t>("support_xy_distance"))
         , bp_radius(mesh_group_settings.get<coord_t>("support_tree_bp_diameter") / 2)
-        , diameter_scale_bp_radius(std::min(sin(0.7) * static_cast<double>(layer_height / branch_radius), 1.0 / (branch_radius / (support_line_width / 2.0))))
+        , diameter_scale_bp_radius(std::min(sin(0.7) * static_cast<double>(layer_height) / static_cast<double>(branch_radius), 1.0 / (branch_radius / (support_line_width / 2.0))))
         , // Either 40° or as much as possible so that 2 lines will overlap by at least 50%, whichever is smaller.
         support_overrides(mesh_group_settings.get<SupportDistPriority>("support_xy_overrides_z"))
         , xy_min_distance(support_overrides == SupportDistPriority::Z_OVERRIDES_XY ? mesh_group_settings.get<coord_t>("support_xy_distance_overhang") : xy_distance)

src/LayerPlan.cpp

@@ -2006,6 +2006,15 @@ void LayerPlan::writeGCode(GCodeExport& gcode)
         constexpr bool wait = false;
         gcode.writeBedTemperatureCommand(mesh_group_settings.get<Temperature>("material_bed_temperature"), wait);
     }
+    if (mesh_group_settings.get<size_t>("build_volume_fan_nr") != 0)
+    {
+        // The machine has a build volume fan.
+        if (layer_nr_ == mesh_group_settings.get<size_t>("build_fan_full_layer"))
+        {
+            gcode.writeSpecificFanCommand(100, mesh_group_settings.get<size_t>("build_volume_fan_nr"));
+        }
+    }
+
 
     gcode.setZ(z_);