FIX: lf hitag : Mea culpa, simulation should not have reader_field on. thanks to...

[proxmark3-svn] / client / cmdlfcotag.c

diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index e200e834abe0e7117076e62417edc752813f1a48..f10516a61053c3e7974308cf2b7ac68dba99ad8e 100644 (file)
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -8,24 +8,103 @@
 // Low frequency COTAG commands
 //-----------------------------------------------------------------------------
 #include "cmdlfcotag.h"  // COTAG function declarations
- 
+
 static int CmdHelp(const char *Cmd);
 
-int CmdCOTAGRead(const char *Cmd) {
+int usage_lf_cotag_read(void){
+       PrintAndLog("Usage: lf COTAG read [h] <signaldata>");
+       PrintAndLog("Options:");
+       PrintAndLog("      h          : This help");
+       PrintAndLog("      <0|1|2>    : 0 - HIGH/LOW signal; maxlength bigbuff");
+       PrintAndLog("                 : 1 - translation of HI/LO into bytes with manchester 0,1");
+       PrintAndLog("                 : 2 - raw signal; maxlength bigbuff");
+       PrintAndLog("");
+       PrintAndLog("Sample:");
+       PrintAndLog("        lf cotag read 0");
+       PrintAndLog("        lf cotag read 1");
+       return 0;
+}
+
+// COTAG demod should be able to use GraphBuffer,
+// when data load samples
+int CmdCOTAGDemod(const char *Cmd) {
+
+       uint8_t bits[COTAG_BITS] = {0};
+       size_t bitlen = COTAG_BITS;
+       memcpy(bits, DemodBuffer, COTAG_BITS);
+       
+       int err = manrawdecode(bits, &bitlen, 1);
+       if (err){
+               if (g_debugMode) PrintAndLog("DEBUG: Error - COTAG too many errors: %d", err);
+               return -1;
+       }
 
-//     if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_cotag_read();
+       setDemodBuf(bits, bitlen, 0);
 
-       UsbCommand c = {CMD_COTAG, {0, 0, 0}};
+       //got a good demod
+       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
+        cccc cccc cccc cccc                     ffffffff
+         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%08X", fc, cn, raw1 ,raw2, raw3, raw4);
+       return 1;
+}
+
+// When reading a COTAG.
+// 0 = HIGH/LOW signal - maxlength bigbuff
+// 1 = translation for HI/LO into bytes with manchester 0,1 - length 300
+// 2 = raw signal -  maxlength bigbuff         
+int CmdCOTAGRead(const char *Cmd) {
+       
+       if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_cotag_read();
+       
+       uint32_t rawsignal = 1;
+       sscanf(Cmd, "%u", &rawsignal);
+ 
+       UsbCommand c = {CMD_COTAG, {rawsignal, 0, 0}};
        clearCommandBuffer();
        SendCommand(&c);
-
-       getSamples("20000", TRUE);
-       return CmdFSKdemodAWID(Cmd);
+       if ( !WaitForResponseTimeout(CMD_ACK, NULL, 7000) ) {
+               PrintAndLog("command execution time out");
+               return -1;      
+       }
+       
+       switch ( rawsignal ){
+               case 0: 
+               case 2: {
+                       CmdPlot("");
+                       CmdGrid("384");
+                       getSamples("", true); break;
+               }
+               case 1: {
+                       GetFromBigBuf(DemodBuffer, COTAG_BITS, 0);
+                       DemodBufferLen = COTAG_BITS;
+                       UsbCommand response;
+                       if ( !WaitForResponseTimeout(CMD_ACK, &response, 1000) ) {
+                               PrintAndLog("timeout while waiting for reply.");
+                               return -1;
+                       }
+                       return CmdCOTAGDemod("");
+               }
+       }       
+       return 0;
 }
 
 static command_t CommandTable[] = {
        {"help",      CmdHelp,         1, "This help"},
-       {"read",      CmdCOTAGRead,     0, "Attempt to read and extract tag data"},
+       {"demod",     CmdCOTAGDemod,   1, "Tries to decode a COTAG signal"},
+       {"read",      CmdCOTAGRead,    0, "Attempt to read and extract tag data"},
        {NULL, NULL, 0, NULL}
 };