Commit Graph

224 Commits

Author SHA1 Message Date
Willy-JL
cb3afc2600 Format 2023-03-28 23:27:07 +01:00
Willy-JL
4c5a37b34e Merge branch 'nfcf' of https://github.com/nullableVoidPtr/flipperzero-firmware into xfw-dev 2023-03-28 22:16:01 +01:00
Willy-JL
c2c9257999 Format 2023-03-28 22:02:15 +01:00
Willy-JL
638f0fc6f1 Use locked submenu for nfc debug options 2023-03-28 21:56:08 +01:00
Willy-JL
7c0875b54c Merge branch 'ISO15693' of https://github.com/g3gg0/flipperzero-firmware into xfw-dev 2023-03-28 21:49:19 +01:00
Willy-JL
6ebbbcc306 Reset NFC stuff 2023-03-28 21:32:00 +01:00
nullableVoidPtr
c1cb656be3 Merge branch 'dev' into nfcf 2023-03-24 18:55:58 +11:00
Willy-JL
79976f460c Show debug options by default as locked 2023-03-20 21:36:42 +00:00
Willy-JL
09bc580497 Merge branch 'ul-dev' into xfw-dev 2023-03-17 23:52:05 +00:00
MX
49378f0893 Merge branch 'fz-dev' into dev 2023-03-16 13:49:24 +03:00
Astra
6aa0c08f3a [FL-3064] Skip the read when the card is not present (#2494)
Co-authored-by: あく <alleteam@gmail.com>
2023-03-16 18:06:11 +09:00
Willy-JL
f53b962722 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-03-08 22:16:39 +00:00
MX
5d9174ac9d Merge branch 'fz-dev' into dev 2023-03-08 22:52:11 +03:00
Liam Hays
90958a6d23 More UI fixes and improvements (#2419)
* Unify spelling of confirm exit/retry across apps.
* Unify infrared exit/retry confirm menus?
* "Keyboard Layout", not "Keyboard layout".
* Make iButton read scene prompt less awkward.
* "Detect Reader" in MF Classic saved menu instead of "Detect reader"
* NFC menu spelling changes only.
* Remove \n in strings in widget_add_string_element() calls.

Co-authored-by: あく <alleteam@gmail.com>
2023-03-08 20:27:21 +09:00
Astra
42d27d04f6 [FL-3127] Fix navigation on unsupported card types (#2440)
Co-authored-by: あく <alleteam@gmail.com>
2023-03-03 19:55:51 +09:00
Willy-JL
8e5be2403b Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-03-01 00:51:43 +00:00
Astra
cc52253e22 Exit to the main menu on pressing BACK 2023-03-01 02:14:56 +03:00
Willy-JL
991d49733f Format 2023-02-26 01:44:32 +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
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
efb11dfcbd Properly integrate xtreme apis and headers 2023-02-11 05:19:37 +00:00
MX
6c768f2019 Merge branch 'fz-dev' into dev 2023-02-08 12:09:57 +03:00
Liam Hays
111c7557b3 Fix minor UI inconsistencies and bugs (#2361)
* Changed blue LED to cyan in NFC Magic and Picopass apps.
* Fix capitalization of ATQA and UID in NFC Add Manually wizard.
* Fix reselection of "Saved" menu item in NFC and RFID apps.
* Fix double back press after deleting a file in the SubGhz browser.
* Make NFC app behave like other apps: return to the file browser after deleting a file.
* Rename NfcSceneSetAtqua to NfcSceneSetAtqa.
* Save selected menu items in NFC Magic and Picopass apps in a way that always works.
* Restore previous selection in Universal Remotes menu.
* Other way to do universal remote menu saving, and NFC Extra Actions saves last selection.

Co-authored-by: あく <alleteam@gmail.com>
2023-02-08 17:08:50 +09:00
nullableVoidPtr
556c76ef7e Merge branch 'dev' into nfcf 2023-01-25 02:16:51 +08:00
Willy-JL
45a0a1104d Revert asset packs to OFW copium naming scheme 2023-01-24 11:44:42 +00:00
g3gg0.de
c1430bd97e increase sniff log size 2023-01-21 01:51:36 +01:00
g3gg0.de
00f8365954 also added DSFID/AFI handling and locking 2023-01-21 01:49:02 +01:00
g3gg0.de
2966a26cf1 added correct description to delete menu 2023-01-21 01:13:27 +01:00
g3gg0.de
02e3a30f06 added "Listen NfcV Reader" to sniff traffic from reader to card 2023-01-21 01:04:02 +01:00
g3gg0.de
4addd1fedc increased maximum memory size to match standard
added security status handling/load/save
added SELECT/QUIET handling
more fine grained allocation routines and checks
fix memset sizes
2023-01-21 00:06:31 +01:00
Willy-JL
abffc3152f New asset system everywhere sfw mode is supported 2023-01-20 06:43:05 +00:00
Willy-JL
da2ce47bd3 Move sfw mode to custom app 2023-01-17 19:58:27 +00:00
g3gg0.de
d4f6df8e40 Merge branch 'DigitalSequence_PulseReader' into ISO15693 2023-01-17 11:17:03 +01:00
VerstreuteSeele
f375a60555 Fix Assets 2023-01-15 01:12:25 +01:00
VerstreuteSeele
905bb23fdf Formatting & New updated IR 2023-01-14 08:44:32 +01:00
jbohack
cfb95cd783 fixed ofw typos 2023-01-10 10:21:19 -05:00
jbohack
89dddc4709 Revert "Show region information in sub-GHz app (#2249)"
This reverts commit 2c450bd835.

we set region information to fully unlocked so this does not matter
2023-01-10 10:17:32 -05:00
VerstreuteSeele
fbd162c4e3 Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-01-07 02:30:14 +01:00
MX
a94c553c5a Merge branch 'fz-dev' into dev 2023-01-07 01:59:20 +03:00
Maksim Derbasov
2c450bd835 Show region information in sub-GHz app (#2249)
* Show region info in sub-GHz app
* SubGhz: reset widget on region info scene exit
* Format sources

Co-authored-by: あく <alleteam@gmail.com>
2023-01-07 04:28:28 +09:00
VerstreuteSeele
a026ab37bd Who tf wrote this, and why? | Biggest stability update ever
Bro, what the fuck is this bullshit? I swear imma go cry if I see more shit like that...
2023-01-06 01:45:02 +01:00
jbohack
1e02d4803b added sfw mode back to nfc 2023-01-04 15:35:16 -05:00
VerstreuteSeele
b54c6c70d5 Fixed NFC 2023-01-02 12:34:00 +01:00
jbohack
23c0f518a0 sfw_mode support for ibutton added 2022-12-30 17:02:45 -05:00
jbohack
83c0f941df NFC_dolphin_emulation_47x61 sfw support 2022-12-30 15:08:12 -05:00
VerstreuteSeele
04a40f31a5 Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2022-12-30 15:59:53 +01:00
nullableVoidPtr
7d79379a95 NFC: FeliCa menu select uses new submenu ownership model 2022-12-30 22:04:06 +08:00
MX
6eb6297ab7 Merge branch 'fz-dev' into dev 2022-12-30 16:34:20 +03:00
nullableVoidPtr
3a098dc779 Merge branch 'dev' into nfcf 2022-12-30 20:10:55 +08:00