Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2024-09-21 15:26:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove floats per piwi

Browse source
This commit is contained in:
marshmellow42 2015-03-31 10:49:06 -04:00
parent 070e3c4305
commit 75cbbe9a69
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
common/lfdemod.c
View file

@ -34,8 +34,8 @@ int getHiLo(uint8_t *BitStream, size_t size, int *high, int *low, uint8_t fuzzHi
if (BitStream[i] < *low) *low = BitStream[i]; if (BitStream[i] < *low) *low = BitStream[i];
} }
if (*high < 123) return -1; // just noise if (*high < 123) return -1; // just noise
*high = (int)(((*high-128)*(((float)fuzzHi)/100))+128); *high = ((*high-128)*fuzzHi + 12800)/100;
*low = (int)(((*low-128)*(((float)fuzzLo)/100))+128); *low = ((*low-128)*fuzzLo + 12800)/100;
return 1; return 1;
} }
@ -559,28 +559,26 @@ size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t rfLen,
size_t idx=0; size_t idx=0;
size_t numBits=0; size_t numBits=0;
uint32_t n=1; uint32_t n=1;
uint16_t lowWaves = ((rfLen*100/fclow)); // (((float)(rfLen))/((float)fclow));
uint16_t highWaves = ((rfLen*100/fchigh)); // (((float)(rfLen))/((float)fchigh));
for( idx=1; idx < size; idx++) { for( idx=1; idx < size; idx++) {
n++; n++;
if (dest[idx]==lastval) continue; if (dest[idx]==lastval) continue;
//if lastval was 1, we have a 1->0 crossing //if lastval was 1, we have a 1->0 crossing
if (dest[idx-1]==1) { if (dest[idx-1]==1) {
if (!numBits && n < lowWaves/100) { if (!numBits && n < rfLen/fclow) {
n=0; n=0;
lastval = dest[idx]; lastval = dest[idx];
continue; continue;
} }
n = (size_t)((((n*1000)/lowWaves)+5)/10); n = (n * fclow + rfLen/2) / rfLen;
} else {// 0->1 crossing } else {// 0->1 crossing
//test first bitsample too small //test first bitsample too small
if (!numBits && n < highWaves/100) { if (!numBits && n < rfLen/fchigh) {
n=0; n=0;
lastval = dest[idx]; lastval = dest[idx];
continue; continue;
} }
n = (((n*1000)/highWaves)+5)/10; n = (n * fchigh + rfLen/2) / rfLen;
} }
if (n == 0) n = 1; if (n == 0) n = 1;
@ -590,11 +588,11 @@ size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t rfLen,
lastval=dest[idx]; lastval=dest[idx];
}//end for }//end for
// if valid extra bits at the end were all the same frequency - add them in // if valid extra bits at the end were all the same frequency - add them in
if (n > highWaves/100) { if (n > rfLen/fchigh) {
if (dest[idx-2]==1) { if (dest[idx-2]==1) {
n=(((n*1000)/lowWaves)+5)/10; n = (n * fclow + rfLen/2) / rfLen;
} else { } else {
n=(((n*1000)/highWaves)+5)/10; n = (n * fchigh + rfLen/2) / rfLen;
} }
memset(dest+numBits, dest[idx-1]^invert , n); memset(dest+numBits, dest[idx-1]^invert , n);
numBits += n; numBits += n;