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

#include "cmdmain.h"

#include "cmddata.h"

#include "lfdemod.h"

#include "cmdmain.h"

#include "cmddata.h"

#include "lfdemod.h"

+#include "usb_cmd.h"

+

uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];

+uint8_t g_debugMode;

int DemodBufferLen;

static int CmdHelp(const char *Cmd);

//set the demod buffer with given array of binary (one bit per byte)

//by marshmellow

int DemodBufferLen;

static int CmdHelp(const char *Cmd);

//set the demod buffer with given array of binary (one bit per byte)

//by marshmellow

-void setDemodBuf(uint8_t *buff,int size)

+void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx)

{

- int i=0;

- for (; i < size; ++i){

- DemodBuffer[i]=buff[i];

+ size_t i = 0;

+ for (; i < size; i++){

+ DemodBuffer[i]=buff[startIdx++];

}

DemodBufferLen=size;

return;

}

DemodBufferLen=size;

return;

}

+int CmdSetDebugMode(const char *Cmd)

+{

+ int demod=0;

+ sscanf(Cmd, "%i", &demod);

+ g_debugMode=(uint8_t)demod;

+ return 1;

+}

+

//by marshmellow

void printDemodBuff()

{

//by marshmellow

void printDemodBuff()

{

return;

}

if (bitLen>512) bitLen=512; //max output to 512 bits if we have more - should be plenty

return;

}

if (bitLen>512) bitLen=512; //max output to 512 bits if we have more - should be plenty

+

+ // ensure equally divided by 16

+ bitLen &= 0xfff0;

+

for (i = 0; i <= (bitLen-16); i+=16) {

PrintAndLog("%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i",

DemodBuffer[i],

for (i = 0; i <= (bitLen-16); i+=16) {

PrintAndLog("%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i",

DemodBuffer[i],

//by marshmellow

void printBitStream(uint8_t BitStream[], uint32_t bitLen)

{

//by marshmellow

void printBitStream(uint8_t BitStream[], uint32_t bitLen)

{

- uint32_t i = 0;

- if (bitLen<16) {

- PrintAndLog("Too few bits found: %d",bitLen);

- return;

- }

- if (bitLen>512) bitLen=512;

- for (i = 0; i <= (bitLen-16); i+=16) {

- PrintAndLog("%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i",

- BitStream[i],

- BitStream[i+1],

- BitStream[i+2],

- BitStream[i+3],

- BitStream[i+4],

- BitStream[i+5],

- BitStream[i+6],

- BitStream[i+7],

- BitStream[i+8],

- BitStream[i+9],

- BitStream[i+10],

- BitStream[i+11],

- BitStream[i+12],

- BitStream[i+13],

- BitStream[i+14],

- BitStream[i+15]);

- }

+ uint32_t i = 0;

+ if (bitLen<16) {

+ PrintAndLog("Too few bits found: %d",bitLen);

+ return;

+ }

+ if (bitLen>512) bitLen=512;

+

+ // ensure equally divided by 16

+ bitLen &= 0xfff0;

+

+ for (i = 0; i <= (bitLen-16); i+=16) {

+ PrintAndLog("%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i",

+ BitStream[i],

+ BitStream[i+1],

+ BitStream[i+2],

+ BitStream[i+3],

+ BitStream[i+4],

+ BitStream[i+5],

+ BitStream[i+6],

+ BitStream[i+7],

+ BitStream[i+8],

+ BitStream[i+9],

+ BitStream[i+10],

+ BitStream[i+11],

+ BitStream[i+12],

+ BitStream[i+13],

+ BitStream[i+14],

+ BitStream[i+15]);

+ }

return;

}

//by marshmellow

return;

}

//by marshmellow

void printEM410x(uint64_t id)

{

if (id !=0){

void printEM410x(uint64_t id)

{

if (id !=0){

- uint64_t iii=1;

- uint64_t id2lo=0; //id2hi=0,

- uint32_t ii=0;

- uint32_t i=0;

- for (ii=5; ii>0;ii--){

- for (i=0;i<8;i++){

- id2lo=(id2lo<<1LL) | ((id & (iii << (i+((ii-1)*8)))) >> (i+((ii-1)*8)));

- }

+ uint64_t iii=1;

+ uint64_t id2lo=0;

+ uint32_t ii=0;

+ uint32_t i=0;

+ for (ii=5; ii>0;ii--){

+ for (i=0;i<8;i++){

+ id2lo=(id2lo<<1LL) | ((id & (iii << (i+((ii-1)*8)))) >> (i+((ii-1)*8)));

}

- //output em id

- PrintAndLog("EM TAG ID : %010llx", id);

- PrintAndLog("Unique TAG ID: %010llx", id2lo); //id2hi,

- PrintAndLog("DEZ 8 : %08lld",id & 0xFFFFFF);

- PrintAndLog("DEZ 10 : %010lld",id & 0xFFFFFF);

- PrintAndLog("DEZ 5.5 : %05lld.%05lld",(id>>16LL) & 0xFFFF,(id & 0xFFFF));

- PrintAndLog("DEZ 3.5A : %03lld.%05lld",(id>>32ll),(id & 0xFFFF));

- PrintAndLog("DEZ 14/IK2 : %014lld",id);

- PrintAndLog("DEZ 15/IK3 : %015lld",id2lo);

- PrintAndLog("Other : %05lld_%03lld_%08lld",(id&0xFFFF),((id>>16LL) & 0xFF),(id & 0xFFFFFF));

- }

- return;

+ }

+ //output em id

+ PrintAndLog("EM TAG ID : %010llx", id);

+ PrintAndLog("Unique TAG ID: %010llx", id2lo);

+ PrintAndLog("DEZ 8 : %08lld",id & 0xFFFFFF);

+ PrintAndLog("DEZ 10 : %010lld",id & 0xFFFFFF);

+ PrintAndLog("DEZ 5.5 : %05lld.%05lld",(id>>16LL) & 0xFFFF,(id & 0xFFFF));

+ PrintAndLog("DEZ 3.5A : %03lld.%05lld",(id>>32ll),(id & 0xFFFF));

+ PrintAndLog("DEZ 14/IK2 : %014lld",id);

+ PrintAndLog("DEZ 15/IK3 : %015lld",id2lo);

+ PrintAndLog("Other : %05lld_%03lld_%08lld",(id&0xFFFF),((id>>16LL) & 0xFF),(id & 0xFFFFFF));

+ }

+ return;

}

//by marshmellow

}

//by marshmellow

-//take binary from demod buffer and see if we can find an EM410x ID

-int CmdEm410xDecode(const char *Cmd)

+//takes 3 arguments - clock, invert and maxErr as integers

+//attempts to demodulate ask while decoding manchester

+//prints binary found and saves in graphbuffer for further commands

+int CmdAskEM410xDemod(const char *Cmd)

{

- uint64_t id=0;

- // uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

- // uint32_t i=0;

- // i=getFromGraphBuf(BitStream);

- id = Em410xDecode(DemodBuffer,DemodBufferLen);

- printEM410x(id);

- if (id>0) return 1;

+ int invert=0;

+ int clk=0;

+ int maxErr=100;

+ char cmdp = param_getchar(Cmd, 0);

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

+ PrintAndLog("Usage: data askem410xdemod [clock] <0|1> [maxError]");

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

+ PrintAndLog(" <invert>, 1 for invert output");

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

+ PrintAndLog("");

+ PrintAndLog(" sample: data askem410xdemod = demod an EM410x Tag ID from GraphBuffer");

+ PrintAndLog(" : data askem410xdemod 32 = demod an EM410x Tag ID from GraphBuffer using a clock of RF/32");

+ PrintAndLog(" : data askem410xdemod 32 1 = demod an EM410x Tag ID from GraphBuffer using a clock of RF/32 and inverting data");

+ PrintAndLog(" : data askem410xdemod 1 = demod an EM410x Tag ID from GraphBuffer while inverting data");

+ PrintAndLog(" : data askem410xdemod 64 1 0 = demod an EM410x Tag ID from GraphBuffer using a clock of RF/64 and inverting data and allowing 0 demod errors");

+

+ return 0;

+ }

+

+ uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

+ sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);

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

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

+ return 0;

+ }

+ size_t BitLen = getFromGraphBuf(BitStream);

+

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

+ if (BitLen==0) return 0;

+ int errCnt=0;

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

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

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

+ return 0;

+ }

+ PrintAndLog("\nUsing Clock: %d - Invert: %d - Bits Found: %d",clk,invert,BitLen);

+

+ //output

+ if (errCnt>0){

+ PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt);

+ }

+ //PrintAndLog("ASK/Manchester decoded bitstream:");

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

+ setDemodBuf(BitStream,BitLen,0);

+ //printDemodBuff();

+ uint64_t lo =0;

+ size_t idx=0;

+ lo = Em410xDecode(BitStream, &BitLen, &idx);

+ if (lo>0){

+ //set GraphBuffer for clone or sim command

+ setDemodBuf(BitStream, BitLen, idx);

+ if (g_debugMode){

+ PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen);

+ printDemodBuff();

+ }

+ PrintAndLog("EM410x pattern found: ");

+ printEM410x(lo);

+ return 1;

+ }

return 0;

}

return 0;

}

-

//by marshmellow

-//takes 2 arguments - clock and invert both as integers

+//takes 3 arguments - clock, invert, maxErr as integers

//attempts to demodulate ask while decoding manchester

//prints binary found and saves in graphbuffer for further commands

int Cmdaskmandemod(const char *Cmd)

