Merge branch 'main' into CURA-10831

# Conflicts: # src/gcodeExport.cpp
Ultimaker · Dec 8, 2023 · 950be2e · 950be2e
2 parents 6427083 + 92cea65
commit 950be2e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/gcodeExport.cpp b/src/gcodeExport.cpp
@@ -1429,7 +1429,9 @@ void GCodeExport::writeFanCommand(double speed)
     else if (speed > 0)
     {
         const bool should_scale_zero_to_one = Application::getInstance().current_slice_->scene.settings.get<bool>("machine_scale_fan_speed_zero_to_one");
-        *output_stream_ << "M106 S" << PrecisionedDouble{ static_cast<uint8_t>((should_scale_zero_to_one ? 2u : 1u)), (should_scale_zero_to_one ? speed : speed * 255) / 100 };
+        *output_stream_ << "M106 S"
+                        << PrecisionedDouble{ (should_scale_zero_to_one ? static_cast<uint8_t>(2) : static_cast<uint8_t>(1)),
+                                              (should_scale_zero_to_one ? speed : speed * 255) / 100 };
         if (fan_number_)
         {
             *output_stream_ << " P" << fan_number_;