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

more functions renamed

This commit is contained in:
olikraus 2015-12-07 22:14:17 +01:00
parent 382c158993
commit 6114781973
8 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
csrc/u8g2_buffer.c
View File

@ -32,7 +32,7 @@ static void u8g2_send_tile_row(u8g2_t *u8g2, uint8_t src_tile_row, uint8_t dest_
offset *= 8;
ptr += offset;
u8x8_display_DrawTile(u8g2_GetU8x8(u8g2), 0, dest_tile_row, w, ptr);
u8x8_DrawTile(u8g2_GetU8x8(u8g2), 0, dest_tile_row, w, ptr);
}
void u8g2_SendBuffer(u8g2_t *u8g2)

8
csrc/u8x8.h
View File

@ -59,7 +59,7 @@
/*==========================================*/
/* Global Defines */
/* Undefine this to remove u8x8_display_SetContrast function */
/* Undefine this to remove u8x8_SetContrast function */
#define U8X8_WITH_SET_CONTRAST
/* Undefine this to remove u8x8_SetFlipMode function */
@ -328,7 +328,7 @@ void u8x8_d_helper_display_init(u8x8_t *u8g2);
//#define U8X8_MSG_DISPLAY_GET_LAYOUT 16
/* u8x8_display.c */
uint8_t u8x8_display_DrawTile(u8x8_t *u8x8, uint8_t x, uint8_t y, uint8_t cnt, uint8_t *tile_ptr);
uint8_t u8x8_DrawTile(u8x8_t *u8x8, uint8_t x, uint8_t y, uint8_t cnt, uint8_t *tile_ptr);
/* setup u8x8 memory structures */
void u8x8_SetupMemory(u8x8_t *u8x8);
@ -337,8 +337,8 @@ void u8x8_InitDisplay(u8x8_t *u8x8);
/* wake up display from power save mode */
void u8x8_SetPowerSave(u8x8_t *u8x8, uint8_t is_enable);
void u8x8_SetFlipMode(u8x8_t *u8x8, uint8_t mode);
void u8x8_display_SetContrast(u8x8_t *u8x8, uint8_t value);
void u8x8_display_ClearScreen(u8x8_t *u8x8);
void u8x8_SetContrast(u8x8_t *u8x8, uint8_t value);
void u8x8_ClearScreen(u8x8_t *u8x8);

2
csrc/u8x8_8x8.c
View File