{

//attempts to demodulate ask while decoding manchester

//prints binary found and saves in graphbuffer for further commands

int Cmdaskmandemod(const char *Cmd)

{

- int invert=0;

- int clk=0;

+ int invert=0;

+ int clk=0;

+ int maxErr=100;

+ char cmdp = param_getchar(Cmd, 0);

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

+ PrintAndLog("Usage: data askmandemod [clock] <0|1> [maxError]");

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

+ PrintAndLog(" <invert>, 1 for invert output");

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

+ PrintAndLog("");

+ PrintAndLog(" sample: data askmandemod = demod an ask/manchester tag from GraphBuffer");

+ PrintAndLog(" : data askmandemod 32 = demod an ask/manchester tag from GraphBuffer using a clock of RF/32");

+ PrintAndLog(" : data askmandemod 32 1 = demod an ask/manchester tag from GraphBuffer using a clock of RF/32 and inverting data");

+ PrintAndLog(" : data askmandemod 1 = demod an ask/manchester tag from GraphBuffer while inverting data");

+ PrintAndLog(" : data askmandemod 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;

+ }

uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

- sscanf(Cmd, "%i %i", &clk, &invert);

+ sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);

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

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

return 0;

}

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

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

return 0;

}

-

- size_t BitLen = getFromGraphBuf(BitStream);

- // PrintAndLog("DEBUG: Bitlen from grphbuff: %d",BitLen);

+ if (clk==1){

+ invert=1;

+ clk=0;

+ }

+ size_t BitLen = getFromGraphBuf(BitStream);

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

+ if (BitLen==0) return 0;

int errCnt=0;

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

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

- // PrintAndLog("no data found %d, errors:%d, bitlen:%d, clock:%d",errCnt,invert,BitLen,clk);

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

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

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

return 0;

- }

+ }

PrintAndLog("\nUsing Clock: %d - Invert: %d - Bits Found: %d",clk,invert,BitLen);

//output

PrintAndLog("\nUsing Clock: %d - Invert: %d - Bits Found: %d",clk,invert,BitLen);

//output

}

PrintAndLog("ASK/Manchester decoded bitstream:");

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

}

PrintAndLog("ASK/Manchester decoded bitstream:");

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

- setDemodBuf(BitStream,BitLen);

- printDemodBuff();

+ setDemodBuf(BitStream,BitLen,0);

+ printDemodBuff();

uint64_t lo =0;

- lo = Em410xDecode(BitStream,BitLen);

+ size_t idx=0;

+ lo = Em410xDecode(BitStream, &BitLen, &idx);

if (lo>0){

//set GraphBuffer for clone or sim command

if (lo>0){

//set GraphBuffer for clone or sim command

+ setDemodBuf(BitStream, BitLen, idx);

+ if (g_debugMode){

+ PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen);

+ printDemodBuff();

+ }

PrintAndLog("EM410x pattern found: ");

printEM410x(lo);

return 1;

}

PrintAndLog("EM410x pattern found: ");

printEM410x(lo);

return 1;

}

- //if (BitLen>16) return 1;

- return 0;

+ return 1;

}

//by marshmellow

}

//by marshmellow

{

int i =0;

int errCnt=0;

{

int i =0;

int errCnt=0;

- size_t size=0;

+ size_t size=0;

+ size_t maxErr = 20;

+ char cmdp = param_getchar(Cmd, 0);

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

+ PrintAndLog("Usage: data manrawdecode");

+ PrintAndLog(" Takes 10 and 01 and converts to 0 and 1 respectively");

+ PrintAndLog(" --must have binary sequence in demodbuffer (run data askrawdemod first)");

+ PrintAndLog("");

+ PrintAndLog(" sample: data manrawdecode = decode manchester bitstream from the demodbuffer");

+ return 0;

+ }

+ if (DemodBufferLen==0) return 0;

uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

int high=0,low=0;

uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

int high=0,low=0;

- for (;i<DemodBufferLen;++i){

- if (DemodBuffer[i]>high) high=DemodBuffer[i];

- else if(DemodBuffer[i]<low) low=DemodBuffer[i];

- BitStream[i]=DemodBuffer[i];

+ for (;i<DemodBufferLen;++i){

+ if (DemodBuffer[i]>high) high=DemodBuffer[i];

+ else if(DemodBuffer[i]<low) low=DemodBuffer[i];

+ BitStream[i]=DemodBuffer[i];

}

if (high>1 || low <0 ){

PrintAndLog("Error: please raw demod the wave first then mancheseter raw decode");

return 0;

}

if (high>1 || low <0 ){

PrintAndLog("Error: please raw demod the wave first then mancheseter raw decode");

return 0;

}

- size=i;

- errCnt=manrawdecode(BitStream, &size);

- if (errCnt>=20){

+ size=i;

+ errCnt=manrawdecode(BitStream, &size);

+ if (errCnt>=maxErr){

PrintAndLog("Too many errors: %d",errCnt);

return 0;

}

PrintAndLog("Manchester Decoded - # errors:%d - data:",errCnt);

PrintAndLog("Too many errors: %d",errCnt);

return 0;

}

PrintAndLog("Manchester Decoded - # errors:%d - data:",errCnt);

- printBitStream(BitStream, size);

+ printBitStream(BitStream, size);

if (errCnt==0){

- uint64_t id = 0;

- id = Em410xDecode(BitStream, size);

- if (id>0) setDemodBuf(BitStream, size);

- printEM410x(id);

+ uint64_t id = 0;

+ size_t idx=0;

+ id = Em410xDecode(BitStream, &size, &idx);

+ if (id>0){

+ //need to adjust to set bitstream back to manchester encoded data

+ //setDemodBuf(BitStream, size, idx);

+

+ printEM410x(id);

+ }

}

return 1;

}

return 1;

}

// width waves vs small width waves to help the decode positioning) or askbiphdemod

int CmdBiphaseDecodeRaw(const char *Cmd)

{

// width waves vs small width waves to help the decode positioning) or askbiphdemod

int CmdBiphaseDecodeRaw(const char *Cmd)

{

- int i = 0;

- int errCnt=0;

+ int i = 0;

+ int errCnt=0;

size_t size=0;

- int offset=0;

- int invert=0;

- int high=0, low=0;

+ int offset=0;

+ int invert=0;

+ int high=0, low=0;

+ char cmdp = param_getchar(Cmd, 0);

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

+ PrintAndLog("Usage: data biphaserawdecode [offset] <invert>");

+ PrintAndLog(" Converts 10 or 01 to 0 and 11 or 00 to 1");

+ PrintAndLog(" --must have binary sequence in demodbuffer (run data askrawdemod first)");

+ PrintAndLog("");

+ PrintAndLog(" [offset <0|1>], set to 0 not to adjust start position or to 1 to adjust decode start position");

+ PrintAndLog(" [invert <0|1>], set to 1 to invert output");

+ PrintAndLog("");

+ PrintAndLog(" sample: data biphaserawdecode = decode biphase bitstream from the demodbuffer");

+ PrintAndLog(" sample: data biphaserawdecode 1 1 = decode biphase bitstream from the demodbuffer, set offset, and invert output");

+ return 0;

+ }

sscanf(Cmd, "%i %i", &offset, &invert);

- uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

- //get graphbuffer & high and low

+ if (DemodBufferLen==0) return 0;

+ uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

+ //get graphbuffer & high and low

for (;i<DemodBufferLen;++i){

if(DemodBuffer[i]>high)high=DemodBuffer[i];

else if(DemodBuffer[i]<low)low=DemodBuffer[i];

BitStream[i]=DemodBuffer[i];

for (;i<DemodBufferLen;++i){

if(DemodBuffer[i]>high)high=DemodBuffer[i];

else if(DemodBuffer[i]<low)low=DemodBuffer[i];

BitStream[i]=DemodBuffer[i];

- }

- if (high>1 || low <0){

- PrintAndLog("Error: please raw demod the wave first then decode");

- return 0;

- }

+ }

+ if (high>1 || low <0){

+ PrintAndLog("Error: please raw demod the wave first then decode");

+ return 0;

+ }

size=i;

errCnt=BiphaseRawDecode(BitStream, &size, offset, invert);

size=i;

errCnt=BiphaseRawDecode(BitStream, &size, offset, invert);

- if (errCnt>=20){

- PrintAndLog("Too many errors attempting to decode: %d",errCnt);

- return 0;

- }

- PrintAndLog("Biphase Decoded using offset: %d - # errors:%d - data:",offset,errCnt);

+ if (errCnt>=20){

+ PrintAndLog("Too many errors attempting to decode: %d",errCnt);

+ return 0;

+ }

+ PrintAndLog("Biphase Decoded using offset: %d - # errors:%d - data:",offset,errCnt);

printBitStream(BitStream, size);

- PrintAndLog("\nif bitstream does not look right try offset=1");

- return 1;

+ PrintAndLog("\nif bitstream does not look right try offset=1");

+ return 1;

}

-

//by marshmellow

-//takes 2 arguments - clock and invert both as integers

+//takes 4 arguments - clock, invert, maxErr as integers and amplify as char

//attempts to demodulate ask only

//prints binary found and saves in graphbuffer for further commands

int Cmdaskrawdemod(const char *Cmd)

{

//attempts to demodulate ask only

//prints binary found and saves in graphbuffer for further commands

int Cmdaskrawdemod(const char *Cmd)

{

- int invert=0;

- int clk=0;

+ int invert=0;

+ int clk=0;

+ int maxErr=100;

+ uint8_t askAmp = 0;

+ char amp = param_getchar(Cmd, 0);

+ char cmdp = param_getchar(Cmd, 0);

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

+ PrintAndLog("Usage: data askrawdemod [clock] <invert> [maxError] [amplify]");

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

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

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

+ PrintAndLog(" <amplify>, 'a' to attempt demod with ask amplification, default = no amp");

+ PrintAndLog("");

+ PrintAndLog(" sample: data askrawdemod = demod an ask tag from GraphBuffer");

+ PrintAndLog(" : data askrawdemod a = demod an ask tag from GraphBuffer, amplified");

+ PrintAndLog(" : data askrawdemod 32 = demod an ask tag from GraphBuffer using a clock of RF/32");

+ PrintAndLog(" : data askrawdemod 32 1 = demod an ask tag from GraphBuffer using a clock of RF/32 and inverting data");

+ PrintAndLog(" : data askrawdemod 1 = demod an ask tag from GraphBuffer while inverting data");

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

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

+ return 0;

+ }

uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

- sscanf(Cmd, "%i %i", &clk, &invert);

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

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

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

return 0;

}

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

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

