while(i < GraphTraceLen)\r
{\r
// measure from low to low\r
- while(GraphBuffer[i] > low)\r
+ while((GraphBuffer[i] > low) && (i<GraphTraceLen))\r
++i;\r
start= i;\r
- while(GraphBuffer[i] < high)\r
+ while((GraphBuffer[i] < high) && (i<GraphTraceLen))\r
++i;\r
- while(GraphBuffer[i] > low)\r
+ while((GraphBuffer[i] > low) && (i<GraphTraceLen))\r
++i;\r
+ if (j>(MAX_GRAPH_TRACE_LEN/64)) {\r
+ break;\r
+ }\r
tmpbuff[j++]= i - start;\r
}\r
\r
-\r
/* look for data start - should be 2 pairs of LW (pulses of 192,128) */\r
start= -1;\r
skip= 0;\r
\r
/* skip over the remainder of the LW */\r
skip += tmpbuff[i+1]+tmpbuff[i+2];\r
- while(GraphBuffer[skip] > low)\r
+ while(skip < MAX_GRAPH_TRACE_LEN && GraphBuffer[skip] > low)\r
++skip;\r
skip += 8;\r
\r
PrintToScrollback("CRC=%04x", Iso15693Crc(outBuf, k-2));\r
}\r
\r
-static void CmdTiread(char *str)\r
-{\r
- UsbCommand c;\r
- c.cmd = CMD_ACQUIRE_RAW_BITS_TI_TYPE;\r
- SendCommand(&c, FALSE);\r
-}\r
-\r
-static void CmdTibits(char *str)\r
-{\r
- int cnt = 0;\r
- int i;\r
-// for(i = 0; i < 1536; i += 12) {\r
- for(i = 0; i < 4000; i += 12) {\r
- UsbCommand c;\r
- c.cmd = CMD_DOWNLOAD_RAW_BITS_TI_TYPE;\r
- c.ext1 = i;\r
- SendCommand(&c, FALSE);\r
- ReceiveCommand(&c);\r
- if(c.cmd != CMD_DOWNLOADED_RAW_BITS_TI_TYPE) {\r
- PrintToScrollback("bad resp");\r
- return;\r
- }\r
- int j;\r
- for(j = 0; j < 12; j++) {\r
- int k;\r
- for(k = 31; k >= 0; k--) {\r
- if(c.d.asDwords[j] & (1 << k)) {\r
- GraphBuffer[cnt++] = 1;\r
- } else {\r
- GraphBuffer[cnt++] = -1;\r
- }\r
- }\r
- }\r
- }\r
-// GraphTraceLen = 1536*32;\r
- GraphTraceLen = 4000*32;\r
- RepaintGraphWindow();\r
-}\r
-\r
static void CmdFSKdemod(char *cmdline)\r
{\r
static const int LowTone[] = {\r
1, 1, 1, 1, -1, -1, -1, -1, -1,\r
};\r
\r
- int convLen = max(arraylen(HighTone), arraylen(LowTone));\r
+ int lowLen = sizeof(LowTone)/sizeof(int);\r
+ int highLen = sizeof(HighTone)/sizeof(int);\r
+ int convLen = (highLen>lowLen)?highLen:lowLen;\r
DWORD hi = 0, lo = 0;\r
\r
int i, j;\r
int minMark=0, maxMark=0;\r
- int lowLen = arraylen(LowTone);\r
- int highLen = arraylen(HighTone);\r
\r
for(i = 0; i < GraphTraceLen - convLen; i++) {\r
int lowSum = 0, highSum = 0;\r
int max = 0, maxPos = 0;\r
for(i = 0; i < 6000; i++) {\r
int dec = 0;\r
- for(j = 0; j < 3*arraylen(LowTone); j++) {\r
+ for(j = 0; j < 3*lowLen; j++) {\r
dec -= GraphBuffer[i+j];\r
}\r
- for(; j < 3*(arraylen(LowTone) + arraylen(HighTone) ); j++) {\r
+ for(; j < 3*(lowLen + highLen ); j++) {\r
dec += GraphBuffer[i+j];\r
}\r
if(dec > max) {\r
GraphBuffer[maxPos+1] = minMark;\r
\r
PrintToScrollback("actual data bits start at sample %d", maxPos);\r
- PrintToScrollback("length %d/%d", arraylen(HighTone), arraylen(LowTone));\r
+ PrintToScrollback("length %d/%d", highLen, lowLen);\r
\r
BYTE bits[46];\r
bits[sizeof(bits)-1] = '\0';\r
// find bit pairs and manchester decode them\r
for(i = 0; i < arraylen(bits)-1; i++) {\r
int dec = 0;\r
- for(j = 0; j < arraylen(LowTone); j++) {\r
+ for(j = 0; j < lowLen; j++) {\r
dec -= GraphBuffer[maxPos+j];\r
}\r
- for(; j < arraylen(LowTone) + arraylen(HighTone); j++) {\r
+ for(; j < lowLen + highLen; j++) {\r
dec += GraphBuffer[maxPos+j];\r
}\r
maxPos += j;\r
PrintToScrollback("hex: %08x %08x", hi, lo);\r
}\r
\r
-static void CmdTidemod(char *cmdline)\r
+// read a TI tag and return its ID\r
+static void CmdTIRead(char *str)\r
+{\r
+ UsbCommand c;\r
+ c.cmd = CMD_READ_TI_TYPE;\r
+ SendCommand(&c, FALSE);\r
+}\r
+\r
+// write new data to a r/w TI tag\r
+static void CmdTIWrite(char *str)\r
+{\r
+ UsbCommand c;\r
+ int res=0;\r
+\r
+ c.cmd = CMD_WRITE_TI_TYPE;\r
+ res = sscanf(str, "0x%x 0x%x 0x%x ", &c.ext1, &c.ext2, &c.ext3);\r
+ if (res == 2) c.ext3=0;\r
+ if (res<2)\r
+ PrintToScrollback("Please specify the data as two hex strings, optionally the CRC as a third");\r
+ else\r
+ SendCommand(&c, FALSE);\r
+}\r
+\r
+static void CmdTIDemod(char *cmdline)\r
{\r
/* MATLAB as follows:\r
f_s = 2000000; % sampling frequency\r
l = sign(sin(cumsum(l)));\r
h = sign(sin(cumsum(h)));\r
*/\r
+\r
+// 2M*16/134.2k = 238\r
static const int LowTone[] = {\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1\r
};\r
+// 2M*16/123.2k = 260\r
static const int HighTone[] = {\r
- 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
- 1, 1, 1, 1, 1, 1, 1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,\r
+ 1, 1, 1, 1, 1, 1, 1, 1\r
};\r
-\r
- int convLen = max(arraylen(HighTone), arraylen(LowTone));\r
+ int lowLen = sizeof(LowTone)/sizeof(int);\r
+ int highLen = sizeof(HighTone)/sizeof(int);\r
+ int convLen = (highLen>lowLen)?highLen:lowLen;\r
WORD crc;\r
- int i, TagType;\r
+ int i, j, TagType;\r
+ int lowSum = 0, highSum = 0;;\r
+ int lowTot = 0, highTot = 0;\r
+\r
for(i = 0; i < GraphTraceLen - convLen; i++) {\r
- int j;\r
- int lowSum = 0, highSum = 0;;\r
- int lowLen = arraylen(LowTone);\r
- int highLen = arraylen(HighTone);\r
+ lowSum = 0;\r
+ highSum = 0;;\r
\r
for(j = 0; j < lowLen; j++) {\r
lowSum += LowTone[j]*GraphBuffer[i+j];\r
}\r
lowSum = abs((100*lowSum) / lowLen);\r
highSum = abs((100*highSum) / highLen);\r
+ lowSum = (lowSum<0)?-lowSum:lowSum;\r
+ highSum = (highSum<0)?-highSum:highSum;\r
+\r
GraphBuffer[i] = (highSum << 16) | lowSum;\r
}\r
\r
for(i = 0; i < GraphTraceLen - convLen - 16; i++) {\r
- int j;\r
- int lowTot = 0, highTot = 0;\r
+ lowTot = 0;\r
+ highTot = 0;\r
// 16 and 15 are f_s divided by f_l and f_h, rounded\r
for(j = 0; j < 16; j++) {\r
lowTot += (GraphBuffer[i+j] & 0xffff);\r
int j;\r
int dec = 0;\r
// searching 17 consecutive lows\r
- for(j = 0; j < 17*arraylen(LowTone); j++) {\r
+ for(j = 0; j < 17*lowLen; j++) {\r
dec -= GraphBuffer[i+j];\r
}\r
// searching 7 consecutive highs\r
- for(; j < 17*arraylen(LowTone) + 6*arraylen(HighTone); j++) {\r
+ for(; j < 17*lowLen + 6*highLen; j++) {\r
dec += GraphBuffer[i+j];\r
}\r
if(dec > max) {\r
GraphBuffer[maxPos+1] = -800;\r
\r
// advance pointer to start of actual data stream (after 16 pre and 8 start bits)\r
- maxPos += 17*arraylen(LowTone);\r
- maxPos += 6*arraylen(HighTone);\r
+ maxPos += 17*lowLen;\r
+ maxPos += 6*highLen;\r
\r
// place a marker in the buffer to visually aid location\r
// of the end of sync\r
\r
PrintToScrollback("actual data bits start at sample %d", maxPos);\r
\r
- PrintToScrollback("length %d/%d", arraylen(HighTone), arraylen(LowTone));\r
+ PrintToScrollback("length %d/%d", highLen, lowLen);\r
\r
BYTE bits[1+64+16+8+16];\r
bits[sizeof(bits)-1] = '\0';\r
int high = 0;\r
int low = 0;\r
int j;\r
- for(j = 0; j < arraylen(LowTone); j++) {\r
+ for(j = 0; j < lowLen; j++) {\r
low -= GraphBuffer[maxPos+j];\r
}\r
- for(j = 0; j < arraylen(HighTone); j++) {\r
+ for(j = 0; j < highLen; j++) {\r
high += GraphBuffer[maxPos+j];\r
}\r
\r
if(high > low) {\r
bits[i] = '1';\r
- maxPos += arraylen(HighTone);\r
+ maxPos += highLen;\r
// bitstream arrives lsb first so shift right\r
shift3 |= (1<<31);\r
} else {\r
bits[i] = '.';\r
- maxPos += arraylen(LowTone);\r
+ maxPos += lowLen;\r
}\r
\r
// 128 bit right shift register\r
// align 16 bit "end bits" or "ident" into lower half of shift3\r
shift3 >>= 16;\r
\r
- if ( (shift3^shift0)&0xffff ) {\r
+ // only 15 bits compare, last bit of ident is not valid\r
+ if ( (shift3^shift0)&0x7fff ) {\r
PrintToScrollback("Error: Ident mismatch!");\r
}\r
+ // WARNING the order of the bytes in which we calc crc below needs checking\r
+ // i'm 99% sure the crc algorithm is correct, but it may need to eat the\r
+ // bytes in reverse or something\r
// calculate CRC\r
crc=0;\r
crc = update_crc16(crc, (shift0)&0xff);\r
{"scale", CmdScale, 1, "<int> -- Set cursor display scale"},\r
{"setlfdivisor", CmdSetDivisor, 0, "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},\r
{"sri512read", CmdSri512read, 0, "<int> -- Read contents of a SRI512 tag"},\r
- {"tibits", CmdTibits, 0, "Get raw bits for TI-type LF tag"},\r
- {"tidemod", CmdTidemod, 1, "Demodulate raw bits for TI-type LF tag"},\r
- {"tiread", CmdTiread, 0, "Read a TI-type 134 kHz tag"},\r
+ {"tidemod", CmdTIDemod, 1, "Demodulate raw bits for TI-type LF tag"},\r
+ {"tiread", CmdTIRead, 0, "Read and decode a TI 134 kHz tag"},\r
+ {"tiwrite", CmdTIWrite, 0, "Write new data to a r/w TI 134 kHz tag"},\r
{"threshold", CmdThreshold, 1, "Maximize/minimize every value in the graph window depending on threshold"},\r
{"tune", CmdTune, 0, "Measure antenna tuning"},\r
{"vchdemod", CmdVchdemod, 0, "['clone'] -- Demodulate samples for VeriChip"},\r
projects / proxmark3-svn / blobdiff