@ -43,7 +43,7 @@ void u8x8_DrawGlyph(u8x8_t *u8x8, uint8_t x, uint8_t y, uint8_t encoding)
buf[i] = 0;
}
}
u8x8_display_DrawTile(u8x8, x, y, 1, buf);
u8x8_DrawTile(u8x8, x, y, 1, buf);
}
/*

6
csrc/u8x8_display.c
View File

@ -49,7 +49,7 @@ void u8x8_d_helper_display_init(u8x8_t *u8x8)
/*==========================================*/
/* official functions */
uint8_t u8x8_display_DrawTile(u8x8_t *u8x8, uint8_t x, uint8_t y, uint8_t cnt, uint8_t *tile_ptr)
uint8_t u8x8_DrawTile(u8x8_t *u8x8, uint8_t x, uint8_t y, uint8_t cnt, uint8_t *tile_ptr)
{
u8x8_tile_t tile;
tile.x_pos = x;
@ -80,13 +80,13 @@ void u8x8_SetFlipMode(u8x8_t *u8x8, uint8_t mode)
u8x8->display_cb(u8x8, U8X8_MSG_DISPLAY_SET_FLIP_MODE, mode, NULL);
}
void u8x8_display_SetContrast(u8x8_t *u8x8, uint8_t value)
void u8x8_SetContrast(u8x8_t *u8x8, uint8_t value)
{
u8x8->display_cb(u8x8, U8X8_MSG_DISPLAY_SET_CONTRAST, value, NULL);
}
void u8x8_display_ClearScreen(u8x8_t *u8x8)
void u8x8_ClearScreen(u8x8_t *u8x8)
{
uint8_t buf[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
u8x8_tile_t tile;

16
sys/arduino/ssd1306_test/test.ino
View File

@ -334,9 +334,9 @@ void loop(void)
for(;;)
{
u8x8_display_ClearScreen(&u8x8);
u8x8_ClearScreen(&u8x8);
u8x8_SetPowerSave(&u8x8, 0);
//u8x8_display_SetContrast(&u8x8, 10);
//u8x8_SetContrast(&u8x8, 10);
//delay(500);
@ -344,12 +344,12 @@ void loop(void)
u8x8_DrawString(&u8x8, 0, 0, "Hello World");
u8x8_DrawString(&u8x8, 3, 1, "ABCdefg");
u8x8_display_DrawTile(&u8x8, 1, 1, 1, tile);
u8x8_display_DrawTile(&u8x8, 2, 2, 1, tile);
u8x8_display_DrawTile(&u8x8, 3, 3, 1, tile);
u8x8_display_DrawTile(&u8x8, 4, 4, 1, tile);
u8x8_display_DrawTile(&u8x8, 5, 5, 1, tile);
u8x8_display_DrawTile(&u8x8, 6, 6, 1, tile);
u8x8_DrawTile(&u8x8, 1, 1, 1, tile);
u8x8_DrawTile(&u8x8, 2, 2, 1, tile);
u8x8_DrawTile(&u8x8, 3, 3, 1, tile);
u8x8_DrawTile(&u8x8, 4, 4, 1, tile);
u8x8_DrawTile(&u8x8, 5, 5, 1, tile);
u8x8_DrawTile(&u8x8, 6, 6, 1, tile);
//delay(2000);
}

16
sys/arduino/test/test.ino
View File

@ -152,9 +152,9 @@ void loop(void)
for(;;)
{
u8x8_display_ClearScreen(&u8g2);
u8x8_ClearScreen(&u8g2);
u8x8_SetPowerSave(&u8g2, 0);
//u8x8_display_SetContrast(&u8g2, 10);
//u8x8_SetContrast(&u8g2, 10);
delay(500);
@ -162,12 +162,12 @@ void loop(void)
u8x8_DrawString(&u8g2, 0, 0, "Hello World");
u8x8_DrawString(&u8g2, 3, 1, "ABCdefg");
u8x8_display_DrawTile(&u8g2, 1, 1, 1, tile);
u8x8_display_DrawTile(&u8g2, 2, 2, 1, tile);
u8x8_display_DrawTile(&u8g2, 3, 3, 1, tile);
u8x8_display_DrawTile(&u8g2, 4, 4, 1, tile);
u8x8_display_DrawTile(&u8g2, 5, 5, 1, tile);
u8x8_display_DrawTile(&u8g2, 6, 6, 1, tile);
u8x8_DrawTile(&u8g2, 1, 1, 1, tile);
u8x8_DrawTile(&u8g2, 2, 2, 1, tile);
u8x8_DrawTile(&u8g2, 3, 3, 1, tile);
u8x8_DrawTile(&u8g2, 4, 4, 1, tile);
u8x8_DrawTile(&u8g2, 5, 5, 1, tile);
u8x8_DrawTile(&u8g2, 6, 6, 1, tile);
delay(2000);
}

4
sys/arduino/text/text.ino
View File

@ -368,9 +368,9 @@ void loop(void)
for(;;)
{
//u8x8_display_ClearScreen(&u8g2);
//u8x8_ClearScreen(&u8g2);
//u8x8_SetPowerSave(&u8g2, 0);
//u8x8_display_SetContrast(&u8g2, 10);
//u8x8_SetContrast(&u8g2, 10);
delay(500);

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

@ -667,7 +667,7 @@ void overviewpic(int i, int fm, char *fms, int bm, char *bms, int mm, char *mms)
u8g2_Setup_TGA(&u8g2, &u8g2_cb_r0);
u8x8_InitDisplay(u8g2_GetU8x8(&u8g2));
u8x8_SetPowerSave(u8g2_GetU8x8(&u8g2), 0);
//u8x8_display_ClearScreen(u8g2_GetU8x8(&u8g2));
//u8x8_ClearScreen(u8g2_GetU8x8(&u8g2));
u8x8_SetFont(u8g2_GetU8x8(&u8g2), u8x8_font_amstrad_cpc_r);
u8x8_DrawString(u8g2_GetU8x8(&u8g2), 0, 0, target_font_identifier);
u8x8_SetFont(u8g2_GetU8x8(&u8g2), u8x8_font_list[u8x8_fnt_cnt]);
@ -736,7 +736,7 @@ void overviewshortpic(int i, int fm, char *fms, int bm, char *bms, int mm, char
u8g2_Setup_TGA(&u8g2, &u8g2_cb_r0);
u8x8_InitDisplay(u8g2_GetU8x8(&u8g2));
u8x8_SetPowerSave(u8g2_GetU8x8(&u8g2), 0);
//u8x8_display_ClearScreen(u8g2_GetU8x8(&u8g2));
//u8x8_ClearScreen(u8g2_GetU8x8(&u8g2));
u8x8_SetFont(u8g2_GetU8x8(&u8g2), u8x8_font_list[u8x8_fnt_cnt]);
if ( mm == MM_N )