return 0;

}

- size_t BitLen = getFromGraphBuf(BitStream);

+ if (clk==1){

+ invert=1;

+ clk=0;

+ }

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

+ size_t BitLen = getFromGraphBuf(BitStream);

+ if (BitLen==0) return 0;

int errCnt=0;

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

- if (errCnt==-1||BitLen<16){ //throw away static - allow 1 and -1 (in case of threshold command first)

- PrintAndLog("no data found");

+ errCnt = askrawdemod(BitStream, &BitLen, &clk, &invert, maxErr, askAmp);

+ if (errCnt==-1||BitLen<16){ //throw away static - allow 1 and -1 (in case of threshold command first)

+ PrintAndLog("no data found");

+ if (g_debugMode==1) PrintAndLog("errCnt: %d, BitLen: %d, clk: %d, invert: %d", errCnt, BitLen, clk, invert);

return 0;

- }

- PrintAndLog("Using Clock: %d - invert: %d - Bits Found: %d",clk,invert,BitLen);

- //PrintAndLog("Data start pos:%d, lastBit:%d, stop pos:%d, numBits:%d",iii,lastBit,i,bitnum);

- //move BitStream back to DemodBuffer

- setDemodBuf(BitStream,BitLen);

+ }

+ PrintAndLog("Using Clock: %d - invert: %d - Bits Found: %d", clk, invert, BitLen);

+

+ //move BitStream back to DemodBuffer

+ setDemodBuf(BitStream,BitLen,0);

- //output

+ //output

if (errCnt>0){

- PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt);

+ PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d", errCnt);

}

PrintAndLog("ASK demoded bitstream:");

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

}

PrintAndLog("ASK demoded bitstream:");

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

}

/* Get our clock */

}

/* Get our clock */

- clock = GetClock(Cmd, high, 1);

+ clock = GetAskClock(Cmd, high, 1);

gtl = ClearGraph(0);

bit = 0;

gtl = ClearGraph(0);

bit = 0;

bit ^= 1;

AppendGraph(0, clock, bit);

bit ^= 1;

AppendGraph(0, clock, bit);

- // for (j = 0; j < (int)(clock/2); j++)

- // GraphBuffer[(i * clock) + j] = bit ^ 1;

- // for (j = (int)(clock/2); j < clock; j++)

- // GraphBuffer[(i * clock) + j] = bit;

}

RepaintGraphWindow();

}

RepaintGraphWindow();

return 0;

}

RepaintGraphWindow();

return 0;

}

+/**

+ * Undecimate - I'd call it 'interpolate', but we'll save that

+ * name until someone does an actual interpolation command, not just

+ * blindly repeating samples

+ * @param Cmd

+ * @return

+ */

+int CmdUndec(const char *Cmd)

+{

+ if(param_getchar(Cmd, 0) == 'h')

+ {

+ PrintAndLog("Usage: data undec [factor]");

+ PrintAndLog("This function performs un-decimation, by repeating each sample N times");

+ PrintAndLog("Options: ");

+ PrintAndLog(" h This help");

+ PrintAndLog(" factor The number of times to repeat each sample.[default:2]");

+ PrintAndLog("Example: 'data undec 3'");

+ return 0;

+ }

+

+ uint8_t factor = param_get8ex(Cmd, 0,2, 10);

+ //We have memory, don't we?

+ int swap[MAX_GRAPH_TRACE_LEN] = { 0 };

+ uint32_t g_index = 0 ,s_index = 0;

+ while(g_index < GraphTraceLen && s_index < MAX_GRAPH_TRACE_LEN)

+ {

+ int count = 0;

+ for(count = 0; count < factor && s_index+count < MAX_GRAPH_TRACE_LEN; count ++)

+ swap[s_index+count] = GraphBuffer[g_index];

+ s_index+=count;

+ }

+

+ memcpy(GraphBuffer,swap, s_index * sizeof(int));

+ GraphTraceLen = s_index;

+ RepaintGraphWindow();

+ return 0;

+}

+

+//by marshmellow

+//shift graph zero up or down based on input + or -

+int CmdGraphShiftZero(const char *Cmd)

+{

+

+ int shift=0;

+ //set options from parameters entered with the command

+ sscanf(Cmd, "%i", &shift);

+ int shiftedVal=0;

+ for(int i = 0; i<GraphTraceLen; i++){

+ shiftedVal=GraphBuffer[i]+shift;

+ if (shiftedVal>127)

+ shiftedVal=127;

+ else if (shiftedVal<-127)

+ shiftedVal=-127;

+ GraphBuffer[i]= shiftedVal;

+ }

+ CmdNorm("");

+ return 0;

+}

+

+//by marshmellow

+//use large jumps in read samples to identify edges of waves and then amplify that wave to max

+//similar to dirtheshold, threshold, and askdemod commands

+//takes a threshold length which is the measured length between two samples then determines an edge

+int CmdAskEdgeDetect(const char *Cmd)

+{

+ int thresLen = 25;

+ sscanf(Cmd, "%i", &thresLen);

+ int shift = 127;

+ int shiftedVal=0;

+ for(int i = 1; i<GraphTraceLen; i++){

+ if (GraphBuffer[i]-GraphBuffer[i-1]>=thresLen) //large jump up

+ shift=127;

+ else if(GraphBuffer[i]-GraphBuffer[i-1]<=-1*thresLen) //large jump down

+ shift=-127;

+

+ shiftedVal=GraphBuffer[i]+shift;

+

+ if (shiftedVal>127)

+ shiftedVal=127;

+ else if (shiftedVal<-127)

+ shiftedVal=-127;

+ GraphBuffer[i-1] = shiftedVal;

+ }

+ RepaintGraphWindow();

+ //CmdNorm("");

+ return 0;

+}

/* Print our clock rate */

// uses data from graphbuffer

/* Print our clock rate */

// uses data from graphbuffer

+// adjusted to take char parameter for type of modulation to find the clock - by marshmellow.

int CmdDetectClockRate(const char *Cmd)

{

int CmdDetectClockRate(const char *Cmd)

{

- GetClock("",0,0);

- //int clock = DetectASKClock(0);

- //PrintAndLog("Auto-detected clock rate: %d", clock);

- return 0;

+ char cmdp = param_getchar(Cmd, 0);

+ if (strlen(Cmd) > 3 || strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') {

+ PrintAndLog("Usage: data detectclock [modulation]");

+ PrintAndLog(" [modulation as char], specify the modulation type you want to detect the clock of");

+ PrintAndLog(" 'a' = ask, 'f' = fsk, 'n' = nrz/direct, 'p' = psk");

+ PrintAndLog("");

+ PrintAndLog(" sample: data detectclock a = detect the clock of an ask modulated wave in the GraphBuffer");

+ PrintAndLog(" data detectclock f = detect the clock of an fsk modulated wave in the GraphBuffer");

+ PrintAndLog(" data detectclock p = detect the clock of an psk modulated wave in the GraphBuffer");

+ PrintAndLog(" data detectclock n = detect the clock of an nrz/direct modulated wave in the GraphBuffer");

+ }

+ int ans=0;

+ if (cmdp == 'a'){

+ ans = GetAskClock("", true, false);

+ } else if (cmdp == 'f'){

+ ans = GetFskClock("", true, false);

+ } else if (cmdp == 'n'){

+ ans = GetNrzClock("", true, false);

+ } else if (cmdp == 'p'){

+ ans = GetPskClock("", true, false);

+ } else {

+ PrintAndLog ("Please specify a valid modulation to detect the clock of - see option h for help");

+ }

+ return ans;

}

//by marshmellow

//fsk raw demod and print binary

}

//by marshmellow

//fsk raw demod and print binary

-//takes 4 arguments - Clock, invert, rchigh, rclow

-//defaults: clock = 50, invert=0, rchigh=10, rclow=8 (RF/10 RF/8 (fsk2a))

+//takes 4 arguments - Clock, invert, fchigh, fclow

+//defaults: clock = 50, invert=1, fchigh=10, fclow=8 (RF/10 RF/8 (fsk2a))

int CmdFSKrawdemod(const char *Cmd)

