From f19d426d1db5db89a9998fce62d8d348c20163c0 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Mon, 11 Nov 2024 01:20:59 +0000 Subject: [PATCH 1/7] Fix missing comma --- lib/toolbox/name_generator.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/lib/toolbox/name_generator.c b/lib/toolbox/name_generator.c index ea6213d98..1700006e7 100644 --- a/lib/toolbox/name_generator.c +++ b/lib/toolbox/name_generator.c @@ -15,25 +15,9 @@ const char* const name_generator_left[] = { }; const char* const name_generator_right[] = { - "bidet", - "sus", - "fed", - "moroder", - "bobr", - "chomik", - "sidorovich", - "stalker", - "yapper", - "bnuuy", - "jezyk", - "juzyk", - "cult", - "pp", - "zalaz", - "breeky", - "bunker" - "pingwin", - "kot", + "bidet", "sus", "fed", "moroder", "bobr", "chomik", "sidorovich", + "stalker", "yapper", "bnuuy", "jezyk", "juzyk", "cult", "pp", + "zalaz", "breeky", "bunker", "pingwin", "kot", }; void name_generator_make_auto_datetime( From 3d74f4e1dc2a4d28568179a01f0c1a34b9141830 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Mon, 11 Nov 2024 14:22:55 +0300 Subject: [PATCH 2/7] Loader: Fix BusFault in handling of OOM ofw PR 3992 by Willy-JL --- lib/flipper_application/elf/elf_file.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/flipper_application/elf/elf_file.c b/lib/flipper_application/elf/elf_file.c index d0c4f52fb..2a9307cac 100644 --- a/lib/flipper_application/elf/elf_file.c +++ b/lib/flipper_application/elf/elf_file.c @@ -8,11 +8,11 @@ #define TAG "Elf" -#define ELF_NAME_BUFFER_LEN 32 -#define SECTION_OFFSET(e, n) ((e)->section_table + (n) * sizeof(Elf32_Shdr)) -#define IS_FLAGS_SET(v, m) (((v) & (m)) == (m)) +#define ELF_NAME_BUFFER_LEN 32 +#define SECTION_OFFSET(e, n) ((e)->section_table + (n) * sizeof(Elf32_Shdr)) +#define IS_FLAGS_SET(v, m) (((v) & (m)) == (m)) #define RESOLVER_THREAD_YIELD_STEP 30 -#define FAST_RELOCATION_VERSION 1 +#define FAST_RELOCATION_VERSION 1 // #define ELF_DEBUG_LOG 1 @@ -834,7 +834,9 @@ void elf_file_free(ELFFile* elf) { aligned_free(itref->value.data); } if(itref->value.fast_rel) { - aligned_free(itref->value.fast_rel->data); + if(itref->value.fast_rel->data) { + aligned_free(itref->value.fast_rel->data); + } free(itref->value.fast_rel); } free((void*)itref->key); From bc4881aa123053d669431c2e5dec41393b591d6c Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:52:41 +0300 Subject: [PATCH 3/7] fix discord changelog posting [ci skip] --- .drone.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index d14ebd517..46ec80cad 100644 --- a/.drone.yml +++ b/.drone.yml @@ -245,9 +245,11 @@ steps: - wget "https://raw.githubusercontent.com/fieu/discord.sh/2253303efc0e7211ac2777d2535054cbb872f1e0/discord.sh" - chmod +x ./discord.sh - sed -n '/## Main changes/,/## Other changes/p' CHANGELOG.md | sed -e 's/## Main changes//' -e 's/## Other changes//' > changelogcut.txt - - truncate -s -1 changelogcut.txt - - tail -c +2 changelogcut.txt > changelogready.txt + - head -c 1544 changelogcut.txt > changelogcutfin.txt + - truncate -s -1 changelogcutfin.txt + - tail -c +2 changelogcutfin.txt > changelogready.txt - rm -f changelogcut.txt + - rm -f changelogcutfin.txt - echo '' >> changelogready.txt - echo '## [Read full changelog](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/'${DRONE_TAG}')' >> changelogready.txt - sed -i 's/(releasever)/'${DRONE_TAG}'/g' .ci_files/release_msg_discord.txt @@ -529,14 +531,20 @@ steps: commands: - wget "https://raw.githubusercontent.com/fieu/discord.sh/2253303efc0e7211ac2777d2535054cbb872f1e0/discord.sh" - chmod +x ./discord.sh - - sed -n '/## Main changes/,/

/p' CHANGELOG.md | sed -e 's/

//' > changelogcut.txt - - truncate -s -1 changelogcut.txt + - sed -n '/## Main changes/,/## Other changes/p' CHANGELOG.md | sed -e 's/## Main changes//' -e 's/## Other changes//' > changelogcut.txt + - head -c 1544 changelogcut.txt > changelogcutfin.txt + - truncate -s -1 changelogcutfin.txt + - tail -c +2 changelogcutfin.txt > changelogready.txt + - rm -f changelogcut.txt + - rm -f changelogcutfin.txt + - echo '' >> changelogready.txt + - echo '## [Read full changelog](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/'${DRONE_TAG}')' >> changelogready.txt - sed -i 's/(buildnum)/'${DRONE_BUILD_NUMBER}'/g' .ci_files/devbuild_msg_discord.txt - sed -i 's/(commitsha)/'${DRONE_COMMIT_SHA}'/g' .ci_files/devbuild_msg_discord.txt - sed -i 's/(buildnum)/'${DRONE_BUILD_NUMBER}'/g' .ci_files/devbuild_msg_telegram.txt - sed -i 's/(commitsha)/'${DRONE_COMMIT_SHA}'/g' .ci_files/devbuild_msg_telegram.txt - cp .ci_files/devbuild_msg_telegram.txt tg_dev_message.tpl - - ./discord.sh --title "Changelog" --description "$(jq -Rs . Date: Mon, 11 Nov 2024 16:58:34 +0300 Subject: [PATCH 4/7] upd changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccc30823d..d263bb8ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ## Main changes +- Current API: 78.1 - SubGHz: - Frequency analyzer fixes and improvements: - **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 @@ -35,6 +36,7 @@ * SubGHz: Freq analyzer - Fix duplicated frequency lists and use user config for nearest frequency selector too * SubGHz: Code cleanup and fix for rare dupicated (Data) field cases * OFW: NFC TRT Parser: Additional checks to prevent false positives +* OFW PR 3992: Loader: Fix BusFault in handling of OOM (by @Willy-JL) * OFW PR 3885: NFC: Add API to enforce ISO15693 mode (by @aaronjamt) * OFW: NFC: iso14443_4a improvements (by @RebornedBrain) * OFW: NFC: Plantain parser improvements (by @assasinfil) & fixes (by @mxcdoam) @@ -69,6 +71,7 @@ * OFW: Put errno into TCB * OFW: Fix USB-UART bridge exit screen stopping the bridge prematurely **More details on JS changes** (js changelog written by @Willy-JL , thanks!): +- Our custom JS SDK can be found on npm now: https://www.npmjs.com/org/darkflippers - Non-exhaustive list of changes to help you fix your scripts: - `badusb`: - `setup()`: `mfr_name`, `prod_name`, `layout_path` parameters renamed to `mfrName`, `prodName`, `layoutPath` From 7ef1a705be6c5decb6c327888d68069bc3919bf1 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Mon, 11 Nov 2024 19:49:20 +0300 Subject: [PATCH 5/7] fix ci --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 46ec80cad..0c6ef0975 100644 --- a/.drone.yml +++ b/.drone.yml @@ -114,7 +114,7 @@ steps: from_secret: fbt_link - name: "Bundle self-update packages" - image: kramos/alpine-zip + image: joshkeegan/zip commands: - cp artifacts-extra-apps/flipper-z-f7-update-${DRONE_TAG}e.tgz . - cp artifacts-rgb-patch/flipper-z-f7-update-${DRONE_TAG}r.tgz . @@ -419,7 +419,7 @@ steps: from_secret: fbt_link - name: "Bundle self-update packages" - image: kramos/alpine-zip + image: joshkeegan/zip commands: - cp artifacts-extra-apps/flipper-z-f7-update-${DRONE_BUILD_NUMBER}e.tgz . - cp artifacts-rgb-patch/flipper-z-f7-update-${DRONE_BUILD_NUMBER}r.tgz . From 6370e814d4a84ab3b938c8bfa3e0fe127acd1fdb Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Mon, 11 Nov 2024 18:21:20 +0000 Subject: [PATCH 6/7] Update apps - All Flip* apps updated (by jblanked), change to use chosen GPIO Pins setting (by Willy-JL) - ESP Flasher: Update FlipperHTTP, reorder quick flash options (by Willy-JL) - UL: RFID/iButton Fuzzer: Add protocols Electra, Idteck, Gallagher, Nexwatch, refactor to make RFID protocols easier to add (by SkeletonMan03), add more Dallas 1990 IDs (by eblis) --- CHANGELOG.md | 1 + applications/external | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 652d3a84d..62c00706b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -141,6 +141,7 @@ - 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: RFID/iButton Fuzzer: Add protocols Electra, Idteck, Gallagher, Nexwatch, refactor to make RFID protocols easier to add (by @SkeletonMan03), add more Dallas 1990 IDs (by @eblis) - UL: NRF24 Apps: Use string library compatible with OFW SDK (by @xMasterX) - UL: W5500 Ethernet: Various fixes and improvements (by @xMasterX) - OFW: SPI Mem Manager: Fixed UI rendering bug related to line breaks (by @portasynthinca3) diff --git a/applications/external b/applications/external index 1b8f9fcf6..861fe3351 160000 --- a/applications/external +++ b/applications/external @@ -1 +1 @@ -Subproject commit 1b8f9fcf6cd977dff6bc8192588e37c172bf07b4 +Subproject commit 861fe3351399f62a705bf3ebea3ca291b4319670 From c06c7c98c1aa648eb648523277d0013e348345d4 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Mon, 11 Nov 2024 22:47:59 +0000 Subject: [PATCH 7/7] Update changelog --nobuild --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62c00706b..b3f4dbaab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ - Reworks how communication with battery guage is done, improves reliability and fixes issues with battery percentage not showing - After installing firmware with this change, downgrading to old firmware will cause battery percentage to be blank - If you must downgrade firmware, use the [Guage Tool app](https://github.com/skotopes/flipperzero_gauge_tool) to unseal the guage +- OFW: Furi: RTC Alarm support (目覚め時計) (by @skotopes) + - Reworks RTC initialization to support Alarms functionality + - Older firmware will be unable to handle alarm, downgrading might be problematic + - If you must downgrade firmware, disable Alarm in Settings > Clock & Alarm first - OFW: JS: Modules backport & overhaul (by @portasynthinca3), backport of backport (by @Willy-JL & @xMasterX) - OFW backported some modules we had, added lots of new stuff, and overhauled many other things - Non-exhaustive list of changes to help you fix your scripts: @@ -47,7 +51,6 @@ - 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/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)` @@ -121,7 +124,6 @@ - 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: