git.zerfleddert.de Git - proxmark3-svn/blobdiff

index 0907f3c538efbc36b9aec69179e8c35ac0d47723..394dcbc2286ee5dfc8002899f4dd3555be2ce290 100644 (file)

--- a/client/cmddata.c

+++ b/client/cmddata.c

@@ -58,11 +58,12 @@ int CmdSetDebugMode(const char *Cmd)

}

int usage_data_printdemodbuf(){

}

int usage_data_printdemodbuf(){

- PrintAndLog("Usage: data printdemodbuffer x o <offset>");

+ PrintAndLog("Usage: data printdemodbuffer x o <offset> l <length>");

PrintAndLog("Options: ");

PrintAndLog(" h This help");

PrintAndLog(" x output in hex (omit for binary output)");

PrintAndLog(" o <offset> enter offset in # of bits");

PrintAndLog("Options: ");

PrintAndLog(" h This help");

PrintAndLog(" x output in hex (omit for binary output)");

PrintAndLog(" o <offset> enter offset in # of bits");

+ PrintAndLog(" l <length> enter length to print in # of bits or hex characters respectively");

return 0;

}

return 0;

}

@@ -87,7 +88,8 @@ int CmdPrintDemodBuff(const char *Cmd)

char hex[512]={0x00};

bool hexMode = false;

bool errors = false;

char hex[512]={0x00};

bool hexMode = false;

bool errors = false;

- uint8_t offset = 0;

+ uint32_t offset = 0; //could be size_t but no param_get16...

+ uint32_t length = 512;

char cmdp = 0;

while(param_getchar(Cmd, cmdp) != 0x00)

{

char cmdp = 0;

while(param_getchar(Cmd, cmdp) != 0x00)

{

@@ -103,10 +105,16 @@ int CmdPrintDemodBuff(const char *Cmd)

break;

case 'o':

case 'O':

break;

case 'o':

case 'O':

- offset = param_get8(Cmd, cmdp+1);

+ offset = param_get32ex(Cmd, cmdp+1, 0, 10);

if (!offset) errors = true;

cmdp += 2;

break;

if (!offset) errors = true;

cmdp += 2;

break;

+ case 'l':

+ case 'L':

+ length = param_get32ex(Cmd, cmdp+1, 512, 10);

+ if (!length) errors = true;

+ cmdp += 2;

+ break;

default:

PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));

errors = true;

default:

PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));

errors = true;

@@ -116,18 +124,17 @@ int CmdPrintDemodBuff(const char *Cmd)

}

//Validations

if(errors) return usage_data_printdemodbuf();

}

//Validations

if(errors) return usage_data_printdemodbuf();

- int numBits = (DemodBufferLen-offset) & 0x7FC; //make sure we don't exceed our string

+ length = (length > (DemodBufferLen-offset)) ? DemodBufferLen-offset : length;

+ int numBits = (length) & 0x00FFC; //make sure we don't exceed our string

if (hexMode){

char *buf = (char *) (DemodBuffer + offset);

if (hexMode){

char *buf = (char *) (DemodBuffer + offset);

+ numBits = (numBits > sizeof(hex)) ? sizeof(hex) : numBits;

numBits = binarraytohex(hex, buf, numBits);

if (numBits==0) return 0;

PrintAndLog("DemodBuffer: %s",hex);

} else {

numBits = binarraytohex(hex, buf, numBits);

if (numBits==0) return 0;

PrintAndLog("DemodBuffer: %s",hex);

} else {

- //setDemodBuf(DemodBuffer, DemodBufferLen-offset, offset);

- char *bin = sprint_bin_break(DemodBuffer+offset,numBits,16);

- PrintAndLog("DemodBuffer:\n%s",bin);

+ PrintAndLog("DemodBuffer:\n%s", sprint_bin_break(DemodBuffer+offset,numBits,16));

}

return 1;

}

return 1;

}

@@ -270,7 +277,8 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo )

int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose)

{

int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose)

{

- if (!ASKDemod(Cmd, FALSE, FALSE, 1)) return 0;

+ bool st = TRUE;

+ if (!ASKDemod_ext(Cmd, FALSE, FALSE, 1, &st)) return 0;

return AskEm410xDecode(verbose, hi, lo);

}

return AskEm410xDecode(verbose, hi, lo);

}

@@ -305,8 +313,7 @@ int CmdAskEM410xDemod(const char *Cmd)

//verbose will print results and demoding messages

//emSearch will auto search for EM410x format in bitstream

//askType switches decode: ask/raw = 0, ask/manchester = 1

//verbose will print results and demoding messages

