Merge remote-tracking branch 'mntm/dev' into dl-more-flash

Next-Flip · Nov 4, 2024 · 515e066 · 515e066
2 parents 92d1712 + f8b280c
commit 515e066
Show file tree

Hide file tree

Showing 155 changed files with 5,948 additions and 963 deletions.
diff --git a/.github/workflow_data/devbuild.py b/.github/workflow_data/devbuild.py
@@ -4,8 +4,9 @@
 import json
 import os
 
-artifact_tgz = f"{os.environ['INDEXER_URL']}/firmware/dev/{os.environ['ARTIFACT_TAG']}.tgz"
-artifact_sdk = f"{os.environ['INDEXER_URL']}/firmware/dev/{os.environ['ARTIFACT_TAG'].replace('update', 'sdk')}.zip"
+base_url = f"{os.environ['INDEXER_URL']}/builds/firmware/dev"
+artifact_tgz = f"{base_url}/{os.environ['ARTIFACT_TAG']}.tgz"
+artifact_sdk = f"{base_url}/{os.environ['ARTIFACT_TAG'].replace('update', 'sdk')}.zip"
 artifact_lab = f"https://lab.flipper.net/?url={artifact_tgz}&channel=dev-cfw&version={os.environ['VERSION_TAG']}"
 
 
@@ -41,28 +42,34 @@
                     "fields": [
                         {
                             "name": "Code Diff:",
-                            "value": "\n".join([
-                                f"[From last release ({release} to {after[:8]})]({compare}/{release}...{after})",
-                                f"[From last build ({before[:8]} to {after[:8]})]({compare}/{before}...{after})",
-                            ])
+                            "value": "\n".join(
+                                [
+                                    f"[From last release ({release} to {after[:8]})]({compare}/{release}...{after})",
+                                    f"[From last build ({before[:8]} to {after[:8]})]({compare}/{before}...{after})",
+                                ]
+                            ),
                         },
                         {
                             "name": "Changelog:",
-                            "value": "\n".join([
-                                f"[Since last release ({release})]({event['repository']['html_url']}/blob/{after}/CHANGELOG.md)",
-                            ])
+                            "value": "\n".join(
+                                [
+                                    f"[Since last release ({release})]({event['repository']['html_url']}/blob/{after}/CHANGELOG.md)",
+                                ]
+                            ),
                         },
                         {
                             "name": "Firmware Artifacts:",
-                            "value": "\n".join([
-                                f"- [🖥️ Install with Web Updater](https://momentum-fw.dev/update)",
-                                f"- [☁️ Open in Flipper Lab/App]({artifact_lab})",
-                                f"- [🐬 Download Firmware TGZ]({artifact_tgz})",
-                                f"- [🛠️ SDK (for development)]({artifact_sdk})",
-                            ])
-                        }
+                            "value": "\n".join(
+                                [
+                                    f"- [🖥️ Install with Web Updater](https://momentum-fw.dev/update)",
+                                    f"- [☁️ Open in Flipper Lab/App]({artifact_lab})",
+                                    f"- [🐬 Download Firmware TGZ]({artifact_tgz})",
+                                    f"- [🛠️ SDK (for development)]({artifact_sdk})",
+                                ]
+                            ),
+                        },
                     ],
-                    "timestamp": dt.datetime.utcnow().isoformat()
+                    "timestamp": dt.datetime.utcnow().isoformat(),
                 }
             ],
         },

diff --git a/.github/workflow_data/release.md b/.github/workflow_data/release.md
@@ -1,7 +1,7 @@
 ## ⬇️ Download
 >### [🖥️ Web Updater (chrome)](https://momentum-fw.dev/update) [recommended]
 
