From e15a56c988a64645ad18125d3a5dc0477a57c95a Mon Sep 17 00:00:00 2001 From: SkorP Date: Mon, 12 Aug 2024 15:47:45 +0400 Subject: [PATCH 1/6] SubGhz: Fix RPC status for ButtonRelease event --- applications/main/subghz/scenes/subghz_scene_rpc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/applications/main/subghz/scenes/subghz_scene_rpc.c b/applications/main/subghz/scenes/subghz_scene_rpc.c index f8bf066d5..42ec98a39 100644 --- a/applications/main/subghz/scenes/subghz_scene_rpc.c +++ b/applications/main/subghz/scenes/subghz_scene_rpc.c @@ -57,7 +57,8 @@ bool subghz_scene_rpc_on_event(void* context, SceneManagerEvent event) { default: //if(SubGhzTxRxStartTxStateOk) result = true; subghz_blink_start(subghz); - state = SubGhzRpcStateTx; + scene_manager_set_scene_state( + subghz->scene_manager, SubGhzSceneRpc, SubGhzRpcStateTx); break; } } @@ -69,7 +70,8 @@ bool subghz_scene_rpc_on_event(void* context, SceneManagerEvent event) { subghz_blink_stop(subghz); result = true; } - state = SubGhzRpcStateIdle; + scene_manager_set_scene_state( + subghz->scene_manager, SubGhzSceneRpc, SubGhzRpcStateIdle); rpc_system_app_confirm(subghz->rpc_ctx, result); } else if(event.event == SubGhzCustomEventSceneRpcLoad) { bool result = false; From 67dae229a9f2150ab440343bc6f3f4504421fd28 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Sat, 17 Aug 2024 17:53:50 +0300 Subject: [PATCH 2/6] merge ofw PR 3840 [ci skip] GUI: NumberInput small improvements by Willy-JL --- applications/services/gui/modules/number_input.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/applications/services/gui/modules/number_input.c b/applications/services/gui/modules/number_input.c index 777e55747..317f22f54 100644 --- a/applications/services/gui/modules/number_input.c +++ b/applications/services/gui/modules/number_input.c @@ -93,7 +93,7 @@ static void number_input_draw_input(Canvas* canvas, NumberInputModel* model) { const size_t text_x = 8; const size_t text_y = 25; - elements_slightly_rounded_frame(canvas, 6, 14, 116, 15); + elements_slightly_rounded_frame(canvas, 4, 14, 120, 15); canvas_draw_str(canvas, text_x, text_y, furi_string_get_cstr(model->text_buffer)); } @@ -206,7 +206,7 @@ static void number_input_add_digit(NumberInputModel* model, char* newChar) { } model->current_number = strtol(furi_string_get_cstr(model->text_buffer), NULL, 10); if(model->current_number == 0) { - furi_string_reset(model->text_buffer); + furi_string_set(model->text_buffer, "0"); } } @@ -417,7 +417,9 @@ void number_input_set_result_callback( int32_t max_value) { furi_check(number_input); - current_number = CLAMP(current_number, max_value, min_value); + if(current_number != 0) { + current_number = CLAMP(current_number, max_value, min_value); + } with_view_model( number_input->view, @@ -426,7 +428,11 @@ void number_input_set_result_callback( model->callback = callback; model->callback_context = callback_context; model->current_number = current_number; - furi_string_printf(model->text_buffer, "%ld", current_number); + if(current_number != 0) { + furi_string_printf(model->text_buffer, "%ld", current_number); + } else { + furi_string_set(model->text_buffer, ""); + } model->min_value = min_value; model->max_value = max_value; }, From 02553d0c6b93b779f276ccd58950251404439a3d Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Sat, 17 Aug 2024 18:02:56 +0300 Subject: [PATCH 3/6] upd changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95b749b7c..b51403f7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,10 @@ * Apps: **Check out more Apps updates and fixes by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev) ## Other changes * Misc: Fix typo in comment in QueueTools.py (by @eltociear | PR #785) +* OFW PR 3840: GUI: NumberInput small improvements (by @Willy-JL) +* OFW PR 3838: SubGhz: Fix RPC status for ButtonRelease event (by @Skorpionm) +* OFW: scripts: improved size validator for updater image +* OFW: Desktop: seaprate callbacks for dolphin and storage subscriptions * OFW: Make file extensions case-insensitive * OFW: Remove internal storage folder if corresponding flag set * OFW: **Added a text input that only accepts full numbers (int)** From 6a934945061231dec138aa700ac47f4cde5e62a3 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Sun, 18 Aug 2024 00:45:04 +0300 Subject: [PATCH 4/6] Settings: Show free flash amount in internal storage info [ci skip] by Willy-JL --- .../scenes/storage_settings_scene_internal_info.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/applications/settings/storage_settings/scenes/storage_settings_scene_internal_info.c b/applications/settings/storage_settings/scenes/storage_settings_scene_internal_info.c index 5a367afce..87a7ac655 100644 --- a/applications/settings/storage_settings/scenes/storage_settings_scene_internal_info.c +++ b/applications/settings/storage_settings/scenes/storage_settings_scene_internal_info.c @@ -1,5 +1,6 @@ #include "../storage_settings.h" #include +#include static void storage_settings_scene_internal_info_dialog_callback(DialogExResult result, void* context) { @@ -27,10 +28,20 @@ void storage_settings_scene_internal_info_on_enter(void* context) { } else { furi_string_printf( app->text_string, - "Name: %s\nType: Virtual\nTotal: %lu KiB\nFree: %lu KiB", + "Name: %s\nType: Virtual (/.int on SD)\nTotal: %lu KiB\nFree: %lu KiB\n", furi_hal_version_get_name_ptr() ? furi_hal_version_get_name_ptr() : "Unknown", (uint32_t)(total_space / 1024), (uint32_t)(free_space / 1024)); + + uint32_t free_flash = + furi_hal_flash_get_free_end_address() - furi_hal_flash_get_free_start_address(); + if(free_flash < 1024) { + furi_string_cat_printf(app->text_string, "Flash: %lu B free", free_flash); + } else { + furi_string_cat_printf( + app->text_string, "Flash: %.2f KiB free", (double)free_flash / 1024); + } + dialog_ex_set_text( dialog_ex, furi_string_get_cstr(app->text_string), 4, 4, AlignLeft, AlignTop); } From a6d0efef83641dd1acb300ac7ebc4a10ef5daec6 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Sun, 18 Aug 2024 01:01:14 +0300 Subject: [PATCH 5/6] fix any path for badusb favourites --- applications/main/archive/helpers/archive_files.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/main/archive/helpers/archive_files.c b/applications/main/archive/helpers/archive_files.c index 868fa8a11..f4b49cd0e 100644 --- a/applications/main/archive/helpers/archive_files.c +++ b/applications/main/archive/helpers/archive_files.c @@ -17,8 +17,8 @@ void archive_set_file_type(ArchiveFile_t* file, const char* path, bool is_folder if((known_ext[i][0] == '?') || (known_ext[i][0] == '*')) continue; if(furi_string_end_withi(file->path, known_ext[i])) { if((i == ArchiveFileTypeBadUsb) || (i == ArchiveFileTypeSubGhzRemote)) { - if(furi_string_search( - file->path, archive_get_default_path(ArchiveTabBadUsb)) == 0) { + if((furi_string_search(file->path, EXT_PATH("badusb")) == 0) || + (furi_string_search(file->path, ANY_PATH("badusb")) == 0)) { file->type = ArchiveFileTypeBadUsb; return; // *.txt file is a BadUSB script only if it is in BadUSB folder } From 889c80e9007dd34f5318c66c8b5747b917a8bcb6 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Sun, 18 Aug 2024 01:09:44 +0300 Subject: [PATCH 6/6] upd changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b51403f7c..327e4446e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ * OFW: iButton ID writing (Enable ID writing for ds1971 and ds1996) * Apps: **Check out more Apps updates and fixes by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev) ## Other changes +* Archive: Fix BadUSB favourite path check +* Settings: Show free flash amount in internal storage info (by @Willy-JL) * Misc: Fix typo in comment in QueueTools.py (by @eltociear | PR #785) * OFW PR 3840: GUI: NumberInput small improvements (by @Willy-JL) * OFW PR 3838: SubGhz: Fix RPC status for ButtonRelease event (by @Skorpionm)