Merge pull request #7027 from thinkyhead/bf_water_is_wet

Followup to German language update

Marlin/G26_Mesh_Validation_Tool.cpp

           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)) {
       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

           // 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

 #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")
-  #define MSG_UBL_LEVEL_BED                 _UxGT("Unified Bed Leveling")
-  #define MSG_UBL_MANUAL_MESH               _UxGT("Netz manuell erst.")
-  #define MSG_UBL_BC_INSERT                 _UxGT("Unterlegen & messen")
-  #define MSG_UBL_BC_INSERT2                _UxGT("Messen")
-  #define MSG_UBL_BC_REMOVE                 _UxGT("Entfernen & messen")
-  #define MSG_UBL_MOVING_TO_NEXT            _UxGT("Nächster Punkt...")
-  #define MSG_UBL_ACTIVATE_MESH             _UxGT("UBL aktivieren")
-  #define MSG_UBL_DEACTIVATE_MESH           _UxGT("UBL deaktivieren")
-  #define MSG_UBL_SET_BED_TEMP              _UxGT("Bett Temp.")
-  #define MSG_UBL_CUSTOM_BED_TEMP           MSG_UBL_SET_BED_TEMP
-  #define MSG_UBL_SET_HOTEND_TEMP           _UxGT("Hotend Temp.")
-  #define MSG_UBL_CUSTOM_HOTEND_TEMP        MSG_UBL_SET_HOTEND_TEMP
-  #define MSG_UBL_EDIT_CUSTOM_MESH          _UxGT("Eigenes Netz bearb.")
-  #define MSG_UBL_FINE_TUNE_MESH            _UxGT("Feineinstellung...")
-  #define MSG_UBL_DONE_EDITING_MESH         _UxGT("Bearbeitung beendet")
-  #define MSG_UBL_BUILD_CUSTOM_MESH         _UxGT("Eigenes Netz erst.")
-  #define MSG_UBL_BUILD_MESH_MENU           _UxGT("Netz erstellen")
-  #define MSG_UBL_BUILD_PLA_MESH            _UxGT("Netz erstellen PLA")
-  #define MSG_UBL_BUILD_ABS_MESH            _UxGT("Netz erstellen ABS")
-  #define MSG_UBL_BUILD_COLD_MESH           _UxGT("Netz erstellen kalt")
-  #define MSG_UBL_MESH_HEIGHT_ADJUST        _UxGT("Netz Höhe einst.")
-  #define MSG_UBL_MESH_HEIGHT_AMOUNT        _UxGT("Height Amount")
-  #define MSG_UBL_VALIDATE_MESH_MENU        _UxGT("Netz validieren")
-  #define MSG_UBL_VALIDATE_PLA_MESH         _UxGT("Netz validieren PLA")
-  #define MSG_UBL_VALIDATE_ABS_MESH         _UxGT("Netz validieren ABS")
-  #define MSG_UBL_VALIDATE_CUSTOM_MESH      _UxGT("Eig. Netz validieren")
-  #define MSG_UBL_CONTINUE_MESH             _UxGT("Netzerst. forts.")
-  #define MSG_UBL_MESH_LEVELING             _UxGT("Netz Nivellierung")
-  #define MSG_UBL_3POINT_MESH_LEVELING      _UxGT("3-Punkt Nivellierung")
-  #define MSG_UBL_GRID_MESH_LEVELING        _UxGT("Gitternetz Nivell.")
-  #define MSG_UBL_MESH_LEVEL                _UxGT("Netz nivellieren")
-  #define MSG_UBL_SIDE_POINTS               _UxGT("Eckpunkte")
-  #define MSG_UBL_MAP_TYPE                  _UxGT("Kartentyp")
-  #define MSG_UBL_OUTPUT_MAP                _UxGT("Karte ausgeben")
-  #define MSG_UBL_OUTPUT_MAP_HOST           _UxGT("Ausgabe für Host")
-  #define MSG_UBL_OUTPUT_MAP_CSV            _UxGT("Ausgabe für CSV")
-  #define MSG_UBL_INFO_UBL                  _UxGT("UBL Info ausgeben")
-  #define MSG_UBL_EDIT_MESH_MENU            _UxGT("Netz bearbeiten")
-  #define MSG_UBL_FILLIN_AMOUNT             _UxGT("Menge an Fill-in")
-  #define MSG_UBL_MANUAL_FILLIN             _UxGT("Manuelles Fill-in")
-  #define MSG_UBL_SMART_FILLIN              _UxGT("Kluges Fill-in")
-  #define MSG_UBL_FILLIN_MESH               _UxGT("Fill-in Netz")
-  #define MSG_UBL_INVALIDATE_ALL            _UxGT("Alles annullieren")
-  #define MSG_UBL_INVALIDATE_CLOSEST        _UxGT("Nächstlieg. ann.")
-  #define MSG_UBL_FINE_TUNE_ALL             _UxGT("Feineinstellung Alle")
-  #define MSG_UBL_FINE_TUNE_CLOSEST         _UxGT("Feineinst. Nächstl.")
-  #define MSG_UBL_STORAGE_MESH_MENU         _UxGT("Netz Speicherplatz")
-  #define MSG_UBL_STORAGE_SLOT              _UxGT("Memory Slot")
-  #define MSG_UBL_LOAD_MESH                 _UxGT("Bett Netz laden")
-  #define MSG_UBL_SAVE_MESH                 _UxGT("Bett Netz speichern")
-  #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
+#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")
+#define MSG_UBL_LEVEL_BED                 _UxGT("Unified Bed Leveling")
+#define MSG_UBL_MANUAL_MESH               _UxGT("Netz manuell erst.")
+#define MSG_UBL_BC_INSERT                 _UxGT("Unterlegen & messen")
+#define MSG_UBL_BC_INSERT2                _UxGT("Messen")
+#define MSG_UBL_BC_REMOVE                 _UxGT("Entfernen & messen")
+#define MSG_UBL_MOVING_TO_NEXT            _UxGT("Nächster Punkt...")
+#define MSG_UBL_ACTIVATE_MESH             _UxGT("UBL aktivieren")
+#define MSG_UBL_DEACTIVATE_MESH           _UxGT("UBL deaktivieren")
+#define MSG_UBL_SET_BED_TEMP              _UxGT("Bett Temp.")
+#define MSG_UBL_CUSTOM_BED_TEMP           MSG_UBL_SET_BED_TEMP
+#define MSG_UBL_SET_HOTEND_TEMP           _UxGT("Hotend Temp.")
+#define MSG_UBL_CUSTOM_HOTEND_TEMP        MSG_UBL_SET_HOTEND_TEMP
+#define MSG_UBL_EDIT_CUSTOM_MESH          _UxGT("Eigenes Netz bearb.")
+#define MSG_UBL_FINE_TUNE_MESH            _UxGT("Feineinstellung...")
+#define MSG_UBL_DONE_EDITING_MESH         _UxGT("Bearbeitung beendet")
+#define MSG_UBL_BUILD_CUSTOM_MESH         _UxGT("Eigenes Netz erst.")
+#define MSG_UBL_BUILD_MESH_MENU           _UxGT("Netz erstellen")
+#define MSG_UBL_BUILD_PLA_MESH            _UxGT("Netz erstellen PLA")
+#define MSG_UBL_BUILD_ABS_MESH            _UxGT("Netz erstellen ABS")
+#define MSG_UBL_BUILD_COLD_MESH           _UxGT("Netz erstellen kalt")
+#define MSG_UBL_MESH_HEIGHT_ADJUST        _UxGT("Netz Höhe einst.")
+#define MSG_UBL_MESH_HEIGHT_AMOUNT        _UxGT("Height Amount")
+#define MSG_UBL_VALIDATE_MESH_MENU        _UxGT("Netz validieren")
+#define MSG_UBL_VALIDATE_PLA_MESH         _UxGT("Netz validieren PLA")
+#define MSG_UBL_VALIDATE_ABS_MESH         _UxGT("Netz validieren ABS")
+#define MSG_UBL_VALIDATE_CUSTOM_MESH      _UxGT("Eig. Netz validieren")
+#define MSG_UBL_CONTINUE_MESH             _UxGT("Netzerst. forts.")
+#define MSG_UBL_MESH_LEVELING             _UxGT("Netz Nivellierung")
+#define MSG_UBL_3POINT_MESH_LEVELING      _UxGT("3-Punkt Nivellierung")
+#define MSG_UBL_GRID_MESH_LEVELING        _UxGT("Gitternetz Nivell.")
+#define MSG_UBL_MESH_LEVEL                _UxGT("Netz nivellieren")
+#define MSG_UBL_SIDE_POINTS               _UxGT("Eckpunkte")
+#define MSG_UBL_MAP_TYPE                  _UxGT("Kartentyp")
+#define MSG_UBL_OUTPUT_MAP                _UxGT("Karte ausgeben")
+#define MSG_UBL_OUTPUT_MAP_HOST           _UxGT("Ausgabe für Host")
+#define MSG_UBL_OUTPUT_MAP_CSV            _UxGT("Ausgabe für CSV")
+#define MSG_UBL_INFO_UBL                  _UxGT("UBL Info ausgeben")
+#define MSG_UBL_EDIT_MESH_MENU            _UxGT("Netz bearbeiten")
+#define MSG_UBL_FILLIN_AMOUNT             _UxGT("Menge an Fill-in")
+#define MSG_UBL_MANUAL_FILLIN             _UxGT("Manuelles Fill-in")
+#define MSG_UBL_SMART_FILLIN              _UxGT("Kluges Fill-in")
+#define MSG_UBL_FILLIN_MESH               _UxGT("Fill-in Netz")
+#define MSG_UBL_INVALIDATE_ALL            _UxGT("Alles annullieren")
+#define MSG_UBL_INVALIDATE_CLOSEST        _UxGT("Nächstlieg. ann.")
+#define MSG_UBL_FINE_TUNE_ALL             _UxGT("Feineinstellung Alle")
+#define MSG_UBL_FINE_TUNE_CLOSEST         _UxGT("Feineinst. Nächstl.")
+#define MSG_UBL_STORAGE_MESH_MENU         _UxGT("Netz Speicherplatz")
+#define MSG_UBL_STORAGE_SLOT              _UxGT("Memory Slot")
+#define MSG_UBL_LOAD_MESH                 _UxGT("Bett Netz laden")
+#define MSG_UBL_SAVE_MESH                 _UxGT("Bett Netz speichern")
+#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")
 
 #if LCD_WIDTH >= 20
   #define MSG_INFO_PRINT_COUNT              _UxGT("Gesamte Drucke")

Marlin/nozzle.cpp

       // 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);
     }
         // 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

           if (fan_kick_end[f] == 0) { \
             fan_kick_end[f] = ms + FAN_KICKSTART_TIME; \
             tail_fan_speed[f] = 255; \
-          } else { \
-            if (PENDING(ms, fan_kick_end[f])) { \
-              tail_fan_speed[f] = 255; \
-            } \
-          } \
-        } else { \
-          fan_kick_end[f] = 0; \
-        }
+          } else if (PENDING(ms, fan_kick_end[f])) \
+            tail_fan_speed[f] = 255; \
+        } else fan_kick_end[f] = 0
 
       #if HAS_FAN0
         KICKSTART_FAN(0);