Commit Graph

1354 Commits

Author SHA1 Message Date
Willy-JL 78696ff458 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-05-31 18:21:41 +01:00
Willy-JL 014a30d8bf Fix xtreme settings values handling 2023-05-31 18:14:30 +01:00
Willy-JL cbcb9b3fb4 Fix charge cap index 2023-05-31 18:04:05 +01:00
Willy-JL a3b4defa44 Revert "Revert "Feature: Custom user set charging cap (#265)""
This reverts commit 31f624d662.
2023-05-31 17:33:05 +01:00
Willy-JL c35406689b Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-05-31 16:45:55 +01:00
MX f5692ea1f0 fix message 2023-05-31 17:16:24 +03:00
MX 774156a78a Merge branch 'ofw-dev' into dev 2023-05-31 17:14:49 +03:00
Tiernan Messmer b18bf3eddb nfcv code review fixes 2023-05-31 17:14:06 +03:00
Skorpionm d09c59fd2f [FL-3340] SubGhz: fix flipper crashes after exiting broadcast blocking message and crash cli (#2714) 2023-05-31 21:59:12 +09:00
gid9798 53dbf8de72 fix 2023-05-31 12:25:45 +03:00
MX e60707d7ef need to fix that 2023-05-31 12:18:24 +03:00
MX 6374474b25 fmt 2023-05-31 10:39:11 +03:00
MX c0d80a4f83 Merge branch 'dev' into keeloq_move_mf_to_keystore 2023-05-31 10:38:28 +03:00
MX 0a0109e2aa Merge pull request #492 from gid9798/subrem_main_and_maker
Subrem main and maker
2023-05-31 01:08:24 +03:00
gid9798 6ad58276f8 Cleanup and rename 2023-05-30 22:21:47 +03:00
gid9798 a260465721 Prog_mode to custom_btn 2023-05-30 22:18:54 +03:00
gid9798 c70a13015b Allow BinRaw & some clean 2023-05-30 20:27:15 +03:00
gid9798 a312aa422a Same codebase as fap 2023-05-30 20:04:17 +03:00
gid9798 b3e8b2c487 upd_subrem_main 2023-05-30 20:01:31 +03:00
gid9798 da4a8eb5c1 Merge branch 'UFW_dev' into lfrfid_t5577 2023-05-30 11:20:01 +03:00
MX b25e98ffbb Rename buttons in OFW naming scheme 2023-05-30 00:12:46 +03:00
MX 121526f521 Use AC Remote from OFW, same for Audio remote
ASSETS update needed, will be done soon
2023-05-29 23:50:37 +03:00
gid9798 a4c1ad22ef Removing duplicate code in t5577 passwd clear 2023-05-29 22:15:07 +03:00
MX e474b851bf fix for new bus changes 2023-05-29 21:29:13 +03:00
MX 0ab530e750 Merge branch 'ofw-dev' into dev 2023-05-29 20:33:12 +03:00
ClaraCrazy b17f5be06c Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-05-29 16:25:18 +02:00
ClaraCrazy 31f624d662 Revert "Feature: Custom user set charging cap (#265)"
This reverts commit 557cc73a1d, reversing
changes made to 32fad4af8d.
2023-05-29 15:42:02 +02:00
micolous 363f555ed7 Implement support for reading Opal card (Sydney, Australia) (#2683)
* Implement support for reading Opal card (Sydney, Australia)
* stub_parser_verify_read: used UNUSED macro
* furi_hal_rtc: expose calendaring as functions
* opal: use bit-packed struct to parse, rather than manually shifting about
* Update f18 api symbols

Co-authored-by: あく <alleteam@gmail.com>
2023-05-29 20:55:55 +09:00
MX 18a895310c Merge branch 'ofw-dev' into dev 2023-05-29 14:40:07 +03:00
Willy-JL ae2f28dcef Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into xfw-dev 2023-05-29 10:49:09 +01:00
Nikolay Minaylov 66961dab06 BadUSB: script execution pause (#2700)
Co-authored-by: あく <alleteam@gmail.com>
2023-05-29 18:21:18 +09:00
Willy-JL 3a21b12818 Move charge cap setting, more values, fix build 2023-05-28 21:04:25 +01:00
Willy-JL 11c443b79a Shorter charge cap var name (for format) 2023-05-28 20:42:11 +01:00
John 8becdc66e7 Feature: Custom user set charging cap 2023-05-28 21:12:00 +02:00
Willy-JL 32fad4af8d Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-05-28 17:11:26 +01:00
Willy-JL 7051917d36 Unload asset pack icons for external apps 2023-05-28 17:04:33 +01:00
Willy-JL 33b8519202 Option to preload extmainapps or not 2023-05-28 17:03:23 +01:00
MX 0d1fea9861 LFRFID PSK Raws in debug 2023-05-28 06:36:19 +03:00
Willy-JL ce1e98eb4a Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-05-28 04:29:08 +01:00
Willy-JL 781ddbbada External ibutton and gpio 2023-05-28 00:37:31 +01:00
Willy-JL 871af9c0d0 Remove xtreme embedded fap icon 2023-05-28 00:37:12 +01:00
Willy-JL 8e5a679266 Add favorite timeout to api 2023-05-28 00:36:37 +01:00
Willy-JL edd4871402 Fix flipper fmt file handling in xfw app 2023-05-28 00:23:51 +01:00
MX 9af6616882 Archive, fix rename, show message to user 2023-05-27 13:39:54 +03:00
Willy-JL 7e5b9f68c5 Add lock on boot setting 2023-05-27 02:54:41 +01:00
Willy-JL 92f54c45ff Use rename or move where appropriate 2023-05-26 22:21:32 +01:00
Willy-JL decce5aa8d Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-05-26 19:33:56 +01:00
MX 3c452e6ddb Merge branch 'ofw-dev' into dev 2023-05-26 16:51:11 +03:00
Yukai Li 5f52382098 nfc: Mifare Ultralight C detection (#2668)
* nfc: Add Mifare Ultralight C detection
* nfc: Add display name for MFUL C and hide menu items
    MFUL C unlock and emulation currently not supported, so hide from menu
    if current card is MFUL C
* nfc: Also check response when probing 3DES auth
* nfc: Hide emulate option in saved menu for MFUL if not supported
* nfc: Remove unlock options from saved menu if Ultralight C


Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2023-05-26 22:19:10 +09:00
MX 36102b8ee0 Merge branch 'ofw-dev' into dev 2023-05-26 12:03:49 +03:00