diff options
3 files changed, 33 insertions, 6 deletions
diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c index 4547f1419..2c8a168e7 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c | |||
| @@ -254,6 +254,32 @@ LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { | |||
| 254 | } | 254 | } |
| 255 | #endif | 255 | #endif |
| 256 | 256 | ||
| 257 | LLDSPEC void gdisp_lld_blit_area(GDisplay *g) { | ||
| 258 | uint8_t* buffer = (uint8_t*)g->p.ptr; | ||
| 259 | int linelength = g->p.cx; | ||
| 260 | for (int i = 0; i < g->p.cy; i++) { | ||
| 261 | unsigned dstx = g->p.x; | ||
| 262 | unsigned dsty = g->p.y + i; | ||
| 263 | unsigned srcx = g->p.x1; | ||
| 264 | unsigned srcy = g->p.y1 + i; | ||
| 265 | unsigned srcbit = srcy * g->p.x2 + srcx; | ||
| 266 | for(int j=0; j < linelength; j++) { | ||
| 267 | uint8_t src = buffer[srcbit / 8]; | ||
| 268 | uint8_t bit = 7-(srcbit % 8); | ||
| 269 | uint8_t bitset = (src >> bit) & 1; | ||
| 270 | uint8_t* dst = &(RAM(g)[xyaddr(dstx, dsty)]); | ||
| 271 | if (bitset) { | ||
| 272 | *dst |= xybit(dsty); | ||
| 273 | } | ||
| 274 | else { | ||
| 275 | *dst &= ~xybit(dsty); | ||
| 276 | } | ||
| 277 | dstx++; | ||
| 278 | srcbit++; | ||
| 279 | } | ||
| 280 | } | ||
| 281 | } | ||
| 282 | |||
| 257 | #if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL | 283 | #if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL |
| 258 | LLDSPEC void gdisp_lld_control(GDisplay *g) { | 284 | LLDSPEC void gdisp_lld_control(GDisplay *g) { |
| 259 | switch(g->p.x) { | 285 | switch(g->p.x) { |
diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h index 48587b9e1..2b66a877c 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h | |||
| @@ -14,12 +14,13 @@ | |||
| 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 |
| 21 | #define GDISP_HARDWARE_BITFILLS TRUE | ||
| 21 | 22 | ||
| 22 | #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO | 23 | #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO |
| 23 | 24 | ||
| 24 | #endif /* GFX_USE_GDISP */ | 25 | #endif /* GFX_USE_GDISP */ |
| 25 | 26 | ||
diff --git a/keyboards/ergodox/infinity/gfxconf.h b/keyboards/ergodox/infinity/gfxconf.h index 8caa577b7..45b9f5858 100644 --- a/keyboards/ergodox/infinity/gfxconf.h +++ b/keyboards/ergodox/infinity/gfxconf.h | |||
| @@ -143,7 +143,7 @@ | |||
| 143 | #define GDISP_HARDWARE_DRAWPIXEL TRUE | 143 | #define GDISP_HARDWARE_DRAWPIXEL TRUE |
| 144 | #define GDISP_HARDWARE_CLEARS FALSE | 144 | #define GDISP_HARDWARE_CLEARS FALSE |
| 145 | #define GDISP_HARDWARE_FILLS FALSE | 145 | #define GDISP_HARDWARE_FILLS FALSE |
| 146 | #define GDISP_HARDWARE_BITFILLS FALSE | 146 | //#define GDISP_HARDWARE_BITFILLS FALSE |
| 147 | #define GDISP_HARDWARE_SCROLL FALSE | 147 | #define GDISP_HARDWARE_SCROLL FALSE |
| 148 | #define GDISP_HARDWARE_PIXELREAD TRUE | 148 | #define GDISP_HARDWARE_PIXELREAD TRUE |
| 149 | #define GDISP_HARDWARE_CONTROL TRUE | 149 | #define GDISP_HARDWARE_CONTROL TRUE |
