RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-11-10 17:49:32 +08:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
ADD: started witha  ISO11784/85 demod function.
This commit is contained in:
iceman1001 2015-06-03 21:12:24 +02:00
parent 77533e21ae
commit 615f21dde2
4 changed files with 43 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
client/cmddata.c
View file

@ -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,25 @@ int CmdFSKdemodPyramid(const char *Cmd)
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)
@ -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"},
{"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"},

1
client/cmddata.h
View file

@ -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 CmdIso11784demodBI(const char *Cmd);
int CmdPSK1rawDemod(const char *Cmd);
int CmdPSK2rawDemod(const char *Cmd);
int CmdPSKNexWatch(const char *Cmd);

19
common/lfdemod.c
View file

@ -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;
}
// 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

2
common/lfdemod.h
View file

@ -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 ISO11784demodBI(uint8_t *dest, size_t *size);
#endif