Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FL-2470],[FL-2385],[FL-2411] NFC fixes #1138

Merged
merged 4 commits into from Apr 20, 2022

Conversation

gornekich
Copy link
Member

@gornekich gornekich commented Apr 20, 2022

What's new

  • Increase timeout for Mifare Classic authentication process
  • Exit NFC app after launch incorrect card file from archive
  • Allow to switch context during nfc detection

Verification

  • Flipper reads Mifare Classic cards with all FFFFFFFF keys quickly
  • NFC exits after launch incorrect key from archive
  • No freeze after launching nfc detect CLI command

Checklist (For Reviewer)

  • PR has description of feature/bug or link to Confluence/Jira task
  • Description contains actions to verify feature/bugfix
  • I've built this code, uploaded it to the device and verified feature/bugfix

@github-actions
Copy link

github-actions bot commented Apr 20, 2022

Click here to flash the b8a6504c version of this branch via WebUSB.

@skotopes skotopes merged commit cea118c into dev Apr 20, 2022
@skotopes skotopes deleted the gornek/2470_mifare_classic_read_fix branch April 20, 2022 14:08
jimilinuxguy added a commit to jimilinuxguy/flipperzero-firmware that referenced this pull request May 16, 2022
* Gui: add missing redraw call after layer change (flipperdevices#1126)

* Desktop: use right button to open passport (flipperdevices#1127)

* Build system improvements and bug fixes (flipperdevices#1129)

* Assets: recompile
* Makefile: add debug_other to main makefile
* Github: stop compilation if compiled assets not in sync with assets sources
* Assets: recompile
* Makefile: correct debug_other rule. Bt: prevent on system start hook from waiting for bt service
* Power, FuriHal: gauge self check report
* Loader: move on system start hook call to the beginning

* [FL-2477] Updater support for resource bundles (flipperdevices#1131)

* Resource unpacking core
* Added more fields to manifest; updated dist scripts
* Python linter fixes
* Parsing manifest before unpacking
* Updated pipelines for separate resource build
* Removed raw path formatting
* Visual progress for resource extraction
* Renamed update status enum

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>

* [FL-2345] Archive: rename left button in delete scene flipperdevices#1132

Co-authored-by: あく <alleteam@gmail.com>

* Loader: always search application in debug apps list (flipperdevices#1133)

* [FL-2461] IR: change word from key to button (flipperdevices#1119)

* 2461 ir renamed menu items
* Renamed the key to the button

Co-authored-by: あく <alleteam@gmail.com>

* [FL-2343] IR: Rename the left button flipperdevices#1134

* [FL-2369] NFC refactoring (flipperdevices#1095)

* nfc: clean up scenes
* nfc worker: remove field on from worker
* nfc worker: move full data exchange to furi hal
* nfc_device: check UID length
* nfc protocol: introduce mifare common API
* nfc: move common data to furi hal nfc
* nfc: rename emv_decoder -> emv
* nfc: move emv data structure to emv lib
* nfc: remove deactivate after detection
* nfc: rework furi hal nfc detect
* nfc: clean up CLI commands and type
* nfc: remove unused includes and function
* nfc: add TxRxType enum
* nfc: read mifare ultralight refactoring
* nfc: refactore mifare ultralight start
* rfal: fix custom data exchange
* nfc: refactor read bank card
* nfc: refactor read emv application
* nfc: refactor emv test emulation
* nfc: refactor uid emulation
* nfc: add limit to uid emulation logger
* fix source formatting
* furi_hal_nfc: fix data exchange full
* nfc: fix mifare ultralight type load

Co-authored-by: あく <alleteam@gmail.com>

* [FL-2481] Renamed assets->resources; enforcing Manifest build if it does not exist (flipperdevices#1135)

* Renamed assets->resources; enforcing Manifest build if it does not exist
* Rebuild resources from CI
* Added Manifest to repo - be sure to rebuild it with `make -C assets` before committing changes!
* Actually added Manifest.
* Keeping Manifest on assets clean
* Spelling fix in Makefile

* [FL-2475] Text Box add three dots trim option (flipperdevices#1136)

* introduce text box debug application
* text box: add strip to dots option
* applications: update text box usage

Co-authored-by: あく <alleteam@gmail.com>

* [FL-2459, FL-2469]SubGhz: displaying a long name in RAW, launching files from subfolders, bugfix (flipperdevices#1125)

* SubGhz: fix the RAW file is not restored when it is launched from under the folder
* SubGhz: fix does not fit long RAW file name
* SubGhz: fix Read not cleared after file rename
* SubGhz: fix restore default frequency and modulation on output
* SubGhz: fix long name output in RAW

* [FL-2470, FL-2385, FL-2411] NFC fixes (flipperdevices#1138)

* mifare classic: increase data exchange timeout
* nfc: exit from app if can't parse file
* furi_hal_nfc: allow to switch context during detect

Co-authored-by: あく <alleteam@gmail.com>

* [FL-2463, FL-2471, FL-2472, FL-2473] Notifications, GUI elements, archive fixes flipperdevices#1137

* [FL-2480] Use SysTick as the main OS timer (flipperdevices#1140)

* Use SysTick as OS tick timer
* Use LPTIM2 as tickless idle timer
* Remove dummy LPTIM2 IRQ handler
* Clean up clock init code
* Rename os timer to idle timer
* Advance hal ticks along with FreeRTOS's
* Improve SysTick control during tickless idle
* Improve idle timer precision
* Correct SysTick IRQ priority
* Main, FuriHal: move system startup to separate thread
* Minor code cleanup

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>

* [FL-2432], [FL-2487] Rework bt keys load and save (flipperdevices#1139)

* bt keys: rework load and save with saved_struct
* bt: rename bt keys storage functions
* furi_hal_nfc: allow context switch during emilation
* bt settings: rework with saved struct
* infrared: replace file worker with dialogs and storage
* Core, Loader: fix thread allocation tracking, much better, so wow.

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>

* SubGhz: loading/saving files from any folder below the parent (flipperdevices#1142)

Co-authored-by: あく <alleteam@gmail.com>

* SubGhz: fix waiting for UPLOAD to be sent, for RAW file worker (flipperdevices#1146)

* SubGhz: fix waiting for UPLOAD to be sent
* SubGhz: remove debug output

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>

* Fix Mifare NTAG read flipperdevices#1147

Fix flipperdevices#1145

* Assets: update URL (flipperdevices#1148)

* [FL-2455] LFRFID, iButton: more-menu fix (flipperdevices#1151)

* Items order changed
* iButton,Rfid: correct order in enums

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>

* [FL-2496] SubGhz: fix freezing of the interface when the transmission of the RAW signal is forcibly canceled (flipperdevices#1152)

Co-authored-by: あく <alleteam@gmail.com>

* [FL-2493] Infrared: fix crash on invalid name. Input: cancel info in dump command. (flipperdevices#1153)

* Infrared: fix crash on invalid name. Input: cancel info in dump command.
* FuriHal: add abort handler

* SubGhz: fix Princeton duration (flipperdevices#1159)

* BadUSB Speedup: set USB HID interval to 2ms (flipperdevices#1166)

Co-authored-by: あく <alleteam@gmail.com>

* ci: Change GH-Actions comment to DFU download link (flipperdevices#1163)

Change the GitHub Actions bot comment to directly point to the full
firmware DFU download link.
Include a pointer to the qFlipper documentation to guide folks towards
installing the DFU file.
The WebUSB flashing link can be restored in the future if it returns.
See https://forum.flipperzero.one/t/no-database-found-after-firmware-update/1761/6

Co-authored-by: あく <alleteam@gmail.com>

* NFC: fix memory corruption in nfc_worker_read_mifare_desfire (flipperdevices#1156)

* NFC: fix memory corruption in nfc_worker_read_mifare_desfire
* NFC: if the NFC tag doesn't have apps or files, don't try to save them.
* NFC: make-format

Co-authored-by: Jack Doan <jackdoan@rivian.com>
Co-authored-by: Skorpionm <85568270+Skorpionm@users.noreply.github.com>
Co-authored-by: Nikolay Minaylov <nm29719@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>

* [FL-2269] Core2 OTA (flipperdevices#1144)

* C2OTA: wip
* Update Cube to 1.13.3
* Fixed prio
* Functional Core2 updater
* Removed hardware CRC usage; code cleanup & linter fixes
* Moved hardcoded stack params to copro.mk
* Fixing CI bundling of core2 fw
* Removed last traces of hardcoded radio stack
* OB processing draft
* Python scripts cleanup
* Support for comments in ob data
* Sacrificed SD card icon in favor of faster update. Waiting for Storage fix
* Additional handling for OB mismatched values
* Description for new furi_hal apis; spelling fixes
* Rework of OB write, WIP
* Properly restarting OB verification loop
* Split update_task_workers.c
* Checking OBs after enabling post-update mode
* Moved OB verification before flashing
* Removed ob.data for custom stacks
* Fixed progress calculation for OB
* Removed unnecessary OB mask cast

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>

* [FL-2502] Properly closing directory on free (flipperdevices#1174)

* Storage: better (at least working) mechanism to distinguish between files and dirs
* Storage API: debug log
* TarArchive: fix stream memleak
* TarArchive: fix another memleak
* Storage: better logs
* Storage: changed the log level to trace

Co-authored-by: あく <alleteam@gmail.com>

* [FL-2494, FL-2497] PIN Lock refactoring, IR library fix (flipperdevices#1167)

* PIN Lock refactoring
* Change tv.ir file type to prevent opening from archive
* Manifest update
* Assets: enforce sorting in fs traversal

Co-authored-by: あく <alleteam@gmail.com>

* [FL-2495] Archive: Refresh file list on application exit flipperdevices#1170

Co-authored-by: あく <alleteam@gmail.com>

* [FL-2510] Fixed BT startup while backing up LFS (flipperdevices#1180)

* Waiting for dummy BT record on LFS ops; cleaner retry for backup file open
* Fixed files not being closed on failed open

* [FL-2507]  Fix NTAG21x emulation fix (flipperdevices#1179)

* mifare ultralight: add support fast read to NTAG21x
* emv: add log traces

Co-authored-by: あく <alleteam@gmail.com>

* [FL-2456] App notifications update (flipperdevices#1175)

* Notifications update: SubGHz
* Notifications: ibutton, infrared, rfid

* Assets: update compile steps for docker-compose (flipperdevices#1181)

flipperdevices#1176

* [FL-2163] CLI: Separate session from CLI service (flipperdevices#1130)

* CLI: session refactoring
* Added forgotten define
* Desktop lock state save
* Dolphin: use proper type for value returned by dolphin_state_xp_to_levelup

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>

* SubGhz add protocol Firefly (flipperdevices#1183)

* SubGhz: add protocol "Firefly"
* SubGhz: refactoring "Add Manually" scene
* SubGhz: refactoring Firefly protocol

Co-authored-by: あく <alleteam@gmail.com>

* [FL-2399, FL-2261] Tickless sleep shenanigans (flipperdevices#1168)

* Disable USART in sleep
* Restore UART state on suspend/resume
* FuriHal: Enable stop mode and add insomnia to I2C and SPI
* Remove IDLE interrupt
* FuriHal: add FPU isr and disable all FPU interrupt, add core2 stop mode configuration on deep sleep
* FuriHal: tie stop mode debug with debug rtc flag
* FuriHal: adjust flash latency on clock switch, tie mcu debug with RTC debug flag
* FuriHal: move resource init to early stage
* Add EXTI pending check, enable debug traps with compile-time flag
* Wrap sleep debug functions in conditional compilation
* Remove erroneous changed
* Do not use CSS, remove it from everywhere
* Enable/disable USB on VBUS connect (prototype)
* FuriHal: add LPMS and DEEPSLEEP magic, workaround state inconsistency between cores
* FuriHal: honor c1 LMPS
* USB mode switch fix
* Applications: add flags and insomnia bypass system
* Correct spelling
* FuriHal: cleanup insomnia usage, reset sleep flags on wakeup, add shutdown api
* FuriHal: extra check on reinit request
* FuriHal: rename gpio_display_rst pin to gpio_display_rst_n
* FuriHal: add debug HAL
* FuriHal: add some magic to core2 reload procedure, fix issue with crash on ble keyboard exit
* FuriHal: cleanup ble glue, add BLE_GLUE_DEBUG flag
* FuriHal: ble reinit API, move os timer to LPTIM1 for deep sleep capability, shutdown that works
* FuriHal: take insomnia while shutdown
* Remove USB switch on/off on VBUS change
* Better tick skew handling
* Improve tick consistency under load
* Add USB_HP dummy IRQ handler
* Move interrupt check closer to sleep
* Clean up includes
* Re-enable Insomnia globally
* FuriHal: enable CSS
* FuriHal: remove questionable core2 clock shenanigans
* FuriHal: use core1 RCC registers in idle timer config
* FuriHal: return back CSS handlers, add lptim isr dispatching

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
Co-authored-by: nminaylov <nm29719@gmail.com>

* [FL-2515] Keep backlight on for updater ops (flipperdevices#1184)

* [FL-2515] Keep backlight on for updater ops
* Notification: Renamed backlight sequences to more obvious names

Co-authored-by: あく <alleteam@gmail.com>

* SubGhz: bug fixes  (flipperdevices#1192)

* Subghz: fix simultaneous detection of Princeton and GateTx
* SubGhz: fix phantom frequencies in the Frequency Analyzer

Co-authored-by: あく <alleteam@gmail.com>
Co-authored-by: hedger <hedger@users.noreply.github.com>
Co-authored-by: Dmitry Pavlov <di-smash007@mail.ru>
Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: Skorpionm <85568270+Skorpionm@users.noreply.github.com>
Co-authored-by: Nikolay Minaylov <nm29719@gmail.com>
Co-authored-by: Georgii Surkov <37121527+gsurkov@users.noreply.github.com>
Co-authored-by: Shane Synan <digitalcircuit36939@gmail.com>
Co-authored-by: Jack Doan <me@jackdoan.com>
Co-authored-by: Jack Doan <jackdoan@rivian.com>
Co-authored-by: SG <who.just.the.doctor@gmail.com>
Co-authored-by: Lee-Roy King <leeroywking@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants