ADD: removed the paritythingy, I missunderstood its purpose.

[proxmark3-svn] / client / cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index 76552351846713d433309c0ba9ce2c0de31617dc..3b9c3a663d61c84d20ad93bd67fab5a5af9de2e2 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -500,7 +500,7 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose)
        int offset=0, clk=0, invert=0, maxErr=0, ans=0;
        ans = sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr);
        if (ans>0)
-               ans = ASKDemod(Cmd+1, FALSE, FALSE, 0);
+               ans = ASKDemod(Cmd+2, FALSE, FALSE, 0);
        else
                ans = ASKDemod(Cmd, FALSE, FALSE, 0);
        if (!ans) {
@@ -512,7 +512,7 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose)
        size_t size = DemodBufferLen;
        uint8_t BitStream[MAX_DEMOD_BUF_LEN];
        memcpy(BitStream, DemodBuffer, DemodBufferLen); 
-       int errCnt = BiphaseRawDecode(BitStream, &size, offset, 0);
+       int errCnt = BiphaseRawDecode(BitStream, &size, offset, invert);
        if (errCnt < 0){
                if (g_debugMode || verbose) PrintAndLog("Error BiphaseRawDecode: %d", errCnt);
                return 0;
@@ -1457,6 +1457,82 @@ int CmdFSKdemodPyramid(const char *Cmd)
        return 1;
 }
 
+// ISO11784/85 demod  (aka animal tag)  BIPHASE, inverted, rf/32,  with preamble of 00000000001 (128bits)
+// 8 databits + 1 parity (1)
+// CIITT 16 chksum
+// NATIONAL CODE, ICAR database
+// COUNTRY CODE (ISO3166) 
+// FLAG (animal/non-animal)
+/*
+38 IDbits   
+10 country code 
+1 extra app bit
+14 reserved bits
+1 animal bit
+16 ccitt CRC chksum over 64bit ID CODE.
+24 appli bits.
+
+-- sample: 985121004515220
+
+Now is nibble shifting, byte shifting.
+*/
+int CmdIso11784demodBI(const char *Cmd){
+
+       int invert = 1;
+       int clk = 32;           
+       int errCnt = 0;
+       uint8_t BitStream[MAX_DEMOD_BUF_LEN];   
+       size_t size = getFromGraphBuf(BitStream);       
+       
+       errCnt = askdemod(BitStream, &size, &clk, &invert, 0, 0, 0);
+       if ( errCnt<0 ) { 
+               if (g_debugMode) PrintAndLog("DEBUG: no data found %d, clock: 32", errCnt);
+               return 0;
+       }
+
+       errCnt = BiphaseRawDecode(BitStream, &size, 0, 1);
+       if (errCnt < 0){
+               if (g_debugMode) PrintAndLog("Error BiphaseRawDecode: %d", errCnt);
+               return 0;
+       } 
+       
+       int preambleIndex = ISO11784demodBI(BitStream, &size);
+       if (preambleIndex < 0){
+               if (g_debugMode) PrintAndLog("Error ISO11784Demod , no startmarker found :: %d",preambleIndex);
+               return 0;
+       }
+       
+       PrintAndLog("startmarker %d;   Size %d", preambleIndex, size);
+
+       //got a good demod
+       uint8_t ByteStream[16] = {0x00};
+       uint8_t bitCnt = 0;
+       uint8_t ByteCnt = 0;
+       size_t startIdx = preambleIndex + 11; //start after preamble
+       for (size_t idx = 0; idx < size; idx++){
+
+               if ( bitCnt == 9 ){
+                       bitCnt = 0;
+                       continue;
+               }
+               //lsb first
+               ByteStream[ByteCnt] |= ( BitStream[startIdx+idx] << bitCnt );
+               bitCnt++;
+               if (bitCnt % 8 == 0){
+                       if (g_debugMode) PrintAndLog("byte %d: %02x", ByteCnt, ByteStream[ByteCnt]);
+                       bitCnt = 9;
+                       ByteCnt++;
+               }
+       }
+       PrintAndLog("DATA:  %s", sprint_hex(ByteStream, 14));
+       //now ByteStream contains 16 bytes of decrypted raw tag data
+       setDemodBuf(BitStream+preambleIndex, 128, 0);
+       printDemodBuff();
+       return 1;
+       
+}
+
+
 //by marshmellow
 //attempt to psk1 demod graph buffer
 int PSKDemod(const char *Cmd, bool verbose)
@@ -2212,6 +2288,7 @@ static command_t CommandTable[] =
        {"hexsamples",      CmdHexsamples,      0, "<bytes> [<offset>] -- Dump big buffer as hex bytes"},
        {"hide",            CmdHide,            1, "Hide graph window"},
        {"hpf",             CmdHpf,             1, "Remove DC offset from trace"},
+       {"iso11784demod",   CmdIso11784demodBI, 1, "Demodulate a ISO11784/85 Biphase tag from GraphBuffer"},
        {"load",            CmdLoad,            1, "<filename> -- Load trace (to graph window"},
        {"ltrim",           CmdLtrim,           1, "<samples> -- Trim samples from left of trace"},
        {"rtrim",           CmdRtrim,           1, "<location to end trace> -- Trim samples from right of trace"},