Skip to content

Commit 5e649d8

Browse files
committed
Merge branch 'dev' into release
2 parents 0bc626b + 0b29fb4 commit 5e649d8

File tree

447 files changed

+10947
-7732
lines changed

Some content is hidden

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

447 files changed

+10947
-7732
lines changed

.ci_files/anims_ofw.txt

+7
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,13 @@ Min level: 1
9292
Max level: 3
9393
Weight: 4
9494

95+
Name: L1_My_dude_128x64
96+
Min butthurt: 0
97+
Max butthurt: 8
98+
Min level: 1
99+
Max level: 3
100+
Weight: 4
101+
95102
Name: L2_Wake_up_128x64
96103
Min butthurt: 0
97104
Max butthurt: 12

.drone.yml

+8
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ steps:
2121
commands:
2222
- export DIST_SUFFIX=${DRONE_TAG}
2323
- export WORKFLOW_BRANCH_OR_TAG=release-cfw
24+
- rm -rf assets/resources/apps/
25+
- rm -rf build/
26+
- rm -rf dist/
27+
- rm -rf .sconsign.dblite
2428
- ./fbt COMPACT=1 DEBUG=0 updater_package
2529
- mkdir artifacts-default
2630
- mv dist/f7-C/* artifacts-default/
@@ -316,6 +320,10 @@ steps:
316320
commands:
317321
- export DIST_SUFFIX=${DRONE_BUILD_NUMBER}
318322
- export WORKFLOW_BRANCH_OR_TAG=dev-cfw
323+
- rm -rf assets/resources/apps/
324+
- rm -rf build/
325+
- rm -rf dist/
326+
- rm -rf .sconsign.dblite
319327
- ./fbt COMPACT=1 DEBUG=0 updater_package
320328
- mkdir artifacts-default
321329
- mv dist/f7-C/* artifacts-default/

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,6 @@
4343
[submodule "lib/stm32wb_copro"]
4444
path = lib/stm32wb_copro
4545
url = https://github.com/flipperdevices/stm32wb_copro.git
46+
[submodule "applications/external/multi_fuzzer"]
47+
path = applications/external/multi_fuzzer
48+
url = https://github.com/DarkFlippers/Multi_Fuzzer.git

.vscode/example/tasks.json

+36-12
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,28 @@
44
"version": "2.0.0",
55
"tasks": [
66
{
7-
"label": "[Release] Build",
7+
"label": "[Release] Build Firmware",
88
"group": "build",
99
"type": "shell",
1010
"command": "./fbt COMPACT=1 DEBUG=0"
1111
},
1212
{
13-
"label": "[Debug] Build",
13+
"label": "[Debug] Build Firmware",
1414
"group": "build",
1515
"type": "shell",
16-
"command": "./fbt FIRMWARE_APP_SET=debug_pack"
16+
"command": "./fbt"
17+
},
18+
{
19+
"label": "[FBT] Format",
20+
"group": "build",
21+
"type": "shell",
22+
"command": "./fbt format"
23+
},
24+
{
25+
"label": "[FBT] Clear",
26+
"group": "build",
27+
"type": "shell",
28+
"command": "./fbt -c"
1729
},
1830
{
1931
"label": "[Release] Flash (ST-Link)",
@@ -25,7 +37,7 @@
2537
"label": "[Debug] Flash (ST-Link)",
2638
"group": "build",
2739
"type": "shell",
28-
"command": "./fbt FIRMWARE_APP_SET=debug_pack FORCE=1 flash"
40+
"command": "./fbt FORCE=1 flash"
2941
},
3042
{
3143
"label": "[Release] Flash (blackmagic)",
@@ -37,7 +49,7 @@
3749
"label": "[Debug] Flash (blackmagic)",
3850
"group": "build",
3951
"type": "shell",
40-
"command": "./fbt FIRMWARE_APP_SET=debug_pack FORCE=1 flash_blackmagic"
52+
"command": "./fbt FORCE=1 flash_blackmagic"
4153
},
4254
{
4355
"label": "[Release] Flash (JLink)",
@@ -49,7 +61,7 @@
4961
"label": "[Debug] Flash (JLink)",
5062
"group": "build",
5163
"type": "shell",
52-
"command": "./fbt FIRMWARE_APP_SET=debug_pack FORCE=1 jflash"
64+
"command": "./fbt FORCE=1 jflash"
5365
},
5466
{
5567
"label": "[Release] Build update bundle",
@@ -61,7 +73,7 @@
6173
"label": "[Debug] Build update bundle",
6274
"group": "build",
6375
"type": "shell",
64-
"command": "./fbt FIRMWARE_APP_SET=debug_pack updater_package"
76+
"command": "./fbt updater_package"
6577
},
6678
{
6779
"label": "[Release] Build updater",
@@ -73,13 +85,13 @@
7385
"label": "[Debug] Build updater",
7486
"group": "build",
7587
"type": "shell",
76-
"command": "./fbt FIRMWARE_APP_SET=debug_pack updater_all"
88+
"command": "./fbt updater_all"
7789
},
7890
{
7991
"label": "[Debug] Flash (USB, w/o resources)",
8092
"group": "build",
8193
"type": "shell",
82-
"command": "./fbt FIRMWARE_APP_SET=debug_pack FORCE=1 flash_usb"
94+
"command": "./fbt FORCE=1 flash_usb"
8395
},
8496
{
8597
"label": "[Release] Flash (USB, w/o resources)",
@@ -97,7 +109,7 @@
97109
"label": "[Debug] Flash (USB, with resources)",
98110
"group": "build",
99111
"type": "shell",
100-
"command": "./fbt FIRMWARE_APP_SET=debug_pack FORCE=1 flash_usb_full"
112+
"command": "./fbt FORCE=1 flash_usb_full"
101113
},
102114
{
103115
"label": "[Release] Flash (USB, with resources)",
@@ -123,17 +135,29 @@
123135
"type": "shell",
124136
"command": "./fbt COMPACT=1 DEBUG=0 fap_dist"
125137
},
138+
{
139+
"label": "[Debug] Build App",
140+
"group": "build",
141+
"type": "shell",
142+
"command": "./fbt build APPSRC=${relativeFileDirname}"
143+
},
144+
{
145+
"label": "[Release] Build App",
146+
"group": "build",
147+
"type": "shell",
148+
"command": "./fbt COMPACT=1 DEBUG=0 build APPSRC=${relativeFileDirname}"
149+
},
126150
{
127151
"label": "[Debug] Launch App on Flipper",
128152
"group": "build",
129153
"type": "shell",
130-
"command": "./fbt launch_app APPSRC=${relativeFileDirname}"
154+
"command": "./fbt launch APPSRC=${relativeFileDirname}"
131155
},
132156
{
133157
"label": "[Release] Launch App on Flipper",
134158
"group": "build",
135159
"type": "shell",
136-
"command": "./fbt COMPACT=1 DEBUG=0 launch_app APPSRC=${relativeFileDirname}"
160+
"command": "./fbt COMPACT=1 DEBUG=0 launch APPSRC=${relativeFileDirname}"
137161
},
138162
{
139163
"label": "[Debug] Launch App on Flipper with Serial Console",

CHANGELOG.md

+37-38
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,44 @@
11
## New changes
22
* !!! **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-
* If you have copied any apps manually into `apps` folder - remove `apps` folder or that specific apps you copied on your microSD before installing this release to avoid issues due to OFW API version update! If you using regular builds or extra pack builds (e) without your manually added apps, all included apps will be installed automatically, no extra actions needed!
3+
* This next text applies to you only **If you have copied any apps manually** into `apps` folder and don't know that you need to update those apps manually in same way you added them - remove `apps` folder or that specific apps you copied on your microSD before installing this release to avoid issues due to OFW API version update! **If you using regular builds or extra pack builds (e) without your manually added apps, all included apps will be installed automatically, no extra actions needed!**
44
-----
5-
* SubGHz: **Keeloq: Centurion Nova read and emulate support (+ add manually)**
6-
* SubGHz: FAAC SLH - UI Fixes, Fix sending signals with no seed
7-
* SubGHz: Code cleanup, proper handling of protocols ignore options (by @gid9798 | PR #516)
8-
* SubGHz: Various UI fixes (by @wosk | PR #527)
9-
* NFC: Fixed issue #532 (Mifare classic user dict - delete removes more than selected key)
10-
* Infrared: Updated universal remote assets (by @amec0e | PR #529)
11-
* Plugins: **Use correct categories (folders) for all plugins (extra pack too)**
12-
* Plugins: Various fixes for uFBT (by @hedger)
13-
* Plugins: Added **NFC Maker** plugin (make tags with URLs, Wifi and other things) [(by Willy-JL)](https://github.com/ClaraCrazy/Flipper-Xtreme/tree/dev/applications/external/nfc_maker)
14-
* Plugins: Added JetPack Joyride [(by timstrasser)](https://github.com/timstrasser)
15-
* Plugins: Moved Barcode Generator [(by Kingal1337)](https://github.com/Kingal1337/flipper-barcode-generator) from extra pack into base fw, old barcode generator was removed
5+
* Archive (FileBrowser): Added Cut/Copy/Paste & NewDir options in new menu (original feature made by (@Willy-JL | XFW) - and ported by @gid9798)
6+
* Plugins: SubGHz Bruteforcer (3.7 update) - New extra settings menu (by @gid9798)
7+
```
8+
- Added the ability to change repeats
9+
- Added the ability to change Te for protocols that use it
10+
- The settings will be reset after returning to the main menu
11+
```
12+
* SubGHz Remote: Merged SubGHz Remote and Remote maker in one app, **use back button to access remote maker** (by @gid9798 | PR #545)
13+
* SubGHz: Port latest OFW external radio driver, fix issues (now you can make drivers for other radio chips) (by @gid9798 | PR #539 #536 #535 #534)
14+
* GUI module: SubMenu fix vertical orientation (by @gid9798 | PR #543)
15+
* Apps: After merge fixes (by @gid9798 | PR #537)
16+
* Docs: Update docs for debug build and update vscode example, please remove `debug_pack` target if you had it in your workflow
17+
* Infrared: Updated universal remote assets (by @amec0e | PR #544 #546)
18+
* Plugins: Barcode app - embed assets (encoding tables) in plugin
19+
* Plugins: NRF24 plugins -> Updates by @Sil333033 with some changes by @xMasterX -> furi_hal_speaker direct calls was removed and replaced with notification service to avoid bypassing of user set silent mode -> What was changed - NRF24 connection check added, app folders was moved (uses migrate, all done automatically), and mousejacker now uses badusb folder for badusb scripts
20+
* Plugins: Added Camera Suite GPIO application for the ESP32-CAM module. [(by CodyTolene)](https://github.com/CodyTolene/Flipper-Zero-Camera-Suite) (PR #541)
1621
* Plugins: Updated ESP32: WiFi Marauder companion plugin [(by 0xchocolate)](https://github.com/0xchocolate/flipperzero-wifi-marauder)
17-
* Plugins: Updated i2c Tools [(by NaejEL)](https://github.com/NaejEL/flipperzero-i2ctools)
18-
* Settings: Change LED and volume settings by 5% steps (by @cokyrain)
19-
* BLE: BadBT fixes and furi_hal_bt cleanup (by @Willy-JL)
20-
* WIP OFW PR 2825: **NFC: Improved MFC emulation on some readers (by AloneLiberty)**
21-
* OFW PR 2829: Decode only supported Oregon 3 sensor (by @wosk)
22-
* OFW PR: Update OFW PR 2782
23-
* OFW: SubGhz: add "SubGhz test" external application and the ability to work "SubGhz" as an external application
24-
* OFW: API: explicitly add math.h
25-
* OFW: NFC: Mf Ultralight emulation optimization
26-
* OFW: Furi_Power: fix furi_hal_power_enable_otg
27-
* OFW: FuriHal: allow nulling null isr
28-
* OFW: FuriHal, Infrared, Protobuf: various fixes and improvements
29-
* OFW: Picopass fix ice
30-
* OFW: Desktop settings: show icon and name for external applications
31-
* OFW: Furi,FuriHal: various improvements
32-
* OFW: Debug apps: speaker, uart_echo with baudrate
33-
* OFW: Add Mitsubishi MSZ-AP25VGK universal ac remote
34-
* OFW: Fix roll-over in file browser and archive
35-
* OFW: Fix fr-FR-mac keylayout
36-
* OFW: NFC/RFID detector app
37-
* OFW: Fast FAP Loader
38-
* OFW: LF-RFID debug: make it work
39-
* OFW: Fix M*LIB usage
40-
* OFW: fix: make `dialog_file_browser_set_basic_options` initialize all fields
41-
* OFW: Scroll acceleration
42-
* OFW: Loader refaptoring: second encounter
22+
* Plugins: Updated **NFC Maker** plugin (make tags with URLs, Wifi and other things) [(by Willy-JL)](https://github.com/ClaraCrazy/Flipper-Xtreme/tree/dev/applications/external/nfc_maker)
23+
* Plugins: Updated **Mifare Nested** [(by AloneLiberty)](https://github.com/AloneLiberty/FlipperNested)
24+
* Plugins: Updated Lightmeter [(by oleksiikutuzov)](https://github.com/oleksiikutuzov/flipperzero-lightmeter)
25+
* Plugins: Updated **Multi (RFID/iButton) Fuzzer** [(by @gid9798)](https://github.com/DarkFlippers/Multi_Fuzzer)
26+
* OFW PR: faploader: always create app dir, even if it doesn't have subdirs (by @hedger)
27+
* OFW: Gauge initialization routine refactoring, new DataMemory layout, configuration update
28+
* OFW: fbt: `build` target for faps
29+
* OFW: IButton: on delete scene key name not fully display if so long
30+
* OFW: Radio headers in SDK
31+
* OFW: Loader: good looking error messages
32+
* OFW: Desktop,Cli: add uptime info
33+
* OFW: Archive and file browser fixes
34+
* OFW: Loader: exit animation fix
35+
* OFW: SubGhz: fix check connect cc1101_ext
36+
* OFW: NFC: Improved MFC emulation on some readers
37+
* OFW: Dolphin: add new animation
38+
* OFW: Update toolchain to v23
39+
* OFW: More descriptive error messages for the log command
40+
* OFW: **External menu apps** -> now we have ton of free internal space
41+
* OFW: Device Info update
4342

4443
----
4544

ReadMe.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ You can support us by using links or addresses below:
137137

138138
### Community apps included:
139139

140-
- **RFID Fuzzer** [(by @gid9798)](https://github.com/DarkFlippers/unleashed-firmware/pull/507) (original by Ganapati & xMasterX)
141-
- **iButton Fuzzer** [(by @gid9798)](https://github.com/DarkFlippers/unleashed-firmware/pull/507) (original by xMasterX)
140+
- **RFID Fuzzer** [(by @gid9798)](https://github.com/DarkFlippers/Multi_Fuzzer) (original by Ganapati & xMasterX)
141+
- **iButton Fuzzer** [(by @gid9798)](https://github.com/DarkFlippers/Multi_Fuzzer) (original by xMasterX)
142142
- **Sub-GHz bruteforcer** [(by @derskythe & xMasterX)](https://github.com/derskythe/flipperzero-subbrute) [(original by Ganapati & xMasterX)](https://github.com/DarkFlippers/unleashed-firmware/pull/57)
143143
- **Sub-GHz playlist** [(by darmiel)](https://github.com/DarkFlippers/unleashed-firmware/pull/62)
144144
- ESP8266 Deauther plugin [(by SequoiaSan)](https://github.com/SequoiaSan/FlipperZero-Wifi-ESP8266-Deauther-Module)
@@ -160,7 +160,7 @@ You can support us by using links or addresses below:
160160
- HC-SR04 Distance sensor - Ported and modified by @xMasterX [(original by Sanqui)](https://github.com/Sanqui/flipperzero-firmware/tree/hc_sr04) - How to connect -> (5V -> VCC) / (GND -> GND) / (13|TX -> Trig) / (14|RX -> Echo)
161161
- Morse Code [(by wh00hw)](https://github.com/wh00hw/MorseCodeFAP)
162162
- **Unitemp - Temperature sensors reader** (DHT11/22, DS18B20, BMP280, HTU21x and more) [(by quen0n)](https://github.com/quen0n/unitemp-flipperzero)
163-
- BH1750 - Lightmeter [(by oleksiikutuzov)](https://github.com/oleksiikutuzov/flipperzero-lightmeter)
163+
- Lightmeter [(by oleksiikutuzov)](https://github.com/oleksiikutuzov/flipperzero-lightmeter)
164164
- HEX Viewer [(by QtRoS)](https://github.com/QtRoS/flipper-zero-hex-viewer)
165165
- POCSAG Pager [(by xMasterX & Shmuma)](https://github.com/xMasterX/flipper-pager)
166166
- Text Viewer [(by kowalski7cc & kyhwana)](https://github.com/kowalski7cc/flipper-zero-text-viewer/tree/refactor-text-app)
@@ -171,6 +171,7 @@ You can support us by using links or addresses below:
171171
- **BadBT** plugin (BT version of BadKB) [(by Willy-JL, ClaraCrazy, XFW contributors)](https://github.com/ClaraCrazy/Flipper-Xtreme/tree/dev/applications/main/bad_kb) (See in Applications->Tools) - (aka BadUSB via Bluetooth)
172172
- **Mifare Nested** [(by AloneLiberty)](https://github.com/AloneLiberty/FlipperNested) - Works with PC and python app `FlipperNested`
173173
- **NFC Maker** plugin (make tags with URLs, Wifi and other things) [(by Willy-JL)](https://github.com/ClaraCrazy/Flipper-Xtreme/tree/dev/applications/external/nfc_maker)
174+
- ESP32-CAM -> Camera Suite [(by CodyTolene)](https://github.com/CodyTolene/Flipper-Zero-Camera-Suite)
174175

175176
Games:
176177
- DOOM (fixed) [(by p4nic4ttack)](https://github.com/p4nic4ttack/doom-flipper-zero/)
@@ -244,6 +245,8 @@ Games:
244245

245246
## [- How to use: [ESP32] WiFi Marauder](https://github.com/UberGuidoZ/Flipper/tree/main/Wifi_DevBoard)
246247

248+
## [- How to use: [ESP32-CAM] Camera Suite](https://github.com/CodyTolene/Flipper-Zero-Camera-Suite)
249+
247250
## [- [WiFi] Scanner - Web Flasher for module firmware](https://sequoiasan.github.io/FlipperZero-WiFi-Scanner_Module/)
248251

249252
## [- [ESP8266] Deauther - Web Flasher for module firmware](https://sequoiasan.github.io/FlipperZero-Wifi-ESP8266-Deauther-Module/)

0 commit comments

Comments
 (0)