Merge branch 'ofw_dev' into dev

This commit is contained in:
MX 2023-12-21 19:48:12 +03:00
commit 92bed4a081
No known key found for this signature in database
GPG Key ID: 7CCC66B7DBDD1C83
3 changed files with 6 additions and 6 deletions

View File

@ -329,10 +329,10 @@ static void canvas_draw_u8g2_bitmap_int(
void canvas_draw_u8g2_bitmap(
u8g2_t* u8g2,
u8g2_uint_t x,
u8g2_uint_t y,
u8g2_uint_t w,
u8g2_uint_t h,
uint8_t x,
uint8_t y,
uint8_t w,
uint8_t h,
const uint8_t* bitmap,
IconRotation rotation) {
u8g2_uint_t blen;

View File

@ -100,7 +100,7 @@ void canvas_draw_u8g2_bitmap(
uint8_t width,
uint8_t height,
const uint8_t* bitmap,
uint8_t rotation);
IconRotation rotation);
#ifdef __cplusplus
}

View File

@ -67,7 +67,7 @@
Use 16 Bit mode for any display with more than 240 pixel in one
direction.
*/
//#define U8G2_16BIT
#define U8G2_16BIT
/*
The following macro switches the library into dynamic display buffer allocation mode.