wuqiyang312
/
u8g2-copy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

issue #266, #292

This commit is contained in:
olikraus 2017-07-01 09:57:00 +02:00
parent 0544031610
commit 34392bcc0f
6 changed files with 2726 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -117,5 +117,7 @@ https://github.com/olikraus/u8g2 ChangeLog
* Added more examples (issue 216)
* Updated code for NHD C12864 (issues 219 and 241)
* Improved speed for HW SPI with SSD13xx OLEDs (issue 215)
2017-xx-xx v2.16.x
* Fonts u8g2_font_unifont_t_korean1, u8g2_font_unifont_t_korean2 (issue 266)

2
csrc/u8g2.h
View File

@ -1368,6 +1368,8 @@ extern const uint8_t u8g2_font_unifont_t_chinese2[] U8G2_FONT_SECTION("u8g2_font
extern const uint8_t u8g2_font_unifont_t_chinese3[] U8G2_FONT_SECTION("u8g2_font_unifont_t_chinese3");
extern const uint8_t u8g2_font_unifont_t_japanese1[] U8G2_FONT_SECTION("u8g2_font_unifont_t_japanese1");
extern const uint8_t u8g2_font_unifont_t_japanese2[] U8G2_FONT_SECTION("u8g2_font_unifont_t_japanese2");
extern const uint8_t u8g2_font_unifont_t_korean1[] U8G2_FONT_SECTION("u8g2_font_unifont_t_korean1");
extern const uint8_t u8g2_font_unifont_t_korean2[] U8G2_FONT_SECTION("u8g2_font_unifont_t_korean2");
extern const uint8_t u8g2_font_gb16st_t_1[] U8G2_FONT_SECTION("u8g2_font_gb16st_t_1");
extern const uint8_t u8g2_font_gb16st_t_2[] U8G2_FONT_SECTION("u8g2_font_gb16st_t_2");
extern const uint8_t u8g2_font_gb16st_t_3[] U8G2_FONT_SECTION("u8g2_font_gb16st_t_3");

2665
csrc/u8g2_fonts.c
View File

File diff suppressed because it is too large Load Diff

55
csrc/u8x8_d_st7565.c
View File

@ -249,6 +249,8 @@ uint8_t u8x8_d_st7565_ea_dogm128(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, voi
static const uint8_t u8x8_d_st7565_64128n_init_seq[] = {
U8X8_START_TRANSFER(), /* enable chip, delay is part of the transfer start */
#ifdef NOT_WORKING
U8X8_C(0x0e2), /* soft reset */
U8X8_C(0x0ae), /* display off */
@ -273,11 +275,62 @@ static const uint8_t u8x8_d_st7565_64128n_init_seq[] = {
U8X8_C(0x0ae), /* display off */
U8X8_C(0x0a5), /* enter powersafe: all pixel on, issue 142 */
#else
U8X8_C(0x0e2), /* soft reset */
U8X8_C(0x0A2), /* 0x0a2: LCD bias 1/9 (according to Displaytech 64128N datasheet) */
U8X8_C(0x0a1), /* ADC set to reverse */
U8X8_C(0x0c0), /* common output mode */
//U8X8_C(0x0A0), /* Normal ADC Select (according to Displaytech 64128N datasheet) */
//U8X8_C(0x0c8), /* common output mode: set scan direction normal operation/SHL Select, 0x0c0 --> SHL = 0, normal, 0x0c8 --> SHL = 1 */
U8X8_C(0x040), /* Display start line for Displaytech 64128N */
U8X8_C(0x028 | 0x04), /* power control: turn on voltage converter */
U8X8_C(0x028 | 0x06), /* power control: turn on voltage regulator */
U8X8_C(0x028 | 0x07), /* power control: turn on voltage follower */
U8X8_C(0x010), /* Set V0 voltage resistor ratio. Setting for controlling brightness of Displaytech 64128N */
U8X8_C(0x0a6), /* display normal, bit val 0: LCD pixel off. */
U8X8_C(0x081), /* set contrast */
U8X8_C(0x01e), /* Contrast value. Setting for controlling brightness of Displaytech 64128N */
//U8X8_C(0x0af), /* display on */
//U8X8_C(0x0a5), /* display all points, ST7565 */
//U8X8_C(0x0a4), /* normal display */
U8X8_C(0x0ae), /* display off */
#endif
U8X8_END_TRANSFER(), /* disable chip */
U8X8_END() /* end of sequence */
};
static const u8x8_display_info_t u8x8_st7565_64128n_display_info =
{
/* chip_enable_level = */ 0,
/* chip_disable_level = */ 1,
/* post_chip_enable_wait_ns = */ 150, /* st7565 datasheet, table 26, tcsh */
/* pre_chip_disable_wait_ns = */ 50, /* st7565 datasheet, table 26, tcss */
/* reset_pulse_width_ms = */ 1,
/* post_reset_wait_ms = */ 1,
/* sda_setup_time_ns = */ 50, /* st7565 datasheet, table 26, tsds */
/* sck_pulse_width_ns = */ 120, /* half of cycle time (100ns according to datasheet), AVR: below 70: 8 MHz, >= 70 --> 4MHz clock */
/* sck_clock_hz = */ 4000000UL, /* since Arduino 1.6.0, the SPI bus speed in Hz. Should be 1000000000/sck_pulse_width_ns */
/* spi_mode = */ 0, /* active high, rising edge */
/* i2c_bus_clock_100kHz = */ 4,
/* data_setup_time_ns = */ 40, /* st7565 datasheet, table 24, tds8 */
/* write_pulse_width_ns = */ 80, /* st7565 datasheet, table 24, tcclw */
/* tile_width = */ 16, /* width of 16*8=128 pixel */
/* tile_hight = */ 8,
/* default_x_offset = */ 4,
/* flipmode_x_offset = */ 0,
/* pixel_width = */ 128,
/* pixel_height = */ 64
};
uint8_t u8x8_d_st7565_64128n(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr)
{
/* call common procedure first and handle messages there */
@ -287,7 +340,7 @@ uint8_t u8x8_d_st7565_64128n(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *a
switch(msg)
{
case U8X8_MSG_DISPLAY_SETUP_MEMORY:
u8x8_d_helper_display_setup_memory(u8x8, &u8x8_st7565_128x64_display_info);
u8x8_d_helper_display_setup_memory(u8x8, &u8x8_st7565_64128n_display_info);
break;
case U8X8_MSG_DISPLAY_INIT:
u8x8_d_helper_display_init(u8x8);

2
tools/font/build/build.c
View File

@ -338,6 +338,8 @@ struct fontinfo fi[] = {
{ 0, "unifont.bdf", "unifont", 6, 0, BM_T, FM_C, MM_M, "japanese1.map", "_japanese1" },
{ 0, "unifont.bdf", "unifont", 6, 0, BM_T, FM_C, MM_M, "japanese2.map", "_japanese2" },
{ 0, "unifont.bdf", "unifont", 6, 0, BM_T, FM_C, MM_M, "korean1.map", "_korean1" },
{ 0, "unifont.bdf", "unifont", 6, 0, BM_T, FM_C, MM_M, "korean2.map", "_korean2" },
{ 0, "gb16st.bdf", "gb16st", 13, 0, BM_T, FM_C, MM_M, "chinese1.map", "_1" },

2
tools/release/print_release.sh
View File

@ -1,2 +1,2 @@
# without 'v' prefix
echo -n "2.16.2"
echo -n "2.16.4"