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

syntax fix

Browse Source
This commit is contained in:
aanper 2020-10-17 13:41:50 +03:00
parent 0f4799d70b
commit 66f6df08cc
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
applications/app-loader/app-loader.c
View File

@ -28,7 +28,7 @@ void render_callback(CanvasApi* canvas, void* _ctx) {
void input_callback(InputEvent* input_event, void* _ctx) { void input_callback(InputEvent* input_event, void* _ctx) {
AppLoaderState* ctx = (AppLoaderState*)_ctx; AppLoaderState* ctx = (AppLoaderState*)_ctx;
if(input_event->state && input_event->input == InputBack){ if(input_event->state && input_event->input == InputBack) {
furiac_kill(ctx->handler); furiac_kill(ctx->handler);
widget_enabled_set(ctx->widget, false); widget_enabled_set(ctx->widget, false);
} }
@ -94,12 +94,8 @@ void app_loader(void* p) {
ctx->state = &state; ctx->state = &state;
ctx->app = &FLIPPER_APPS[i]; ctx->app = &FLIPPER_APPS[i];
menu_item_add(menu, menu_item_alloc_function( menu_item_add(
FLIPPER_APPS[i].name, menu, menu_item_alloc_function(FLIPPER_APPS[i].name, NULL, handle_menu, ctx));
NULL,
handle_menu,
ctx
));
} }
/* /*

4
applications/menu/menu.c
View File

@ -74,7 +74,7 @@ void menu_settings_item_add(Menu* menu, MenuItem* item) {
void menu_widget_callback(CanvasApi* canvas, void* context) { void menu_widget_callback(CanvasApi* canvas, void* context) {
assert(canvas); assert(canvas);
assert(context); assert(context);
Menu* menu = acquire_mutex((ValueMutex*)context, 100); // wait 10 ms to get mutex Menu* menu = acquire_mutex((ValueMutex*)context, 100); // wait 10 ms to get mutex
if(menu == NULL) return; // redraw fail if(menu == NULL) return; // redraw fail
@ -97,7 +97,6 @@ void menu_widget_callback(CanvasApi* canvas, void* context) {
} }
release_mutex((ValueMutex*)context, menu); release_mutex((ValueMutex*)context, menu);
} }
void menu_update(Menu* menu) { void menu_update(Menu* menu) {
@ -195,7 +194,6 @@ void menu_task(void* p) {
Menu* menu = acquire_mutex_block(menu_mutex); Menu* menu = acquire_mutex_block(menu_mutex);
if(!menu->current && m.type != MenuMessageTypeOk) { if(!menu->current && m.type != MenuMessageTypeOk) {
} else if(m.type == MenuMessageTypeUp) { } else if(m.type == MenuMessageTypeUp) {
menu_up(menu); menu_up(menu);
} else if(m.type == MenuMessageTypeDown) { } else if(m.type == MenuMessageTypeDown) {