github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fpga 14b merge p.N

Browse source
This commit is contained in:
iceman1001 2020-07-14 15:46:05 +02:00
commit ce981d9124
1 changed files with 159 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

4
armsrc/iso14443b.c
View file

@ -720,9 +720,6 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
} \ } \
} }
// Subcarrier amplitude v = sqrt(ci^2 + cq^2), approximated here by abs(ci) + abs(cq)
// Subcarrier amplitude v = sqrt(ci^2 + cq^2), approximated here by max(abs(ci),abs(cq)) + 1/2*min(abs(ci),abs(cq)))
#define SUBCARRIER_DETECT_THRESHOLD 8 #define SUBCARRIER_DETECT_THRESHOLD 8
//note: couldn't we just use MAX(ABS(ci),ABS(cq)) + (MIN(ABS(ci),ABS(cq))/2) from common.h - marshmellow //note: couldn't we just use MAX(ABS(ci),ABS(cq)) + (MIN(ABS(ci),ABS(cq))/2) from common.h - marshmellow
@ -883,7 +880,6 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
/* /*
* Demodulate the samples we received from the tag, also log to tracebuffer * Demodulate the samples we received from the tag, also log to tracebuffer
* quiet: set to 'TRUE' to disable debug output
*/ */
static int GetTagSamplesFor14443bDemod(int timeout) { static int GetTagSamplesFor14443bDemod(int timeout) {
int ret = 0; int ret = 0;