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

2 fix

Browse source
This commit is contained in:
lilian 2016-12-08 14:01:28 +01:00
parent 11912e0b8a
commit 579023e3f5
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
examples/ssd1306_fps/Makefile
View file

@ -1,4 +1,3 @@
PROGRAM=SSD1306_fps PROGRAM=SSD1306_fps
EXTRA_COMPONENTS = extras/fonts extras/ssd1306 extras/i2c EXTRA_COMPONENTS = extras/ssd1306 extras/i2c extras/fonts
PROGRAM_SRC_DIR=. ./fonts
include ../../common.mk include ../../common.mk

15
extras/ssd1306/ssd1306.c
View file

@ -747,6 +747,7 @@ int ssd1306_draw_line(const ssd1306_t *dev, uint8_t *fb, int16_t x0, int16_t y0,
if ((x1 >= dev->width) || (x1 < 0) || (y1 >= dev->height) || (y1 < 0)) if ((x1 >= dev->width) || (x1 < 0) || (y1 >= dev->height) || (y1 < 0))
return -EINVAL; return -EINVAL;
int err ;
int16_t steep = abs(y1 - y0) > abs(x1 - x0); int16_t steep = abs(y1 - y0) > abs(x1 - x0);
if (steep) { if (steep) {
swap(x0, y0); swap(x0, y0);
@ -762,7 +763,7 @@ int ssd1306_draw_line(const ssd1306_t *dev, uint8_t *fb, int16_t x0, int16_t y0,
dx = x1 - x0; dx = x1 - x0;
dy = abs(y1 - y0); dy = abs(y1 - y0);
int16_t err = dx / 2; int16_t errx = dx / 2;
int16_t ystep; int16_t ystep;
if (y0 < y1) { if (y0 < y1) {
@ -773,14 +774,16 @@ int ssd1306_draw_line(const ssd1306_t *dev, uint8_t *fb, int16_t x0, int16_t y0,
for (; x0<=x1; x0++) { for (; x0<=x1; x0++) {
if (steep) { if (steep) {
ssd1306_draw_pixel(dev, fb, y0, x0, color); if ((err = ssd1306_draw_pixel(dev, fb, y0, x0, color)))
return err;
} else { } else {
ssd1306_draw_pixel(dev, fb, x0, y0, color); if ((err = ssd1306_draw_pixel(dev, fb, x0, y0, color)))
return err;
} }
err -= dy; errx -= dy;
if (err < 0) { if (errx < 0) {
y0 += ystep; y0 += ystep;
err += dx; errx += dx;
} }
} }
return 0; return 0;