zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Replace tabs with spaces

Browse source
This commit is contained in:
Scott Lahteine 2020-10-02 17:04:23 -05:00
parent 348570fd68
commit d83baf8925
2 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/lcd/TFTGLCD/ultralcd_TFTGLCD.cpp
View file

@ -113,8 +113,8 @@ enum Commands { // based on Smoothieware commands
// Other commands... 0xE0 thru 0xFF // Other commands... 0xE0 thru 0xFF
GET_LCD_ROW = 0xE0, // for detect panel GET_LCD_ROW = 0xE0, // for detect panel
GET_LCD_COL, // reserved for compatibility with Smoothieware, not used GET_LCD_COL, // reserved for compatibility with Smoothieware, not used
LCD_PUT, // write one line to LCD LCD_PUT, // write one line to LCD
INIT_SCREEN = 0xFE, // clear panel buffer INIT_SCREEN = 0xFE, // clear panel buffer
}; };
static unsigned char framebuffer[FBSIZE]; static unsigned char framebuffer[FBSIZE];

60
Marlin/src/lcd/tft/tft_color.h
View file

@ -73,104 +73,104 @@
#define COLOR_BACKGROUND 0x20AC // #1E156E #define COLOR_BACKGROUND 0x20AC // #1E156E
#endif #endif
#ifndef COLOR_SELECTION_BG #ifndef COLOR_SELECTION_BG
#define COLOR_SELECTION_BG 0x9930 // #992380 #define COLOR_SELECTION_BG 0x9930 // #992380
#endif #endif
#ifndef COLOR_WEBSITE_URL #ifndef COLOR_WEBSITE_URL
#define COLOR_WEBSITE_URL 0x03B7 #define COLOR_WEBSITE_URL 0x03B7
#endif #endif
#ifndef COLOR_INACTIVE #ifndef COLOR_INACTIVE
#define COLOR_INACTIVE COLOR_GREY #define COLOR_INACTIVE COLOR_GREY
#endif #endif
#ifndef COLOR_COLD #ifndef COLOR_COLD
#define COLOR_COLD COLOR_AQUA #define COLOR_COLD COLOR_AQUA
#endif #endif
#ifndef COLOR_HOTEND #ifndef COLOR_HOTEND
#define COLOR_HOTEND COLOR_SCARLET #define COLOR_HOTEND COLOR_SCARLET
#endif #endif
#ifndef COLOR_HEATED_BED #ifndef COLOR_HEATED_BED
#define COLOR_HEATED_BED COLOR_DARK_ORANGE #define COLOR_HEATED_BED COLOR_DARK_ORANGE
#endif #endif
#ifndef COLOR_CHAMBER #ifndef COLOR_CHAMBER
#define COLOR_CHAMBER COLOR_DARK_ORANGE #define COLOR_CHAMBER COLOR_DARK_ORANGE
#endif #endif
#ifndef COLOR_FAN #ifndef COLOR_FAN
#define COLOR_FAN COLOR_AQUA #define COLOR_FAN COLOR_AQUA
#endif #endif
#ifndef COLOR_AXIS_HOMED #ifndef COLOR_AXIS_HOMED
#define COLOR_AXIS_HOMED COLOR_WHITE #define COLOR_AXIS_HOMED COLOR_WHITE
#endif #endif
#ifndef COLOR_AXIS_NOT_HOMED #ifndef COLOR_AXIS_NOT_HOMED
#define COLOR_AXIS_NOT_HOMED COLOR_YELLOW #define COLOR_AXIS_NOT_HOMED COLOR_YELLOW
#endif #endif
#ifndef COLOR_RATE_100 #ifndef COLOR_RATE_100
#define COLOR_RATE_100 COLOR_VIVID_GREEN #define COLOR_RATE_100 COLOR_VIVID_GREEN
#endif #endif
#ifndef COLOR_RATE_ALTERED #ifndef COLOR_RATE_ALTERED
#define COLOR_RATE_ALTERED COLOR_YELLOW #define COLOR_RATE_ALTERED COLOR_YELLOW
#endif #endif
#ifndef COLOR_PRINT_TIME #ifndef COLOR_PRINT_TIME
#define COLOR_PRINT_TIME COLOR_AQUA #define COLOR_PRINT_TIME COLOR_AQUA
#endif #endif
#ifndef COLOR_PROGRESS_FRAME #ifndef COLOR_PROGRESS_FRAME
#define COLOR_PROGRESS_FRAME COLOR_WHITE #define COLOR_PROGRESS_FRAME COLOR_WHITE
#endif #endif
#ifndef COLOR_PROGRESS_BAR #ifndef COLOR_PROGRESS_BAR
#define COLOR_PROGRESS_BAR COLOR_BLUE #define COLOR_PROGRESS_BAR COLOR_BLUE
#endif #endif
#ifndef COLOR_PROGRESS_BG #ifndef COLOR_PROGRESS_BG
#define COLOR_PROGRESS_BG COLOR_BLACK #define COLOR_PROGRESS_BG COLOR_BLACK
#endif #endif
#ifndef COLOR_STATUS_MESSAGE #ifndef COLOR_STATUS_MESSAGE
#define COLOR_STATUS_MESSAGE COLOR_YELLOW #define COLOR_STATUS_MESSAGE COLOR_YELLOW
#endif #endif
#ifndef COLOR_CONTROL_ENABLED #ifndef COLOR_CONTROL_ENABLED
#define COLOR_CONTROL_ENABLED COLOR_WHITE #define COLOR_CONTROL_ENABLED COLOR_WHITE
#endif #endif
#ifndef COLOR_CONTROL_DISABLED #ifndef COLOR_CONTROL_DISABLED
#define COLOR_CONTROL_DISABLED COLOR_GREY #define COLOR_CONTROL_DISABLED COLOR_GREY
#endif #endif
#ifndef COLOR_CONTROL_CANCEL #ifndef COLOR_CONTROL_CANCEL
#define COLOR_CONTROL_CANCEL COLOR_SCARLET #define COLOR_CONTROL_CANCEL COLOR_SCARLET
#endif #endif
#ifndef COLOR_CONTROL_CONFIRM #ifndef COLOR_CONTROL_CONFIRM
#define COLOR_CONTROL_CONFIRM COLOR_VIVID_GREEN #define COLOR_CONTROL_CONFIRM COLOR_VIVID_GREEN
#endif #endif
#ifndef COLOR_BUSY #ifndef COLOR_BUSY
#define COLOR_BUSY COLOR_SILVER #define COLOR_BUSY COLOR_SILVER
#endif #endif
#ifndef COLOR_MENU_TEXT #ifndef COLOR_MENU_TEXT
#define COLOR_MENU_TEXT COLOR_YELLOW #define COLOR_MENU_TEXT COLOR_YELLOW
#endif #endif
#ifndef COLOR_MENU_VALUE #ifndef COLOR_MENU_VALUE
#define COLOR_MENU_VALUE COLOR_WHITE #define COLOR_MENU_VALUE COLOR_WHITE
#endif #endif
#ifndef COLOR_SLIDER #ifndef COLOR_SLIDER
#define COLOR_SLIDER COLOR_WHITE #define COLOR_SLIDER COLOR_WHITE
#endif #endif
#ifndef COLOR_SLIDER_INACTIVE #ifndef COLOR_SLIDER_INACTIVE
#define COLOR_SLIDER_INACTIVE COLOR_GREY #define COLOR_SLIDER_INACTIVE COLOR_GREY
#endif #endif
#ifndef COLOR_UBL #ifndef COLOR_UBL
#define COLOR_UBL COLOR_WHITE #define COLOR_UBL COLOR_WHITE
#endif #endif
#ifndef COLOR_TOUCH_CALIBRATION #ifndef COLOR_TOUCH_CALIBRATION
#define COLOR_TOUCH_CALIBRATION COLOR_WHITE #define COLOR_TOUCH_CALIBRATION COLOR_WHITE
#endif #endif
#ifndef COLOR_KILL_SCREEN_BG #ifndef COLOR_KILL_SCREEN_BG
#define COLOR_KILL_SCREEN_BG COLOR_MAROON #define COLOR_KILL_SCREEN_BG COLOR_MAROON
#endif #endif
#ifndef COLOR_KILL_SCREEN_TEXT #ifndef COLOR_KILL_SCREEN_TEXT
#define COLOR_KILL_SCREEN_TEXT COLOR_WHITE #define COLOR_KILL_SCREEN_TEXT COLOR_WHITE
#endif #endif