From 02b17886c947c155d4add6be83b50ba2993e8e6f Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 2 Oct 2020 17:04:23 -0500 Subject: [PATCH] Replace tabs with spaces --- Marlin/src/lcd/TFTGLCD/ultralcd_TFTGLCD.cpp | 4 +- Marlin/src/lcd/tft/tft_color.h | 60 ++++++++++----------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Marlin/src/lcd/TFTGLCD/ultralcd_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/ultralcd_TFTGLCD.cpp index c9a5b2525a..fd1b6858e8 100644 --- a/Marlin/src/lcd/TFTGLCD/ultralcd_TFTGLCD.cpp +++ b/Marlin/src/lcd/TFTGLCD/ultralcd_TFTGLCD.cpp @@ -113,8 +113,8 @@ enum Commands { // based on Smoothieware commands // Other commands... 0xE0 thru 0xFF GET_LCD_ROW = 0xE0, // for detect panel GET_LCD_COL, // reserved for compatibility with Smoothieware, not used - LCD_PUT, // write one line to LCD - INIT_SCREEN = 0xFE, // clear panel buffer + LCD_PUT, // write one line to LCD + INIT_SCREEN = 0xFE, // clear panel buffer }; static unsigned char framebuffer[FBSIZE]; diff --git a/Marlin/src/lcd/tft/tft_color.h b/Marlin/src/lcd/tft/tft_color.h index 8e380b366b..a72a079f6e 100644 --- a/Marlin/src/lcd/tft/tft_color.h +++ b/Marlin/src/lcd/tft/tft_color.h @@ -73,104 +73,104 @@ #define COLOR_BACKGROUND 0x20AC // #1E156E #endif #ifndef COLOR_SELECTION_BG - #define COLOR_SELECTION_BG 0x9930 // #992380 + #define COLOR_SELECTION_BG 0x9930 // #992380 #endif #ifndef COLOR_WEBSITE_URL - #define COLOR_WEBSITE_URL 0x03B7 + #define COLOR_WEBSITE_URL 0x03B7 #endif #ifndef COLOR_INACTIVE - #define COLOR_INACTIVE COLOR_GREY + #define COLOR_INACTIVE COLOR_GREY #endif #ifndef COLOR_COLD - #define COLOR_COLD COLOR_AQUA + #define COLOR_COLD COLOR_AQUA #endif #ifndef COLOR_HOTEND - #define COLOR_HOTEND COLOR_SCARLET + #define COLOR_HOTEND COLOR_SCARLET #endif #ifndef COLOR_HEATED_BED - #define COLOR_HEATED_BED COLOR_DARK_ORANGE + #define COLOR_HEATED_BED COLOR_DARK_ORANGE #endif #ifndef COLOR_CHAMBER - #define COLOR_CHAMBER COLOR_DARK_ORANGE + #define COLOR_CHAMBER COLOR_DARK_ORANGE #endif #ifndef COLOR_FAN - #define COLOR_FAN COLOR_AQUA + #define COLOR_FAN COLOR_AQUA #endif #ifndef COLOR_AXIS_HOMED - #define COLOR_AXIS_HOMED COLOR_WHITE + #define COLOR_AXIS_HOMED COLOR_WHITE #endif #ifndef COLOR_AXIS_NOT_HOMED - #define COLOR_AXIS_NOT_HOMED COLOR_YELLOW + #define COLOR_AXIS_NOT_HOMED COLOR_YELLOW #endif #ifndef COLOR_RATE_100 - #define COLOR_RATE_100 COLOR_VIVID_GREEN + #define COLOR_RATE_100 COLOR_VIVID_GREEN #endif #ifndef COLOR_RATE_ALTERED - #define COLOR_RATE_ALTERED COLOR_YELLOW + #define COLOR_RATE_ALTERED COLOR_YELLOW #endif #ifndef COLOR_PRINT_TIME - #define COLOR_PRINT_TIME COLOR_AQUA + #define COLOR_PRINT_TIME COLOR_AQUA #endif #ifndef COLOR_PROGRESS_FRAME - #define COLOR_PROGRESS_FRAME COLOR_WHITE + #define COLOR_PROGRESS_FRAME COLOR_WHITE #endif #ifndef COLOR_PROGRESS_BAR - #define COLOR_PROGRESS_BAR COLOR_BLUE + #define COLOR_PROGRESS_BAR COLOR_BLUE #endif #ifndef COLOR_PROGRESS_BG - #define COLOR_PROGRESS_BG COLOR_BLACK + #define COLOR_PROGRESS_BG COLOR_BLACK #endif #ifndef COLOR_STATUS_MESSAGE - #define COLOR_STATUS_MESSAGE COLOR_YELLOW + #define COLOR_STATUS_MESSAGE COLOR_YELLOW #endif #ifndef COLOR_CONTROL_ENABLED - #define COLOR_CONTROL_ENABLED COLOR_WHITE + #define COLOR_CONTROL_ENABLED COLOR_WHITE #endif #ifndef COLOR_CONTROL_DISABLED - #define COLOR_CONTROL_DISABLED COLOR_GREY + #define COLOR_CONTROL_DISABLED COLOR_GREY #endif #ifndef COLOR_CONTROL_CANCEL - #define COLOR_CONTROL_CANCEL COLOR_SCARLET + #define COLOR_CONTROL_CANCEL COLOR_SCARLET #endif #ifndef COLOR_CONTROL_CONFIRM - #define COLOR_CONTROL_CONFIRM COLOR_VIVID_GREEN + #define COLOR_CONTROL_CONFIRM COLOR_VIVID_GREEN #endif #ifndef COLOR_BUSY - #define COLOR_BUSY COLOR_SILVER + #define COLOR_BUSY COLOR_SILVER #endif #ifndef COLOR_MENU_TEXT - #define COLOR_MENU_TEXT COLOR_YELLOW + #define COLOR_MENU_TEXT COLOR_YELLOW #endif #ifndef COLOR_MENU_VALUE - #define COLOR_MENU_VALUE COLOR_WHITE + #define COLOR_MENU_VALUE COLOR_WHITE #endif #ifndef COLOR_SLIDER - #define COLOR_SLIDER COLOR_WHITE + #define COLOR_SLIDER COLOR_WHITE #endif #ifndef COLOR_SLIDER_INACTIVE - #define COLOR_SLIDER_INACTIVE COLOR_GREY + #define COLOR_SLIDER_INACTIVE COLOR_GREY #endif #ifndef COLOR_UBL - #define COLOR_UBL COLOR_WHITE + #define COLOR_UBL COLOR_WHITE #endif #ifndef COLOR_TOUCH_CALIBRATION - #define COLOR_TOUCH_CALIBRATION COLOR_WHITE + #define COLOR_TOUCH_CALIBRATION COLOR_WHITE #endif #ifndef COLOR_KILL_SCREEN_BG - #define COLOR_KILL_SCREEN_BG COLOR_MAROON + #define COLOR_KILL_SCREEN_BG COLOR_MAROON #endif #ifndef COLOR_KILL_SCREEN_TEXT - #define COLOR_KILL_SCREEN_TEXT COLOR_WHITE + #define COLOR_KILL_SCREEN_TEXT COLOR_WHITE #endif