From c741727b96cfecb067a82313586b8065077e37d8 Mon Sep 17 00:00:00 2001 From: Anna Antonenko Date: Tue, 5 Nov 2024 13:53:24 +0300 Subject: [PATCH 1/9] I am own the JS (#3982) * fix: js app template * i am own the js * farewell --- .github/CODEOWNERS | 10 +++++----- .../system/js_app/packages/create-fz-app/package.json | 2 +- .../packages/create-fz-app/template/tsconfig.json | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index aab3ff3531..dcf964addc 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -36,7 +36,7 @@ /applications/services/power_settings_app/ @skotopes @DrZlo13 @hedger @gsurkov @gornekich /applications/system/storage_move_to_sd/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov -/applications/system/js_app/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov +/applications/system/js_app/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov @portasynthinca3 /applications/debug/unit_tests/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov @gornekich @Astrrra @Skorpionm @@ -49,8 +49,8 @@ /applications/main/infrared/resources/ @skotopes @DrZlo13 @hedger @gsurkov # Documentation -/documentation/ @skotopes @DrZlo13 @hedger @gsurkov @drunkbatya -/scripts/toolchain/ @skotopes @DrZlo13 @hedger @gsurkov @drunkbatya +/documentation/ @skotopes @DrZlo13 @hedger @gsurkov +/scripts/toolchain/ @skotopes @DrZlo13 @hedger @gsurkov # Lib /lib/stm32wb_copro/ @skotopes @DrZlo13 @hedger @gsurkov @gornekich @@ -59,11 +59,11 @@ /lib/lfrfid/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov /lib/libusb_stm32/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov /lib/mbedtls/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov -/lib/mjs/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov +/lib/mjs/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov @portasynthinca3 /lib/nanopb/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov /lib/nfc/ @skotopes @DrZlo13 @hedger @gsurkov @gornekich @Astrrra /lib/one_wire/ @skotopes @DrZlo13 @hedger @gsurkov /lib/subghz/ @skotopes @DrZlo13 @hedger @gsurkov @Skorpionm # CI/CD -/.github/workflows/ @skotopes @DrZlo13 @hedger @gsurkov @drunkbatya +/.github/workflows/ @skotopes @DrZlo13 @hedger @gsurkov diff --git a/applications/system/js_app/packages/create-fz-app/package.json b/applications/system/js_app/packages/create-fz-app/package.json index 2164233965..7778104e20 100644 --- a/applications/system/js_app/packages/create-fz-app/package.json +++ b/applications/system/js_app/packages/create-fz-app/package.json @@ -1,6 +1,6 @@ { "name": "@flipperdevices/create-fz-app", - "version": "0.1.0", + "version": "0.1.1", "description": "Template package for JS apps Flipper Zero", "bin": "index.js", "type": "module", diff --git a/applications/system/js_app/packages/create-fz-app/template/tsconfig.json b/applications/system/js_app/packages/create-fz-app/template/tsconfig.json index c7b83cd5d3..1e6fc60180 100644 --- a/applications/system/js_app/packages/create-fz-app/template/tsconfig.json +++ b/applications/system/js_app/packages/create-fz-app/template/tsconfig.json @@ -5,13 +5,14 @@ "module": "CommonJS", "noLib": true, "target": "ES2015", + "types": [], }, "files": [ "./node_modules/@flipperdevices/fz-sdk/global.d.ts", ], "include": [ "./**/*.ts", - "./**/*.js" + "./**/*.js", ], "exclude": [ "./node_modules/**/*", From b86b9b87b8d5977bfd25c7ac344c4db9d63fb53f Mon Sep 17 00:00:00 2001 From: WillyJL <49810075+Willy-JL@users.noreply.github.com> Date: Tue, 5 Nov 2024 11:41:03 +0000 Subject: [PATCH 2/9] JS: Add die() typedoc (#3985) * JS: Add die() to typedocs * JS: Never type for die() --------- Co-authored-by: Anna Antonenko --- applications/system/js_app/packages/fz-sdk/global.d.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/applications/system/js_app/packages/fz-sdk/global.d.ts b/applications/system/js_app/packages/fz-sdk/global.d.ts index d2e73f7de5..ba6996f271 100644 --- a/applications/system/js_app/packages/fz-sdk/global.d.ts +++ b/applications/system/js_app/packages/fz-sdk/global.d.ts @@ -202,6 +202,13 @@ declare function chr(n: number): string | null; */ declare function require(module: string): any; +/** + * @brief Exit JavaScript with given message + * @param message The error message to show to user + * @version Added in JS SDK 0.1 + */ +declare function die(message: string): never; + /** * @brief mJS Foreign Pointer type * From 51aafd1b5ea1023616c88d2294ab411679ad8915 Mon Sep 17 00:00:00 2001 From: Anna Antonenko Date: Tue, 5 Nov 2024 14:58:19 +0300 Subject: [PATCH 3/9] fix: bump fz-sdk to 0.1.2 (#3989) --- applications/system/js_app/packages/fz-sdk/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/system/js_app/packages/fz-sdk/package.json b/applications/system/js_app/packages/fz-sdk/package.json index 4d18f3f201..3c2954c9c4 100644 --- a/applications/system/js_app/packages/fz-sdk/package.json +++ b/applications/system/js_app/packages/fz-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@flipperdevices/fz-sdk", - "version": "0.1.1", + "version": "0.1.2", "description": "Type declarations and documentation for native JS modules available on Flipper Zero", "keywords": [ "flipper", From 0923071b955ab0ca788c905e37a3fcf8ef5b3ada Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Tue, 5 Nov 2024 23:23:15 +0000 Subject: [PATCH 4/9] IR: Fix openned typo in error message --- applications/main/infrared/infrared_app.c | 2 +- applications/main/infrared/scenes/infrared_scene_remote_list.c | 2 +- .../main/infrared/scenes/infrared_scene_universal_from_file.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/applications/main/infrared/infrared_app.c b/applications/main/infrared/infrared_app.c index 674f0cc679..e42446a42a 100644 --- a/applications/main/infrared/infrared_app.c +++ b/applications/main/infrared/infrared_app.c @@ -566,7 +566,7 @@ int32_t infrared_app(void* p) { is_remote_loaded = false; bool wrong_file_type = INFRARED_ERROR_CHECK(error, InfraredErrorCodeWrongFileType); const char* format = wrong_file_type ? - "Library file\n\"%s\" can't be openned as a remote" : + "Library file\n\"%s\" can't be opened as a remote" : "Failed to load\n\"%s\""; infrared_show_error_message(infrared, format, file_path); diff --git a/applications/main/infrared/scenes/infrared_scene_remote_list.c b/applications/main/infrared/scenes/infrared_scene_remote_list.c index 93665769cf..c7593cc5e6 100644 --- a/applications/main/infrared/scenes/infrared_scene_remote_list.c +++ b/applications/main/infrared/scenes/infrared_scene_remote_list.c @@ -46,7 +46,7 @@ bool infrared_scene_remote_list_on_event(void* context, SceneManagerEvent event) bool wrong_file_type = INFRARED_ERROR_CHECK(task_error, InfraredErrorCodeWrongFileType); const char* format = wrong_file_type ? - "Library file\n\"%s\" can't be openned as a remote" : + "Library file\n\"%s\" can't be opened as a remote" : "Failed to load\n\"%s\""; infrared_show_error_message( diff --git a/applications/main/infrared/scenes/infrared_scene_universal_from_file.c b/applications/main/infrared/scenes/infrared_scene_universal_from_file.c index d6a7190414..10a1e11d6c 100644 --- a/applications/main/infrared/scenes/infrared_scene_universal_from_file.c +++ b/applications/main/infrared/scenes/infrared_scene_universal_from_file.c @@ -93,7 +93,7 @@ bool infrared_scene_universal_from_file_on_event(void* context, SceneManagerEven bool wrong_file_type = INFRARED_ERROR_CHECK(task_error, InfraredErrorCodeWrongFileType); const char* format = wrong_file_type ? - "Remote file\n\"%s\" can't be openned as a library" : + "Remote file\n\"%s\" can't be opened as a library" : "Failed to load\n\"%s\""; infrared_show_error_message( From 3e928fd7d28b8346e9c2f788371e04d42475fd27 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Wed, 6 Nov 2024 03:26:53 +0000 Subject: [PATCH 5/9] ESP Flasher: Spring cleaning, prep for Ghost ESP --- CHANGELOG.md | 4 +++- applications/external | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab9defb1fd..bffaded574 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -222,4 +222,6 @@ ### Removed: - Apps: - - Mifare Nested: Superseded by NFC app after OFW PR 3822 (MIFARE Classic Key Recovery Improvements) \ No newline at end of file + - Mifare Nested: Superseded by NFC app after OFW PR 3822 (MIFARE Classic Key Recovery Improvements) + - ESP Flasher: + - Removed Airtag Scanner and ESP32-S2 Wardriver due to low user interest and to make space for Ghost ESP diff --git a/applications/external b/applications/external index 68bb084ec9..1881e679de 160000 --- a/applications/external +++ b/applications/external @@ -1 +1 @@ -Subproject commit 68bb084ec9476b011465b78f27fdacd560262e2c +Subproject commit 1881e679de8486cbb29f31d7bcb5efd80dd59aa8 From ce3e95709ddfd5999f99dc1e5e79ead2e9e7d66d Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Wed, 6 Nov 2024 03:33:51 +0000 Subject: [PATCH 6/9] Update apps --nobuild - NFC Playlist: Better error handling with many new error screens (by acegoal07) --- CHANGELOG.md | 2 +- applications/external | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bffaded574..948ac3e658 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -120,7 +120,7 @@ - Picopass: File loading improvements and fixes (by @bettse), force ISO15693 1OutOf4 mode (by @aaronjamt) - Quac!: External IR board support (by @daniilty), import all IR from file, iButton support, code improvements (by @rdefeo) - DTMF Dolphin: Add EAS tone support (by @JendrBendr) - - NFC Playlist: Error screens for playlist already exists and item already in playlist, general improvements (by @acegoal07), refactor rename/new scene without thread (by @Willy-JL) + - NFC Playlist: Better error handling with many new error screens, general improvements (by @acegoal07), refactor rename/new scene without thread (by @Willy-JL) - CLI-GUI Bridge: Fixes and improvements (by @ranchordo) - Seader: Enable T=1, show error for timeout, fix wrong LRC logging, fix crash scanning NTAG215 with MFC option (by @bettse) - BLE Spam: Fix menu index callback (by @Willy-JL) diff --git a/applications/external b/applications/external index 1881e679de..0261767df7 160000 --- a/applications/external +++ b/applications/external @@ -1 +1 @@ -Subproject commit 1881e679de8486cbb29f31d7bcb5efd80dd59aa8 +Subproject commit 0261767df74166513341ff419d678508a873aac6 From ef3a668769938f563113f37c1d2396256066c0b1 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Wed, 6 Nov 2024 03:56:35 +0000 Subject: [PATCH 7/9] Tools: Add uPython (by ofabel) --- CHANGELOG.md | 1 + applications/external | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 948ac3e658..a82f1fa78c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,6 +55,7 @@ - Apps: - NFC: Cyborg Detector (by @RocketGod-git) - Sub-GHz: Radio Scanner (by @RocketGod-git) + - Tools: uPython (by @ofabel) - Games: Umpire Indicator (by @RocketGod-git) - Sub-GHz: - Show satellites count with an icon (#215 by @m7i-org) diff --git a/applications/external b/applications/external index 0261767df7..2828e57a80 160000 --- a/applications/external +++ b/applications/external @@ -1 +1 @@ -Subproject commit 0261767df74166513341ff419d678508a873aac6 +Subproject commit 2828e57a80cc2c6175ea92c3fcc99ee839d7b645 From f07cc58f80961bed52b03a833107d112f09e65fc Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Wed, 6 Nov 2024 05:38:52 +0000 Subject: [PATCH 8/9] GPIO: Add FlipperHTTP suite (by jblanked) --- CHANGELOG.md | 9 ++++++++- applications/external | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a82f1fa78c..8f35e534e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,6 +55,13 @@ - Apps: - NFC: Cyborg Detector (by @RocketGod-git) - Sub-GHz: Radio Scanner (by @RocketGod-git) + - GPIO: FlipperHTTP app suite (by @jblanked): + - FlipLibrary + - FlipSocial + - FlipStore + - FlipTrader + - FlipWeather + - FlipWiFi - Tools: uPython (by @ofabel) - Games: Umpire Indicator (by @RocketGod-git) - Sub-GHz: @@ -117,7 +124,7 @@ - MFKey: Added Static Encrypted Nested key recovery, Added NFC app support, Dropped FlipperNested support (by @noproto) - WAV Player: Better fix for unresponsiveness, handle thread exit signal (by @CookiePLMonster) - Laser Tag: External Infrared board support, crash fixes (by @RocketGod-git), RFID support for ammo reload, thread leak fix (by @jamisonderek) - - ESP Flasher: Update blackmagic bin with WiFi Logs (by @DrZlo13), support more board types (by @xMasterX) + - ESP Flasher: Add FlipperHTTP firmware (by @jblanked), update blackmagic bin with WiFi Logs (by @DrZlo13), support more board types (by @xMasterX) - Picopass: File loading improvements and fixes (by @bettse), force ISO15693 1OutOf4 mode (by @aaronjamt) - Quac!: External IR board support (by @daniilty), import all IR from file, iButton support, code improvements (by @rdefeo) - DTMF Dolphin: Add EAS tone support (by @JendrBendr) diff --git a/applications/external b/applications/external index 2828e57a80..826fdbda71 160000 --- a/applications/external +++ b/applications/external @@ -1 +1 @@ -Subproject commit 2828e57a80cc2c6175ea92c3fcc99ee839d7b645 +Subproject commit 826fdbda71fe9c0689858de07c71d99676d437c2 From 1f7543a355ea43cfb917b44d69b170871afc1b9f Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Wed, 6 Nov 2024 05:54:12 +0000 Subject: [PATCH 9/9] GPIO: Add Web Crawler too (by jblanked) --- CHANGELOG.md | 1 + applications/external | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f35e534e0..ea951e8ed6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,6 +62,7 @@ - FlipTrader - FlipWeather - FlipWiFi + - Web Crawler - Tools: uPython (by @ofabel) - Games: Umpire Indicator (by @RocketGod-git) - Sub-GHz: diff --git a/applications/external b/applications/external index 826fdbda71..9d0e50ef07 160000 --- a/applications/external +++ b/applications/external @@ -1 +1 @@ -Subproject commit 826fdbda71fe9c0689858de07c71d99676d437c2 +Subproject commit 9d0e50ef075de0c718d5be480ba68b22d49c96ad