From f67a776f8f263bb917ed203e728b3ac909ec434d Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Thu, 9 Mar 2023 19:40:51 +0000 Subject: [PATCH 1/9] Revert to old install instructions --- .github/workflow_data/release.md | 6 +++--- ReadMe.md | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflow_data/release.md b/.github/workflow_data/release.md index 1dcbf31ee..5d3f2f6bc 100644 --- a/.github/workflow_data/release.md +++ b/.github/workflow_data/release.md @@ -1,11 +1,11 @@ ## ⬇️ Download ->### [🐬 qFlipper Package (.tgz)](https://github.com/ClaraCrazy/Flipper-Xtreme/releases/download/{release_tag}/{release_tag}.tgz) [recommended] +>### [📦 Zipped Archive (.zip)](https://github.com/ClaraCrazy/Flipper-Xtreme/releases/download/{release_tag}/{release_tag}.zip) [recommended] ->### [📦 Zipped Archive (.zip)](https://github.com/ClaraCrazy/Flipper-Xtreme/releases/download/{release_tag}/{release_tag}.zip) +>### [🐬 qFlipper Package (.tgz)](https://github.com/ClaraCrazy/Flipper-Xtreme/releases/download/{release_tag}/{release_tag}.tgz) >### [🖥️ Web Updater (chrome)](https://lab.flipper.net/?url={webupdater_url}&channel=XFW-Updater&version={release_tag}) [not recommended] -**Remember to delete your `apps` (and `update` if using "Install from file...") folders before updating!**\ +**Remember to delete your `apps` folders before updating!**\ **Check the [install guide](https://github.com/ClaraCrazy/Flipper-Xtreme#install) if you're not sure, or [join our Discord](https://discord.gg/flipper-xtreme) if you have questions!** ## 🚀 Changelog diff --git a/ReadMe.md b/ReadMe.md index bfce45ed6..135efc123 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -162,11 +162,13 @@ Note: This repo is always updated with OFW & Unleashed. No need to mention all t **This process will NOT delete any saved files and simply ensures the install goes smoothly.**

