mount/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FuriHal, Infrared, Protobuf: various fixes and improvements (#2845)

Browse Source 
* Infrared: fix crash caused by null-ptr dereference in interrupt call. FuriHal: callback checks in interrupt handlers. Protobuf: bump to latest.

* DesktopSettings: allow application browser as favourite

* Format sources

* FuriHal: fix pvs warnings
This commit is contained in:
あく 2023-07-05 22:56:52 +09:00 committed by GitHub
parent 08bafc478e
commit 97fbd84e08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c
View File

@ -5,8 +5,11 @@
#include <storage/storage.h> #include <storage/storage.h>
#include <dialogs/dialogs.h> #include <dialogs/dialogs.h>
#define EXTERNAL_BROWSER_NAME ("Applications")
#define EXTERNAL_BROWSER_INDEX (FLIPPER_APPS_COUNT + 1)
#define EXTERNAL_APPLICATION_NAME ("[External Application]") #define EXTERNAL_APPLICATION_NAME ("[External Application]")
#define EXTERNAL_APPLICATION_INDEX (FLIPPER_APPS_COUNT + 1) #define EXTERNAL_APPLICATION_INDEX (FLIPPER_APPS_COUNT + 2)
static bool favorite_fap_selector_item_callback( static bool favorite_fap_selector_item_callback(
FuriString* file_path, FuriString* file_path,
@ -58,14 +61,28 @@ void desktop_settings_scene_favorite_on_enter(void* context) {
} }
} }
// Special case: Application browser
submenu_add_item(
submenu,
EXTERNAL_BROWSER_NAME,
EXTERNAL_BROWSER_INDEX,
desktop_settings_scene_favorite_submenu_callback,
app);
// Special case: Specific application
submenu_add_item( submenu_add_item(
submenu, submenu,
EXTERNAL_APPLICATION_NAME, EXTERNAL_APPLICATION_NAME,
EXTERNAL_APPLICATION_INDEX, EXTERNAL_APPLICATION_INDEX,
desktop_settings_scene_favorite_submenu_callback, desktop_settings_scene_favorite_submenu_callback,
app); app);
if(curr_favorite_app->is_external) { if(curr_favorite_app->is_external) {
pre_select_item = EXTERNAL_APPLICATION_INDEX; if(curr_favorite_app->name_or_path[0] == '\0') {
pre_select_item = EXTERNAL_BROWSER_INDEX;
} else {
pre_select_item = EXTERNAL_APPLICATION_INDEX;
}
} }
submenu_set_header( submenu_set_header(
@ -86,7 +103,11 @@ bool desktop_settings_scene_favorite_on_event(void* context, SceneManagerEvent e
&app->settings.favorite_secondary; &app->settings.favorite_secondary;
if(event.type == SceneManagerEventTypeCustom) { if(event.type == SceneManagerEventTypeCustom) {
if(event.event == EXTERNAL_APPLICATION_INDEX) { if(event.event == EXTERNAL_BROWSER_INDEX) {
curr_favorite_app->is_external = true;
curr_favorite_app->name_or_path[0] = '\0';
consumed = true;
} else if(event.event == EXTERNAL_APPLICATION_INDEX) {
const DialogsFileBrowserOptions browser_options = { const DialogsFileBrowserOptions browser_options = {
.extension = ".fap", .extension = ".fap",
.icon = &I_unknown_10px, .icon = &I_unknown_10px,

2
assets/protobuf

@ -1 +1 @@
Subproject commit f71c4b7f750f2539a1fed08925d8da3abdc80ff9 Subproject commit 08a907d95733600becc41c0602ef5ee4c4baf782

3
firmware/targets/f7/furi_hal/furi_hal_infrared.c
View File

@ -373,9 +373,6 @@ static void furi_hal_infrared_configure_tim_pwm_tx(uint32_t freq, float duty_cyc
LL_TIM_EnableAllOutputs(INFRARED_DMA_TIMER); LL_TIM_EnableAllOutputs(INFRARED_DMA_TIMER);
LL_TIM_DisableIT_UPDATE(INFRARED_DMA_TIMER); LL_TIM_DisableIT_UPDATE(INFRARED_DMA_TIMER);
LL_TIM_EnableDMAReq_UPDATE(INFRARED_DMA_TIMER); LL_TIM_EnableDMAReq_UPDATE(INFRARED_DMA_TIMER);
NVIC_SetPriority(TIM1_UP_TIM16_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(), 5, 0));
NVIC_EnableIRQ(TIM1_UP_TIM16_IRQn);
} }
static void furi_hal_infrared_configure_tim_cmgr2_dma_tx(void) { static void furi_hal_infrared_configure_tim_cmgr2_dma_tx(void) {

11
firmware/targets/f7/furi_hal/furi_hal_interrupt.c
View File

@ -62,7 +62,7 @@ const IRQn_Type furi_hal_interrupt_irqn[FuriHalInterruptIdMax] = {
__attribute__((always_inline)) static inline void __attribute__((always_inline)) static inline void
furi_hal_interrupt_call(FuriHalInterruptId index) { furi_hal_interrupt_call(FuriHalInterruptId index) {
furi_assert(furi_hal_interrupt_isr[index].isr); furi_check(furi_hal_interrupt_isr[index].isr);
furi_hal_interrupt_isr[index].isr(furi_hal_interrupt_isr[index].context); furi_hal_interrupt_isr[index].isr(furi_hal_interrupt_isr[index].context);
} }
@ -127,16 +127,15 @@ void furi_hal_interrupt_set_isr_ex(
uint16_t priority, uint16_t priority,
FuriHalInterruptISR isr, FuriHalInterruptISR isr,
void* context) { void* context) {
furi_assert(index < FuriHalInterruptIdMax); furi_check(index < FuriHalInterruptIdMax);
furi_assert(priority < 15); furi_check(priority < 15);
furi_assert(furi_hal_interrupt_irqn[index]);
if(isr) { if(isr) {
// Pre ISR set // Pre ISR set
furi_assert(furi_hal_interrupt_isr[index].isr == NULL); furi_check(furi_hal_interrupt_isr[index].isr == NULL);
} else { } else {
// Pre ISR clear // Pre ISR clear
furi_assert(furi_hal_interrupt_isr[index].isr != NULL); furi_check(furi_hal_interrupt_isr[index].isr != NULL);
furi_hal_interrupt_disable(index); furi_hal_interrupt_disable(index);
furi_hal_interrupt_clear_pending(index); furi_hal_interrupt_clear_pending(index);
} }