RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-12-28 19:31:19 +08:00
Code Issues Projects Releases Packages Wiki Activity

chg: zero mean in hidfskdemod

Browse source 
chg: idteck demod return values
This commit is contained in:
Chris 2018-09-06 21:44:53 +02:00
parent 24eaac8681
commit 3a338f566e
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
common/lfdemod.c
View file

@ -1697,11 +1697,11 @@ size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t clk, uint8_t invert, u
//by marshmellow (from holiman's base) //by marshmellow (from holiman's base)
// full fsk demod from GraphBuffer wave to decoded 1s and 0s (no mandemod) // full fsk demod from GraphBuffer wave to decoded 1s and 0s (no mandemod)
size_t fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *startIdx) { size_t fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *start_idx) {
if (signalprop.isnoise) return 0; if (signalprop.isnoise) return 0;
// FSK demodulator // FSK demodulator
size = fsk_wave_demod(dest, size, fchigh, fclow, startIdx); size = fsk_wave_demod(dest, size, fchigh, fclow, start_idx);
size = aggregate_bits(dest, size, rfLen, invert, fchigh, fclow, startIdx); size = aggregate_bits(dest, size, rfLen, invert, fchigh, fclow, start_idx);
return size; return size;
} }
@ -1905,6 +1905,16 @@ int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32
if (signalprop.isnoise) return -2; if (signalprop.isnoise) return -2;
// zero mean data
int i, accum = 0;
for (i = 10; i < *size; ++i)
accum += dest[i];
accum /= (*size - 10);
for (i = 0; i < *size; ++i)
dest[i] -= accum;
// FSK demodulator fsk2a so invert and fc/10/8 // FSK demodulator fsk2a so invert and fc/10/8
*size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); //hid fsk2a *size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); //hid fsk2a
@ -1943,12 +1953,19 @@ int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32
int detectIdteck(uint8_t *dest, size_t *size) { int detectIdteck(uint8_t *dest, size_t *size) {
//make sure buffer has data //make sure buffer has data
if (*size < 64*2) return -1; if (*size < 64*2) return -1;
size_t startIdx = 0;
if (signalprop.isnoise) return -2;
size_t start_idx = 0;
uint8_t preamble[] = {0,1,0,0,1,0,0,1,0,1,0,0,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,0,1,0,1,1}; uint8_t preamble[] = {0,1,0,0,1,0,0,1,0,1,0,0,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,0,1,0,1,1};
if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
return -2; //preamble not found //preamble not found
if (*size != 64) return -3; // wrong demoded size if (!preambleSearch(dest, preamble, sizeof(preamble), size, &start_idx))
return (int) startIdx; return -3;
// wrong demoded size
if (*size != 64) return -4;
return (int)start_idx;
} }
int detectIOProx(uint8_t *dest, size_t *size, int *waveStartIdx) { int detectIOProx(uint8_t *dest, size_t *size, int *waveStartIdx) {