diff --git a/applications/main/application.fam b/applications/main/application.fam index 49fc6466c..376af8c42 100644 --- a/applications/main/application.fam +++ b/applications/main/application.fam @@ -3,28 +3,19 @@ App( name="Basic applications for main menu", apptype=FlipperAppType.METAPACKAGE, provides=[ - "clock_loader", - # "gpio", - "gpio_loader", - # "ibutton", - "ibutton_loader", - # "infrared", - "infrared_loader", + "gpio", + "ibutton", + "infrared", "lfrfid", - # "lfrfid_loader", "nfc", "subghz", - "sub_playlist_loader", - #"bad_usb", - "bad_usb_loader", - # "u2f", - "u2f_loader", + "bad_usb", + "u2f", "fap_loader", + "sub_playlist", "archive", - # "Clock", - #"SubGHz_Remote", - "SubGHz_Remote_loader", - # "Spectrum_Analyzer", + "clock", + "unirfremix", ], ) diff --git a/applications/main/archive/scenes/archive_scene_browser.c b/applications/main/archive/scenes/archive_scene_browser.c index ea85d6559..f88efb0c4 100644 --- a/applications/main/archive/scenes/archive_scene_browser.c +++ b/applications/main/archive/scenes/archive_scene_browser.c @@ -45,55 +45,10 @@ static void archive_run_in_app(ArchiveBrowserView* browser, ArchiveFile_t* selec if(param != NULL) { param++; } - - if(strcmp(flipper_app_name[selected->type], "U2F") == 0) { - char* tmpType = "/ext/apps/Main/U2F.fap¯"; - char* result = - malloc(strlen(tmpType) + strlen(furi_string_get_cstr(selected->path)) + 1); - - strcpy(result, tmpType); - strcat(result, furi_string_get_cstr(selected->path)); - status = loader_start(loader, "Applications", result); - } else { - status = loader_start(loader, flipper_app_name[selected->type], param); - } + status = loader_start(loader, flipper_app_name[selected->type], param); } else { - if(strcmp(flipper_app_name[selected->type], "iButton") == 0) { - char* tmpType = "/ext/apps/Main/ibutton.fap¯"; - char* result = - malloc(strlen(tmpType) + strlen(furi_string_get_cstr(selected->path)) + 1); - - strcpy(result, tmpType); - strcat(result, furi_string_get_cstr(selected->path)); - status = loader_start(loader, "Applications", result); - } else if(strcmp(flipper_app_name[selected->type], "Bad USB") == 0) { - char* tmpType = "/ext/apps/Main/bad_usb.fap¯"; - char* result = - malloc(strlen(tmpType) + strlen(furi_string_get_cstr(selected->path)) + 1); - - strcpy(result, tmpType); - strcat(result, furi_string_get_cstr(selected->path)); - status = loader_start(loader, "Applications", result); - // } else if(strcmp(flipper_app_name[selected->type], "125 kHz RFID") == 0) { - // char* tmpType = "/ext/apps/Main/lfrfid.fap¯"; - // char* result = - // malloc(strlen(tmpType) + strlen(furi_string_get_cstr(selected->path)) + 1); - - // strcpy(result, tmpType); - // strcat(result, furi_string_get_cstr(selected->path)); - // status = loader_start(loader, "Applications", result); - } else if(strcmp(flipper_app_name[selected->type], "Infrared") == 0) { - char* tmpType = "/ext/apps/Main/infrared.fap¯"; - char* result = - malloc(strlen(tmpType) + strlen(furi_string_get_cstr(selected->path)) + 1); - - strcpy(result, tmpType); - strcat(result, furi_string_get_cstr(selected->path)); - status = loader_start(loader, "Applications", result); - } else { - status = loader_start( - loader, flipper_app_name[selected->type], furi_string_get_cstr(selected->path)); - } + status = loader_start( + loader, flipper_app_name[selected->type], furi_string_get_cstr(selected->path)); } if(status != LoaderStatusOk) { diff --git a/applications/main/bad_usb/application.fam b/applications/main/bad_usb/application.fam index d068bc8a2..2442dd3aa 100644 --- a/applications/main/bad_usb/application.fam +++ b/applications/main/bad_usb/application.fam @@ -1,7 +1,7 @@ App( appid="bad_usb", name="Bad USB", - apptype=FlipperAppType.EXTERNAL, + apptype=FlipperAppType.APP, entry_point="bad_usb_app", cdefines=["APP_BAD_USB"], requires=[ @@ -9,10 +9,7 @@ App( "dialogs", ], stack_size=2 * 1024, - # icon="A_BadUsb_14", + icon="A_BadUsb_14", order=70, - fap_category="Main", - fap_icon="badusb_10px.png", - fap_icon_assets="images", fap_libs=["assets"], ) diff --git a/applications/main/bad_usb/bad_usb_app_i.h b/applications/main/bad_usb/bad_usb_app_i.h index eda67eae5..b3fbb1679 100644 --- a/applications/main/bad_usb/bad_usb_app_i.h +++ b/applications/main/bad_usb/bad_usb_app_i.h @@ -5,7 +5,7 @@ #include "bad_usb_script.h" #include -#include +#include #include #include #include diff --git a/applications/main/bad_usb/bad_usb_script.c b/applications/main/bad_usb/bad_usb_script.c index aad79a329..62a826ed6 100644 --- a/applications/main/bad_usb/bad_usb_script.c +++ b/applications/main/bad_usb/bad_usb_script.c @@ -462,14 +462,7 @@ static int32_t ducky_script_execute_next(BadUsbScript* bad_usb, File* script_fil return 0; } else if(delay_val < 0) { bad_usb->st.error_line = bad_usb->st.line_cur; - if(delay_val == SCRIPT_STATE_NEXT_LINE) { - snprintf( - bad_usb->st.error, sizeof(bad_usb->st.error), "Forbidden empty line"); - FURI_LOG_E( - WORKER_TAG, "Forbidden empty line at line %u", bad_usb->st.line_cur); - } else { - FURI_LOG_E(WORKER_TAG, "Unknown command at line %u", bad_usb->st.line_cur); - } + FURI_LOG_E(WORKER_TAG, "Unknown command at line %u", bad_usb->st.line_cur); return SCRIPT_STATE_ERROR; } else { return (delay_val + bad_usb->defdelay); diff --git a/applications/main/bad_usb/badusb_10px.png b/applications/main/bad_usb/badusb_10px.png deleted file mode 100644 index 037474aa3..000000000 Binary files a/applications/main/bad_usb/badusb_10px.png and /dev/null differ diff --git a/applications/main/bad_usb/images/ActiveConnection_50x64.png b/applications/main/bad_usb/images/ActiveConnection_50x64.png deleted file mode 100644 index 1d7686ddd..000000000 Binary files a/applications/main/bad_usb/images/ActiveConnection_50x64.png and /dev/null differ diff --git a/applications/main/bad_usb/images/Clock_18x18.png b/applications/main/bad_usb/images/Clock_18x18.png deleted file mode 100644 index ab06d008e..000000000 Binary files a/applications/main/bad_usb/images/Clock_18x18.png and /dev/null differ diff --git a/applications/main/bad_usb/images/Error_18x18.png b/applications/main/bad_usb/images/Error_18x18.png deleted file mode 100644 index 16a5a74d9..000000000 Binary files a/applications/main/bad_usb/images/Error_18x18.png and /dev/null differ diff --git a/applications/main/bad_usb/images/EviSmile1_18x21.png b/applications/main/bad_usb/images/EviSmile1_18x21.png deleted file mode 100644 index 987af3258..000000000 Binary files a/applications/main/bad_usb/images/EviSmile1_18x21.png and /dev/null differ diff --git a/applications/main/bad_usb/images/EviSmile2_18x21.png b/applications/main/bad_usb/images/EviSmile2_18x21.png deleted file mode 100644 index 7e28c9f01..000000000 Binary files a/applications/main/bad_usb/images/EviSmile2_18x21.png and /dev/null differ diff --git a/applications/main/bad_usb/images/EviWaiting1_18x21.png b/applications/main/bad_usb/images/EviWaiting1_18x21.png deleted file mode 100644 index d39d21733..000000000 Binary files a/applications/main/bad_usb/images/EviWaiting1_18x21.png and /dev/null differ diff --git a/applications/main/bad_usb/images/EviWaiting2_18x21.png b/applications/main/bad_usb/images/EviWaiting2_18x21.png deleted file mode 100644 index 15ca088fd..000000000 Binary files a/applications/main/bad_usb/images/EviWaiting2_18x21.png and /dev/null differ diff --git a/applications/main/bad_usb/images/Percent_10x14.png b/applications/main/bad_usb/images/Percent_10x14.png deleted file mode 100644 index 677911fd4..000000000 Binary files a/applications/main/bad_usb/images/Percent_10x14.png and /dev/null differ diff --git a/applications/main/bad_usb/images/SDQuestion_35x43.png b/applications/main/bad_usb/images/SDQuestion_35x43.png deleted file mode 100644 index 9b9c9a58e..000000000 Binary files a/applications/main/bad_usb/images/SDQuestion_35x43.png and /dev/null differ diff --git a/applications/main/bad_usb/images/Smile_18x18.png b/applications/main/bad_usb/images/Smile_18x18.png deleted file mode 100644 index d2aae0dc3..000000000 Binary files a/applications/main/bad_usb/images/Smile_18x18.png and /dev/null differ diff --git a/applications/main/bad_usb/images/UsbTree_48x22.png b/applications/main/bad_usb/images/UsbTree_48x22.png deleted file mode 100644 index cc41b5b9a..000000000 Binary files a/applications/main/bad_usb/images/UsbTree_48x22.png and /dev/null differ diff --git a/applications/main/bad_usb/images/badusb_10px.png b/applications/main/bad_usb/images/badusb_10px.png deleted file mode 100644 index 037474aa3..000000000 Binary files a/applications/main/bad_usb/images/badusb_10px.png and /dev/null differ diff --git a/applications/main/bad_usb/images/keyboard_10px.png b/applications/main/bad_usb/images/keyboard_10px.png deleted file mode 100644 index 74a10e6db..000000000 Binary files a/applications/main/bad_usb/images/keyboard_10px.png and /dev/null differ diff --git a/applications/main/bad_usb/scenes/bad_usb_scene_file_select.c b/applications/main/bad_usb/scenes/bad_usb_scene_file_select.c index de84e3406..21a2ce024 100644 --- a/applications/main/bad_usb/scenes/bad_usb_scene_file_select.c +++ b/applications/main/bad_usb/scenes/bad_usb_scene_file_select.c @@ -49,4 +49,4 @@ bool bad_usb_scene_file_select_on_event(void* context, SceneManagerEvent event) void bad_usb_scene_file_select_on_exit(void* context) { UNUSED(context); // BadUsbApp* bad_usb = context; -} \ No newline at end of file +} diff --git a/applications/main/bad_usb/views/bad_usb_view.c b/applications/main/bad_usb/views/bad_usb_view.c index 2a15c4d4e..26b6ed27d 100644 --- a/applications/main/bad_usb/views/bad_usb_view.c +++ b/applications/main/bad_usb/views/bad_usb_view.c @@ -2,7 +2,7 @@ #include "../bad_usb_script.h" #include #include -#include +#include #include "../../../settings/desktop_settings/desktop_settings_app.h" #define MAX_NAME_LEN 64 diff --git a/applications/main/bad_usb_loader/application.fam b/applications/main/bad_usb_loader/application.fam deleted file mode 100644 index d3bc81cf0..000000000 --- a/applications/main/bad_usb_loader/application.fam +++ /dev/null @@ -1,14 +0,0 @@ -App( - appid="bad_usb_loader", - name="Bad USB", - apptype=FlipperAppType.APP, - entry_point="bad_usb_loader_app", - requires=[ - "gui", - "dialogs", - ], - stack_size=int(2 * 1024), - icon="A_BadUsb_14", - order=70, - link="/ext/apps/Main/bad_usb.fap", -) diff --git a/applications/main/bad_usb_loader/bad_usb_loader_app.c b/applications/main/bad_usb_loader/bad_usb_loader_app.c deleted file mode 100644 index cede52b55..000000000 --- a/applications/main/bad_usb_loader/bad_usb_loader_app.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#define TAG "bad_usb_loader_app" - -int32_t bad_usb_loader_app(void* p) { - UNUSED(p); - - return 0; -} \ No newline at end of file diff --git a/applications/main/clock/ClockIcon.png b/applications/main/clock/ClockIcon.png deleted file mode 100644 index 71ccaeabb..000000000 Binary files a/applications/main/clock/ClockIcon.png and /dev/null differ diff --git a/applications/main/clock/application.fam b/applications/main/clock/application.fam deleted file mode 100644 index a5486947a..000000000 --- a/applications/main/clock/application.fam +++ /dev/null @@ -1,14 +0,0 @@ -App( - appid="Clock", - name="Clock", - apptype=FlipperAppType.EXTERNAL, - entry_point="clock_app", - cdefines=["APP_CLOCK"], - requires=["gui"], - # icon="A_Clock_14", - stack_size=2 * 1024, - order=9, - fap_icon="ClockIcon.png", - fap_category="Main", - fap_icon_assets="icons", -) \ No newline at end of file diff --git a/applications/main/clock/icons/EviSmile1_18x21.png b/applications/main/clock/icons/EviSmile1_18x21.png deleted file mode 100644 index 987af3258..000000000 Binary files a/applications/main/clock/icons/EviSmile1_18x21.png and /dev/null differ diff --git a/applications/main/clock/icons/EviSmile2_18x21.png b/applications/main/clock/icons/EviSmile2_18x21.png deleted file mode 100644 index 7e28c9f01..000000000 Binary files a/applications/main/clock/icons/EviSmile2_18x21.png and /dev/null differ diff --git a/applications/main/clock/icons/EviWaiting1_18x21.png b/applications/main/clock/icons/EviWaiting1_18x21.png deleted file mode 100644 index d39d21733..000000000 Binary files a/applications/main/clock/icons/EviWaiting1_18x21.png and /dev/null differ diff --git a/applications/main/clock/icons/EviWaiting2_18x21.png b/applications/main/clock/icons/EviWaiting2_18x21.png deleted file mode 100644 index 15ca088fd..000000000 Binary files a/applications/main/clock/icons/EviWaiting2_18x21.png and /dev/null differ diff --git a/applications/main/clock/icons/G0ku.png b/applications/main/clock/icons/G0ku.png deleted file mode 100644 index 84389c4f4..000000000 Binary files a/applications/main/clock/icons/G0ku.png and /dev/null differ diff --git a/applications/main/clock/icons/GameMode_11x8.png b/applications/main/clock/icons/GameMode_11x8.png deleted file mode 100644 index 49f2e25bf..000000000 Binary files a/applications/main/clock/icons/GameMode_11x8.png and /dev/null differ diff --git a/applications/main/clock/icons/HappyFlipper_128x64.png b/applications/main/clock/icons/HappyFlipper_128x64.png deleted file mode 100644 index d95412f3f..000000000 Binary files a/applications/main/clock/icons/HappyFlipper_128x64.png and /dev/null differ diff --git a/applications/main/clock/icons/frame_01.png b/applications/main/clock/icons/frame_01.png deleted file mode 100644 index 0cd187053..000000000 Binary files a/applications/main/clock/icons/frame_01.png and /dev/null differ diff --git a/applications/main/clock/icons/frame_02.png b/applications/main/clock/icons/frame_02.png deleted file mode 100644 index 3c37cdb8b..000000000 Binary files a/applications/main/clock/icons/frame_02.png and /dev/null differ diff --git a/applications/main/clock/icons/frame_03.png b/applications/main/clock/icons/frame_03.png deleted file mode 100644 index a111ce163..000000000 Binary files a/applications/main/clock/icons/frame_03.png and /dev/null differ diff --git a/applications/main/clock/icons/g0ku_1.png b/applications/main/clock/icons/g0ku_1.png deleted file mode 100644 index 900d5113f..000000000 Binary files a/applications/main/clock/icons/g0ku_1.png and /dev/null differ diff --git a/applications/main/clock/icons/g0ku_2.png b/applications/main/clock/icons/g0ku_2.png deleted file mode 100644 index 202353bb9..000000000 Binary files a/applications/main/clock/icons/g0ku_2.png and /dev/null differ diff --git a/applications/main/clock/icons/g0ku_3.png b/applications/main/clock/icons/g0ku_3.png deleted file mode 100644 index 517c1653f..000000000 Binary files a/applications/main/clock/icons/g0ku_3.png and /dev/null differ diff --git a/applications/main/clock_app/application.fam b/applications/main/clock_app/application.fam new file mode 100644 index 000000000..9016973c5 --- /dev/null +++ b/applications/main/clock_app/application.fam @@ -0,0 +1,12 @@ +App( + appid="clock", + name="Clock", + apptype=FlipperAppType.APP, + entry_point="clock_app", + cdefines=["APP_CLOCK"], + requires=["gui"], + icon="A_Clock_14", + stack_size=2 * 1024, + order=81, +) + diff --git a/applications/main/clock/clock_app.c b/applications/main/clock_app/clock_app.c similarity index 100% rename from applications/main/clock/clock_app.c rename to applications/main/clock_app/clock_app.c diff --git a/applications/main/clock/clock_app.h b/applications/main/clock_app/clock_app.h similarity index 98% rename from applications/main/clock/clock_app.h rename to applications/main/clock_app/clock_app.h index a6a99254b..693bdfac0 100644 --- a/applications/main/clock/clock_app.h +++ b/applications/main/clock_app/clock_app.h @@ -36,4 +36,4 @@ typedef struct { uint32_t timer_start_timestamp; uint32_t timer_stopped_seconds; bool timer_running; -} ClockState; \ No newline at end of file +} ClockState; diff --git a/applications/main/clock_loader/application.fam b/applications/main/clock_loader/application.fam deleted file mode 100644 index cbb627c9c..000000000 --- a/applications/main/clock_loader/application.fam +++ /dev/null @@ -1,11 +0,0 @@ -App( - appid="clock_loader", - name="Clock", - apptype=FlipperAppType.APP, - entry_point="clock_loader_app", - requires=["gui"], - stack_size=int(1.5 * 1024), - icon="A_Clock_14", - order=9, - link="/ext/apps/Main/Clock.fap", -) diff --git a/applications/main/clock_loader/clock_loader_app.c b/applications/main/clock_loader/clock_loader_app.c deleted file mode 100644 index cf345d9f3..000000000 --- a/applications/main/clock_loader/clock_loader_app.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#define TAG "clock_loader_app" - -int32_t clock_loader_app(void* p) { - UNUSED(p); - - return 0; -} \ No newline at end of file diff --git a/applications/main/fap_loader/fap_loader_app.c b/applications/main/fap_loader/fap_loader_app.c index fbec8b718..7911aa068 100644 --- a/applications/main/fap_loader/fap_loader_app.c +++ b/applications/main/fap_loader/fap_loader_app.c @@ -17,7 +17,6 @@ struct FapLoader { DialogsApp* dialogs; Gui* gui; FuriString* fap_path; - FuriString* fap_args; ViewDispatcher* view_dispatcher; Loading* loading; }; @@ -105,26 +104,14 @@ static bool fap_loader_run_selected_app(FapLoader* loader) { FURI_LOG_I(TAG, "Loaded in %ums", (size_t)(furi_get_tick() - start)); FURI_LOG_I(TAG, "FAP Loader is starting app"); - if(strcmp(furi_string_get_cstr(loader->fap_args), "false") == 0) { - FuriThread* thread = flipper_application_spawn(loader->app, NULL); - furi_thread_start(thread); - furi_thread_join(thread); + FuriThread* thread = flipper_application_spawn(loader->app, NULL); + furi_thread_start(thread); + furi_thread_join(thread); - show_error = false; - int ret = furi_thread_get_return_code(thread); + show_error = false; + int ret = furi_thread_get_return_code(thread); - FURI_LOG_I(TAG, "FAP app returned: %i", ret); - } else { - FuriThread* thread = flipper_application_spawn( - loader->app, (void*)furi_string_get_cstr(loader->fap_args)); - furi_thread_start(thread); - furi_thread_join(thread); - - show_error = false; - int ret = furi_thread_get_return_code(thread); - - FURI_LOG_I(TAG, "FAP app returned: %i", ret); - } + FURI_LOG_I(TAG, "FAP app returned: %i", ret); } while(0); if(show_error) { @@ -169,28 +156,8 @@ static bool fap_loader_select_app(FapLoader* loader) { } static FapLoader* fap_loader_alloc(const char* path) { - FapLoader* loader = malloc(sizeof(FapLoader)); //-V773 - - char* tmp = malloc(strlen(path) + 1); - strcpy(tmp, path); - char* new_path; - - new_path = strtok(tmp, "¯"); - - if(new_path) { - loader->fap_path = furi_string_alloc_set(new_path); - } else { - loader->fap_path = furi_string_alloc_set(path); - } - - new_path = strtok(NULL, "¯"); - - if(new_path) { - loader->fap_args = furi_string_alloc_set(new_path); - } else { - loader->fap_args = furi_string_alloc_set("false"); - } - + FapLoader* loader = malloc(sizeof(FapLoader)); //-V799 + loader->fap_path = furi_string_alloc_set(path); loader->storage = furi_record_open(RECORD_STORAGE); loader->dialogs = furi_record_open(RECORD_DIALOGS); loader->gui = furi_record_open(RECORD_GUI); @@ -207,7 +174,6 @@ static void fap_loader_free(FapLoader* loader) { loading_free(loader->loading); view_dispatcher_free(loader->view_dispatcher); furi_string_free(loader->fap_path); - furi_string_free(loader->fap_args); furi_record_close(RECORD_GUI); furi_record_close(RECORD_DIALOGS); furi_record_close(RECORD_STORAGE); diff --git a/applications/main/gpio/application.fam b/applications/main/gpio/application.fam index 8c6fa3897..efeb8b6fe 100644 --- a/applications/main/gpio/application.fam +++ b/applications/main/gpio/application.fam @@ -1,15 +1,12 @@ App( appid="gpio", name="GPIO", - apptype=FlipperAppType.EXTERNAL, + apptype=FlipperAppType.APP, entry_point="gpio_app", cdefines=["APP_GPIO"], requires=["gui"], stack_size=1 * 1024, - # icon="A_GPIO_14", + icon="A_GPIO_14", order=50, - fap_icon="gpioIcon.png", - fap_category="Main", - fap_icon_assets="images", fap_libs=["assets"], ) diff --git a/applications/main/gpio/gpioIcon.png b/applications/main/gpio/gpioIcon.png deleted file mode 100644 index 5b2f4293c..000000000 Binary files a/applications/main/gpio/gpioIcon.png and /dev/null differ diff --git a/applications/main/gpio/gpio_app_i.h b/applications/main/gpio/gpio_app_i.h index 06c7621fc..ac6c77a8e 100644 --- a/applications/main/gpio/gpio_app_i.h +++ b/applications/main/gpio/gpio_app_i.h @@ -17,7 +17,7 @@ #include "views/gpio_usb_uart.h" #include "views/gpio_i2c_scanner.h" #include "views/gpio_i2c_sfp.h" -#include +#include struct GpioApp { Gui* gui; diff --git a/applications/main/gpio/images/ActiveConnection_50x64.png b/applications/main/gpio/images/ActiveConnection_50x64.png deleted file mode 100644 index 1d7686ddd..000000000 Binary files a/applications/main/gpio/images/ActiveConnection_50x64.png and /dev/null differ diff --git a/applications/main/gpio/images/ArrowDownEmpty_14x15.png b/applications/main/gpio/images/ArrowDownEmpty_14x15.png deleted file mode 100644 index 8c6d54f9c..000000000 Binary files a/applications/main/gpio/images/ArrowDownEmpty_14x15.png and /dev/null differ diff --git a/applications/main/gpio/images/ArrowDownFilled_14x15.png b/applications/main/gpio/images/ArrowDownFilled_14x15.png deleted file mode 100644 index 6cef0f4a7..000000000 Binary files a/applications/main/gpio/images/ArrowDownFilled_14x15.png and /dev/null differ diff --git a/applications/main/gpio/images/ArrowUpEmpty_14x15.png b/applications/main/gpio/images/ArrowUpEmpty_14x15.png deleted file mode 100644 index 261c6d89e..000000000 Binary files a/applications/main/gpio/images/ArrowUpEmpty_14x15.png and /dev/null differ diff --git a/applications/main/gpio/images/ArrowUpFilled_14x15.png b/applications/main/gpio/images/ArrowUpFilled_14x15.png deleted file mode 100644 index fa35eb2f8..000000000 Binary files a/applications/main/gpio/images/ArrowUpFilled_14x15.png and /dev/null differ diff --git a/applications/main/gpio_loader/application.fam b/applications/main/gpio_loader/application.fam deleted file mode 100644 index 08a5b7967..000000000 --- a/applications/main/gpio_loader/application.fam +++ /dev/null @@ -1,14 +0,0 @@ -App( - appid="gpio_loader", - name="GPIO", - apptype=FlipperAppType.APP, - entry_point="gpio_loader_app", - requires=[ - "gui", - "storage", - ], - stack_size=int(1.5 * 1024), - icon="A_GPIO_14", - order=50, - link="/ext/apps/Main/gpio.fap", -) diff --git a/applications/main/gpio_loader/gpio_loader_app.c b/applications/main/gpio_loader/gpio_loader_app.c deleted file mode 100644 index ba7fb4e31..000000000 --- a/applications/main/gpio_loader/gpio_loader_app.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#define TAG "gpio_loader_app" - -int32_t gpio_loader_app(void* p) { - UNUSED(p); - - return 0; -} \ No newline at end of file diff --git a/applications/main/ibutton/application.fam b/applications/main/ibutton/application.fam index fc3333ae7..77bb9a33c 100644 --- a/applications/main/ibutton/application.fam +++ b/applications/main/ibutton/application.fam @@ -1,18 +1,24 @@ App( appid="ibutton", name="iButton", - apptype=FlipperAppType.EXTERNAL, + apptype=FlipperAppType.APP, entry_point="ibutton_app", cdefines=["APP_IBUTTON"], requires=[ "gui", "dialogs", ], - # icon="A_iButton_14", + provides=["ibutton_start"], + icon="A_iButton_14", stack_size=2 * 1024, order=60, - fap_icon="iBIcon.png", - fap_category="Main", - fap_icon_assets="images", fap_libs=["assets"], ) + +App( + appid="ibutton_start", + apptype=FlipperAppType.STARTUP, + entry_point="ibutton_on_system_start", + requires=["ibutton"], + order=60, +) diff --git a/applications/main/ibutton/iBIcon.png b/applications/main/ibutton/iBIcon.png deleted file mode 100644 index f6e3ecbcc..000000000 Binary files a/applications/main/ibutton/iBIcon.png and /dev/null differ diff --git a/applications/main/ibutton/ibutton.c b/applications/main/ibutton/ibutton.c index 86ff384a8..85212f42b 100644 --- a/applications/main/ibutton/ibutton.c +++ b/applications/main/ibutton/ibutton.c @@ -1,4 +1,5 @@ #include "ibutton.h" +#include "assets_icons.h" #include "ibutton_i.h" #include "ibutton/scenes/ibutton_scene.h" #include diff --git a/applications/services/ibuttonsrv/ibuttonsrv_cli.c b/applications/main/ibutton/ibutton_cli.c similarity index 100% rename from applications/services/ibuttonsrv/ibuttonsrv_cli.c rename to applications/main/ibutton/ibutton_cli.c diff --git a/applications/main/ibutton/ibutton_i.h b/applications/main/ibutton/ibutton_i.h index f79ae0d81..0a8099351 100644 --- a/applications/main/ibutton/ibutton_i.h +++ b/applications/main/ibutton/ibutton_i.h @@ -4,7 +4,7 @@ #include #include -#include "ibutton_icons.h" +#include #include #include #include diff --git a/applications/main/ibutton/images/DolphinMafia_115x62.png b/applications/main/ibutton/images/DolphinMafia_115x62.png deleted file mode 100644 index 53dffb4fa..000000000 Binary files a/applications/main/ibutton/images/DolphinMafia_115x62.png and /dev/null differ diff --git a/applications/main/ibutton/images/DolphinMafia_115x62_sfw.png b/applications/main/ibutton/images/DolphinMafia_115x62_sfw.png deleted file mode 100644 index 66fdb40ff..000000000 Binary files a/applications/main/ibutton/images/DolphinMafia_115x62_sfw.png and /dev/null differ diff --git a/applications/main/ibutton/images/DolphinNice_96x59.png b/applications/main/ibutton/images/DolphinNice_96x59.png deleted file mode 100644 index 43cc58bd9..000000000 Binary files a/applications/main/ibutton/images/DolphinNice_96x59.png and /dev/null differ diff --git a/applications/main/ibutton/images/DolphinNice_96x59_sfw.png b/applications/main/ibutton/images/DolphinNice_96x59_sfw.png deleted file mode 100644 index a299d3630..000000000 Binary files a/applications/main/ibutton/images/DolphinNice_96x59_sfw.png and /dev/null differ diff --git a/applications/main/ibutton/images/DolphinReadingSuccess_59x63.png b/applications/main/ibutton/images/DolphinReadingSuccess_59x63.png deleted file mode 100644 index 46f559f65..000000000 Binary files a/applications/main/ibutton/images/DolphinReadingSuccess_59x63.png and /dev/null differ diff --git a/applications/main/ibutton/images/DolphinWait_61x59.png b/applications/main/ibutton/images/DolphinWait_61x59.png deleted file mode 100644 index 4beec55ef..000000000 Binary files a/applications/main/ibutton/images/DolphinWait_61x59.png and /dev/null differ diff --git a/applications/main/ibutton/images/DolphinWait_61x59_sfw.png b/applications/main/ibutton/images/DolphinWait_61x59_sfw.png deleted file mode 100644 index 423e07919..000000000 Binary files a/applications/main/ibutton/images/DolphinWait_61x59_sfw.png and /dev/null differ diff --git a/applications/main/ibutton/images/iButtonDolphinVerySuccess_108x52.png b/applications/main/ibutton/images/iButtonDolphinVerySuccess_108x52.png deleted file mode 100644 index 90b589ff8..000000000 Binary files a/applications/main/ibutton/images/iButtonDolphinVerySuccess_108x52.png and /dev/null differ diff --git a/applications/main/ibutton/images/iButtonDolphinVerySuccess_108x52_sfw.png b/applications/main/ibutton/images/iButtonDolphinVerySuccess_108x52_sfw.png deleted file mode 100644 index 2b4bec7c6..000000000 Binary files a/applications/main/ibutton/images/iButtonDolphinVerySuccess_108x52_sfw.png and /dev/null differ diff --git a/applications/main/ibutton/images/iButtonKey_49x44.png b/applications/main/ibutton/images/iButtonKey_49x44.png deleted file mode 100644 index db895ec52..000000000 Binary files a/applications/main/ibutton/images/iButtonKey_49x44.png and /dev/null differ diff --git a/applications/main/ibutton/images/ibutt_10px.png b/applications/main/ibutton/images/ibutt_10px.png deleted file mode 100644 index 2fdaf123a..000000000 Binary files a/applications/main/ibutton/images/ibutt_10px.png and /dev/null differ diff --git a/applications/main/ibutton_loader/application.fam b/applications/main/ibutton_loader/application.fam deleted file mode 100644 index b4150f46b..000000000 --- a/applications/main/ibutton_loader/application.fam +++ /dev/null @@ -1,14 +0,0 @@ -App( - appid="ibutton_loader", - name="iButton", - apptype=FlipperAppType.APP, - entry_point="ibutton_loader_app", - requires=[ - "gui", - "storage", - ], - stack_size=int(1.5 * 1024), - icon="A_iButton_14", - order=60, - link="/ext/apps/Main/ibutton.fap", -) diff --git a/applications/main/ibutton_loader/ibutton_loader_app.c b/applications/main/ibutton_loader/ibutton_loader_app.c deleted file mode 100644 index 8738d9491..000000000 --- a/applications/main/ibutton_loader/ibutton_loader_app.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#define TAG "ibutton_loader_app" - -int32_t ibutton_loader_app(void* p) { - UNUSED(p); - - return 0; -} \ No newline at end of file diff --git a/applications/main/infrared/application.fam b/applications/main/infrared/application.fam index 405224d80..9c5eaf392 100644 --- a/applications/main/infrared/application.fam +++ b/applications/main/infrared/application.fam @@ -1,19 +1,24 @@ App( appid="infrared", name="Infrared", - apptype=FlipperAppType.EXTERNAL, + apptype=FlipperAppType.APP, entry_point="infrared_app", cdefines=["APP_INFRARED"], requires=[ "gui", "dialogs", ], - # provides=["infrared_start"], - # icon="A_Infrared_14", + provides=["infrared_start"], + icon="A_Infrared_14", stack_size=3 * 1024, order=40, - fap_category="Main", - fap_icon="ir_10px.png", - fap_icon_assets="images", fap_libs=["assets"], ) + +App( + appid="infrared_start", + apptype=FlipperAppType.STARTUP, + entry_point="infrared_on_system_start", + requires=["infrared"], + order=20, +) diff --git a/applications/main/infrared/images/DolphinMafia_115x62.png b/applications/main/infrared/images/DolphinMafia_115x62.png deleted file mode 100644 index 53dffb4fa..000000000 Binary files a/applications/main/infrared/images/DolphinMafia_115x62.png and /dev/null differ diff --git a/applications/main/infrared/images/DolphinNice_96x59.png b/applications/main/infrared/images/DolphinNice_96x59.png deleted file mode 100644 index b111196c7..000000000 Binary files a/applications/main/infrared/images/DolphinNice_96x59.png and /dev/null differ diff --git a/applications/main/infrared/images/DolphinReadingSuccess_59x63.png b/applications/main/infrared/images/DolphinReadingSuccess_59x63.png deleted file mode 100644 index 46f559f65..000000000 Binary files a/applications/main/infrared/images/DolphinReadingSuccess_59x63.png and /dev/null differ diff --git a/applications/main/infrared/images/Down_25x27.png b/applications/main/infrared/images/Down_25x27.png deleted file mode 100644 index c13097778..000000000 Binary files a/applications/main/infrared/images/Down_25x27.png and /dev/null differ diff --git a/applications/main/infrared/images/Down_hvr_25x27.png b/applications/main/infrared/images/Down_hvr_25x27.png deleted file mode 100644 index 76d181924..000000000 Binary files a/applications/main/infrared/images/Down_hvr_25x27.png and /dev/null differ diff --git a/applications/main/infrared/images/InfraredArrowDown_4x8.png b/applications/main/infrared/images/InfraredArrowDown_4x8.png deleted file mode 100644 index 2ac7bcdbe..000000000 Binary files a/applications/main/infrared/images/InfraredArrowDown_4x8.png and /dev/null differ diff --git a/applications/main/infrared/images/InfraredArrowUp_4x8.png b/applications/main/infrared/images/InfraredArrowUp_4x8.png deleted file mode 100644 index 4c9a16b3f..000000000 Binary files a/applications/main/infrared/images/InfraredArrowUp_4x8.png and /dev/null differ diff --git a/applications/main/infrared/images/InfraredLearnShort_128x31.png b/applications/main/infrared/images/InfraredLearnShort_128x31.png deleted file mode 100644 index 783ad0877..000000000 Binary files a/applications/main/infrared/images/InfraredLearnShort_128x31.png and /dev/null differ diff --git a/applications/main/infrared/images/Mode_25x27.png b/applications/main/infrared/images/Mode_25x27.png deleted file mode 100644 index 381ba8296..000000000 Binary files a/applications/main/infrared/images/Mode_25x27.png and /dev/null differ diff --git a/applications/main/infrared/images/Mode_hvr_25x27.png b/applications/main/infrared/images/Mode_hvr_25x27.png deleted file mode 100644 index 64f459f55..000000000 Binary files a/applications/main/infrared/images/Mode_hvr_25x27.png and /dev/null differ diff --git a/applications/main/infrared/images/Mute_25x27.png b/applications/main/infrared/images/Mute_25x27.png deleted file mode 100644 index d8812dd4f..000000000 Binary files a/applications/main/infrared/images/Mute_25x27.png and /dev/null differ diff --git a/applications/main/infrared/images/Mute_hvr_25x27.png b/applications/main/infrared/images/Mute_hvr_25x27.png deleted file mode 100644 index 155bd9004..000000000 Binary files a/applications/main/infrared/images/Mute_hvr_25x27.png and /dev/null differ diff --git a/applications/main/infrared/images/Pin_back_arrow_10x8.png b/applications/main/infrared/images/Pin_back_arrow_10x8.png deleted file mode 100644 index 3bafabd14..000000000 Binary files a/applications/main/infrared/images/Pin_back_arrow_10x8.png and /dev/null differ diff --git a/applications/main/infrared/images/Power_25x27.png b/applications/main/infrared/images/Power_25x27.png deleted file mode 100644 index 5ae493fbe..000000000 Binary files a/applications/main/infrared/images/Power_25x27.png and /dev/null differ diff --git a/applications/main/infrared/images/Power_hvr_25x27.png b/applications/main/infrared/images/Power_hvr_25x27.png deleted file mode 100644 index 9425072c0..000000000 Binary files a/applications/main/infrared/images/Power_hvr_25x27.png and /dev/null differ diff --git a/applications/main/infrared/images/RFIDDolphinSend_97x61.png b/applications/main/infrared/images/RFIDDolphinSend_97x61.png deleted file mode 100644 index 343b9f734..000000000 Binary files a/applications/main/infrared/images/RFIDDolphinSend_97x61.png and /dev/null differ diff --git a/applications/main/infrared/images/Rotate_25x27.png b/applications/main/infrared/images/Rotate_25x27.png deleted file mode 100644 index 648634a09..000000000 Binary files a/applications/main/infrared/images/Rotate_25x27.png and /dev/null differ diff --git a/applications/main/infrared/images/Rotate_hvr_25x27.png b/applications/main/infrared/images/Rotate_hvr_25x27.png deleted file mode 100644 index a2b5cf93d..000000000 Binary files a/applications/main/infrared/images/Rotate_hvr_25x27.png and /dev/null differ diff --git a/applications/main/infrared/images/SDQuestion_35x43.png b/applications/main/infrared/images/SDQuestion_35x43.png deleted file mode 100644 index 9b9c9a58e..000000000 Binary files a/applications/main/infrared/images/SDQuestion_35x43.png and /dev/null differ diff --git a/applications/main/infrared/images/Swing_25x27.png b/applications/main/infrared/images/Swing_25x27.png deleted file mode 100644 index 38a6c9040..000000000 Binary files a/applications/main/infrared/images/Swing_25x27.png and /dev/null differ diff --git a/applications/main/infrared/images/Swing_hvr_25x27.png b/applications/main/infrared/images/Swing_hvr_25x27.png deleted file mode 100644 index 6e65b4e2e..000000000 Binary files a/applications/main/infrared/images/Swing_hvr_25x27.png and /dev/null differ diff --git a/applications/main/infrared/images/Timer_25x27.png b/applications/main/infrared/images/Timer_25x27.png deleted file mode 100644 index 2f1853a34..000000000 Binary files a/applications/main/infrared/images/Timer_25x27.png and /dev/null differ diff --git a/applications/main/infrared/images/Timer_hvr_25x27.png b/applications/main/infrared/images/Timer_hvr_25x27.png deleted file mode 100644 index d4dffa544..000000000 Binary files a/applications/main/infrared/images/Timer_hvr_25x27.png and /dev/null differ diff --git a/applications/main/infrared/images/Up_25x27.png b/applications/main/infrared/images/Up_25x27.png deleted file mode 100644 index b81a02e8a..000000000 Binary files a/applications/main/infrared/images/Up_25x27.png and /dev/null differ diff --git a/applications/main/infrared/images/Up_hvr_25x27.png b/applications/main/infrared/images/Up_hvr_25x27.png deleted file mode 100644 index cf71e5965..000000000 Binary files a/applications/main/infrared/images/Up_hvr_25x27.png and /dev/null differ diff --git a/applications/main/infrared/images/Vol_down_25x27.png b/applications/main/infrared/images/Vol_down_25x27.png deleted file mode 100644 index d7ae44558..000000000 Binary files a/applications/main/infrared/images/Vol_down_25x27.png and /dev/null differ diff --git a/applications/main/infrared/images/Vol_down_hvr_25x27.png b/applications/main/infrared/images/Vol_down_hvr_25x27.png deleted file mode 100644 index c556a037a..000000000 Binary files a/applications/main/infrared/images/Vol_down_hvr_25x27.png and /dev/null differ diff --git a/applications/main/infrared/images/Vol_up_25x27.png b/applications/main/infrared/images/Vol_up_25x27.png deleted file mode 100644 index c4d9e87a0..000000000 Binary files a/applications/main/infrared/images/Vol_up_25x27.png and /dev/null differ diff --git a/applications/main/infrared/images/Vol_up_hvr_25x27.png b/applications/main/infrared/images/Vol_up_hvr_25x27.png deleted file mode 100644 index 90c2df47d..000000000 Binary files a/applications/main/infrared/images/Vol_up_hvr_25x27.png and /dev/null differ diff --git a/applications/main/infrared/images/ir_10px.png b/applications/main/infrared/images/ir_10px.png deleted file mode 100644 index 22c986180..000000000 Binary files a/applications/main/infrared/images/ir_10px.png and /dev/null differ diff --git a/applications/services/infraredsrv/infrared_cli.c b/applications/main/infrared/infrared_cli.c similarity index 100% rename from applications/services/infraredsrv/infrared_cli.c rename to applications/main/infrared/infrared_cli.c diff --git a/applications/main/infrared/infrared_i.h b/applications/main/infrared/infrared_i.h index 4bf0631f5..6972d53b4 100644 --- a/applications/main/infrared/infrared_i.h +++ b/applications/main/infrared/infrared_i.h @@ -32,7 +32,7 @@ #include "rpc/rpc_app.h" -#include +#include #define INFRARED_FILE_NAME_SIZE 100 #define INFRARED_TEXT_STORE_NUM 2 diff --git a/applications/main/infrared/ir_10px.png b/applications/main/infrared/ir_10px.png deleted file mode 100644 index 22c986180..000000000 Binary files a/applications/main/infrared/ir_10px.png and /dev/null differ diff --git a/applications/main/infrared/views/infrared_progress_view.c b/applications/main/infrared/views/infrared_progress_view.c index bb1f982c5..3c50f89e4 100644 --- a/applications/main/infrared/views/infrared_progress_view.c +++ b/applications/main/infrared/views/infrared_progress_view.c @@ -1,5 +1,6 @@ #include #include "furi_hal_resources.h" +#include "assets_icons.h" #include "gui/canvas.h" #include "gui/view.h" #include "input/input.h" @@ -8,7 +9,6 @@ #include "infrared_progress_view.h" #include "gui/modules/button_panel.h" #include -#include struct InfraredProgressView { View* view; diff --git a/applications/main/infrared_loader/application.fam b/applications/main/infrared_loader/application.fam deleted file mode 100644 index c3d87a24e..000000000 --- a/applications/main/infrared_loader/application.fam +++ /dev/null @@ -1,14 +0,0 @@ -App( - appid="infrared_loader", - name="Infrared", - apptype=FlipperAppType.APP, - entry_point="infrared_loader_app", - requires=[ - "gui", - "dialogs", - ], - stack_size=int(2 * 1024), - icon="A_Infrared_14", - order=40, - link="/ext/apps/Main/infrared.fap", -) diff --git a/applications/main/infrared_loader/infrared_loader_app.c b/applications/main/infrared_loader/infrared_loader_app.c deleted file mode 100644 index 1fd2a59ed..000000000 --- a/applications/main/infrared_loader/infrared_loader_app.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#define TAG "infrared_loader_app" - -int32_t infrared_loader_app(void* p) { - UNUSED(p); - - return 0; -} \ No newline at end of file diff --git a/applications/main/lfrfid/125_10px.png b/applications/main/lfrfid/125_10px.png deleted file mode 100644 index ce01284a2..000000000 Binary files a/applications/main/lfrfid/125_10px.png and /dev/null differ diff --git a/applications/main/lfrfid/application.fam b/applications/main/lfrfid/application.fam index 41d3b8fa7..150a6f3db 100644 --- a/applications/main/lfrfid/application.fam +++ b/applications/main/lfrfid/application.fam @@ -8,12 +8,19 @@ App( "gui", "dialogs", ], - # provides=[ "lfrfid_start", ], + provides=[ + "lfrfid_start", + ], icon="A_125khz_14", stack_size=2 * 1024, order=20, - # fap_category="Main", - # fap_icon="125_10px.png", - # fap_icon_assets="images", - # fap_libs=["assets"], + fap_libs=["assets"], +) + +App( + appid="lfrfid_start", + apptype=FlipperAppType.STARTUP, + entry_point="lfrfid_on_system_start", + requires=["lfrfid"], + order=50, ) diff --git a/applications/main/lfrfid/images/125_10px.png b/applications/main/lfrfid/images/125_10px.png deleted file mode 100644 index ce01284a2..000000000 Binary files a/applications/main/lfrfid/images/125_10px.png and /dev/null differ diff --git a/applications/main/lfrfid/images/ButtonRight_4x7.png b/applications/main/lfrfid/images/ButtonRight_4x7.png deleted file mode 100644 index 8e1c74c1c..000000000 Binary files a/applications/main/lfrfid/images/ButtonRight_4x7.png and /dev/null differ diff --git a/applications/main/lfrfid/images/DolphinCommon_56x48.png b/applications/main/lfrfid/images/DolphinCommon_56x48.png deleted file mode 100644 index 089aaed83..000000000 Binary files a/applications/main/lfrfid/images/DolphinCommon_56x48.png and /dev/null differ diff --git a/applications/main/lfrfid/images/DolphinMafia_115x62.png b/applications/main/lfrfid/images/DolphinMafia_115x62.png deleted file mode 100644 index 53dffb4fa..000000000 Binary files a/applications/main/lfrfid/images/DolphinMafia_115x62.png and /dev/null differ diff --git a/applications/main/lfrfid/images/DolphinNice_96x59.png b/applications/main/lfrfid/images/DolphinNice_96x59.png deleted file mode 100644 index b111196c7..000000000 Binary files a/applications/main/lfrfid/images/DolphinNice_96x59.png and /dev/null differ diff --git a/applications/main/lfrfid/images/NFC_manual_60x50.png b/applications/main/lfrfid/images/NFC_manual_60x50.png deleted file mode 100644 index 787c0bcfe..000000000 Binary files a/applications/main/lfrfid/images/NFC_manual_60x50.png and /dev/null differ diff --git a/applications/main/lfrfid/images/RFIDDolphinReceive_97x61.png b/applications/main/lfrfid/images/RFIDDolphinReceive_97x61.png deleted file mode 100644 index ff967599c..000000000 Binary files a/applications/main/lfrfid/images/RFIDDolphinReceive_97x61.png and /dev/null differ diff --git a/applications/main/lfrfid/images/RFIDDolphinSend_97x61.png b/applications/main/lfrfid/images/RFIDDolphinSend_97x61.png deleted file mode 100644 index 343b9f734..000000000 Binary files a/applications/main/lfrfid/images/RFIDDolphinSend_97x61.png and /dev/null differ diff --git a/applications/main/lfrfid/images/RFIDDolphinSuccess_108x57.png b/applications/main/lfrfid/images/RFIDDolphinSuccess_108x57.png deleted file mode 100644 index 341999109..000000000 Binary files a/applications/main/lfrfid/images/RFIDDolphinSuccess_108x57.png and /dev/null differ diff --git a/applications/main/lfrfid/images/RFIDSmallChip_14x14.png b/applications/main/lfrfid/images/RFIDSmallChip_14x14.png deleted file mode 100644 index 24219a548..000000000 Binary files a/applications/main/lfrfid/images/RFIDSmallChip_14x14.png and /dev/null differ diff --git a/applications/main/lfrfid/images/Round_loader_8x8/frame_01.png b/applications/main/lfrfid/images/Round_loader_8x8/frame_01.png deleted file mode 100644 index a5dc239d8..000000000 Binary files a/applications/main/lfrfid/images/Round_loader_8x8/frame_01.png and /dev/null differ diff --git a/applications/main/lfrfid/images/Round_loader_8x8/frame_02.png b/applications/main/lfrfid/images/Round_loader_8x8/frame_02.png deleted file mode 100644 index 162d8a8f4..000000000 Binary files a/applications/main/lfrfid/images/Round_loader_8x8/frame_02.png and /dev/null differ diff --git a/applications/main/lfrfid/images/Round_loader_8x8/frame_03.png b/applications/main/lfrfid/images/Round_loader_8x8/frame_03.png deleted file mode 100644 index 5483e4734..000000000 Binary files a/applications/main/lfrfid/images/Round_loader_8x8/frame_03.png and /dev/null differ diff --git a/applications/main/lfrfid/images/Round_loader_8x8/frame_04.png b/applications/main/lfrfid/images/Round_loader_8x8/frame_04.png deleted file mode 100644 index ce2fbbd47..000000000 Binary files a/applications/main/lfrfid/images/Round_loader_8x8/frame_04.png and /dev/null differ diff --git a/applications/main/lfrfid/images/Round_loader_8x8/frame_05.png b/applications/main/lfrfid/images/Round_loader_8x8/frame_05.png deleted file mode 100644 index 8b786c029..000000000 Binary files a/applications/main/lfrfid/images/Round_loader_8x8/frame_05.png and /dev/null differ diff --git a/applications/main/lfrfid/images/Round_loader_8x8/frame_rate b/applications/main/lfrfid/images/Round_loader_8x8/frame_rate deleted file mode 100644 index d8263ee98..000000000 --- a/applications/main/lfrfid/images/Round_loader_8x8/frame_rate +++ /dev/null @@ -1 +0,0 @@ -2 \ No newline at end of file diff --git a/applications/main/lfrfid/images/SDQuestion_35x43.png b/applications/main/lfrfid/images/SDQuestion_35x43.png deleted file mode 100644 index 9b9c9a58e..000000000 Binary files a/applications/main/lfrfid/images/SDQuestion_35x43.png and /dev/null differ diff --git a/applications/services/lfrfidsrv/lfrfid_cli.c b/applications/main/lfrfid/lfrfid_cli.c similarity index 100% rename from applications/services/lfrfidsrv/lfrfid_cli.c rename to applications/main/lfrfid/lfrfid_cli.c diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_save_type.c b/applications/main/lfrfid/scenes/lfrfid_scene_save_type.c index dd20ae489..eb73b1123 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_save_type.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_save_type.c @@ -17,9 +17,10 @@ void lfrfid_scene_save_type_on_enter(void* context) { SaveTypeCtx* state = malloc(sizeof(SaveTypeCtx)); FuriString* protocol_string = furi_string_alloc(); for(uint8_t i = 0; i < LFRFIDProtocolMax; i++) { - if(strcmp( - protocol_dict_get_manufacturer(app->dict, i), - protocol_dict_get_name(app->dict, i)) != 0) { + if((strcmp( + protocol_dict_get_manufacturer(app->dict, i), + protocol_dict_get_name(app->dict, i)) != 0) && + (strcmp(protocol_dict_get_manufacturer(app->dict, i), "N/A") != 0)) { furi_string_printf( protocol_string, "%s %s", diff --git a/applications/main/lfrfid/views/lfrfid_view_read.c b/applications/main/lfrfid/views/lfrfid_view_read.c index 4828e21a7..094afb617 100644 --- a/applications/main/lfrfid/views/lfrfid_view_read.c +++ b/applications/main/lfrfid/views/lfrfid_view_read.c @@ -1,7 +1,6 @@ #include "lfrfid_view_read.h" #include #include -// #include #define TEMP_STR_LEN 128 diff --git a/applications/main/lfrfid_loader/application.fam b/applications/main/lfrfid_loader/application.fam deleted file mode 100644 index 947762085..000000000 --- a/applications/main/lfrfid_loader/application.fam +++ /dev/null @@ -1,14 +0,0 @@ -App( - appid="lfrfid_loader", - name="125 kHz RFID", - apptype=FlipperAppType.APP, - entry_point="lfrfid_loader_app", - requires=[ - "gui", - "dialogs", - ], - stack_size=int(2 * 1024), - icon="A_125khz_14", - order=20, - link="/ext/apps/Main/lfrfid.fap", -) diff --git a/applications/main/lfrfid_loader/lfrfid_loader_app.c b/applications/main/lfrfid_loader/lfrfid_loader_app.c deleted file mode 100644 index ad6a96c64..000000000 --- a/applications/main/lfrfid_loader/lfrfid_loader_app.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#define TAG "lfrfid_loader_app" - -int32_t lfrfid_loader_app(void* p) { - UNUSED(p); - - return 0; -} \ No newline at end of file diff --git a/applications/main/nfc/scenes/nfc_scene_mf_classic_dict_attack.c b/applications/main/nfc/scenes/nfc_scene_mf_classic_dict_attack.c index 9b477e301..b82bf5521 100644 --- a/applications/main/nfc/scenes/nfc_scene_mf_classic_dict_attack.c +++ b/applications/main/nfc/scenes/nfc_scene_mf_classic_dict_attack.c @@ -58,7 +58,7 @@ static void nfc_scene_mf_classic_dict_attack_prepare_view(Nfc* nfc, DictAttackSt // If failed to load user dictionary - try the system dictionary if(!dict) { - FURI_LOG_E(TAG, "User Dictionary Not Found"); + FURI_LOG_E(TAG, "User dictionary not found"); state = DictAttackStateFlipperDictInProgress; } } @@ -67,8 +67,8 @@ static void nfc_scene_mf_classic_dict_attack_prepare_view(Nfc* nfc, DictAttackSt dict_attack_set_header(nfc->dict_attack, "MF Classic System Dictionary"); dict = mf_classic_dict_alloc(MfClassicDictTypeSystem); if(!dict) { - FURI_LOG_E(TAG, "Flipper Dictionary Not Found"); - // Pass through to let worker handle the failure + FURI_LOG_E(TAG, "Flipper dictionary not found"); + // Pass through to let the worker handle the failure } } // Free previous dictionary diff --git a/applications/main/nfc/scenes/nfc_scene_mf_classic_keys.c b/applications/main/nfc/scenes/nfc_scene_mf_classic_keys.c index 8b61904b4..8a7dc2c18 100644 --- a/applications/main/nfc/scenes/nfc_scene_mf_classic_keys.c +++ b/applications/main/nfc/scenes/nfc_scene_mf_classic_keys.c @@ -28,9 +28,9 @@ void nfc_scene_mf_classic_keys_on_enter(void* context) { widget_add_string_element( nfc->widget, 0, 0, AlignLeft, AlignTop, FontPrimary, "MIFARE Classic Keys"); char temp_str[32]; - snprintf(temp_str, sizeof(temp_str), "System Dict: %ld", flipper_dict_keys_total); + snprintf(temp_str, sizeof(temp_str), "System dict: %lu", flipper_dict_keys_total); widget_add_string_element(nfc->widget, 0, 20, AlignLeft, AlignTop, FontSecondary, temp_str); - snprintf(temp_str, sizeof(temp_str), "User Dict: %ld", user_dict_keys_total); + snprintf(temp_str, sizeof(temp_str), "User dict: %lu", user_dict_keys_total); widget_add_string_element(nfc->widget, 0, 32, AlignLeft, AlignTop, FontSecondary, temp_str); widget_add_button_element( nfc->widget, GuiButtonTypeCenter, "Add", nfc_scene_mf_classic_keys_widget_callback, nfc); diff --git a/applications/main/nfc/scenes/nfc_scene_mf_desfire_app.c b/applications/main/nfc/scenes/nfc_scene_mf_desfire_app.c index afc5f0dee..882dc5fea 100644 --- a/applications/main/nfc/scenes/nfc_scene_mf_desfire_app.c +++ b/applications/main/nfc/scenes/nfc_scene_mf_desfire_app.c @@ -51,23 +51,18 @@ void nfc_scene_mf_desfire_app_on_enter(void* context) { nfc_scene_mf_desfire_app_submenu_callback, nfc); - uint16_t cap = NFC_TEXT_STORE_SIZE; - char* buf = nfc->text_store; + FuriString* label = furi_string_alloc(); int idx = SubmenuIndexDynamic; for(MifareDesfireFile* file = app->file_head; file; file = file->next) { - int size = snprintf(buf, cap, "File %d", file->id); - if(size < 0 || size >= cap) { - FURI_LOG_W( - TAG, - "Exceeded NFC_TEXT_STORE_SIZE when preparing file id strings; menu truncated"); - break; - } - char* label = buf; - cap -= size + 1; - buf += size + 1; + furi_string_printf(label, "File %d", file->id); submenu_add_item( - nfc->submenu, label, idx++, nfc_scene_mf_desfire_app_submenu_callback, nfc); + nfc->submenu, + furi_string_get_cstr(label), + idx++, + nfc_scene_mf_desfire_app_submenu_callback, + nfc); } + furi_string_free(label); view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewMenu); } diff --git a/applications/main/nfc/scenes/nfc_scene_mf_desfire_data.c b/applications/main/nfc/scenes/nfc_scene_mf_desfire_data.c index e619d0377..c7caee8dc 100644 --- a/applications/main/nfc/scenes/nfc_scene_mf_desfire_data.c +++ b/applications/main/nfc/scenes/nfc_scene_mf_desfire_data.c @@ -33,21 +33,18 @@ void nfc_scene_mf_desfire_data_on_enter(void* context) { nfc_scene_mf_desfire_data_submenu_callback, nfc); - uint16_t cap = NFC_TEXT_STORE_SIZE; - char* buf = nfc->text_store; + FuriString* label = furi_string_alloc(); int idx = SubmenuIndexDynamic; for(MifareDesfireApplication* app = data->app_head; app; app = app->next) { - int size = snprintf(buf, cap, "App %02x%02x%02x", app->id[0], app->id[1], app->id[2]); - if(size < 0 || size >= cap) { - FURI_LOG_W( - TAG, "Exceeded NFC_TEXT_STORE_SIZE when preparing app id strings; menu truncated"); - break; - } - char* label = buf; - cap -= size + 1; - buf += size + 1; - submenu_add_item(submenu, label, idx++, nfc_scene_mf_desfire_data_submenu_callback, nfc); + furi_string_printf(label, "App %02x%02x%02x", app->id[0], app->id[1], app->id[2]); + submenu_add_item( + submenu, + furi_string_get_cstr(label), + idx++, + nfc_scene_mf_desfire_data_submenu_callback, + nfc); } + furi_string_free(label); if(state >= MifareDesfireDataStateItem) { submenu_set_selected_item( diff --git a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_key_input.c b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_key_input.c index 174d1a406..089187d5b 100644 --- a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_key_input.c +++ b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_key_input.c @@ -11,7 +11,7 @@ void nfc_scene_mf_ultralight_key_input_on_enter(void* context) { // Setup view ByteInput* byte_input = nfc->byte_input; - byte_input_set_header_text(byte_input, "Enter The Password In Hex"); + byte_input_set_header_text(byte_input, "Enter the password in hex"); byte_input_set_result_callback( byte_input, nfc_scene_mf_ultralight_key_input_byte_input_callback, diff --git a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_read_auth.c b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_read_auth.c index 8e2dd0c22..2ab5e3f3f 100644 --- a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_read_auth.c +++ b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_read_auth.c @@ -24,22 +24,21 @@ void nfc_scene_mf_ultralight_read_auth_set_state(Nfc* nfc, NfcSceneMfUlReadState if(curr_state != state) { if(state == NfcSceneMfUlReadStateDetecting) { popup_reset(nfc->popup); - popup_set_text( - nfc->popup, "Apply Card To\nFlipper's Back", 97, 24, AlignCenter, AlignTop); + popup_set_text(nfc->popup, "Apply the\ntarget card", 97, 24, AlignCenter, AlignTop); popup_set_icon(nfc->popup, 0, 8, &I_NFC_manual_60x50); nfc_blink_read_start(nfc); } else if(state == NfcSceneMfUlReadStateReading) { popup_reset(nfc->popup); popup_set_header( - nfc->popup, "Reading Card\nDon't Move...", 85, 24, AlignCenter, AlignTop); + nfc->popup, "Reading card\nDon't move...", 85, 24, AlignCenter, AlignTop); popup_set_icon(nfc->popup, 12, 23, &A_Loading_24); nfc_blink_detect_start(nfc); } else if(state == NfcSceneMfUlReadStateNotSupportedCard) { popup_reset(nfc->popup); - popup_set_header(nfc->popup, "Wrong Type Of Card!", 64, 3, AlignCenter, AlignTop); + popup_set_header(nfc->popup, "Wrong type of card!", 64, 3, AlignCenter, AlignTop); popup_set_text( nfc->popup, - "Only MIFARE\nUltralight & NTAG\n Are Supported", + "Only MIFARE\nUltralight & NTAG\nare supported", 4, 22, AlignLeft, diff --git a/applications/main/nfc/scenes/nfc_scene_save_name.c b/applications/main/nfc/scenes/nfc_scene_save_name.c index 8f0e889ec..007274226 100644 --- a/applications/main/nfc/scenes/nfc_scene_save_name.c +++ b/applications/main/nfc/scenes/nfc_scene_save_name.c @@ -22,7 +22,7 @@ void nfc_scene_save_name_on_enter(void* context) { } else { nfc_text_store_set(nfc, nfc->dev->dev_name); } - text_input_set_header_text(text_input, "Name The Card"); + text_input_set_header_text(text_input, "Name the card"); text_input_set_result_callback( text_input, nfc_scene_save_name_text_input_callback, diff --git a/applications/main/nfc/views/dict_attack.c b/applications/main/nfc/views/dict_attack.c index 9ee9b1e15..a539e514b 100644 --- a/applications/main/nfc/views/dict_attack.c +++ b/applications/main/nfc/views/dict_attack.c @@ -32,7 +32,7 @@ static void dict_attack_draw_callback(Canvas* canvas, void* model) { DictAttackViewModel* m = model; if(m->state == DictAttackStateCardRemoved) { canvas_set_font(canvas, FontPrimary); - canvas_draw_str_aligned(canvas, 64, 4, AlignCenter, AlignTop, "Lost The Tag!"); + canvas_draw_str_aligned(canvas, 64, 4, AlignCenter, AlignTop, "Lost the tag!"); canvas_set_font(canvas, FontSecondary); elements_multiline_text_aligned( canvas, 64, 23, AlignCenter, AlignTop, "Make sure the tag is\npositioned correctly."); @@ -69,7 +69,7 @@ static void dict_attack_draw_callback(Canvas* canvas, void* model) { } elements_progress_bar_with_text(canvas, 0, 20, 128, dict_progress, draw_str); canvas_set_font(canvas, FontSecondary); - snprintf(draw_str, sizeof(draw_str), "Keys Found: %d/%d", m->keys_found, m->keys_total); + snprintf(draw_str, sizeof(draw_str), "Keys found: %d/%d", m->keys_found, m->keys_total); canvas_draw_str_aligned(canvas, 0, 33, AlignLeft, AlignTop, draw_str); snprintf( draw_str, sizeof(draw_str), "Sectors Read: %d/%d", m->sectors_read, m->sectors_total); diff --git a/applications/main/sub_playlist/application.fam b/applications/main/sub_playlist/application.fam index 08e297163..523adb931 100644 --- a/applications/main/sub_playlist/application.fam +++ b/applications/main/sub_playlist/application.fam @@ -1,5 +1,5 @@ App( - appid="SubGHz_Playlist", + appid="sub_playlist", name="Sub-GHz Playlist", apptype=FlipperAppType.EXTERNAL, entry_point="playlist_app", diff --git a/applications/main/sub_playlist/playlist.c b/applications/main/sub_playlist/playlist.c index ecf2f2817..4e996c062 100644 --- a/applications/main/sub_playlist/playlist.c +++ b/applications/main/sub_playlist/playlist.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include diff --git a/applications/main/sub_playlist_loader/application.fam b/applications/main/sub_playlist_loader/application.fam deleted file mode 100644 index 923733a4d..000000000 --- a/applications/main/sub_playlist_loader/application.fam +++ /dev/null @@ -1,13 +0,0 @@ -App( - appid="sub_playlist_loader", - name="Sub-GHz Playlist", - apptype=FlipperAppType.APP, - entry_point="sub_playlist_loader_app", - requires=[ - "gui", - ], - stack_size=int(2 * 1024), - icon="A_Sub_Playlist_14", - order=12, - link="/ext/apps/Main/SubGHz_Playlist.fap", -) diff --git a/applications/main/sub_playlist_loader/sub_playlist_loader_app.c b/applications/main/sub_playlist_loader/sub_playlist_loader_app.c deleted file mode 100644 index 1c4eb20c9..000000000 --- a/applications/main/sub_playlist_loader/sub_playlist_loader_app.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#define TAG "sub_playlist_loader_app" - -int32_t sub_playlist_loader_app(void* p) { - UNUSED(p); - - return 0; -} diff --git a/applications/main/subghz/scenes/subghz_scene_read_raw.c b/applications/main/subghz/scenes/subghz_scene_read_raw.c index e81aac5ba..fea4b6aef 100644 --- a/applications/main/subghz/scenes/subghz_scene_read_raw.c +++ b/applications/main/subghz/scenes/subghz_scene_read_raw.c @@ -3,10 +3,9 @@ #include #include #include -#include #include -#define RAW_FILE_NAME "R_" +#define RAW_FILE_NAME "RAW_" #define TAG "SubGhzSceneReadRAW" #define RAW_THRESHOLD_RSSI_LOW_COUNT 10 @@ -295,28 +294,8 @@ bool subghz_scene_read_raw_on_event(void* context, SceneManagerEvent event) { FuriString* temp_str; temp_str = furi_string_alloc(); - - uint32_t time = LL_RTC_TIME_Get(RTC); // 0x00HHMMSS - uint32_t date = LL_RTC_DATE_Get(RTC); // 0xWWDDMMYY - char strings[1][25]; - snprintf( - strings[0], - sizeof(strings[0]), - "%s%.4d%.2d%.2d%.2d%.2d", - "R", - __LL_RTC_CONVERT_BCD2BIN((date >> 0) & 0xFF) + 2000 // YEAR - , - __LL_RTC_CONVERT_BCD2BIN((date >> 8) & 0xFF) // MONTH - , - __LL_RTC_CONVERT_BCD2BIN((date >> 16) & 0xFF) // DAY - , - __LL_RTC_CONVERT_BCD2BIN((time >> 16) & 0xFF) // HOUR - , - __LL_RTC_CONVERT_BCD2BIN((time >> 8) & 0xFF) // DAY - ); - furi_string_printf( - temp_str, "%s/%s%s", SUBGHZ_RAW_FOLDER, strings[0], SUBGHZ_APP_EXTENSION); + temp_str, "%s/%s%s", SUBGHZ_RAW_FOLDER, RAW_FILE_NAME, SUBGHZ_APP_EXTENSION); subghz_protocol_raw_gen_fff_data( subghz->txrx->fff_data, furi_string_get_cstr(temp_str)); furi_string_free(temp_str); @@ -337,29 +316,10 @@ bool subghz_scene_read_raw_on_event(void* context, SceneManagerEvent event) { if(subghz->txrx->rx_key_state != SubGhzRxKeyStateIDLE) { scene_manager_next_scene(subghz->scene_manager, SubGhzSceneNeedSaving); } else { - uint32_t time = LL_RTC_TIME_Get(RTC); // 0x00HHMMSS - uint32_t date = LL_RTC_DATE_Get(RTC); // 0xWWDDMMYY - char strings[1][25]; - snprintf( - strings[0], - sizeof(strings[0]), - "%s%.4d%.2d%.2d%.2d%.2d", - "R", - __LL_RTC_CONVERT_BCD2BIN((date >> 0) & 0xFF) + 2000 // YEAR - , - __LL_RTC_CONVERT_BCD2BIN((date >> 8) & 0xFF) // MONTH - , - __LL_RTC_CONVERT_BCD2BIN((date >> 16) & 0xFF) // DAY - , - __LL_RTC_CONVERT_BCD2BIN((time >> 16) & 0xFF) // HOUR - , - __LL_RTC_CONVERT_BCD2BIN((time >> 8) & 0xFF) // DAY - ); - //subghz_get_preset_name(subghz, subghz->error_str); subghz->txrx->raw_threshold_rssi_low_count = RAW_THRESHOLD_RSSI_LOW_COUNT; if(subghz_protocol_raw_save_to_file_init( (SubGhzProtocolDecoderRAW*)subghz->txrx->decoder_result, - strings[0], + RAW_FILE_NAME, subghz->txrx->preset)) { DOLPHIN_DEED(DolphinDeedSubGhzRawRec); if((subghz->txrx->txrx_state == SubGhzTxRxStateIDLE) || @@ -468,4 +428,4 @@ void subghz_scene_read_raw_on_exit(void* context) { #else subghz_receiver_set_filter(subghz->txrx->receiver, SubGhzProtocolFlag_Decodable); #endif -} +} \ No newline at end of file diff --git a/applications/main/subghz/scenes/subghz_scene_receiver_config.c b/applications/main/subghz/scenes/subghz_scene_receiver_config.c index 7ac172e56..c23d93496 100644 --- a/applications/main/subghz/scenes/subghz_scene_receiver_config.c +++ b/applications/main/subghz/scenes/subghz_scene_receiver_config.c @@ -694,4 +694,4 @@ void subghz_scene_receiver_config_on_exit(void* context) { subghz_last_settings_save(subghz->last_settings); scene_manager_set_scene_state( subghz->scene_manager, SubGhzSceneReadRAW, SubGhzCustomEventManagerNoSet); -} \ No newline at end of file +} diff --git a/applications/main/subghz/scenes/subghz_scene_save_name.c b/applications/main/subghz/scenes/subghz_scene_save_name.c index 1a85501de..4f37ebc0b 100644 --- a/applications/main/subghz/scenes/subghz_scene_save_name.c +++ b/applications/main/subghz/scenes/subghz_scene_save_name.c @@ -19,7 +19,7 @@ void subghz_scene_save_name_get_timefilename(FuriString* name) { furi_hal_rtc_get_datetime(&datetime); furi_string_printf( name, - "R_%.4d.%.2d.%.2d-%.2d.%.2d.%.2d", + "RAW_%.4d%.2d%.2d-%.2d%.2d%.2d", datetime.year, datetime.month, datetime.day, diff --git a/applications/main/subghz/subghz.c b/applications/main/subghz/subghz.c index a37ed1cd4..c39c35679 100644 --- a/applications/main/subghz/subghz.c +++ b/applications/main/subghz/subghz.c @@ -182,7 +182,8 @@ SubGhz* subghz_alloc(bool alloc_for_tx_only) { //init setting subghz->setting = subghz_setting_alloc(); - subghz_setting_load(subghz->setting, EXT_PATH("subghz/assets/setting_user.txt")); + + subghz_setting_load(subghz->setting, EXT_PATH("subghz/assets/setting_user")); // Custom Presets load without using config file diff --git a/applications/main/subghz/subghz_i.h b/applications/main/subghz/subghz_i.h index a5629616a..a6c96cb69 100644 --- a/applications/main/subghz/subghz_i.h +++ b/applications/main/subghz/subghz_i.h @@ -176,7 +176,6 @@ void subghz_file_name_clear(SubGhz* subghz); bool subghz_path_is_file(FuriString* path); uint32_t subghz_random_serial(void); void subghz_hopper_update(SubGhz* subghz); - void subghz_speaker_on(SubGhz* subghz); void subghz_speaker_off(SubGhz* subghz); void subghz_speaker_mute(SubGhz* subghz); diff --git a/applications/main/u2f/U2FIcon.png b/applications/main/u2f/U2FIcon.png deleted file mode 100644 index 81341f1ee..000000000 Binary files a/applications/main/u2f/U2FIcon.png and /dev/null differ diff --git a/applications/main/u2f/application.fam b/applications/main/u2f/application.fam index d2e695a3f..82010ffb4 100644 --- a/applications/main/u2f/application.fam +++ b/applications/main/u2f/application.fam @@ -1,7 +1,7 @@ App( appid="u2f", name="U2F", - apptype=FlipperAppType.EXTERNAL, + apptype=FlipperAppType.APP, entry_point="u2f_app", cdefines=["APP_U2F"], requires=[ @@ -9,10 +9,7 @@ App( "dialogs", ], stack_size=2 * 1024, - # icon="A_U2F_14", + icon="A_U2F_14", order=80, - fap_icon="U2FIcon.png", - fap_category="Main", - fap_icon_assets="images", fap_libs=["assets"], ) diff --git a/applications/main/u2f/images/ActiveConnection_50x64.png b/applications/main/u2f/images/ActiveConnection_50x64.png deleted file mode 100644 index 1d7686ddd..000000000 Binary files a/applications/main/u2f/images/ActiveConnection_50x64.png and /dev/null differ diff --git a/applications/main/u2f/images/Auth_62x31.png b/applications/main/u2f/images/Auth_62x31.png deleted file mode 100644 index dd220bb65..000000000 Binary files a/applications/main/u2f/images/Auth_62x31.png and /dev/null differ diff --git a/applications/main/u2f/images/Auth_62x31_sfw.png b/applications/main/u2f/images/Auth_62x31_sfw.png deleted file mode 100644 index 40f094ac9..000000000 Binary files a/applications/main/u2f/images/Auth_62x31_sfw.png and /dev/null differ diff --git a/applications/main/u2f/images/Connect_me_62x31.png b/applications/main/u2f/images/Connect_me_62x31.png deleted file mode 100644 index 495e8ab55..000000000 Binary files a/applications/main/u2f/images/Connect_me_62x31.png and /dev/null differ diff --git a/applications/main/u2f/images/Connect_me_62x31_sfw.png b/applications/main/u2f/images/Connect_me_62x31_sfw.png deleted file mode 100644 index 68c48c0e6..000000000 Binary files a/applications/main/u2f/images/Connect_me_62x31_sfw.png and /dev/null differ diff --git a/applications/main/u2f/images/Connected_62x31.png b/applications/main/u2f/images/Connected_62x31.png deleted file mode 100644 index bc1010ca9..000000000 Binary files a/applications/main/u2f/images/Connected_62x31.png and /dev/null differ diff --git a/applications/main/u2f/images/Connected_62x31_sfw.png b/applications/main/u2f/images/Connected_62x31_sfw.png deleted file mode 100644 index eeaf660b1..000000000 Binary files a/applications/main/u2f/images/Connected_62x31_sfw.png and /dev/null differ diff --git a/applications/main/u2f/images/Drive_112x35.png b/applications/main/u2f/images/Drive_112x35.png deleted file mode 100644 index 6f7b9c834..000000000 Binary files a/applications/main/u2f/images/Drive_112x35.png and /dev/null differ diff --git a/applications/main/u2f/images/Error_62x31.png b/applications/main/u2f/images/Error_62x31.png deleted file mode 100644 index b78e010b7..000000000 Binary files a/applications/main/u2f/images/Error_62x31.png and /dev/null differ diff --git a/applications/main/u2f/images/Error_62x31_sfw.png b/applications/main/u2f/images/Error_62x31_sfw.png deleted file mode 100644 index bb280e751..000000000 Binary files a/applications/main/u2f/images/Error_62x31_sfw.png and /dev/null differ diff --git a/applications/main/u2f/images/SDQuestion_35x43.png b/applications/main/u2f/images/SDQuestion_35x43.png deleted file mode 100644 index 9b9c9a58e..000000000 Binary files a/applications/main/u2f/images/SDQuestion_35x43.png and /dev/null differ diff --git a/applications/main/u2f/u2f_app_i.h b/applications/main/u2f/u2f_app_i.h index c7bac40b4..2896684c3 100644 --- a/applications/main/u2f/u2f_app_i.h +++ b/applications/main/u2f/u2f_app_i.h @@ -4,7 +4,7 @@ #include "scenes/u2f_scene.h" #include -#include +#include #include #include #include diff --git a/applications/main/u2f/views/u2f_view.c b/applications/main/u2f/views/u2f_view.c index fb5eaac1f..af55ea7ce 100644 --- a/applications/main/u2f/views/u2f_view.c +++ b/applications/main/u2f/views/u2f_view.c @@ -1,6 +1,6 @@ #include "u2f_view.h" #include -#include +#include #include "../../../settings/desktop_settings/desktop_settings_app.h" struct U2fView { diff --git a/applications/main/u2f_loader/application.fam b/applications/main/u2f_loader/application.fam deleted file mode 100644 index 3da5bf205..000000000 --- a/applications/main/u2f_loader/application.fam +++ /dev/null @@ -1,14 +0,0 @@ -App( - appid="u2f_loader", - name="U2F", - apptype=FlipperAppType.APP, - entry_point="u2f_loader_app", - requires=[ - "gui", - "dialogs", - ], - stack_size=int(2 * 1024), - icon="A_U2F_14", - order=80, - link="/ext/apps/Main/u2f.fap", -) diff --git a/applications/main/u2f_loader/u2f_loader_app.c b/applications/main/u2f_loader/u2f_loader_app.c deleted file mode 100644 index 186d2489b..000000000 --- a/applications/main/u2f_loader/u2f_loader_app.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#define TAG "u2f_loader_app" - -int32_t u2f_loader_app(void* p) { - UNUSED(p); - - return 0; -} \ No newline at end of file diff --git a/applications/main/unirfremix/application.fam b/applications/main/unirfremix/application.fam index 73c063197..fd3553947 100644 --- a/applications/main/unirfremix/application.fam +++ b/applications/main/unirfremix/application.fam @@ -1,14 +1,14 @@ App( - appid="SubGHz_Remote", + appid="unirfremix", name="Sub-GHz Remote", - apptype=FlipperAppType.EXTERNAL, + apptype=FlipperAppType.APP, entry_point="unirfremix_app", cdefines=["APP_UNIRFREMIX"], - requires=["storage", "gui", "dialogs", "subghz"], + requires=[ + "gui", + "dialogs", + ], icon="A_UniRFRemix_14", stack_size=4 * 1024, order=11, - fap_icon="unirfIcon.png", - fap_category="Main", - fap_icon_assets="images", ) diff --git a/applications/main/unirfremix/images/ButtonDown_7x4.png b/applications/main/unirfremix/images/ButtonDown_7x4.png deleted file mode 100644 index 2954bb6a6..000000000 Binary files a/applications/main/unirfremix/images/ButtonDown_7x4.png and /dev/null differ diff --git a/applications/main/unirfremix/images/ButtonLeft_4x7.png b/applications/main/unirfremix/images/ButtonLeft_4x7.png deleted file mode 100644 index 0b4655d43..000000000 Binary files a/applications/main/unirfremix/images/ButtonLeft_4x7.png and /dev/null differ diff --git a/applications/main/unirfremix/images/ButtonRight_4x7.png b/applications/main/unirfremix/images/ButtonRight_4x7.png deleted file mode 100644 index 8e1c74c1c..000000000 Binary files a/applications/main/unirfremix/images/ButtonRight_4x7.png and /dev/null differ diff --git a/applications/main/unirfremix/images/ButtonUp_7x4.png b/applications/main/unirfremix/images/ButtonUp_7x4.png deleted file mode 100644 index 1be79328b..000000000 Binary files a/applications/main/unirfremix/images/ButtonUp_7x4.png and /dev/null differ diff --git a/applications/main/unirfremix/images/Ok_btn_9x9.png b/applications/main/unirfremix/images/Ok_btn_9x9.png deleted file mode 100644 index 9a1539da2..000000000 Binary files a/applications/main/unirfremix/images/Ok_btn_9x9.png and /dev/null differ diff --git a/applications/main/unirfremix/images/Pin_arrow_down_7x9.png b/applications/main/unirfremix/images/Pin_arrow_down_7x9.png deleted file mode 100644 index 9687397af..000000000 Binary files a/applications/main/unirfremix/images/Pin_arrow_down_7x9.png and /dev/null differ diff --git a/applications/main/unirfremix/images/Pin_arrow_left_9x7.png b/applications/main/unirfremix/images/Pin_arrow_left_9x7.png deleted file mode 100644 index fb4ded78f..000000000 Binary files a/applications/main/unirfremix/images/Pin_arrow_left_9x7.png and /dev/null differ diff --git a/applications/main/unirfremix/images/Pin_arrow_right_9x7.png b/applications/main/unirfremix/images/Pin_arrow_right_9x7.png deleted file mode 100644 index 97648d176..000000000 Binary files a/applications/main/unirfremix/images/Pin_arrow_right_9x7.png and /dev/null differ diff --git a/applications/main/unirfremix/images/Pin_arrow_up_7x9.png b/applications/main/unirfremix/images/Pin_arrow_up_7x9.png deleted file mode 100644 index a91a6fd5e..000000000 Binary files a/applications/main/unirfremix/images/Pin_arrow_up_7x9.png and /dev/null differ diff --git a/applications/main/unirfremix/images/Pin_cell_13x13.png b/applications/main/unirfremix/images/Pin_cell_13x13.png deleted file mode 100644 index 1b1ff0c2f..000000000 Binary files a/applications/main/unirfremix/images/Pin_cell_13x13.png and /dev/null differ diff --git a/applications/main/unirfremix/images/Pin_star_7x7.png b/applications/main/unirfremix/images/Pin_star_7x7.png deleted file mode 100644 index 42fdea86e..000000000 Binary files a/applications/main/unirfremix/images/Pin_star_7x7.png and /dev/null differ diff --git a/applications/main/unirfremix/images/back_10px.png b/applications/main/unirfremix/images/back_10px.png deleted file mode 100644 index f9c615a99..000000000 Binary files a/applications/main/unirfremix/images/back_10px.png and /dev/null differ diff --git a/applications/main/unirfremix/images/sub1_10px.png b/applications/main/unirfremix/images/sub1_10px.png deleted file mode 100644 index 5a25fdf4e..000000000 Binary files a/applications/main/unirfremix/images/sub1_10px.png and /dev/null differ diff --git a/applications/main/unirfremix/unirfIcon.png b/applications/main/unirfremix/unirfIcon.png deleted file mode 100644 index ae1417827..000000000 Binary files a/applications/main/unirfremix/unirfIcon.png and /dev/null differ diff --git a/applications/main/unirfremix/unirfremix_app.c b/applications/main/unirfremix/unirfremix_app.c index c9391ea7c..d981c3cd5 100644 --- a/applications/main/unirfremix/unirfremix_app.c +++ b/applications/main/unirfremix/unirfremix_app.c @@ -8,6 +8,8 @@ #include #include +#include + #include #include #include @@ -18,33 +20,11 @@ #include #include -#include - -#define UNIRFMAP_FOLDER "/ext/subghz/unirf" +#define UNIRFMAP_FOLDER "/ext/unirf" #define UNIRFMAP_EXTENSION ".txt" #define TAG "UniRF Remix" -static const char* mfname; - -static int kl_type; - -void keeloq_reset_mfname() { - mfname = ""; -} - -void keeloq_reset_kl_type() { - kl_type = 0; -} - -void star_line_reset_mfname() { - mfname = ""; -} - -void star_line_reset_kl_type() { - kl_type = 0; -} - typedef struct { uint32_t frequency; FuriString* name; @@ -707,8 +687,6 @@ static void render_callback(Canvas* canvas, void* ctx) { canvas_draw_icon(canvas, 113, 15, &I_Pin_cell_13x13); canvas_draw_icon(canvas, 116, 18, &I_Pin_star_7x7); break; - default: - break; } //Repeat indicator @@ -728,7 +706,7 @@ static void input_callback(InputEvent* input_event, void* ctx) { void unirfremix_subghz_alloc(UniRFRemix* app) { // load subghz presets app->setting = subghz_setting_alloc(); - subghz_setting_load(app->setting, EXT_PATH("subghz/assets/setting_user.txt")); + subghz_setting_load(app->setting, EXT_PATH("subghz/assets/setting_user")); // load mfcodes app->environment = subghz_environment_alloc(); @@ -1004,8 +982,6 @@ int32_t unirfremix_app(void* p) { case 5: app->send_status_c = 5; break; - default: - break; } app->processing = 2; diff --git a/applications/main/unirfremix_loader/application.fam b/applications/main/unirfremix_loader/application.fam deleted file mode 100644 index 070bc9cf7..000000000 --- a/applications/main/unirfremix_loader/application.fam +++ /dev/null @@ -1,11 +0,0 @@ -App( - appid="SubGHz_Remote_loader", - name="Sub-GHz Remote", - apptype=FlipperAppType.APP, - entry_point="unirfremix_loader_app", - requires=["gui"], - stack_size=int(1.5 * 1024), - icon="A_UniRFRemix_14", - order=11, - link="/ext/apps/Main/SubGHz_Remote.fap", -) diff --git a/applications/main/unirfremix_loader/unirfremix_loader_app.c b/applications/main/unirfremix_loader/unirfremix_loader_app.c deleted file mode 100644 index 1acfe41fb..000000000 --- a/applications/main/unirfremix_loader/unirfremix_loader_app.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#define TAG "unirfremix_loader_app" - -int32_t unirfremix_loader_app(void* p) { - UNUSED(p); - - return 0; -} \ No newline at end of file diff --git a/applications/services/application.fam b/applications/services/application.fam index c5fb01dc3..aec49b231 100644 --- a/applications/services/application.fam +++ b/applications/services/application.fam @@ -9,8 +9,5 @@ App( "desktop", "loader", "power", - "ibuttonsrv", - "infraredsrv", - "lfrfidsrv", ], ) diff --git a/applications/services/desktop/application.fam b/applications/services/desktop/application.fam index 6e0b257c2..da6e2b802 100644 --- a/applications/services/desktop/application.fam +++ b/applications/services/desktop/application.fam @@ -12,6 +12,6 @@ App( ], provides=["desktop_settings"], conflicts=["updater"], - stack_size=4 * 1024, + stack_size=2 * 1024, order=60, ) diff --git a/applications/services/desktop/scenes/desktop_scene_main.c b/applications/services/desktop/scenes/desktop_scene_main.c index 507b82e10..b55643d52 100644 --- a/applications/services/desktop/scenes/desktop_scene_main.c +++ b/applications/services/desktop/scenes/desktop_scene_main.c @@ -13,8 +13,6 @@ #define TAG "DesktopSrv" -#define CLOCK_APP EXT_PATH("/apps/Main/Clock.fap") - static void desktop_scene_main_new_idle_animation_callback(void* context) { furi_assert(context); Desktop* desktop = context; @@ -221,6 +219,10 @@ bool desktop_scene_main_on_event(void* context, SceneManagerEvent event) { desktop_scene_main_open_app_or_profile(desktop, EXT_PATH("/apps/Games/Zombiez.fap")); break; } + case DesktopMainEventOpenClock: { + desktop_scene_main_open_app_or_profile(desktop, EXT_PATH("/apps/Main/Clock.fap")); + break; + } case DesktopMainEventOpenTetris: { desktop_scene_main_open_app_or_profile(desktop, EXT_PATH("/apps/Games/Tetris.fap")); break; @@ -247,10 +249,6 @@ bool desktop_scene_main_on_event(void* context, SceneManagerEvent event) { desktop, EXT_PATH("/apps/Main/SubGHz_Remote.fap")); break; } - case DesktopMainEventOpenClock: { - desktop_scene_main_open_app_or_profile(desktop, CLOCK_APP); - break; - } case DesktopLockedEventUpdate: desktop_view_locked_update(desktop->locked_view); consumed = true; diff --git a/applications/services/desktop/views/desktop_view_locked.c b/applications/services/desktop/views/desktop_view_locked.c index 3034da376..0bf757036 100644 --- a/applications/services/desktop/views/desktop_view_locked.c +++ b/applications/services/desktop/views/desktop_view_locked.c @@ -125,7 +125,7 @@ static void desktop_view_locked_draw(Canvas* canvas, void* model) { } else if(view_state == DesktopViewLockedStateLockedHintShown) { canvas_set_font(canvas, FontSecondary); elements_bold_rounded_frame(canvas, 14, 2 + STATUS_BAR_Y_SHIFT, 99, 48); - elements_multiline_text(canvas, 65, 20 + STATUS_BAR_Y_SHIFT, "To Unlock\nPress:"); + elements_multiline_text(canvas, 65, 20 + STATUS_BAR_Y_SHIFT, "To unlock\npress:"); canvas_draw_icon(canvas, 65, 36 + STATUS_BAR_Y_SHIFT, &I_Pin_back_arrow_10x8); canvas_draw_icon(canvas, 80, 36 + STATUS_BAR_Y_SHIFT, &I_Pin_back_arrow_10x8); canvas_draw_icon(canvas, 95, 36 + STATUS_BAR_Y_SHIFT, &I_Pin_back_arrow_10x8); diff --git a/applications/services/dolphin/helpers/dolphin_deed.c b/applications/services/dolphin/helpers/dolphin_deed.c index 59863cf2a..51db56fdf 100644 --- a/applications/services/dolphin/helpers/dolphin_deed.c +++ b/applications/services/dolphin/helpers/dolphin_deed.c @@ -45,15 +45,13 @@ static const DolphinDeedWeight dolphin_deed_weights[] = { }; static uint8_t dolphin_deed_limits[] = { - 100, // DolphinAppSubGhz - 100, // DolphinAppRfid - 100, // DolphinAppNfc - 100, // DolphinAppIr - 100, // DolphinAppIbutton - 100, // DolphinAppBadusb -// 100, // DolphinAppU2f -// 100, // DolphinAppGpio - 100, // DolphinAppPlugin + 20, // DolphinAppSubGhz + 20, // DolphinAppRfid + 20, // DolphinAppNfc + 20, // DolphinAppIr + 20, // DolphinAppIbutton + 20, // DolphinAppBadusb + 20, // DolphinAppPlugin }; _Static_assert(COUNT_OF(dolphin_deed_weights) == DolphinDeedMAX, "dolphin_deed_weights size error"); diff --git a/applications/services/gui/modules/file_browser_worker.c b/applications/services/gui/modules/file_browser_worker.c index eadc7f219..4386fdfd0 100644 --- a/applications/services/gui/modules/file_browser_worker.c +++ b/applications/services/gui/modules/file_browser_worker.c @@ -493,4 +493,4 @@ void file_browser_worker_load(BrowserWorker* browser, uint32_t offset, uint32_t browser->load_offset = offset; browser->load_count = count; furi_thread_flags_set(furi_thread_get_id(browser->thread), WorkerEvtLoad); -} \ No newline at end of file +} diff --git a/applications/services/gui/modules/file_browser_worker.h b/applications/services/gui/modules/file_browser_worker.h index 3b1373c14..3b4be6aa7 100644 --- a/applications/services/gui/modules/file_browser_worker.h +++ b/applications/services/gui/modules/file_browser_worker.h @@ -67,4 +67,4 @@ void file_browser_worker_load(BrowserWorker* browser, uint32_t offset, uint32_t #ifdef __cplusplus } -#endif \ No newline at end of file +#endif diff --git a/applications/services/ibuttonsrv/application.fam b/applications/services/ibuttonsrv/application.fam deleted file mode 100644 index e23ac786f..000000000 --- a/applications/services/ibuttonsrv/application.fam +++ /dev/null @@ -1,7 +0,0 @@ -App( - appid="ibuttonsrv", - apptype=FlipperAppType.STARTUP, - entry_point="ibutton_on_system_start", - requires=["ibutton"], - order=60, -) diff --git a/applications/services/infraredsrv/application.fam b/applications/services/infraredsrv/application.fam deleted file mode 100644 index 53168216c..000000000 --- a/applications/services/infraredsrv/application.fam +++ /dev/null @@ -1,7 +0,0 @@ -App( - appid="infraredsrv", - apptype=FlipperAppType.STARTUP, - entry_point="infrared_on_system_start", - requires=["infrared"], - order=20, -) diff --git a/applications/services/infraredsrv/infrared_brute_force.c b/applications/services/infraredsrv/infrared_brute_force.c deleted file mode 100644 index 31bcabd1d..000000000 --- a/applications/services/infraredsrv/infrared_brute_force.c +++ /dev/null @@ -1,158 +0,0 @@ -#include "infrared_brute_force.h" - -#include -#include -#include - -#include "infrared_signal.h" - -typedef struct { - uint32_t index; - uint32_t count; -} InfraredBruteForceRecord; - -DICT_DEF2( - InfraredBruteForceRecordDict, - FuriString*, - FURI_STRING_OPLIST, - InfraredBruteForceRecord, - M_POD_OPLIST); - -struct InfraredBruteForce { - FlipperFormat* ff; - const char* db_filename; - FuriString* current_record_name; - InfraredSignal* current_signal; - InfraredBruteForceRecordDict_t records; - bool is_started; -}; - -InfraredBruteForce* infrared_brute_force_alloc() { - InfraredBruteForce* brute_force = malloc(sizeof(InfraredBruteForce)); - brute_force->ff = NULL; - brute_force->db_filename = NULL; - brute_force->current_signal = NULL; - brute_force->is_started = false; - brute_force->current_record_name = furi_string_alloc(); - InfraredBruteForceRecordDict_init(brute_force->records); - return brute_force; -} - -void infrared_brute_force_clear_records(InfraredBruteForce* brute_force) { - furi_assert(!brute_force->is_started); - InfraredBruteForceRecordDict_reset(brute_force->records); -} - -void infrared_brute_force_free(InfraredBruteForce* brute_force) { - furi_assert(!brute_force->is_started); - InfraredBruteForceRecordDict_clear(brute_force->records); - furi_string_free(brute_force->current_record_name); - free(brute_force); -} - -void infrared_brute_force_set_db_filename(InfraredBruteForce* brute_force, const char* db_filename) { - furi_assert(!brute_force->is_started); - brute_force->db_filename = db_filename; -} - -bool infrared_brute_force_calculate_messages(InfraredBruteForce* brute_force) { - furi_assert(!brute_force->is_started); - furi_assert(brute_force->db_filename); - bool success = false; - - Storage* storage = furi_record_open(RECORD_STORAGE); - FlipperFormat* ff = flipper_format_buffered_file_alloc(storage); - - success = flipper_format_buffered_file_open_existing(ff, brute_force->db_filename); - if(success) { - FuriString* signal_name; - signal_name = furi_string_alloc(); - while(flipper_format_read_string(ff, "name", signal_name)) { - InfraredBruteForceRecord* record = - InfraredBruteForceRecordDict_get(brute_force->records, signal_name); - if(record) { - ++(record->count); - } - } - furi_string_free(signal_name); - } - - flipper_format_free(ff); - furi_record_close(RECORD_STORAGE); - return success; -} - -bool infrared_brute_force_start( - InfraredBruteForce* brute_force, - uint32_t index, - uint32_t* record_count) { - furi_assert(!brute_force->is_started); - bool success = false; - *record_count = 0; - - InfraredBruteForceRecordDict_it_t it; - for(InfraredBruteForceRecordDict_it(it, brute_force->records); - !InfraredBruteForceRecordDict_end_p(it); - InfraredBruteForceRecordDict_next(it)) { - const InfraredBruteForceRecordDict_itref_t* record = InfraredBruteForceRecordDict_cref(it); - if(record->value.index == index) { - *record_count = record->value.count; - if(*record_count) { - furi_string_set(brute_force->current_record_name, record->key); - } - break; - } - } - - if(*record_count) { - Storage* storage = furi_record_open(RECORD_STORAGE); - brute_force->ff = flipper_format_buffered_file_alloc(storage); - brute_force->current_signal = infrared_signal_alloc(); - brute_force->is_started = true; - success = - flipper_format_buffered_file_open_existing(brute_force->ff, brute_force->db_filename); - if(!success) infrared_brute_force_stop(brute_force); - } - return success; -} - -bool infrared_brute_force_is_started(InfraredBruteForce* brute_force) { - return brute_force->is_started; -} - -void infrared_brute_force_stop(InfraredBruteForce* brute_force) { - furi_assert(brute_force->is_started); - furi_string_reset(brute_force->current_record_name); - infrared_signal_free(brute_force->current_signal); - flipper_format_free(brute_force->ff); - brute_force->current_signal = NULL; - brute_force->ff = NULL; - brute_force->is_started = false; - furi_record_close(RECORD_STORAGE); -} - -bool infrared_brute_force_send_next(InfraredBruteForce* brute_force) { - furi_assert(brute_force->is_started); - const bool success = infrared_signal_search_and_read( - brute_force->current_signal, brute_force->ff, brute_force->current_record_name); - if(success) { - infrared_signal_transmit(brute_force->current_signal); - } - return success; -} - -void infrared_brute_force_add_record( - InfraredBruteForce* brute_force, - uint32_t index, - const char* name) { - InfraredBruteForceRecord value = {.index = index, .count = 0}; - FuriString* key; - key = furi_string_alloc_set(name); - InfraredBruteForceRecordDict_set_at(brute_force->records, key, value); - furi_string_free(key); -} - -void infrared_brute_force_reset(InfraredBruteForce* brute_force) { - furi_assert(!brute_force->is_started); - InfraredBruteForceRecordDict_reset(brute_force->records); -} diff --git a/applications/services/infraredsrv/infrared_brute_force.h b/applications/services/infraredsrv/infrared_brute_force.h deleted file mode 100644 index cf37935ef..000000000 --- a/applications/services/infraredsrv/infrared_brute_force.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include -#include - -typedef struct InfraredBruteForce InfraredBruteForce; - -InfraredBruteForce* infrared_brute_force_alloc(); -void infrared_brute_force_free(InfraredBruteForce* brute_force); -void infrared_brute_force_reset(InfraredBruteForce* brute_force); -void infrared_brute_force_set_db_filename(InfraredBruteForce* brute_force, const char* db_filename); -bool infrared_brute_force_calculate_messages(InfraredBruteForce* brute_force); -bool infrared_brute_force_start( - InfraredBruteForce* brute_force, - uint32_t index, - uint32_t* record_count); -bool infrared_brute_force_is_started(InfraredBruteForce* brute_force); -void infrared_brute_force_stop(InfraredBruteForce* brute_force); -bool infrared_brute_force_send_next(InfraredBruteForce* brute_force); -void infrared_brute_force_clear_records(InfraredBruteForce* brute_force); -void infrared_brute_force_add_record( - InfraredBruteForce* brute_force, - uint32_t index, - const char* name); diff --git a/applications/services/infraredsrv/infrared_signal.c b/applications/services/infraredsrv/infrared_signal.c deleted file mode 100644 index d399b9587..000000000 --- a/applications/services/infraredsrv/infrared_signal.c +++ /dev/null @@ -1,300 +0,0 @@ -#include "infrared_signal.h" - -#include -#include -#include -#include -#include - -#define TAG "InfraredSignal" - -struct InfraredSignal { - bool is_raw; - union { - InfraredMessage message; - InfraredRawSignal raw; - } payload; -}; - -static void infrared_signal_clear_timings(InfraredSignal* signal) { - if(signal->is_raw) { - free(signal->payload.raw.timings); - signal->payload.raw.timings_size = 0; - signal->payload.raw.timings = NULL; - } -} - -static bool infrared_signal_is_message_valid(InfraredMessage* message) { - if(!infrared_is_protocol_valid(message->protocol)) { - FURI_LOG_E(TAG, "Unknown protocol"); - return false; - } - - uint32_t address_length = infrared_get_protocol_address_length(message->protocol); - uint32_t address_mask = (1UL << address_length) - 1; - - if(message->address != (message->address & address_mask)) { - FURI_LOG_E( - TAG, - "Address is out of range (mask 0x%08lX): 0x%lX\r\n", - address_mask, - message->address); - return false; - } - - uint32_t command_length = infrared_get_protocol_command_length(message->protocol); - uint32_t command_mask = (1UL << command_length) - 1; - - if(message->command != (message->command & command_mask)) { - FURI_LOG_E( - TAG, - "Command is out of range (mask 0x%08lX): 0x%lX\r\n", - command_mask, - message->command); - return false; - } - - return true; -} - -static bool infrared_signal_is_raw_valid(InfraredRawSignal* raw) { - if((raw->frequency > INFRARED_MAX_FREQUENCY) || (raw->frequency < INFRARED_MIN_FREQUENCY)) { - FURI_LOG_E( - TAG, - "Frequency is out of range (%X - %X): %lX", - INFRARED_MIN_FREQUENCY, - INFRARED_MAX_FREQUENCY, - raw->frequency); - return false; - - } else if((raw->duty_cycle <= 0) || (raw->duty_cycle > 1)) { - FURI_LOG_E(TAG, "Duty cycle is out of range (0 - 1): %f", (double)raw->duty_cycle); - return false; - - } else if((raw->timings_size <= 0) || (raw->timings_size > MAX_TIMINGS_AMOUNT)) { - FURI_LOG_E( - TAG, - "Timings amount is out of range (0 - %X): %X", - MAX_TIMINGS_AMOUNT, - raw->timings_size); - return false; - } - - return true; -} - -static inline bool infrared_signal_save_message(InfraredMessage* message, FlipperFormat* ff) { - const char* protocol_name = infrared_get_protocol_name(message->protocol); - return flipper_format_write_string_cstr(ff, "type", "parsed") && - flipper_format_write_string_cstr(ff, "protocol", protocol_name) && - flipper_format_write_hex(ff, "address", (uint8_t*)&message->address, 4) && - flipper_format_write_hex(ff, "command", (uint8_t*)&message->command, 4); -} - -static inline bool infrared_signal_save_raw(InfraredRawSignal* raw, FlipperFormat* ff) { - furi_assert(raw->timings_size <= MAX_TIMINGS_AMOUNT); - return flipper_format_write_string_cstr(ff, "type", "raw") && - flipper_format_write_uint32(ff, "frequency", &raw->frequency, 1) && - flipper_format_write_float(ff, "duty_cycle", &raw->duty_cycle, 1) && - flipper_format_write_uint32(ff, "data", raw->timings, raw->timings_size); -} - -static inline bool infrared_signal_read_message(InfraredSignal* signal, FlipperFormat* ff) { - FuriString* buf; - buf = furi_string_alloc(); - bool success = false; - - do { - if(!flipper_format_read_string(ff, "protocol", buf)) break; - - InfraredMessage message; - message.protocol = infrared_get_protocol_by_name(furi_string_get_cstr(buf)); - - success = flipper_format_read_hex(ff, "address", (uint8_t*)&message.address, 4) && - flipper_format_read_hex(ff, "command", (uint8_t*)&message.command, 4) && - infrared_signal_is_message_valid(&message); - - if(!success) break; - - infrared_signal_set_message(signal, &message); - } while(0); - - furi_string_free(buf); - return success; -} - -static inline bool infrared_signal_read_raw(InfraredSignal* signal, FlipperFormat* ff) { - uint32_t timings_size, frequency; - float duty_cycle; - - bool success = flipper_format_read_uint32(ff, "frequency", &frequency, 1) && - flipper_format_read_float(ff, "duty_cycle", &duty_cycle, 1) && - flipper_format_get_value_count(ff, "data", &timings_size); - - if(!success || timings_size > MAX_TIMINGS_AMOUNT) { - return false; - } - - uint32_t* timings = malloc(sizeof(uint32_t) * timings_size); - success = flipper_format_read_uint32(ff, "data", timings, timings_size); - - if(success) { - infrared_signal_set_raw_signal(signal, timings, timings_size, frequency, duty_cycle); - } - - free(timings); - return success; -} - -static bool infrared_signal_read_body(InfraredSignal* signal, FlipperFormat* ff) { - FuriString* tmp = furi_string_alloc(); - - bool success = false; - - do { - if(!flipper_format_read_string(ff, "type", tmp)) break; - if(furi_string_equal(tmp, "raw")) { - success = infrared_signal_read_raw(signal, ff); - } else if(furi_string_equal(tmp, "parsed")) { - success = infrared_signal_read_message(signal, ff); - } else { - FURI_LOG_E(TAG, "Unknown signal type"); - } - } while(false); - - furi_string_free(tmp); - return success; -} - -InfraredSignal* infrared_signal_alloc() { - InfraredSignal* signal = malloc(sizeof(InfraredSignal)); - - signal->is_raw = false; - signal->payload.message.protocol = InfraredProtocolUnknown; - - return signal; -} - -void infrared_signal_free(InfraredSignal* signal) { - infrared_signal_clear_timings(signal); - free(signal); -} - -bool infrared_signal_is_raw(InfraredSignal* signal) { - return signal->is_raw; -} - -bool infrared_signal_is_valid(InfraredSignal* signal) { - return signal->is_raw ? infrared_signal_is_raw_valid(&signal->payload.raw) : - infrared_signal_is_message_valid(&signal->payload.message); -} - -void infrared_signal_set_signal(InfraredSignal* signal, const InfraredSignal* other) { - if(other->is_raw) { - const InfraredRawSignal* raw = &other->payload.raw; - infrared_signal_set_raw_signal( - signal, raw->timings, raw->timings_size, raw->frequency, raw->duty_cycle); - } else { - const InfraredMessage* message = &other->payload.message; - infrared_signal_set_message(signal, message); - } -} - -void infrared_signal_set_raw_signal( - InfraredSignal* signal, - const uint32_t* timings, - size_t timings_size, - uint32_t frequency, - float duty_cycle) { - infrared_signal_clear_timings(signal); - - signal->is_raw = true; - - signal->payload.raw.timings_size = timings_size; - signal->payload.raw.frequency = frequency; - signal->payload.raw.duty_cycle = duty_cycle; - - signal->payload.raw.timings = malloc(timings_size * sizeof(uint32_t)); - memcpy(signal->payload.raw.timings, timings, timings_size * sizeof(uint32_t)); -} - -InfraredRawSignal* infrared_signal_get_raw_signal(InfraredSignal* signal) { - furi_assert(signal->is_raw); - return &signal->payload.raw; -} - -void infrared_signal_set_message(InfraredSignal* signal, const InfraredMessage* message) { - infrared_signal_clear_timings(signal); - - signal->is_raw = false; - signal->payload.message = *message; -} - -InfraredMessage* infrared_signal_get_message(InfraredSignal* signal) { - furi_assert(!signal->is_raw); - return &signal->payload.message; -} - -bool infrared_signal_save(InfraredSignal* signal, FlipperFormat* ff, const char* name) { - if(!flipper_format_write_comment_cstr(ff, "") || - !flipper_format_write_string_cstr(ff, "name", name)) { - return false; - } else if(signal->is_raw) { - return infrared_signal_save_raw(&signal->payload.raw, ff); - } else { - return infrared_signal_save_message(&signal->payload.message, ff); - } -} - -bool infrared_signal_read(InfraredSignal* signal, FlipperFormat* ff, FuriString* name) { - FuriString* tmp = furi_string_alloc(); - - bool success = false; - - do { - if(!flipper_format_read_string(ff, "name", tmp)) break; - furi_string_set(name, tmp); - if(!infrared_signal_read_body(signal, ff)) break; - success = true; - } while(0); - - furi_string_free(tmp); - return success; -} - -bool infrared_signal_search_and_read( - InfraredSignal* signal, - FlipperFormat* ff, - const FuriString* name) { - bool success = false; - FuriString* tmp = furi_string_alloc(); - - do { - bool is_name_found = false; - while(flipper_format_read_string(ff, "name", tmp)) { - is_name_found = furi_string_equal(name, tmp); - if(is_name_found) break; - } - if(!is_name_found) break; - if(!infrared_signal_read_body(signal, ff)) break; - success = true; - } while(false); - - furi_string_free(tmp); - return success; -} - -void infrared_signal_transmit(InfraredSignal* signal) { - if(signal->is_raw) { - InfraredRawSignal* raw_signal = &signal->payload.raw; - infrared_send_raw_ext( - raw_signal->timings, - raw_signal->timings_size, - true, - raw_signal->frequency, - raw_signal->duty_cycle); - } else { - InfraredMessage* message = &signal->payload.message; - infrared_send(message, 1); - } -} diff --git a/applications/services/infraredsrv/infrared_signal.h b/applications/services/infraredsrv/infrared_signal.h deleted file mode 100644 index 29c661938..000000000 --- a/applications/services/infraredsrv/infrared_signal.h +++ /dev/null @@ -1,45 +0,0 @@ -#pragma once - -#include -#include -#include - -#include -#include - -typedef struct InfraredSignal InfraredSignal; - -typedef struct { - size_t timings_size; - uint32_t* timings; - uint32_t frequency; - float duty_cycle; -} InfraredRawSignal; - -InfraredSignal* infrared_signal_alloc(); -void infrared_signal_free(InfraredSignal* signal); - -bool infrared_signal_is_raw(InfraredSignal* signal); -bool infrared_signal_is_valid(InfraredSignal* signal); - -void infrared_signal_set_signal(InfraredSignal* signal, const InfraredSignal* other); - -void infrared_signal_set_raw_signal( - InfraredSignal* signal, - const uint32_t* timings, - size_t timings_size, - uint32_t frequency, - float duty_cycle); -InfraredRawSignal* infrared_signal_get_raw_signal(InfraredSignal* signal); - -void infrared_signal_set_message(InfraredSignal* signal, const InfraredMessage* message); -InfraredMessage* infrared_signal_get_message(InfraredSignal* signal); - -bool infrared_signal_save(InfraredSignal* signal, FlipperFormat* ff, const char* name); -bool infrared_signal_read(InfraredSignal* signal, FlipperFormat* ff, FuriString* name); -bool infrared_signal_search_and_read( - InfraredSignal* signal, - FlipperFormat* ff, - const FuriString* name); - -void infrared_signal_transmit(InfraredSignal* signal); diff --git a/applications/services/lfrfidsrv/application.fam b/applications/services/lfrfidsrv/application.fam deleted file mode 100644 index 9a6044d00..000000000 --- a/applications/services/lfrfidsrv/application.fam +++ /dev/null @@ -1,7 +0,0 @@ -App( - appid="lfrfidsrv", - apptype=FlipperAppType.STARTUP, - entry_point="lfrfid_on_system_start", - requires=["lfrfid"], - order=50, -)