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

merge + comments

This commit is contained in:
olikraus 2016-07-27 10:30:59 +02:00
parent 5e049d4ddc
commit 573611c257
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
csrc/u8x8.h
View File

@ -211,6 +211,8 @@ struct u8x8_display_info_struct
/* AVR: below 70: DIV2, 8 MHz, >= 70 --> 4MHz clock (DIV4) */ /* AVR: below 70: DIV2, 8 MHz, >= 70 --> 4MHz clock (DIV4) */
uint8_t sck_pulse_width_ns; /* UC1701: 50ns */ uint8_t sck_pulse_width_ns; /* UC1701: 50ns */
/* previous name "sck_takeover_edge" renamed to "spi_mode" */
/* bit 0 of spi_mode is equal to the value of the previous variable sck_takeover_edge */
/* SPI has four clock modes: */ /* SPI has four clock modes: */
/* 0: clock active high, data out on falling edge */ /* 0: clock active high, data out on falling edge */
/* 1: clock active high, data out on rising edge */ /* 1: clock active high, data out on rising edge */

2
csrc/u8x8_d_st7920.c
View File

@ -156,7 +156,7 @@ static const u8x8_display_info_t u8x8_st7920_192x32_display_info =
/* post_reset_wait_ms = */ 6, /* post_reset_wait_ms = */ 6,
/* sda_setup_time_ns = */ 20, /* sda_setup_time_ns = */ 20,
/* sck_pulse_width_ns = */ 140, /* datasheet ST7920 */ /* sck_pulse_width_ns = */ 140, /* datasheet ST7920 */
/* spi_mode = */ 1, /* active high, rising edge */ /* spi_mode = */ 1, /* old: sck_takeover_edge, new: active high (bit 1), rising edge (bit 0) */
/* i2c_bus_clock_100kHz = */ 4, /* i2c_bus_clock_100kHz = */ 4,
/* data_setup_time_ns = */ 30, /* data_setup_time_ns = */ 30,
/* write_pulse_width_ns = */ 40, /* write_pulse_width_ns = */ 40,