Commit Graph

10469 Commits

Author SHA1 Message Date
Willy-JL
d3c4785655 Merge branch 'dev' of https://github.com/Flipper-XFW/Xtreme-Firmware into new-app-system
# Conflicts:
#	applications/external/evil_portal/evil_portal_app.c
#	applications/external/gpio_reader_b/application.fam
#	applications/external/magspoof/application.fam
#	applications/external/magspoof/helpers/mag_helpers.c
#	applications/external/nrf24channelscanner/nrf24channelscanner.c
#	applications/external/protoview/app.h
#	applications/external/solitaire/defines.h
#	applications/external/swd_probe/swd_probe_app.c
#	applications/external/totp/ui/scenes/standby/standby.c
#	applications/external/uart_terminal/application.fam
2023-11-15 00:03:46 +00:00
Willy-JL
8096391c6c Update from apps repo, magspoof working (not nfc) 2023-11-14 23:49:52 +00:00
Willy-JL
b7798d2e5e Merge branch 'dev' of https://github.com/Flipper-XFW/Xtreme-Firmware into new-app-system 2023-11-14 23:34:50 +00:00
Willy-JL
1fc83431fd BLE Spam 4.2 2023-11-14 00:08:46 +00:00
Willy-JL
1451c4f9ba Add Love Spouse toys to BLE Spam
First discovered by @mandomat
2023-11-14 00:08:34 +00:00
Willy-JL
b0fcb61cff Sort protocols 2023-11-14 00:07:27 +00:00
Willy-JL
8651dfcb12 Better ble spam comments 2023-11-13 22:22:07 +00:00
Willy-JL
d7f0b62f42 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-11-13 21:07:33 +00:00
MMX
591a2f2b02 Merge pull request #649 from krolchonok/ibutton_fix
Fix naming in iButton
2023-11-13 20:01:09 +03:00
MX
7aaa847835 Merge branch 'nfcrefactoring' into dev 2023-11-13 20:57:36 +04:00
ClaraCrazy
a15d5ffb3a New update image --nobuild 2023-11-13 16:12:22 +01:00
MX
18377185c7 upd dronich 2023-11-13 15:02:01 +04:00
Willy-JL
7a5d642d8e Fix badkb resources again 2023-11-13 09:30:10 +00:00
WillyJL
ece9c63f45 Update mf_classic_dict.nfc (#449) 2023-11-13 09:29:29 +00:00
MX
ef09dcf8f8 subghz things and remove rtos finally 2023-11-13 12:42:05 +04:00
ushastoe
42101c6594 Revert " applications_user/Flipper-Zero-Privet-Mir-main/"
This reverts commit 3e9ecd2f4f.
2023-11-13 11:27:27 +03:00
MX
bee1a6c18a remove rtos 2023-11-13 12:27:21 +04:00
ushastoe
3e9ecd2f4f applications_user/Flipper-Zero-Privet-Mir-main/ 2023-11-13 11:26:36 +03:00
Mihai
f2f2035bf7 Update mf_classic_dict.nfc
Re-added STB Public transport keys and also new Metrorex Subway keys
2023-11-13 09:08:30 +02:00
Willy-JL
df3f944045 New update screen 2023-11-13 00:01:23 +00:00
Willy-JL
088e7b5714 Deploy resources for extapps too 2023-11-12 23:32:21 +00:00
Willy-JL
63698630d6 Fix remaining unserolved symbols 2023-11-12 23:06:38 +00:00
Willy-JL
4143d2c517 Merge branch 'dev' of https://github.com/Flipper-XFW/Xtreme-Firmware into xfw-new-app-system 2023-11-12 13:56:04 +00:00
Willy-JL
1bbf424118 Add back nfc dynamic default save name to new app 2023-11-12 12:54:06 +00:00
Willy-JL
692d1a7363 Add back favorite timeout to new nfc app 2023-11-12 12:38:48 +00:00
Willy-JL
2effc5fde8 Ignore unresolved plugins symbols (dynamic load) 2023-11-12 12:28:55 +00:00
Willy-JL
d5f1d0bf02 Format 2023-11-12 12:27:49 +00:00
Willy-JL
270ea226b7 Temp disable esubghzchat magspoof nested mf-fuzzer 2023-11-12 12:26:02 +00:00
Willy-JL
1c1b855fd1 Fix circular and redundant imports + last freertos 2023-11-12 12:15:17 +00:00
Willy-JL
67db9ff25d Fix refactored nfc app defines usage 2023-11-12 11:41:47 +00:00
Willy-JL
f402495725 Fix problems from FreeRTOS refactor 2023-11-12 11:40:59 +00:00
Willy-JL
9c8d9eb236 Fix errors piled up on apps repo 2023-11-12 11:39:13 +00:00
Willy-JL
9c7310317d Merge branch 'xfw-dev' into xfw-new-app-system 2023-11-12 11:13:11 +00:00
Willy-JL
e309fa8a88 Temporarily backport app updates from apps repo 2023-11-12 11:11:46 +00:00
Willy-JL
79e7f491fe Move apps resources to apps repo 2023-11-12 10:23:12 +00:00
Willy-JL
cf77f692ac Merge branch 'xfw-dev' into xfw-new-app-system 2023-11-12 07:59:31 +00:00
Willy-JL
2430e873f4 Merge branch 'dev' of https://github.com/Flipper-XFW/Xtreme-Firmware into xfw-new-app-system 2023-11-12 07:43:13 +00:00
Willy-JL
782e9eba79 Fix timer priority api in apps 2023-11-12 07:42:28 +00:00
Willy-JL
0a1a853f9a Fix xfwfirstboot, core firmware builds! 2023-11-12 07:41:03 +00:00
Willy-JL
3d6654b029 Fix badkb resources 2023-11-12 07:40:14 +00:00
Willy-JL
caee42f1ac Fix infrared var item list setup and app cast 2023-11-12 07:14:33 +00:00
Willy-JL
b5a56d39c0 Fix subghz linking, firmware dfu builds! 2023-11-12 06:59:52 +00:00
Willy-JL
f2902755ca Fix thread and timer api 2023-11-12 06:35:20 +00:00
Willy-JL
461aadeedf Fix subghz lib create_data api 2023-11-12 06:34:18 +00:00
Willy-JL
94efe04132 Refactor asset packs to build properly with fbt 2023-11-12 05:39:24 +00:00
Willy-JL
748932151d Cleanup example resources, replace tesla files 2023-11-12 03:24:20 +00:00
Willy-JL
418f44fef1 Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into xfw-dev 2023-11-12 02:56:30 +00:00
Willy-JL
aa1e50e653 Merge branch 'nfcrefactoring' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-11-12 01:04:33 +00:00
MX
b958bfd5c9 Merge branch 'ofw_dev' into nfcrefactoring 2023-11-11 20:18:55 +04:00
ushastoe
725811d7b3 fix [] 2023-11-10 23:29:11 +03:00