mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-05-12 13:28:36 -07:00
Merge branch 'ofw_dev' into dev
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user