Merge pull request #7027 from thinkyhead/bf_water_is_wet

Followup to German language update

Marlin/G26_Mesh_Validation_Tool.cpp

@@ -684,7 +684,8 @@
           SERIAL_PROTOCOLLNPGM("?Prime length must be specified when not using an LCD.");
           return UBL_ERR;
         #endif
-      } else {
+      }
+      else {
         g26_prime_flag++;
         g26_prime_length = parser.value_linear_units();
         if (!WITHIN(g26_prime_length, 0.0, 25.0)) {
@@ -727,7 +728,9 @@
       if (!parser.seen('R')) {
         SERIAL_PROTOCOLLNPGM("?(R)epeat must be specified when not using an LCD.");
         return UBL_ERR;
-      } else g26_repeats = parser.has_value() ? parser.value_int() : GRID_MAX_POINTS + 1;
+      }
+      else
+        g26_repeats = parser.has_value() ? parser.value_int() : GRID_MAX_POINTS + 1;
     #endif
     if (g26_repeats < 1) {
       SERIAL_PROTOCOLLNPGM("?(R)epeat value not plausible; must be at least 1.");

Marlin/MarlinSerial.cpp

@@ -320,7 +320,8 @@
           // space for us.
           if (TEST(M_UCSRxA, M_UDREx))
             _tx_udr_empty_irq();
-        } else {
+        }
+        else {
           // nop, the interrupt handler will free up space for us
         }
       }

Marlin/language_de.h

@@ -221,7 +221,6 @@
 #define MSG_CASE_LIGHT                      _UxGT("Beleuchtung")
 #define MSG_CASE_LIGHT_BRIGHTNESS           _UxGT("Helligkeit")
 
-#if ENABLED(AUTO_BED_LEVELING_UBL)
 #define MSG_UBL_DOING_G29                 _UxGT("G29 UBL läuft!")
 #define MSG_UBL_UNHOMED                   _UxGT("Erst XYZ homen")
 #define MSG_UBL_TOOLS                     _UxGT("UBL Tools")
@@ -278,7 +277,6 @@
 #define MSG_UBL_SAVE_ERROR                _UxGT("ERR:UBL speichern")
 #define MSG_UBL_RESTORE_ERROR             _UxGT("ERR:UBL wiederherst.")
 #define MSG_UBL_Z_OFFSET_STOPPED          _UxGT("Z-Versatz angehalten")
-#endif // AUTO_BED_LEVELING_UBL
 
 #if LCD_WIDTH >= 20
   #define MSG_INFO_PRINT_COUNT              _UxGT("Gesamte Drucke")

Marlin/nozzle.cpp

@@ -136,7 +136,8 @@ void Nozzle::circle(
       // Order of movement is pretty darn important here
       do_blocking_move_to_xy(start.x, start.y);
       do_blocking_move_to_z(start.z);
-    } else {
+    }
+    else {
       do_blocking_move_to_z(start.z);
       do_blocking_move_to_xy(start.x, start.y);
     }
@@ -160,7 +161,8 @@ void Nozzle::circle(
         // As above order is important
         do_blocking_move_to_z(initial.z);
         do_blocking_move_to_xy(initial.x, initial.y);
-      } else {
+      }
+      else {
         do_blocking_move_to_xy(initial.x, initial.y);
         do_blocking_move_to_z(initial.z);
       }

Marlin/planner.cpp

@@ -470,14 +470,9 @@ void Planner::check_axes_activity() {
           if (fan_kick_end[f] == 0) { \
             fan_kick_end[f] = ms + FAN_KICKSTART_TIME; \
             tail_fan_speed[f] = 255; \
-          } else { \
+          } else if (PENDING(ms, fan_kick_end[f])) \
-            if (PENDING(ms, fan_kick_end[f])) { \
             tail_fan_speed[f] = 255; \
-            } \
+        } else fan_kick_end[f] = 0
-          } \
-        } else { \
-          fan_kick_end[f] = 0; \
-        }
 
       #if HAS_FAN0
         KICKSTART_FAN(0);