->### [☁️ Flipper Lab/App (chrome/mobile)](https://lab.flipper.net/?url=https://up.momentum-fw.dev/firmware/{VERSION_TAG}/flipper-z-f7-update-{VERSION_TAG}.tgz&channel=release-cfw&version={VERSION_TAG})
+>### [☁️ Flipper Lab/App (chrome/mobile)](https://lab.flipper.net/?url=https://up.momentum-fw.dev/builds/firmware/{VERSION_TAG}/flipper-z-f7-update-{VERSION_TAG}.tgz&channel=release-cfw&version={VERSION_TAG})
 
 >### [🐬 qFlipper Package (.tgz)](https://github.com/Next-Flip/Momentum-Firmware/releases/download/{VERSION_TAG}/flipper-z-f7-update-{VERSION_TAG}.tgz)
 

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -153,8 +153,8 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
             **Compiled ${{ matrix.target }} firmware for commit `${{steps.names.outputs.commit_sha}}`:**
-            - [☁️ Flipper Lab/App](https://lab.flipper.net/?url=${{secrets.INDEXER_URL}}/firmware/${{steps.names.outputs.branch_name}}/flipper-z-${{steps.names.outputs.default_target}}-update-${{steps.names.outputs.suffix}}.tgz&channel=mntm-${{steps.names.outputs.branch_name}}&version=${{steps.names.outputs.commit_sha}})
-            - [📦 qFlipper Package](${{secrets.INDEXER_URL}}/firmware/${{steps.names.outputs.branch_name}}/flipper-z-${{steps.names.outputs.default_target}}-update-${{steps.names.outputs.suffix}}.tgz)
+            - [☁️ Flipper Lab/App](https://lab.flipper.net/?url=${{secrets.INDEXER_URL}}/builds/firmware/${{steps.names.outputs.branch_name}}/flipper-z-${{steps.names.outputs.default_target}}-update-${{steps.names.outputs.suffix}}.tgz&channel=mntm-${{steps.names.outputs.branch_name}}&version=${{steps.names.outputs.commit_sha}})
+            - [📦 qFlipper Package](${{secrets.INDEXER_URL}}/builds/firmware/${{steps.names.outputs.branch_name}}/flipper-z-${{steps.names.outputs.default_target}}-update-${{steps.names.outputs.suffix}}.tgz)
           edit-mode: replace
 
       - name: Send devbuild webhook

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,9 +25,9 @@ jobs:
       - name: "Download release assets from tag build"
         run: |
           set -e
-          wget "${{ secrets.INDEXER_URL }}"/firmware/${{ github.event.release.tag_name }}/flipper-z-f7-update-${{ github.event.release.tag_name }}.tgz
-          wget "${{ secrets.INDEXER_URL }}"/firmware/${{ github.event.release.tag_name }}/flipper-z-f7-update-${{ github.event.release.tag_name }}.zip
-          wget "${{ secrets.INDEXER_URL }}"/firmware/${{ github.event.release.tag_name }}/flipper-z-f7-sdk-${{ github.event.release.tag_name }}.zip
+          wget "${{ secrets.INDEXER_URL }}"/builds/firmware/${{ github.event.release.tag_name }}/flipper-z-f7-update-${{ github.event.release.tag_name }}.tgz
+          wget "${{ secrets.INDEXER_URL }}"/builds/firmware/${{ github.event.release.tag_name }}/flipper-z-f7-update-${{ github.event.release.tag_name }}.zip
+          wget "${{ secrets.INDEXER_URL }}"/builds/firmware/${{ github.event.release.tag_name }}/flipper-z-f7-sdk-${{ github.event.release.tag_name }}.zip
 
       - name: "Update release with assets and notes"
         uses: "softprops/action-gh-release@v1"

diff --git a/.gitignore b/.gitignore
@@ -65,3 +65,6 @@ PVS-Studio.log
 .gdbinit
 
 /fbt_options_local.py
+
+# JS packages
+node_modules/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -46,7 +46,7 @@
       - `to_upper_case()` and `to_lower_case()` renamed and moved to string class as `s.toUpperCase()` and `s.toLowerCase()`
       - effort required to update old scripts using these: minimal
   - Added type definitions (typescript files for type checking in IDE, Flipper does not run typescript)
-  - Documentation is incomplete and deprecated, from now on you should refer to type definitions (`applications/system/js_app/types`), those will always be correct
+  - Documentation is incomplete and deprecated, from now on you should refer to type definitions (`applications/system/js_app/packages/fz-sdk`), those will always be correct
   - Type definitions for extra modules we have that OFW doesn't will come later
 - GUI: Refactored TextInput illegal symbols (by @Willy-JL)
   - If your app used `text_input_add_illegal_symbols(text_input)` it should change to `text_input_show_illegal_symbols(text_input, true)`
@@ -64,7 +64,7 @@
   - UL: Add GangQi protocol (static 34 bit) with button parsing and add manually (by @xMasterX & @Skorpionm)
   - UL: Add Hollarm protocol (static 42 bit) with button parsing and add manually (by @xMasterX & @Skorpionm)
   - UL: Add Hay21 protocol (dynamic 21 bit) with button parsing (by @xMasterX)
-  - UL: Add Keeloq Monarch full support, with add manually (by @ashphx)
+  - UL: Add Keeloq Monarch full support, with add manually (by @ashphx & @xMasterX)
   - UL: Princeton custom buttons support (by @xMasterX)
 - NFC:
   - OFW: MIFARE Classic Key Recovery Improvements (PR 3822 by @noproto)
@@ -82,7 +82,11 @@
 - JS:
   - New `i2c` module (#259 by @jamisonderek)
   - New `spi` module (#272 by @jamisonderek)
+  - OFW: Full-fledged JS SDK + npm packages (by @portasynthinca3)
+    - CFWs can have their own JS SDKs too! Check ours out at [`@next-flip/fz-sdk-mntm`](https://www.npmjs.com/package/@next-flip/fz-sdk-mntm)
+  - Added typedocs for all extra JS modules in Momentum (by @Willy-JL)
 - RPC: Added ASCII event support (#284 by @Willy-JL)
+- OFW: Settings: Clock editing & Alarm function (目覚め時計) (by @skotopes)
 - BadKB:
   - OFW: Add linux/gnome badusb demo files (by @thomasnemer)
   - Add older qFlipper install demos for windows and macos (by @DXVVAY & @grugnoymeme)
@@ -95,7 +99,10 @@
   - OFW: Extended icon draw function in Canvas (by @RebornedBrain)
 - OFW: RPC: Support 5V on GPIO control for ext. modules (by @gsurkov)
 - OFW: Toolbox: Proper integer parsing library `strint` (by @portasynthinca3)
-- OFW: Furi: Put errno into TCB (by @portasynthinca3)
+- Furi:
+  - OFW: Add FuriEventLoop support for FuriEventFlag, simplify API (by @Skorpionm)
+  - OFW: Put errno into TCB, better integration with libc (by @portasynthinca3)
+  - OFW: FuriHalRtc Alarm support (目覚め時計) (by @skotopes)
 
 ### Updated:
 - Apps:
@@ -111,7 +118,9 @@
   - 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)
   - Solitaire: App rewrite, Added quick solve, New effects and sounds, Removed hacky canvas manipulation (by @doofy-dev)
+  - Flappy Bird: Yappy Bird mode, highscore system (by @jaylikesbunda & @the1anonlypr3)
   - CLI-GUI Bridge: Add more symbols to keyboard (#222 by @Willy-JL)
+  - NRF24 Batch: Add Aeropac SN board txt file (by @vad7)
   - UL: Sub-GHz Bruteforcer: Add new protocols for existing dump option (by @xMasterX), use FW functions for top buttons (by @DerSkythe)
   - UL: NRF24 Apps: Use string library compatible with OFW SDK (by @xMasterX)
   - UL: W5500 Ethernet: Various fixes and improvements (by @xMasterX)
@@ -132,6 +141,7 @@
   - OFW: Moscow social card parser (by @assasinfil)
   - OFW: Fixes and improvements to iso14443_4a listener and poller (by @RebornedBrain)
   - OFW: Update BART station codes in Clipper plugin (by @ted-logan)
+  - OFW: Add Caltrain zones for Clipper parser (by @tomholford)
 - Sub-GHz:
   - UL: Frequency analyzer fixes and improvements (by @xMasterX):
     - Enforce int module (like in OFW) usage due to lack of required hardware on external boards (PathIsolate (+rf switch for multiple paths)) and incorrect usage and/or understanding the purpose of frequency analyzer app by users, it should be used only to get frequency of the remote placed around 1-10cm around flipper's left corner
@@ -162,6 +172,7 @@
   - OFW: Update and cleanup (by @rnadyrshin)
   - OFW: Improve bit_buffer.h docs (by @Astrrra)
   - OFW: Wi-Fi Devboard documentation rework (by @rnadyrshin)
+  - OFW: Update unit tests docs (by @portasynthinca3)
 
 ### Fixed:
 - RFID:
@@ -173,6 +184,7 @@
 - Sub-GHz:
   - Fix GPS "Latitute" typo, switch to "Lat" and "Lon" in .sub files (#246 by @m7i-org)
   - UL: Fix zero issues in Princeton (by @xMasterX)
+  - UL: Code cleanup and fix for rare dupicated "Data" field cases (by @xMasterX)
 - Power: Suppress Shutdown on Idle While Charging / Plugged In (#244 by @luu176)
 - Storage:
   - Fallback SD format prompt when storage settings is unavailable (by @Willy-JL)
@@ -181,10 +193,10 @@
 - RPC: Fixed apps not updating and staying at 100% (by @Willy-JL)
 - OFW: Loader: Warn about missing SD card for main apps (by @Willy-JL)
 - NFC:
-  - UL: Read Ultralight block by block (by @mishamyte)
   - OFW: Fix crash on Ultralight unlock (by @Astrrra)
   - OFW: FeliCa anti-collision fix (by @RebornedBrain)
   - OFW: Emulation freeze fixed when pressing OK repeatedly (by @RebornedBrain)
+  - OFW: Fixed bug with reading pwd locked MFULs (by @mishamyte)
 - OFW: RPC: Broken file interaction fixes (by @RebornedBrain)
 - OFW: GPIO: Fix USB-UART bridge exit screen stopping the bridge prematurely (by @portasynthinca3)
 - OFW: GUI: Fix dialog_ex NULL ptr crash (by @Willy-JL)

diff --git a/applications/debug/event_loop_blink_test/event_loop_blink_test.c b/applications/debug/event_loop_blink_test/event_loop_blink_test.c
@@ -82,7 +82,7 @@ static void view_port_input_callback(InputEvent* input_event, void* context) {
     furi_message_queue_put(app->input_queue, input_event, 0);
 }
 
-static bool input_queue_callback(FuriEventLoopObject* object, void* context) {
+static void input_queue_callback(FuriEventLoopObject* object, void* context) {
     FuriMessageQueue* queue = object;
     EventLoopBlinkTestApp* app = context;
 
@@ -107,8 +107,6 @@ static bool input_queue_callback(FuriEventLoopObject* object, void* context) {
             furi_event_loop_stop(app->event_loop);
         }
     }
-
-    return true;
 }
 
 static void blink_timer_callback(void* context) {

diff --git a/applications/debug/unit_tests/resources/unit_tests/js/basic.js b/applications/debug/unit_tests/resources/unit_tests/js/basic.js
@@ -1,4 +1,15 @@
 let tests = require("tests");
+let flipper = require("flipper");
 
 tests.assert_eq(1337, 1337);
 tests.assert_eq("hello", "hello");
+
+tests.assert_eq("compatible", sdkCompatibilityStatus(0, 1));
+tests.assert_eq("firmwareTooOld", sdkCompatibilityStatus(100500, 0));
+tests.assert_eq("firmwareTooNew", sdkCompatibilityStatus(-100500, 0));
+tests.assert_eq(true, doesSdkSupport(["baseline"]));
+tests.assert_eq(false, doesSdkSupport(["abobus", "other-nonexistent-feature"]));
+
+tests.assert_eq("momentum", flipper.firmwareVendor);
+tests.assert_eq(0, flipper.jsSdkVersion[0]);
+tests.assert_eq(1, flipper.jsSdkVersion[1]);