Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'reborned/some_api_adjustments' into mntm-dev

Browse Source
This commit is contained in:
Willy-JL
2024-10-13 01:17:37 +01:00
parent 806fd93b38 676eab29f2
commit c204ba944d
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
applications/services/gui/canvas.c
View File

@@ -561,17 +561,18 @@ void canvas_draw_xbm(
canvas_draw_u8g2_bitmap(&canvas->fb, x, y, width, height, bitmap, IconRotation0);
}
void canvas_draw_xbm_mirrored(
void canvas_draw_xbm_custom(
Canvas* canvas,
int32_t x,
int32_t y,
size_t width,
size_t height,
IconRotation rotation,
const uint8_t* bitmap_data) {
furi_check(canvas);
x += canvas->offset_x;
y += canvas->offset_y;
canvas_draw_u8g2_bitmap(&canvas->fb, x, y, width, height, bitmap_data, IconRotation180);
canvas_draw_u8g2_bitmap(&canvas->fb, x, y, width, height, bitmap_data, rotation);
}
void canvas_draw_glyph(Canvas* canvas, int32_t x, int32_t y, uint16_t ch) {

7
applications/services/gui/canvas.h
View File

@@ -296,21 +296,24 @@ void canvas_draw_xbm(
size_t height,
const uint8_t* bitmap);
/** Draw mirrored XBM bitmap
/** Draw rotated XBM bitmap
*
* @param canvas Canvas instance
* @param x x coordinate
* @param y y coordinate
* @param[in] width bitmap width
* @param[in] height bitmap height
* @param[in] rotation bitmap rotation
* @param bitmap pointer to XBM bitmap data
*/
void canvas_draw_xbm_mirrored(
void canvas_draw_xbm_custom(
Canvas* canvas,
int32_t x,
int32_t y,
size_t width,
size_t height,
IconRotation rotation,
const uint8_t* bitmap_data);
/** Draw dot at x,y

2
targets/f7/api_symbols.csv
View File

@@ -842,7 +842,7 @@ Function,+,canvas_draw_str,void,"Canvas*, int32_t, int32_t, const char*"
Function,+,canvas_draw_str_aligned,void,"Canvas*, int32_t, int32_t, Align, Align, const char*"
Function,+,canvas_draw_triangle,void,"Canvas*, int32_t, int32_t, size_t, size_t, CanvasDirection"
Function,+,canvas_draw_xbm,void,"Canvas*, int32_t, int32_t, size_t, size_t, const uint8_t*"
Function,+,canvas_draw_xbm_mirrored,void,"Canvas*, int32_t, int32_t, size_t, size_t, const uint8_t*"
Function,+,canvas_draw_xbm_custom,void,"Canvas*, int32_t, int32_t, size_t, size_t, IconRotation, const uint8_t*"
Function,+,canvas_get_font_params,const CanvasFontParameters*,"const Canvas*, Font"
Function,+,canvas_glyph_width,size_t,"Canvas*, uint16_t"
Function,+,canvas_height,size_t,const Canvas*
1 entry status name type params
842 Function + canvas_draw_str_aligned void Canvas*, int32_t, int32_t, Align, Align, const char*
843 Function + canvas_draw_triangle void Canvas*, int32_t, int32_t, size_t, size_t, CanvasDirection
844 Function + canvas_draw_xbm void Canvas*, int32_t, int32_t, size_t, size_t, const uint8_t*
845 Function + canvas_draw_xbm_mirrored canvas_draw_xbm_custom void Canvas*, int32_t, int32_t, size_t, size_t, const uint8_t* Canvas*, int32_t, int32_t, size_t, size_t, IconRotation, const uint8_t*
846 Function + canvas_get_font_params const CanvasFontParameters* const Canvas*, Font
847 Function + canvas_glyph_width size_t Canvas*, uint16_t
848 Function + canvas_height size_t const Canvas*