Commit Graph

884 Commits

Author SHA1 Message Date
Willy-JL f03b64fc7f Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into fix-bad_kb_bt-flipper_app-conflict 2023-02-28 21:24:18 +00:00
yocvito 30c603ee2d change troll default mac addr for remember bonding mode in bad kb 2023-02-28 22:20:25 +01:00
yocvito 581f050d1e fix ui bug where conf scene was not updated on bonding toggle 2023-02-28 22:18:09 +01:00
Willy-JL 2d9c6d5bb9 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware 2023-02-28 21:01:06 +00:00
Willy-JL fa8ed7f6e4 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware 2023-02-28 20:34:44 +00:00
yocvito ba7ccd33b8 Merge branch 'fix-bad_kb_bt-flipper_app-conflict' of github.com:yocvito/Flipper-Xtreme into fix-bad_kb_bt-flipper_app-conflict 2023-02-28 19:43:29 +01:00
yocvito 48641ef6f6 Adds bonding toggle in badkb, allowing to remember paired devices, but MAC address cannot be modified in this state (V1) 2023-02-28 19:27:15 +01:00
Willy-JL 4b84b71373 Change darkmode setting name 2023-02-27 19:33:44 +00:00
Willy-JL f27de04158 Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into fix-bad_kb_bt-flipper_app-conflict 2023-02-27 19:16:56 +00:00
Willy-JL 14ed0e24b1 Format 2023-02-27 19:16:45 +00:00
Willy-JL 007447cc61 Add experimental dark mode setting 2023-02-27 19:12:48 +00:00
Willy-JL fb08674a99 BadKB handle connection at app level + fix crash 2023-02-26 06:49:08 +00:00
Willy-JL 6b9eb8f350 Format 2023-02-26 01:45:02 +00:00
Willy-JL ad2522fc1d Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into fix-bad_kb_bt-flipper_app-conflict 2023-02-26 01:44:44 +00:00
Willy-JL 991d49733f Format 2023-02-26 01:44:32 +00:00
Willy-JL 9ff49110a0 Cleaner BadKB pin sync 2023-02-26 01:41:40 +00:00
Willy-JL 3207fbab3f Show BadKB connection mode in main view 2023-02-26 01:41:07 +00:00
Willy-JL 4aeec153c4 Fix BadKB connection management and persistence 2023-02-26 00:55:49 +00:00
Willy-JL 62dd0aded2 Subtly show PIN in BadKB 2023-02-25 03:25:31 +00:00
Willy-JL c6c6b50583 Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into fix-bad_kb_bt-flipper_app-conflict 2023-02-24 04:46:44 +00:00
Willy-JL d3f3bf1e11 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-02-24 01:05:31 +00:00
Willy-JL bb4a024d88 Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into fix-bad_kb_bt-flipper_app-conflict 2023-02-23 22:37:44 +00:00
MX 5132b16305 Merge branch 'dev' into dev2 2023-02-21 23:23:07 +03:00
MX a0b02b0110 Merge branch 'fz-dev' into dev 2023-02-21 23:10:51 +03:00
Liam Hays 663eb6cd6d Display Mifare Classic data in NFC app (#2389)
* Add data display for Mifare Classic cards.
* Clean up log statements and data display.

Co-authored-by: あく <alleteam@gmail.com>
2023-02-21 16:15:48 +09:00
Willy-JL 8d78d6b524 Small xtreme settings tweaks 2023-02-20 19:57:19 +00:00
Willy-JL c29ea2e2e2 Add custom icon for xtreme main menu app 2023-02-20 19:51:31 +00:00
Willy-JL 617700bd15 Move xtreme app to main menu 2023-02-20 19:00:38 +00:00
Willy-JL 355ef763e4 Cleanup main apps manifest 2023-02-20 18:59:39 +00:00
Round-Pi b89902942b typo combing 2023-02-20 10:55:53 -05:00
Willy-JL d91981b66b Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into fix-bad_kb_bt-flipper_app-conflict 2023-02-19 03:28:21 +00:00
Willy-JL eb97b3b80a Add asset pack support to external cc1101 scanning 2023-02-19 02:37:32 +00:00
Willy-JL 94eed59e46 Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into fix-bad_kb_bt-flipper_app-conflict 2023-02-19 01:12:46 +00:00
yocvito 6612597c83 really fix mac layout reversed on bt mac config scene (previous fix was just moving the issue lol) 2023-02-19 00:58:23 +01:00
yocvito a967f4d80b Merge branch 'dev' of github.com:ClaraCrazy/Flipper-Xtreme into fix-bad_kb_bt-flipper_app-conflict 2023-02-18 19:40:11 +01:00
yocvito d704c749c5 restore mac address original layout at scene exit when mac addr was not modified in bad kb bt mac config scene 2023-02-18 16:10:59 +01:00
Willy-JL 87963417aa Merge unleashed + general cleanup 2023-02-18 07:41:51 +00:00
Willy-JL 3ed7caf27d Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into xfw-dev 2023-02-17 23:47:39 +00:00
Willy-JL 462a0c8efc Cleaner settings implementation (proper defaults) 2023-02-17 23:30:28 +00:00
MX 80a64d8e1a Merge branch 'fz-dev' into dev 2023-02-17 21:55:32 +03:00
Mathie 009c9b1b71 Update nfc_cli.c (#2402)
Modified the f to a capital F, looks cleaner.

Co-authored-by: あく <alleteam@gmail.com>
2023-02-17 20:43:06 +09:00
yocvito bde3aa589b Fix: Flipper serial bt profile shown as 'Unknown' in bt settings + flipper app 2023-02-15 14:29:29 +01:00
Willy-JL e299f3a4fb Update bt settings editors titles 2023-02-15 09:55:53 +00:00
MX f93462667c Remove 467.75 From freq analyzer since it has too much noise
Frequency is still can be used, just excluded from FA to avoid false detections
2023-02-13 20:54:03 +03:00
MX b5a60dc10b Merge branch 'fz-dev' into dev 2023-02-13 19:30:36 +03:00
Nikolay Minaylov bc06d407f3 [FL-3113] BadUSB: disable CDC mode, USB mode switch fix (#2394) 2023-02-14 00:43:29 +09:00
Willy-JL cb89bb9628 Fix archive sorting (skip on big folders) 2023-02-13 14:54:23 +00:00
Willy-JL fbf99d6cb3 Skip browser inputs while loading / sorting 2023-02-13 14:54:15 +00:00
Willy-JL abeb34b983 Fix archive sorting (skip on big folders) 2023-02-13 05:01:31 +00:00
Willy-JL 9fe3136993 Skip browser inputs while loading / sorting 2023-02-13 04:57:44 +00:00