Skip to content

Commit 8d090cb

Browse files
committed
Replace tabs with spaces
1 parent ec5b78d commit 8d090cb

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

Marlin/src/lcd/TFTGLCD/ultralcd_TFTGLCD.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ enum Commands { // based on Smoothieware commands
113113
// Other commands... 0xE0 thru 0xFF
114114
GET_LCD_ROW = 0xE0, // for detect panel
115115
GET_LCD_COL, // reserved for compatibility with Smoothieware, not used
116-
LCD_PUT, // write one line to LCD
117-
INIT_SCREEN = 0xFE, // clear panel buffer
116+
LCD_PUT, // write one line to LCD
117+
INIT_SCREEN = 0xFE, // clear panel buffer
118118
};
119119

120120
static unsigned char framebuffer[FBSIZE];

Marlin/src/lcd/tft/tft_color.h

+30-30
Original file line numberDiff line numberDiff line change
@@ -73,104 +73,104 @@
7373
#define COLOR_BACKGROUND 0x20AC // #1E156E
7474
#endif
7575
#ifndef COLOR_SELECTION_BG
76-
#define COLOR_SELECTION_BG 0x9930 // #992380
76+
#define COLOR_SELECTION_BG 0x9930 // #992380
7777
#endif
7878
#ifndef COLOR_WEBSITE_URL
79-
#define COLOR_WEBSITE_URL 0x03B7
79+
#define COLOR_WEBSITE_URL 0x03B7
8080
#endif
8181

8282
#ifndef COLOR_INACTIVE
83-
#define COLOR_INACTIVE COLOR_GREY
83+
#define COLOR_INACTIVE COLOR_GREY
8484
#endif
8585
#ifndef COLOR_COLD
86-
#define COLOR_COLD COLOR_AQUA
86+
#define COLOR_COLD COLOR_AQUA
8787
#endif
8888
#ifndef COLOR_HOTEND
89-
#define COLOR_HOTEND COLOR_SCARLET
89+
#define COLOR_HOTEND COLOR_SCARLET
9090
#endif
9191
#ifndef COLOR_HEATED_BED
92-
#define COLOR_HEATED_BED COLOR_DARK_ORANGE
92+
#define COLOR_HEATED_BED COLOR_DARK_ORANGE
9393
#endif
9494
#ifndef COLOR_CHAMBER
95-
#define COLOR_CHAMBER COLOR_DARK_ORANGE
95+
#define COLOR_CHAMBER COLOR_DARK_ORANGE
9696
#endif
9797
#ifndef COLOR_FAN
98-
#define COLOR_FAN COLOR_AQUA
98+
#define COLOR_FAN COLOR_AQUA
9999
#endif
100100

101101
#ifndef COLOR_AXIS_HOMED
102-
#define COLOR_AXIS_HOMED COLOR_WHITE
102+
#define COLOR_AXIS_HOMED COLOR_WHITE
103103
#endif
104104
#ifndef COLOR_AXIS_NOT_HOMED
105-
#define COLOR_AXIS_NOT_HOMED COLOR_YELLOW
105+
#define COLOR_AXIS_NOT_HOMED COLOR_YELLOW
106106
#endif
107107

108108
#ifndef COLOR_RATE_100
109-
#define COLOR_RATE_100 COLOR_VIVID_GREEN
109+
#define COLOR_RATE_100 COLOR_VIVID_GREEN
110110
#endif
111111
#ifndef COLOR_RATE_ALTERED
112-
#define COLOR_RATE_ALTERED COLOR_YELLOW
112+
#define COLOR_RATE_ALTERED COLOR_YELLOW
113113
#endif
114114

115115
#ifndef COLOR_PRINT_TIME
116-
#define COLOR_PRINT_TIME COLOR_AQUA
116+
#define COLOR_PRINT_TIME COLOR_AQUA
117117
#endif
118118

