mirror of
https://github.com/DarkFlippers/unleashed-firmware
synced 2024-11-15 01:07:22 +00:00
Merge branch 'ofw_dev' into dev
This commit is contained in:
commit
92bed4a081
3 changed files with 6 additions and 6 deletions
|
@ -329,10 +329,10 @@ static void canvas_draw_u8g2_bitmap_int(
|
||||||
|
|
||||||
void canvas_draw_u8g2_bitmap(
|
void canvas_draw_u8g2_bitmap(
|
||||||
u8g2_t* u8g2,
|
u8g2_t* u8g2,
|
||||||
u8g2_uint_t x,
|
uint8_t x,
|
||||||
u8g2_uint_t y,
|
uint8_t y,
|
||||||
u8g2_uint_t w,
|
uint8_t w,
|
||||||
u8g2_uint_t h,
|
uint8_t h,
|
||||||
const uint8_t* bitmap,
|
const uint8_t* bitmap,
|
||||||
IconRotation rotation) {
|
IconRotation rotation) {
|
||||||
u8g2_uint_t blen;
|
u8g2_uint_t blen;
|
||||||
|
|
|
@ -100,7 +100,7 @@ void canvas_draw_u8g2_bitmap(
|
||||||
uint8_t width,
|
uint8_t width,
|
||||||
uint8_t height,
|
uint8_t height,
|
||||||
const uint8_t* bitmap,
|
const uint8_t* bitmap,
|
||||||
uint8_t rotation);
|
IconRotation rotation);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
|
|
@ -67,7 +67,7 @@
|
||||||
Use 16 Bit mode for any display with more than 240 pixel in one
|
Use 16 Bit mode for any display with more than 240 pixel in one
|
||||||
direction.
|
direction.
|
||||||
*/
|
*/
|
||||||
//#define U8G2_16BIT
|
#define U8G2_16BIT
|
||||||
|
|
||||||
/*
|
/*
|
||||||
The following macro switches the library into dynamic display buffer allocation mode.
|
The following macro switches the library into dynamic display buffer allocation mode.
|
||||||
|
|
Loading…
Reference in a new issue