More parity with 1.1.x, plus whitespace

Marlin/src/config/examples/MakerParts/Configuration.h

@@ -56,7 +56,7 @@
 //  If we could use 1.65A as motor current, then 3000 mm/s^2 as acceleration
 // if perfectly achievable. Using 1A as motor current, 2400 mm/s^2 acceleration
 // is perfectly possible without losing any steps
-// On A4988 drivers, maximum current can be calculated as I_TripMax= Vref/(8*Rs) 
+// On A4988 drivers, maximum current can be calculated as I_TripMax= Vref/(8*Rs)
 //
 
 //===========================================================================
@@ -548,14 +548,14 @@
  * Override with M92
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
  */
-#define DEFAULT_AXIS_STEPS_PER_UNIT   {80,80,4000,97}  //motor bajos con varilla3200 y altos 1600 default steps per unit for Ultimaker
+#define DEFAULT_AXIS_STEPS_PER_UNIT     { 80, 80, 4000, 97 }
 
 /**
  * Default Max Feed Rate (mm/s)
  * Override with M203
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
  */
-#define DEFAULT_MAX_FEEDRATE            { 300, 300, 2, 30 } /* For 300mm/s printing */ 
+#define DEFAULT_MAX_FEEDRATE            { 300, 300, 2, 30 } // For 300mm/s printing
 
 /**
  * Default Max Acceleration (change/s) change = mm/s

Marlin/src/lcd/dogm/HAL_LCD_class_defines.h

@@ -65,8 +65,8 @@ class U8GLIB_ST7920_128X64_RRD : public U8GLIB
 extern u8g_dev_t u8g_dev_st7920_128x64_custom_sw_spi;
 class U8GLIB_ST7920_128X64_CUSTOM_SW_SPI : public U8GLIB {
   public:
-    U8GLIB_ST7920_128X64_CUSTOM_SW_SPI() 
+    U8GLIB_ST7920_128X64_CUSTOM_SW_SPI()
-    : U8GLIB(&u8g_dev_st7920_128x64_custom_sw_spi) 
+    : U8GLIB(&u8g_dev_st7920_128x64_custom_sw_spi)
     {  }
 };
 

Marlin/src/lcd/ultralcd.cpp

@@ -2559,10 +2559,8 @@ void kill_screen(const char* lcd_msg) {
               lcd_bed_leveling
             #endif
           );
-    #else
+    #elif PLANNER_LEVELING && DISABLED(PROBE_MANUALLY)
-      #if PLANNER_LEVELING
+      MENU_ITEM(gcode, MSG_BED_LEVELING, PSTR("G28\nG29"));
-        MENU_ITEM(gcode, MSG_BED_LEVELING, PSTR("G28\nG29"));
-      #endif
     #endif
 
     #if ENABLED(LEVEL_BED_CORNERS) && DISABLED(LCD_BED_LEVELING)

Marlin/src/lcd/ultralcd_impl_DOGM.h

@@ -172,7 +172,7 @@
 #elif ENABLED(U8GLIB_ST7920) && defined(__arm__)
   // RepRap Discount Full Graphics Smart Controller on an ARM target
     U8GLIB_ST7920_128X64_CUSTOM_SW_SPI u8g;
-    
+
 #elif ENABLED(U8GLIB_ST7920)
   // RepRap Discount Full Graphics Smart Controller
     //U8GLIB_ST7920_128X64_4X u8g(LCD_PINS_RS); // 2 stripes, HW SPI (shared with SD card, on AVR does not use standard LCD adapter)
@@ -180,7 +180,7 @@
     U8GLIB_ST7920_128X64_RRD u8g(LCD_PINS_D4, LCD_PINS_ENABLE, LCD_PINS_RS); // Number of stripes can be adjusted in ultralcd_st7920_u8glib_rrd.h with PAGE_HEIGHT
                                                                            // AVR version ignores these pin settings
                                                                            // HAL version uses these pin settings
-    
+
 #elif ENABLED(CARTESIO_UI)
   // The CartesioUI display
     //U8GLIB_DOGM128_2X u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0); // 4 stripes

Marlin/src/module/planner.cpp

@@ -1100,7 +1100,7 @@ void Planner::_buffer_steps(const int32_t (&target)[XYZE], float fr_mm_s, const
   float max_stepper_speed = 0, min_axis_accel_ratio = 1; // ratio < 1 means acceleration ramp needed
   LOOP_XYZE(i) {
     const float cs = FABS((current_speed[i] = delta_mm[i] * inverse_secs));
-    if (cs >  max_jerk[i]) 
+    if (cs > max_jerk[i])
       NOMORE(min_axis_accel_ratio, max_jerk[i] / cs);
     NOLESS(max_stepper_speed, cs);
     #if ENABLED(DISTINCT_E_FACTORS)

Marlin/src/module/temperature.cpp

@@ -803,7 +803,7 @@ void Temperature::manage_heater() {
       meas_shift_index = filwidth_delay_index[0] - meas_delay_cm;
       if (meas_shift_index < 0) meas_shift_index += MAX_MEASUREMENT_DELAY + 1;  //loop around buffer if needed
       meas_shift_index = constrain(meas_shift_index, 0, MAX_MEASUREMENT_DELAY);
-      calculate_volumetric_for_width_sensor(measurement_delay[meas_shift_index])
+      planner.calculate_volumetric_for_width_sensor(measurement_delay[meas_shift_index]);
     }
   #endif // FILAMENT_WIDTH_SENSOR
 

Marlin/src/pins/pins_MIGHTYBOARD_REVE.h

@@ -124,7 +124,7 @@
 //
 // Temperature Sensors
 //
-#define TEMP_BED_PIN        15   // K7 - 69 / ADC15 - 15 
+#define TEMP_BED_PIN        15   // K7 - 69 / ADC15 - 15
 
 // SPI for Max6675 or Max31855 Thermocouple
 // Uses a separate SPI bus

Marlin/src/pins/pins_RAMPS.h

@@ -122,7 +122,7 @@
 #if ENABLED(HAVE_TMC2208)
   /*
    * TMC2208 stepper drivers
-   * 
+   *
    * Hardware serial communication ports.
    * If undefined software serial is used according to the pins below
    */