119119
#ifndef COLOR_PROGRESS_FRAME
120-
#define COLOR_PROGRESS_FRAME COLOR_WHITE
120+
#define COLOR_PROGRESS_FRAME COLOR_WHITE
121121
#endif
122122
#ifndef COLOR_PROGRESS_BAR
123-
#define COLOR_PROGRESS_BAR COLOR_BLUE
123+
#define COLOR_PROGRESS_BAR COLOR_BLUE
124124
#endif
125125
#ifndef COLOR_PROGRESS_BG
126-
#define COLOR_PROGRESS_BG COLOR_BLACK
126+
#define COLOR_PROGRESS_BG COLOR_BLACK
127127
#endif
128128

129129
#ifndef COLOR_STATUS_MESSAGE
130-
#define COLOR_STATUS_MESSAGE COLOR_YELLOW
130+
#define COLOR_STATUS_MESSAGE COLOR_YELLOW
131131
#endif
132132

133133
#ifndef COLOR_CONTROL_ENABLED
134-
#define COLOR_CONTROL_ENABLED COLOR_WHITE
134+
#define COLOR_CONTROL_ENABLED COLOR_WHITE
135135
#endif
136136
#ifndef COLOR_CONTROL_DISABLED
137-
#define COLOR_CONTROL_DISABLED COLOR_GREY
137+
#define COLOR_CONTROL_DISABLED COLOR_GREY
138138
#endif
139139
#ifndef COLOR_CONTROL_CANCEL
140-
#define COLOR_CONTROL_CANCEL COLOR_SCARLET
140+
#define COLOR_CONTROL_CANCEL COLOR_SCARLET
141141
#endif
142142
#ifndef COLOR_CONTROL_CONFIRM
143-
#define COLOR_CONTROL_CONFIRM COLOR_VIVID_GREEN
143+
#define COLOR_CONTROL_CONFIRM COLOR_VIVID_GREEN
144144
#endif
145145
#ifndef COLOR_BUSY
146-
#define COLOR_BUSY COLOR_SILVER
146+
#define COLOR_BUSY COLOR_SILVER
147147
#endif
148148

149149
#ifndef COLOR_MENU_TEXT
150-
#define COLOR_MENU_TEXT COLOR_YELLOW
150+
#define COLOR_MENU_TEXT COLOR_YELLOW
151151
#endif
152152
#ifndef COLOR_MENU_VALUE
153-
#define COLOR_MENU_VALUE COLOR_WHITE
153+
#define COLOR_MENU_VALUE COLOR_WHITE
154154
#endif
155155

156156
#ifndef COLOR_SLIDER
157-
#define COLOR_SLIDER COLOR_WHITE
157+
#define COLOR_SLIDER COLOR_WHITE
158158
#endif
159159
#ifndef COLOR_SLIDER_INACTIVE
160-
#define COLOR_SLIDER_INACTIVE COLOR_GREY
160+
#define COLOR_SLIDER_INACTIVE COLOR_GREY
161161
#endif
162162

163163
#ifndef COLOR_UBL
164-
#define COLOR_UBL COLOR_WHITE
164+
#define COLOR_UBL COLOR_WHITE
165165
#endif
166166

167167
#ifndef COLOR_TOUCH_CALIBRATION
168-
#define COLOR_TOUCH_CALIBRATION COLOR_WHITE
168+
#define COLOR_TOUCH_CALIBRATION COLOR_WHITE
169169
#endif
170170

171171
#ifndef COLOR_KILL_SCREEN_BG
172-
#define COLOR_KILL_SCREEN_BG COLOR_MAROON
172+
#define COLOR_KILL_SCREEN_BG COLOR_MAROON
173173
#endif
174174
#ifndef COLOR_KILL_SCREEN_TEXT
175-
#define COLOR_KILL_SCREEN_TEXT COLOR_WHITE
175+
#define COLOR_KILL_SCREEN_TEXT COLOR_WHITE
176176
#endif

0 commit comments

Comments
 (0)