{

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

//set defaults

int CmdFSKrawdemod(const char *Cmd)

{

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

//set defaults

- int rfLen = 50;

+ int rfLen = 0;

int invert=0;

- int fchigh=10;

- int fclow=8;

+ int fchigh=0;

+ int fclow=0;

+ char cmdp = param_getchar(Cmd, 0);

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

+ PrintAndLog("Usage: data fskrawdemod [clock] <invert> [fchigh] [fclow]");

+ PrintAndLog(" [set clock as integer] optional, omit for autodetect.");

+ PrintAndLog(" <invert>, 1 for invert output, can be used even if the clock is omitted");

+ PrintAndLog(" [fchigh], larger field clock length, omit for autodetect");

+ PrintAndLog(" [fclow], small field clock length, omit for autodetect");

+ PrintAndLog("");

+ PrintAndLog(" sample: data fskrawdemod = demod an fsk tag from GraphBuffer using autodetect");

+ PrintAndLog(" : data fskrawdemod 32 = demod an fsk tag from GraphBuffer using a clock of RF/32, autodetect fc");

+ PrintAndLog(" : data fskrawdemod 1 = demod an fsk tag from GraphBuffer using autodetect, invert output");

+ PrintAndLog(" : data fskrawdemod 32 1 = demod an fsk tag from GraphBuffer using a clock of RF/32, invert output, autodetect fc");

+ PrintAndLog(" : data fskrawdemod 64 0 8 5 = demod an fsk1 RF/64 tag from GraphBuffer");

+ PrintAndLog(" : data fskrawdemod 50 0 10 8 = demod an fsk2 RF/50 tag from GraphBuffer");

+ PrintAndLog(" : data fskrawdemod 50 1 10 8 = demod an fsk2a RF/50 tag from GraphBuffer");

+ return 0;

+ }

//set options from parameters entered with the command

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

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

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

- //rfLen=param_get8(Cmd, 0); //if rfLen option only is used

if (rfLen==1){

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

if (rfLen==1){

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

- rfLen = 50;

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

- }

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

+ rfLen = 0;

+ }

+

uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

- size_t BitLen = getFromGraphBuf(BitStream);

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

+ size_t BitLen = getFromGraphBuf(BitStream);

+ if (BitLen==0) return 0;

+ //get field clock lengths

+ uint16_t fcs=0;

+ uint8_t dummy=0;

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

+ fcs=countFC(BitStream, BitLen, &dummy);

+ if (fcs==0){

+ fchigh=10;

+ fclow=8;

+ }else{

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

+ fclow = fcs & 0xFF;

+ }

+ //get bit clock length

+ if (rfLen==0){

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

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

+ }

+ PrintAndLog("Args invert: %d - Clock:%d - fchigh:%d - fclow: %d",invert,rfLen,fchigh, fclow);

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

if (size>0){

PrintAndLog("FSK decoded bitstream:");

if (size>0){

PrintAndLog("FSK decoded bitstream:");

- setDemodBuf(BitStream,size);

+ setDemodBuf(BitStream,size,0);

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

if(size > (8*32)+2) size = (8*32)+2; //only output a max of 8 blocks of 32 bits most tags will have full bit stream inside that sample size

printBitStream(BitStream,size);

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

if(size > (8*32)+2) size = (8*32)+2; //only output a max of 8 blocks of 32 bits most tags will have full bit stream inside that sample size

printBitStream(BitStream,size);

+ return 1;

} else{

PrintAndLog("no FSK data found");

}

} else{

PrintAndLog("no FSK data found");

}

uint32_t hi2=0, hi=0, lo=0;

uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

uint32_t hi2=0, hi=0, lo=0;

uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

- size_t BitLen = getFromGraphBuf(BitStream);

+ size_t BitLen = getFromGraphBuf(BitStream);

+ if (BitLen==0) return 0;

//get binary from fsk wave

- size_t size = HIDdemodFSK(BitStream,BitLen,&hi2,&hi,&lo);

- if (size<0){

- PrintAndLog("Error demoding fsk");

+ int idx = HIDdemodFSK(BitStream,&BitLen,&hi2,&hi,&lo);

+ if (idx<0){

+ if (g_debugMode){

+ if (idx==-1){

+ PrintAndLog("DEBUG: Just Noise Detected");

+ } else if (idx == -2) {

+ PrintAndLog("DEBUG: Error demoding fsk");

+ } else if (idx == -3) {

+ PrintAndLog("DEBUG: Preamble not found");

+ } else if (idx == -4) {

+ PrintAndLog("DEBUG: Error in Manchester data, SIZE: %d", BitLen);

+ } else {

+ PrintAndLog("DEBUG: Error demoding fsk %d", idx);

+ }

+ return 0;

+ }

+ if (hi2==0 && hi==0 && lo==0) {

+ if (g_debugMode) PrintAndLog("DEBUG: Error - no values found");

return 0;

}

return 0;

}

- if (hi2==0 && hi==0 && lo==0) return 0;

if (hi2 != 0){ //extra large HID tags

- PrintAndLog("HID Prox TAG ID: %x%08x%08x (%d)",

+ PrintAndLog("HID Prox TAG ID: %x%08x%08x (%d)",

(unsigned int) hi2, (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);

- setDemodBuf(BitStream,BitLen);

- return 1;

}

else { //standard HID tags <38 bits

}

else { //standard HID tags <38 bits

- //Dbprintf("TAG ID: %x%08x (%d)",(unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF); //old print cmd

uint8_t fmtLen = 0;

uint32_t fc = 0;

uint32_t cardnum = 0;

uint8_t fmtLen = 0;

uint32_t fc = 0;

uint32_t cardnum = 0;

lo2=lo2>>1;

idx3++;

}

lo2=lo2>>1;

idx3++;

}

- fmtLen =idx3+19;

+ fmtLen =idx3+19;

fc =0;

cardnum=0;

if(fmtLen==26){

fc =0;

cardnum=0;

if(fmtLen==26){

cardnum = (lo>>1)&0x7FFFF;

fc = ((hi&0xF)<<12)|(lo>>20);

}

cardnum = (lo>>1)&0x7FFFF;

fc = ((hi&0xF)<<12)|(lo>>20);

}

- }

- PrintAndLog("HID Prox TAG ID: %x%08x (%d) - Format Len: %dbit - FC: %d - Card: %d",

+ }

+ PrintAndLog("HID Prox TAG ID: %x%08x (%d) - Format Len: %dbit - FC: %d - Card: %d",

(unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF,

(unsigned int) fmtLen, (unsigned int) fc, (unsigned int) cardnum);

(unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF,

(unsigned int) fmtLen, (unsigned int) fc, (unsigned int) cardnum);

- setDemodBuf(BitStream,BitLen);

- return 1;

}

- return 0;

+ setDemodBuf(BitStream,BitLen,idx);

+ if (g_debugMode){

+ PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen);

+ printDemodBuff();

+ }

+ return 1;

+}

+

+//by marshmellow

+//Paradox Prox demod - FSK RF/50 with preamble of 00001111 (then manchester encoded)

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

+int CmdFSKdemodParadox(const char *Cmd)

+{

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

+ uint32_t hi2=0, hi=0, lo=0;

+

+ uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

+ size_t BitLen = getFromGraphBuf(BitStream);

+ if (BitLen==0) return 0;

+ //get binary from fsk wave

+ int idx = ParadoxdemodFSK(BitStream,&BitLen,&hi2,&hi,&lo);

+ if (idx<0){

+ if (g_debugMode){

+ if (idx==-1){

+ PrintAndLog("DEBUG: Just Noise Detected");

+ } else if (idx == -2) {

+ PrintAndLog("DEBUG: Error demoding fsk");

+ } else if (idx == -3) {

+ PrintAndLog("DEBUG: Preamble not found");

+ } else if (idx == -4) {

+ PrintAndLog("DEBUG: Error in Manchester data");

+ } else {

+ PrintAndLog("DEBUG: Error demoding fsk %d", idx);

+ }

+ return 0;

+ }

+ if (hi2==0 && hi==0 && lo==0){

+ if (g_debugMode) PrintAndLog("DEBUG: Error - no value found");

+ return 0;

+ }

+ uint32_t fc = ((hi & 0x3)<<6) | (lo>>26);

+ uint32_t cardnum = (lo>>10)&0xFFFF;

+

+ PrintAndLog("Paradox TAG ID: %x%08x - FC: %d - Card: %d - Checksum: %02x",

+ hi>>10, (hi & 0x3)<<26 | (lo>>10), fc, cardnum, (lo>>2) & 0xFF );

+ setDemodBuf(BitStream,BitLen,idx);

+ if (g_debugMode){

+ PrintAndLog("DEBUG: idx: %d, len: %d, Printing Demod Buffer:", idx, BitLen);

+ printDemodBuff();

+ }

+ return 1;

}

//by marshmellow

}

//by marshmellow

