Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-13 20:28:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

post merge fixes p2 [ci skip]

Browse Source
This commit is contained in:
MX
2024-03-25 15:47:34 +03:00
parent 7c0939ad52
commit fda8370255
11 changed files with 226 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
targets/f7/api_symbols.csv
View File

@@ -789,6 +789,7 @@ Function,+,calloc,void*,"size_t, size_t"
Function,+,canvas_clear,void,Canvas*
Function,+,canvas_commit,void,Canvas*
Function,+,canvas_current_font_height,size_t,const Canvas*
Function,+,canvas_current_font_width,size_t,const Canvas*
Function,+,canvas_draw_bitmap,void,"Canvas*, int32_t, int32_t, size_t, size_t, const uint8_t*"
Function,+,canvas_draw_box,void,"Canvas*, int32_t, int32_t, size_t, size_t"
Function,+,canvas_draw_circle,void,"Canvas*, int32_t, int32_t, size_t"
@@ -798,6 +799,7 @@ Function,+,canvas_draw_frame,void,"Canvas*, int32_t, int32_t, size_t, size_t"
Function,+,canvas_draw_glyph,void,"Canvas*, int32_t, int32_t, uint16_t"
Function,+,canvas_draw_icon,void,"Canvas*, int32_t, int32_t, const Icon*"
Function,+,canvas_draw_icon_animation,void,"Canvas*, int32_t, int32_t, IconAnimation*"
Function,+,canvas_draw_icon_bitmap,void,"Canvas*, uint8_t, uint8_t, int16_t, int16_t, const Icon*"
Function,+,canvas_draw_icon_ex,void,"Canvas*, int32_t, int32_t, const Icon*, IconRotation"
Function,+,canvas_draw_line,void,"Canvas*, int32_t, int32_t, int32_t, int32_t"
Function,+,canvas_draw_rbox,void,"Canvas*, int32_t, int32_t, size_t, size_t, size_t"
@@ -941,6 +943,7 @@ Function,+,elements_multiline_text_framed,void,"Canvas*, int32_t, int32_t, const
Function,+,elements_progress_bar,void,"Canvas*, int32_t, int32_t, size_t, float"
Function,+,elements_progress_bar_with_text,void,"Canvas*, int32_t, int32_t, size_t, float, const char*"
Function,+,elements_scrollable_text_line,void,"Canvas*, int32_t, int32_t, size_t, FuriString*, size_t, _Bool"
Function,+,elements_scrollable_text_line_str,void,"Canvas*, uint8_t, uint8_t, uint8_t, const char*, size_t, _Bool, _Bool"
Function,+,elements_scrollbar,void,"Canvas*, size_t, size_t"
Function,+,elements_scrollbar_pos,void,"Canvas*, int32_t, int32_t, size_t, size_t, size_t"
Function,+,elements_slightly_rounded_box,void,"Canvas*, int32_t, int32_t, size_t, size_t"
1 entry status name type params
789 Function + canvas_clear void Canvas*
790 Function + canvas_commit void Canvas*
791 Function + canvas_current_font_height size_t const Canvas*
792 Function + canvas_current_font_width size_t const Canvas*
793 Function + canvas_draw_bitmap void Canvas*, int32_t, int32_t, size_t, size_t, const uint8_t*
794 Function + canvas_draw_box void Canvas*, int32_t, int32_t, size_t, size_t
795 Function + canvas_draw_circle void Canvas*, int32_t, int32_t, size_t
799 Function + canvas_draw_glyph void Canvas*, int32_t, int32_t, uint16_t
800 Function + canvas_draw_icon void Canvas*, int32_t, int32_t, const Icon*
801 Function + canvas_draw_icon_animation void Canvas*, int32_t, int32_t, IconAnimation*
802 Function + canvas_draw_icon_bitmap void Canvas*, uint8_t, uint8_t, int16_t, int16_t, const Icon*
803 Function + canvas_draw_icon_ex void Canvas*, int32_t, int32_t, const Icon*, IconRotation
804 Function + canvas_draw_line void Canvas*, int32_t, int32_t, int32_t, int32_t
805 Function + canvas_draw_rbox void Canvas*, int32_t, int32_t, size_t, size_t, size_t
943 Function + elements_progress_bar void Canvas*, int32_t, int32_t, size_t, float
944 Function + elements_progress_bar_with_text void Canvas*, int32_t, int32_t, size_t, float, const char*
945 Function + elements_scrollable_text_line void Canvas*, int32_t, int32_t, size_t, FuriString*, size_t, _Bool
946 Function + elements_scrollable_text_line_str void Canvas*, uint8_t, uint8_t, uint8_t, const char*, size_t, _Bool, _Bool
947 Function + elements_scrollbar void Canvas*, size_t, size_t
948 Function + elements_scrollbar_pos void Canvas*, int32_t, int32_t, size_t, size_t, size_t
949 Function + elements_slightly_rounded_box void Canvas*, int32_t, int32_t, size_t, size_t

9
targets/f7/furi_hal/furi_hal_infrared.c
View File

@@ -80,7 +80,6 @@ static FuriHalInfraredTxPin infrared_tx_output = FuriHalInfraredTxPinInternal;
static volatile InfraredState furi_hal_infrared_state = InfraredStateIdle;
static InfraredTimTx infrared_tim_tx;
static InfraredTimRx infrared_tim_rx;
static bool infrared_external_output;
static const GpioPin* infrared_tx_pins[FuriHalInfraredTxPinMax] = {
[FuriHalInfraredTxPinInternal] = &gpio_infrared_tx,
@@ -96,14 +95,6 @@ static uint8_t furi_hal_infrared_get_current_dma_tx_buffer(void);
static void furi_hal_infrared_tx_dma_polarity_isr();
static void furi_hal_infrared_tx_dma_isr();
void furi_hal_infrared_set_debug_out(bool enable) {
infrared_external_output = enable;
}
bool furi_hal_infrared_get_debug_out_status(void) {
return infrared_external_output;
}
static void furi_hal_infrared_tim_rx_isr(void* context) {
UNUSED(context);