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

[FL-872] Furi, API-HAL, App-Loader cleanup and improvements (#334)

Browse Source 
* Furi: replace obsolete furiac_exit with osThreadExit, drop obsolete apis and test. Rename systemd to flipper and move to separate file, cleanup. ApiHal: Rename timebase to os and move freertos hooks there, move insomnia api to power module.
* Furi: new thread helper
* Furi: cleanup thread documentation
* Flipper, AppLoader: update to use FuriThread. Update tasks signatures to match FuriThreadCallback signature.
* F4: rename API_HAL_TIMEBASE_DEBUG to API_HAL_OS_DEBUG
* Applications: rename FuriApplication to FlipperApplication, use FuriThreadCallback signature for apps.
* C++ app template sample, new exit method
This commit is contained in:
あく
2021-02-12 20:24:34 +03:00
committed by GitHub
parent 7c5de59f53
commit b835d7a451
67 changed files with 906 additions and 1494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,20 +8,19 @@
#include <api-hal.h>
typedef struct {
osThreadAttr_t app_thread_attr;
osThreadId_t app_thread_id;
FuriThread* thread;
ViewPort* view_port;
const FuriApplication* current_app;
const FlipperApplication* current_app;
} AppLoaderState;
typedef struct {
AppLoaderState* state;
const FuriApplication* app;
const FlipperApplication* app;
} AppLoaderContext;
// TODO add mutex for contex
static void render_callback(Canvas* canvas, void* _ctx) {
static void app_loader_render_callback(Canvas* canvas, void* _ctx) {
AppLoaderState* ctx = (AppLoaderState*)_ctx;
canvas_clear(canvas);
@@ -33,77 +32,71 @@ static void render_callback(Canvas* canvas, void* _ctx) {
canvas_draw_str(canvas, 2, 44, "press back to exit");
}
static void input_callback(InputEvent* input_event, void* _ctx) {
static void app_loader_input_callback(InputEvent* input_event, void* _ctx) {
AppLoaderState* ctx = (AppLoaderState*)_ctx;
if(input_event->type == InputTypeShort && input_event->key == InputKeyBack) {
osThreadTerminate(ctx->app_thread_id);
view_port_enabled_set(ctx->view_port, false);
api_hal_timebase_insomnia_exit();
furi_thread_terminate(ctx->thread);
}
}
static void handle_menu(void* _ctx) {
static void app_loader_menu_callback(void* _ctx) {
AppLoaderContext* ctx = (AppLoaderContext*)_ctx;
if(ctx->app->app == NULL) return;
view_port_enabled_set(ctx->state->view_port, true);
// TODO how to call this?
// furiac_wait_libs(&FLIPPER_STARTUP[i].libs);
api_hal_timebase_insomnia_enter();
api_hal_power_insomnia_enter();
ctx->state->current_app = ctx->app;
ctx->state->app_thread_attr.name = ctx->app->name;
ctx->state->app_thread_attr.attr_bits = osThreadDetached;
ctx->state->app_thread_attr.cb_mem = NULL;
ctx->state->app_thread_attr.cb_size = 0;
ctx->state->app_thread_attr.stack_mem = NULL;
ctx->state->app_thread_attr.stack_size = ctx->app->stack_size;
ctx->state->app_thread_attr.priority = osPriorityNormal;
ctx->state->app_thread_attr.tz_module = 0;
ctx->state->app_thread_attr.reserved = 0;
ctx->state->app_thread_id = osThreadNew(ctx->app->app, NULL, &ctx->state->app_thread_attr);
furi_thread_set_name(ctx->state->thread, ctx->app->name);
furi_thread_set_stack_size(ctx->state->thread, ctx->app->stack_size);
furi_thread_set_callback(ctx->state->thread, ctx->app->app);
furi_thread_start(ctx->state->thread);
}
static void handle_cli(string_t args, void* _ctx) {
static void app_loader_cli_callback(string_t args, void* _ctx) {
AppLoaderContext* ctx = (AppLoaderContext*)_ctx;
if(ctx->app->app == NULL) return;
printf("Starting furi application\r\n");
ctx->state->current_app = ctx->app;
ctx->state->app_thread_attr.name = ctx->app->name;
ctx->state->app_thread_attr.attr_bits = osThreadDetached;
ctx->state->app_thread_attr.cb_mem = NULL;
ctx->state->app_thread_attr.cb_size = 0;
ctx->state->app_thread_attr.stack_mem = NULL;
ctx->state->app_thread_attr.stack_size = ctx->app->stack_size;
ctx->state->app_thread_attr.priority = osPriorityNormal;
ctx->state->app_thread_attr.tz_module = 0;
ctx->state->app_thread_attr.reserved = 0;
ctx->state->app_thread_id = osThreadNew(ctx->app->app, NULL, &ctx->state->app_thread_attr);
api_hal_power_insomnia_enter();
furi_thread_set_name(ctx->state->thread, ctx->app->name);
furi_thread_set_stack_size(ctx->state->thread, ctx->app->stack_size);
furi_thread_set_callback(ctx->state->thread, ctx->app->app);
furi_thread_start(ctx->state->thread);
printf("Press any key to kill application");
char c;
cli_read(&c, 1);
osThreadTerminate(ctx->state->app_thread_id);
furi_thread_terminate(ctx->state->thread);
}
void app_loader(void* p) {
osThreadId_t self_id = osThreadGetId();
furi_check(self_id);
void app_loader_thread_state_callback(FuriThreadState state, void* context) {
furi_assert(context);
AppLoaderState* app_loader_state = context;
if(state == FuriThreadStateStopped) {
view_port_enabled_set(app_loader_state->view_port, false);
api_hal_power_insomnia_exit();
}
}
int32_t app_loader(void* p) {
AppLoaderState state;
state.app_thread_id = NULL;
state.thread = furi_thread_alloc();
furi_thread_set_state_context(state.thread, &state);
furi_thread_set_state_callback(state.thread, app_loader_thread_state_callback);
state.view_port = view_port_alloc();
view_port_enabled_set(state.view_port, false);
view_port_draw_callback_set(state.view_port, render_callback, &state);
view_port_input_callback_set(state.view_port, input_callback, &state);
view_port_draw_callback_set(state.view_port, app_loader_render_callback, &state);
view_port_input_callback_set(state.view_port, app_loader_input_callback, &state);
ValueMutex* menu_mutex = furi_record_open("menu");
Cli* cli = furi_record_open("cli");
@@ -114,7 +107,7 @@ void app_loader(void* p) {
// Main menu
with_value_mutex(
menu_mutex, (Menu * menu) {
for(size_t i = 0; i < FLIPPER_APPS_size(); i++) {
for(size_t i = 0; i < FLIPPER_APPS_COUNT; i++) {
AppLoaderContext* ctx = furi_alloc(sizeof(AppLoaderContext));
ctx->state = &state;
ctx->app = &FLIPPER_APPS[i];
@@ -124,14 +117,14 @@ void app_loader(void* p) {
menu_item_alloc_function(
FLIPPER_APPS[i].name,
assets_icons_get(FLIPPER_APPS[i].icon),
handle_menu,
app_loader_menu_callback,
ctx));
// Add cli command
string_t cli_name;
string_init_set_str(cli_name, "app_");
string_cat_str(cli_name, FLIPPER_APPS[i].name);
cli_add_command(cli, string_get_cstr(cli_name), handle_cli, ctx);
cli_add_command(cli, string_get_cstr(cli_name), app_loader_cli_callback, ctx);
string_clear(cli_name);
}
});
@@ -160,7 +153,7 @@ void app_loader(void* p) {
MenuItem* menu_plugins =
menu_item_alloc_menu("Plugins", assets_icons_get(A_Plugins_14));
for(size_t i = 0; i < FLIPPER_PLUGINS_size(); i++) {
for(size_t i = 0; i < FLIPPER_PLUGINS_COUNT; i++) {
AppLoaderContext* ctx = furi_alloc(sizeof(AppLoaderContext));
ctx->state = &state;
ctx->app = &FLIPPER_PLUGINS[i];
@@ -170,14 +163,14 @@ void app_loader(void* p) {
menu_item_alloc_function(
FLIPPER_PLUGINS[i].name,
assets_icons_get(FLIPPER_PLUGINS[i].icon),
handle_menu,
app_loader_menu_callback,
ctx));
// Add cli command
string_t cli_name;
string_init_set_str(cli_name, "app_");
string_cat_str(cli_name, FLIPPER_PLUGINS[i].name);
cli_add_command(cli, string_get_cstr(cli_name), handle_cli, ctx);
cli_add_command(cli, string_get_cstr(cli_name), app_loader_cli_callback, ctx);
string_clear(cli_name);
}
@@ -186,5 +179,9 @@ void app_loader(void* p) {
printf("[app loader] start\r\n");
osThreadSuspend(self_id);
while(1) {
osThreadSuspend(osThreadGetId());
}
return 0;
}