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

minor setting adjustments/cleanup

Browse source 
clean up code
This commit is contained in:
marshmellow42 2014-12-29 15:58:59 -05:00
parent 66707a3b3c
commit 2df8c07907
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
client/cmddata.c
View file

@ -132,7 +132,7 @@ void printBitStream(uint8_t BitStream[], uint32_t bitLen){
return;
}
if (bitLen>512) bitLen=512;
for (i = 0; i < (bitLen-16); i+=16) {
for (i = 0; i <= (bitLen-16); i+=16) {
PrintAndLog("%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i",
BitStream[i],
BitStream[i+1],
@ -272,6 +272,10 @@ int Cmdmandecoderaw(const char *Cmd)
}
bitnum=i;
errCnt=manrawdemod(BitStream,&bitnum);
if (errCnt>=20){
PrintAndLog("Too many errors: %d",errCnt);
return 0;
}
PrintAndLog("Manchester Decoded - # errors:%d - data:",errCnt);
printBitStream(BitStream,bitnum);
if (errCnt==0){
@ -515,7 +519,7 @@ int CmdFSKrawdemod(const char *Cmd)
RepaintGraphWindow();
// Now output the bitstream to the scrollback by line of 16 bits
if(size > (7*32)+2) size = (7*32)+2; //only output a max of 7 blocks of 32 bits most tags will have full bit stream inside that sample size
if(size > (8*32)+2) size = (8*32)+2; //only output a max of 8 blocks of 32 bits most tags will have full bit stream inside that sample size
printBitStream(BitStream,size);
return 0;
}

6
common/lfdemod.c
View file

@ -259,7 +259,7 @@ int manrawdemod(uint8_t * BitStream, int *bitLen)
bitnum=0;
}
errCnt=bestErr;
if (errCnt<10){
if (errCnt<20){
for (i=0; i<bitnum;++i){
BitStream[i]=BitStream2[i];
}
@ -278,7 +278,7 @@ int askrawdemod(uint8_t *BinStream, int *bitLen,int *clk, int *invert)
// int invert=0; //invert default
int high = 0, low = 0;
*clk=DetectClock2(BinStream,*bitLen,*clk); //clock default
uint8_t BitStream[252] = {0};
uint8_t BitStream[502] = {0};
if (*clk<8) *clk =64;
if (*clk<32) *clk=32;
@ -368,7 +368,7 @@ int askrawdemod(uint8_t *BinStream, int *bitLen,int *clk, int *invert)
}
}
}
if (bitnum>250) break;
if (bitnum>500) break;
}
//we got more than 64 good bits and not all errors
if ((bitnum > (64+errCnt)) && (errCnt<(*bitLen/1000))) {

2
common/lfdemod.h
View file

@ -22,7 +22,7 @@ int fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert);
uint32_t bytebits_to_byte(uint8_t* src, int numbits);
//
#define MAX_BitStream_LEN (1024*128)
//#define MAX_BitStream_LEN (1024*128)
//extern int BitStreamLen;
#endif