Skip to content

Commit 239eca0

Browse files
committed
Merge branch 'dev' of github.com:Eng1n33r/flipperzero-firmware into feat/playlist
2 parents b107274 + de4e7b9 commit 239eca0

File tree

407 files changed

+15101
-5170
lines changed

Some content is hidden

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

407 files changed

+15101
-5170
lines changed

.drone.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ steps:
3636
- mkdir -p sd-card/nfc/assets
3737
- mkdir -p sd-card/infrared/assets
3838
- mkdir -p sd-card/unirf
39+
- mkdir -p sd-card/rfidfuzzer
3940
- mkdir -p sd-card/badusb/layouts
4041
- cp assets/resources/badusb/layouts/* sd-card/badusb/layouts/
4142
- cp assets/resources/subghz/assets/dangerous_settings sd-card/subghz/assets/dangerous_settings
@@ -44,9 +45,11 @@ steps:
4445
- cp assets/resources/nfc/assets/mf_classic_dict.nfc sd-card/nfc/assets/mf_classic_dict.nfc
4546
- cp assets/resources/infrared/assets/tv.ir sd-card/infrared/assets/tv.ir
4647
- cp assets/resources/infrared/assets/ac.ir sd-card/infrared/assets/ac.ir
48+
- cp assets/resources/infrared/assets/fans.ir sd-card/infrared/assets/fans.ir
4749
- cp assets/resources/infrared/assets/projectors.ir sd-card/infrared/assets/projectors.ir
4850
- cp assets/resources/infrared/assets/audio.ir sd-card/infrared/assets/audio.ir
4951
- cp assets/resources/unirf/unirf_map_example.txt sd-card/unirf/unirf_map_example.txt
52+
- cp assets/resources/rfidfuzzer/example_uids.txt sd-card/rfidfuzzer/example_uids.txt
5053
- cp assets/resources/Manifest sd-card/Manifest
5154
- zip -r artifacts-default/sd-card-${DRONE_TAG}.zip sd-card
5255
- rm -rf sd-card
@@ -115,9 +118,7 @@ steps:
115118
116119
[-Install via Web Updater-](https://my.flipp.dev/?url=https://unleashedflip.com/builds/flipper-z-f7-update-${DRONE_TAG}.tgz&channel=dev-cfw&version=${DRONE_TAG})"
117120
document:
118-
- artifacts-default/flipper-z-f7-full-${DRONE_TAG}.dfu
119-
- artifacts-default/flipper-z-f7-update-${DRONE_TAG}.zip
120-
- artifacts-default/sd-card-${DRONE_TAG}.zip
121+
- artifacts-default/flipper-z-f7-update-${DRONE_TAG}.tgz
121122

122123
- name: "Send discord notification"
123124
image: appleboy/drone-discord

CHANGELOG.md

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,10 @@
11
### New changes
2-
* New universal remote for projectors
3-
* OFW: New LF-RFID subsystem (New protocols, Animal tags support)
4-
* Updated universal remote assets (by @Amec0e)
5-
* Renamed UniRF Remix -> Sub-GHz Remote
6-
* Replaced Hex/Dec converter with Multi Converter plugin [(by theisolinearchip)](https://github.com/theisolinearchip/flipperzero_stuff)
7-
* New update screen, readme pictures (by @Svaarich)
8-
* Fixed crash if Center button is pressed on the "update success" screen via screensharing
9-
* Temporary disabled one log call in picopass plugin to fix crash/freeze on Read screen
10-
* OFW: Picopass load/info/delete
11-
* OFW: SubGhz: add protocol Magellen
12-
* OFW: Fix mifare ultralight/ntag unlock
13-
* OFW: Dolphin level thresholds update
14-
* OFW: Add MFC 1/4K 4/7bUID to "Add Manually"
15-
* OFW: Other fixes and changes
2+
* Actually fix universal tv remote
3+
* bt and lfrfid tune debug apps excluded from releases
164

17-
**Note: Prefer installing using web updater or by self update package, all needed assets will be installed**
5+
**Note: To avoid issues prefer installing using web updater or by self update package, all needed assets will be installed**
186

19-
**Build naming has been changed - all same as before but `cg - codegrabber` changed to `un - unleashed`**
20-
21-
Self-update package (update from microSD) - `flipper-z-f7-update-(version).zip`
7+
Self-update package (update from microSD) - `flipper-z-f7-update-(version).zip` or `.tgz` for iOS mobile app
228

239
DFU for update using qFlipper - `flipper-z-f7-full-(version).dfu`
2410

ReadMe.md

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
</a>
55
</h3>
66

7-
Welcome to Flipper Zero's Custom Firmware repo!
7+
### Welcome to Flipper Zero Unleashed Firmware repo!
88
Our goal is to make any features possible in this device without any limitations!
99

10-
Please help us implement emulation for all subghz dynamic (rolling code) protocols and static code brute-force app!
10+
Please help us implement emulation for all subghz dynamic (rolling code) protocols!
1111

1212
<br>
1313

@@ -27,25 +27,26 @@ Our Discord Community:
2727
* SubGHz frequecy range can be extended in settings file (Warning: It can damage flipper's hardware)
2828
* Many rolling code protocols now have the ability to save & send captured signals
2929
* FAAC SLH (Spa) & BFT Mitto (secure with seed) manual creation
30+
* Sub-GHz static code brute-force plugin
31+
* LFRFID Fuzzer plugin
3032
* Custom community plugins and games added
3133
* Extra SubGHz frequencies + extra Mifare Classic keys
3234
* Picopass/iClass plugin included in releases
3335
* Recompiled IR TV Universal Remote for ALL buttons
34-
* Universal A/C and Audio(soundbars, etc.) remote
35-
* Universal remote for Projectors
36+
* Universal remote for Projectors, Fans, A/Cs and Audio(soundbars, etc.)
3637
* BadUSB keyboard layouts
3738
* Customizable Flipper name
3839
* Other small fixes and changes throughout
3940

4041
See changelog in releases for latest updates!
4142

42-
### Current modified and new SubGhz protocols list:
43+
### Current modified and new SubGHz protocols list:
4344
- HCS101
4445
- An-Motors
4546
- CAME Atomo
46-
- FAAC SLH (Spa) [if cloning existing remote - external seed calculation required]
47-
- BFT Mitto [if cloning existing remote - external seed calculation required]
48-
- Keeloq (+ proper manufacturer codes selection) [Not ALL systems supported yet!]
47+
- FAAC SLH (Spa) [External seed calculation required]
48+
- BFT Mitto [External seed calculation required]
49+
- Keeloq [Not ALL systems supported yet!]
4950
- Nice Flor S
5051
- Security+ v1 & v2
5152
- Star Line
@@ -56,10 +57,10 @@ See changelog in releases for latest updates!
5657
* DOGE: `D6R6gYgBn5LwTNmPyvAQR6bZ9EtGgFCpvv`
5758
* LTC: `ltc1q3ex4ejkl0xpx3znwrmth4lyuadr5qgv8tmq8z9`
5859

59-
**Big thanks to all sponsors!**
60-
6160
### Community apps included:
6261

62+
- RFID Fuzzer plugin [(by Ganapati)](https://github.com/Eng1n33r/flipperzero-firmware/pull/54) with some changes by xMasterX
63+
- Sub-GHz bruteforce plugin [(by Ganapati & xMasterX)](https://github.com/Eng1n33r/flipperzero-firmware/pull/57)
6364
- ESP8266 Deauther plugin [(by SequoiaSan)](https://github.com/SequoiaSan/FlipperZero-Wifi-ESP8266-Deauther-Module)
6465
- WiFi Scanner plugin [(by SequoiaSan)](https://github.com/SequoiaSan/FlipperZero-WiFi-Scanner_Module)
6566
- MultiConverter plugin [(by theisolinearchip)](https://github.com/theisolinearchip/flipperzero_stuff)
@@ -68,8 +69,8 @@ See changelog in releases for latest updates!
6869
- GPIO: Sentry Safe plugin [(by H4ckd4ddy)](https://github.com/H4ckd4ddy/flipperzero-sentry-safe-plugin)
6970
- ESP32: WiFi Marauder companion plugin [(by 0xchocolate)](https://github.com/0xchocolate/flipperzero-firmware-with-wifi-marauder-companion)
7071
- NRF24: Sniffer & MouseJacker (with changes) [(by mothball187)](https://github.com/mothball187/flipperzero-nrf24/tree/main/mousejacker)
71-
- Simple Clock (fixed) !! New version WIP, wait for updates !! [(Original by CompaqDisc)](https://gist.github.com/CompaqDisc/4e329c501bd03c1e801849b81f48ea61)
72-
- UniversalRF Remix (with changes)(only RAW subghz files) [(by ESurge)(Original UniversalRF by jimilinuxguy)](https://github.com/ESurge/flipperzero-firmware-unirfremix)
72+
- Simple Clock (fixed) [(Original by CompaqDisc)](https://gist.github.com/CompaqDisc/4e329c501bd03c1e801849b81f48ea61)
73+
- UniversalRF Remix / Sub-GHz Remote [(by ESurge)](https://github.com/ESurge/flipperzero-firmware-unirfremix)[(updated and all protocol support added by darmiel & xMasterX)](https://github.com/darmiel/flipper-playlist/tree/feat/unirf-protocols)
7374
- Tetris (with fixes) [(by jeffplang)](https://github.com/jeffplang/flipperzero-firmware/tree/tetris_game/applications/tetris_game)
7475
- Spectrum Analyzer (with changes) [(by jolcese)](https://github.com/jolcese/flipperzero-firmware/tree/spectrum/applications/spectrum_analyzer) - [Ultra Narrow mode & scan channels non-consecutively](https://github.com/theY4Kman/flipperzero-firmware/commits?author=theY4Kman)
7576
- Arkanoid (with fixes) [(by gotnull)](https://github.com/gotnull/flipperzero-firmware-wPlugins)

SConstruct

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Main Fipper Build System entry point
2+
# Main Flipper Build System entry point
33
#
44
# This file is evaluated by scons (the build system) every time fbt is invoked.
55
# Scons constructs all referenced environments & their targets' dependency
@@ -15,7 +15,7 @@ DefaultEnvironment(tools=[])
1515
# Progress(["OwO\r", "owo\r", "uwu\r", "owo\r"], interval=15)
1616

1717

18-
# This environment is created only for loading options & validating file/dir existance
18+
# This environment is created only for loading options & validating file/dir existence
1919
fbt_variables = SConscript("site_scons/commandline.scons")
2020
cmd_environment = Environment(tools=[], variables=fbt_variables)
2121
Help(fbt_variables.GenerateHelpText(cmd_environment))

applications/bad_usb/views/bad_usb_view.h

100755100644
File mode changed.

applications/bt/application.fam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ App(
1111
provides=[
1212
"bt_start",
1313
"bt_settings",
14-
"bt_debug",
14+
#"bt_debug",
1515
],
1616
stack_size=1 * 1024,
1717
order=20,

applications/bt/bt_debug_app/views/bt_carrier_test.c

100755100644
File mode changed.

applications/bt/bt_debug_app/views/bt_test.c

100755100644
File mode changed.

applications/bt/bt_debug_app/views/bt_test.h

100755100644
File mode changed.

applications/bt/bt_hid_app/views/bt_hid_keynote.c

100755100644
File mode changed.

0 commit comments

Comments
 (0)