//emSearch will auto search for EM410x format in bitstream

//askType switches decode: ask/raw = 0, ask/manchester = 1

-int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType)

+int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType, bool *stCheck) {

int invert=0;

int clk=0;

int maxErr=100;

int invert=0;

int clk=0;

int maxErr=100;

@@ -315,7 +322,7 @@ int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType)

char amp = param_getchar(Cmd, 0);

uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

sscanf(Cmd, "%i %i %i %i %c", &clk, &invert, &maxErr, &maxLen, &amp);

char amp = param_getchar(Cmd, 0);

uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

sscanf(Cmd, "%i %i %i %i %c", &clk, &invert, &maxErr, &maxLen, &amp);

- if (!maxLen) maxLen = 512*64;

+ if (!maxLen) maxLen = BIGBUF_SIZE;

if (invert != 0 && invert != 1) {

PrintAndLog("Invalid argument: %s", Cmd);

return 0;

if (invert != 0 && invert != 1) {

PrintAndLog("Invalid argument: %s", Cmd);

return 0;

@@ -327,15 +334,22 @@ int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType)

if (amp == 'a' || amp == 'A') askAmp=1;

size_t BitLen = getFromGraphBuf(BitStream);

if (g_debugMode) PrintAndLog("DEBUG: Bitlen from grphbuff: %d",BitLen);

if (amp == 'a' || amp == 'A') askAmp=1;

size_t BitLen = getFromGraphBuf(BitStream);

if (g_debugMode) PrintAndLog("DEBUG: Bitlen from grphbuff: %d",BitLen);

- if (BitLen<255) return 0;

- if (maxLen<BitLen && maxLen != 0) BitLen = maxLen;

+ if (BitLen < 255) return 0;

+ if (maxLen < BitLen && maxLen != 0) BitLen = maxLen;

+ int foundclk = 0;

+ bool st = false;

+ if (*stCheck) st = DetectST(BitStream, &BitLen, &foundclk);

+ if (st) {

+ *stCheck = st;

+ clk = (clk == 0) ? foundclk : clk;

+ if (verbose || g_debugMode) PrintAndLog("\nFound Sequence Terminator");

+ }

int errCnt = askdemod(BitStream, &BitLen, &clk, &invert, maxErr, askAmp, askType);

if (errCnt<0 || BitLen<16){ //if fatal error (or -1)

if (g_debugMode) PrintAndLog("DEBUG: no data found %d, errors:%d, bitlen:%d, clock:%d",errCnt,invert,BitLen,clk);

return 0;

}

int errCnt = askdemod(BitStream, &BitLen, &clk, &invert, maxErr, askAmp, askType);

if (errCnt<0 || BitLen<16){ //if fatal error (or -1)

if (g_debugMode) PrintAndLog("DEBUG: no data found %d, errors:%d, bitlen:%d, clock:%d",errCnt,invert,BitLen,clk);

return 0;

}

- if (errCnt>maxErr){

+ if (errCnt > maxErr){

if (g_debugMode) PrintAndLog("DEBUG: Too many errors found, errors:%d, bits:%d, clock:%d",errCnt, BitLen, clk);

return 0;

}

if (g_debugMode) PrintAndLog("DEBUG: Too many errors found, errors:%d, bits:%d, clock:%d",errCnt, BitLen, clk);

return 0;

}

@@ -358,6 +372,10 @@ int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType)

}

return 1;

}

return 1;

}

+int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) {

+ bool st = false;

+ return ASKDemod_ext(Cmd, verbose, emSearch, askType, &st);

//by marshmellow

//takes 5 arguments - clock, invert, maxErr, maxLen as integers and amplify as char == 'a'

//by marshmellow

//takes 5 arguments - clock, invert, maxErr, maxLen as integers and amplify as char == 'a'

@@ -367,7 +385,8 @@ int Cmdaskmandemod(const char *Cmd)

{

char cmdp = param_getchar(Cmd, 0);

if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') {

{

char cmdp = param_getchar(Cmd, 0);

if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') {

- PrintAndLog("Usage: data rawdemod am [clock] <invert> [maxError] [maxLen] [amplify]");

+ PrintAndLog("Usage: data rawdemod am <s> [clock] <invert> [maxError] [maxLen] [amplify]");

+ PrintAndLog(" ['s'] optional, check for Sequence Terminator");

PrintAndLog(" [set clock as integer] optional, if not set, autodetect");

PrintAndLog(" <invert>, 1 to invert output");

PrintAndLog(" [set maximum allowed errors], default = 100");

PrintAndLog(" [set clock as integer] optional, if not set, autodetect");

PrintAndLog(" <invert>, 1 to invert output");

PrintAndLog(" [set maximum allowed errors], default = 100");

@@ -381,7 +400,13 @@ int Cmdaskmandemod(const char *Cmd)

PrintAndLog(" : data rawdemod am 64 1 0 = demod an ask/manchester tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");

return 0;

}

PrintAndLog(" : data rawdemod am 64 1 0 = demod an ask/manchester tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");

return 0;

}

- return ASKDemod(Cmd, TRUE, TRUE, 1);

+ bool st = TRUE;

+ if (Cmd[0]=='s')

+ return ASKDemod_ext(Cmd++, TRUE, TRUE, 1, &st);

+ else if (Cmd[1] == 's')

+ return ASKDemod_ext(Cmd+=2, TRUE, TRUE, 1, &st);

+ else

+ return ASKDemod(Cmd, TRUE, TRUE, 1);

}

