From cae9c0c32020a76e59518b940c5df1be67f4d131 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Tue, 31 Oct 2023 12:29:00 +0100 Subject: [PATCH] wip --- .../gdisp/SSD1312/.gdisp_lld_SSD1312.c.swp | Bin 20480 -> 0 bytes drivers/gdisp/SSD1312/SSD1312.h | 28 -- .../gdisp/SSD1312/board_SSD1312_template.h | 31 ++- drivers/gdisp/SSD1312/driver.cmake | 8 + drivers/gdisp/SSD1312/gdisp_lld_SSD1312.c | 241 ++++++++++-------- drivers/gdisp/SSD1312/gdisp_lld_config.h | 8 +- 6 files changed, 166 insertions(+), 150 deletions(-) delete mode 100644 drivers/gdisp/SSD1312/.gdisp_lld_SSD1312.c.swp delete mode 100644 drivers/gdisp/SSD1312/SSD1312.h create mode 100644 drivers/gdisp/SSD1312/driver.cmake diff --git a/drivers/gdisp/SSD1312/.gdisp_lld_SSD1312.c.swp b/drivers/gdisp/SSD1312/.gdisp_lld_SSD1312.c.swp deleted file mode 100644 index 4de69047d3089980c1d4800d16c65e7acf7c9aab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20480 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 #define xybit(y) (1<<((y)&7)) +#define write_cmd_1(g, a) { gU8 cmd[1]; cmd[0] = a; write_cmd(g, cmd, 1); } +#define write_cmd_2(g, a, b) { gU8 cmd[2]; cmd[0] = a; cmd[1] = b; write_cmd(g, cmd, 2); } + /*===========================================================================*/ /* Driver exported functions. */ /*===========================================================================*/ @@ -59,17 +60,19 @@ /** * As this controller can't update on a pixel boundary we need to maintain the * the entire display surface in memory so that we can do the necessary bit - * operations. Fortunately it is a small display in 4 bit grayscale. - * 64 * 128 / 2 = 4096 bytes. + * operations. Fortunately it is a small monochrome display. + * 64 * 128 / 8 = 1024 bytes. */ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // The private area is the display surface. g->priv = gfxAlloc(GDISP_SCREEN_HEIGHT/8 * SSD1312_PAGE_WIDTH); + if (!g->priv) + return gFalse; // Fill in the prefix command byte on each page line of the display buffer - // We can do it during initialisation as this byte is never overwritten. + // We can do this during initialisation as we're being careful that this byte is never overwritten. #ifdef SSD1312_PAGE_PREFIX for (unsigned i = 0; i < GDISP_SCREEN_HEIGHT/8 * SSD1312_PAGE_WIDTH; i += SSD1312_PAGE_WIDTH) RAM(g)[i] = SSD1312_PAGE_PREFIX; @@ -84,54 +87,64 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) setpin_reset(g, gFalse); gfxSleepMilliseconds(200); - // Display off - write_cmd(g, 0xAE); + acquire_bus(g); - // Clock divider - write_cmd2(g, 0xD5, 0x80); + // Configuration + // This might require display module vendor specific changes + { + // Display off + write_cmd_1(g, 0xAE); - // Multiplex ratio - write_cmd2(g, 0xA8, 0x1F); + // Clock divider + write_cmd_2(g, 0xD5, 0x80); - // Display offset - write_cmd2(g, 0xD3, 0x30); + // Multiplex ratio + write_cmd_2(g, 0xA8, 0x1F); - // Display start line - write_cmd(g, 0x40); + // Display offset + write_cmd_2(g, 0xD3, 0x30); - // Charge pump - write_cmd2(g, 0x8D, 0x72); // 0x10 if Vcc externally supplied + // Display start line + write_cmd_1(g, 0x40); - // Segment re-map - write_cmd(g, 0xA1); + // Charge pump + write_cmd_2(g, 0x8D, 0x72); // 0x10 if Vcc externally supplied - // COM output scan direction - write_cmd(g, 0xC0); + // Segment re-map + write_cmd_1(g, 0xA1); - // COM pin hardware configuration - write_cmd2(g, 0xDA, 0x10); + // COM output scan direction + write_cmd_1(g, 0xC0); - // Set internal/external current reference - write_cmd2(g, 0xAD, 0x50); + // COM pin hardware configuration + write_cmd_2(g, 0xDA, 0x10); - // Set contract - // ToDo: Also add to GDISP control interface below - write_cmd2(g, 0x81, 0x17); + // Set internal/external current reference + write_cmd_2(g, 0xAD, 0x50); - // Set pre-charge period - write_cmd2(g, 0xD9, 0xF1); + // Set contract + write_cmd_2(g, 0x81, 0x17); - // Set VCOMH select level - write_cmd2(g, 0xDB, 0x30); + // Set pre-charge period + write_cmd_2(g, 0xD9, 0xF1); - // Set entire display on/off - write_cmd(g, 0xA4); + // Set VCOMH select level + write_cmd_2(g, 0xDB, 0x30); - // Set normal/inverse display - write_cmd(g, 0xA6); + // Set entire display on/off + write_cmd_1(g, 0xA4); - // Display on - write_cmd(g, 0xAF); + // Set normal/inverse display + write_cmd_1(g, 0xA6); + + // Page addressing mode + write_cmd_2(g, 0x20, 0x02); + + // Display on + write_cmd_1(g, 0xAF); + } + + release_bus(g); // Finish Init post_init_board(g); @@ -148,11 +161,12 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) } #if GDISP_HARDWARE_FLUSH - LLDSPEC void gdisp_lld_flush(GDisplay *g) { + LLDSPEC void gdisp_lld_flush(GDisplay *g) + { gU8 * ram; unsigned pages; - // Don't flush if we don't need it. + // Only flush if necessary if (!(g->flags & GDISP_FLG_NEEDFLUSH)) return; @@ -160,8 +174,11 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) pages = GDISP_SCREEN_HEIGHT/8; acquire_bus(g); - write_cmd(g, CMD_DISPLAY_START_LINE); + write_cmd_1(g, 0x40 | 0); while (pages--) { + write_cmd_1(g, 0xB0 + (((GDISP_SCREEN_HEIGHT/8)-1)-pages)); + write_cmd_1(g, 0x00); + write_cmd_1(g, 0x10); write_data(g, ram, SSD1312_PAGE_WIDTH); ram += SSD1312_PAGE_WIDTH; } @@ -171,8 +188,70 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) } #endif +#if GDISP_HARDWARE_DRAWPIXEL + LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) + { + gCoord x, y; + + switch(g->g.Orientation) { + default: + case gOrientation0: + x = g->p.x; + y = g->p.y; + break; + case gOrientation90: + x = g->p.y; + y = GDISP_SCREEN_HEIGHT-1 - g->p.x; + break; + case gOrientation180: + x = GDISP_SCREEN_WIDTH-1 - g->p.x; + y = GDISP_SCREEN_HEIGHT-1 - g->p.y; + break; + case gOrientation270: + x = GDISP_SCREEN_WIDTH-1 - g->p.y; + y = g->p.x; + break; + } + if (gdispColor2Native(g->p.color) != gdispColor2Native(GFX_BLACK)) + RAM(g)[xyaddr(x, y)] |= xybit(y); + else + RAM(g)[xyaddr(x, y)] &= ~xybit(y); + g->flags |= GDISP_FLG_NEEDFLUSH; + } +#endif + +#if GDISP_HARDWARE_PIXELREAD + LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) + { + gCoord x, y; + + switch(g->g.Orientation) { + default: + case gOrientation0: + x = g->p.x; + y = g->p.y; + break; + case gOrientation90: + x = g->p.y; + y = GDISP_SCREEN_HEIGHT-1 - g->p.x; + break; + case gOrientation180: + x = GDISP_SCREEN_WIDTH-1 - g->p.x; + y = GDISP_SCREEN_HEIGHT-1 - g->p.y; + break; + case gOrientation270: + x = GDISP_SCREEN_WIDTH-1 - g->p.y; + y = g->p.x; + break; + } + + return (RAM(g)[xyaddr(x, y)] & xybit(y)) ? GFX_WHITE : GFX_BLACK; + } +#endif + #if GDISP_HARDWARE_FILLS - LLDSPEC void gdisp_lld_fill_area(GDisplay *g) { + LLDSPEC void gdisp_lld_fill_area(GDisplay *g) + { gCoord sy, ey; gCoord sx, ex; gCoord col; @@ -223,7 +302,8 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) mask &= (0xff >> (7 - (ey&7))); for (col = sx; col <= ex; col++) base[col] &= ~mask; - } else { + } + else { while (zpages--) { for (col = sx; col <= ex; col++) base[col] |= mask; @@ -238,66 +318,9 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) } #endif -#if GDISP_HARDWARE_DRAWPIXEL - LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { - gCoord x, y; - - switch(g->g.Orientation) { - default: - case gOrientation0: - x = g->p.x; - y = g->p.y; - break; - case gOrientation90: - x = g->p.y; - y = GDISP_SCREEN_HEIGHT-1 - g->p.x; - break; - case gOrientation180: - x = GDISP_SCREEN_WIDTH-1 - g->p.x; - y = GDISP_SCREEN_HEIGHT-1 - g->p.y; - break; - case gOrientation270: - x = GDISP_SCREEN_WIDTH-1 - g->p.y; - y = g->p.x; - break; - } - if (gdispColor2Native(g->p.color) != gdispColor2Native(GFX_BLACK)) - RAM(g)[xyaddr(x, y)] |= xybit(y); - else - RAM(g)[xyaddr(x, y)] &= ~xybit(y); - g->flags |= GDISP_FLG_NEEDFLUSH; - } -#endif - -#if GDISP_HARDWARE_PIXELREAD - LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) { - gCoord x, y; - - switch(g->g.Orientation) { - default: - case gOrientation0: - x = g->p.x; - y = g->p.y; - break; - case gOrientation90: - x = g->p.y; - y = GDISP_SCREEN_HEIGHT-1 - g->p.x; - break; - case gOrientation180: - x = GDISP_SCREEN_WIDTH-1 - g->p.x; - y = GDISP_SCREEN_HEIGHT-1 - g->p.y; - break; - case gOrientation270: - x = GDISP_SCREEN_WIDTH-1 - g->p.y; - y = g->p.x; - break; - } - return (RAM(g)[xyaddr(x, y)] & xybit(y)) ? GFX_WHITE : GFX_BLACK; - } -#endif - #if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL - LLDSPEC void gdisp_lld_control(GDisplay *g) { + LLDSPEC void gdisp_lld_control(GDisplay *g) + { switch(g->p.x) { case GDISP_CONTROL_POWER: if (g->g.Powermode == (gPowermode)g->p.ptr) @@ -307,12 +330,12 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) case gPowerSleep: case gPowerDeepSleep: acquire_bus(g); - write_cmd(g, SSD1312_DISPLAYOFF); + write_cmd_1(g, 0xAE); release_bus(g); break; case gPowerOn: acquire_bus(g); - write_cmd(g, SSD1312_DISPLAYON); + write_cmd_1(g, 0xAF); release_bus(g); break; default: @@ -324,8 +347,9 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) case GDISP_CONTROL_ORIENTATION: if (g->g.Orientation == (gOrientation)g->p.ptr) return; + switch((gOrientation)g->p.ptr) { - /* Rotation is handled by the drawing routines */ + // Rotation is handled by the drawing routines case gOrientation0: case gOrientation180: g->g.Height = GDISP_SCREEN_HEIGHT; @@ -339,6 +363,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) default: return; } + g->g.Orientation = (gOrientation)g->p.ptr; return; @@ -346,7 +371,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) if ((unsigned)g->p.ptr > 100) g->p.ptr = (void *)100; acquire_bus(g); - write_cmd2(g, SSD1312_SETCONTRAST, (((unsigned)g->p.ptr)<<8)/101); + write_cmd_2(g, 0x81, (((unsigned)g->p.ptr)<<8)/101); release_bus(g); g->g.Contrast = (unsigned)g->p.ptr; return; @@ -355,7 +380,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) // 0 = normal, 1 = inverse case GDISP_CONTROL_INVERSE: acquire_bus(g); - write_cmd(g, g->p.ptr ? SSD1312_INVERTDISPLAY : SSD1312_NORMALDISPLAY); + write_cmd_1(g, g->p.ptr ? 0xA7: 0xA6); release_bus(g); return; } diff --git a/drivers/gdisp/SSD1312/gdisp_lld_config.h b/drivers/gdisp/SSD1312/gdisp_lld_config.h index 2e9bfed3..289b6a00 100644 --- a/drivers/gdisp/SSD1312/gdisp_lld_config.h +++ b/drivers/gdisp/SSD1312/gdisp_lld_config.h @@ -22,6 +22,10 @@ #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO -#endif /* GFX_USE_GDISP */ +// This controller supports a special gdispControl() to inverse the display. +// Pass a parameter of 1 for inverse and 0 for normal. +#define GDISP_CONTROL_INVERSE (GDISP_CONTROL_LLD+0) -#endif /* _GDISP_LLD_CONFIG_H */ +#endif // GFX_USE_GDISP + +#endif // _GDISP_LLD_CONFIG_H