Skip to content

Commit 92bed4a

Browse files
committed
Merge branch 'ofw_dev' into dev
2 parents bcadbc6 + 1543170 commit 92bed4a

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

applications/services/gui/canvas.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,10 @@ static void canvas_draw_u8g2_bitmap_int(
329329

330330
void canvas_draw_u8g2_bitmap(
331331
u8g2_t* u8g2,
332-
u8g2_uint_t x,
333-
u8g2_uint_t y,
334-
u8g2_uint_t w,
335-
u8g2_uint_t h,
332+
uint8_t x,
333+
uint8_t y,
334+
uint8_t w,
335+
uint8_t h,
336336
const uint8_t* bitmap,
337337
IconRotation rotation) {
338338
u8g2_uint_t blen;

applications/services/gui/canvas_i.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ void canvas_draw_u8g2_bitmap(
100100
uint8_t width,
101101
uint8_t height,
102102
const uint8_t* bitmap,
103-
uint8_t rotation);
103+
IconRotation rotation);
104104

105105
#ifdef __cplusplus
106106
}

lib/u8g2/u8g2.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
Use 16 Bit mode for any display with more than 240 pixel in one
6868
direction.
6969
*/
70-
//#define U8G2_16BIT
70+
#define U8G2_16BIT
7171

7272
/*
7373
The following macro switches the library into dynamic display buffer allocation mode.

0 commit comments

Comments
 (0)