diff options
| author | fishsoupisgood <github@madingley.org> | 2020-06-18 16:43:57 +0100 |
|---|---|---|
| committer | fishsoupisgood <github@madingley.org> | 2020-06-18 16:43:57 +0100 |
| commit | 1d4ac4c0e0300cc0b4fb0ee66cbbb8aa2b18dd99 (patch) | |
| tree | 3bd34e32d8073ebe7d3fe9f0bcff011562832797 /stm32/app/font8x16.c | |
| parent | e41764fceeabb1cdb6a7a299e00f2166a6f6ac32 (diff) | |
| download | robs_speedo-master.tar.gz robs_speedo-master.tar.bz2 robs_speedo-master.zip | |
Diffstat (limited to 'stm32/app/font8x16.c')
| -rw-r--r-- | stm32/app/font8x16.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/stm32/app/font8x16.c b/stm32/app/font8x16.c index 4e3b5d6..c015f50 100644 --- a/stm32/app/font8x16.c +++ b/stm32/app/font8x16.c @@ -1033,27 +1033,37 @@ font8x16_put_ch (uint8_t *vram, unsigned ch, unsigned x, unsigned y) unsigned shift = y & 7; unsigned page = y >> 3; unsigned mask; + unsigned xe; + + if (x >= SSD1306_WIDTH) return; + + xe = x + 8; + + if (xe > SSD1306_WIDTH) xe = SSD1306_WIDTH; x += page * SSD1306_WIDTH; + xe += page * SSD1306_WIDTH; - oled_blit_strip (vram, x, x + 8, 0xff << shift, shift, font8x16[ch]); + oled_blit_strip (vram, x, xe, 0xff << shift, shift, font8x16[ch]); x += SSD1306_WIDTH; + xe += SSD1306_WIDTH; shift = 8 - shift; mask = 0xff >> shift; if (shift) - oled_blit_strip (vram, x, x + 8, mask, -shift, font8x16[ch]); + oled_blit_strip (vram, x, xe, mask, -shift, font8x16[ch]); shift = y & 7; - oled_blit_strip (vram, x, x + 8, ~mask & (0xff << shift), shift, + oled_blit_strip (vram, x, xe, ~mask & (0xff << shift), shift, &font8x16[ch][8]); if (shift) { x += SSD1306_WIDTH; + xe += SSD1306_WIDTH; shift = 8 - shift; - oled_blit_strip (vram, x, x + 8, 0xff >> shift, -shift, + oled_blit_strip (vram, x, xe, 0xff >> shift, -shift, &font8x16[ch][8]); } |