aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2017-07-09 13:50:18 +0300
committerJack Humbert <jack.humb@gmail.com>2017-07-10 09:01:59 -0400
commit011ee294414800eaa18ce7c3f9447054d9eae765 (patch)
treedf9378c71287fedd424b01ab51bd3f1358baea8a
parent630f065376618d94f4616687629aadb3ee91e562 (diff)
downloadqmk_firmware-011ee294414800eaa18ce7c3f9447054d9eae765.tar.gz
qmk_firmware-011ee294414800eaa18ce7c3f9447054d9eae765.zip
Fixup mixed tabs/spaces
-rw-r--r--drivers/ugfx/gdisp/is31fl3731c/gdisp_is31fl3731c.c246
-rw-r--r--drivers/ugfx/gdisp/is31fl3731c/gdisp_lld_config.h14
-rw-r--r--drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c36
-rw-r--r--drivers/ugfx/gdisp/st7565/gdisp_lld_config.h6
-rw-r--r--keyboards/ergodox/infinity/board_ST7565.h6
5 files changed, 154 insertions, 154 deletions
diff --git a/drivers/ugfx/gdisp/is31fl3731c/gdisp_is31fl3731c.c b/drivers/ugfx/gdisp/is31fl3731c/gdisp_is31fl3731c.c
index c55dd0a0e..0691dbfbf 100644
--- a/drivers/ugfx/gdisp/is31fl3731c/gdisp_is31fl3731c.c
+++ b/drivers/ugfx/gdisp/is31fl3731c/gdisp_is31fl3731c.c
@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
19 19
20#if GFX_USE_GDISP 20#if GFX_USE_GDISP
21 21
22#define GDISP_DRIVER_VMT GDISPVMT_IS31FL3731C_QMK 22#define GDISP_DRIVER_VMT GDISPVMT_IS31FL3731C_QMK
23#include "gdisp_lld_config.h" 23#include "gdisp_lld_config.h"
24#include "src/gdisp/gdisp_driver.h" 24#include "src/gdisp/gdisp_driver.h"
25 25
@@ -34,26 +34,26 @@ extern const uint8_t CIE1931_CURVE[];
34/*===========================================================================*/ 34/*===========================================================================*/
35 35
36#ifndef GDISP_SCREEN_HEIGHT 36#ifndef GDISP_SCREEN_HEIGHT
37 #define GDISP_SCREEN_HEIGHT 9 37 #define GDISP_SCREEN_HEIGHT 9
38#endif 38#endif
39#ifndef GDISP_SCREEN_WIDTH 39#ifndef GDISP_SCREEN_WIDTH
40 #define GDISP_SCREEN_WIDTH 16 40 #define GDISP_SCREEN_WIDTH 16
41#endif 41#endif
42#ifndef GDISP_INITIAL_CONTRAST 42#ifndef GDISP_INITIAL_CONTRAST
43 #define GDISP_INITIAL_CONTRAST 0 43 #define GDISP_INITIAL_CONTRAST 0
44#endif 44#endif
45#ifndef GDISP_INITIAL_BACKLIGHT 45#ifndef GDISP_INITIAL_BACKLIGHT
46 #define GDISP_INITIAL_BACKLIGHT 0 46 #define GDISP_INITIAL_BACKLIGHT 0
47#endif 47#endif
48 48
49#define GDISP_FLG_NEEDFLUSH (GDISP_FLG_DRIVER<<0) 49#define GDISP_FLG_NEEDFLUSH (GDISP_FLG_DRIVER<<0)
50 50
51#define IS31_ADDR_DEFAULT 0x74 51#define IS31_ADDR_DEFAULT 0x74
52 52
53#define IS31_REG_CONFIG 0x00 53#define IS31_REG_CONFIG 0x00
54// bits in reg 54// bits in reg
55#define IS31_REG_CONFIG_PICTUREMODE 0x00 55#define IS31_REG_CONFIG_PICTUREMODE 0x00
56#define IS31_REG_CONFIG_AUTOPLAYMODE 0x08 56#define IS31_REG_CONFIG_AUTOPLAYMODE 0x08
57#define IS31_REG_CONFIG_AUDIOPLAYMODE 0x18 57#define IS31_REG_CONFIG_AUDIOPLAYMODE 0x18
58// D2:D0 bits are starting frame for autoplay mode 58// D2:D0 bits are starting frame for autoplay mode
59 59
@@ -144,14 +144,14 @@ static GFXINLINE void write_ram(GDisplay *g, uint8_t page, uint16_t offset, uint
144} 144}
145 145
146LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { 146LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
147 // The private area is the display surface. 147 // The private area is the display surface.
148 g->priv = gfxAlloc(sizeof(PrivData)); 148 g->priv = gfxAlloc(sizeof(PrivData));
149 __builtin_memset(PRIV(g), 0, sizeof(PrivData)); 149 __builtin_memset(PRIV(g), 0, sizeof(PrivData));
150 PRIV(g)->page = 0; 150 PRIV(g)->page = 0;
151 151
152 // Initialise the board interface 152 // Initialise the board interface
153 init_board(g); 153 init_board(g);
154 gfxSleepMilliseconds(10); 154 gfxSleepMilliseconds(10);
155 155
156 // zero function page, all registers (assuming full_page is all zeroes) 156 // zero function page, all registers (assuming full_page is all zeroes)
157 write_ram(g, IS31_FUNCTIONREG, 0, IS31_FUNCTIONREG_SIZE); 157 write_ram(g, IS31_FUNCTIONREG, 0, IS31_FUNCTIONREG_SIZE);
@@ -179,134 +179,134 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
179 // Finish Init 179 // Finish Init
180 post_init_board(g); 180 post_init_board(g);
181 181
182 /* Initialise the GDISP structure */ 182 /* Initialise the GDISP structure */
183 g->g.Width = GDISP_SCREEN_WIDTH; 183 g->g.Width = GDISP_SCREEN_WIDTH;
184 g->g.Height = GDISP_SCREEN_HEIGHT; 184 g->g.Height = GDISP_SCREEN_HEIGHT;
185 g->g.Orientation = GDISP_ROTATE_0; 185 g->g.Orientation = GDISP_ROTATE_0;
186 g->g.Powermode = powerOff; 186 g->g.Powermode = powerOff;
187 g->g.Backlight = GDISP_INITIAL_BACKLIGHT; 187 g->g.Backlight = GDISP_INITIAL_BACKLIGHT;
188 g->g.Contrast = GDISP_INITIAL_CONTRAST; 188 g->g.Contrast = GDISP_INITIAL_CONTRAST;
189 return TRUE; 189 return TRUE;
190} 190}
191 191
192#if GDISP_HARDWARE_FLUSH 192#if GDISP_HARDWARE_FLUSH
193 LLDSPEC void gdisp_lld_flush(GDisplay *g) { 193 LLDSPEC void gdisp_lld_flush(GDisplay *g) {
194 // Don't flush if we don't need it. 194 // Don't flush if we don't need it.
195 if (!(g->flags & GDISP_FLG_NEEDFLUSH)) 195 if (!(g->flags & GDISP_FLG_NEEDFLUSH))
196 return; 196 return;
197 197
198 PRIV(g)->page++; 198 PRIV(g)->page++;
199 PRIV(g)->page %= 2; 199 PRIV(g)->page %= 2;
200 // TODO: some smarter algorithm for this 200 // TODO: some smarter algorithm for this
201 // We should run only one physical page at a time 201 // We should run only one physical page at a time
202 // This way we don't need to send so much data, and 202 // This way we don't need to send so much data, and
203 // we could use slightly less memory 203 // we could use slightly less memory
204 uint8_t* src = PRIV(g)->frame_buffer; 204 uint8_t* src = PRIV(g)->frame_buffer;
205 for (int y=0;y<GDISP_SCREEN_HEIGHT;y++) { 205 for (int y=0;y<GDISP_SCREEN_HEIGHT;y++) {
206 for (int x=0;x<GDISP_SCREEN_WIDTH;x++) { 206 for (int x=0;x<GDISP_SCREEN_WIDTH;x++) {
207 uint8_t val = (uint16_t)*src * g->g.Backlight / 100; 207 uint8_t val = (uint16_t)*src * g->g.Backlight / 100;
208 PRIV(g)->write_buffer[get_led_address(g, x, y)]=CIE1931_CURVE[val]; 208 PRIV(g)->write_buffer[get_led_address(g, x, y)]=CIE1931_CURVE[val];
209 ++src; 209 ++src;
210 } 210 }
211 } 211 }
212 write_ram(g, PRIV(g)->page, IS31_PWM_REG, IS31_PWM_SIZE); 212 write_ram(g, PRIV(g)->page, IS31_PWM_REG, IS31_PWM_SIZE);
213 gfxSleepMilliseconds(1); 213 gfxSleepMilliseconds(1);
214 write_register(g, IS31_FUNCTIONREG, IS31_REG_PICTDISP, PRIV(g)->page); 214 write_register(g, IS31_FUNCTIONREG, IS31_REG_PICTDISP, PRIV(g)->page);
215 215
216 g->flags &= ~GDISP_FLG_NEEDFLUSH; 216 g->flags &= ~GDISP_FLG_NEEDFLUSH;
217 } 217 }
218#endif 218#endif
219 219
220#if GDISP_HARDWARE_DRAWPIXEL 220#if GDISP_HARDWARE_DRAWPIXEL
221 LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { 221 LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) {
222 coord_t x, y; 222 coord_t x, y;
223 223
224 switch(g->g.Orientation) { 224 switch(g->g.Orientation) {
225 default: 225 default:
226 case GDISP_ROTATE_0: 226 case GDISP_ROTATE_0:
227 x = g->p.x; 227 x = g->p.x;
228 y = g->p.y; 228 y = g->p.y;
229 break; 229 break;
230 case GDISP_ROTATE_180: 230 case GDISP_ROTATE_180:
231 x = GDISP_SCREEN_WIDTH-1 - g->p.x; 231 x = GDISP_SCREEN_WIDTH-1 - g->p.x;
232 y = g->p.y; 232 y = g->p.y;
233 break; 233 break;
234 } 234 }
235 PRIV(g)->frame_buffer[y * GDISP_SCREEN_WIDTH + x] = gdispColor2Native(g->p.color); 235 PRIV(g)->frame_buffer[y * GDISP_SCREEN_WIDTH + x] = gdispColor2Native(g->p.color);
236 g->flags |= GDISP_FLG_NEEDFLUSH; 236 g->flags |= GDISP_FLG_NEEDFLUSH;
237 } 237 }
238#endif 238#endif
239 239
240#if GDISP_HARDWARE_PIXELREAD 240#if GDISP_HARDWARE_PIXELREAD
241 LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { 241 LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) {
242 coord_t x, y; 242 coord_t x, y;
243 243
244 switch(g->g.Orientation) { 244 switch(g->g.Orientation) {
245 default: 245 default:
246 case GDISP_ROTATE_0: 246 case GDISP_ROTATE_0:
247 x = g->p.x; 247 x = g->p.x;
248 y = g->p.y; 248 y = g->p.y;
249 break; 249 break;
250 case GDISP_ROTATE_180: 250 case GDISP_ROTATE_180:
251 x = GDISP_SCREEN_WIDTH-1 - g->p.x; 251 x = GDISP_SCREEN_WIDTH-1 - g->p.x;
252 y = g->p.y; 252 y = g->p.y;
253 break; 253 break;
254 } 254 }
255 return gdispNative2Color(PRIV(g)->frame_buffer[y * GDISP_SCREEN_WIDTH + x]); 255 return gdispNative2Color(PRIV(g)->frame_buffer[y * GDISP_SCREEN_WIDTH + x]);
256 } 256 }
257#endif 257#endif
258 258
259#if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL 259#if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL
260 LLDSPEC void gdisp_lld_control(GDisplay *g) { 260 LLDSPEC void gdisp_lld_control(GDisplay *g) {
261 switch(g->p.x) { 261 switch(g->p.x) {
262 case GDISP_CONTROL_POWER: 262 case GDISP_CONTROL_POWER:
263 if (g->g.Powermode == (powermode_t)g->p.ptr) 263 if (g->g.Powermode == (powermode_t)g->p.ptr)
264 return; 264 return;
265 switch((powermode_t)g->p.ptr) { 265 switch((powermode_t)g->p.ptr) {
266 case powerOff: 266 case powerOff:
267 case powerSleep: 267 case powerSleep:
268 case powerDeepSleep: 268 case powerDeepSleep:
269 write_register(g, IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_OFF); 269 write_register(g, IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_OFF);
270 break; 270 break;
271 case powerOn: 271 case powerOn:
272 write_register(g, IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_ON); 272 write_register(g, IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_ON);
273 break; 273 break;
274 default: 274 default:
275 return;
276 }
277 g->g.Powermode = (powermode_t)g->p.ptr;
278 return;
279
280 case GDISP_CONTROL_ORIENTATION:
281 if (g->g.Orientation == (orientation_t)g->p.ptr)
282 return;
283 switch((orientation_t)g->p.ptr) {
284 /* Rotation is handled by the drawing routines */
285 case GDISP_ROTATE_0:
286 case GDISP_ROTATE_180:
287 g->g.Height = GDISP_SCREEN_HEIGHT;
288 g->g.Width = GDISP_SCREEN_WIDTH;
289 break;
290 case GDISP_ROTATE_90:
291 case GDISP_ROTATE_270:
292 g->g.Height = GDISP_SCREEN_WIDTH;
293 g->g.Width = GDISP_SCREEN_HEIGHT;
294 break;
295 default:
296 return;
297 }
298 g->g.Orientation = (orientation_t)g->p.ptr;
299 return;
300
301 case GDISP_CONTROL_BACKLIGHT:
302 if (g->g.Backlight == (unsigned)g->p.ptr)
303 return; 275 return;
304 unsigned val = (unsigned)g->p.ptr; 276 }
305 g->g.Backlight = val > 100 ? 100 : val; 277 g->g.Powermode = (powermode_t)g->p.ptr;
278 return;
279
280 case GDISP_CONTROL_ORIENTATION:
281 if (g->g.Orientation == (orientation_t)g->p.ptr)
282 return;
283 switch((orientation_t)g->p.ptr) {
284 /* Rotation is handled by the drawing routines */
285 case GDISP_ROTATE_0:
286 case GDISP_ROTATE_180:
287 g->g.Height = GDISP_SCREEN_HEIGHT;
288 g->g.Width = GDISP_SCREEN_WIDTH;
289 break;
290 case GDISP_ROTATE_90:
291 case GDISP_ROTATE_270:
292 g->g.Height = GDISP_SCREEN_WIDTH;
293 g->g.Width = GDISP_SCREEN_HEIGHT;
294 break;
295 default:
296 return;
297 }
298 g->g.Orientation = (orientation_t)g->p.ptr;
299 return;
300
301 case GDISP_CONTROL_BACKLIGHT:
302 if (g->g.Backlight == (unsigned)g->p.ptr)
303 return;
304 unsigned val = (unsigned)g->p.ptr;
305 g->g.Backlight = val > 100 ? 100 : val;
306 g->flags |= GDISP_FLG_NEEDFLUSH; 306 g->flags |= GDISP_FLG_NEEDFLUSH;
307 return; 307 return;
308 } 308 }
309 } 309 }
310#endif // GDISP_NEED_CONTROL 310#endif // GDISP_NEED_CONTROL
311 311
312#endif // GFX_USE_GDISP 312#endif // GFX_USE_GDISP
diff --git a/drivers/ugfx/gdisp/is31fl3731c/gdisp_lld_config.h b/drivers/ugfx/gdisp/is31fl3731c/gdisp_lld_config.h
index bb28ad775..588d688cf 100644
--- a/drivers/ugfx/gdisp/is31fl3731c/gdisp_lld_config.h
+++ b/drivers/ugfx/gdisp/is31fl3731c/gdisp_lld_config.h
@@ -24,13 +24,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
24/* Driver hardware support. */ 24/* Driver hardware support. */
25/*===========================================================================*/ 25/*===========================================================================*/
26 26
27#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing 27#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing
28#define GDISP_HARDWARE_DRAWPIXEL TRUE 28#define GDISP_HARDWARE_DRAWPIXEL TRUE
29#define GDISP_HARDWARE_PIXELREAD TRUE 29#define GDISP_HARDWARE_PIXELREAD TRUE
30#define GDISP_HARDWARE_CONTROL TRUE 30#define GDISP_HARDWARE_CONTROL TRUE
31 31
32#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_GRAY256 32#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_GRAY256
33 33
34#endif /* GFX_USE_GDISP */ 34#endif /* GFX_USE_GDISP */
35 35
36#endif /* _GDISP_LLD_CONFIG_H */ 36#endif /* _GDISP_LLD_CONFIG_H */
diff --git a/drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c b/drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c
index 69c574772..55552cb79 100644
--- a/drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c
+++ b/drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c
@@ -9,7 +9,7 @@
9 9
10#if GFX_USE_GDISP 10#if GFX_USE_GDISP
11 11
12#define GDISP_DRIVER_VMT GDISPVMT_ST7565_QMK 12#define GDISP_DRIVER_VMT GDISPVMT_ST7565_QMK
13#include "gdisp_lld_config.h" 13#include "gdisp_lld_config.h"
14#include "src/gdisp/gdisp_driver.h" 14#include "src/gdisp/gdisp_driver.h"
15 15
@@ -20,24 +20,24 @@
20/*===========================================================================*/ 20/*===========================================================================*/
21 21
22#ifndef GDISP_SCREEN_HEIGHT 22#ifndef GDISP_SCREEN_HEIGHT
23#define GDISP_SCREEN_HEIGHT 32 23#define GDISP_SCREEN_HEIGHT 32
24#endif 24#endif
25#ifndef GDISP_SCREEN_WIDTH 25#ifndef GDISP_SCREEN_WIDTH
26#define GDISP_SCREEN_WIDTH 128 26#define GDISP_SCREEN_WIDTH 128
27#endif 27#endif
28#ifndef GDISP_INITIAL_CONTRAST 28#ifndef GDISP_INITIAL_CONTRAST
29#define GDISP_INITIAL_CONTRAST 35 29#define GDISP_INITIAL_CONTRAST 35
30#endif 30#endif
31#ifndef GDISP_INITIAL_BACKLIGHT 31#ifndef GDISP_INITIAL_BACKLIGHT
32#define GDISP_INITIAL_BACKLIGHT 100 32#define GDISP_INITIAL_BACKLIGHT 100
33#endif 33#endif
34 34
35#define GDISP_FLG_NEEDFLUSH (GDISP_FLG_DRIVER<<0) 35#define GDISP_FLG_NEEDFLUSH (GDISP_FLG_DRIVER<<0)
36 36
37#include "st7565.h" 37#include "st7565.h"
38 38
39/*===========================================================================*/ 39/*===========================================================================*/
40/* Driver config defaults for backward compatibility. */ 40/* Driver config defaults for backward compatibility. */
41/*===========================================================================*/ 41/*===========================================================================*/
42#ifndef ST7565_LCD_BIAS 42#ifndef ST7565_LCD_BIAS
43#define ST7565_LCD_BIAS ST7565_LCD_BIAS_7 43#define ST7565_LCD_BIAS ST7565_LCD_BIAS_7
@@ -65,7 +65,7 @@ typedef struct{
65 65
66// Some common routines and macros 66// Some common routines and macros
67#define PRIV(g) ((PrivData*)g->priv) 67#define PRIV(g) ((PrivData*)g->priv)
68#define RAM(g) (PRIV(g)->ram) 68#define RAM(g) (PRIV(g)->ram)
69 69
70static GFXINLINE void write_cmd(GDisplay* g, uint8_t cmd) { 70static GFXINLINE void write_cmd(GDisplay* g, uint8_t cmd) {
71 PRIV(g)->data[PRIV(g)->data_pos++] = cmd; 71 PRIV(g)->data[PRIV(g)->data_pos++] = cmd;
@@ -76,15 +76,15 @@ static GFXINLINE void flush_cmd(GDisplay* g) {
76 PRIV(g)->data_pos = 0; 76 PRIV(g)->data_pos = 0;
77} 77}
78 78
79#define write_cmd2(g, cmd1, cmd2) { write_cmd(g, cmd1); write_cmd(g, cmd2); } 79#define write_cmd2(g, cmd1, cmd2) { write_cmd(g, cmd1); write_cmd(g, cmd2); }
80#define write_cmd3(g, cmd1, cmd2, cmd3) { write_cmd(g, cmd1); write_cmd(g, cmd2); write_cmd(g, cmd3); } 80#define write_cmd3(g, cmd1, cmd2, cmd3) { write_cmd(g, cmd1); write_cmd(g, cmd2); write_cmd(g, cmd3); }
81 81
82// Some common routines and macros 82// Some common routines and macros
83#define delay(us) gfxSleepMicroseconds(us) 83#define delay(us) gfxSleepMicroseconds(us)
84#define delay_ms(ms) gfxSleepMilliseconds(ms) 84#define delay_ms(ms) gfxSleepMilliseconds(ms)
85 85
86#define xyaddr(x, y) ((x) + ((y)>>3)*GDISP_SCREEN_WIDTH) 86#define xyaddr(x, y) ((x) + ((y)>>3)*GDISP_SCREEN_WIDTH)
87#define xybit(y) (1<<((y)&7)) 87#define xybit(y) (1<<((y)&7))
88 88
89/*===========================================================================*/ 89/*===========================================================================*/
90/* Driver exported functions. */ 90/* Driver exported functions. */
@@ -150,7 +150,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
150 150
151#if GDISP_HARDWARE_FLUSH 151#if GDISP_HARDWARE_FLUSH
152LLDSPEC void gdisp_lld_flush(GDisplay *g) { 152LLDSPEC void gdisp_lld_flush(GDisplay *g) {
153 unsigned p; 153 unsigned p;
154 154
155 // Don't flush if we don't need it. 155 // Don't flush if we don't need it.
156 if (!(g->flags & GDISP_FLG_NEEDFLUSH)) 156 if (!(g->flags & GDISP_FLG_NEEDFLUSH))
@@ -181,7 +181,7 @@ LLDSPEC void gdisp_lld_flush(GDisplay *g) {
181 181
182#if GDISP_HARDWARE_DRAWPIXEL 182#if GDISP_HARDWARE_DRAWPIXEL
183LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { 183LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) {
184 coord_t x, y; 184 coord_t x, y;
185 185
186 switch(g->g.Orientation) { 186 switch(g->g.Orientation) {
187 default: 187 default:
@@ -212,7 +212,7 @@ LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) {
212 212
213#if GDISP_HARDWARE_PIXELREAD 213#if GDISP_HARDWARE_PIXELREAD
214LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { 214LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) {
215 coord_t x, y; 215 coord_t x, y;
216 216
217 switch(g->g.Orientation) { 217 switch(g->g.Orientation) {
218 default: 218 default:
@@ -257,7 +257,7 @@ LLDSPEC void gdisp_lld_blit_area(GDisplay *g) {
257 else { 257 else {
258 *dst &= ~xybit(dsty); 258 *dst &= ~xybit(dsty);
259 } 259 }
260 dstx++; 260 dstx++;
261 srcbit++; 261 srcbit++;
262 } 262 }
263 } 263 }
diff --git a/drivers/ugfx/gdisp/st7565/gdisp_lld_config.h b/drivers/ugfx/gdisp/st7565/gdisp_lld_config.h
index 2b66a877c..4446bd38b 100644
--- a/drivers/ugfx/gdisp/st7565/gdisp_lld_config.h
+++ b/drivers/ugfx/gdisp/st7565/gdisp_lld_config.h
@@ -14,7 +14,7 @@
14/* Driver hardware support. */ 14/* Driver hardware support. */
15/*===========================================================================*/ 15/*===========================================================================*/
16 16
17#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing 17#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing
18#define GDISP_HARDWARE_DRAWPIXEL TRUE 18#define GDISP_HARDWARE_DRAWPIXEL TRUE
19#define GDISP_HARDWARE_PIXELREAD TRUE 19#define GDISP_HARDWARE_PIXELREAD TRUE
20#define GDISP_HARDWARE_CONTROL TRUE 20#define GDISP_HARDWARE_CONTROL TRUE
@@ -22,6 +22,6 @@
22 22
23#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO 23#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO
24 24
25#endif /* GFX_USE_GDISP */ 25#endif /* GFX_USE_GDISP */
26 26
27#endif /* _GDISP_LLD_CONFIG_H */ 27#endif /* _GDISP_LLD_CONFIG_H */
diff --git a/keyboards/ergodox/infinity/board_ST7565.h b/keyboards/ergodox/infinity/board_ST7565.h
index 9650ffb44..9ab636c95 100644
--- a/keyboards/ergodox/infinity/board_ST7565.h
+++ b/keyboards/ergodox/infinity/board_ST7565.h
@@ -83,7 +83,7 @@ static GFXINLINE void init_board(GDisplay *g) {
83} 83}
84 84
85static GFXINLINE void post_init_board(GDisplay *g) { 85static GFXINLINE void post_init_board(GDisplay *g) {
86 (void) g; 86 (void) g;
87} 87}
88 88
89static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { 89static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) {
@@ -106,8 +106,8 @@ static GFXINLINE void enter_cmd_mode(GDisplay *g) {
106 106
107 107
108static GFXINLINE void write_data(GDisplay *g, uint8_t* data, uint16_t length) { 108static GFXINLINE void write_data(GDisplay *g, uint8_t* data, uint16_t length) {
109 (void) g; 109 (void) g;
110 spiSend(&SPID1, length, data); 110 spiSend(&SPID1, length, data);
111} 111}
112 112
113#endif /* _GDISP_LLD_BOARD_H */ 113#endif /* _GDISP_LLD_BOARD_H */