CHG: 'lf cotag read' - added the raw output and the repeating byte pattern is 16bytes...

diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index 3c1c3caa0553c64322b71c66c9fad2d4f6edb728..f10516a61053c3e7974308cf2b7ac68dba99ad8e 100644 (file)
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -45,6 +45,11 @@ int CmdCOTAGDemod(const char *Cmd) {
        uint16_t cn = bytebits_to_byteLSBF(bits+1, 16);
        uint32_t fc = bytebits_to_byteLSBF(bits+1+16, 8);
        
        uint16_t cn = bytebits_to_byteLSBF(bits+1, 16);
        uint32_t fc = bytebits_to_byteLSBF(bits+1+16, 8);
        

+       uint32_t raw1 = bytebits_to_byteLSBF(bits, 32);
+       uint32_t raw2 = bytebits_to_byteLSBF(bits+32, 32);
+       uint32_t raw3 = bytebits_to_byteLSBF(bits+64, 32);
+       uint32_t raw4 = bytebits_to_byteLSBF(bits+96, 32);
+       

        /*
        fc 161:   1010 0001 -> LSB 1000 0101
        cn 33593  1000 0011 0011 1001 -> LSB 1001 1100 1100 0001
        /*
        fc 161:   1010 0001 -> LSB 1000 0101
        cn 33593  1000 0011 0011 1001 -> LSB 1001 1100 1100 0001


@@ -52,8 +57,7 @@ int CmdCOTAGDemod(const char *Cmd) {
          0 1001 1100 1100 0001 1000 0101 0000 0000 100001010000000001111011100000011010000010000000000000000000000000000000000000000000000000000000100111001100000110000101000
         1001 1100 1100 0001                     10000101                                                                                         
        */
          0 1001 1100 1100 0001 1000 0101 0000 0000 100001010000000001111011100000011010000010000000000000000000000000000000000000000000000000000000100111001100000110000101000
         1001 1100 1100 0001                     10000101                                                                                         
        */

-       //PrintAndLog("COTAG Found: FC %u, CN: %u Raw: %08X%08X%08X", fc, cn); //, raw1 ,raw2, raw3);
-       PrintAndLog("COTAG Found: FC %u, CN: %u", fc, cn); 
+       PrintAndLog("COTAG Found: FC %u, CN: %u Raw: %08X%08X%08X%08X", fc, cn, raw1 ,raw2, raw3, raw4);

        return 1;
 }
 
        return 1;
 }
 

diff --git a/client/cmdlfcotag.h b/client/cmdlfcotag.h
index 265f60d965898ae865521fd7c8ca842a5b3641c9..dab6051343d5937eff48d58f9ede4899a0879650 100644 (file)
--- a/client/cmdlfcotag.h
+++ b/client/cmdlfcotag.h
@@ -20,7 +20,7 @@
 #include "cmdlf.h"             // Setconfig 
 
 #ifndef COTAG_BITS
 #include "cmdlf.h"             // Setconfig 
 
 #ifndef COTAG_BITS

-#define COTAG_BITS 320
+#define COTAG_BITS 264

 #endif
 
 int CmdLFCOTAG(const char *Cmd);
 #endif
 
 int CmdLFCOTAG(const char *Cmd);

diff --git a/include/proxmark3.h b/include/proxmark3.h
index 4fb1a30b4060ffa7c11b7ca1a72712041b94f085..23d7b1ceb81932e8b3836c24059ee0ca9d61d594 100644 (file)
--- a/include/proxmark3.h
+++ b/include/proxmark3.h
@@ -65,7 +65,7 @@
 #define FALSE 0
 
 #ifndef COTAG_BITS
 #define FALSE 0
 
 #ifndef COTAG_BITS

-#define COTAG_BITS 320
+#define COTAG_BITS 264

 #endif
 
 //#define PACKED __attribute__((__packed__))
 #endif
 
 //#define PACKED __attribute__((__packed__))