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

issue #1151 temp checkin

This commit is contained in:
kraus 2020-04-19 00:47:28 +02:00
parent 60c3417d42
commit b4e5ca4dd7
6 changed files with 79 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
csrc/u8x8_d_uc1610.c
View File

@ -273,16 +273,9 @@ uint8_t u8x8_d_uc1610_ea_dogxl160(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, vo
{
c = ((u8x8_tile_t *)arg_ptr)->cnt;
ptr = ((u8x8_tile_t *)arg_ptr)->tile_ptr;
do
{
u8x8_cad_SendData(u8x8, 16, u8x8_convert_tile_for_uc1610(ptr));
ptr += 8;
x += 8;
c--;

87
csrc/u8x8_d_uc1617.c
View File

@ -55,18 +55,37 @@ static const uint8_t u8x8_d_uc1617_powersave1_seq[] = {
static const uint8_t u8x8_d_uc1617_flip0_seq[] = {
U8X8_START_TRANSFER(), /* enable chip, delay is part of the transfer start */
U8X8_C(0x0c4), /* LCD Mapping */
//U8X8_C(0x0c2), /* LCD Mapping */
U8X8_END_TRANSFER(), /* disable chip */
U8X8_END() /* end of sequence */
};
static const uint8_t u8x8_d_uc1617_flip1_seq[] = {
U8X8_START_TRANSFER(), /* enable chip, delay is part of the transfer start */
U8X8_C(0x0c2), /* LCD Mapping */
//U8X8_C(0x0c4), /* LCD Mapping */
U8X8_END_TRANSFER(), /* disable chip */
U8X8_END() /* end of sequence */
};
static uint8_t *u8x8_convert_tile_for_uc1617(uint8_t *t)
{
uint8_t i;
uint16_t r;
static uint8_t buf[16];
uint8_t *pbuf = buf;
for( i = 0; i < 8; i++ )
{
r = u8x8_upscale_byte(*t++);
*pbuf = r & 255;
r >>= 8;
pbuf+=8;
*pbuf = r;
pbuf-=7;
}
return buf;
}
uint8_t u8x8_d_uc1617_common(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr)
{
@ -80,22 +99,58 @@ uint8_t u8x8_d_uc1617_common(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *a
x = ((u8x8_tile_t *)arg_ptr)->x_pos;
x *= 8;
x += u8x8->x_offset;
u8x8_cad_SendCmd(u8x8, 0x000 | ((x&15)));
u8x8_cad_SendCmd(u8x8, 0x010 | (x>>4) );
y = ((u8x8_tile_t *)arg_ptr)->y_pos;
u8x8_cad_SendCmd(u8x8, 0x060 | (y&15));
u8x8_cad_SendCmd(u8x8, 0x070 | (y>>4));
y*=2;
do
{
c = ((u8x8_tile_t *)arg_ptr)->cnt;
ptr = ((u8x8_tile_t *)arg_ptr)->tile_ptr;
do
{
u8x8_cad_SendCmd(u8x8, 0x060 | (x&15));
u8x8_cad_SendCmd(u8x8, 0x070 | (x>>4));
u8x8_cad_SendCmd(u8x8, 0x00 | (y));
u8x8_cad_SendCmd(u8x8, 0xf8 ); /* disable window */
u8x8_cad_SendCmd(u8x8, 0xf4 ); /* page start */
u8x8_cad_SendCmd(u8x8, y );
u8x8_cad_SendCmd(u8x8, 0xf5 ); /* x start */
u8x8_cad_SendCmd(u8x8, x );
u8x8_cad_SendCmd(u8x8, 0xf6 ); /* page end */
u8x8_cad_SendCmd(u8x8, y+1 );
u8x8_cad_SendCmd(u8x8, 0xf7 ); /* x end */
u8x8_cad_SendCmd(u8x8, x+7 );
u8x8_cad_SendCmd(u8x8, 0xf9 ); /* enable window */
u8x8_cad_SendData(u8x8, 16, u8x8_convert_tile_for_uc1617(ptr));
ptr += 8;
x += 8;
c--;
} while( c > 0 );
arg_int--;
} while( arg_int > 0 );
/*
c = ((u8x8_tile_t *)arg_ptr)->cnt;
c *= 8;
ptr = ((u8x8_tile_t *)arg_ptr)->tile_ptr;
do
{
u8x8_cad_SendData(u8x8, c, ptr); /* note: SendData can not handle more than 255 bytes */
u8x8_cad_SendData(u8x8, c, ptr);
arg_int--;
} while( arg_int > 0 );
*/
u8x8_cad_EndTransfer(u8x8);
break;
@ -147,7 +202,7 @@ static const uint8_t u8x8_d_uc1617_jlx128128_init_seq[] = {
U8X8_C(0x02f), /* internal pump control */
U8X8_C(0x0eb), /* bias=1/11 */
U8X8_CA(0x081, 0x066), /* set contrast */
U8X8_CA(0x081, 0x036), /* set contrast */
//U8X8_C(0x0a9), /* used in display datasheet, but cmd not described in controller datasheet */
U8X8_CA(0x0f1, 0x07f), /* set COM end */
@ -158,18 +213,19 @@ static const uint8_t u8x8_d_uc1617_jlx128128_init_seq[] = {
U8X8_C(0x0d3), /* */
U8X8_C(0x0d7), /* */
U8X8_C(0x0ad), /* display enable BW Mode*/
//U8X8_C(0x0af), /* display enable GS Mode*/
//U8X8_C(0x0ad), /* display enable BW Mode*/
U8X8_C(0x0af), /* display enable GS Mode*/
//U8X8_C(0x0a5), /* all pixel on */
//U8X8_C(0x0d1), /* display pattern */
U8X8_C(0x089), /* auto increment */
U8X8_C(0x0c4), /* LCD Mapping */
U8X8_C(0x08b), /* auto increment */
U8X8_C(0x0c0), /* LCD Mapping */
U8X8_C(0x000), /* column */
U8X8_C(0x060), /* page adr low */
U8X8_C(0x070), /* page adr high */
/*
U8X8_D1(0x0ff),
U8X8_D1(0x0ff),
U8X8_D1(0x0ff),
@ -187,6 +243,7 @@ static const uint8_t u8x8_d_uc1617_jlx128128_init_seq[] = {
U8X8_D1(0x0ff),
U8X8_D1(0x0ff),
U8X8_D1(0x0ff),
*/
U8X8_END_TRANSFER(), /* disable chip */
U8X8_END() /* end of sequence */
@ -230,8 +287,6 @@ uint8_t u8x8_d_uc1617_jlx128128(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void
case U8X8_MSG_DISPLAY_INIT:
u8x8_d_helper_display_init(u8x8);
u8x8_cad_SendSequence(u8x8, u8x8_d_uc1617_jlx128128_init_seq);
for(;;)
;
break;
default:
return 0; /* msg unknown */

1
sys/arduino/u8g2_page_buffer/U8g2Logo/U8g2Logo.ino
View File

@ -263,6 +263,7 @@
//U8G2_LS013B7DH05_144X168_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ U8X8_PIN_NONE, /* reset=*/ 8); // there is no DC line for this display
//U8G2_ST7511_AVD_320X240_1_8080 u8g2(U8G2_R0, 13, 11, 2, 3, 4, 5, 6, A4, /*enable/WR=*/ 7, /*cs=*/ 10, /*dc=*/ 9, /*reset=*/ 8); // Enable U8g2 16Bit Mode and connect RD pin with 3.3V/5V
U8G2_UC1617_JLX128128_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);

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

@ -183,6 +183,8 @@
//U8X8_ST75256_JLX256160_ALT_4W_HW_SPI u8x8(/* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
//U8X8_ST75256_JLX240160_4W_SW_SPI u8x8( /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
//U8X8_ST75256_JLX240160_4W_HW_SPI u8x8(/* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
//U8X8_UC1617_JLX128128_4W_HW_SPI u8x8(/* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
U8X8_UC1617_JLX128128_4W_SW_SPI u8x8( /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
//U8X8_ST75256_JLX25664_2ND_HW_I2C u8x8(/* reset=*/ 8); // Due, 2nd I2C
//U8X8_ST75320_JLX320240_4W_SW_SPI u8x8( /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
//U8X8_ST75320_JLX320240_4W_HW_SPI u8x8(/* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);

3
sys/arduino/u8x8/HelloWorld/HelloWorld.ino
View File

@ -219,6 +219,7 @@
//U8X8_IL3820_V2_296X128_4W_SW_SPI u8x8(/* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // eInk/ePaper Display, optimized (lesser screen flicker)
//U8X8_ST7511_AVD_320X240_8080 u8x8(13, 11, 2, 3, 4, 5, 6, A4, /*enable/WR=*/ 7, /*cs=*/ 10, /*dc=*/ 9, /*reset=*/ 8); // Connect RD pin with 3.3V/5V
U8X8_UC1617_JLX128128_4W_SW_SPI u8x8( /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
// End of constructor list
@ -245,7 +246,7 @@ void setup(void)
void loop(void)
{
u8x8.setFont(u8x8_font_chroma48medium8_r);
u8x8.drawString(0,0,"Hello World!");
u8x8.drawString(0,1,"Hello World!");
u8x8.refreshDisplay(); // only required for SSD1606/7
delay(2000);
}

3
tools/font/bdfconv/Makefile
View File

@ -52,6 +52,9 @@ dseg14cr: bdfconv
emoticons21: bdfconv
./bdfconv -v -f 1 -m '32-64' ../emoticons/emoticons21.bdf -o emoticons21.c -n u8g2_font_emoticons21_tn -d ../bdf/helvB18.bdf
ded: bdfconv
./bdfconv -v -b 0 -f 1 ./F16_DED.bdf -o ded.c -n ded -d ../bdf/helvB12.bdf
old16x16: bdfconv
-../otf2bdf/otf2bdf -r 72 -p 16 -o tmp.bdf ../ttf/Px437_Wyse700a.ttf
./bdfconv -x 0 -y 8 -v -f 2 -m '32-59' tmp.bdf -o u8x8_font_px437wyse700a_ul_n.c -n u8x8_font_px437wyse700a_ul_n