Michel2/U8g2_Arduino
1
0
Fork 0
mirror of https://github.com/olikraus/U8g2_Arduino.git synced 2026-07-27 20:06:05 +00:00
Code Issues Releases Activity

2.36.10

Browse Source
This commit is contained in:
olikraus
2025-06-22 18:11:32 +02:00
parent c766f05094
commit ace3940b71
7 changed files with 57 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -8,5 +8,5 @@ Description: https://github.com/olikraus/u8g2/wiki
Issue Tracker: https://github.com/olikraus/u8g2/issues
Download (2.36.9): https://github.com/olikraus/U8g2_Arduino/archive/master.zip
Download (2.36.10): https://github.com/olikraus/U8g2_Arduino/archive/master.zip
library.json
+1 -1
View File
@@ -7,7 +7,7 @@
"type": "git",
"url": "https://github.com/olikraus/u8g2.git"
},
"version": "2.36.9",
"version": "2.36.10",
"license": "BSD-2-Clause",
"authors": {
"name": "Oliver Kraus",
library.properties
+1 -1
View File
@@ -1,5 +1,5 @@
name=U8g2
version=2.36.9
version=2.36.10
author=oliver <olikraus@gmail.com>
maintainer=oliver <olikraus@gmail.com>
sentence=Monochrome LCD, OLED and eInk Library. Display controller: SSD1305, SSD1306, SSD1309, SSD1312, SSD1316, SSD1318, SSD1320, SSD1322, SSD1325, SSD1327, SSD1329, SSD1362, SSD1363, SSD1606, SSD1607, SH1106, SH1107, SH1108, SH1122, T6963, RA8835, LC7981, PCD8544, PCF8812, HX1230, UC1601, UC1604, UC1608, UC1610, UC1611, UC1617, UC1628, UC1638, UC1701, ST7302, ST7511, ST7528, ST7539, ST7565, ST7567, ST7571, ST7586, ST7588, ST75160, ST75161, ST75256, ST75320, NT7534, ST7920, IST3020, IST3088, IST7920, LD7032, KS0108, KS0713, HD44102, T7932, SSD1312, SED1330, SED1520, SBN1661, IL3820, MAX7219, GP1287, GP1247, GP1294, GU800. Interfaces: I2C, SPI, Parallel.
src/clib/u8g2.h
+6 -3
View File
@@ -606,9 +606,9 @@ uint8_t *u8g2_m_17_9_f(uint8_t *page_cnt);
uint8_t *u8g2_m_16_32_1(uint8_t *page_cnt);
uint8_t *u8g2_m_16_32_2(uint8_t *page_cnt);
uint8_t *u8g2_m_16_32_f(uint8_t *page_cnt);
uint8_t *u8g2_m_25_25_1(uint8_t *page_cnt);
uint8_t *u8g2_m_25_25_2(uint8_t *page_cnt);
uint8_t *u8g2_m_25_25_f(uint8_t *page_cnt);
uint8_t *u8g2_m_26_25_1(uint8_t *page_cnt);
uint8_t *u8g2_m_26_25_2(uint8_t *page_cnt);
uint8_t *u8g2_m_26_25_f(uint8_t *page_cnt);
uint8_t *u8g2_m_48_17_1(uint8_t *page_cnt);
uint8_t *u8g2_m_48_17_2(uint8_t *page_cnt);
uint8_t *u8g2_m_48_17_f(uint8_t *page_cnt);
@@ -645,6 +645,9 @@ uint8_t *u8g2_m_26_5_f(uint8_t *page_cnt);
uint8_t *u8g2_m_22_9_1(uint8_t *page_cnt);
uint8_t *u8g2_m_22_9_2(uint8_t *page_cnt);
uint8_t *u8g2_m_22_9_f(uint8_t *page_cnt);
uint8_t *u8g2_m_25_25_1(uint8_t *page_cnt);
uint8_t *u8g2_m_25_25_2(uint8_t *page_cnt);
uint8_t *u8g2_m_25_25_f(uint8_t *page_cnt);
uint8_t *u8g2_m_37_16_1(uint8_t *page_cnt);
uint8_t *u8g2_m_37_16_2(uint8_t *page_cnt);
uint8_t *u8g2_m_37_16_f(uint8_t *page_cnt);
src/clib/u8g2_d_memory.c
+39 -6
View File
@@ -1521,35 +1521,35 @@ uint8_t *u8g2_m_16_32_f(uint8_t *page_cnt)
return buf;
#endif
}
uint8_t *u8g2_m_25_25_1(uint8_t *page_cnt)
uint8_t *u8g2_m_26_25_1(uint8_t *page_cnt)
{
#ifdef U8G2_USE_DYNAMIC_ALLOC
*page_cnt = 1;
return 0;
#else
static uint8_t buf[200];
static uint8_t buf[208];
*page_cnt = 1;
return buf;
#endif
}
uint8_t *u8g2_m_25_25_2(uint8_t *page_cnt)
uint8_t *u8g2_m_26_25_2(uint8_t *page_cnt)
{
#ifdef U8G2_USE_DYNAMIC_ALLOC
*page_cnt = 2;
return 0;
#else
static uint8_t buf[400];
static uint8_t buf[416];
*page_cnt = 2;
return buf;
#endif
}
uint8_t *u8g2_m_25_25_f(uint8_t *page_cnt)
uint8_t *u8g2_m_26_25_f(uint8_t *page_cnt)
{
#ifdef U8G2_USE_DYNAMIC_ALLOC
*page_cnt = 25;
return 0;
#else
static uint8_t buf[5000];
static uint8_t buf[5200];
*page_cnt = 25;
return buf;
#endif
@@ -1950,6 +1950,39 @@ uint8_t *u8g2_m_22_9_f(uint8_t *page_cnt)
return buf;
#endif
}
uint8_t *u8g2_m_25_25_1(uint8_t *page_cnt)
{
#ifdef U8G2_USE_DYNAMIC_ALLOC
*page_cnt = 1;
return 0;
#else
static uint8_t buf[200];
*page_cnt = 1;
return buf;
#endif
}
uint8_t *u8g2_m_25_25_2(uint8_t *page_cnt)
{
#ifdef U8G2_USE_DYNAMIC_ALLOC
*page_cnt = 2;
return 0;
#else
static uint8_t buf[400];
*page_cnt = 2;
return buf;
#endif
}
uint8_t *u8g2_m_25_25_f(uint8_t *page_cnt)
{
#ifdef U8G2_USE_DYNAMIC_ALLOC
*page_cnt = 25;
return 0;
#else
static uint8_t buf[5000];
*page_cnt = 25;
return buf;
#endif
}
uint8_t *u8g2_m_37_16_1(uint8_t *page_cnt)
{
#ifdef U8G2_USE_DYNAMIC_ALLOC
src/clib/u8g2_d_setup.c
+3 -3
View File
@@ -6734,7 +6734,7 @@ void u8g2_Setup_st7305_200x200_1(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_m
uint8_t tile_buf_height;
uint8_t *buf;
u8g2_SetupDisplay(u8g2, u8x8_d_st7305_200x200, u8x8_cad_011, byte_cb, gpio_and_delay_cb);
buf = u8g2_m_25_25_1(&tile_buf_height);
buf = u8g2_m_26_25_1(&tile_buf_height);
u8g2_SetupBuffer(u8g2, buf, tile_buf_height, u8g2_ll_hvline_horizontal_right_lsb, rotation);
}
/* st7305 2 */
@@ -6743,7 +6743,7 @@ void u8g2_Setup_st7305_200x200_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_m
uint8_t tile_buf_height;
uint8_t *buf;
u8g2_SetupDisplay(u8g2, u8x8_d_st7305_200x200, u8x8_cad_011, byte_cb, gpio_and_delay_cb);
buf = u8g2_m_25_25_2(&tile_buf_height);
buf = u8g2_m_26_25_2(&tile_buf_height);
u8g2_SetupBuffer(u8g2, buf, tile_buf_height, u8g2_ll_hvline_horizontal_right_lsb, rotation);
}
/* st7305 f */
@@ -6752,7 +6752,7 @@ void u8g2_Setup_st7305_200x200_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_m
uint8_t tile_buf_height;
uint8_t *buf;
u8g2_SetupDisplay(u8g2, u8x8_d_st7305_200x200, u8x8_cad_011, byte_cb, gpio_and_delay_cb);
buf = u8g2_m_25_25_f(&tile_buf_height);
buf = u8g2_m_26_25_f(&tile_buf_height);
u8g2_SetupBuffer(u8g2, buf, tile_buf_height, u8g2_ll_hvline_horizontal_right_lsb, rotation);
}
/* st7586s */
src/clib/u8x8_d_st7305.c
+6 -6
View File
@@ -200,11 +200,11 @@ static const uint8_t u8x8_d_st7305_122x250_init_seq[] = {
U8X8_CA(0xCB, 0x14), // VCOMH: 0x14 = 4V (0x28 = 5V)
U8X8_CAA(0xB4, 0xE5, 0x77), // Update Period Gate EQ Control, why 0x77??? it should be 0x66 according to the datasheet
U8X8_A8(0xF1, 0xFF, 0xFF, 0x4F, 0xF1, 0xFF, 0xFF, 0X4F),
U8X8_CA(0xB0, 0x64), // Duty Cycle... this must be before sleep out
U8X8_CA(0xB0, 0x32), // Duty Cycle... this must be before sleep out, 200x200 display: 0x64 --> 0x32
U8X8_C(0x11), // sleep out: furn off sleep mode
U8X8_DLY(120),
U8X8_CAA(0xC7, 0xA6, 0xE9), // Enable OSC
U8X8_CA(0x36, 0xa0), // Memory Control
U8X8_CA(0x36, 0xa4), // Memory Control, 0xa4 for the 200x200 display
U8X8_CA(0x3A, 0x11), // Data Format
U8X8_CA(0xB9, 0x23), // Source Setting: Clear RAM off
@@ -397,11 +397,11 @@ static const u8x8_display_info_t u8x8_st7305_200x200_display_info =
/* i2c_bus_clock_100kHz = */ 4, /* 400KHz */
/* data_setup_time_ns = */ 15,
/* write_pulse_width_ns = */ 70,
/* tile_width = */ 25,
/* tile_width = */ 26, /* tile width is 26*8=208, because this display requires 12 bit blocks, which would be 204 pixel, so next tile is at 208 */
/* tile_height = */ 25,
/* default_x_offset = */ 0,
/* flipmode_x_offset = */ 0,
/* pixel_width = */ 200,
/* pixel_width = */ 200, /* not 100% sure, whether this works with the tile_width of 26... */
/* pixel_height = */ 200
};
@@ -461,8 +461,8 @@ uint8_t u8x8_d_st7305_200x200(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *
{
u8x8_cad_SendCmd(u8x8, 0x2a); // column address set
u8x8_cad_SendArg(u8x8, 0x19); // specific for the 122x250 LCD --> probably needs to be changed for the 200x200
u8x8_cad_SendArg(u8x8, 0x3a );
u8x8_cad_SendArg(u8x8, 0x16); // 0x019 for the 122x250 LCD --> 0x016 for the 200x200 display
u8x8_cad_SendArg(u8x8, 0x26 ); // 204 pixel for the 200x200 display
u8x8_cad_SendCmd(u8x8, 0x2b );
u8x8_cad_SendArg(u8x8, y+i);