Merge branch 'ofw_dev' into dev

DarkFlippers · Dec 21, 2023 · 92bed4a · 92bed4a
2 parents bcadbc6 + 1543170
commit 92bed4a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/applications/services/gui/canvas.c b/applications/services/gui/canvas.c
@@ -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;

diff --git a/applications/services/gui/canvas_i.h b/applications/services/gui/canvas_i.h
@@ -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
 }

diff --git a/lib/u8g2/u8g2.h b/lib/u8g2/u8g2.h
@@ -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.