Skip to content

Commit 53fffff

Browse files
committed
Merge remote-tracking branch 'upstream/dev' into feat/subghz-save-hopping-state
# Conflicts: # applications/main/subghz/scenes/subghz_scene_receiver.c
2 parents 7b4d66f + a90ebd7 commit 53fffff

File tree

181 files changed

+1558
-4124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

181 files changed

+1558
-4124
lines changed

.drone.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ steps:
4747
- cp -R base_pack_build/artifacts-base/* assets/resources/apps/
4848
- rm -rf base_pack_build
4949
- rm -rf all-the-apps-base.tgz
50+
- rm -f build/f7-firmware-C/toolbox/version.*
5051
- ./fbt COMPACT=1 DEBUG=0 updater_package
5152
- mkdir artifacts-default
5253
- mv dist/f7-C/* artifacts-default/
@@ -414,6 +415,7 @@ steps:
414415
- cp -R base_pack_build/artifacts-base/* assets/resources/apps/
415416
- rm -rf base_pack_build
416417
- rm -rf all-the-apps-base.tgz
418+
- rm -f build/f7-firmware-C/toolbox/version.*
417419
- ./fbt COMPACT=1 DEBUG=0 updater_package
418420
- mkdir artifacts-default
419421
- mv dist/f7-C/* artifacts-default/

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,7 @@
3838
[submodule "lib/stm32wb_copro"]
3939
path = lib/stm32wb_copro
4040
url = https://github.com/flipperdevices/stm32wb_copro.git
41+
[submodule "subghz_remote"]
42+
path = applications/main/subghz_remote
43+
url = https://github.com/DarkFlippers/SubGHz_Remote.git
44+
branch = ufw_main_app

CHANGELOG.md

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,41 @@
11
## New changes
2-
* !!! **Warning! After installing, Desktop settings (Favoutite apps, PIN Code, AutoLock time..) will be resetted to default due to settings changes, Please set your PIN code, Favourite apps again in Settings->Desktop** !!!
3-
* Desktop: **New way to set favourite apps and fully configurable dummy mode** (now you can set up to 4 favourite apps!) (port of OFW PR 2972 by nminaylov) (by @gid9798 | PR #578)
4-
* Desktop: Fix lock timer after rebooting (by @gid9798 | PR #578)
5-
* Infrared: Updated universal assets (by @amec0e | PR #581)
6-
* Core: Added proper error message on out of memory crash (by @Willy-JL)
7-
* SubGHz: Fix FAAC SLH add manually issues and fix sending signals with unknown seed
8-
* SubGHz: Temporarily reverted changes from OFW PR 2984: SubGhz: fix todo (by Skorpionm) - Fixes Enhanced Sub-GHz Chat app and various issues related to receiving signals that was found in 061 release
2+
* **Apple BLE Spam app** (by @Willy-JL | Plus research from ECTO-1A, xMasterX and techryptic) -> (app can be found in builds ` `, `e`, `n`, `r`)
3+
* SubGHz: **FAAC SLH - Programming mode** (by @xMasterX & @Eng1n33r (full research and PoC by @Skorpionm)| PR #585) -> [How to use](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
4+
* SubGHz: FAAC SLH -> Add manually new options
5+
* SubGHz: Fix 0xFFFF counter value being skipped
6+
* SubGHz: Fix path reset on save name scene exit
7+
* SubGHz: Various fixes
8+
* SubGHz Remote: Fix Sub-GHz Remote folder name (by @OperKH | PR #583)
9+
* SubGHz Remote: submodule (by @gid9798 | PR #592)
10+
* Infrared: Updated universal assets (by @amec0e | PR #594)
11+
* Infrared: Remake custom universal remotes to use new design (New icons by @Svaarich)
12+
* UI: Keyboard ok to toggle select all in cursor mode (by @Willy-JL)
13+
* CI/CD: Fixed regular builds having `c` in version name in the device info while not being actual `c` build
14+
* Docs: New FAAC SLH instructions
15+
* Docs: Readme & Changelog fixes (by @gid9798 | PR #586)
16+
* OFW: iButton: Return to the file selection if file is corrupted
17+
* OFW: Account for the "-" in line carry-over
18+
* OFW: github: workflow improvements
19+
* OFW: Storage: force mount
20+
* OFW: Add File Naming setting for more detailed naming -> **Breaking API change, API 35.x -> API 36.x** - **Update your apps!**
21+
* OFW: Disconnect from BLE on protobuf error
22+
* OFW: Add support for Mifare Classic 4k SAK 0x38 ATQA 0x02, 0x04, 0x08
23+
* OFW: Undo some TODO
24+
* OFW: Check the filetype of the update manifest
25+
* OFW: StorageListRequest: size filter
26+
* OFW: SubGhz: heap overflow text error
27+
* OFW: nfc: add rfal wrong state error handling
28+
* OFW: Rfid: fix crash on broken key launch from archive (fix was already done in UL in similar way)
29+
* OFW: AC OFF button
30+
* OFW: New IR universal remote graphics
31+
* OFW: Intelligent probing with warnings for fwflash.py
32+
* OFW: FuriHal: explicitly pull display pins at early init stage, move PUPD config to early stage
33+
* OFW: Fix display last symbol in multiline text
34+
* OFW: Properly reset the NFC device data
35+
* OFW: fbt: various improvements and bug fixes
36+
* OFW: Littlefs updated to v2.7.0
37+
* OFW: loader: restored support for debug apps
38+
* OFW: Removed explicit dependency on scons for external scripting
939

1040
----
1141

ReadMe.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@
5353
- Press OK in frequency analyzer to use detected frequency in Read modes [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77)
5454
- Long press OK button in Sub-GHz Frequency analyzer to switch to Read menu [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/79)
5555
- New option to use timestamps + protocol name when you saving file, instead of random name - Enable in `Radio Settings -> Time in names = ON`
56-
- Read mode UI improvements (scrolling text, + shows time when signal was received) (by @wosk)
56+
- Read mode UI improvements (shows time when signal was received) (by @wosk)
5757
- External CC1101 module support (Hardware SPI used)
5858
- **Hold right in received signal list to delete selected signal**
5959
- **Custom buttons for Keeloq / Alutech AT4N / Nice Flor S / Somfy Telis / Security+ 2.0 / CAME Atomo** - now you can use arrow buttons to send signal with different button code
6060
- `Add manually` menu extended with new protocols
61-
- BFT Mitto / Somfy Telis / Nice Flor S / CAME Atomo, etc.. manual creation with programming new remote into receiver (use button 0xF for BFT Mitto, 0x8 (Prog) on Somfy Telis)
61+
- FAAC SLH, BFT Mitto / Somfy Telis / Nice Flor S / CAME Atomo, etc.. manual creation with programming new remote into receiver (use button 0xF for BFT Mitto, 0x8 (Prog) on Somfy Telis)
6262
- Debug mode counter increase settings (+1 -> +5, +10, default: +1)
6363
- Debug PIN output settings for protocol development
6464

@@ -120,8 +120,8 @@ Encoders or sending made by @xMasterX:
120120
Encoders or sending made by @Eng1n33r(first implementation in Q2 2022) & @xMasterX (current version):
121121
- CAME Atomo -> Update! check out new [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
122122
- Nice Flor S -> How to create new remote - [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
123-
- FAAC SLH (Spa) [External seed calculation required (For info contact me in Discord: @mmx7)]
124-
- Keeloq: BFT Mitto -> Update! check out new [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
123+
- FAAC SLH (Spa) -> Update!!! Check out new [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
124+
- Keeloq: BFT Mitto -> Update! Check out new [instructions](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
125125
- Star Line
126126
- Security+ v1 & v2 (encoders was made in OFW)
127127

applications/debug/unit_tests/furi/furi_memmgr_test.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ void test_furi_memmgr() {
2626
mu_assert_int_eq(66, ((uint8_t*)ptr)[i]);
2727
}
2828

29-
// TODO FL-3492: fix realloc to copy only old size, and write testcase that leftover of reallocated memory is zero-initialized
3029
free(ptr);
3130

3231
// allocate and zero-initialize array (calloc)

0 commit comments

Comments
 (0)