finish data printdemodbuffer command

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index d279c9e640313eab4f0b54bfba7aa899dbac823c..074a37e288efcc53adfbc0f1ff65d0b2b09a703a 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -288,6 +288,34 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
        uint8_t *parityBytes = trace + tracepos;
        tracepos += parity_len;
 
+       //Check the CRC status
+       uint8_t crcStatus = 2;
+
+       if (data_len > 2) {
+               uint8_t b1, b2;
+               if(protocol == ICLASS)
+               {
+                       crcStatus = iclass_CRC_check(isResponse, frame, data_len);
+
+               }else if (protocol == ISO_14443B)
+               {
+                       crcStatus = iso14443B_CRC_check(isResponse, frame, data_len);
+               }
+               else if (protocol == ISO_14443A){//Iso 14443a
+
+                       ComputeCrc14443(CRC_14443_A, frame, data_len-2, &b1, &b2);
+
+                       if (b1 != frame[data_len-2] || b2 != frame[data_len-1]) {
+                               if(!(isResponse & (data_len < 6)))
+                               {
+                                               crcStatus = 0;
+                               }
+                       }
+               }
+       }
+       //0 CRC-command, CRC not ok
+       //1 CRC-command, CRC ok
+       //2 Not crc-command
 
        //--- Draw the data column
        //char line[16][110];
@@ -301,7 +329,6 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
                for (k=0 ; k<8 ; k++) {
                        oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
                }
-
                uint8_t parityBits = parityBytes[j>>3];
                if (isResponse && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
                        snprintf(line[j/16]+(( j % 16) * 4),110, "%02x! ", frame[j]);
@@ -309,6 +336,14 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
                } else {
                        snprintf(line[j/16]+(( j % 16) * 4),110, "%02x  ", frame[j]);
                }
+
+       }
+       if(crcStatus == 1)
+       {//CRC-command
+               char *pos1 = line[(data_len-2)/16]+(((data_len-2) % 16) * 4)-1;
+               (*pos1) = '[';
+               char *pos2 = line[(data_len)/16]+(((data_len) % 16) * 4)-2;
+               (*pos2) = ']';
        }
        if(data_len == 0)
        {
@@ -317,33 +352,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
                }
        }
        //--- Draw the CRC column
-       uint8_t crcStatus = 2;
-
-       if (data_len > 2) {
-               uint8_t b1, b2;
-               if(protocol == ICLASS)
-               {
-                       crcStatus = iclass_CRC_check(isResponse, frame, data_len);
-
-               }else if (protocol == ISO_14443B)
-               {
-                       crcStatus = iso14443B_CRC_check(isResponse, frame, data_len);
-               }
-               else if (protocol == ISO_14443A){//Iso 14443a
-
-                       ComputeCrc14443(CRC_14443_A, frame, data_len-2, &b1, &b2);
 
-                       if (b1 != frame[data_len-2] || b2 != frame[data_len-1]) {
-                               if(!(isResponse & (data_len < 6)))
-                               {
-                                               crcStatus = 0;
-                               }
-                       }
-               }
-       }
-       //0 CRC-command, CRC not ok
-       //1 CRC-command, CRC ok
-       //2 Not crc-command
        char *crc = (crcStatus == 0 ? "!crc" : (crcStatus == 1 ? " ok " : "    "));
 
        EndOfTransmissionTimestamp = timestamp + duration;