{

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

//set defaults

{

//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) return 0;

+ int idx=0;

+ //something in graphbuffer?

+ if (GraphTraceLen < 65) {

+ if (g_debugMode)PrintAndLog("DEBUG: not enough samples in GraphBuffer");

+ return 0;

+ }

uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

- size_t BitLen = getFromGraphBuf(BitStream);

+ size_t BitLen = getFromGraphBuf(BitStream);

+ if (BitLen==0) return 0;

+

//get binary from fsk wave

- // PrintAndLog("DEBUG: got buff");

- idx = IOdemodFSK(BitStream,BitLen);

+ idx = IOdemodFSK(BitStream,BitLen);

if (idx<0){

- //PrintAndLog("Error demoding fsk");

+ if (g_debugMode){

+ if (idx==-1){

+ PrintAndLog("DEBUG: Just Noise Detected");

+ } else if (idx == -2) {

+ PrintAndLog("DEBUG: not enough samples");

+ } else if (idx == -3) {

+ PrintAndLog("DEBUG: error during fskdemod");

+ } else if (idx == -4) {

+ PrintAndLog("DEBUG: Preamble not found");

+ } else if (idx == -5) {

+ PrintAndLog("DEBUG: Separator bits not found");

+ } else {

+ PrintAndLog("DEBUG: Error demoding fsk %d", idx);

+ }

return 0;

}

return 0;

}

- // PrintAndLog("DEBUG: Got IOdemodFSK");

if (idx==0){

- //PrintAndLog("IO Prox Data not found - FSK Data:");

- //if (BitLen > 92) printBitStream(BitStream,92);

+ if (g_debugMode==1){

+ PrintAndLog("DEBUG: IO Prox Data not found - FSK Bits: %d",BitLen);

+ if (BitLen > 92) printBitStream(BitStream,92);

+ }

return 0;

}

//Index map

return 0;

}

//Index map

//

//XSF(version)facility:codeone+codetwo (raw)

//Handle the data

//

//XSF(version)facility:codeone+codetwo (raw)

//Handle the data

- if (idx+64>BitLen) return 0;

+ if (idx+64>BitLen) {

+ if (g_debugMode==1) PrintAndLog("not enough bits found - bitlen: %d",BitLen);

+ return 0;

+ }

PrintAndLog("%d%d%d%d%d%d%d%d %d",BitStream[idx], BitStream[idx+1], BitStream[idx+2], BitStream[idx+3], BitStream[idx+4], BitStream[idx+5], BitStream[idx+6], BitStream[idx+7], BitStream[idx+8]);

- PrintAndLog("%d%d%d%d%d%d%d%d %d",BitStream[idx+9], BitStream[idx+10], BitStream[idx+11],BitStream[idx+12],BitStream[idx+13],BitStream[idx+14],BitStream[idx+15],BitStream[idx+16],BitStream[idx+17]);

+ PrintAndLog("%d%d%d%d%d%d%d%d %d",BitStream[idx+9], BitStream[idx+10], BitStream[idx+11],BitStream[idx+12],BitStream[idx+13],BitStream[idx+14],BitStream[idx+15],BitStream[idx+16],BitStream[idx+17]);

PrintAndLog("%d%d%d%d%d%d%d%d %d facility",BitStream[idx+18], BitStream[idx+19], BitStream[idx+20],BitStream[idx+21],BitStream[idx+22],BitStream[idx+23],BitStream[idx+24],BitStream[idx+25],BitStream[idx+26]);

PrintAndLog("%d%d%d%d%d%d%d%d %d version",BitStream[idx+27], BitStream[idx+28], BitStream[idx+29],BitStream[idx+30],BitStream[idx+31],BitStream[idx+32],BitStream[idx+33],BitStream[idx+34],BitStream[idx+35]);

PrintAndLog("%d%d%d%d%d%d%d%d %d code1",BitStream[idx+36], BitStream[idx+37], BitStream[idx+38],BitStream[idx+39],BitStream[idx+40],BitStream[idx+41],BitStream[idx+42],BitStream[idx+43],BitStream[idx+44]);

PrintAndLog("%d%d%d%d%d%d%d%d %d facility",BitStream[idx+18], BitStream[idx+19], BitStream[idx+20],BitStream[idx+21],BitStream[idx+22],BitStream[idx+23],BitStream[idx+24],BitStream[idx+25],BitStream[idx+26]);

PrintAndLog("%d%d%d%d%d%d%d%d %d version",BitStream[idx+27], BitStream[idx+28], BitStream[idx+29],BitStream[idx+30],BitStream[idx+31],BitStream[idx+32],BitStream[idx+33],BitStream[idx+34],BitStream[idx+35]);

PrintAndLog("%d%d%d%d%d%d%d%d %d code1",BitStream[idx+36], BitStream[idx+37], BitStream[idx+38],BitStream[idx+39],BitStream[idx+40],BitStream[idx+41],BitStream[idx+42],BitStream[idx+43],BitStream[idx+44]);

PrintAndLog("%d%d%d%d%d%d%d%d %d%d checksum",BitStream[idx+54],BitStream[idx+55],BitStream[idx+56],BitStream[idx+57],BitStream[idx+58],BitStream[idx+59],BitStream[idx+60],BitStream[idx+61],BitStream[idx+62],BitStream[idx+63]);

uint32_t code = bytebits_to_byte(BitStream+idx,32);

PrintAndLog("%d%d%d%d%d%d%d%d %d%d checksum",BitStream[idx+54],BitStream[idx+55],BitStream[idx+56],BitStream[idx+57],BitStream[idx+58],BitStream[idx+59],BitStream[idx+60],BitStream[idx+61],BitStream[idx+62],BitStream[idx+63]);

uint32_t code = bytebits_to_byte(BitStream+idx,32);

- uint32_t code2 = bytebits_to_byte(BitStream+idx+32,32);

+ uint32_t code2 = bytebits_to_byte(BitStream+idx+32,32);

uint8_t version = bytebits_to_byte(BitStream+idx+27,8); //14,4

uint8_t facilitycode = bytebits_to_byte(BitStream+idx+18,8) ;

uint16_t number = (bytebits_to_byte(BitStream+idx+36,8)<<8)|(bytebits_to_byte(BitStream+idx+45,8)); //36,9

uint8_t version = bytebits_to_byte(BitStream+idx+27,8); //14,4

uint8_t facilitycode = bytebits_to_byte(BitStream+idx+18,8) ;

uint16_t number = (bytebits_to_byte(BitStream+idx+36,8)<<8)|(bytebits_to_byte(BitStream+idx+45,8)); //36,9

- PrintAndLog("IO Prox XSF(%02d)%02x:%05d (%08x%08x)",version,facilitycode,number,code,code2);

- int i;

- for (i=0;i<64;++i)

- DemodBuffer[i]=BitStream[idx++];

-

- DemodBufferLen=64;

+ PrintAndLog("IO Prox XSF(%02d)%02x:%05d (%08x%08x)",version,facilitycode,number,code,code2);

+ setDemodBuf(BitStream,64,idx);

+ if (g_debugMode){

+ PrintAndLog("DEBUG: idx: %d, Len: %d, Printing demod buffer:",idx,64);

+ printDemodBuff();

+ }

return 1;

}

return 1;

}

-

//by marshmellow

//AWID Prox demod - FSK RF/50 with preamble of 00000001 (always a 96 bit data stream)

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

int CmdFSKdemodAWID(const char *Cmd)

{

//by marshmellow

//AWID Prox demod - FSK RF/50 with preamble of 00000001 (always a 96 bit data stream)

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

int CmdFSKdemodAWID(const char *Cmd)

{

- int verbose=1;

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

+ //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);

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

//get binary from fsk wave

- int idx = AWIDdemodFSK(BitStream, size);

+ int idx = AWIDdemodFSK(BitStream, &size);

if (idx<=0){

- if (verbose){

+ if (g_debugMode==1){

if (idx == -1)

- PrintAndLog("Error: not enough samples");

+ PrintAndLog("DEBUG: Error - not enough samples");

else if (idx == -2)

- PrintAndLog("Error: only noise found - no waves");

+ PrintAndLog("DEBUG: Error - only noise found");

else if (idx == -3)

- PrintAndLog("Error: problem during FSK demod");

- // else if (idx == -3)

- // PrintAndLog("Error: thought we had a tag but the parity failed");

+ PrintAndLog("DEBUG: Error - problem during FSK demod");

else if (idx == -4)

- PrintAndLog("Error: AWID preamble not found");

+ PrintAndLog("DEBUG: Error - AWID preamble not found");

+ else if (idx == -5)

+ PrintAndLog("DEBUG: Error - Size not correct: %d", size);

+ else

+ PrintAndLog("DEBUG: Error %d",idx);

}

return 0;

}

return 0;

}

uint32_t rawLo = bytebits_to_byte(BitStream+idx+64,32);

uint32_t rawHi = bytebits_to_byte(BitStream+idx+32,32);

uint32_t rawHi2 = bytebits_to_byte(BitStream+idx,32);

uint32_t rawLo = bytebits_to_byte(BitStream+idx+64,32);

uint32_t rawHi = bytebits_to_byte(BitStream+idx+32,32);

uint32_t rawHi2 = bytebits_to_byte(BitStream+idx,32);

+ setDemodBuf(BitStream,96,idx);

+

size = removeParity(BitStream, idx+8, 4, 1, 88);

if (size != 66){

size = removeParity(BitStream, idx+8, 4, 1, 88);

if (size != 66){

- if (verbose) PrintAndLog("Error: at parity check-tag size does not match AWID format");

+ if (g_debugMode==1) PrintAndLog("DEBUG: Error - at parity check-tag size does not match AWID format");

return 0;

}

// ok valid card found!

return 0;

}

// ok valid card found!

PrintAndLog("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x, Raw: %x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo);

}

PrintAndLog("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x, Raw: %x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo);

}

-

+ if (g_debugMode){

+ PrintAndLog("DEBUG: idx: %d, Len: %d Printing Demod Buffer:", idx, 96);

+ printDemodBuff();

+ }

//todo - convert hi2, hi, lo to demodbuffer for future sim/clone commands

-

return 1;

}

return 1;

}

//print full Farpointe Data/Pyramid Prox ID and some bit format details if found

int CmdFSKdemodPyramid(const char *Cmd)

