j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #748 from 0x0aa/optimize-ssd1306-fill-rectangle

Browse source 
optimize ssd1306_fill_rectangle
This commit is contained in:
Ruslan V. Uss 2020-06-19 16:47:08 +05:00 • committed by GitHub
commit 887143a14e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 52 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

58
extras/ssd1306/ssd1306.c
View file

@ -643,12 +643,58 @@ int ssd1306_draw_rectangle(const ssd1306_t *dev, uint8_t *fb, int8_t x, int8_t y
int ssd1306_fill_rectangle(const ssd1306_t *dev, uint8_t *fb, int8_t x, int8_t y, uint8_t w, uint8_t h, ssd1306_color_t color)
{
// Can be optimized?
uint8_t i;
int err = 0;
for (i = x; i < x + w; ++i)
if ((err = ssd1306_draw_vline(dev, fb, i, y, h, color)))
return err;
uint16_t index;
uint8_t fill, mask, mod, t;
// boundary check
if ((x >= dev->width) || (x < 0) || (y >= dev->height) || (y < 0))
return -EINVAL;
if (w == 0 || h == 0)
return -EINVAL;
if (x + w > dev->width)
w = dev->width - x;
if (y + h > dev->height)
h = dev->height - y;
do {
mod = y & 7;
fill = 8 - mod;
if (fill > h)
fill = h;
t = w;
index = x + (y / 8) * dev->width;
mask = ((1 << fill) - 1) << mod;
switch (color) {
case OLED_COLOR_WHITE:
while (t--) {
fb[index] |= mask;
++index;
}
break;
case OLED_COLOR_BLACK:
mask = ~mask;
while (t--) {
fb[index] &= mask;
++index;
}
break;
case OLED_COLOR_INVERT:
while (t--) {
fb[index] ^= mask;
++index;
}
break;
default:
break;
}
y += fill;
h -= fill;
} while(h > 0);
return 0;
}