MX
3d36105142
Merge branch 'fz-dev' into dev
2022-11-28 23:12:17 +03:00
Georgii Surkov
c535ce9b76
[FL-2997] Improve file name filtering #2047
...
Co-authored-by: あく <alleteam@gmail.com >
2022-11-29 04:28:51 +09:00
Skorpionm
84f9af3e7e
SubGhz: fix duration pricenton protocol ( #2054 )
...
Co-authored-by: あく <alleteam@gmail.com >
2022-11-29 04:17:57 +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
Michael Huebler
1b3156521c
NFC: Accept non-parsed apps in Mifare DESFire. ( #2041 )
...
* NFC: Accept non-parsed apps in Mifare DESFire. Fixes #2040
Co-authored-by: gornekich <n.gorbadey@gmail.com >
Co-authored-by: あく <alleteam@gmail.com >
2022-11-29 02:14:13 +09:00
RogueMaster
c161fbc0df
Merge branch 'UNLEASHED' into 420
2022-11-27 01:44:26 -05:00
RogueMaster
ce26d9eae5
Update mifare_ultralight.h
2022-11-26 22:15:53 -05:00
RogueMaster
69c851b888
Merge pull request #453 from Shmuma/pocsag
...
Pocsag
2022-11-26 18:41:43 -05:00
RogueMaster
2c8555c6a4
Merge pull request #452 from flipperdevices/skorp/subghz_fix_pricenton
...
SubGhz: fix duration pricenton protocol
2022-11-26 18:37:18 -05:00
RogueMaster
569a6fe6c3
fmt
2022-11-26 17:11:53 -05:00
RogueMaster
eb5ad7fb49
Update nfcv.c
2022-11-26 17:10:16 -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 17ba83f20e7484e573d0
2022-11-26 17:02:32 -05:00
RogueMaster
17ba83f20e
Merge branch 'pr/450' into 420
2022-11-26 17:00:36 -05:00
Max Lapan
dd578eb91c
Make linter happy
2022-11-26 17:47:56 +01:00
Max Lapan
07eff384a2
Merge branch 'dev' into pocsag
2022-11-26 17:22:29 +01:00
Max Lapan
12132fbbe7
Unit tests
2022-11-26 17:05:37 +01:00
g3gg0
67f8f5a014
added NfcVSendFlags to choose fields to send
2022-11-26 16:54:32 +01:00
Max Lapan
6734659e0d
Drop logging
2022-11-26 16:33:17 +01:00
Max Lapan
2609e982a8
Decoding of alert messages
2022-11-26 16:32:08 +01:00
g3gg0
4b18370dfa
fix SLIX/SLIX2 type indicator bits
2022-11-26 16:31:32 +01:00
MX
08e533ccf2
SubGHz: Fix Came Atomo and NiceFlorS counters
...
add check for protocols with 16bit counters, to block them for going higher than 16bit
2022-11-26 17:23:36 +03:00
SkorP
215c9b0eed
SubGhz: fix duration pricenton protocol
2022-11-26 12:54:14 +04:00
RogueMaster
68f51411a1
fmt
2022-11-26 02:23:03 -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
Max Lapan
7d3a39be65
Bring back protocol name
2022-11-25 21:00:33 +01:00
Max Lapan
e294e03618
Decoding of BCD messages
2022-11-25 19:46:02 +01: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
g3gg0
4b554c5f9e
code cleanup for ISO15693
...
added logging code for ISO15693
2022-11-25 10:31:17 +01:00
RogueMaster
28cc99ad2d
Revert "Merge branch 'pr/446' into 420"
...
This reverts commit 761dc48b3e91f037c63f
2022-11-25 03:08:53 -05:00
RogueMaster
761dc48b3e
Merge branch 'pr/446' into 420
2022-11-25 01:40:03 -05:00
RogueMaster
d1caca1894
Merge pull request #442 from mh-/dev
...
NFC: Accept non-parsed apps in Mifare DESFire
2022-11-25 01:24:02 -05:00
RogueMaster
b04b7e7edd
Merge pull request #441 from flipperdevices/gsurkov/2997_file_name_filtering
...
Improve file name filtering
2022-11-25 01:22:08 -05:00
g3gg0
013e88154f
implement ISO14433-A fully in software for pointless experimenting reasons and improving the DigitalReader / SignalSequence code in performance
2022-11-25 02:46:49 +01:00
gornekich
ea5840462b
Merge branch 'dev' into dev
2022-11-24 20:42:15 +04:00
Georgii Surkov
f01a1cfeae
Improve file name filtering
2022-11-24 18:53:21 +03:00
RogueMaster
db3676ee8a
Merge branch 'DarkFlippers:dev' into 420
2022-11-24 09:05:13 -05:00
MX
bf62f66dc8
SubGHz: Fix keeloq, SL, counter going higher than 16bits
...
Proper reset to 0 after we get to 0xFFFF
2022-11-24 17:03:50 +03:00
Michael Huebler
bf54016553
NFC: Accept non-parsed apps in Mifare DESFire.
...
Fixes #2040
Minor editorial changes
2022-11-24 12:06:27 +01:00
g3gg0
674a5c6f48
added ISO14443 tag emulator code, receiving only yet
2022-11-24 01:43:23 +01:00
RogueMaster
4a8c814daf
Merge branch 'UNLEASHED' into 420
2022-11-23 15:28:31 -05:00
g3gg0
73111c4ac1
optimized ISO15693 code
2022-11-23 21:25:36 +01:00
g3gg0
31efe21412
timing optimizations for DigitalSequence
2022-11-23 21:24:53 +01:00
MX
7829428455
Merge branch 'fz-dev' into dev
2022-11-23 19:21:50 +03:00
Sergey Gavrilov
c511c67e71
Core: thread allocation shortcut ( #2007 )
...
* Core: thread alloc+set shortcut
* Apps: use thread allocation shortcut
* Mark some service threads as services
* Init BT as soon as possible
Co-authored-by: あく <alleteam@gmail.com >
2022-11-23 21:49:17 +09:00
Skorpionm
00fcd9cfcd
[FL-2976] SubGhz: add protocol "Ansonic" ( #2000 )
...
* SubGhz: add protocol "Ansonic"
* SubGhz: fix encoder "Ansonic"
* SubGhz: add unit_test "Ansonic"
* SubGhz: fix flag
* SubGhz: protocol "Ansonic" fix timing
Co-authored-by: あく <alleteam@gmail.com >
2022-11-23 18:29:30 +09:00