{

//print full Farpointe Data/Pyramid Prox ID and some bit format details if found

int CmdFSKdemodPyramid(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);

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

//get binary from fsk wave

- int idx = PyramiddemodFSK(BitStream, size);

+ int idx = PyramiddemodFSK(BitStream, &size);

if (idx < 0){

- if (verbose){

+ if (g_debugMode==1){

if (idx == -5)

- PrintAndLog("Error: not enough samples");

+ PrintAndLog("DEBUG: Error - not enough samples");

else if (idx == -1)

- PrintAndLog("Error: only noise found - no waves");

+ PrintAndLog("DEBUG: Error - only noise found");

else if (idx == -2)

- PrintAndLog("Error: problem during FSK demod");

- //else if (idx == -3)

- // PrintAndLog("Error: thought we had a tag but the parity failed");

+ PrintAndLog("DEBUG: Error - problem during FSK demod");

+ else if (idx == -3)

+ PrintAndLog("DEBUG: Error - Size not correct: %d", size);

else if (idx == -4)

- PrintAndLog("Error: AWID preamble not found");

+ PrintAndLog("DEBUG: Error - Pyramid preamble not found");

+ else

+ PrintAndLog("DEBUG: Error - idx: %d",idx);

}

- PrintAndLog("idx: %d",idx);

return 0;

}

return 0;

}

- //PrintAndLog("DEBUG: idx: %d",idx);

-

// Index map

// 0 10 20 30 40 50 60

// | | | | | | |

// Index map

// 0 10 20 30 40 50 60

// | | | | | | |

uint32_t rawHi = bytebits_to_byte(BitStream+idx+64,32);

uint32_t rawHi2 = bytebits_to_byte(BitStream+idx+32,32);

uint32_t rawHi3 = bytebits_to_byte(BitStream+idx,32);

uint32_t rawHi = bytebits_to_byte(BitStream+idx+64,32);

uint32_t rawHi2 = bytebits_to_byte(BitStream+idx+32,32);

uint32_t rawHi3 = bytebits_to_byte(BitStream+idx,32);

+ setDemodBuf(BitStream,128,idx);

+

size = removeParity(BitStream, idx+8, 8, 1, 120);

if (size != 105){

size = removeParity(BitStream, idx+8, 8, 1, 120);

if (size != 105){

- if (verbose) PrintAndLog("Error: at parity check-tag size does not match Pyramid format, SIZE: %d, IDX: %d, hi3: %x",size, idx, rawHi3);

+ if (g_debugMode==1) PrintAndLog("DEBUG: Error at parity check-tag size does not match Pyramid format, SIZE: %d, IDX: %d, hi3: %x",size, idx, rawHi3);

return 0;

}

return 0;

}

// (26 bit format shown)

//find start bit to get fmtLen

// (26 bit format shown)

//find start bit to get fmtLen

- idx = 0;

int j;

for (j=0; j<size; j++){

int j;

for (j=0; j<size; j++){

- if(BitStream[idx+j]) break;

+ if(BitStream[j]) break;

}

uint8_t fmtLen = size-j-8;

uint32_t fc = 0;

}

uint8_t fmtLen = size-j-8;

uint32_t fc = 0;

fc = bytebits_to_byte(BitStream+73, 8);

cardnum = bytebits_to_byte(BitStream+81, 16);

code1 = bytebits_to_byte(BitStream+72,fmtLen);

fc = bytebits_to_byte(BitStream+73, 8);

cardnum = bytebits_to_byte(BitStream+81, 16);

code1 = bytebits_to_byte(BitStream+72,fmtLen);

- PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %x%08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi3, rawHi2, rawHi, rawLo);

+ PrintAndLog("Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %x%08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi3, rawHi2, rawHi, rawLo);

} else if (fmtLen==45){

fmtLen=42; //end = 10 bits not 7 like 26 bit fmt

fc = bytebits_to_byte(BitStream+53, 10);

cardnum = bytebits_to_byte(BitStream+63, 32);

} else if (fmtLen==45){

fmtLen=42; //end = 10 bits not 7 like 26 bit fmt

fc = bytebits_to_byte(BitStream+53, 10);

cardnum = bytebits_to_byte(BitStream+63, 32);

- PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %d - Raw: %x%08x%08x%08x", fmtLen, fc, cardnum, rawHi3, rawHi2, rawHi, rawLo);

+ PrintAndLog("Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Raw: %x%08x%08x%08x", fmtLen, fc, cardnum, rawHi3, rawHi2, rawHi, rawLo);

} else {

cardnum = bytebits_to_byte(BitStream+81, 16);

if (fmtLen>32){

//code1 = bytebits_to_byte(BitStream+(size-fmtLen),fmtLen-32);

//code2 = bytebits_to_byte(BitStream+(size-32),32);

} else {

cardnum = bytebits_to_byte(BitStream+81, 16);

if (fmtLen>32){

//code1 = bytebits_to_byte(BitStream+(size-fmtLen),fmtLen-32);

//code2 = bytebits_to_byte(BitStream+(size-32),32);

- PrintAndLog("AWID Found - BitLength: %d -unknown BitLength- (%d), Raw: %x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);

+ PrintAndLog("Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);

} else{

//code1 = bytebits_to_byte(BitStream+(size-fmtLen),fmtLen);

} else{

//code1 = bytebits_to_byte(BitStream+(size-fmtLen),fmtLen);

- PrintAndLog("AWID Found - BitLength: %d -unknown BitLength- (%d), Raw: %x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);

+ PrintAndLog("Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);

}

- //todo - convert hi2, hi, lo to demodbuffer for future sim/clone commands

-

+ if (g_debugMode){

+ PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, 128);

+ printDemodBuff();

+ }

return 1;

}

return 1;

}

PrintAndLog("actual data bits start at sample %d", maxPos);

PrintAndLog("length %d/%d", highLen, lowLen);

PrintAndLog("actual data bits start at sample %d", maxPos);

PrintAndLog("length %d/%d", highLen, lowLen);

- uint8_t bits[46];

- bits[sizeof(bits)-1] = '\0';

+ uint8_t bits[46] = {0x00};

// find bit pairs and manchester decode them

for (i = 0; i < arraylen(bits) - 1; ++i) {

// find bit pairs and manchester decode them

for (i = 0; i < arraylen(bits) - 1; ++i) {

return 0;

}

return 0;

}

-int CmdFSKfcDetect(const char *Cmd)

+//by marshmellow

+//attempt to psk1 demod graph buffer

+int PSKDemod(const char *Cmd, uint8_t verbose)

{

+ int invert=0;

+ int clk=0;

+ int maxErr=100;

+ sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);

+ if (clk==1){

+ invert=1;

+ clk=0;

+ }

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

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

+ return -1;

+ }

uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

- size_t size = getFromGraphBuf(BitStream);

-

- uint32_t ans = countFC(BitStream, size);

- int fc1, fc2, rf1;

- fc1 = (ans >> 8) & 0xFF;

- fc2 = ans & 0xFF;

- rf1 = (ans >>16) & 0xFF;

- PrintAndLog("Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);

- return 1;

-}

-

-int CmdDetectNRZpskClockRate(const char *Cmd)

-{

- GetNRZpskClock("",0,0);

- return 0;

+ size_t BitLen = getFromGraphBuf(BitStream);

+ if (BitLen==0) return 0;

+ int errCnt=0;

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

+ if (errCnt > maxErr){

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

+ return -1;

+ }

+ if (errCnt<0|| BitLen<16){ //throw away static - allow 1 and -1 (in case of threshold command first)

+ if (g_debugMode==1) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);

+ return -1;

+ }

+ if (verbose) PrintAndLog("Tried PSK Demod using Clock: %d - invert: %d - Bits Found: %d",clk,invert,BitLen);

+ //prime demod buffer for output

+ setDemodBuf(BitStream,BitLen,0);

+ return errCnt;

}

-int PSKnrzDemod(const char *Cmd){

- int invert=0;

- int clk=0;

- sscanf(Cmd, "%i %i", &clk, &invert);

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

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

- return -1;

- }

- uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

- size_t BitLen = getFromGraphBuf(BitStream);

- int errCnt=0;

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

- if (errCnt<0|| BitLen<16){ //throw away static - allow 1 and -1 (in case of threshold command first)

- //PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);

- return -1;

- }

- PrintAndLog("Tried PSK/NRZ Demod using Clock: %d - invert: %d - Bits Found: %d",clk,invert,BitLen);

-

- //prime demod buffer for output

- setDemodBuf(BitStream,BitLen);

- return errCnt;

-}

// Indala 26 bit decode

// by marshmellow

// optional arguments - same as CmdpskNRZrawDemod (clock & invert)

int CmdIndalaDecode(const char *Cmd)

{

// Indala 26 bit decode

// by marshmellow

// optional arguments - same as CmdpskNRZrawDemod (clock & invert)

int CmdIndalaDecode(const char *Cmd)

{

- uint8_t verbose = 1;

- int ans;

- if (strlen(Cmd)>0){

- if (Cmd[0]=='0'){

- verbose=0;

- ans = PSKnrzDemod("32");

- }else{

- ans = PSKnrzDemod(Cmd);

- }

- } else{ //default to RF/32

- ans = PSKnrzDemod("32");

- }

+ int ans;

+ if (strlen(Cmd)>0){

+ ans = PSKDemod(Cmd, 0);

+ } else{ //default to RF/32

+ ans = PSKDemod("32", 0);

+ }

if (ans < 0){

- if (verbose)

- PrintAndLog("Error1: %d",ans);

+ if (g_debugMode==1)

+ PrintAndLog("Error1: %d",ans);

return 0;

}

uint8_t invert=0;

ans = indala26decode(DemodBuffer,(size_t *) &DemodBufferLen, &invert);

if (ans < 1) {

return 0;

}

uint8_t invert=0;

ans = indala26decode(DemodBuffer,(size_t *) &DemodBufferLen, &invert);

if (ans < 1) {

- if (verbose)

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

+ if (g_debugMode==1)

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

return -1;

}

return -1;

}

- char showbits[251];

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

if (invert)

- if (verbose)

- PrintAndLog("Had to invert bits");

+ if (g_debugMode==1)

+ PrintAndLog("Had to invert bits");

+

//convert UID to HEX

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

int idx;

//convert UID to HEX

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

int idx;

showbits[idx]='\0';

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

}

showbits[idx]='\0';

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

}

+ if (g_debugMode){

+ PrintAndLog("DEBUG: printing demodbuffer:");

+ printDemodBuff();

+ }

return 1;

}

return 1;

}

-int CmdPskClean(const char *Cmd)

+// by marshmellow

+// takes 3 arguments - clock, invert, maxErr as integers

+// attempts to demodulate nrz only

+// prints binary found and saves in demodbuffer for further commands

+int CmdNRZrawDemod(const char *Cmd)

