github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-14 10:37:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

iso15 sniffing: intragrate 2SC sniffing in same FPGA mode

Browse source 
switching Fpgamode while sniffing with FpgaWriteConfWord() was
sometimes too long so the tag answer start was lost.
Now, (only with FPGA_BITSTREAM_HF_15) with "FPGA_HF_READER_MODE_SNIFF_AMPLITUDE |
FPGA_HF_READER_2SUBCARRIERS_424_484_KHZ": the amplitude is shrank
from its 2 LSB bits and those 2 bits are now used to return the current
frequency. From my tests, this 2 bits reduction does not affect
quality of 1SC sniffing, but it may have slightly reduced the
receiving range.

FPGA FSK decoding code is also improved.
This commit is contained in:
Yann GASCUEL 2022-03-04 09:45:12 +01:00
commit 38d49097f9
7 changed files with 469 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

9
armsrc/fpgaloader.h
View file

@ -106,14 +106,7 @@ thres| x x x x x x x x
#define FPGA_HF_READER_SUBCARRIER_848_KHZ (0<<4)
#define FPGA_HF_READER_SUBCARRIER_424_KHZ (1<<4)
#define FPGA_HF_READER_SUBCARRIER_212_KHZ (2<<4)
#define FPGA_HF_FSK_READER_OUTPUT_1695_KHZ (0<<0)
#define FPGA_HF_FSK_READER_OUTPUT_848_KHZ (1<<0)
#define FPGA_HF_FSK_READER_OUTPUT_424_KHZ (2<<0)
#define FPGA_HF_FSK_READER_OUTPUT_212_KHZ (3<<0)
#define FPGA_HF_FSK_READER_NOPOWER (0<<4)
#define FPGA_HF_FSK_READER_WITHPOWER (1<<4)
#define FPGA_HF_READER_2SUBCARRIERS_424_484_KHZ (3<<4)
// Options for the HF simulated tag, how to modulate
#define FPGA_HF_SIMULATOR_NO_MODULATION 0x0 // 0000