//by marshmellow

}

//by marshmellow

@@ -588,7 +613,7 @@ int CmdG_Prox_II_Demod(const char *Cmd)

if ((idx+1) % 5 == 0){

//spacer bit - should be 0

if (DemodBuffer[startIdx+idx] != 0) {

if ((idx+1) % 5 == 0){

//spacer bit - should be 0

if (DemodBuffer[startIdx+idx] != 0) {

- if (g_debugMode) PrintAndLog("Error spacer not 0: %d, pos: %d",DemodBuffer[startIdx+idx],startIdx+idx);

+ if (g_debugMode) PrintAndLog("Error spacer not 0: %u, pos: %u", (unsigned int)DemodBuffer[startIdx+idx],(unsigned int)(startIdx+idx));

return 0;

}

continue;

return 0;

}

continue;

@@ -596,21 +621,21 @@ int CmdG_Prox_II_Demod(const char *Cmd)

if (keyCnt<8){ //lsb first

xorKey = xorKey | (DemodBuffer[startIdx+idx]<<keyCnt);

keyCnt++;

if (keyCnt<8){ //lsb first

xorKey = xorKey | (DemodBuffer[startIdx+idx]<<keyCnt);

keyCnt++;

- if (keyCnt==8 && g_debugMode) PrintAndLog("xorKey Found: %02x", xorKey);

+ if (keyCnt==8 && g_debugMode) PrintAndLog("xorKey Found: %02x", (unsigned int)xorKey);

continue;

}

//lsb first

ByteStream[ByteCnt] = ByteStream[ByteCnt] | (DemodBuffer[startIdx+idx]<<bitCnt);

bitCnt++;

if (bitCnt % 8 == 0){

continue;

}

//lsb first

ByteStream[ByteCnt] = ByteStream[ByteCnt] | (DemodBuffer[startIdx+idx]<<bitCnt);

bitCnt++;

if (bitCnt % 8 == 0){

- if (g_debugMode) PrintAndLog("byte %d: %02x",ByteCnt,ByteStream[ByteCnt]);

+ if (g_debugMode) PrintAndLog("byte %u: %02x", (unsigned int)ByteCnt, ByteStream[ByteCnt]);

bitCnt=0;

ByteCnt++;

}

for (uint8_t i = 0; i < ByteCnt; i++){

ByteStream[i] ^= xorKey; //xor

bitCnt=0;

ByteCnt++;

}

for (uint8_t i = 0; i < ByteCnt; i++){

ByteStream[i] ^= xorKey; //xor

- if (g_debugMode) PrintAndLog("byte %d after xor: %02x", i, ByteStream[i]);

+ if (g_debugMode) PrintAndLog("byte %u after xor: %02x", (unsigned int)i, ByteStream[i]);

}

//now ByteStream contains 64 bytes of decrypted raw tag data

}

//now ByteStream contains 64 bytes of decrypted raw tag data

@@ -624,19 +649,45 @@ int CmdG_Prox_II_Demod(const char *Cmd)

if (fmtLen==36){

FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);

Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);

if (fmtLen==36){

FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);

Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);

- PrintAndLog("G-Prox-II Found: FmtLen %d, FC %d, Card %d",fmtLen,FC,Card);

+ PrintAndLog("G-Prox-II Found: FmtLen %d, FC %d, Card %d", fmtLen, FC, Card);

} else if(fmtLen==26){

FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7);

Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7);

} else if(fmtLen==26){

FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7);

Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7);

- PrintAndLog("G-Prox-II Found: FmtLen %d, FC %d, Card %d",fmtLen,FC,Card);

