From d25907098020d60ddff91ad1abf6ab253d97cc36 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 31 May 2018 00:06:26 -0500 Subject: [PATCH] Clean up trailing spaces from vim, etc. --- Marlin/src/lcd/dogm/status_screen_DOGM.h | 2 +- Marlin/src/module/planner.h | 1 - Marlin/src/pins/pins.h | 21 ++++++++++----------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.h b/Marlin/src/lcd/dogm/status_screen_DOGM.h index f8842ba559..869b470f94 100644 --- a/Marlin/src/lcd/dogm/status_screen_DOGM.h +++ b/Marlin/src/lcd/dogm/status_screen_DOGM.h @@ -164,7 +164,7 @@ inline void lcd_implementation_status_message(const bool blink) { lcd_put_wchar('.'); if (--chars) { // Print a second copy of the message - lcd_put_u8str_max(lcd_status_message, LCD_PIXEL_WIDTH - ((rlen+2) * DOG_CHAR_WIDTH)); + lcd_put_u8str_max(lcd_status_message, LCD_PIXEL_WIDTH - ((rlen+2) * DOG_CHAR_WIDTH)); } } } diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h index 77b0d5a09c..b8ab952c10 100644 --- a/Marlin/src/module/planner.h +++ b/Marlin/src/module/planner.h @@ -179,7 +179,6 @@ class Planner { static uint16_t cleaning_buffer_counter; // A counter to disable queuing of blocks static uint8_t delay_before_delivering, // This counter delays delivery of blocks when queue becomes empty to allow the opportunity of merging blocks block_buffer_planned; // Index of the optimally planned block - #if ENABLED(DISTINCT_E_FACTORS) static uint8_t last_extruder; // Respond to extruder change diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index bb8b20f57a..e69e33b264 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -296,8 +296,7 @@ #include "pins_COHESION3D_REMIX.h" // LPC176x env:LPC1768 env:LPC1768_debug_and_upload #elif MB(COHESION3D_MINI) #include "pins_COHESION3D_MINI.h" // LPC176x env:LPC1768 env:LPC1768_debug_and_upload - - + // // Other 32-bit Boards // @@ -353,8 +352,8 @@ // // STM32 ARM Cortex-M3 -// - +// + #elif MB(STM32F1R) #include "pins_STM32F1R.h" // STM32F1 env:STM32F1 #elif MB(STM3R_MINI) @@ -363,13 +362,13 @@ #include "pins_MALYAN_M200.h" // STM32F1 env:malyanm200 #elif MB(CHITU3D) #include "pins_CHITU3D.h" // STM32F1 env:STM32F1 - + // // STM32 ARM Cortex-M4F -// +// #elif MB(TEENSY35_36) - #include "pins_TEENSY35_36.h" // TEENSY35_36 env:teensy35 + #include "pins_TEENSY35_36.h" // TEENSY35_36 env:teensy35 #elif MB(BEAST) #include "pins_BEAST.h" // STM32F4 env:STM32F4 #elif MB(STM32F4) @@ -377,11 +376,11 @@ // // ARM Cortex M7 -// - +// + #elif MB(THE_BORG) - #include "pins_THE_BORG.h" // STM32F7 env:STM32F7 - + #include "pins_THE_BORG.h" // STM32F7 env:STM32F7 + #else #error "Unknown MOTHERBOARD value set in Configuration.h" #endif