Michel2/U8g2_Arduino
1
0
Fork 0
mirror of https://github.com/olikraus/U8g2_Arduino.git synced 2026-07-28 04:16:19 +00:00
Code Issues Releases Activity

2.17.7

Browse Source
This commit is contained in:
olikraus
2017-08-26 18:11:53 +02:00
parent 093137de58
commit cde20a058b
5 changed files with 70 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/page_buffer/HelloWorld/HelloWorld.ino
+1 -1
View File
@@ -154,7 +154,7 @@
//U8G2_UC1611_EA_DOGXL240_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // SW SPI, Due DOGXL240 Test Board
//U8G2_SSD1606_172X72_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // eInk/ePaper Display
//U8G2_SSD1607_200X200_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // eInk/ePaper Display
//U8G2_IL3820_296X128_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // WaveShare 2.9 inch eInk/ePaper Display, enable 16 bit mode for this display!
U8G2_IL3820_296X128_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // WaveShare 2.9 inch eInk/ePaper Display, enable 16 bit mode for this display!
library.properties
+1 -1
View File
@@ -1,5 +1,5 @@
name=U8g2
version=2.17.6
version=2.17.7
author=oliver <olikraus@gmail.com>
maintainer=oliver <olikraus@gmail.com>
sentence=Monochrome LCD, OLED and eInk Library. Display controller: SSD1305, SSD1306, SSD1309, SSD1322, SSD1325, SSD1327, SSD1329, SSD1606, SSD1607, SH1106, T6963, RA8835, LC7981, PCD8544, PCF8812, UC1604, UC1608, UC1610, UC1611, UC1701, ST7565, ST7567, ST7588, NT7534, IST3020, ST7920, LD7032, KS0108, SED1520, SBN1661, MAX7219. Interfaces: I2C, SPI, Parallel.
src/clib/u8g2.h
+5
View File
@@ -994,6 +994,11 @@ void u8g2_SetupBuffer_SDL_128x64_4(u8g2_t *u8g2, const u8g2_cb_t *u8g2_cb);
void u8g2_SetupBuffer_TGA_DESC(u8g2_t *u8g2, const u8g2_cb_t *u8g2_cb);
void u8g2_SetupBuffer_TGA_LCD(u8g2_t *u8g2, const u8g2_cb_t *u8g2_cb);
/*==========================================*/
/* u8x8_d_bitmap.c */
void u8g2_SetupBitmap(u8g2_t *u8g2, const u8g2_cb_t *u8g2_cb, uint16_t tile_width, uint16_t tile_height);
/*==========================================*/
/* u8x8_d_utf8.c */
/* 96x32 stdout */
src/clib/u8x8.h
+7
View File
@@ -729,6 +729,13 @@ void u8x8_Setup_TGA_DESC(u8x8_t *u8x8);
void u8x8_Setup_TGA_LCD(u8x8_t *u8x8);
void tga_save(const char *name);
/*==========================================*/
/* u8x8_d_bitmap.c */
uint8_t u8x8_GetBitmapPixel(u8x8_t *u8x8, uint16_t x, uint16_t y);
void u8x8_SaveBitmapTGA(u8x8_t *u8x8, const char *filename);
void u8x8_SetupBitmap(u8x8_t *u8x8, uint16_t tile_width, uint16_t tile_height);
uint8_t u8x8_ConnectBitmapToU8x8(u8x8_t *u8x8);
/*==========================================*/
/* u8x8_d_utf8.c */
void u8x8_Setup_Utf8(u8x8_t *u8x8); /* stdout UTF-8 display */
src/clib/u8x8_d_il3820_296x128.c
+56 -22
View File
@@ -82,11 +82,11 @@ static const uint8_t u8x8_d_il3820_296x128_init_seq[] = {
U8X8_CA(0x11, 0x01), /* Define data entry mode, x&y inc, x first*/
U8X8_CAA(0x44, 0, 31), /* RAM x start & end, 32*4=128 */
U8X8_CAA(0x44, 0, 29), /* RAM x start & end, 32*4=128 */
U8X8_CAAAA(0x45, 0, 0, 295&255, 295>>8), /* RAM y start & end, 0..295 */
U8X8_CA(0x4e, 0), /* set x pos, 0..29? */
U8X8_CAA(0x4f, 0&255, 0>>8), /* set y pos, 0...320??? */
U8X8_CAA(0x4f, 100&255, 100>>8), /* set y pos, 0...320??? */
U8X8_CA(0x22, 0xc0), /* display update seq. option: enable clk, enable CP, .... todo: this is never activated */
@@ -119,8 +119,7 @@ according to section 6.8:
*/
/*
static unsigned char LUTDefault_full[] =
{
static unsigned char LUTDefault_full[] =
0x32,
0x02,0x02,0x01,0x11,0x12, 0x12,0x22,0x22,0x66,0x69,
0x69,0x59,0x58,0x99,0x99, 0x88,0x00,0x00,0x00,0x00,
@@ -178,7 +177,40 @@ static unsigned char LUTDefault_full[] =
U8X8_CA(0x3b, 0x08), /* gate time */
U8X8_CA(0x3c, 0x33), /* select boarder waveform */
U8X8_CA(0x22, 0xc4), /* display update seq. option: clk -> CP -> LUT -> initial display -> pattern display */
U8X8_CA(0x11, 0x07), /* Define data entry mode, x&y inc, x first*/
U8X8_CAA(0x44, 0, 29), /* RAM x start & end, 32*4=128 */
U8X8_CAAAA(0x45, 0, 0, 295&255, 295>>8), /* RAM y start & end, 0..295 */
U8X8_CA(0x4e, 0), /* set x pos, 0..29? */
U8X8_CAA(0x4f, 0, 0), /* set y pos, 0...320??? */
U8X8_C(0x024), /* data write */
U8X8_D1(0x000),
U8X8_D1(0x000),
U8X8_D1(0x081),
U8X8_D1(0x081),
U8X8_D1(0x0c3),
U8X8_D1(0x0c3),
U8X8_D1(0x0e7),
U8X8_D1(0x0e7),
U8X8_D1(0x00f),
U8X8_D1(0x00f),
U8X8_D1(0x00f),
U8X8_D1(0x00f),
U8X8_D1(0x00f),
U8X8_D1(0x00f),
U8X8_D1(0x00f),
U8X8_D1(0x00f),
U8X8_END_TRANSFER(), /* disable chip */
U8X8_END() /* end of sequence */
};
@@ -264,29 +296,27 @@ static void u8x8_d_il3820_draw_tile(u8x8_t *u8x8, uint8_t arg_int, void *arg_ptr
x *= 8;
x += u8x8->x_offset;
u8x8_cad_SendCmd(u8x8, 0x00f ); /* scan start */
u8x8_cad_SendArg(u8x8, 0);
u8x8_cad_SendCmd(u8x8, 0x011 ); /* cursor increment mode */
u8x8_cad_SendArg(u8x8, 3);
u8x8_cad_SendCmd(u8x8, 0x045 ); /* window start column */
u8x8_cad_SendArg(u8x8, 0);
u8x8_cad_SendArg(u8x8, 0);
u8x8_cad_SendArg(u8x8, 296-1); /* end of display */
u8x8_cad_SendArg(u8x8, 0);
u8x8_cad_SendCmd(u8x8, 0x044 ); /* window end page */
u8x8_cad_SendArg(u8x8, page);
u8x8_cad_SendArg(u8x8, page+1);
//u8x8_cad_SendCmd(u8x8, 0x00f ); /* scan start */
//u8x8_cad_SendArg(u8x8, 0);
//u8x8_cad_SendArg(u8x8, 199/8);
u8x8_cad_SendCmd(u8x8, 0x04f ); /* window column */
//u8x8_cad_SendCmd(u8x8, 0x011 ); /* cursor increment mode */
//u8x8_cad_SendArg(u8x8, 3);
//u8x8_cad_SendCmd(u8x8, 0x045 ); /* window start column */
//u8x8_cad_SendArg(u8x8, 0);
//u8x8_cad_SendArg(u8x8, 0);
//u8x8_cad_SendArg(u8x8, (296-1)&255); /* end of display */
//u8x8_cad_SendArg(u8x8, (296-1)>>8);
//u8x8_cad_SendCmd(u8x8, 0x044 ); /* window end page */
//u8x8_cad_SendArg(u8x8, page);
//u8x8_cad_SendArg(u8x8, page+1);
u8x8_cad_SendCmd(u8x8, 0x04f ); /* set cursor column */
u8x8_cad_SendArg(u8x8, x&255);
u8x8_cad_SendArg(u8x8, x>>8);
u8x8_cad_SendCmd(u8x8, 0x04e ); /* window row */
u8x8_cad_SendCmd(u8x8, 0x04e ); /* set cursor row */
u8x8_cad_SendArg(u8x8, page);
u8x8_cad_SendCmd(u8x8, 0x024 );
@@ -323,6 +353,10 @@ static uint8_t u8x8_d_il3820_296x128_generic(u8x8_t *u8x8, uint8_t msg, uint8_t
u8x8_d_helper_display_init(u8x8);
u8x8_cad_SendSequence(u8x8, u8x8_d_il3820_296x128_init_seq);
//u8x8_cad_SendSequence(u8x8, u8x8_d_il3820_to_display_seq);
//for(;;)
//;
#ifdef NOT_USED
/* STRATEGY FOR SSD1606 */