+ PrintAndLog("G-Prox-II Found: FmtLen %d, FC %d, Card %d",(unsigned int)fmtLen,FC,Card);

} else {

- PrintAndLog("Unknown G-Prox-II Fmt Found: FmtLen %d",fmtLen);

+ PrintAndLog("Unknown G-Prox-II Fmt Found: FmtLen %d",(int)fmtLen);

}

PrintAndLog("Raw: %08x%08x%08x", raw1,raw2,raw3);

setDemodBuf(DemodBuffer+ans, 96, 0);

return 1;

}

PrintAndLog("Raw: %08x%08x%08x", raw1,raw2,raw3);

setDemodBuf(DemodBuffer+ans, 96, 0);

return 1;

}

+//by marshmellow

+//see ASKDemod for what args are accepted

+int CmdVikingDemod(const char *Cmd)

+ if (!ASKDemod(Cmd, false, false, 1)) {

+ if (g_debugMode) PrintAndLog("ASKDemod failed");

+ return 0;

+ }

+ size_t size = DemodBufferLen;

+ //call lfdemod.c demod for Viking

+ int ans = VikingDemod_AM(DemodBuffer, &size);

+ if (ans < 0) {

+ if (g_debugMode) PrintAndLog("Error Viking_Demod %d", ans);

+ return 0;

+ }

+ //got a good demod

+ uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans, 32);

+ uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32);

+ uint32_t cardid = bytebits_to_byte(DemodBuffer+ans+24, 32);

+ uint8_t checksum = bytebits_to_byte(DemodBuffer+ans+32+24, 8);

+ PrintAndLog("Viking Tag Found: Card ID %08X, Checksum: %02X", cardid, (unsigned int) checksum);

+ PrintAndLog("Raw: %08X%08X", raw1,raw2);

+ setDemodBuf(DemodBuffer+ans, 64, 0);

+ return 1;

//by marshmellow - see ASKDemod

int Cmdaskrawdemod(const char *Cmd)

{

//by marshmellow - see ASKDemod

int Cmdaskrawdemod(const char *Cmd)

{

@@ -886,19 +937,21 @@ int CmdDetectClockRate(const char *Cmd)

char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert)

{

char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert)

{

- char *fskType;

+ static char fType[8];

+ memset(fType, 0x00, 8);

+ char *fskType = fType;

if (fchigh==10 && fclow==8){

if (invert) //fsk2a

if (fchigh==10 && fclow==8){

if (invert) //fsk2a

- fskType = "FSK2a";

+ memcpy(fskType, "FSK2a", 5);

else //fsk2

- fskType = "FSK2";

+ memcpy(fskType, "FSK2", 4);

} else if (fchigh == 8 && fclow == 5) {

if (invert)

} else if (fchigh == 8 && fclow == 5) {

if (invert)

- fskType = "FSK1";

+ memcpy(fskType, "FSK1", 4);

else

- fskType = "FSK1a";

+ memcpy(fskType, "FSK1a", 5);

} else {

- fskType = "FSK??";

+ memcpy(fskType, "FSK??", 5);

}

return fskType;

}

return fskType;

}

@@ -910,55 +963,53 @@ char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert)

int FSKrawDemod(const char *Cmd, bool verbose)

