From c8ea915892a5c6739002ff2a3e3b48d7cf6a6dd1 Mon Sep 17 00:00:00 2001 From: Yeyin Hu Date: Sat, 20 Dec 2025 23:50:19 +0800 Subject: [PATCH] fix jd79665 driver and add 5.83 bwry * update jd79665 and fixup 7.5 bwry variant * add 5.83 bwry variant * update jd79665 init to match waveshare * merge JD79665_Write_Ram into UC81xx_Write_Ram_Native * merge JD79665_Write_Image into JD79668_Write_Image * merge JD79665_Refresh into JD79668_Refresh * format code * refactor code * fix jd79665 and update JD79668_Clear --------- Co-authored-by: Shuanglei Tao --- EPD/EPD_driver.c | 6 ++- EPD/EPD_driver.h | 3 +- EPD/UC81xx.c | 104 ++++++++++++++++++++++++++++++----------------- html/index.html | 3 +- 4 files changed, 75 insertions(+), 41 deletions(-) diff --git a/EPD/EPD_driver.c b/EPD/EPD_driver.c index 4010ecc..937ca59 100644 --- a/EPD/EPD_driver.c +++ b/EPD/EPD_driver.c @@ -299,12 +299,14 @@ extern epd_model_t epd_ssd1619_420_bw; extern epd_model_t epd_ssd1677_750_bwr; extern epd_model_t epd_ssd1677_750_bw; extern epd_model_t epd_jd79668_420_bwry; -extern epd_model_t epd_jd79668_750_bwry; +extern epd_model_t epd_jd79665_750_bwry; +extern epd_model_t epd_jd79665_583_bwry; static epd_model_t* epd_models[] = { &epd_uc8176_420_bw, &epd_uc8176_420_bwr, &epd_uc8159_750_bw, &epd_uc8159_750_bwr, &epd_uc8179_750_bw, &epd_uc8179_750_bwr, &epd_ssd1619_420_bwr, &epd_ssd1619_420_bw, - &epd_ssd1677_750_bwr, &epd_ssd1677_750_bw, &epd_jd79668_420_bwry, &epd_jd79668_750_bwry, + &epd_ssd1677_750_bwr, &epd_ssd1677_750_bw, &epd_jd79668_420_bwry, &epd_jd79665_750_bwry, + &epd_jd79665_583_bwry, }; epd_model_t* epd_init(epd_model_id_t id) { diff --git a/EPD/EPD_driver.h b/EPD/EPD_driver.h index c69ae91..8c7a82b 100644 --- a/EPD/EPD_driver.h +++ b/EPD/EPD_driver.h @@ -139,7 +139,8 @@ typedef enum { EPD_UC8159_750_LOW_BWR = 9, EPD_SSD1677_750_HD_BW = 10, EPD_SSD1677_750_HD_BWR = 11, - EPD_JD79668_750_BWRY = 12, + EPD_JD79665_750_BWRY = 12, + EPD_JD79665_583_BWRY = 13, } epd_model_id_t; struct epd_driver; diff --git a/EPD/UC81xx.c b/EPD/UC81xx.c index ae3ec14..5af65ca 100644 --- a/EPD/UC81xx.c +++ b/EPD/UC81xx.c @@ -3,13 +3,16 @@ static void UC81xx_WaitBusy(uint16_t timeout) { EPD_WaitBusy(LOW, timeout); } -static void UC81xx_PowerOn(void) { +static void UC81xx_PowerOn(epd_model_t* epd) { EPD_WriteCmd(UC81xx_PON); UC81xx_WaitBusy(200); } -static void UC81xx_PowerOff(void) { - EPD_WriteCmd(UC81xx_POF); +static void UC81xx_PowerOff(epd_model_t* epd) { + if (epd->drv->ic == EPD_DRIVER_IC_JD79665) + EPD_Write(UC81xx_POF, 0x00); + else + EPD_WriteCmd(UC81xx_POF); UC81xx_WaitBusy(200); } @@ -36,34 +39,25 @@ static void _setPartialRamArea(epd_model_t* epd, uint16_t x, uint16_t y, uint16_ void UC81xx_Refresh(epd_model_t* epd) { NRF_LOG_DEBUG("[EPD]: refresh begin\n"); - UC81xx_PowerOn(); + if (epd->drv->ic != EPD_DRIVER_IC_JD79668 && epd->drv->ic != EPD_DRIVER_IC_JD79665) UC81xx_PowerOn(epd); _setPartialRamArea(epd, 0, 0, epd->width, epd->height); EPD_WriteCmd(UC81xx_DRF); + if (epd->drv->ic == EPD_DRIVER_IC_JD79668 || epd->drv->ic == EPD_DRIVER_IC_JD79665) { + EPD_WriteByte(0x00); + } delay(100); UC81xx_WaitBusy(30000); - UC81xx_PowerOff(); + if (epd->drv->ic != EPD_DRIVER_IC_JD79668 && epd->drv->ic != EPD_DRIVER_IC_JD79665) UC81xx_PowerOff(epd); NRF_LOG_DEBUG("[EPD]: refresh end\n"); } -void JD79668_Refresh(epd_model_t* epd) { - NRF_LOG_DEBUG("[EPD]: refresh begin\n"); - - _setPartialRamArea(epd, 0, 0, epd->width, epd->height); - - EPD_WriteCmd(UC81xx_DRF); - delay(100); - UC81xx_WaitBusy(30000); - - NRF_LOG_DEBUG("[EPD]: refresh end\n"); -} - -void UC81xx_Dump_OTP(void) { +void UC81xx_Dump_OTP(epd_model_t* epd) { uint8_t data[128]; - UC81xx_PowerOn(); + UC81xx_PowerOn(epd); EPD_Write(UC81xx_ROTP, 0x00); NRF_LOG_DEBUG("=== OTP BEGIN ===\n"); @@ -73,13 +67,13 @@ void UC81xx_Dump_OTP(void) { } NRF_LOG_DEBUG("=== OTP END ===\n"); - UC81xx_PowerOff(); + UC81xx_PowerOff(epd); } void UC81xx_Init(epd_model_t* epd) { EPD_Reset(HIGH, 10); - // UC81xx_Dump_OTP(); + // UC81xx_Dump_OTP(epd); EPD_Write(UC81xx_PSR, epd->color == BWR ? 0x0F : 0x1F); EPD_Write(UC81xx_CDI, epd->color == BWR ? 0x77 : 0x97); @@ -116,7 +110,34 @@ void JD79668_Init(epd_model_t* epd) { EPD_Write(0xBE, 0xFE); EPD_Write(0xE9, 0x01); - UC81xx_PowerOn(); + UC81xx_PowerOn(epd); +} + +void JD79665_Init(epd_model_t* epd) { + EPD_Reset(HIGH, 50); + UC81xx_WaitBusy(1000); + + EPD_Write(0x4D, 0x78); + EPD_Write(UC81xx_PSR, 0x2F, 0x29); + EPD_Write(UC81xx_BTST, 0x0F, 0x8B, 0x93, 0xA1); + EPD_Write(UC81xx_TSE, 0x00); + EPD_Write(UC81xx_CDI, 0x37); + EPD_Write(UC81xx_TCON, 0x02, 0x02); + EPD_Write(UC81xx_TRES, epd->width / 256, epd->width % 256, epd->height / 256, epd->height % 256); + EPD_Write(0x62, 0x98, 0x98, 0x98, 0x75, 0xCA, 0xB2, 0x98, 0x7E); + + if (epd->id == EPD_JD79665_750_BWRY) { + EPD_Write(UC81xx_GSST, 0x00, 0x00, 0x00, 0x00); + } else { + EPD_Write(UC81xx_GSST, 0x00, 0x10, 0x00, 0x00); + } + + EPD_Write(0xE7, 0x1C); + EPD_Write(UC81xx_PWS, 0x00); + EPD_Write(0xE9, 0x01); + EPD_Write(UC81xx_PLL, 0x08); + + UC81xx_PowerOn(epd); } void UC81xx_Clear(epd_model_t* epd, bool refresh) { @@ -144,9 +165,14 @@ void UC8159_Clear(epd_model_t* epd, bool refresh) { } void JD79668_Clear(epd_model_t* epd, bool refresh) { - uint32_t ram_bytes = ((epd->width + 3) / 4) * epd->height; + uint16_t wb = (epd->width + 3) / 4; - EPD_FillRAM(UC81xx_DTM1, 0x55, ram_bytes); + EPD_WriteCmd(UC81xx_DTM1); + for (uint16_t i = 0; i < epd->height; i++) { + for (uint16_t j = 0; j < wb; j++) { + EPD_WriteByte(0x55); + } + } if (refresh) UC81xx_Refresh(epd); } @@ -227,16 +253,19 @@ void UC8159_Write_Image(epd_model_t* epd, uint8_t* black, uint8_t* color, uint16 void JD79668_Write_Image(epd_model_t* epd, uint8_t* black, uint8_t* color, uint16_t x, uint16_t y, uint16_t w, uint16_t h) { - uint16_t wb = (w + 7) / 8; // width bytes, bitmaps are padded - x -= x % 8; // byte boundary - w = wb * 8; // byte boundary + uint16_t wb = (w + 3) / 4; // width bytes, bitmaps are padded + x -= x % 4; // byte boundary + w = wb * 4; // byte boundary if (x + w > epd->width || y + h > epd->height) return; _setPartialRamArea(epd, x, y, w, h); EPD_WriteCmd(UC81xx_DTM1); - for (uint16_t i = 0; i < h * 2; i++) // 2 bits per pixel - { - for (uint16_t j = 0; j < w / 8; j++) EPD_WriteByte(black ? black[j + i * wb] : 0x55); + for (uint16_t i = 0; i < h; i++) { + for (uint16_t j = 0; j < wb; j++) { + // black buffer contains the packed 2bpp data + // If black is NULL, write 0x55 (White: 01 01 01 01) + EPD_WriteByte(black ? black[j + i * wb] : 0x55); + } } } @@ -255,13 +284,12 @@ void UC81xx_Write_Ram(epd_model_t* epd, uint8_t cfg, uint8_t* data, uint8_t len) // Write native data to ram, format should be 2pp or above void UC81xx_Write_Ram_Native(epd_model_t* epd, uint8_t cfg, uint8_t* data, uint8_t len) { bool begin = (cfg >> 4) == 0x00; - bool black = (cfg & 0x0F) == 0x0F; - if (begin && black) EPD_WriteCmd(UC81xx_DTM1); + if (begin) EPD_WriteCmd(UC81xx_DTM1); EPD_WriteData(data, len); } void UC81xx_Sleep(epd_model_t* epd) { - UC81xx_PowerOff(); + UC81xx_PowerOff(epd); delay(100); EPD_Write(UC81xx_DSLP, 0xA5); } @@ -306,18 +334,18 @@ static epd_driver_t epd_drv_jd79668 = { .clear = JD79668_Clear, .write_image = JD79668_Write_Image, .write_ram = UC81xx_Write_Ram_Native, - .refresh = JD79668_Refresh, + .refresh = UC81xx_Refresh, .sleep = UC81xx_Sleep, .read_temp = UC81xx_Read_Temp, }; static epd_driver_t epd_drv_jd79665 = { .ic = EPD_DRIVER_IC_JD79665, - .init = JD79668_Init, + .init = JD79665_Init, .clear = JD79668_Clear, .write_image = JD79668_Write_Image, .write_ram = UC81xx_Write_Ram_Native, - .refresh = JD79668_Refresh, + .refresh = UC81xx_Refresh, .sleep = UC81xx_Sleep, .read_temp = UC81xx_Read_Temp, }; @@ -337,4 +365,6 @@ const epd_model_t epd_uc8179_750_bwr = {EPD_UC8179_750_BWR, BWR, &epd_drv_uc8179 // JD79668 400x300 Black/White/Red/Yellow const epd_model_t epd_jd79668_420_bwry = {EPD_JD79668_420_BWRY, BWRY, &epd_drv_jd79668, 400, 300}; // JD79665 800x480 Black/White/Red/Yellow -const epd_model_t epd_jd79668_750_bwry = {EPD_JD79668_750_BWRY, BWRY, &epd_drv_jd79665, 800, 480}; +const epd_model_t epd_jd79665_750_bwry = {EPD_JD79665_750_BWRY, BWRY, &epd_drv_jd79665, 800, 480}; +// JD79665 648x480 Black/White/Red/Yellow +const epd_model_t epd_jd79665_583_bwry = {EPD_JD79665_583_BWRY, BWRY, &epd_drv_jd79665, 648, 480}; diff --git a/html/index.html b/html/index.html index 7610345..56794ec 100644 --- a/html/index.html +++ b/html/index.html @@ -28,9 +28,10 @@ + - +