Skip to content

Commit

Permalink
Merge branch 'master' of github.com:vroland/ed097oc4-breakout
Browse files Browse the repository at this point in the history
  • Loading branch information
@vroland
vroland committed Jul 7, 2020
2 parents b49f826 + d83045e commit 2d5026f
Show file tree
Hide file tree
Showing 24 changed files with 14,896 additions and 23 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ sdkconfig.old
doc/source/xml/
compile_commands.json
examples/mpd_status/main/wifi_config.h
/.idea/
3 changes: 3 additions & 0 deletions components/epd_driver/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,8 @@ menu "E-Paper Driver"

config EPD_DISPLAY_TYPE_ED097TC2
bool "ED097TC2"

config EPD_DISPLAY_TYPE_ED097OC4_LQ
bool "ED097OC4 Low Quality"
endchoice
endmenu
291 changes: 269 additions & 22 deletions components/epd_driver/epd_driver.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ uint32_t skipping;
#define CLEAR_BYTE 0B10101010
#define DARK_BYTE 0B01010101

#if defined(CONFIG_EPD_DISPLAY_TYPE_ED097OC4) || \
defined(CONFIG_EPD_DISPLAY_TYPE_ED060SC4)
#if defined(CONFIG_EPD_DISPLAY_TYPE_ED097OC4) || defined(CONFIG_EPD_DISPLAY_TYPE_ED060SC4) || defined(CONFIG_EPD_DISPLAY_TYPE_ED097OC4_LQ)
/* 4bpp Contrast cycles in order of contrast (Darkest first). */
const int contrast_cycles_4[15] = {30, 30, 20, 20, 30, 30, 30, 40,
40, 50, 50, 50, 100, 200, 300};
Expand All @@ -41,6 +40,15 @@ const int contrast_cycles_4_white[15] = {7, 8, 8, 6, 6, 6, 6, 6,
#error "no display type defined!"
#endif

#ifndef _swap_int
#define _swap_int(a, b) \
{ \
int t = a; \
a = b; \
b = t; \
}
#endif

// Heap space to use for the EPD output lookup table, which
// is calculated for each cycle.
static uint8_t *conversion_lut;
Expand Down Expand Up @@ -301,39 +309,278 @@ inline uint32_t min(uint32_t x, uint32_t y) { return x < y ? x : y; }

void epd_draw_hline(int x, int y, int length, uint8_t color,
uint8_t *framebuffer) {
if (y < 0 || y >= EPD_HEIGHT) {
return;
}
for (int i = 0; i < length; i++) {
int xx = x + i;
if (xx < 0 || xx >= EPD_WIDTH) {
continue;
}
uint8_t *buf_ptr = &framebuffer[y * EPD_WIDTH / 2 + xx / 2];
if (xx % 2) {
*buf_ptr = (*buf_ptr & 0x0F) | (color & 0xF0);
} else {
*buf_ptr = (*buf_ptr & 0xF0) | (color >> 4);
}
epd_draw_pixel(xx, y, color, framebuffer);
}
}

void epd_draw_vline(int x, int y, int length, uint8_t color,
uint8_t *framebuffer) {
for (int i = 0; i < length; i++) {
int yy = y + i;
epd_draw_pixel(x, yy, color, framebuffer);
}
}

void epd_draw_pixel(int x, int y, uint8_t color,
uint8_t *framebuffer) {
if (x < 0 || x >= EPD_WIDTH) {
return;
}
for (int i = 0; i < length; i++) {
int yy = y + i;
if (yy < 0 || yy >= EPD_HEIGHT) {
return;
if (y < 0 || y >= EPD_HEIGHT) {
return;
}
uint8_t *buf_ptr = &framebuffer[y * EPD_WIDTH / 2 + x / 2];
if (x % 2) {
*buf_ptr = (*buf_ptr & 0x0F) | (color & 0xF0);
} else {
*buf_ptr = (*buf_ptr & 0xF0) | (color >> 4);
}
}

void epd_draw_circle(int x0, int y0, int r, uint8_t color,
uint8_t *framebuffer) {
int f = 1 - r;
int ddF_x = 1;
int ddF_y = -2 * r;
int x = 0;
int y = r;

epd_draw_pixel(x0, y0 + r, color, framebuffer);
epd_draw_pixel(x0, y0 - r, color, framebuffer);
epd_draw_pixel(x0 + r, y0, color, framebuffer);
epd_draw_pixel(x0 - r, y0, color, framebuffer);

while (x < y) {
if (f >= 0) {
y--;
ddF_y += 2;
f += ddF_y;
}
x++;
ddF_x += 2;
f += ddF_x;

epd_draw_pixel(x0 + x, y0 + y, color, framebuffer);
epd_draw_pixel(x0 - x, y0 + y, color, framebuffer);
epd_draw_pixel(x0 + x, y0 - y, color, framebuffer);
epd_draw_pixel(x0 - x, y0 - y, color, framebuffer);
epd_draw_pixel(x0 + y, y0 + x, color, framebuffer);
epd_draw_pixel(x0 - y, y0 + x, color, framebuffer);
epd_draw_pixel(x0 + y, y0 - x, color, framebuffer);
epd_draw_pixel(x0 - y, y0 - x, color, framebuffer);
}
}

void epd_fill_circle(int x0, int y0, int r, uint8_t color,
uint8_t *framebuffer) {
epd_draw_vline(x0, y0 - r, 2 * r + 1, color, framebuffer);
epd_fill_circle_helper(x0, y0, r, 3, 0, color, framebuffer);
}


void epd_fill_circle_helper(int x0, int y0, int r,
int corners, int delta,
uint8_t color,
uint8_t *framebuffer) {

int f = 1 - r;
int ddF_x = 1;
int ddF_y = -2 * r;
int x = 0;
int y = r;
int px = x;
int py = y;

delta++; // Avoid some +1's in the loop

while (x < y) {
if (f >= 0) {
y--;
ddF_y += 2;
f += ddF_y;
}
x++;
ddF_x += 2;
f += ddF_x;
// These checks avoid double-drawing certain lines, important
// for the SSD1306 library which has an INVERT drawing mode.
if (x < (y + 1)) {
if (corners & 1)
epd_draw_vline(x0 + x, y0 - y, 2 * y + delta, color, framebuffer);
if (corners & 2)
epd_draw_vline(x0 - x, y0 - y, 2 * y + delta, color, framebuffer);
}
uint8_t *buf_ptr = &framebuffer[yy * EPD_WIDTH / 2 + x / 2];
if (x % 2) {
*buf_ptr = (*buf_ptr & 0x0F) | (color & 0xF0);
if (y != py) {
if (corners & 1)
epd_draw_vline(x0 + py, y0 - px, 2 * px + delta, color, framebuffer);
if (corners & 2)
epd_draw_vline(x0 - py, y0 - px, 2 * px + delta, color, framebuffer);
py = y;
}
px = x;
}
}

void epd_draw_rect(int x, int y, int w, int h,
uint8_t color, uint8_t *framebuffer) {
epd_draw_hline(x, y, w, color, framebuffer);
epd_draw_hline(x, y + h - 1, w, color, framebuffer);
epd_draw_vline(x, y, h, color, framebuffer);
epd_draw_vline(x + w - 1, y, h, color, framebuffer);
}

void epd_fill_rect(int x, int y, int w, int h,
uint8_t color, uint8_t *framebuffer) {
for (int i = x; i < x + w; i++) {
epd_draw_vline(i, y, h, color, framebuffer);
}
}

void epd_write_line(int x0, int y0, int x1, int y1,
uint8_t color, uint8_t *framebuffer) {
int steep = abs(y1 - y0) > abs(x1 - x0);
if (steep) {
_swap_int(x0, y0);
_swap_int(x1, y1);
}

if (x0 > x1) {
_swap_int(x0, x1);
_swap_int(y0, y1);
}

int dx, dy;
dx = x1 - x0;
dy = abs(y1 - y0);

int err = dx / 2;
int ystep;

if (y0 < y1) {
ystep = 1;
} else {
ystep = -1;
}

for (; x0 <= x1; x0++) {
if (steep) {
epd_draw_pixel(y0, x0, color, framebuffer);
} else {
*buf_ptr = (*buf_ptr & 0xF0) | (color >> 4);
epd_draw_pixel(x0, y0, color, framebuffer);
}
err -= dy;
if (err < 0) {
y0 += ystep;
err += dx;
}
}
}

void epd_draw_line(int x0, int y0, int x1, int y1,
uint8_t color, uint8_t *framebuffer) {
// Update in subclasses if desired!
if (x0 == x1) {
if (y0 > y1)
_swap_int(y0, y1);
epd_draw_vline(x0, y0, y1 - y0 + 1, color, framebuffer);
} else if (y0 == y1) {
if (x0 > x1)
_swap_int(x0, x1);
epd_draw_hline(x0, y0, x1 - x0 + 1, color, framebuffer);
} else {
epd_write_line(x0, y0, x1, y1, color, framebuffer);
}
}

void epd_draw_triangle(int x0, int y0, int x1, int y1,
int x2, int y2, uint8_t color,
uint8_t *framebuffer) {
epd_draw_line(x0, y0, x1, y1, color, framebuffer);
epd_draw_line(x1, y1, x2, y2, color, framebuffer);
epd_draw_line(x2, y2, x0, y0, color, framebuffer);
}

void epd_fill_triangle(int x0, int y0, int x1, int y1,
int x2, int y2, uint8_t color,
uint8_t *framebuffer) {

int a, b, y, last;

// Sort coordinates by Y order (y2 >= y1 >= y0)
if (y0 > y1) {
_swap_int(y0, y1);
_swap_int(x0, x1);
}
if (y1 > y2) {
_swap_int(y2, y1);
_swap_int(x2, x1);
}
if (y0 > y1) {
_swap_int(y0, y1);
_swap_int(x0, x1);
}

if (y0 == y2) { // Handle awkward all-on-same-line case as its own thing
a = b = x0;
if (x1 < a)
a = x1;
else if (x1 > b)
b = x1;
if (x2 < a)
a = x2;
else if (x2 > b)
b = x2;
epd_draw_hline(a, y0, b - a + 1, color, framebuffer);
return;
}

int dx01 = x1 - x0, dy01 = y1 - y0, dx02 = x2 - x0, dy02 = y2 - y0,
dx12 = x2 - x1, dy12 = y2 - y1;
int32_t sa = 0, sb = 0;

// For upper part of triangle, find scanline crossings for segments
// 0-1 and 0-2. If y1=y2 (flat-bottomed triangle), the scanline y1
// is included here (and second loop will be skipped, avoiding a /0
// error there), otherwise scanline y1 is skipped here and handled
// in the second loop...which also avoids a /0 error here if y0=y1
// (flat-topped triangle).
if (y1 == y2)
last = y1; // Include y1 scanline
else
last = y1 - 1; // Skip it

for (y = y0; y <= last; y++) {
a = x0 + sa / dy01;
b = x0 + sb / dy02;
sa += dx01;
sb += dx02;
/* longhand:
a = x0 + (x1 - x0) * (y - y0) / (y1 - y0);
b = x0 + (x2 - x0) * (y - y0) / (y2 - y0);
*/
if (a > b)
_swap_int(a, b);
epd_draw_hline(a, y, b - a + 1, color, framebuffer);
}

// For lower part of triangle, find scanline crossings for segments
// 0-2 and 1-2. This loop is skipped if y1=y2.
sa = (int32_t)dx12 * (y - y1);
sb = (int32_t)dx02 * (y - y0);
for (; y <= y2; y++) {
a = x1 + sa / dy12;
b = x0 + sb / dy02;
sa += dx12;
sb += dx02;
/* longhand:
a = x1 + (x2 - x1) * (y - y1) / (y2 - y1);
b = x0 + (x2 - x0) * (y - y0) / (y2 - y0);
*/
if (a > b)
_swap_int(a, b);
epd_draw_hline(a, y, b - a + 1, color, framebuffer);
}
}

Expand Down
6 changes: 6 additions & 0 deletions components/epd_driver/i2s_data_bus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,14 @@ void i2s_bus_init(i2s_bus_config *cfg) {
// (Smallest possible divider according to the spec).
dev->sample_rate_conf.tx_bck_div_num = 2;

#if defined(CONFIG_EPD_DISPLAY_TYPE_ED097OC4_LQ)
// Initialize Audio Clock (APLL) for 120 Mhz.
rtc_clk_apll_enable(1, 0, 0, 8, 0);
#else
// Initialize Audio Clock (APLL) for 80 Mhz.
rtc_clk_apll_enable(1, 0, 0, 8, 1);
#endif


// Set Audio Clock Dividers
dev->clkm_conf.val = 0;
Expand Down

0 comments on commit 2d5026f

Please sign in to comment.