mirror of
https://github.com/DarkFlippers/unleashed-firmware.git
synced 2025-12-12 04:34:43 +04:00
Merge remote-tracking branch 'RebornedBrain/reborned/some_api_adjustments' into dev
This commit is contained in:
@@ -520,12 +520,10 @@ void canvas_draw_xbm(
|
|||||||
size_t height,
|
size_t height,
|
||||||
const uint8_t* bitmap) {
|
const uint8_t* bitmap) {
|
||||||
furi_check(canvas);
|
furi_check(canvas);
|
||||||
x += canvas->offset_x;
|
canvas_draw_xbm_ex(canvas, x, y, width, height, IconRotation0, bitmap);
|
||||||
y += canvas->offset_y;
|
|
||||||
canvas_draw_u8g2_bitmap(&canvas->fb, x, y, width, height, bitmap, IconRotation0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void canvas_draw_xbm_custom(
|
void canvas_draw_xbm_ex(
|
||||||
Canvas* canvas,
|
Canvas* canvas,
|
||||||
int32_t x,
|
int32_t x,
|
||||||
int32_t y,
|
int32_t y,
|
||||||
|
|||||||
@@ -307,7 +307,7 @@ void canvas_draw_xbm(
|
|||||||
* @param bitmap pointer to XBM bitmap data
|
* @param bitmap pointer to XBM bitmap data
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void canvas_draw_xbm_custom(
|
void canvas_draw_xbm_ex(
|
||||||
Canvas* canvas,
|
Canvas* canvas,
|
||||||
int32_t x,
|
int32_t x,
|
||||||
int32_t y,
|
int32_t y,
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
entry,status,name,type,params
|
entry,status,name,type,params
|
||||||
Version,+,77.0,,
|
Version,+,78.0,,
|
||||||
Header,+,applications/services/bt/bt_service/bt.h,,
|
Header,+,applications/services/bt/bt_service/bt.h,,
|
||||||
Header,+,applications/services/bt/bt_service/bt_keys_storage.h,,
|
Header,+,applications/services/bt/bt_service/bt_keys_storage.h,,
|
||||||
Header,+,applications/services/cli/cli.h,,
|
Header,+,applications/services/cli/cli.h,,
|
||||||
@@ -746,6 +746,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_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_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,void,"Canvas*, int32_t, int32_t, size_t, size_t, const uint8_t*"
|
||||||
|
Function,+,canvas_draw_xbm_ex,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_get_font_params,const CanvasFontParameters*,"const Canvas*, Font"
|
||||||
Function,+,canvas_glyph_width,size_t,"Canvas*, uint16_t"
|
Function,+,canvas_glyph_width,size_t,"Canvas*, uint16_t"
|
||||||
Function,+,canvas_height,size_t,const Canvas*
|
Function,+,canvas_height,size_t,const Canvas*
|
||||||
|
|||||||
|
@@ -1,5 +1,5 @@
|
|||||||
entry,status,name,type,params
|
entry,status,name,type,params
|
||||||
Version,+,77.0,,
|
Version,+,78.0,,
|
||||||
Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
|
Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
|
||||||
Header,+,applications/services/bt/bt_service/bt.h,,
|
Header,+,applications/services/bt/bt_service/bt.h,,
|
||||||
Header,+,applications/services/bt/bt_service/bt_keys_storage.h,,
|
Header,+,applications/services/bt/bt_service/bt_keys_storage.h,,
|
||||||
@@ -832,7 +832,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_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_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,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_draw_xbm_ex,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_get_font_params,const CanvasFontParameters*,"const Canvas*, Font"
|
||||||
Function,+,canvas_glyph_width,size_t,"Canvas*, uint16_t"
|
Function,+,canvas_glyph_width,size_t,"Canvas*, uint16_t"
|
||||||
Function,+,canvas_height,size_t,const Canvas*
|
Function,+,canvas_height,size_t,const Canvas*
|
||||||
|
|||||||
|
Reference in New Issue
Block a user