diff --git a/ChangeLog b/ChangeLog index e3968d2772f2386dc088d19dc056cb8ec6337990..6aa0e2b1ef5d4737738f6abcb0e94083fab38fcc 100755 --- a/ChangeLog +++ b/ChangeLog @@ -11011,3 +11011,6 @@ * libc/stdlib/lib_qsort.c and include/stdlib.h: Make coding style more conformant, take description from OpenGroup.org, rename formal parameters to match names used on OpenGroup.org (2015-10-02). + * drivers/lcd/st7565.c: Extend to include support for the ERC12864-3. + From Pierre-noel Bouteville (2015-10-07). + diff --git a/arch b/arch index 0f4940ff6339d4a4e4b8fdfeb3af8dd54f77b93f..0b8c98bfac171b330430a02070ecbe8bb9618de3 160000 --- a/arch +++ b/arch @@ -1 +1 @@ -Subproject commit 0f4940ff6339d4a4e4b8fdfeb3af8dd54f77b93f +Subproject commit 0b8c98bfac171b330430a02070ecbe8bb9618de3 diff --git a/drivers/lcd/Kconfig b/drivers/lcd/Kconfig index a895ca0dea512244b211bca42752db03224a4ac1..a7be77550c3d10e7cac58eed5e99367549cc3780 100644 --- a/drivers/lcd/Kconfig +++ b/drivers/lcd/Kconfig @@ -564,6 +564,9 @@ choice config NHD_C12864KGZ bool "like NHD C12864KGZ" +config ERC_12864_3 + bool "like ERC12864-3" + endchoice config ST7565_NINTERFACES diff --git a/drivers/lcd/st7565.c b/drivers/lcd/st7565.c index 592c39d3aedfc3c1de91eeda960bae72961d049f..fb42531d2a413cd92f54a3c981ed6f6d5f879eb5 100644 --- a/drivers/lcd/st7565.c +++ b/drivers/lcd/st7565.c @@ -1025,6 +1025,17 @@ FAR struct lcd_dev_s *st7565_initialize(FAR struct st7565_lcd_s *lcd, (void)st7565_send_one_data(priv, ST7565_POWERCTRL_INT); (void)st7565_send_one_data(priv, ST7565_SETSTARTLINE); +#elif CONFIG_ERC_12864_3 + + (void)st7565_send_one_data(priv, ST7565_ADCNORMAL); + (void)st7565_send_one_data(priv, ST7565_SETCOMREVERSE); + (void)st7565_send_one_data(priv, ST7565_BIAS_1_9); + (void)st7565_send_one_data(priv, ST7565_POWERCTRL_INT); + (void)st7565_send_one_data(priv, ST7565_REG_RES_5_5); + (void)st7565_send_one_data(priv, ST7565_SETEVMODE); + (void)st7565_send_one_data(priv, ST7565_SETEVREG(0x24)); + (void)st7565_send_one_data(priv, ST7565_SETSTARTLINE); + #else # error "No initialization sequence selected" #endif