Commit Graph

1095 Commits

Author SHA1 Message Date
nullableVoidPtr
eaf72348a6 Merge branch 'dev' into nfcf 2022-12-10 12:21:54 +11:00
nullableVoidPtr
6c7cd0960c NFC: Add Felica info scenes and properly clear felica_data 2022-12-10 12:15:09 +11:00
RogueMaster
18f64f0002 Merge branch 'ofwdev' into 420 2022-12-09 00:24:04 -05:00
MX
8794aad5d0 Merge branch 'fz-dev' into dev 2022-12-08 21:41:45 +03:00
Aleksandr Kutuzov
a590f7e46b Merge remote-tracking branch 'origin/dev' into DigitalSequence_PulseReader 2022-12-08 16:04:31 +09:00
Shane Synan
5c3a5cd8f7 FuriHal, Power, UnitTests: battery charging voltage limit API (#2063) 2022-12-08 15:57:49 +09:00
MX
1fc67f76a2 Merge branch 'fz-dev' into dev 2022-12-08 08:58:39 +03:00
RogueMaster
c1fae1dce0 Merge branch 'ofwdev' into 420 2022-12-08 00:54:42 -05:00
Skorpionm
6a470a464e [FL-3002] SubGhz: add RPC error (#2097)
* [FL-3002] SubGhz: add RPC error
* RPC_APP: rpc_system_app_error_reset, automatic error reset when a new event is executed
* SubGhz: fix text error
* SubGhz: fix text error 2
* SubGhz: add error description
* Format sources

Co-authored-by: あく <alleteam@gmail.com>
2022-12-08 14:49:54 +09:00
RogueMaster
9261e3cdcf Merge branch 'ofwdev' into 420 2022-12-07 19:16:33 -05:00
Mekare
2871759877 use FuriHalNfcADevData instead of using each of its fields in function calls 2022-12-07 22:24:44 +01:00
Nikolay Minaylov
2daf39018b [FL-3001] File browser base folder (#2091)
* File browser base folder
* Format sources
* FuriHal: bump api version

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2022-12-07 23:17:41 +09:00
gornekich
9a21dae29c [FL-3008], [FL-2734], [FL-2766], [FL-2898] NFC bug fixes (#2098)
* nfc: rework mf classic update
* nfc: rename cache folder to .cache
* nfc: fix ATQA order bytes in nfc files
* file browser: add hide dot files option
* nfc: fix iso-14443-4 uid cards emulation
* nfc: fix unit tests

Co-authored-by: あく <alleteam@gmail.com>
2022-12-07 19:52:44 +09:00
RogueMaster
4414b6451a Merge branch 'pr/462' into 420 2022-12-06 19:38:40 -05:00
gornekich
1c40592823 nfc: fix iso-14443-4 uid cards emulation 2022-12-06 17:32:11 +04:00
gornekich
79140829b3 file browser: add hide dot files option 2022-12-06 15:22:03 +04:00
nullableVoidPtr
eaa2dea075 NFC: initial support for NFC-F (FeliCa) 2022-12-06 02:31:25 +08:00
g3gg0.de
45757f2f52 Merge branch 'dev' into DigitalSequence_PulseReader 2022-12-05 17:24:55 +01:00
g3gg0
9404c2f108 flagged functions in api_symbols.csv 2022-12-05 10:36:15 +01:00
RogueMaster
f6e65139ea Merge branch 'UNLEASHED' into 420 2022-12-01 16:15:43 -05:00
MX
45d6826fa0 Merge branch 'fz-dev' into dev 2022-12-01 22:00:58 +03:00
Nikolay Minaylov
4070eeb1c9 USB HID: fix key name #2065
Co-authored-by: あく <alleteam@gmail.com>
2022-12-02 03:56:27 +09:00
Nikolay Minaylov
7f67445c85 U2F HID descriptor fix (#2073)
Co-authored-by: あく <alleteam@gmail.com>
2022-12-02 03:40:49 +09:00
RogueMaster
11ba083862 Merge branch 'UNLEASHED' into 420 2022-11-30 15:10:14 -05:00
RogueMaster
aa78d8c124 Merge branch 'flipperdevices:dev' into 420 2022-11-30 14:27:57 -05:00
MX
0b9d632363 Misc improvements 2022-11-30 20:03:55 +03:00
MX
a66f94d22e Merge branch 'fz-dev' into dev 2022-11-30 15:27:55 +03:00
Skorpionm
2a6a3a1bf7 [FL-2955], [FL-2953] SubGhz: fix RAW "Send never ends" (#1979)
* SubGhz: fix RAW "Send never ends"
* SubGhz: delete comments
* SubGhz: RAW file parsing speed increase
* SubGhz: fix level_duration_is_wait
* SubGhz: modification furi_hal_subghz_async_tx_refill
* SubGhz: furi_hal_subghz_stop_async_rx
* SubGhz: hal unit test and better async tx yield handling
* FuriHal: proper async tx end in subghz, vibro on power off
* FuriHal: variable naming in subghz
* SubGhz,FuriHal: extreme timings in subghz hal unit tests, remove memset in async tx buffer fill routine
* FuriHal: small refinements in subghz

Co-authored-by: あく <alleteam@gmail.com>
2022-11-30 20:41:23 +09:00
RogueMaster
b4656d801b Merge branch 'UNLEASHED' into 420 2022-11-29 12:38:01 -05:00
MX
eec21b073b Merge branch 'fz-dev' into dev 2022-11-29 16:11:13 +03:00
Sergey Gavrilov
297f185ef4 Blocking USB driver API (#2009)
* invalidate memmgt thread dict
* Core: rollback memmgt thread dict invalidation
* Dialogs: move api lock to toolbox
* HAL: blocking usb API
* HAL usb: fix api return data
* HAL usb: api optimization
* api lock: test results
* Fix build errors
* DAP Link: fix imports
* Crash when malloc in ISR
* Fix dap-link copypaste error
* Moar memory management crashes.
* Crash when malloc in IRQ, not ISR
* USB-UART: Blocking VCP mode switch

Co-authored-by: nminaylov <nm29719@gmail.com>
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2022-11-29 21:50:55 +09:00
Georgii Surkov
0261dc3075 [FL-2957] Unified Info API, App Error, Data Xchange (#1998)
* Update protobuf definitions
* Add Property subsystem entry point function
* Key-based system info and power info function stubs
* Remove unneeded functions
* Working power info
* Working system info
* Replace #defines with string literals
* Remove unneeded field
* Simplify system info formatting
* Refactor output callback handling
* Handle the last info element correctly
* Optimise power info, rename methods
* Add comments
* Add power debug
* Remove unneeded definitions
* Rename some files and functions
* Update protobuf definitions
* Implement App GetError and DataExchange APIs
* Send GetErrorReply with correct command_id
* Add RPC debug app stub
* Add more scenes
* Add warning, increase stack size
* Add receive data exchange scene
* Improve data exchange
* Add notifications
* Update application requirements
* Bump format version for property-based infos
* Correctly reset error text
* RCP: sync protobuf repo to latest release tag

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2022-11-29 18:08:08 +09:00
RogueMaster
aa8e7d93ff Merge branch 'pr/456' into 420 2022-11-29 00:56:39 -05:00
g3gg0
1b6b4b6522 cleaned up SLIX code
added callbacks for card-specific ISO15693-3 handling
2022-11-29 01:00:41 +01:00
MX
3d36105142 Merge branch 'fz-dev' into dev 2022-11-28 23:12:17 +03:00
あく
769c53b6da [FL-2977] Gui: better navigation in file browser dialog (#2014)
* Gui: proper navigation in file browser dialog
* Trim file name from start path
* File list loading fix
* File list offset fix

Co-authored-by: nminaylov <nm29719@gmail.com>
Co-authored-by: Sergey Gavrilov <who.just.the.doctor@gmail.com>
2022-11-29 03:59:24 +09:00
RogueMaster
72bd6bc865 Merge branch 'ofwdev' into 420 2022-11-28 13:26:36 -05:00
Yukai Li
6b47bc1af4 Nfc: NTAG password auto capture (and other password-related changes) (#1843)
* nfc: MFUL minor cleanup
* nfc: Add mechanism to pass event data
* nfc: Add NTAG authentication event to emulation
* nfc: Rename enum member to align with existing convention
* nfc: Add function to determine whether MFUL is fully captured
* nfc: Fix emulation of incompletely-read password-protected MFUL
* nfc: Add reader password capture scene
* nfc: Set default MFUL password input to 0xFFFFFFFF
* nfc: Fix MFUL auth counter loading
* nfc: Be explicit about using manual auth method when using auto unlock
* nfc: Fill in MFUL has_auth when loading file
* nfc: Fix MFUL auth success usage, remove unused variable
* nfc: Display PWD and PACK in MFUL info if available
* nfc: Remove unnecessary include
* nfc: Add unlock options to loaded MFUL menu
* nfc: Move set default MFUL password. This way it can be edited if needed instead of reentered
* nfc: Fix unlock menu not maintaining selection index
* nfc: Move captured MFUL auth data from worker to device data
* nfc: Attempt to authenticate with default PWD when possible when reading NTAG
* nfc: Don't try to auth NTAG on read if we already authed
* nfc: Add title for all pages read but failed auth for NTAG auth
* nfc: Add faster auth callback patch
* lib: Remove scons submodule from index
* nfc: Revise MFUL unlock UI flow
* nfc: Disallow MFUL unlock with reader if card not read yet. Trying to read first results in either needing to make a new scene or badly jury rigging other scenes, so let's just not do that
* f7: Bump API symbols
* Format code

Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2022-11-29 03:16:22 +09:00
RogueMaster
e7ccb8029d Update api_symbols.csv 2022-11-26 21:40:38 -05:00
RogueMaster
a2f491ecdf Update api_symbols.csv 2022-11-26 19:30:26 -05:00
RogueMaster
16a037fc4e Revert "Revert "Merge branch 'pr/450' into 420""
This reverts commit 076b11e872.
2022-11-26 17:05:26 -05:00
RogueMaster
076b11e872 Revert "Merge branch 'pr/450' into 420"
This reverts commit 17ba83f20e, reversing
changes made to 7484e573d0.
2022-11-26 17:02:32 -05:00
RogueMaster
17ba83f20e Merge branch 'pr/450' into 420 2022-11-26 17:00:36 -05:00
g3gg0
466a2fd96f remove unneccessary function 2022-11-26 16:33:02 +01:00
RogueMaster
090932fa06 Update api_symbols.csv 2022-11-25 21:52:17 -05:00
RogueMaster
41e9c09fba Merge branch 'pr/448' into 420 2022-11-25 21:43:35 -05:00
RogueMaster
a15ee2ea7d Revert "Revert "Merge branch 'pr/446' into 420""
This reverts commit 28cc99ad2d.
2022-11-25 21:41:55 -05:00
g3gg0
0cb784aadd undo NfcA changes which might have looked better, but brought no reliability improvement 2022-11-25 12:08:36 +01:00
g3gg0
c1b5394b0f further mergability updates 2022-11-25 11:42:29 +01:00
g3gg0
27b99e15a4 further cleanups towards a proper merge
SLIX-L accepts all passwords when password is zero
2022-11-25 11:31:19 +01:00