diff --git a/ChangeLog b/ChangeLog index 4b39bed6..c11ac254 100644 --- a/ChangeLog +++ b/ChangeLog @@ -189,4 +189,7 @@ https://github.com/olikraus/u8g2 ChangeLog * NEW FONT FORMAT for speedup of the unicode font section (issue 596) * Fixed a bug in the font construction for monospaced fonts (issue 669) * Added SpaceTrash game (issue 622) + * Added support for T6963 160x80 Displays (issue 635) + * Added support for EA W128128 (issue 641) + diff --git a/csrc/u8x8.h b/csrc/u8x8.h index 34c451c3..ab51ee70 100644 --- a/csrc/u8x8.h +++ b/csrc/u8x8.h @@ -826,6 +826,7 @@ uint8_t u8x8_d_st7567_pi_132x64(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void uint8_t u8x8_d_st7567_jlx12864(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr); uint8_t u8x8_d_st7567_enh_dg128064(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr); uint8_t u8x8_d_st7567_enh_dg128064i(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr); +uint8_t u8x8_d_st7567_64x32(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr); uint8_t u8x8_d_st7586s_s028hn118a(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr); uint8_t u8x8_d_st7586s_erc240160(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr); uint8_t u8x8_d_st7588_jlx12864(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr); diff --git a/csrc/u8x8_d_st7567.c b/csrc/u8x8_d_st7567.c index 04a07593..ede2ca36 100644 --- a/csrc/u8x8_d_st7567.c +++ b/csrc/u8x8_d_st7567.c @@ -572,3 +572,140 @@ uint8_t u8x8_d_st7567_enh_dg128064i(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, return 1; } + +/*=====================================================*/ +/* issue 657 */ + +static const u8x8_display_info_t u8x8_st7567_64x32_display_info = +{ + /* chip_enable_level = */ 0, + /* chip_disable_level = */ 1, + + /* post_chip_enable_wait_ns = */ 150, /* */ + /* pre_chip_disable_wait_ns = */ 50, /* */ + /* reset_pulse_width_ms = */ 1, + /* post_reset_wait_ms = */ 1, + /* sda_setup_time_ns = */ 50, /* */ + /* sck_pulse_width_ns = */ 120, /* */ + /* sck_clock_hz = */ 4000000UL, /* */ + /* spi_mode = */ 0, /* active high, rising edge */ + /* i2c_bus_clock_100kHz = */ 4, + /* data_setup_time_ns = */ 40, /* */ + /* write_pulse_width_ns = */ 80, /* */ + /* tile_width = */ 8, + /* tile_hight = */ 4, + /* default_x_offset = */ 32, + /* flipmode_x_offset = */ 32, + /* pixel_width = */ 64, + /* pixel_height = */ 32 +}; + +static const uint8_t u8x8_d_st7567_64x32_init_seq[] = { + + U8X8_START_TRANSFER(), /* enable chip, delay is part of the transfer start */ + + U8X8_C(0x0e2), /* soft reset */ + U8X8_C(0x0ae), /* display off */ + U8X8_C(0x040), /* set display start line to 0 */ + + U8X8_C(0x0a1), /* ADC */ + U8X8_C(0x0c0), /* common output mode */ + // Flipmode + //U8X8_C(0x0a0), /* ADC */ + //U8X8_C(0x0c8), /* common output mode */ + + U8X8_C(0x0a6), /* display normal, bit val 0: LCD pixel off. */ + U8X8_C(0x0a2), /* LCD bias 1/9 */ + U8X8_C(0x028|4), /* all power control circuits on */ + U8X8_DLY(50), + U8X8_C(0x028|6), /* all power control circuits on */ + U8X8_DLY(50), + U8X8_C(0x028|7), /* all power control circuits on */ + U8X8_DLY(50), + + U8X8_C(0x024), /* v0 voltage resistor ratio, taken from issue 657 */ + U8X8_CA(0x081, 0x080), /* set contrast, contrast value*/ + + U8X8_C(0x0ae), /* display off */ + U8X8_C(0x0a5), /* enter powersafe: all pixel on, issue 142 */ + + U8X8_END_TRANSFER(), /* disable chip */ + U8X8_END() /* end of sequence */ +}; + + +uint8_t u8x8_d_st7567_64x32(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr) +{ + uint8_t x, c; + uint8_t *ptr; + switch(msg) + { + case U8X8_MSG_DISPLAY_SETUP_MEMORY: + u8x8_d_helper_display_setup_memory(u8x8, &u8x8_st7567_64x32_display_info); + break; + case U8X8_MSG_DISPLAY_INIT: + u8x8_d_helper_display_init(u8x8); + u8x8_cad_SendSequence(u8x8, u8x8_st7567_64x32_init_seq); + break; + case U8X8_MSG_DISPLAY_SET_POWER_SAVE: + if ( arg_int == 0 ) + u8x8_cad_SendSequence(u8x8, u8x8_d_st7567_132x64_powersave0_seq); + else + u8x8_cad_SendSequence(u8x8, u8x8_d_st7567_132x64_powersave1_seq); + break; + case U8X8_MSG_DISPLAY_SET_FLIP_MODE: + if ( arg_int == 0 ) + { + u8x8_cad_SendSequence(u8x8, u8x8_d_st7567_132x64_flip0_seq); + u8x8->x_offset = u8x8->display_info->default_x_offset; + } + else + { + u8x8_cad_SendSequence(u8x8, u8x8_d_st7567_132x64_flip1_seq); + u8x8->x_offset = u8x8->display_info->flipmode_x_offset; + } + break; +#ifdef U8X8_WITH_SET_CONTRAST + case U8X8_MSG_DISPLAY_SET_CONTRAST: + u8x8_cad_StartTransfer(u8x8); + u8x8_cad_SendCmd(u8x8, 0x081 ); + u8x8_cad_SendArg(u8x8, arg_int >> 2 ); /* st7567 has range from 0 to 63 */ + u8x8_cad_EndTransfer(u8x8); + break; +#endif + case U8X8_MSG_DISPLAY_DRAW_TILE: + u8x8_cad_StartTransfer(u8x8); + + x = ((u8x8_tile_t *)arg_ptr)->x_pos; + x *= 8; + x += u8x8->x_offset; + u8x8_cad_SendCmd(u8x8, 0x010 | (x>>4) ); + u8x8_cad_SendCmd(u8x8, 0x000 | ((x&15))); + u8x8_cad_SendCmd(u8x8, 0x0b0 | (((u8x8_tile_t *)arg_ptr)->y_pos)); + + c = ((u8x8_tile_t *)arg_ptr)->cnt; + c *= 8; + ptr = ((u8x8_tile_t *)arg_ptr)->tile_ptr; + /* + The following if condition checks the hardware limits of the st7567 + controller: It is not allowed to write beyond the display limits. + This is in fact an issue within flip mode. + */ + if ( c + x > 132u ) + { + c = 132u; + c -= x; + } + do + { + u8x8_cad_SendData(u8x8, c, ptr); /* note: SendData can not handle more than 255 bytes */ + arg_int--; + } while( arg_int > 0 ); + + u8x8_cad_EndTransfer(u8x8); + break; + default: + return 0; + } + return 1; +} diff --git a/tools/codebuild/codebuild.c b/tools/codebuild/codebuild.c index edb4c870..0fb4eaf2 100644 --- a/tools/codebuild/codebuild.c +++ b/tools/codebuild/codebuild.c @@ -820,6 +820,25 @@ struct controller controller_list[] = } }, + { + "st7567", 8, 4, "u8g2_ll_hvline_vertical_top_lsb", "u8x8_cad_001", "", COM_4WSPI|COM_6800|COM_8080, + "", /* is_generate_u8g2_class= */ 1, + { + { "64x32" }, + { NULL } + } + }, + { + "st7567", 8, 4, "u8g2_ll_hvline_vertical_top_lsb", "u8x8_cad_ssd13xx_i2c", "i2c", COM_I2C, + "", /* is_generate_u8g2_class= */ 1, + { + { "64x32" }, + { NULL } + } + }, + + + { "st7586s", 48, 17, "u8g2_ll_hvline_horizontal_right_lsb", "u8x8_cad_011", "", COM_4WSPI, "", /* is_generate_u8g2_class= */ 1,