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

issue #412

This commit is contained in:
olikraus 2017-12-09 10:36:24 +01:00
parent 749c044271
commit d5d599c833
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
csrc/u8x8_d_ssd1322.c
View File

@ -368,8 +368,9 @@ uint8_t u8x8_d_ssd1322_common2(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void
u8x8_cad_StartTransfer(u8x8);
x = ((u8x8_tile_t *)arg_ptr)->x_pos;
x *= 2; // only every 4th col can be addressed
x *= 2; // only every second pixel is used in the 128x64 NHD OLED
x += u8x8->x_offset;
x *= 2; // only every second pixel is used in the 128x64 NHD OLED
y = (((u8x8_tile_t *)arg_ptr)->y_pos);
y *= 8;
@ -449,8 +450,8 @@ static const u8x8_display_info_t u8x8_ssd1322_128x64_display_info =
/* write_pulse_width_ns = */ 150, /* SSD1322: cycle time is 300ns, so use 300/2 = 150 */
/* tile_width = */ 16, /* 128 pixel */
/* tile_hight = */ 8,
/* default_x_offset = */ 0x01c, /* this is the byte offset (there are two pixel per byte with 4 bit per pixel) */
/* flipmode_x_offset = */ 0x01c,
/* default_x_offset = */ 28, /* this is the byte offset (there are two pixel per byte with 4 bit per pixel) */
/* flipmode_x_offset = */ 28,
/* pixel_width = */ 128,
/* pixel_height = */ 64
};

6
sys/arduino/u8x8/FlipMode/FlipMode.ino
View File

@ -78,7 +78,7 @@
//U8X8_SSD1309_128X64_NONAME2_4W_HW_SPI u8x8(/* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
//U8X8_SSD1322_NHD_256X64_4W_SW_SPI u8x8(/* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
//U8X8_SSD1322_NHD_256X64_4W_HW_SPI u8x8(/* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
//U8X8_SSD1322_NHD_128X64_4W_SW_SPI u8x8(/* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
U8X8_SSD1322_NHD_128X64_4W_SW_SPI u8x8(/* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
//U8X8_SSD1322_NHD_128X64_4W_HW_SPI u8x8(/* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
//U8X8_SSD1325_NHD_128X64_4W_SW_SPI u8x8(/* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
//U8X8_SSD1325_NHD_128X64_4W_HW_SPI u8x8(/* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
@ -172,7 +172,7 @@ void loop(void)
u8x8.setInverseFont(1);
u8x8.drawString(0,0,"FlipMode 0");
u8x8.setInverseFont(0);
u8x8.drawString(0,2,"FlipMode 0");
u8x8.drawString(1,1,"FlipMode 0");
delay(1500);
u8x8.clear();
@ -180,7 +180,7 @@ void loop(void)
u8x8.setInverseFont(1);
u8x8.drawString(0,0,"FlipMode 1");
u8x8.setInverseFont(0);
u8x8.drawString(0,3,"FlipMode 1");
u8x8.drawString(1,1,"FlipMode 1");
delay(1500);
}

2
tools/release/print_release.sh
View File

@ -1,2 +1,2 @@
# without 'v' prefix
echo -n "2.20.10"
echo -n "2.20.11"