Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts: client/cmddata.c
This commit is contained in:
@@ -63,10 +63,8 @@ void printDemodBuff()
|
||||
}
|
||||
if (bitLen>512) bitLen=512; //max output to 512 bits if we have more - should be plenty
|
||||
|
||||
// equally divided by 16
|
||||
|
||||
if ( bitLen % 16 > 0)
|
||||
bitLen = (bitLen/16)*16;
|
||||
// ensure equally divided by 16
|
||||
bitLen &= 0xfff0;
|
||||
|
||||
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",
|
||||
@@ -200,6 +198,11 @@ void printBitStream(uint8_t BitStream[], uint32_t bitLen)
|
||||
return;
|
||||
}
|
||||
if (bitLen>512) bitLen=512;
|
||||
|
||||
// ensure equally divided by 16
|
||||
bitLen &= 0xfff0;
|
||||
|
||||
|
||||
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],
|
||||
|
||||
Reference in New Issue
Block a user