Commit Graph

256 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
MX
2a040f245f Merge branch 'fz-dev' into dev 2023-03-15 21:25:06 +03:00
Leopold
a69ae93871 Add new nfc apdu cli command (#2482)
Co-authored-by: あく <alleteam@gmail.com>
2023-03-15 22:52:32 +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
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
Round-Pi
b89902942b typo combing 2023-02-20 10:55:53 -05: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
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
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
VerstreuteSeele
9b81f93fd2 Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-02-07 19:12:13 +01:00
hedger
224d0aefe4 [FL-2733] multitarget support for fbt (#2209)
* First part of multitarget porting
* Delete firmware/targets/f7/Inc directory
* Delete firmware/targets/f7/Src directory
* gpio: cli fixes; about: using version from HAL
* sdk: path fixes
* gui: include fixes
* applications: more include fixes
* gpio: ported to new apis
* hal: introduced furi_hal_target_hw.h; libs: added one_wire
* hal: f18 target
* github: also build f18 by default
* typo fix
* fbt: removed extra checks on app list
* api: explicitly bundling select mlib headers with sdk
* hal: f18: changed INPUT_DEBOUNCE_TICKS to match f7
* cleaned up commented out code
* docs: added info on hw targets
* docs: targets: formatting fixes
* f18: fixed link error
* f18: fixed API version to match f7
* docs: hardware: minor wording fixes
* faploader: added fw target check
* docs: typo fixes
* github: not building komi target by default
* fbt: support for `targets` field for built-in apps
* github: reworked build flow to exclude app_set; fbt: removed komi-specific appset; added additional target buildset check
* github: fixed build; nfc: fixed pvs warnings
* attempt to fix target id
* f7, f18: removed certain HAL function from public API
* apps: debug: enabled bt_debug_app for f18
* Targets: backport input pins configuration routine from F7 to F18

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2023-02-08 01:33:05 +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
49dabee42f Revert NFC u2f 2023-01-14 09:00:41 +01:00
VerstreuteSeele
905bb23fdf Formatting & New updated IR 2023-01-14 08:44:32 +01:00
jbohack
ea0b5488ad u2f over nfc
https://github.com/flipperdevices/flipperzero-firmware/pull/1755
from @devsnek

may need more testing
2023-01-11 19:15:06 -05: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