From cc24111c0519ad7eedbe96e173671a017774b786 Mon Sep 17 00:00:00 2001
From: Olli Asikainen <olli.asikainen@gmail.com>
Date: Fri, 24 Apr 2020 16:31:05 +0300
Subject: [PATCH] optimize ssd1306_fill_rectangle
---
extras/ssd1306/ssd1306.c | 58 +++++++++++++++++++++++++++++++++++-----
1 file changed, 52 insertions(+), 6 deletions(-)
diff --git a/extras/ssd1306/ssd1306.c b/extras/ssd1306/ssd1306.c
index d830f44..1d49f7c 100644
--- a/extras/ssd1306/ssd1306.c
+++ b/extras/ssd1306/ssd1306.c
@@ -692,12 +692,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;
}