{

//raw fsk demod no manchester decoding no start bit finding just get binary from wave

int FSKrawDemod(const char *Cmd, bool verbose)

{

//raw fsk demod no manchester decoding no start bit finding just get binary from wave

+ uint8_t rfLen, invert, fchigh, fclow;

//set defaults

- int rfLen = 0;

- int invert = 0;

- int fchigh = 0;

- int fclow = 0;

//set options from parameters entered with the command

- sscanf(Cmd, "%i %i %i %i", &rfLen, &invert, &fchigh, &fclow);

+ rfLen = param_get8(Cmd, 0);

+ invert = param_get8(Cmd, 1);

+ fchigh = param_get8(Cmd, 2);

+ fclow = param_get8(Cmd, 3);

if (strlen(Cmd)>0 && strlen(Cmd)<=2) {

- if (rfLen==1){

+ if (rfLen==1) {

invert = 1; //if invert option only is used

rfLen = 0;

invert = 1; //if invert option only is used

rfLen = 0;

- }

+ }

}

uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

size_t BitLen = getFromGraphBuf(BitStream);

if (BitLen==0) return 0;

//get field clock lengths

uint16_t fcs=0;

uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

size_t BitLen = getFromGraphBuf(BitStream);

if (BitLen==0) return 0;

//get field clock lengths

uint16_t fcs=0;

- if (fchigh==0 || fclow == 0){

+ if (!fchigh || !fclow) {

fcs = countFC(BitStream, BitLen, 1);

- if (fcs==0){

- fchigh=10;

- fclow=8;

- }else{

- fchigh = (fcs >> 8) & 0xFF;

- fclow = fcs & 0xFF;

+ if (!fcs) {

+ fchigh = 10;

+ fclow = 8;

+ } else {

+ fchigh = (fcs >> 8) & 0x00FF;

+ fclow = fcs & 0x00FF;

}

//get bit clock length

}

//get bit clock length

- if (rfLen==0){

+ if (!rfLen) {

rfLen = detectFSKClk(BitStream, BitLen, fchigh, fclow);

- if (rfLen == 0) rfLen = 50;

+ if (!rfLen) rfLen = 50;

}

- int size = fskdemod(BitStream,BitLen,(uint8_t)rfLen,(uint8_t)invert,(uint8_t)fchigh,(uint8_t)fclow);

- if (size>0){

+ int size = fskdemod(BitStream, BitLen, rfLen, invert, fchigh, fclow);

+ if (size > 0) {

setDemodBuf(BitStream,size,0);

// Now output the bitstream to the scrollback by line of 16 bits

if (verbose || g_debugMode) {

setDemodBuf(BitStream,size,0);

// Now output the bitstream to the scrollback by line of 16 bits

if (verbose || g_debugMode) {

- PrintAndLog("\nUsing Clock:%d, invert:%d, fchigh:%d, fclow:%d", rfLen, invert, fchigh, fclow);

+ PrintAndLog("\nUsing Clock:%u, invert:%u, fchigh:%u, fclow:%u", (unsigned int)rfLen, (unsigned int)invert, (unsigned int)fchigh, (unsigned int)fclow);

PrintAndLog("%s decoded bitstream:",GetFSKType(fchigh,fclow,invert));

printDemodBuff();

}

return 1;

PrintAndLog("%s decoded bitstream:",GetFSKType(fchigh,fclow,invert));

printDemodBuff();

}

return 1;

- } else{

+ } else {

if (g_debugMode) PrintAndLog("no FSK data found");

}

return 0;

if (g_debugMode) PrintAndLog("no FSK data found");

}

return 0;

@@ -1130,8 +1181,6 @@ int CmdFSKdemodParadox(const char *Cmd)

//print ioprox ID and some format details

int CmdFSKdemodIO(const char *Cmd)

{

//print ioprox ID and some format details

int CmdFSKdemodIO(const char *Cmd)

{

- //raw fsk demod no manchester decoding no start bit finding just get binary from wave

- //set defaults

int idx=0;

//something in graphbuffer?

if (GraphTraceLen < 65) {

int idx=0;

//something in graphbuffer?

if (GraphTraceLen < 65) {

@@ -1220,11 +1269,6 @@ int CmdFSKdemodIO(const char *Cmd)

//print full AWID Prox ID and some bit format details if found

int CmdFSKdemodAWID(const char *Cmd)

{

//print full AWID Prox ID and some bit format details if found

int CmdFSKdemodAWID(const char *Cmd)

{

- //int verbose=1;

- //sscanf(Cmd, "%i", &verbose);

- //raw fsk demod no manchester decoding no start bit finding just get binary from wave

uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

size_t size = getFromGraphBuf(BitStream);

if (size==0) return 0;

uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

size_t size = getFromGraphBuf(BitStream);

if (size==0) return 0;

@@ -1423,7 +1467,6 @@ int CmdFSKdemodPyramid(const char *Cmd)

uint32_t fc = 0;

uint32_t cardnum = 0;

uint32_t code1 = 0;

uint32_t fc = 0;

uint32_t cardnum = 0;

uint32_t code1 = 0;

- //uint32_t code2 = 0;

if (fmtLen==26){

fc = bytebits_to_byte(BitStream+73, 8);

cardnum = bytebits_to_byte(BitStream+81, 16);

if (fmtLen==26){

fc = bytebits_to_byte(BitStream+73, 8);

cardnum = bytebits_to_byte(BitStream+81, 16);

@@ -1463,6 +1506,17 @@ int CmdFSKdemodPyramid(const char *Cmd)

// NATIONAL CODE, ICAR database

// COUNTRY CODE (ISO3166) or http://cms.abvma.ca/uploads/ManufacturersISOsandCountryCodes.pdf

// FLAG (animal/non-animal)

// NATIONAL CODE, ICAR database

// COUNTRY CODE (ISO3166) or http://cms.abvma.ca/uploads/ManufacturersISOsandCountryCodes.pdf

// 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 [ 37FF65B88EF94 ]

+*/

int CmdFDXBdemodBI(const char *Cmd){

int invert = 1;

int CmdFDXBdemodBI(const char *Cmd){

int invert = 1;

@@ -1489,6 +1543,10 @@ int CmdFDXBdemodBI(const char *Cmd){

if (g_debugMode) PrintAndLog("Error FDXBDemod , no startmarker found :: %d",preambleIndex);

return 0;

}

if (g_debugMode) PrintAndLog("Error FDXBDemod , no startmarker found :: %d",preambleIndex);

return 0;

}

+ if (size != 128) {

+ if (g_debugMode) PrintAndLog("Error incorrect data length found");

+ return 0;

+ }

setDemodBuf(BitStream, 128, preambleIndex);

@@ -1558,6 +1616,9 @@ int PSKDemod(const char *Cmd, bool verbose)

//invalid carrier

return 0;

}

//invalid carrier

return 0;

}

+ if (g_debugMode){

+ PrintAndLog("Carrier: rf/%d",carrier);

+ }

int errCnt=0;

errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert);

if (errCnt > maxErr){

int errCnt=0;

errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert);

if (errCnt > maxErr){

@@ -1597,61 +1658,33 @@ int CmdIndalaDecode(const char *Cmd)

return 0;

}

uint8_t invert=0;

return 0;

}

uint8_t invert=0;

- ans = indala26decode(DemodBuffer, &DemodBufferLen, &invert);

- if (ans < 1) {

+ size_t size = DemodBufferLen;

+ size_t startIdx = indala26decode(DemodBuffer, &size, &invert);

+ if (startIdx < 1 || size > 224) {

if (g_debugMode==1)

PrintAndLog("Error2: %d",ans);

return -1;

}

if (g_debugMode==1)

PrintAndLog("Error2: %d",ans);

return -1;

}

- char showbits[251]={0x00};

+ setDemodBuf(DemodBuffer, size, startIdx);

if (invert)

if (g_debugMode==1)

PrintAndLog("Had to invert bits");

if (invert)

if (g_debugMode==1)

PrintAndLog("Had to invert bits");

+ PrintAndLog("BitLen: %d",DemodBufferLen);

//convert UID to HEX

uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;

//convert UID to HEX

uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;

- int idx;

- uid1=0;

- uid2=0;

- PrintAndLog("BitLen: %d",DemodBufferLen);

- if (DemodBufferLen==64){

- for( idx=0; idx<64; idx++) {

- uid1=(uid1<<1)|(uid2>>31);

- if (DemodBuffer[idx] == 0) {

- uid2=(uid2<<1)|0;

- showbits[idx]='0';

- } else {

- uid2=(uid2<<1)|1;

- showbits[idx]='1';

- }

- showbits[idx]='\0';

- PrintAndLog("Indala UID=%s (%x%08x)", showbits, uid1, uid2);

- }

- else {

- uid3=0;

- uid4=0;

- uid5=0;

- uid6=0;

- uid7=0;

- for( idx=0; idx<DemodBufferLen; idx++) {

- uid1=(uid1<<1)|(uid2>>31);

- uid2=(uid2<<1)|(uid3>>31);

- uid3=(uid3<<1)|(uid4>>31);

- uid4=(uid4<<1)|(uid5>>31);

- uid5=(uid5<<1)|(uid6>>31);

- uid6=(uid6<<1)|(uid7>>31);

- if (DemodBuffer[idx] == 0) {

- uid7=(uid7<<1)|0;

- showbits[idx]='0';

- }

- else {

- uid7=(uid7<<1)|1;

- showbits[idx]='1';

- }

- showbits[idx]='\0';

- PrintAndLog("Indala UID=%s (%x%08x%08x%08x%08x%08x%08x)", showbits, uid1, uid2, uid3, uid4, uid5, uid6, uid7);

+ uid1=bytebits_to_byte(DemodBuffer,32);

+ uid2=bytebits_to_byte(DemodBuffer+32,32);

+ if (DemodBufferLen==64) {

+ PrintAndLog("Indala UID=%s (%x%08x)", sprint_bin_break(DemodBuffer,DemodBufferLen,16), uid1, uid2);

+ } else {

+ uid3=bytebits_to_byte(DemodBuffer+64,32);

+ uid4=bytebits_to_byte(DemodBuffer+96,32);

+ uid5=bytebits_to_byte(DemodBuffer+128,32);

+ uid6=bytebits_to_byte(DemodBuffer+160,32);

+ uid7=bytebits_to_byte(DemodBuffer+192,32);

+ PrintAndLog("Indala UID=%s (%x%08x%08x%08x%08x%08x%08x)",

+ sprint_bin_break(DemodBuffer,DemodBufferLen,16), uid1, uid2, uid3, uid4, uid5, uid6, uid7);

}

if (g_debugMode){

PrintAndLog("DEBUG: printing demodbuffer:");

}

if (g_debugMode){

PrintAndLog("DEBUG: printing demodbuffer:");

@@ -1721,7 +1754,7 @@ int NRZrawDemod(const char *Cmd, bool verbose)

size_t BitLen = getFromGraphBuf(BitStream);

if (BitLen==0) return 0;

int errCnt=0;

size_t BitLen = getFromGraphBuf(BitStream);

if (BitLen==0) return 0;

int errCnt=0;

- errCnt = nrzRawDemod(BitStream, &BitLen, &clk, &invert, maxErr);

+ errCnt = nrzRawDemod(BitStream, &BitLen, &clk, &invert);

if (errCnt > maxErr){

if (g_debugMode) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);

return 0;

if (errCnt > maxErr){

if (g_debugMode) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);

return 0;

@@ -1967,10 +2000,7 @@ int getSamples(const char *Cmd, bool silent)

int n = strtol(Cmd, NULL, 0);

- if (n == 0)

- n = sizeof(got);

- if (n > sizeof(got))

+ if (n == 0 || n > sizeof(got))

n = sizeof(got);

PrintAndLog("Reading %d bytes from device memory\n", n);

n = sizeof(got);

PrintAndLog("Reading %d bytes from device memory\n", n);

@@ -2018,10 +2048,20 @@ int CmdSamples(const char *Cmd)

int CmdTuneSamples(const char *Cmd)

{

int CmdTuneSamples(const char *Cmd)

{

- int timeout = 0;

+ int timeout = 0, arg = FLAG_TUNE_ALL;

+ if(*Cmd == 'l') {

+ arg = FLAG_TUNE_LF;

+ } else if (*Cmd == 'h') {

+ arg = FLAG_TUNE_HF;

+ } else if (*Cmd != '\0') {

+ PrintAndLog("use 'tune' or 'tune l' or 'tune h'");

+ return 0;

+ }

printf("\nMeasuring antenna characteristics, please wait...");

- UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING};

+ UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING, {arg, 0, 0}};

SendCommand(&c);

UsbCommand resp;

SendCommand(&c);

UsbCommand resp;

@@ -2353,8 +2393,10 @@ static command_t CommandTable[] =

{"askedgedetect", CmdAskEdgeDetect, 1, "[threshold] Adjust Graph for manual ask demod using the length of sample differences to detect the edge of a wave (use 20-45, def:25)"},

{"askem410xdemod", CmdAskEM410xDemod, 1, "[clock] [invert<0|1>] [maxErr] -- Demodulate an EM410x tag from GraphBuffer (args optional)"},

{"askgproxiidemod", CmdG_Prox_II_Demod, 1, "Demodulate a G Prox II tag from GraphBuffer"},

{"askedgedetect", CmdAskEdgeDetect, 1, "[threshold] Adjust Graph for manual ask demod using the length of sample differences to detect the edge of a wave (use 20-45, def:25)"},

{"askem410xdemod", CmdAskEM410xDemod, 1, "[clock] [invert<0|1>] [maxErr] -- Demodulate an EM410x tag from GraphBuffer (args optional)"},

{"askgproxiidemod", CmdG_Prox_II_Demod, 1, "Demodulate a G Prox II tag from GraphBuffer"},

+ {"askvikingdemod", CmdVikingDemod, 1, "Demodulate a Viking tag from GraphBuffer"},

{"autocorr", CmdAutoCorr, 1, "[window length] [g] -- Autocorrelation over window - g to save back to GraphBuffer (overwrite)"},

{"biphaserawdecode",CmdBiphaseDecodeRaw,1, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},

{"autocorr", CmdAutoCorr, 1, "[window length] [g] -- Autocorrelation over window - g to save back to GraphBuffer (overwrite)"},

{"biphaserawdecode",CmdBiphaseDecodeRaw,1, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},

+ {"bin2hex", Cmdbin2hex, 1, "bin2hex <digits> -- Converts binary to hexadecimal"},

{"bitsamples", CmdBitsamples, 0, "Get raw samples as bitstring"},

{"buffclear", CmdBuffClear, 1, "Clear sample buffer and graph window"},

{"dec", CmdDec, 1, "Decimate samples"},

{"bitsamples", CmdBitsamples, 0, "Get raw samples as bitstring"},

{"buffclear", CmdBuffClear, 1, "Clear sample buffer and graph window"},

{"dec", CmdDec, 1, "Decimate samples"},

@@ -2369,9 +2411,7 @@ static command_t CommandTable[] =

{"getbitstream", CmdGetBitStream, 1, "Convert GraphBuffer's >=1 values to 1 and <1 to 0"},

{"grid", CmdGrid, 1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},

{"hexsamples", CmdHexsamples, 0, "<bytes> [<offset>] -- Dump big buffer as hex bytes"},

{"getbitstream", CmdGetBitStream, 1, "Convert GraphBuffer's >=1 values to 1 and <1 to 0"},

{"grid", CmdGrid, 1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},

{"hexsamples", CmdHexsamples, 0, "<bytes> [<offset>] -- Dump big buffer as hex bytes"},

- {"bin2hex", Cmdbin2hex, 1, "bin2hex <digits> -- Converts binary to hexadecimal"},

{"hex2bin", Cmdhex2bin, 1, "hex2bin <hexadecimal> -- Converts hexadecimal to binary"},

- {"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"},

{"load", CmdLoad, 1, "<filename> -- Load trace (to graph window"},

{"hide", CmdHide, 1, "Hide graph window"},

{"hpf", CmdHpf, 1, "Remove DC offset from trace"},

{"load", CmdLoad, 1, "<filename> -- Load trace (to graph window"},

@@ -2380,14 +2420,14 @@ static command_t CommandTable[] =

{"manrawdecode", Cmdmandecoderaw, 1, "[invert] [maxErr] -- Manchester decode binary stream in DemodBuffer"},

{"norm", CmdNorm, 1, "Normalize max/min to +/-128"},

{"plot", CmdPlot, 1, "Show graph window (hit 'h' in window for keystroke help)"},

{"manrawdecode", Cmdmandecoderaw, 1, "[invert] [maxErr] -- Manchester decode binary stream in DemodBuffer"},

{"norm", CmdNorm, 1, "Normalize max/min to +/-128"},

{"plot", CmdPlot, 1, "Show graph window (hit 'h' in window for keystroke help)"},

- {"printdemodbuffer",CmdPrintDemodBuff, 1, "[x] [o] <offset> -- print the data in the DemodBuffer - 'x' for hex output"},

+ {"printdemodbuffer",CmdPrintDemodBuff, 1, "[x] [o] <offset> [l] <length> -- print the data in the DemodBuffer - 'x' for hex output"},

{"pskindalademod", CmdIndalaDecode, 1, "[clock] [invert<0|1>] -- Demodulate an indala tag (PSK1) from GraphBuffer (args optional)"},

{"psknexwatchdemod",CmdPSKNexWatch, 1, "Demodulate a NexWatch tag (nexkey, quadrakey) (PSK1) from GraphBuffer"},

{"rawdemod", CmdRawDemod, 1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},

{"samples", CmdSamples, 0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},

{"save", CmdSave, 1, "<filename> -- Save trace (from graph window)"},

{"scale", CmdScale, 1, "<int> -- Set cursor display scale"},

{"pskindalademod", CmdIndalaDecode, 1, "[clock] [invert<0|1>] -- Demodulate an indala tag (PSK1) from GraphBuffer (args optional)"},

{"psknexwatchdemod",CmdPSKNexWatch, 1, "Demodulate a NexWatch tag (nexkey, quadrakey) (PSK1) from GraphBuffer"},

{"rawdemod", CmdRawDemod, 1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},

{"samples", CmdSamples, 0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},

{"save", CmdSave, 1, "<filename> -- Save trace (from graph window)"},

{"scale", CmdScale, 1, "<int> -- Set cursor display scale"},

- {"setdebugmode", CmdSetDebugMode, 1, "<0|1> -- Turn on or off Debugging Mode for demods"},

+ {"setdebugmode", CmdSetDebugMode, 1, "<0|1|2> -- Turn on or off Debugging Level for lf demods"},

{"shiftgraphzero", CmdGraphShiftZero, 1, "<shift> -- Shift 0 for Graphed wave + or - shift value"},

{"dirthreshold", CmdDirectionalThreshold, 1, "<thres up> <thres down> -- Max rising higher up-thres/ Min falling lower down-thres, keep rest as prev."},

{"tune", CmdTuneSamples, 0, "Get hw tune samples for graph window"},

{"shiftgraphzero", CmdGraphShiftZero, 1, "<shift> -- Shift 0 for Graphed wave + or - shift value"},

{"dirthreshold", CmdDirectionalThreshold, 1, "<thres up> <thres down> -- Max rising higher up-thres/ Min falling lower down-thres, keep rest as prev."},

{"tune", CmdTuneSamples, 0, "Get hw tune samples for graph window"},