FIX: a minor bug fix from @marshmellow42 in "data raw" and ask/biphase.

ADD: started witha  ISO11784/85 demod function.

diff --git a/client/cmddata.c b/client/cmddata.c
index 76552351846713d433309c0ba9ce2c0de31617dc..90a0921ca75152d59139e420a4d534d1773bdc4a 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)
        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) {
        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); 
        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;
        if (errCnt < 0){
                if (g_debugMode || verbose) PrintAndLog("Error BiphaseRawDecode: %d", errCnt);
                return 0;


@@ -1457,6 +1457,25 @@ int CmdFSKdemodPyramid(const char *Cmd)
        return 1;
 }
 
        return 1;
 }
 

+int CmdIso11784demodBI(const char *Cmd){
+       //ASK/Biphase demod,
+       uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
+       size_t size = getFromGraphBuf(BitStream);
+       if (size==0) return 0;
+
+       //get binary from Biphase wave
+       int idx = ISO11784demodBI(BitStream, &size);
+       setDemodBuf(BitStream,128,idx);
+
+       size = removeParity(BitStream, idx+8, 4, 1, 88);
+       // if (size != 66){
+               // if (g_debugMode==1) PrintAndLog("DEBUG: Error - at parity check-tag size does not match AWID format");
+               // return 0;
+       // }
+       return 1;
+}
+
+

 //by marshmellow
 //attempt to psk1 demod graph buffer
 int PSKDemod(const char *Cmd, bool verbose)
 //by marshmellow
 //attempt to psk1 demod graph buffer
 int PSKDemod(const char *Cmd, bool verbose)


@@ -2212,6 +2231,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"},
        {"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"},
        {"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"},

diff --git a/client/cmddata.h b/client/cmddata.h
index c62307368d6ef3965a3d7dad3ae2842b9afc36d5..4ad5fbd0c63d8d4fa0847af05b11bdffcf867719 100644 (file)
--- a/client/cmddata.h
+++ b/client/cmddata.h
@@ -33,6 +33,7 @@ int CmdFSKdemodIO(const char *Cmd);
 int CmdFSKdemodParadox(const char *Cmd);
 int CmdFSKdemodPyramid(const char *Cmd);
 int CmdFSKrawdemod(const char *Cmd);
 int CmdFSKdemodParadox(const char *Cmd);
 int CmdFSKdemodPyramid(const char *Cmd);
 int CmdFSKrawdemod(const char *Cmd);

+int CmdIso11784demodBI(const char *Cmd);

 int CmdPSK1rawDemod(const char *Cmd);
 int CmdPSK2rawDemod(const char *Cmd);
 int CmdPSKNexWatch(const char *Cmd);
 int CmdPSK1rawDemod(const char *Cmd);
 int CmdPSK2rawDemod(const char *Cmd);
 int CmdPSKNexWatch(const char *Cmd);

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 7d40d22e5aa44551835ae4ada1f69947f132e488..2c65014409eebcb09ca22ea6a85d79f9649b179f 100644 (file)
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -589,6 +589,25 @@ size_t removeParity(uint8_t *BitStream, size_t startIdx, uint8_t pLen, uint8_t p
        //return ID start index and size
        return bitCnt;
 }
        //return ID start index and size
        return bitCnt;
 }

+// Ask/Biphase Demod then try to locate an ISO 11784/85 ID
+int ISO11784demodBI(uint8_t *dest, size_t *size)
+{
+       //make sure buffer has enough data
+       if (*size < 128*50) return -1;
+
+       if (justNoise(dest, *size)) return -2;
+
+       // FSK demodulator
+       *size = fskdemod(dest, *size, 50, 1, 10, 8);  // fsk2a RF/50 
+       if (*size < 96) return -3;  //did we get a good demod?
+
+       uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,1};
+       size_t startIdx = 0;
+       uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
+       if (errChk == 0) return -4; //preamble not found
+       if (*size != 128) return -5;
+       return (int)startIdx;
+}

 
 // by marshmellow
 // FSK Demod then try to locate an AWID ID
 
 // by marshmellow
 // FSK Demod then try to locate an AWID ID

diff --git a/common/lfdemod.h b/common/lfdemod.h
index ab81c34c459ef327cbe3ea595af3f1ecf1d5a72b..f2cee27f786e44c2febb2e631fc76e68e4e2d270 100644 (file)
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -47,5 +47,5 @@ int IOdemodFSK(uint8_t *dest, size_t size);
 int indala26decode(uint8_t *bitStream, size_t *size, uint8_t *invert);
 int PyramiddemodFSK(uint8_t *dest, size_t *size);
 int ParadoxdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo);
 int indala26decode(uint8_t *bitStream, size_t *size, uint8_t *invert);
 int PyramiddemodFSK(uint8_t *dest, size_t *size);
 int ParadoxdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo);

-
+int ISO11784demodBI(uint8_t *dest, size_t *size);

 #endif
 #endif