Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-25 01:38:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

[FL-3847, FL-3513] Thread Signals (#3730)

Browse Source 
* Add signal API
* Add signal support to loader
* Add signal support to ViewDispatcher
* Remove extra signal definitions
* Fix typos
  Co-authored-by: Silent <CookiePLMonster@users.noreply.github.com>
* scripts: runfap: close current app pre-launch
* loader: enable backlight when starting an app
* scripts: removed distfap.py
* Do not expose signal API via ViewDispatcher
* scripts: runfap: iterative retry to launch
* Add a loader signal subcommand
* Furi, Gui: move signal handling from View Dispatcher to Event Loop

Co-authored-by: Silent <CookiePLMonster@users.noreply.github.com>
Co-authored-by: hedger <hedger@nanode.su>
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
This commit is contained in:
Georgii Surkov
2024-06-21 23:44:36 +03:00
committed by GitHub
parent a0036d10fc
commit 4cf98867a0
16 changed files with 291 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/services/loader/loader_cli.c
+64 -27
View File
@@ -1,8 +1,10 @@
#include "loader.h"
#include <furi.h>
#include <cli/cli.h>
#include <applications.h>
#include <lib/toolbox/args.h>
#include "loader.h"
#include <notification/notification_messages.h>
static void loader_cli_print_usage(void) {
printf("Usage:\r\n");
@@ -11,6 +13,8 @@ static void loader_cli_print_usage(void) {
printf("\tlist\t - List available applications\r\n");
printf("\topen <Application Name:string>\t - Open application by name\r\n");
printf("\tinfo\t - Show loader state\r\n");
printf("\tclose\t - Close the current application\r\n");
printf("\tsignal <signal:number> [arg:hex]\t - Send a signal with an optional argument\r\n");
}
static void loader_cli_list(void) {
@@ -25,12 +29,15 @@ static void loader_cli_list(void) {
}
static void loader_cli_info(Loader* loader) {
if(!loader_is_locked(loader)) {
FuriString* app_name = furi_string_alloc();
if(!loader_get_application_name(loader, app_name)) {
printf("No application is running\r\n");
} else {
// TODO FL-3513: print application name ???
printf("Application is running\r\n");
printf("Application \"%s\" is running\r\n", furi_string_get_cstr(app_name));
}
furi_string_free(app_name);
}
static void loader_cli_open(FuriString* args, Loader* loader) {
@@ -53,6 +60,12 @@ static void loader_cli_open(FuriString* args, Loader* loader) {
FuriString* error_message = furi_string_alloc();
if(loader_start(loader, app_name_str, args_str, error_message) != LoaderStatusOk) {
printf("%s\r\n", furi_string_get_cstr(error_message));
} else {
#ifdef SRV_NOTIFICATION
NotificationApp* notification_srv = furi_record_open(RECORD_NOTIFICATION);
notification_message(notification_srv, &sequence_display_backlight_on);
furi_record_close(RECORD_NOTIFICATION);
#endif
}
furi_string_free(error_message);
} while(false);
@@ -60,6 +73,38 @@ static void loader_cli_open(FuriString* args, Loader* loader) {
furi_string_free(app_name);
}
static void loader_cli_close(Loader* loader) {
FuriString* app_name = furi_string_alloc();
if(!loader_get_application_name(loader, app_name)) {
printf("No application is running\r\n");
} else if(!loader_signal(loader, FuriSignalExit, NULL)) {
printf("Application \"%s\" has to be closed manually\r\n", furi_string_get_cstr(app_name));
} else {
printf("Application \"%s\" was closed\r\n", furi_string_get_cstr(app_name));
}
furi_string_free(app_name);
}
static void loader_cli_signal(FuriString* args, Loader* loader) {
uint32_t signal;
void* arg = NULL;
if(!sscanf(furi_string_get_cstr(args), "%lu %p", &signal, &arg)) {
printf("Signal must be a decimal number\r\n");
} else if(!loader_is_locked(loader)) {
printf("No application is running\r\n");
} else {
const bool is_handled = loader_signal(loader, signal, arg);
printf(
"Signal %lu with argument 0x%p was %s\r\n",
signal,
arg,
is_handled ? "handled" : "ignored");
}
}
static void loader_cli(Cli* cli, FuriString* args, void* context) {
UNUSED(cli);
UNUSED(context);
@@ -68,29 +113,21 @@ static void loader_cli(Cli* cli, FuriString* args, void* context) {
FuriString* cmd;
cmd = furi_string_alloc();
do {
if(!args_read_string_and_trim(args, cmd)) {
loader_cli_print_usage();
break;
}
if(furi_string_cmp_str(cmd, "list") == 0) {
loader_cli_list();
break;
}
if(furi_string_cmp_str(cmd, "open") == 0) {
loader_cli_open(args, loader);
break;
}
if(furi_string_cmp_str(cmd, "info") == 0) {
loader_cli_info(loader);
break;
}
if(!args_read_string_and_trim(args, cmd)) {
loader_cli_print_usage();
} while(false);
} else if(furi_string_equal(cmd, "list")) {
loader_cli_list();
} else if(furi_string_equal(cmd, "open")) {
loader_cli_open(args, loader);
} else if(furi_string_equal(cmd, "info")) {
loader_cli_info(loader);
} else if(furi_string_equal(cmd, "close")) {
loader_cli_close(loader);
} else if(furi_string_equal(cmd, "signal")) {
loader_cli_signal(args, loader);
} else {
loader_cli_print_usage();
}
furi_string_free(cmd);
furi_record_close(RECORD_LOADER);
@@ -104,4 +141,4 @@ void loader_on_system_start(void) {
#else
UNUSED(loader_cli);
#endif
}
}