Merge branch 'master' into topaz
authorpwpiwi <pwpiwi@users.noreply.github.com>
Tue, 25 Aug 2015 05:53:00 +0000 (07:53 +0200)
committerpwpiwi <pwpiwi@users.noreply.github.com>
Tue, 25 Aug 2015 05:53:00 +0000 (07:53 +0200)
1  2 
armsrc/BigBuf.c
armsrc/iso14443a.c
client/Makefile
client/cmdhf.c

diff --cc armsrc/BigBuf.c
Simple merge
Simple merge
diff --cc client/Makefile
Simple merge
diff --cc client/cmdhf.c
index 4777a0f40295b40408e03a3a505eeb73560f041c,f8daff7e5ef106f20721ef1dfd53a706648da8f2..ee0b4fd8c1855f83da631df3476ad46b6de83bbd
@@@ -484,10 -378,11 +484,10 @@@ uint16_t printTraceLine(uint16_t tracep
                        oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
                }
                uint8_t parityBits = parityBytes[j>>3];
-               if (protocol != ISO_14443B && isResponse && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
+               if (protocol != ISO_14443B && (isResponse || protocol == ISO_14443A) && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
                        snprintf(line[j/16]+(( j % 16) * 4),110, "%02x! ", frame[j]);
 -
                } else {
 -                      snprintf(line[j/16]+(( j % 16) * 4),110, "%02x  ", frame[j]);
 +                      snprintf(line[j/16]+(( j % 16) * 4), 110, " %02x ", frame[j]);
                }
  
        }
Impressum, Datenschutz