{

- uint8_t bitStream[MAX_GRAPH_TRACE_LEN]={0};

- size_t bitLen = getFromGraphBuf(bitStream);

- pskCleanWave(bitStream, bitLen);

- setGraphBuf(bitStream, bitLen);

- return 0;

+ int invert=0;

+ int clk=0;

+ int maxErr=100;

+ char cmdp = param_getchar(Cmd, 0);

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

+ PrintAndLog("Usage: data nrzrawdemod [clock] <0|1> [maxError]");

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

+ PrintAndLog(" <invert>, 1 for invert output");

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

+ PrintAndLog("");

+ PrintAndLog(" sample: data nrzrawdemod = demod a nrz/direct tag from GraphBuffer");

+ PrintAndLog(" : data nrzrawdemod 32 = demod a nrz/direct tag from GraphBuffer using a clock of RF/32");

+ PrintAndLog(" : data nrzrawdemod 32 1 = demod a nrz/direct tag from GraphBuffer using a clock of RF/32 and inverting data");

+ PrintAndLog(" : data nrzrawdemod 1 = demod a nrz/direct tag from GraphBuffer while inverting data");

+ PrintAndLog(" : data nrzrawdemod 64 1 0 = demod a nrz/direct tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");

+

+ return 0;

+ }

+

+ sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);

+ if (clk==1){

+ invert=1;

+ clk=0;

+ }

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

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

+ return 0;

+ }

+ uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

+ size_t BitLen = getFromGraphBuf(BitStream);

+ if (BitLen==0) return 0;

+ int errCnt=0;

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

+ if (errCnt > maxErr){

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

+ return 0;

+ }

+ if (errCnt<0|| BitLen<16){ //throw away static - allow 1 and -1 (in case of threshold command first)

+ if (g_debugMode==1) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);

+ return 0;

+ }

+ PrintAndLog("Tried NRZ Demod using Clock: %d - invert: %d - Bits Found: %d",clk,invert,BitLen);

+ //prime demod buffer for output

+ setDemodBuf(BitStream,BitLen,0);

+

+ if (errCnt>0){

+ PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt);

+ }else{

+ }

+ PrintAndLog("NRZ demoded bitstream:");

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

+ printDemodBuff();

+ return 1;

}

-//by marshmellow

-//takes 2 arguments - clock and invert both as integers

-//attempts to demodulate ask only

-//prints binary found and saves in graphbuffer for further commands

-int CmdpskNRZrawDemod(const char *Cmd)

+// by marshmellow

+// takes 3 arguments - clock, invert, maxErr as integers

+// attempts to demodulate psk only

+// prints binary found and saves in demodbuffer for further commands

+int CmdPSK1rawDemod(const char *Cmd)

{

- uint8_t verbose = 1;

int errCnt;

- if (strlen(Cmd)>0){

- if (Cmd[0]=='0')

- verbose=0;

+ char cmdp = param_getchar(Cmd, 0);

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

+ PrintAndLog("Usage: data psk1rawdemod [clock] <0|1> [maxError]");

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

+ PrintAndLog(" <invert>, 1 for invert output");

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

+ PrintAndLog("");

+ PrintAndLog(" sample: data psk1rawdemod = demod a psk1 tag from GraphBuffer");

+ PrintAndLog(" : data psk1rawdemod 32 = demod a psk1 tag from GraphBuffer using a clock of RF/32");

+ PrintAndLog(" : data psk1rawdemod 32 1 = demod a psk1 tag from GraphBuffer using a clock of RF/32 and inverting data");

+ PrintAndLog(" : data psk1rawdemod 1 = demod a psk1 tag from GraphBuffer while inverting data");

+ PrintAndLog(" : data psk1rawdemod 64 1 0 = demod a psk1 tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors");

+ return 0;

+ }

+ errCnt = PSKDemod(Cmd, 1);

+ //output

+ if (errCnt<0){

+ if (g_debugMode) PrintAndLog("Error demoding: %d",errCnt);

+ return 0;

}

+ if (errCnt>0){

+ PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt);

+ }else{

+ }

+ PrintAndLog("PSK demoded bitstream:");

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

+ printDemodBuff();

+ return 1;

+}

- errCnt = PSKnrzDemod(Cmd);

- //output

- if (errCnt<0) return 0;

- if (errCnt>0){

- if (verbose)

+// by marshmellow

+// takes same args as cmdpsknrzrawdemod

+int CmdPSK2rawDemod(const char *Cmd)

+{

+ int errCnt=0;

+ char cmdp = param_getchar(Cmd, 0);

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

+ PrintAndLog("Usage: data psk2rawdemod [clock] <0|1> [maxError]");

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

+ PrintAndLog(" <invert>, 1 for invert output");

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

+ PrintAndLog("");

+ PrintAndLog(" sample: data psk2rawdemod = demod a psk2 tag from GraphBuffer, autodetect clock");

+ PrintAndLog(" : data psk2rawdemod 32 = demod a psk2 tag from GraphBuffer using a clock of RF/32");

+ PrintAndLog(" : data psk2rawdemod 32 1 = demod a psk2 tag from GraphBuffer using a clock of RF/32 and inverting output");

+ PrintAndLog(" : data psk2rawdemod 1 = demod a psk2 tag from GraphBuffer, autodetect clock and invert output");

+ PrintAndLog(" : data psk2rawdemod 64 1 0 = demod a psk2 tag from GraphBuffer using a clock of RF/64, inverting output and allowing 0 demod errors");

+ return 0;

+ }

+ errCnt=PSKDemod(Cmd, 1);

+ if (errCnt<0){

+ if (g_debugMode) PrintAndLog("Error demoding: %d",errCnt);

+ return 0;

+ }

+ psk1TOpsk2(DemodBuffer, DemodBufferLen);

+ if (errCnt>0){

+ if (g_debugMode){

PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt);

- }

- PrintAndLog("PSK or NRZ demoded bitstream:");

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

- printDemodBuff();

-

- return 1;

+ PrintAndLog("PSK2 demoded bitstream:");

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

+ printDemodBuff();

+ }

+ }else{

+ PrintAndLog("PSK2 demoded bitstream:");

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

+ printDemodBuff();

+ }

+ return 1;

}

int CmdGrid(const char *Cmd)

}

int CmdGrid(const char *Cmd)

int offset = 0;

char string_buf[25];

char* string_ptr = string_buf;

int offset = 0;

char string_buf[25];

char* string_ptr = string_buf;

- uint8_t got[40000];

+ uint8_t got[BIGBUF_SIZE];

sscanf(Cmd, "%i %i", &requested, &offset);

requested = 8;

}

if (offset + requested > sizeof(got)) {

requested = 8;

}

if (offset + requested > sizeof(got)) {

- PrintAndLog("Tried to read past end of buffer, <bytes> + <offset> > 40000");

+ PrintAndLog("Tried to read past end of buffer, <bytes> + <offset> > %d", BIGBUF_SIZE);

return 0;

}

return 0;

}

*(string_ptr - 1) = '\0';

PrintAndLog("%s", string_buf);

string_buf[0] = '\0';

*(string_ptr - 1) = '\0';

PrintAndLog("%s", string_buf);

string_buf[0] = '\0';

+ }

}

- }

return 0;

}

return 0;

}

RepaintGraphWindow();

return 0;

}

RepaintGraphWindow();

return 0;

}

+typedef struct {

+ uint8_t * buffer;

+ uint32_t numbits;

+ uint32_t position;

+}BitstreamOut;

+

+bool _headBit( BitstreamOut *stream)

+{

+ int bytepos = stream->position >> 3; // divide by 8

+ int bitpos = (stream->position++) & 7; // mask out 00000111

+ return (*(stream->buffer + bytepos) >> (7-bitpos)) & 1;

+}

+

+uint8_t getByte(uint8_t bits_per_sample, BitstreamOut* b)

+{

+ int i;

+ uint8_t val = 0;

+ for(i =0 ; i < bits_per_sample; i++)

+ {

+ val |= (_headBit(b) << (7-i));

+ }

+ return val;

+}

int CmdSamples(const char *Cmd)

{

int CmdSamples(const char *Cmd)

{

- uint8_t got[40000];

+ //If we get all but the last byte in bigbuf,

+ // we don't have to worry about remaining trash

+ // in the last byte in case the bits-per-sample

+ // does not line up on byte boundaries

+ uint8_t got[BIGBUF_SIZE-1] = { 0 };

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

if (n == 0)

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

if (n == 0)

- n = 20000;

+ n = sizeof(got);

if (n > sizeof(got))

n = sizeof(got);

if (n > sizeof(got))

n = sizeof(got);

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

- GetFromBigBuf(got,n,0);

- WaitForResponse(CMD_ACK,NULL);

- for (int j = 0; j < n; j++) {

- GraphBuffer[j] = ((int)got[j]) - 128;

- }

- GraphTraceLen = n;

- RepaintGraphWindow();

- return 0;

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

+ GetFromBigBuf(got,n,0);

+ PrintAndLog("Data fetched");

+ UsbCommand response;

+ WaitForResponse(CMD_ACK, &response);

+ uint8_t bits_per_sample = 8;

+

+ //Old devices without this feature would send 0 at arg[0]

+ if(response.arg[0] > 0)

+ {

+ sample_config *sc = (sample_config *) response.d.asBytes;

+ PrintAndLog("Samples @ %d bits/smpl, decimation 1:%d ", sc->bits_per_sample

+ , sc->decimation);

+ bits_per_sample = sc->bits_per_sample;

+ }

+ if(bits_per_sample < 8)

+ {

+ PrintAndLog("Unpacking...");

+ BitstreamOut bout = { got, bits_per_sample * n, 0};

+ int j =0;

+ for (j = 0; j * bits_per_sample < n * 8 && j < sizeof(GraphBuffer); j++) {

+ uint8_t sample = getByte(bits_per_sample, &bout);

+ GraphBuffer[j] = ((int) sample )- 128;

+ }

+ GraphTraceLen = j;

+ PrintAndLog("Unpacked %d samples" , j );

+ }else

+ {

+ for (int j = 0; j < n; j++) {

+ GraphBuffer[j] = ((int)got[j]) - 128;

+ }

+ GraphTraceLen = n;

+ }

+

+ RepaintGraphWindow();

+ return 0;

}

int CmdTuneSamples(const char *Cmd)

}

int CmdTuneSamples(const char *Cmd)

GraphBuffer[i] = resp.d.asBytes[i] - 128;

}

GraphBuffer[i] = resp.d.asBytes[i] - 128;

}

- PrintAndLog("Done! Divisor 89 is 134khz, 95 is 125khz.\n");

- PrintAndLog("\n");

+ PrintAndLog("Done! Divisor 89 is 134khz, 95 is 125khz.\n");

+ PrintAndLog("\n");

GraphTraceLen = 256;

ShowGraphWindow();

GraphTraceLen = 256;

ShowGraphWindow();

- return 0;

+ return 0;

}

int CmdLoad(const char *Cmd)

{

}

int CmdLoad(const char *Cmd)

{

- char filename[FILE_PATH_SIZE] = {0x00};

- int len = 0;

+ char filename[FILE_PATH_SIZE] = {0x00};

+ int len = 0;

- len = strlen(Cmd);

- if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;

- memcpy(filename, Cmd, len);

+ len = strlen(Cmd);

+ if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;

+ memcpy(filename, Cmd, len);

- FILE *f = fopen(filename, "r");

+ FILE *f = fopen(filename, "r");

if (!f) {

PrintAndLog("couldn't open '%s'", filename);

return 0;

if (!f) {

PrintAndLog("couldn't open '%s'", filename);

return 0;

RepaintGraphWindow();

return 0;

}

RepaintGraphWindow();

return 0;

}

+

+// trim graph to input argument length

int CmdRtrim(const char *Cmd)

{

int ds = atoi(Cmd);

int CmdRtrim(const char *Cmd)

{

int ds = atoi(Cmd);

}

/* Get our clock */

}

/* Get our clock */

- clock = GetClock(Cmd, high, 1);

+ clock = GetAskClock(Cmd, high, 1);

int tolerance = clock/4;

int bit, lastbit, wave;

/* Get our clock */

int bit, lastbit, wave;

/* Get our clock */

- clock = GetClock(Cmd, 0, 1);

+ clock = GetAskClock(Cmd, 0, 1);

wave = 0;

lastbit = 1;

wave = 0;

lastbit = 1;

int CmdSave(const char *Cmd)

{

int CmdSave(const char *Cmd)

{

- char filename[FILE_PATH_SIZE] = {0x00};

- int len = 0;

+ char filename[FILE_PATH_SIZE] = {0x00};

+ int len = 0;

- len = strlen(Cmd);

- if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;

- memcpy(filename, Cmd, len);

+ len = strlen(Cmd);

+ if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;

+ memcpy(filename, Cmd, len);

FILE *f = fopen(filename, "w");

int CmdDirectionalThreshold(const char *Cmd)

{

int CmdDirectionalThreshold(const char *Cmd)

{

- int8_t upThres = param_get8(Cmd, 0);

- int8_t downThres = param_get8(Cmd, 1);

+ int8_t upThres = param_get8(Cmd, 0);

+ int8_t downThres = param_get8(Cmd, 1);

printf("Applying Up Threshold: %d, Down Threshold: %d\n", upThres, downThres);

{"help", CmdHelp, 1, "This help"},

{"amp", CmdAmp, 1, "Amplify peaks"},

{"askdemod", Cmdaskdemod, 1, "<0 or 1> -- Attempt to demodulate simple ASK tags"},

{"help", CmdHelp, 1, "This help"},

{"amp", CmdAmp, 1, "Amplify peaks"},

{"askdemod", Cmdaskdemod, 1, "<0 or 1> -- Attempt to demodulate simple ASK tags"},

- {"askmandemod", Cmdaskmandemod, 1, "[clock] [invert<0|1>] -- Attempt to demodulate ASK/Manchester tags and output binary (args optional)"},

- {"askrawdemod", Cmdaskrawdemod, 1, "[clock] [invert<0|1>] -- Attempt to demodulate ASK tags and output bin (args optional)"},

+ {"askedgedetect", CmdAskEdgeDetect, 1, "[threshold] Adjust Graph for manual ask demod using length of sample differences to detect the edge of a wave - default = 25"},

+ {"askem410xdemod",CmdAskEM410xDemod, 1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate ASK/Manchester tags and output binary (args optional)"},

+ {"askmandemod", Cmdaskmandemod, 1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate ASK/Manchester tags and output binary (args optional)"},

+ {"askrawdemod", Cmdaskrawdemod, 1, "[clock] [invert<0|1>] -- Attempt to demodulate ASK tags and output bin (args optional)"},

{"autocorr", CmdAutoCorr, 1, "<window length> -- Autocorrelation over window"},

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

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

{"bitstream", CmdBitstream, 1, "[clock rate] -- Convert waveform into a bitstream"},

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

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

{"autocorr", CmdAutoCorr, 1, "<window length> -- Autocorrelation over window"},

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

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

{"bitstream", CmdBitstream, 1, "[clock rate] -- Convert waveform into a bitstream"},

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

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

- {"detectclock", CmdDetectClockRate, 1, "Detect ASK clock rate"},

+ {"detectclock", CmdDetectClockRate, 1, "[modulation] Detect clock rate (options: 'a','f','n','p' for ask, fsk, nrz, psk respectively)"},

{"fskdemod", CmdFSKdemod, 1, "Demodulate graph window as a HID FSK"},

{"fskawiddemod", CmdFSKdemodAWID, 1, "Demodulate graph window as an AWID FSK tag using raw"},

{"fskdemod", CmdFSKdemod, 1, "Demodulate graph window as a HID FSK"},

{"fskawiddemod", CmdFSKdemodAWID, 1, "Demodulate graph window as an AWID FSK tag using raw"},

- {"fskfcdetect", CmdFSKfcDetect, 1, "Try to detect the Field Clock of an FSK wave"},

+ //{"fskfcdetect", CmdFSKfcDetect, 1, "Try to detect the Field Clock of an FSK wave"},

{"fskhiddemod", CmdFSKdemodHID, 1, "Demodulate graph window as a HID FSK tag using raw"},

{"fskiodemod", CmdFSKdemodIO, 1, "Demodulate graph window as an IO Prox tag FSK using raw"},

{"fskpyramiddemod",CmdFSKdemodPyramid,1, "Demodulate graph window as a Pyramid FSK tag using raw"},

{"fskhiddemod", CmdFSKdemodHID, 1, "Demodulate graph window as a HID FSK tag using raw"},

{"fskiodemod", CmdFSKdemodIO, 1, "Demodulate graph window as an IO Prox tag FSK using raw"},

{"fskpyramiddemod",CmdFSKdemodPyramid,1, "Demodulate graph window as a Pyramid FSK tag using raw"},

+ {"fskparadoxdemod",CmdFSKdemodParadox,1, "Demodulate graph window as a Paradox FSK tag using raw"},

{"fskrawdemod", CmdFSKrawdemod, 1, "[clock rate] [invert] [rchigh] [rclow] Demodulate graph window from FSK to bin (clock = 50)(invert = 1|0)(rchigh = 10)(rclow=8)"},

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

{"fskrawdemod", CmdFSKrawdemod, 1, "[clock rate] [invert] [rchigh] [rclow] Demodulate graph window from FSK to bin (clock = 50)(invert = 1|0)(rchigh = 10)(rclow=8)"},

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

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

{"mandemod", CmdManchesterDemod, 1, "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)"},

{"manrawdecode", Cmdmandecoderaw, 1, "Manchester decode binary stream already in graph buffer"},

{"manmod", CmdManchesterMod, 1, "[clock rate] -- Manchester modulate a binary stream"},

{"mandemod", CmdManchesterDemod, 1, "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)"},

{"manrawdecode", Cmdmandecoderaw, 1, "Manchester decode binary stream already in graph buffer"},

{"manmod", CmdManchesterMod, 1, "[clock rate] -- Manchester modulate a binary stream"},

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

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

+ //{"nrzdetectclock",CmdDetectNRZClockRate, 1, "Detect ASK, PSK, or NRZ clock rate"},

+ {"nrzrawdemod", CmdNRZrawDemod, 1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate nrz tags and output binary (args optional)"},

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

- {"pskclean", CmdPskClean, 1, "Attempt to clean psk wave"},

- {"pskdetectclock",CmdDetectNRZpskClockRate, 1, "Detect ASK, PSK, or NRZ clock rate"},

- {"pskindalademod",CmdIndalaDecode, 1, "[clock] [invert<0|1>] -- Attempt to demodulate psk indala tags and output ID binary & hex (args optional)"},

- {"psknrzrawdemod",CmdpskNRZrawDemod, 1, "[clock] [invert<0|1>] -- Attempt to demodulate psk or nrz tags and output binary (args optional)"},

+ //{"pskdetectclock",CmdDetectPSKClockRate, 1, "Detect ASK, PSK, or NRZ clock rate"},

+ {"pskindalademod",CmdIndalaDecode, 1, "[clock] [invert<0|1>] -- Attempt to demodulate psk1 indala tags and output ID binary & hex (args optional)"},

+ {"psk1rawdemod", CmdPSK1rawDemod, 1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate psk1 tags and output binary (args optional)"},

+ {"psk2rawdemod", CmdPSK2rawDemod, 1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate psk2 tags and output binary (args optional)"},

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

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

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

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

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

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

{"threshold", CmdThreshold, 1, "<threshold> -- Maximize/minimize every value in the graph window depending on threshold"},

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

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

+ {"undec", CmdUndec, 1, "Un-decimate samples by 2"},

{"zerocrossings", CmdZerocrossings, 1, "Count time between zero-crossings"},

{NULL, NULL, 0, NULL}

};

{"zerocrossings", CmdZerocrossings, 1, "Count time between zero-crossings"},

{NULL, NULL, 0, NULL}

};