dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Proxmark/proxmark3

Browse Source 
Conflicts:
	client/cmddata.c
This commit is contained in:
iceman1001
2015-01-30 15:22:01 +01:00
parent 21e06301b9 15491b2d73
commit 908536d161
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/cmddata.c
View File

@@ -63,10 +63,8 @@ void printDemodBuff()
} }
if (bitLen>512) bitLen=512; //max output to 512 bits if we have more - should be plenty if (bitLen>512) bitLen=512; //max output to 512 bits if we have more - should be plenty
// equally divided by 16 // ensure equally divided by 16
bitLen &= 0xfff0;
if ( bitLen % 16 > 0)
bitLen = (bitLen/16)*16;
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", 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; return;
} }
if (bitLen>512) bitLen=512; if (bitLen>512) bitLen=512;
// ensure equally divided by 16
bitLen &= 0xfff0;
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", PrintAndLog("%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i",
BitStream[i], BitStream[i],