-- Download the latest release (`.tgz`) from [the release page](https://github.com/ClaraCrazy/Flipper-Xtreme/releases/latest) +- Download the latest release (`.zip`) from [the release page](https://github.com/ClaraCrazy/Flipper-Xtreme/releases/latest) +- Extract the archive. This is now your new firmware folder - Open [qFlipper](https://flipperzero.one/update) and connect your Flipper Zero -- Go to the files tab, into SD Card, and DELETE THE `apps` AND `update` FOLDERS -- Go back to the device tab -- Click `Install from file...` and select the downloaded file (`.tgz`) +- Go to the files tab, into SD Card and delete the `apps` folder +- Open the `update` folder and drag the new firmware folder there +- On the Flipper, hit the `Arrow Down` button, this will get you to the file menu. Hit `Arrow Left` once, and then simply search for your updates folder +- Inside that folder, select the Firmware you just moved onto it, and run the file thats simply called `Update` - Enjoy! From 3a5aa98dbbe34448538f0e0aeb991595bdb58e62 Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Thu, 9 Mar 2023 20:00:49 +0000 Subject: [PATCH 2/9] Fix release assets upload --- .github/workflows/release.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dc6ead78d..842184286 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -63,6 +63,9 @@ jobs: cd ./${DEFAULT_TARGET}-update-* 7z a ../${RELEASE_TAG}.zip . cd .. + mv ${RELEASE_TAG}.tgz .. + mv ${RELEASE_TAG}.zip .. + cd .. python -m pip install pyncclient WEBUPDATER_URL="$(python -c "import nextcloud_client as n;c = n.Client('https://cloud.cynthialabs.net/');c.login('${{ secrets.NC_USER }}', '${{ secrets.NC_PASS }}');c.put_file('XFW-Updater/${RELEASE_TAG}.tgz', '${RELEASE_TAG}.tgz');print(c.share_file_with_link('XFW-Updater/${RELEASE_TAG}.tgz').get_link().rstrip('/') + '/download/${RELEASE_TAG}.tgz', end='')")" echo "WEBUPDATER_URL=${WEBUPDATER_URL}" >> $GITHUB_ENV @@ -91,8 +94,8 @@ jobs: draft: false prerelease: false files: | - ${{ env.RELEASE_TAG }}.tgz - ${{ env.RELEASE_TAG }}.zip + dist/${{ env.RELEASE_TAG }}.tgz + dist/${{ env.RELEASE_TAG }}.zip name: "${{ env.RELEASE_TAG }}" tag_name: "${{ env.RELEASE_TAG }}" target_commitish: main From f6b503e735b2c97afa52acba0d94981fb5d9dd15 Mon Sep 17 00:00:00 2001 From: Clara K Date: Thu, 9 Mar 2023 21:05:47 +0100 Subject: [PATCH 3/9] Update release.md --- .github/workflow_data/release.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflow_data/release.md b/.github/workflow_data/release.md index 5d3f2f6bc..b8fb31852 100644 --- a/.github/workflow_data/release.md +++ b/.github/workflow_data/release.md @@ -6,7 +6,7 @@ >### [🖥️ Web Updater (chrome)](https://lab.flipper.net/?url={webupdater_url}&channel=XFW-Updater&version={release_tag}) [not recommended] **Remember to delete your `apps` folders before updating!**\ -**Check the [install guide](https://github.com/ClaraCrazy/Flipper-Xtreme#install) if you're not sure, or [join our Discord](https://discord.gg/flipper-xtreme) if you have questions!** +**Check the [install guide](https://github.com/ClaraCrazy/Flipper-Xtreme#install) if you're not sure, or [join our Discord](https://discord.gg/flipper-xtreme) if you have questions or encounter issues!** ## 🚀 Changelog {changelog} From 7add235a7064cc5aaa8647cad18443290fb55a42 Mon Sep 17 00:00:00 2001 From: Clara K Date: Thu, 9 Mar 2023 21:06:09 +0100 Subject: [PATCH 4/9] Update release.md --- .github/workflow_data/release.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflow_data/release.md b/.github/workflow_data/release.md index b8fb31852..4602ffa1f 100644 --- a/.github/workflow_data/release.md +++ b/.github/workflow_data/release.md @@ -17,6 +17,6 @@ If you like what you're seeing, **please consider donating to us**. We won't eve - **[Direct transfer to my bank](https://bunq.me/ClaraK)**: No account needed, they have a convenient online pay thingy (that hates americans, sowwy) - **[Patreon](https://patreon.com/CynthiaLabs)** - **[Paypal](https://paypal.me/RdX2020)** -- **Monero**: 41kyWeeoVdK4quzQ4M9ikVGs6tCQCLfdx8jLExTNsAu2SF1QAyDqRdjfGM6EL8L9NpXwt89HJeAoGf1aoArk7nDr4AMMV4T +- **Monero**: `41kyWeeoVdK4quzQ4M9ikVGs6tCQCLfdx8jLExTNsAu2SF1QAyDqRdjfGM6EL8L9NpXwt89HJeAoGf1aoArk7nDr4AMMV4T` **Thanks for all your support <3** From dfa46442fb98957bb39da4c16b1bc204213533e6 Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Fri, 10 Mar 2023 08:34:59 +0000 Subject: [PATCH 5/9] Revert migrate bs --- applications/main/bad_kb/bad_kb_app.c | 8 -------- applications/main/subghz_remote/subghz_remote_app.c | 7 ------- 2 files changed, 15 deletions(-) diff --git a/applications/main/bad_kb/bad_kb_app.c b/applications/main/bad_kb/bad_kb_app.c index 9f2a3145a..d1af93b90 100644 --- a/applications/main/bad_kb/bad_kb_app.c +++ b/applications/main/bad_kb/bad_kb_app.c @@ -84,14 +84,6 @@ BadKbApp* bad_kb_app_alloc(char* arg) { } Storage* storage = furi_record_open(RECORD_STORAGE); - // Remove old pre-included files to avoid duplicates on migrate - storage_simply_remove(storage, EXT_PATH("badusb/layouts")); - storage_simply_remove(storage, EXT_PATH("badusb/.badusb.settings")); - storage_simply_remove(storage, EXT_PATH("badusb/Kiosk-Evasion-Bruteforce.txt")); - storage_simply_remove(storage, EXT_PATH("badusb/Wifi-Stealer_ORG.txt")); - storage_simply_remove(storage, EXT_PATH("badusb/demo_macos.txt")); - storage_simply_remove(storage, EXT_PATH("badusb/demo_windows.txt")); - storage_common_migrate(storage, EXT_PATH("badusb"), BAD_KB_APP_BASE_FOLDER); storage_simply_mkdir(storage, BAD_KB_APP_BASE_FOLDER); furi_record_close(RECORD_STORAGE); diff --git a/applications/main/subghz_remote/subghz_remote_app.c b/applications/main/subghz_remote/subghz_remote_app.c index 941cdb889..0d0d8ba8e 100644 --- a/applications/main/subghz_remote/subghz_remote_app.c +++ b/applications/main/subghz_remote/subghz_remote_app.c @@ -812,13 +812,6 @@ int32_t subghz_remote_app(void* p) { app->file_result = 3; Storage* storage = furi_record_open(RECORD_STORAGE); - // Remove old pre-included files to avoid duplicates on migrate - storage_simply_remove(storage, EXT_PATH("subghz/unirf/CVS_Walgreens.txt")); - storage_simply_remove(storage, EXT_PATH("subghz/unirf/Gas_Sign_Edit.txt")); - storage_simply_remove(storage, EXT_PATH("subghz/unirf/Ridin_Dirty.txt")); - storage_simply_remove(storage, EXT_PATH("subghz/unirf/Tesla_Handicap.txt")); - storage_common_migrate(storage, EXT_PATH("subghz/unirf"), SUBREMOTEMAP_FOLDER); - if(!storage_simply_mkdir(storage, SUBREMOTEMAP_FOLDER)) { FURI_LOG_E(TAG, "Could not create folder %s", SUBREMOTEMAP_FOLDER); } From 4a6fb14d7f0eee8cd1b9bbc04b9b298c5911c246 Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Fri, 10 Mar 2023 09:35:32 +0000 Subject: [PATCH 6/9] This can go too --- applications/main/subghz_remote/subghz_remote_app.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/applications/main/subghz_remote/subghz_remote_app.c b/applications/main/subghz_remote/subghz_remote_app.c index 0d0d8ba8e..77627f5ca 100644 --- a/applications/main/subghz_remote/subghz_remote_app.c +++ b/applications/main/subghz_remote/subghz_remote_app.c @@ -811,12 +811,6 @@ int32_t subghz_remote_app(void* p) { app->file_result = 3; - Storage* storage = furi_record_open(RECORD_STORAGE); - if(!storage_simply_mkdir(storage, SUBREMOTEMAP_FOLDER)) { - FURI_LOG_E(TAG, "Could not create folder %s", SUBREMOTEMAP_FOLDER); - } - furi_record_close(RECORD_STORAGE); - furi_string_set(app->file_path, SUBREMOTEMAP_FOLDER); DialogsApp* dialogs = furi_record_open(RECORD_DIALOGS); From bbb122746ad11ff4f438607188d97ece80f6640f Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Fri, 10 Mar 2023 09:38:27 +0000 Subject: [PATCH 7/9] BadKB connection init check already done by thread --- applications/main/bad_kb/bad_kb_app.c | 4 +--- applications/main/bad_kb/bad_kb_app_i.h | 1 - applications/main/bad_kb/bad_kb_script.c | 4 ---- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/applications/main/bad_kb/bad_kb_app.c b/applications/main/bad_kb/bad_kb_app.c index d1af93b90..18c833c7a 100644 --- a/applications/main/bad_kb/bad_kb_app.c +++ b/applications/main/bad_kb/bad_kb_app.c @@ -106,8 +106,6 @@ BadKbApp* bad_kb_app_alloc(char* arg) { view_dispatcher_set_navigation_event_callback( app->view_dispatcher, bad_kb_app_back_event_callback); - app->connection_init = false; - Bt* bt = furi_record_open(RECORD_BT); app->bt = bt; app->bt->suppress_pin_screen = true; @@ -232,8 +230,8 @@ void bad_kb_app_free(BadKbApp* app) { if(app->conn_init_thread) { furi_thread_join(app->conn_init_thread); furi_thread_free(app->conn_init_thread); + bad_kb_connection_deinit(app); } - bad_kb_connection_deinit(app); free(app); } diff --git a/applications/main/bad_kb/bad_kb_app_i.h b/applications/main/bad_kb/bad_kb_app_i.h index a55875676..8a8a166d5 100644 --- a/applications/main/bad_kb/bad_kb_app_i.h +++ b/applications/main/bad_kb/bad_kb_app_i.h @@ -72,7 +72,6 @@ struct BadKbApp { bool is_bt; - bool connection_init; FuriHalUsbInterface* usb_prev_mode; GapPairing bt_prev_mode; diff --git a/applications/main/bad_kb/bad_kb_script.c b/applications/main/bad_kb/bad_kb_script.c index b91f36b9f..f6b65247d 100644 --- a/applications/main/bad_kb/bad_kb_script.c +++ b/applications/main/bad_kb/bad_kb_script.c @@ -704,14 +704,10 @@ int32_t bad_kb_connection_init(BadKbApp* app) { furi_hal_bt_stop_advertising(); } - app->connection_init = true; - return 0; } void bad_kb_connection_deinit(BadKbApp* app) { - if(!app->connection_init) return; - furi_hal_usb_set_config(app->usb_prev_mode, NULL); // bt_hid_hold_while_keyboard_buffer_full(6, 3000); // release all keys From 74dc69cd424ede68b777073fe06af553495366e8 Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Fri, 10 Mar 2023 09:48:40 +0000 Subject: [PATCH 8/9] BadKB connection deinit before record close --- applications/main/bad_kb/bad_kb_app.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/applications/main/bad_kb/bad_kb_app.c b/applications/main/bad_kb/bad_kb_app.c index 18c833c7a..62bb2ca38 100644 --- a/applications/main/bad_kb/bad_kb_app.c +++ b/applications/main/bad_kb/bad_kb_app.c @@ -216,6 +216,12 @@ void bad_kb_app_free(BadKbApp* app) { } app->bt->suppress_pin_screen = false; + if(app->conn_init_thread) { + furi_thread_join(app->conn_init_thread); + furi_thread_free(app->conn_init_thread); + bad_kb_connection_deinit(app); + } + // Close records furi_record_close(RECORD_GUI); furi_record_close(RECORD_NOTIFICATION); @@ -227,12 +233,6 @@ void bad_kb_app_free(BadKbApp* app) { furi_string_free(app->file_path); furi_string_free(app->keyboard_layout); - if(app->conn_init_thread) { - furi_thread_join(app->conn_init_thread); - furi_thread_free(app->conn_init_thread); - bad_kb_connection_deinit(app); - } - free(app); } From 657f1258f718d861bf776cfeaec4af6b670e9a87 Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Fri, 10 Mar 2023 10:01:13 +0000 Subject: [PATCH 9/9] Fix BadKB MPU stack overflow in conn thread (#162) --- applications/main/bad_kb/bad_kb_app.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/main/bad_kb/bad_kb_app.c b/applications/main/bad_kb/bad_kb_app.c index 62bb2ca38..5c095c2f0 100644 --- a/applications/main/bad_kb/bad_kb_app.c +++ b/applications/main/bad_kb/bad_kb_app.c @@ -156,7 +156,7 @@ BadKbApp* bad_kb_app_alloc(char* arg) { scene_manager_next_scene(app->scene_manager, BadKbSceneError); } else { app->conn_init_thread = furi_thread_alloc_ex( - "BadKbConnInit", 512, (FuriThreadCallback)bad_kb_connection_init, app); + "BadKbConnInit", 1024, (FuriThreadCallback)bad_kb_connection_init, app); furi_thread_start(app->conn_init_thread); if(!furi_string_empty(app->file_path)) { app->bad_kb_script = bad_kb_script_open(app->file_path, app->is_bt ? app->bt : NULL);