mirror of
https://github.com/Proxmark/proxmark3.git
synced 2024-09-21 15:26:35 +08:00
minor setting adjustments/cleanup
clean up code
This commit is contained in:
parent
66707a3b3c
commit
2df8c07907
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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))) {
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue