PrintAndLog(" This function will ignore all characters not 1 or 0 (but stop reading on whitespace)");
return 0;
}
+int usage_data_buffclear(void){
+ PrintAndLog("This function clears the bigbuff on deviceside");
+ PrintAndLog("Usage: data buffclear [h]");
+ PrintAndLog("Options:");
+ PrintAndLog(" h This help");
+ return 0;
+}
//set the demod buffer with given array of binary (one bit per byte)
//by marshmellow
void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx)
{
- if (buff == NULL)
- return;
+ if (buff == NULL) return;
- if ( size >= MAX_DEMOD_BUF_LEN)
+ if (size >= MAX_DEMOD_BUF_LEN)
size = MAX_DEMOD_BUF_LEN;
-
- size_t i = 0;
- for (; i < size; i++){
- DemodBuffer[i]=buff[startIdx++];
- }
+
+ for (size_t i = 0; i < size; i++)
+ DemodBuffer[i] = buff[startIdx++];
+
DemodBufferLen = size;
}
-int CmdSetDebugMode(const char *Cmd)
-{
- int demod=0;
+int CmdSetDebugMode(const char *Cmd) {
+ int demod = 0;
sscanf(Cmd, "%i", &demod);
- g_debugMode=(uint8_t)demod;
+ g_debugMode = (uint8_t)demod;
return 1;
}
void printDemodBuff(void)
{
int bitLen = DemodBufferLen;
- if (bitLen<1) {
+ if (bitLen < 1) {
PrintAndLog("no bits found in demod buffer");
return;
}
- if (bitLen>512) bitLen=512; //max output to 512 bits if we have more - should be plenty
+ if (bitLen > 512) bitLen=512; //max output to 512 bits if we have more - should be plenty
char *bin = sprint_bin_break(DemodBuffer, bitLen,16);
PrintAndLog("%s",bin);
-
- return;
}
int CmdPrintDemodBuff(const char *Cmd)
{
- char hex[512]={0x00};
+ char hex[512] = {0x00};
bool hexMode = false;
bool errors = false;
uint32_t offset = 0; //could be size_t but no param_get16...
}
//Validations
if(errors) return usage_data_printdemodbuf();
+
+ if (DemodBufferLen == 0) {
+ PrintAndLog("Demodbuffer is empty");
+ return 0;
+ }
length = (length > (DemodBufferLen-offset)) ? DemodBufferLen-offset : length;
int numBits = (length) & 0x00FFC; //make sure we don't exceed our string
//this function strictly converts >1 to 1 and <1 to 0 for each sample in the graphbuffer
int CmdGetBitStream(const char *Cmd)
{
- int i;
CmdHpf(Cmd);
- for (i = 0; i < GraphTraceLen; i++) {
- if (GraphBuffer[i] >= 1) {
- GraphBuffer[i] = 1;
- } else {
- GraphBuffer[i] = 0;
- }
- }
+ for (uint32_t i = 0; i < GraphTraceLen; i++)
+ GraphBuffer[i] = (GraphBuffer[i] >= 1) ? 1 : 0;
+
RepaintGraphWindow();
return 0;
}
{
size_t idx = 0;
size_t size = DemodBufferLen;
- uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
+ uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};
memcpy(BitStream, DemodBuffer, size);
int ans = Em410xDecode(BitStream, &size, &idx, hi, lo);
if ( ans < 0){
if (g_debugMode){
-
if (ans == -1)
PrintAndLog("DEBUG: Error - Em410x not only 0|1 in decoded bitstream");
else if (ans == -3)
//emSearch will auto search for EM410x format in bitstream
//askType switches decode: ask/raw = 0, ask/manchester = 1
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 maxLen=0;
- uint8_t askAmp = 0;
+ int invert = 0;
+ int clk = 0;
+ int maxErr = 100;
+ int maxLen = 0;
char amp = param_getchar(Cmd, 0);
- uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
+ uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};
sscanf(Cmd, "%i %i %i %i %c", &clk, &invert, &maxErr, &maxLen, &);
if (!maxLen) maxLen = BIGBUF_SIZE;
if (invert != 0 && invert != 1) {
invert=1;
clk=0;
}
- if (amp == 'a' || amp == 'A') askAmp=1;
size_t BitLen = getFromGraphBuf(BitStream);
- if (g_debugMode) PrintAndLog("DEBUG: Bitlen from grphbuff: %d",BitLen);
+ if (g_debugMode) PrintAndLog("DEBUG: Bitlen from grphbuff: %d", BitLen);
if (BitLen<255) return 0;
if (maxLen<BitLen && maxLen != 0) BitLen = maxLen;
int foundclk = 0;
+ //amp before ST check
+ if (amp == 'a' || amp == 'A') {
+ askAmp(BitStream, BitLen);
+ }
bool st = false;
if (*stCheck) st = DetectST(BitStream, &BitLen, &foundclk);
if (st) {
clk = (clk == 0) ? foundclk : clk;
if (verbose || g_debugMode) PrintAndLog("\nFound Sequence Terminator");
}
- int errCnt = askdemod(BitStream, &BitLen, &clk, &invert, maxErr, askAmp, askType);
+ int errCnt = askdemod(BitStream, &BitLen, &clk, &invert, maxErr, 0, 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;
}
//output
setDemodBuf(BitStream,BitLen,0);
if (verbose || g_debugMode){
- if (errCnt>0) PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt);
- if (askType) PrintAndLog("ASK/Manchester - Clock: %d - Decoded bitstream:",clk);
- else PrintAndLog("ASK/Raw - Clock: %d - Decoded bitstream:",clk);
+ if (errCnt>0)
+ PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt);
+ if (askType)
+ PrintAndLog("ASK/Manchester - Clock: %d - Decoded bitstream:",clk);
+ else
+ PrintAndLog("ASK/Raw - Clock: %d - Decoded bitstream:",clk);
// Now output the bitstream to the scrollback by line of 16 bits
- printDemodBuff();
-
+ printDemodBuff();
}
uint64_t lo = 0;
uint32_t hi = 0;
- if (emSearch){
+ if (emSearch)
AskEm410xDecode(true, &hi, &lo);
- }
+
return 1;
}
int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) {
int Cmdaskmandemod(const char *Cmd)
{
char cmdp = param_getchar(Cmd, 0);
- if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H')
- return usage_data_rawdemod_am();
+ if (strlen(Cmd) > 45 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_am();
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);
}
//stricktly take 10 and 01 and convert to 0 and 1
int Cmdmandecoderaw(const char *Cmd)
{
- int i =0;
- int errCnt=0;
- size_t size=0;
- int invert=0;
+ int i = 0;
+ int errCnt = 0;
+ size_t size = 0;
+ int invert = 0;
int maxErr = 20;
char cmdp = param_getchar(Cmd, 0);
- if (strlen(Cmd) > 5 || cmdp == 'h' || cmdp == 'H')
- return usage_data_manrawdecode();
+ if (strlen(Cmd) > 5 || cmdp == 'h' || cmdp == 'H') return usage_data_manrawdecode();
if (DemodBufferLen==0) return 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];
+
+ 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];
}
if (high>7 || low <0 ){
PrintAndLog("Error: please raw demod the wave first then manchester raw decode");
}
sscanf(Cmd, "%i %i", &invert, &maxErr);
- size=i;
- errCnt=manrawdecode(BitStream, &size, invert);
- if (errCnt>=maxErr){
+ size = i;
+ errCnt = manrawdecode(BitStream, &size, invert);
+ if (errCnt >= maxErr){
PrintAndLog("Too many errors: %d",errCnt);
return 0;
}
PrintAndLog("Manchester Decoded - # errors:%d - data:",errCnt);
PrintAndLog("%s", sprint_bin_break(BitStream, size, 16));
- if (errCnt==0){
+ if (errCnt == 0){
uint64_t id = 0;
uint32_t hi = 0;
size_t idx=0;
if (Em410xDecode(BitStream, &size, &idx, &hi, &id)){
//need to adjust to set bitstream back to manchester encoded data
//setDemodBuf(BitStream, size, idx);
-
printEM410x(hi, id);
}
}
size_t size=0;
int offset=0, invert=0, maxErr=20, errCnt=0;
char cmdp = param_getchar(Cmd, 0);
- if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H')
- return usage_data_biphaserawdecode();
+ if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H') return usage_data_biphaserawdecode();
sscanf(Cmd, "%i %i %i", &offset, &invert, &maxErr);
if (DemodBufferLen==0){
memcpy(BitStream, DemodBuffer, DemodBufferLen);
size = DemodBufferLen;
errCnt=BiphaseRawDecode(BitStream, &size, offset, invert);
- if (errCnt<0){
+ if (errCnt < 0){
PrintAndLog("Error during decode:%d", errCnt);
return 0;
}
- if (errCnt>maxErr){
+ if (errCnt > maxErr){
PrintAndLog("Too many errors attempting to decode: %d",errCnt);
return 0;
}
- if (errCnt>0){
+ if (errCnt > 0)
PrintAndLog("# Errors found during Demod (shown as 7 in bit stream): %d",errCnt);
- }
+
PrintAndLog("Biphase Decoded using offset: %d - # invert:%d - data:",offset,invert);
PrintAndLog("%s", sprint_bin_break(BitStream, size, 16));
- if (offset) setDemodBuf(DemodBuffer,DemodBufferLen-offset, offset); //remove first bit from raw demod
+ if (offset)
+ setDemodBuf(DemodBuffer,DemodBufferLen-offset, offset); //remove first bit from raw demod
return 1;
}
int Cmdaskbiphdemod(const char *Cmd)
{
char cmdp = param_getchar(Cmd, 0);
- if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H')
- return usage_data_rawdemod_ab();
+ if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_ab();
return ASKbiphaseDemod(Cmd, TRUE);
}
}
//got a good demod of 96 bits
uint8_t ByteStream[8] = {0x00};
- uint8_t xorKey=0;
+ uint8_t xorKey = 0;
size_t startIdx = ans + 6; //start after 6 bit preamble
uint8_t bits_no_spacer[90];
// remove the 18 (90/5=18) parity bits (down to 72 bits (96-6-18=72))
size_t bitLen = removeParity(bits_no_spacer, 0, 5, 3, 90); //source, startloc, paritylen, ptype, length_to_run
if (bitLen != 72) {
- if (g_debugMode) PrintAndLog("DEBUG: Error - gProxII spacer removal did not produce 72 bits: %u, start: %u", bitLen, startIdx);
- return 0;
- }
+ if (g_debugMode)
+ PrintAndLog("DEBUG: Error - gProxII spacer removal did not produce 72 bits: %u, start: %u", bitLen, startIdx);
+ return 0;
+ }
// get key and then get all 8 bytes of payload decoded
xorKey = (uint8_t)bytebits_to_byteLSBF(bits_no_spacer, 8);
for (size_t idx = 0; idx < 8; idx++) {
ByteStream[idx] = ((uint8_t)bytebits_to_byteLSBF(bits_no_spacer+8 + (idx*8),8)) ^ xorKey;
if (g_debugMode) PrintAndLog("DEBUG: gProxII byte %u after xor: %02x", (unsigned int)idx, ByteStream[idx]);
}
- //now ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data
- //
+
+ //ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data
uint8_t fmtLen = ByteStream[0]>>2;
uint32_t FC = 0;
uint32_t Card = 0;
uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans,32);
uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32);
uint32_t raw3 = bytebits_to_byte(DemodBuffer+ans+64, 32);
-
- 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 %u, Card %u", (int)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);
- PrintAndLog("G-Prox-II Found: FmtLen %d, FC %u, Card %u", (int)fmtLen, FC, Card);
- } else {
- PrintAndLog("Unknown G-Prox-II Fmt Found: FmtLen %d",(int)fmtLen);
- PrintAndLog("Decoded Raw: %s", sprint_hex(ByteStream, 8));
+ bool unknown = FALSE;
+ switch(fmtLen) {
+ case 36:
+ FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);
+ Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);
+ break;
+ case 26:
+ FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7);
+ Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7);
+ break;
+ default :
+ unknown = TRUE;
+ break;
}
- PrintAndLog("Raw: %08x%08x%08x", raw1,raw2,raw3);
+ if ( !unknown)
+ PrintAndLog("G-Prox-II Found: Format Len: %ubit - FC: %u - Card: %u, Raw: %08x%08x%08x", fmtLen, FC, Card, raw1, raw2, raw3);
+ else
+ PrintAndLog("Unknown G-Prox-II Fmt Found: Format Len: %u, Raw: %08x%08x%08x", fmtLen, raw1, raw2, raw3);
+
setDemodBuf(DemodBuffer+ans, 96, 0);
return 1;
}
int Cmdaskrawdemod(const char *Cmd)
{
char cmdp = param_getchar(Cmd, 0);
- if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H')
- return usage_data_rawdemod_ar();
+ if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_ar();
return ASKDemod(Cmd, TRUE, FALSE, 0);
}
char cmdp = param_getchar(Cmd, 0);
if (cmdp == 'h' || cmdp == 'H') return usage_data_autocorr();
int window = 4000; //set default
- char grph=0;
+ char grph = 0;
bool updateGrph = FALSE;
sscanf(Cmd, "%i %c", &window, &grph);
if (window >= GraphTraceLen) {
- PrintAndLog("window must be smaller than trace (%d samples)",
- GraphTraceLen);
+ PrintAndLog("window must be smaller than trace (%d samples)", GraphTraceLen);
return 0;
}
- if (grph == 'g') updateGrph=TRUE;
+ if (grph == 'g') updateGrph = TRUE;
return AutoCorrelate(window, updateGrph, TRUE);
}
for (int j = 0; j < sizeof(got); j++) {
for (int k = 0; k < 8; k++) {
- if(got[j] & (1 << (7 - k))) {
+ if(got[j] & (1 << (7 - k)))
GraphBuffer[cnt++] = 1;
- } else {
+ else
GraphBuffer[cnt++] = 0;
- }
}
}
GraphTraceLen = cnt;
int CmdBuffClear(const char *Cmd)
{
+ char cmdp = param_getchar(Cmd, 0);
+ if (cmdp == 'h' || cmdp == 'H') return usage_data_buffclear();
+
UsbCommand c = {CMD_BUFF_CLEAR, {0,0,0}};
SendCommand(&c);
ClearGraph(true);
int CmdUndec(const char *Cmd)
{
char cmdp = param_getchar(Cmd, 0);
- if (cmdp == 'h' || cmdp == 'H')
- return usage_data_undecimate();
+ if (cmdp == 'h' || cmdp == 'H') return usage_data_undecimate();
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;
+ int swap[MAX_GRAPH_TRACE_LEN] = {0};
+ uint32_t g_index = 0, s_index = 0;
while(g_index < GraphTraceLen && s_index + factor < MAX_GRAPH_TRACE_LEN)
{
int count = 0;
//set options from parameters entered with the command
sscanf(Cmd, "%i", &shift);
- for(int i = 0; i<GraphTraceLen; i++){
- shiftedVal=GraphBuffer[i]+shift;
+ for(int i = 0; i < GraphTraceLen; i++){
+ if ( i+shift >= GraphTraceLen)
+ shiftedVal = GraphBuffer[i];
+ else
+ shiftedVal = GraphBuffer[i] + shift;
+
if (shiftedVal > 127)
shiftedVal = 127;
else if (shiftedVal < -127)
// Now output the bitstream to the scrollback by line of 16 bits
if (verbose || g_debugMode) {
- PrintAndLog("\nUsing Clock:%u, invert:%u, fchigh:%u, fclow:%u", (unsigned int)rfLen, (unsigned int)invert, (unsigned int)fchigh, (unsigned int)fclow);
+ PrintAndLog("\nUsing Clock:%u, invert:%u, fchigh:%u, fclow:%u", rfLen, invert, fchigh, fclow);
PrintAndLog("%s decoded bitstream:", GetFSKType(fchigh, fclow, invert));
printDemodBuff();
}
-
return 1;
} else {
if (g_debugMode) PrintAndLog("no FSK data found");
int CmdFSKrawdemod(const char *Cmd)
{
char cmdp = param_getchar(Cmd, 0);
- if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H')
- return usage_data_rawdemod_fs();
+ if (strlen(Cmd) > 20 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_fs();
return FSKrawDemod(Cmd, TRUE);
}
//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};
+ uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};
size_t BitLen = getFromGraphBuf(BitStream);
if (BitLen==0) return 0;
//get binary from fsk wave
return 0;
}
if (hi2 != 0){ //extra large HID tags
- PrintAndLog("HID Prox TAG ID: %x%08x%08x (%d)",
- (unsigned int) hi2, (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);
+ PrintAndLog("HID Prox TAG ID: %x%08x%08x (%u)", hi2, hi, lo, (lo>>1) & 0xFFFF);
}
else { //standard HID tags <38 bits
uint8_t fmtLen = 0;
fc = ((hi&0xF)<<12)|(lo>>20);
}
}
- 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);
+ PrintAndLog("HID Prox TAG ID: %x%08x (%u) - Format Len: %ubit - FC: %u - Card: %u", hi, lo, (lo>>1) & 0xFFFF, fmtLen, fc, cardnum);
}
setDemodBuf(BitStream,BitLen,idx);
if (g_debugMode){
uint32_t code1 = 0;
uint32_t code2 = 0;
uint8_t fmtLen = bytebits_to_byte(BitStream, 8);
+
switch(fmtLen) {
case 26:
fc = bytebits_to_byte(BitStream + 9, 8);
code1 = bytebits_to_byte(BitStream + 8,fmtLen);
PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo);
break;
+ case 34:
+ fc = bytebits_to_byte(BitStream + 9, 8);
+ cardnum = bytebits_to_byte(BitStream + 17, 24);
+ code1 = bytebits_to_byte(BitStream + 8, (fmtLen-32) );
+ code2 = bytebits_to_byte(BitStream + 8 + (fmtLen-32), 32);
+ PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
+ break;
+ case 37:
+ fc = bytebits_to_byte(BitStream + 9, 13);
+ cardnum = bytebits_to_byte(BitStream + 22, 18);
+ code1 = bytebits_to_byte(BitStream + 8, (fmtLen-32) );
+ code2 = bytebits_to_byte(BitStream + 8 + (fmtLen-32), 32);
+ PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
+ break;
+ // case 40:
+ // break;
case 50:
fc = bytebits_to_byte(BitStream + 9, 16);
cardnum = bytebits_to_byte(BitStream + 25, 32);
if (g_debugMode) PrintAndLog("DEBUG: Error - FDXB error removeParity:: %d", size);
return 0;
}
- if (g_debugMode) {
- char *bin = sprint_bin_break(BitStream,size,16);
- PrintAndLog("DEBUG BinStream:\n%s",bin);
- }
PrintAndLog("\nFDX-B / ISO 11784/5 Animal Tag ID Found:");
- if (g_debugMode) PrintAndLog("Start marker %d; Size %d", preambleIndex, size);
//got a good demod
uint64_t NationalCode = ((uint64_t)(bytebits_to_byteLSBF(BitStream+32,6)) << 32) | bytebits_to_byteLSBF(BitStream,32);
PrintAndLog("Animal ID: %04u-%012llu", countryCode, NationalCode);
PrintAndLog("National Code: %012llu", NationalCode);
PrintAndLog("CountryCode: %04u", countryCode);
- PrintAndLog("Extended Data: %s", dataBlockBit ? "True" : "False");
- PrintAndLog("reserved Code: %u", reservedCode);
- PrintAndLog("Animal Tag: %s", animalBit ? "True" : "False");
+
+ PrintAndLog("Reserved/RFU: %u", reservedCode);
+ PrintAndLog("Animal Tag: %s", animalBit ? "True" : "False");
+ PrintAndLog("Has extended data: %s [0x%X]", dataBlockBit ? "True" : "False", extended);
PrintAndLog("CRC: 0x%04X - [%04X] - %s", crc16, calcCrc, (calcCrc == crc16) ? "Passed" : "Failed");
- PrintAndLog("Extended: 0x%X\n", extended);
+
+ if (g_debugMode) {
+ PrintAndLog("Start marker %d; Size %d", preambleIndex, size);
+ char *bin = sprint_bin_break(BitStream,size,16);
+ PrintAndLog("DEBUG BinStream:\n%s",bin);
+ }
return 1;
}
if (invert)
if (g_debugMode) PrintAndLog("DEBUG: Error - Indala had to invert bits");
- PrintAndLog("BitLen: %d",DemodBufferLen);
//convert UID to HEX
uint32_t 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);
+ PrintAndLog("Indala Found - Bitlength %d, UID = (%x%08x)\n%s",
+ DemodBufferLen, uid1, uid2, sprint_bin_break(DemodBuffer,DemodBufferLen,32)
+ );
} 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);
+ PrintAndLog("Indala Found - Bitlength %d, UID = (%x%08x%08x%08x%08x%08x%08x)\n%s",
+ DemodBufferLen,
+ uid1, uid2, uid3, uid4, uid5, uid6, uid7, sprint_bin_break(DemodBuffer,DemodBufferLen,32)
+ );
}
if (g_debugMode){
PrintAndLog("DEBUG: Indala - printing demodbuffer:");
return 1;
}
+int CmdPSKIdteck(const char *Cmd) {
+
+ if (!PSKDemod("", false)) {
+ if (g_debugMode) PrintAndLog("DEBUG: Error - Idteck PSKDemod failed");
+ return 0;
+ }
+ size_t size = DemodBufferLen;
+
+ //get binary from PSK1 wave
+ int idx = IdteckDemodPSK(DemodBuffer, &size);
+ if (idx < 0){
+ if (g_debugMode){
+ if (idx == -1)
+ PrintAndLog("DEBUG: Error - Idteck: not enough samples");
+ else if (idx == -2)
+ PrintAndLog("DEBUG: Error - Idteck: preamble not found");
+ else if (idx == -3)
+ PrintAndLog("DEBUG: Error - Idteck: size not correct: %d", size);
+ else
+ PrintAndLog("DEBUG: Error - Idteck: idx: %d",idx);
+ }
+
+ // if didn't find preamble try again inverting
+ if (!PSKDemod("1", false)) {
+ if (g_debugMode) PrintAndLog("DEBUG: Error - Idteck PSKDemod failed");
+ return 0;
+ }
+ idx = IdteckDemodPSK(DemodBuffer, &size);
+ if (idx < 0){
+ if (g_debugMode){
+ if (idx == -1)
+ PrintAndLog("DEBUG: Error - Idteck: not enough samples");
+ else if (idx == -2)
+ PrintAndLog("DEBUG: Error - Idteck: preamble not found");
+ else if (idx == -3)
+ PrintAndLog("DEBUG: Error - Idteck: size not correct: %d", size);
+ else
+ PrintAndLog("DEBUG: Error - Idteck: idx: %d",idx);
+ }
+ return 0;
+ }
+ }
+ setDemodBuf(DemodBuffer, 64, idx);
+
+ //got a good demod
+ uint32_t id = 0;
+ uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
+ uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
+
+ //parity check (TBD)
+ //checksum check (TBD)
+
+ //output
+ PrintAndLog("IDTECK Tag Found: Card ID %u , Raw: %08X%08X", id, raw1, raw2);
+ return 1;
+}
+
// by marshmellow
// takes 3 arguments - clock, invert, maxErr as integers
// attempts to demodulate nrz only
int CmdNRZrawDemod(const char *Cmd)
{
char cmdp = param_getchar(Cmd, 0);
- if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H')
- return usage_data_rawdemod_nr();
+ if (strlen(Cmd) > 16 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_nr();
return NRZrawDemod(Cmd, TRUE);
}
{
int ans;
char cmdp = param_getchar(Cmd, 0);
- if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H')
- return usage_data_rawdemod_p1();
+ if (strlen(Cmd) > 16 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_p1();
ans = PSKDemod(Cmd, TRUE);
//output
{
int ans = 0;
char cmdp = param_getchar(Cmd, 0);
- if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H')
- return usage_data_rawdemod_p2();
+ if (strlen(Cmd) > 16 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_p2();
ans = PSKDemod(Cmd, TRUE);
if (!ans){
char cmdp2 = Cmd[1];
int ans = 0;
- if (strlen(Cmd) > 20 || cmdp == 'h' || cmdp == 'H' || strlen(Cmd) < 2)
+ if (strlen(Cmd) > 35 || cmdp == 'h' || cmdp == 'H' || strlen(Cmd) < 2)
return usage_data_rawdemod();
if (cmdp == 'f' && cmdp2 == 's')
while(!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING, &resp, 2000)) {
timeout++;
printf(".");
+ fflush(stdout);
if (timeout > 7) {
PrintAndLog("\nNo response from Proxmark. Aborting...");
return 1;
}
}
+#define NON_VOLTAGE 999
+#define LF_UNUSABLE_V 2948 // was 2000. Changed due to bugfix in voltage measurements. LF results are now 47% higher.
+#define LF_MARGINAL_V 14739 // was 10000. Changed due to bugfix bug in voltage measurements. LF results are now 47% higher.
+#define HF_UNUSABLE_V 3167 // was 2000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.
+#define HF_MARGINAL_V 7917 // was 5000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.
+
int peakv, peakf;
int vLf125, vLf134, vHf;
vLf125 = resp.arg[0] & 0xffff;
peakf = resp.arg[2] & 0xffff;
peakv = resp.arg[2] >> 16;
PrintAndLog("");
- if ( vLf125 > 0 )
+ if ( vLf125 > NON_VOLTAGE )
PrintAndLog("# LF antenna: %5.2f V @ 125.00 kHz", vLf125/1000.0);
- if ( vLf134 > 0 )
+ if ( vLf134 > NON_VOLTAGE )
PrintAndLog("# LF antenna: %5.2f V @ 134.00 kHz", vLf134/1000.0);
- if ( peakv > 0 && peakf > 0 )
+ if ( peakv > NON_VOLTAGE && peakf > 0 )
PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1));
- if ( vHf > 0 )
+ if ( vHf > NON_VOLTAGE )
PrintAndLog("# HF antenna: %5.2f V @ 13.56 MHz", vHf/1000.0);
- #define LF_UNUSABLE_V 2948 // was 2000. Changed due to bugfix in voltage measurements. LF results are now 47% higher.
- #define LF_MARGINAL_V 14739 // was 10000. Changed due to bugfix bug in voltage measurements. LF results are now 47% higher.
- #define HF_UNUSABLE_V 3167 // was 2000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.
- #define HF_MARGINAL_V 7917 // was 5000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.
+
if (peakv < LF_UNUSABLE_V)
PrintAndLog("# Your LF antenna is unusable.");
GraphBuffer[GraphTraceLen] = atoi(line);
GraphTraceLen++;
}
- if (f) {
+ if (f)
fclose(f);
- f = NULL;
- }
+
PrintAndLog("loaded %d samples", GraphTraceLen);
RepaintGraphWindow();
return 0;
if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
memcpy(filename, Cmd, len);
-
FILE *f = fopen(filename, "w");
if(!f) {
PrintAndLog("couldn't open '%s'", filename);
return 0;
}
- int i;
- for (i = 0; i < GraphTraceLen; i++) {
+
+ for (int i = 0; i < GraphTraceLen; i++)
fprintf(f, "%d\n", GraphBuffer[i]);
- }
- if (f) {
+
+ if (f)
fclose(f);
- f = NULL;
- }
+
PrintAndLog("saved to '%s'", Cmd);
return 0;
}
}
int CmdDataIIR(const char *Cmd){
-
uint8_t k = param_get8(Cmd,0);
//iceIIR_Butterworth(GraphBuffer, GraphTraceLen);
iceSimple_Filter(GraphBuffer, GraphTraceLen, k);
{"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, "<digits> -- Converts binary to hexadecimal"},
{"bitsamples", CmdBitsamples, 0, "Get raw samples as bitstring"},
- {"buffclear", CmdBuffClear, 1, "Clear sample buffer and graph window"},
+ {"buffclear", CmdBuffClear, 1, "Clears bigbuff on deviceside. d graph window"},
{"dec", CmdDec, 1, "Decimate samples"},
{"detectclock", CmdDetectClockRate, 1, "[<a|f|n|p>] Detect ASK, FSK, NRZ, PSK clock rate of wave in GraphBuffer"},
{"fdxbdemod", CmdFDXBdemodBI , 1, "Demodulate a FDX-B ISO11784/85 Biphase tag from GraphBuffer"},
projects / proxmark3-svn / blobdiff