]>
Commit | Line | Data |
---|---|---|
a553f267 | 1 | //----------------------------------------------------------------------------- |
2 | // Copyright (C) 2010 iZsh <izsh at fail0verflow.com> | |
3 | // | |
4 | // This code is licensed to you under the terms of the GNU GPL, version 2 or, | |
5 | // at your option, any later version. See the LICENSE.txt file for the text of | |
6 | // the license. | |
7 | //----------------------------------------------------------------------------- | |
8 | // Data and Graph commands | |
9 | //----------------------------------------------------------------------------- | |
10 | ||
7fe9b0b7 | 11 | #include <stdio.h> |
12 | #include <stdlib.h> | |
13 | #include <string.h> | |
14 | #include <limits.h> | |
902cb3c0 | 15 | #include "proxmark3.h" |
7fe9b0b7 | 16 | #include "data.h" |
17 | #include "ui.h" | |
18 | #include "graph.h" | |
19 | #include "cmdparser.h" | |
d51b2eda | 20 | #include "util.h" |
7fe9b0b7 | 21 | #include "cmdmain.h" |
22 | #include "cmddata.h" | |
7db5f1ca | 23 | #include "lfdemod.h" |
31abe49f | 24 | #include "usb_cmd.h" |
73d04bb4 | 25 | #include "crc.h" |
ad6219fc | 26 | #include "crc16.h" |
0de8e387 | 27 | #include "loclass/cipherutils.h" |
ad6219fc | 28 | |
4118b74d | 29 | uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN]; |
b10a759f | 30 | uint8_t g_debugMode=0; |
31 | size_t DemodBufferLen=0; | |
7fe9b0b7 | 32 | static int CmdHelp(const char *Cmd); |
33 | ||
4118b74d | 34 | //set the demod buffer with given array of binary (one bit per byte) |
35 | //by marshmellow | |
ec75f5c1 | 36 | void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx) |
4118b74d | 37 | { |
13d77ef9 | 38 | if (buff == NULL) |
39 | return; | |
40 | ||
41 | if ( size >= MAX_DEMOD_BUF_LEN) | |
42 | size = MAX_DEMOD_BUF_LEN; | |
43 | ||
ec75f5c1 | 44 | size_t i = 0; |
45 | for (; i < size; i++){ | |
46 | DemodBuffer[i]=buff[startIdx++]; | |
ba1a299c | 47 | } |
48 | DemodBufferLen=size; | |
49 | return; | |
4118b74d | 50 | } |
51 | ||
ec75f5c1 | 52 | int CmdSetDebugMode(const char *Cmd) |
53 | { | |
e0165dcf | 54 | int demod=0; |
55 | sscanf(Cmd, "%i", &demod); | |
56 | g_debugMode=(uint8_t)demod; | |
57 | return 1; | |
ec75f5c1 | 58 | } |
59 | ||
2d2f7d19 | 60 | int usage_data_printdemodbuf(){ |
bf32dd92 | 61 | PrintAndLog("Usage: data printdemodbuffer x o <offset> l <length>"); |
afa86e5c | 62 | PrintAndLog("Options:"); |
63 | PrintAndLog(" h This help"); | |
64 | PrintAndLog(" x output in hex (omit for binary output)"); | |
65 | PrintAndLog(" o <offset> enter offset in # of bits"); | |
bf32dd92 | 66 | PrintAndLog(" l <length> enter length to print in # of bits or hex characters respectively"); |
afa86e5c | 67 | return 0; |
2d2f7d19 | 68 | } |
69 | ||
4118b74d | 70 | //by marshmellow |
abd6112f | 71 | void printDemodBuff(void) |
4118b74d | 72 | { |
ba1a299c | 73 | int bitLen = DemodBufferLen; |
2767fc02 | 74 | if (bitLen<1) { |
ba1a299c | 75 | PrintAndLog("no bits found in demod buffer"); |
76 | return; | |
77 | } | |
78 | if (bitLen>512) bitLen=512; //max output to 512 bits if we have more - should be plenty | |
e0165dcf | 79 | |
2767fc02 | 80 | char *bin = sprint_bin_break(DemodBuffer,bitLen,16); |
81 | PrintAndLog("%s",bin); | |
82 | ||
ba1a299c | 83 | return; |
4118b74d | 84 | } |
85 | ||
8d960002 | 86 | int CmdPrintDemodBuff(const char *Cmd) |
87 | { | |
2d2f7d19 | 88 | char hex[512]={0x00}; |
89 | bool hexMode = false; | |
90 | bool errors = false; | |
bf32dd92 | 91 | uint32_t offset = 0; //could be size_t but no param_get16... |
92 | uint32_t length = 512; | |
2d2f7d19 | 93 | char cmdp = 0; |
94 | while(param_getchar(Cmd, cmdp) != 0x00) | |
95 | { | |
96 | switch(param_getchar(Cmd, cmdp)) | |
97 | { | |
98 | case 'h': | |
99 | case 'H': | |
100 | return usage_data_printdemodbuf(); | |
101 | case 'x': | |
102 | case 'X': | |
103 | hexMode = true; | |
104 | cmdp++; | |
105 | break; | |
106 | case 'o': | |
107 | case 'O': | |
bf32dd92 | 108 | offset = param_get32ex(Cmd, cmdp+1, 0, 10); |
2d2f7d19 | 109 | if (!offset) errors = true; |
110 | cmdp += 2; | |
111 | break; | |
bf32dd92 | 112 | case 'l': |
113 | case 'L': | |
114 | length = param_get32ex(Cmd, cmdp+1, 512, 10); | |
115 | if (!length) errors = true; | |
116 | cmdp += 2; | |
117 | break; | |
2d2f7d19 | 118 | default: |
119 | PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp)); | |
120 | errors = true; | |
121 | break; | |
122 | } | |
123 | if(errors) break; | |
e0165dcf | 124 | } |
2d2f7d19 | 125 | //Validations |
126 | if(errors) return usage_data_printdemodbuf(); | |
bf32dd92 | 127 | length = (length > (DemodBufferLen-offset)) ? DemodBufferLen-offset : length; |
128 | int numBits = (length) & 0x00FFC; //make sure we don't exceed our string | |
2d2f7d19 | 129 | |
130 | if (hexMode){ | |
131 | char *buf = (char *) (DemodBuffer + offset); | |
bf32dd92 | 132 | numBits = (numBits > sizeof(hex)) ? sizeof(hex) : numBits; |
2d2f7d19 | 133 | numBits = binarraytohex(hex, buf, numBits); |
e0165dcf | 134 | if (numBits==0) return 0; |
2d2f7d19 | 135 | PrintAndLog("DemodBuffer: %s",hex); |
e0165dcf | 136 | } else { |
52f2df61 | 137 | PrintAndLog("DemodBuffer:\n%s", sprint_bin_break(DemodBuffer+offset,numBits,16)); |
e0165dcf | 138 | } |
139 | return 1; | |
8d960002 | 140 | } |
7fe9b0b7 | 141 | |
2767fc02 | 142 | //by marshmellow |
78f5b1a7 | 143 | //this function strictly converts >1 to 1 and <1 to 0 for each sample in the graphbuffer |
144 | int CmdGetBitStream(const char *Cmd) | |
145 | { | |
e0165dcf | 146 | int i; |
147 | CmdHpf(Cmd); | |
148 | for (i = 0; i < GraphTraceLen; i++) { | |
149 | if (GraphBuffer[i] >= 1) { | |
150 | GraphBuffer[i] = 1; | |
151 | } else { | |
152 | GraphBuffer[i] = 0; | |
153 | } | |
154 | } | |
155 | RepaintGraphWindow(); | |
156 | return 0; | |
78f5b1a7 | 157 | } |
158 | ||
d5a72d2f | 159 | //by marshmellow |
abd6112f | 160 | //print 64 bit EM410x ID in multiple formats |
b41534d1 | 161 | void printEM410x(uint32_t hi, uint64_t id) |
2fc2150e | 162 | { |
e0165dcf | 163 | if (id || hi){ |
164 | uint64_t iii=1; | |
165 | uint64_t id2lo=0; | |
166 | uint32_t ii=0; | |
167 | uint32_t i=0; | |
168 | for (ii=5; ii>0;ii--){ | |
169 | for (i=0;i<8;i++){ | |
170 | id2lo=(id2lo<<1LL) | ((id & (iii << (i+((ii-1)*8)))) >> (i+((ii-1)*8))); | |
171 | } | |
172 | } | |
173 | if (hi){ | |
174 | //output 88 bit em id | |
2767fc02 | 175 | PrintAndLog("\nEM TAG ID : %06X%016llX", hi, id); |
e0165dcf | 176 | } else{ |
177 | //output 40 bit em id | |
2767fc02 | 178 | PrintAndLog("\nEM TAG ID : %010llX", id); |
179 | PrintAndLog("Unique TAG ID : %010llX", id2lo); | |
e0165dcf | 180 | PrintAndLog("\nPossible de-scramble patterns"); |
181 | PrintAndLog("HoneyWell IdentKey {"); | |
182 | PrintAndLog("DEZ 8 : %08lld",id & 0xFFFFFF); | |
183 | PrintAndLog("DEZ 10 : %010lld",id & 0xFFFFFFFF); | |
184 | PrintAndLog("DEZ 5.5 : %05lld.%05lld",(id>>16LL) & 0xFFFF,(id & 0xFFFF)); | |
185 | PrintAndLog("DEZ 3.5A : %03lld.%05lld",(id>>32ll),(id & 0xFFFF)); | |
186 | PrintAndLog("DEZ 3.5B : %03lld.%05lld",(id & 0xFF000000) >> 24,(id & 0xFFFF)); | |
187 | PrintAndLog("DEZ 3.5C : %03lld.%05lld",(id & 0xFF0000) >> 16,(id & 0xFFFF)); | |
188 | PrintAndLog("DEZ 14/IK2 : %014lld",id); | |
189 | PrintAndLog("DEZ 15/IK3 : %015lld",id2lo); | |
190 | PrintAndLog("DEZ 20/ZK : %02lld%02lld%02lld%02lld%02lld%02lld%02lld%02lld%02lld%02lld", | |
191 | (id2lo & 0xf000000000) >> 36, | |
192 | (id2lo & 0x0f00000000) >> 32, | |
193 | (id2lo & 0x00f0000000) >> 28, | |
194 | (id2lo & 0x000f000000) >> 24, | |
195 | (id2lo & 0x0000f00000) >> 20, | |
196 | (id2lo & 0x00000f0000) >> 16, | |
197 | (id2lo & 0x000000f000) >> 12, | |
198 | (id2lo & 0x0000000f00) >> 8, | |
199 | (id2lo & 0x00000000f0) >> 4, | |
200 | (id2lo & 0x000000000f) | |
201 | ); | |
202 | uint64_t paxton = (((id>>32) << 24) | (id & 0xffffff)) + 0x143e00; | |
203 | PrintAndLog("}\nOther : %05lld_%03lld_%08lld",(id&0xFFFF),((id>>16LL) & 0xFF),(id & 0xFFFFFF)); | |
2767fc02 | 204 | PrintAndLog("Pattern Paxton : %lld [0x%llX]", paxton, paxton); |
e0165dcf | 205 | |
206 | uint32_t p1id = (id & 0xFFFFFF); | |
207 | uint8_t arr[32] = {0x00}; | |
208 | int i =0; | |
209 | int j = 23; | |
210 | for (; i < 24; ++i, --j ){ | |
211 | arr[i] = (p1id >> i) & 1; | |
212 | } | |
213 | ||
214 | uint32_t p1 = 0; | |
215 | ||
216 | p1 |= arr[23] << 21; | |
217 | p1 |= arr[22] << 23; | |
218 | p1 |= arr[21] << 20; | |
219 | p1 |= arr[20] << 22; | |
220 | ||
221 | p1 |= arr[19] << 18; | |
222 | p1 |= arr[18] << 16; | |
223 | p1 |= arr[17] << 19; | |
224 | p1 |= arr[16] << 17; | |
225 | ||
226 | p1 |= arr[15] << 13; | |
227 | p1 |= arr[14] << 15; | |
228 | p1 |= arr[13] << 12; | |
229 | p1 |= arr[12] << 14; | |
230 | ||
231 | p1 |= arr[11] << 6; | |
232 | p1 |= arr[10] << 2; | |
233 | p1 |= arr[9] << 7; | |
234 | p1 |= arr[8] << 1; | |
235 | ||
236 | p1 |= arr[7] << 0; | |
237 | p1 |= arr[6] << 8; | |
238 | p1 |= arr[5] << 11; | |
239 | p1 |= arr[4] << 3; | |
240 | ||
241 | p1 |= arr[3] << 10; | |
242 | p1 |= arr[2] << 4; | |
243 | p1 |= arr[1] << 5; | |
244 | p1 |= arr[0] << 9; | |
2767fc02 | 245 | PrintAndLog("Pattern 1 : %d [0x%X]", p1, p1); |
e0165dcf | 246 | |
247 | uint16_t sebury1 = id & 0xFFFF; | |
248 | uint8_t sebury2 = (id >> 16) & 0x7F; | |
249 | uint32_t sebury3 = id & 0x7FFFFF; | |
2767fc02 | 250 | PrintAndLog("Pattern Sebury : %d %d %d [0x%X 0x%X 0x%X]", sebury1, sebury2, sebury3, sebury1, sebury2, sebury3); |
e0165dcf | 251 | } |
252 | } | |
253 | return; | |
eb191de6 | 254 | } |
255 | ||
fef74fdc | 256 | int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo ) |
13d77ef9 | 257 | { |
fef74fdc | 258 | size_t idx = 0; |
259 | size_t BitLen = DemodBufferLen; | |
260 | uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; | |
261 | memcpy(BitStream, DemodBuffer, BitLen); | |
262 | if (Em410xDecode(BitStream, &BitLen, &idx, hi, lo)){ | |
263 | //set GraphBuffer for clone or sim command | |
264 | setDemodBuf(BitStream, BitLen, idx); | |
e0165dcf | 265 | if (g_debugMode){ |
fef74fdc | 266 | PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen); |
e0165dcf | 267 | printDemodBuff(); |
268 | } | |
fef74fdc | 269 | if (verbose){ |
270 | PrintAndLog("EM410x pattern found: "); | |
271 | printEM410x(*hi, *lo); | |
272 | } | |
e0165dcf | 273 | return 1; |
274 | } | |
275 | return 0; | |
13d77ef9 | 276 | } |
fef74fdc | 277 | |
278 | int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose) | |
279 | { | |
280 | if (!ASKDemod(Cmd, FALSE, FALSE, 1)) return 0; | |
281 | return AskEm410xDecode(verbose, hi, lo); | |
282 | } | |
283 | ||
e888ed8e | 284 | //by marshmellow |
e770c648 | 285 | //takes 3 arguments - clock, invert and maxErr as integers |
286 | //attempts to demodulate ask while decoding manchester | |
287 | //prints binary found and saves in graphbuffer for further commands | |
288 | int CmdAskEM410xDemod(const char *Cmd) | |
289 | { | |
e0165dcf | 290 | char cmdp = param_getchar(Cmd, 0); |
291 | if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') { | |
292 | PrintAndLog("Usage: data askem410xdemod [clock] <0|1> [maxError]"); | |
293 | PrintAndLog(" [set clock as integer] optional, if not set, autodetect."); | |
294 | PrintAndLog(" <invert>, 1 for invert output"); | |
295 | PrintAndLog(" [set maximum allowed errors], default = 100."); | |
296 | PrintAndLog(""); | |
297 | PrintAndLog(" sample: data askem410xdemod = demod an EM410x Tag ID from GraphBuffer"); | |
298 | PrintAndLog(" : data askem410xdemod 32 = demod an EM410x Tag ID from GraphBuffer using a clock of RF/32"); | |
299 | PrintAndLog(" : data askem410xdemod 32 1 = demod an EM410x Tag ID from GraphBuffer using a clock of RF/32 and inverting data"); | |
300 | PrintAndLog(" : data askem410xdemod 1 = demod an EM410x Tag ID from GraphBuffer while inverting data"); | |
301 | 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"); | |
302 | return 0; | |
303 | } | |
e0165dcf | 304 | uint64_t lo = 0; |
fef74fdc | 305 | uint32_t hi = 0; |
306 | return AskEm410xDemod(Cmd, &hi, &lo, true); | |
e770c648 | 307 | } |
308 | ||
fef74fdc | 309 | //by marshmellow |
310 | //Cmd Args: Clock, invert, maxErr, maxLen as integers and amplify as char == 'a' | |
311 | // (amp may not be needed anymore) | |
312 | //verbose will print results and demoding messages | |
313 | //emSearch will auto search for EM410x format in bitstream | |
314 | //askType switches decode: ask/raw = 0, ask/manchester = 1 | |
315 | int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) | |
e888ed8e | 316 | { |
e0165dcf | 317 | int invert=0; |
318 | int clk=0; | |
319 | int maxErr=100; | |
fef74fdc | 320 | int maxLen=0; |
321 | uint8_t askAmp = 0; | |
322 | char amp = param_getchar(Cmd, 0); | |
e0165dcf | 323 | uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; |
fef74fdc | 324 | sscanf(Cmd, "%i %i %i %i %c", &clk, &invert, &maxErr, &maxLen, &); |
bf32dd92 | 325 | if (!maxLen) maxLen = BIGBUF_SIZE; |
e0165dcf | 326 | if (invert != 0 && invert != 1) { |
327 | PrintAndLog("Invalid argument: %s", Cmd); | |
328 | return 0; | |
329 | } | |
330 | if (clk==1){ | |
331 | invert=1; | |
332 | clk=0; | |
333 | } | |
fef74fdc | 334 | if (amp == 'a' || amp == 'A') askAmp=1; |
e0165dcf | 335 | size_t BitLen = getFromGraphBuf(BitStream); |
2767fc02 | 336 | if (g_debugMode) PrintAndLog("DEBUG: Bitlen from grphbuff: %d",BitLen); |
fef74fdc | 337 | if (BitLen<255) return 0; |
23f0a7d8 | 338 | if (maxLen<BitLen && maxLen != 0) BitLen = maxLen; |
fef74fdc | 339 | |
340 | int errCnt = askdemod(BitStream, &BitLen, &clk, &invert, maxErr, askAmp, askType); | |
341 | if (errCnt<0 || BitLen<16){ //if fatal error (or -1) | |
2767fc02 | 342 | if (g_debugMode) PrintAndLog("DEBUG: no data found %d, errors:%d, bitlen:%d, clock:%d",errCnt,invert,BitLen,clk); |
e0165dcf | 343 | return 0; |
344 | } | |
2767fc02 | 345 | if (errCnt>maxErr){ |
346 | if (g_debugMode) PrintAndLog("DEBUG: Too many errors found, errors:%d, bits:%d, clock:%d",errCnt, BitLen, clk); | |
347 | return 0; | |
348 | } | |
349 | if (verbose || g_debugMode) PrintAndLog("\nUsing Clock:%d, Invert:%d, Bits Found:%d",clk,invert,BitLen); | |
e0165dcf | 350 | |
351 | //output | |
e0165dcf | 352 | setDemodBuf(BitStream,BitLen,0); |
fef74fdc | 353 | if (verbose || g_debugMode){ |
354 | if (errCnt>0) PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt); | |
1299c798 | 355 | if (askType) PrintAndLog("ASK/Manchester - Clock: %d - Decoded bitstream:",clk); |
356 | else PrintAndLog("ASK/Raw - Clock: %d - Decoded bitstream:",clk); | |
fef74fdc | 357 | // Now output the bitstream to the scrollback by line of 16 bits |
358 | printDemodBuff(); | |
359 | ||
360 | } | |
361 | uint64_t lo = 0; | |
362 | uint32_t hi = 0; | |
e0165dcf | 363 | if (emSearch){ |
fef74fdc | 364 | AskEm410xDecode(true, &hi, &lo); |
e0165dcf | 365 | } |
366 | return 1; | |
eb191de6 | 367 | } |
368 | ||
4ac906d1 | 369 | //by marshmellow |
fef74fdc | 370 | //takes 5 arguments - clock, invert, maxErr, maxLen as integers and amplify as char == 'a' |
4ac906d1 | 371 | //attempts to demodulate ask while decoding manchester |
372 | //prints binary found and saves in graphbuffer for further commands | |
373 | int Cmdaskmandemod(const char *Cmd) | |
374 | { | |
e0165dcf | 375 | char cmdp = param_getchar(Cmd, 0); |
fef74fdc | 376 | if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') { |
377 | PrintAndLog("Usage: data rawdemod am [clock] <invert> [maxError] [maxLen] [amplify]"); | |
378 | PrintAndLog(" [set clock as integer] optional, if not set, autodetect"); | |
379 | PrintAndLog(" <invert>, 1 to invert output"); | |
380 | PrintAndLog(" [set maximum allowed errors], default = 100"); | |
381 | PrintAndLog(" [set maximum Samples to read], default = 32768 (512 bits at rf/64)"); | |
382 | PrintAndLog(" <amplify>, 'a' to attempt demod with ask amplification, default = no amp"); | |
e0165dcf | 383 | PrintAndLog(""); |
384 | PrintAndLog(" sample: data rawdemod am = demod an ask/manchester tag from GraphBuffer"); | |
385 | PrintAndLog(" : data rawdemod am 32 = demod an ask/manchester tag from GraphBuffer using a clock of RF/32"); | |
386 | PrintAndLog(" : data rawdemod am 32 1 = demod an ask/manchester tag from GraphBuffer using a clock of RF/32 and inverting data"); | |
387 | PrintAndLog(" : data rawdemod am 1 = demod an ask/manchester tag from GraphBuffer while inverting data"); | |
388 | PrintAndLog(" : data rawdemod am 64 1 0 = demod an ask/manchester tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors"); | |
389 | return 0; | |
390 | } | |
fef74fdc | 391 | return ASKDemod(Cmd, TRUE, TRUE, 1); |
4ac906d1 | 392 | } |
393 | ||
eb191de6 | 394 | //by marshmellow |
d5a72d2f | 395 | //manchester decode |
eb191de6 | 396 | //stricktly take 10 and 01 and convert to 0 and 1 |
397 | int Cmdmandecoderaw(const char *Cmd) | |
398 | { | |
e0165dcf | 399 | int i =0; |
400 | int errCnt=0; | |
401 | size_t size=0; | |
fef74fdc | 402 | int invert=0; |
0ad1a1d4 | 403 | int maxErr = 20; |
e0165dcf | 404 | char cmdp = param_getchar(Cmd, 0); |
1f918317 | 405 | if (strlen(Cmd) > 5 || cmdp == 'h' || cmdp == 'H') { |
fef74fdc | 406 | PrintAndLog("Usage: data manrawdecode [invert] [maxErr]"); |
e0165dcf | 407 | PrintAndLog(" Takes 10 and 01 and converts to 0 and 1 respectively"); |
408 | PrintAndLog(" --must have binary sequence in demodbuffer (run data askrawdemod first)"); | |
fef74fdc | 409 | PrintAndLog(" [invert] invert output"); |
1f918317 | 410 | PrintAndLog(" [maxErr] set number of errors allowed (default = 20)"); |
e0165dcf | 411 | PrintAndLog(""); |
412 | PrintAndLog(" sample: data manrawdecode = decode manchester bitstream from the demodbuffer"); | |
413 | return 0; | |
414 | } | |
415 | if (DemodBufferLen==0) return 0; | |
416 | uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; | |
417 | int high=0,low=0; | |
418 | for (;i<DemodBufferLen;++i){ | |
419 | if (DemodBuffer[i]>high) high=DemodBuffer[i]; | |
420 | else if(DemodBuffer[i]<low) low=DemodBuffer[i]; | |
421 | BitStream[i]=DemodBuffer[i]; | |
422 | } | |
1f918317 | 423 | if (high>7 || low <0 ){ |
2767fc02 | 424 | PrintAndLog("Error: please raw demod the wave first then manchester raw decode"); |
e0165dcf | 425 | return 0; |
426 | } | |
1f918317 | 427 | |
fef74fdc | 428 | sscanf(Cmd, "%i %i", &invert, &maxErr); |
e0165dcf | 429 | size=i; |
fef74fdc | 430 | errCnt=manrawdecode(BitStream, &size, invert); |
e0165dcf | 431 | if (errCnt>=maxErr){ |
432 | PrintAndLog("Too many errors: %d",errCnt); | |
433 | return 0; | |
434 | } | |
435 | PrintAndLog("Manchester Decoded - # errors:%d - data:",errCnt); | |
2767fc02 | 436 | PrintAndLog("%s", sprint_bin_break(BitStream, size, 16)); |
e0165dcf | 437 | if (errCnt==0){ |
438 | uint64_t id = 0; | |
439 | uint32_t hi = 0; | |
440 | size_t idx=0; | |
441 | if (Em410xDecode(BitStream, &size, &idx, &hi, &id)){ | |
442 | //need to adjust to set bitstream back to manchester encoded data | |
443 | //setDemodBuf(BitStream, size, idx); | |
444 | ||
445 | printEM410x(hi, id); | |
446 | } | |
447 | } | |
448 | return 1; | |
d5a72d2f | 449 | } |
450 | ||
451 | //by marshmellow | |
452 | //biphase decode | |
453 | //take 01 or 10 = 0 and 11 or 00 = 1 | |
1e090a61 | 454 | //takes 2 arguments "offset" default = 0 if 1 it will shift the decode by one bit |
455 | // and "invert" default = 0 if 1 it will invert output | |
2767fc02 | 456 | // the argument offset allows us to manually shift if the output is incorrect - [EDIT: now auto detects] |
d5a72d2f | 457 | int CmdBiphaseDecodeRaw(const char *Cmd) |
458 | { | |
ba1a299c | 459 | size_t size=0; |
b41534d1 | 460 | int offset=0, invert=0, maxErr=20, errCnt=0; |
b4fb11ba | 461 | char cmdp = param_getchar(Cmd, 0); |
462 | if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H') { | |
b41534d1 | 463 | PrintAndLog("Usage: data biphaserawdecode [offset] [invert] [maxErr]"); |
464 | PrintAndLog(" Converts 10 or 01 to 1 and 11 or 00 to 0"); | |
b4fb11ba | 465 | PrintAndLog(" --must have binary sequence in demodbuffer (run data askrawdemod first)"); |
e0165dcf | 466 | PrintAndLog(" --invert for Conditional Dephase Encoding (CDP) AKA Differential Manchester"); |
b4fb11ba | 467 | PrintAndLog(""); |
468 | PrintAndLog(" [offset <0|1>], set to 0 not to adjust start position or to 1 to adjust decode start position"); | |
469 | PrintAndLog(" [invert <0|1>], set to 1 to invert output"); | |
b41534d1 | 470 | PrintAndLog(" [maxErr int], set max errors tolerated - default=20"); |
b4fb11ba | 471 | PrintAndLog(""); |
472 | PrintAndLog(" sample: data biphaserawdecode = decode biphase bitstream from the demodbuffer"); | |
473 | PrintAndLog(" sample: data biphaserawdecode 1 1 = decode biphase bitstream from the demodbuffer, set offset, and invert output"); | |
474 | return 0; | |
475 | } | |
b41534d1 | 476 | sscanf(Cmd, "%i %i %i", &offset, &invert, &maxErr); |
477 | if (DemodBufferLen==0){ | |
478 | PrintAndLog("DemodBuffer Empty - run 'data rawdemod ar' first"); | |
b4fb11ba | 479 | return 0; |
480 | } | |
b41534d1 | 481 | uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; |
482 | memcpy(BitStream, DemodBuffer, DemodBufferLen); | |
483 | size = DemodBufferLen; | |
1e090a61 | 484 | errCnt=BiphaseRawDecode(BitStream, &size, offset, invert); |
b41534d1 | 485 | if (errCnt<0){ |
486 | PrintAndLog("Error during decode:%d", errCnt); | |
487 | return 0; | |
488 | } | |
489 | if (errCnt>maxErr){ | |
b4fb11ba | 490 | PrintAndLog("Too many errors attempting to decode: %d",errCnt); |
491 | return 0; | |
492 | } | |
b41534d1 | 493 | |
494 | if (errCnt>0){ | |
2767fc02 | 495 | PrintAndLog("# Errors found during Demod (shown as 7 in bit stream): %d",errCnt); |
b41534d1 | 496 | } |
497 | PrintAndLog("Biphase Decoded using offset: %d - # invert:%d - data:",offset,invert); | |
2767fc02 | 498 | PrintAndLog("%s", sprint_bin_break(BitStream, size, 16)); |
b41534d1 | 499 | |
500 | if (offset) setDemodBuf(DemodBuffer,DemodBufferLen-offset, offset); //remove first bit from raw demod | |
b4fb11ba | 501 | return 1; |
eb191de6 | 502 | } |
503 | ||
b41534d1 | 504 | //by marshmellow |
505 | // - ASK Demod then Biphase decode GraphBuffer samples | |
506 | int ASKbiphaseDemod(const char *Cmd, bool verbose) | |
507 | { | |
508 | //ask raw demod GraphBuffer first | |
b4c1f167 | 509 | int offset=0, clk=0, invert=0, maxErr=0; |
510 | sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr); | |
1299c798 | 511 | |
b41534d1 | 512 | uint8_t BitStream[MAX_DEMOD_BUF_LEN]; |
1299c798 | 513 | size_t size = getFromGraphBuf(BitStream); |
b10a759f | 514 | //invert here inverts the ask raw demoded bits which has no effect on the demod, but we need the pointer |
b4c1f167 | 515 | int errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0); |
1299c798 | 516 | if ( errCnt < 0 || errCnt > maxErr ) { |
517 | if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk); | |
518 | return 0; | |
519 | } | |
520 | ||
521 | //attempt to Biphase decode BitStream | |
522 | errCnt = BiphaseRawDecode(BitStream, &size, offset, invert); | |
b41534d1 | 523 | if (errCnt < 0){ |
524 | if (g_debugMode || verbose) PrintAndLog("Error BiphaseRawDecode: %d", errCnt); | |
525 | return 0; | |
526 | } | |
527 | if (errCnt > maxErr) { | |
528 | if (g_debugMode || verbose) PrintAndLog("Error BiphaseRawDecode too many errors: %d", errCnt); | |
529 | return 0; | |
530 | } | |
531 | //success set DemodBuffer and return | |
532 | setDemodBuf(BitStream, size, 0); | |
533 | if (g_debugMode || verbose){ | |
1299c798 | 534 | PrintAndLog("Biphase Decoded using offset: %d - clock: %d - # errors:%d - data:",offset,clk,errCnt); |
b41534d1 | 535 | printDemodBuff(); |
536 | } | |
537 | return 1; | |
538 | } | |
539 | //by marshmellow - see ASKbiphaseDemod | |
540 | int Cmdaskbiphdemod(const char *Cmd) | |
541 | { | |
e0165dcf | 542 | char cmdp = param_getchar(Cmd, 0); |
fef74fdc | 543 | if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') { |
544 | PrintAndLog("Usage: data rawdemod ab [offset] [clock] <invert> [maxError] [maxLen] <amplify>"); | |
e0165dcf | 545 | PrintAndLog(" [offset], offset to begin biphase, default=0"); |
546 | PrintAndLog(" [set clock as integer] optional, if not set, autodetect"); | |
547 | PrintAndLog(" <invert>, 1 to invert output"); | |
548 | PrintAndLog(" [set maximum allowed errors], default = 100"); | |
fef74fdc | 549 | PrintAndLog(" [set maximum Samples to read], default = 32768 (512 bits at rf/64)"); |
e0165dcf | 550 | PrintAndLog(" <amplify>, 'a' to attempt demod with ask amplification, default = no amp"); |
551 | PrintAndLog(" NOTE: <invert> can be entered as second or third argument"); | |
552 | PrintAndLog(" NOTE: <amplify> can be entered as first, second or last argument"); | |
553 | PrintAndLog(" NOTE: any other arg must have previous args set to work"); | |
554 | PrintAndLog(""); | |
555 | PrintAndLog(" NOTE: --invert for Conditional Dephase Encoding (CDP) AKA Differential Manchester"); | |
556 | PrintAndLog(""); | |
fef74fdc | 557 | PrintAndLog(" sample: data rawdemod ab = demod an ask/biph tag from GraphBuffer"); |
558 | PrintAndLog(" : data rawdemod ab 0 a = demod an ask/biph tag from GraphBuffer, amplified"); | |
559 | PrintAndLog(" : data rawdemod ab 1 32 = demod an ask/biph tag from GraphBuffer using an offset of 1 and a clock of RF/32"); | |
560 | PrintAndLog(" : data rawdemod ab 0 32 1 = demod an ask/biph tag from GraphBuffer using a clock of RF/32 and inverting data"); | |
561 | PrintAndLog(" : data rawdemod ab 0 1 = demod an ask/biph tag from GraphBuffer while inverting data"); | |
562 | PrintAndLog(" : data rawdemod ab 0 64 1 0 = demod an ask/biph tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors"); | |
563 | PrintAndLog(" : data rawdemod ab 0 64 1 0 0 a = demod an ask/biph tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp"); | |
e0165dcf | 564 | return 0; |
565 | } | |
566 | return ASKbiphaseDemod(Cmd, TRUE); | |
b41534d1 | 567 | } |
568 | ||
8d960002 | 569 | //by marshmellow |
570 | //attempts to demodulate and identify a G_Prox_II verex/chubb card | |
571 | //WARNING: if it fails during some points it will destroy the DemodBuffer data | |
572 | // but will leave the GraphBuffer intact. | |
573 | //if successful it will push askraw data back to demod buffer ready for emulation | |
574 | int CmdG_Prox_II_Demod(const char *Cmd) | |
575 | { | |
e0165dcf | 576 | if (!ASKbiphaseDemod(Cmd, FALSE)){ |
577 | if (g_debugMode) PrintAndLog("ASKbiphaseDemod failed 1st try"); | |
578 | return 0; | |
579 | } | |
580 | size_t size = DemodBufferLen; | |
581 | //call lfdemod.c demod for gProxII | |
582 | int ans = gProxII_Demod(DemodBuffer, &size); | |
583 | if (ans < 0){ | |
584 | if (g_debugMode) PrintAndLog("Error gProxII_Demod"); | |
585 | return 0; | |
586 | } | |
587 | //got a good demod | |
588 | uint32_t ByteStream[65] = {0x00}; | |
589 | uint8_t xorKey=0; | |
590 | uint8_t keyCnt=0; | |
591 | uint8_t bitCnt=0; | |
592 | uint8_t ByteCnt=0; | |
593 | size_t startIdx = ans + 6; //start after preamble | |
594 | for (size_t idx = 0; idx<size-6; idx++){ | |
595 | if ((idx+1) % 5 == 0){ | |
596 | //spacer bit - should be 0 | |
597 | if (DemodBuffer[startIdx+idx] != 0) { | |
598 | if (g_debugMode) PrintAndLog("Error spacer not 0: %d, pos: %d",DemodBuffer[startIdx+idx],startIdx+idx); | |
599 | return 0; | |
600 | } | |
601 | continue; | |
602 | } | |
603 | if (keyCnt<8){ //lsb first | |
604 | xorKey = xorKey | (DemodBuffer[startIdx+idx]<<keyCnt); | |
605 | keyCnt++; | |
606 | if (keyCnt==8 && g_debugMode) PrintAndLog("xorKey Found: %02x", xorKey); | |
607 | continue; | |
608 | } | |
609 | //lsb first | |
610 | ByteStream[ByteCnt] = ByteStream[ByteCnt] | (DemodBuffer[startIdx+idx]<<bitCnt); | |
611 | bitCnt++; | |
612 | if (bitCnt % 8 == 0){ | |
613 | if (g_debugMode) PrintAndLog("byte %d: %02x",ByteCnt,ByteStream[ByteCnt]); | |
614 | bitCnt=0; | |
615 | ByteCnt++; | |
616 | } | |
617 | } | |
618 | for (uint8_t i = 0; i < ByteCnt; i++){ | |
619 | ByteStream[i] ^= xorKey; //xor | |
620 | if (g_debugMode) PrintAndLog("byte %d after xor: %02x", i, ByteStream[i]); | |
621 | } | |
622 | //now ByteStream contains 64 bytes of decrypted raw tag data | |
623 | // | |
624 | uint8_t fmtLen = ByteStream[0]>>2; | |
625 | uint32_t FC = 0; | |
626 | uint32_t Card = 0; | |
627 | uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans,32); | |
628 | uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32); | |
629 | uint32_t raw3 = bytebits_to_byte(DemodBuffer+ans+64, 32); | |
630 | ||
631 | if (fmtLen==36){ | |
632 | FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1); | |
633 | Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5); | |
634 | PrintAndLog("G-Prox-II Found: FmtLen %d, FC %d, Card %d",fmtLen,FC,Card); | |
635 | } else if(fmtLen==26){ | |
636 | FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7); | |
637 | Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7); | |
638 | PrintAndLog("G-Prox-II Found: FmtLen %d, FC %d, Card %d",fmtLen,FC,Card); | |
639 | } else { | |
640 | PrintAndLog("Unknown G-Prox-II Fmt Found: FmtLen %d",fmtLen); | |
641 | } | |
642 | PrintAndLog("Raw: %08x%08x%08x", raw1,raw2,raw3); | |
643 | setDemodBuf(DemodBuffer+ans, 96, 0); | |
644 | return 1; | |
8d960002 | 645 | } |
646 | ||
a126332a | 647 | //by marshmellow |
648 | //see ASKDemod for what args are accepted | |
649 | int CmdVikingDemod(const char *Cmd) | |
650 | { | |
651 | if (!ASKDemod(Cmd, false, false, 1)) { | |
652 | if (g_debugMode) PrintAndLog("ASKDemod failed"); | |
653 | return 0; | |
654 | } | |
655 | size_t size = DemodBufferLen; | |
656 | //call lfdemod.c demod for Viking | |
657 | int ans = VikingDemod_AM(DemodBuffer, &size); | |
658 | if (ans < 0) { | |
659 | if (g_debugMode) PrintAndLog("Error Viking_Demod %d", ans); | |
660 | return 0; | |
661 | } | |
662 | //got a good demod | |
663 | uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans, 32); | |
664 | uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32); | |
665 | uint32_t cardid = bytebits_to_byte(DemodBuffer+ans+24, 32); | |
666 | uint8_t checksum = bytebits_to_byte(DemodBuffer+ans+32+24, 8); | |
667 | PrintAndLog("Viking Tag Found: Card ID %08X, Checksum: %02X", cardid, checksum); | |
668 | PrintAndLog("Raw: %08X%08X", raw1,raw2); | |
669 | setDemodBuf(DemodBuffer+ans, 64, 0); | |
670 | return 1; | |
671 | } | |
672 | ||
fef74fdc | 673 | //by marshmellow - see ASKDemod |
4ac906d1 | 674 | int Cmdaskrawdemod(const char *Cmd) |
675 | { | |
e0165dcf | 676 | char cmdp = param_getchar(Cmd, 0); |
fef74fdc | 677 | if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') { |
678 | PrintAndLog("Usage: data rawdemod ar [clock] <invert> [maxError] [maxLen] [amplify]"); | |
e0165dcf | 679 | PrintAndLog(" [set clock as integer] optional, if not set, autodetect"); |
680 | PrintAndLog(" <invert>, 1 to invert output"); | |
681 | PrintAndLog(" [set maximum allowed errors], default = 100"); | |
fef74fdc | 682 | PrintAndLog(" [set maximum Samples to read], default = 32768 (1024 bits at rf/64)"); |
e0165dcf | 683 | PrintAndLog(" <amplify>, 'a' to attempt demod with ask amplification, default = no amp"); |
684 | PrintAndLog(""); | |
fef74fdc | 685 | PrintAndLog(" sample: data rawdemod ar = demod an ask tag from GraphBuffer"); |
686 | PrintAndLog(" : data rawdemod ar a = demod an ask tag from GraphBuffer, amplified"); | |
687 | PrintAndLog(" : data rawdemod ar 32 = demod an ask tag from GraphBuffer using a clock of RF/32"); | |
688 | PrintAndLog(" : data rawdemod ar 32 1 = demod an ask tag from GraphBuffer using a clock of RF/32 and inverting data"); | |
689 | PrintAndLog(" : data rawdemod ar 1 = demod an ask tag from GraphBuffer while inverting data"); | |
690 | PrintAndLog(" : data rawdemod ar 64 1 0 = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors"); | |
691 | PrintAndLog(" : data rawdemod ar 64 1 0 0 a = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp"); | |
e0165dcf | 692 | return 0; |
693 | } | |
fef74fdc | 694 | return ASKDemod(Cmd, TRUE, FALSE, 0); |
4ac906d1 | 695 | } |
696 | ||
73d04bb4 | 697 | int AutoCorrelate(int window, bool SaveGrph, bool verbose) |
7fe9b0b7 | 698 | { |
e0165dcf | 699 | static int CorrelBuffer[MAX_GRAPH_TRACE_LEN]; |
700 | size_t Correlation = 0; | |
701 | int maxSum = 0; | |
702 | int lastMax = 0; | |
703 | if (verbose) PrintAndLog("performing %d correlations", GraphTraceLen - window); | |
704 | for (int i = 0; i < GraphTraceLen - window; ++i) { | |
705 | int sum = 0; | |
706 | for (int j = 0; j < window; ++j) { | |
707 | sum += (GraphBuffer[j]*GraphBuffer[i + j]) / 256; | |
708 | } | |
709 | CorrelBuffer[i] = sum; | |
710 | if (sum >= maxSum-100 && sum <= maxSum+100){ | |
711 | //another max | |
712 | Correlation = i-lastMax; | |
713 | lastMax = i; | |
714 | if (sum > maxSum) maxSum = sum; | |
715 | } else if (sum > maxSum){ | |
716 | maxSum=sum; | |
717 | lastMax = i; | |
718 | } | |
719 | } | |
720 | if (Correlation==0){ | |
721 | //try again with wider margin | |
722 | for (int i = 0; i < GraphTraceLen - window; i++){ | |
723 | if (CorrelBuffer[i] >= maxSum-(maxSum*0.05) && CorrelBuffer[i] <= maxSum+(maxSum*0.05)){ | |
724 | //another max | |
725 | Correlation = i-lastMax; | |
726 | lastMax = i; | |
727 | //if (CorrelBuffer[i] > maxSum) maxSum = sum; | |
728 | } | |
729 | } | |
730 | } | |
731 | if (verbose && Correlation > 0) PrintAndLog("Possible Correlation: %d samples",Correlation); | |
732 | ||
733 | if (SaveGrph){ | |
734 | GraphTraceLen = GraphTraceLen - window; | |
735 | memcpy(GraphBuffer, CorrelBuffer, GraphTraceLen * sizeof (int)); | |
736 | RepaintGraphWindow(); | |
737 | } | |
738 | return Correlation; | |
73d04bb4 | 739 | } |
7fe9b0b7 | 740 | |
9f7bbd24 | 741 | int usage_data_autocorr(void) |
742 | { | |
e0165dcf | 743 | //print help |
744 | PrintAndLog("Usage: data autocorr [window] [g]"); | |
745 | PrintAndLog("Options: "); | |
746 | PrintAndLog(" h This help"); | |
747 | PrintAndLog(" [window] window length for correlation - default = 4000"); | |
748 | PrintAndLog(" g save back to GraphBuffer (overwrite)"); | |
749 | return 0; | |
9f7bbd24 | 750 | } |
751 | ||
73d04bb4 | 752 | int CmdAutoCorr(const char *Cmd) |
753 | { | |
e0165dcf | 754 | char cmdp = param_getchar(Cmd, 0); |
755 | if (cmdp == 'h' || cmdp == 'H') | |
756 | return usage_data_autocorr(); | |
757 | int window = 4000; //set default | |
758 | char grph=0; | |
759 | bool updateGrph = FALSE; | |
760 | sscanf(Cmd, "%i %c", &window, &grph); | |
761 | ||
762 | if (window >= GraphTraceLen) { | |
763 | PrintAndLog("window must be smaller than trace (%d samples)", | |
764 | GraphTraceLen); | |
765 | return 0; | |
766 | } | |
767 | if (grph == 'g') updateGrph=TRUE; | |
768 | return AutoCorrelate(window, updateGrph, TRUE); | |
7fe9b0b7 | 769 | } |
770 | ||
771 | int CmdBitsamples(const char *Cmd) | |
772 | { | |
e0165dcf | 773 | int cnt = 0; |
774 | uint8_t got[12288]; | |
952a8bb5 | 775 | |
e0165dcf | 776 | GetFromBigBuf(got,sizeof(got),0); |
777 | WaitForResponse(CMD_ACK,NULL); | |
7fe9b0b7 | 778 | |
e0165dcf | 779 | for (int j = 0; j < sizeof(got); j++) { |
780 | for (int k = 0; k < 8; k++) { | |
781 | if(got[j] & (1 << (7 - k))) { | |
782 | GraphBuffer[cnt++] = 1; | |
783 | } else { | |
784 | GraphBuffer[cnt++] = 0; | |
785 | } | |
786 | } | |
787 | } | |
788 | GraphTraceLen = cnt; | |
789 | RepaintGraphWindow(); | |
790 | return 0; | |
7fe9b0b7 | 791 | } |
792 | ||
7fe9b0b7 | 793 | int CmdBuffClear(const char *Cmd) |
794 | { | |
e0165dcf | 795 | UsbCommand c = {CMD_BUFF_CLEAR}; |
796 | SendCommand(&c); | |
797 | ClearGraph(true); | |
798 | return 0; | |
7fe9b0b7 | 799 | } |
800 | ||
801 | int CmdDec(const char *Cmd) | |
802 | { | |
e0165dcf | 803 | for (int i = 0; i < (GraphTraceLen / 2); ++i) |
804 | GraphBuffer[i] = GraphBuffer[i * 2]; | |
805 | GraphTraceLen /= 2; | |
806 | PrintAndLog("decimated by 2"); | |
807 | RepaintGraphWindow(); | |
808 | return 0; | |
7fe9b0b7 | 809 | } |
698b649e MHS |
810 | /** |
811 | * Undecimate - I'd call it 'interpolate', but we'll save that | |
812 | * name until someone does an actual interpolation command, not just | |
813 | * blindly repeating samples | |
814 | * @param Cmd | |
815 | * @return | |
816 | */ | |
817 | int CmdUndec(const char *Cmd) | |
818 | { | |
c856ceae MHS |
819 | if(param_getchar(Cmd, 0) == 'h') |
820 | { | |
821 | PrintAndLog("Usage: data undec [factor]"); | |
822 | PrintAndLog("This function performs un-decimation, by repeating each sample N times"); | |
823 | PrintAndLog("Options: "); | |
824 | PrintAndLog(" h This help"); | |
825 | PrintAndLog(" factor The number of times to repeat each sample.[default:2]"); | |
826 | PrintAndLog("Example: 'data undec 3'"); | |
827 | return 0; | |
828 | } | |
829 | ||
1d42f25f | 830 | uint8_t factor = param_get8ex(Cmd, 0, 2, 10); |
698b649e MHS |
831 | //We have memory, don't we? |
832 | int swap[MAX_GRAPH_TRACE_LEN] = { 0 }; | |
c856ceae | 833 | uint32_t g_index = 0 ,s_index = 0; |
1d42f25f | 834 | while(g_index < GraphTraceLen && s_index + factor < MAX_GRAPH_TRACE_LEN) |
698b649e | 835 | { |
c856ceae | 836 | int count = 0; |
1d42f25f | 837 | for (count = 0; count < factor && s_index + count < MAX_GRAPH_TRACE_LEN; count++) |
c856ceae | 838 | swap[s_index+count] = GraphBuffer[g_index]; |
1d42f25f | 839 | s_index += count; |
840 | g_index++; | |
698b649e | 841 | } |
698b649e | 842 | |
1d42f25f | 843 | memcpy(GraphBuffer, swap, s_index * sizeof(int)); |
c856ceae MHS |
844 | GraphTraceLen = s_index; |
845 | RepaintGraphWindow(); | |
698b649e MHS |
846 | return 0; |
847 | } | |
7fe9b0b7 | 848 | |
ec75f5c1 | 849 | //by marshmellow |
850 | //shift graph zero up or down based on input + or - | |
851 | int CmdGraphShiftZero(const char *Cmd) | |
852 | { | |
853 | ||
e0165dcf | 854 | int shift=0; |
855 | //set options from parameters entered with the command | |
856 | sscanf(Cmd, "%i", &shift); | |
857 | int shiftedVal=0; | |
858 | for(int i = 0; i<GraphTraceLen; i++){ | |
859 | shiftedVal=GraphBuffer[i]+shift; | |
860 | if (shiftedVal>127) | |
861 | shiftedVal=127; | |
862 | else if (shiftedVal<-127) | |
863 | shiftedVal=-127; | |
864 | GraphBuffer[i]= shiftedVal; | |
865 | } | |
866 | CmdNorm(""); | |
867 | return 0; | |
ec75f5c1 | 868 | } |
869 | ||
6de43508 | 870 | //by marshmellow |
871 | //use large jumps in read samples to identify edges of waves and then amplify that wave to max | |
2767fc02 | 872 | //similar to dirtheshold, threshold commands |
6de43508 | 873 | //takes a threshold length which is the measured length between two samples then determines an edge |
874 | int CmdAskEdgeDetect(const char *Cmd) | |
875 | { | |
e0165dcf | 876 | int thresLen = 25; |
877 | sscanf(Cmd, "%i", &thresLen); | |
49bbc60a | 878 | |
e0165dcf | 879 | for(int i = 1; i<GraphTraceLen; i++){ |
880 | if (GraphBuffer[i]-GraphBuffer[i-1]>=thresLen) //large jump up | |
49bbc60a | 881 | GraphBuffer[i-1] = 127; |
e0165dcf | 882 | else if(GraphBuffer[i]-GraphBuffer[i-1]<=-1*thresLen) //large jump down |
49bbc60a | 883 | GraphBuffer[i-1] = -127; |
e0165dcf | 884 | } |
885 | RepaintGraphWindow(); | |
e0165dcf | 886 | return 0; |
6de43508 | 887 | } |
888 | ||
7fe9b0b7 | 889 | /* Print our clock rate */ |
ba1a299c | 890 | // uses data from graphbuffer |
f3bf15e4 | 891 | // adjusted to take char parameter for type of modulation to find the clock - by marshmellow. |
7fe9b0b7 | 892 | int CmdDetectClockRate(const char *Cmd) |
893 | { | |
f3bf15e4 | 894 | char cmdp = param_getchar(Cmd, 0); |
fef74fdc | 895 | if (strlen(Cmd) > 6 || strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') { |
896 | PrintAndLog("Usage: data detectclock [modulation] <clock>"); | |
f3bf15e4 | 897 | PrintAndLog(" [modulation as char], specify the modulation type you want to detect the clock of"); |
fef74fdc | 898 | PrintAndLog(" <clock> , specify the clock (optional - to get best start position only)"); |
f3bf15e4 | 899 | PrintAndLog(" 'a' = ask, 'f' = fsk, 'n' = nrz/direct, 'p' = psk"); |
900 | PrintAndLog(""); | |
901 | PrintAndLog(" sample: data detectclock a = detect the clock of an ask modulated wave in the GraphBuffer"); | |
902 | PrintAndLog(" data detectclock f = detect the clock of an fsk modulated wave in the GraphBuffer"); | |
903 | PrintAndLog(" data detectclock p = detect the clock of an psk modulated wave in the GraphBuffer"); | |
904 | PrintAndLog(" data detectclock n = detect the clock of an nrz/direct modulated wave in the GraphBuffer"); | |
905 | } | |
906 | int ans=0; | |
907 | if (cmdp == 'a'){ | |
fef74fdc | 908 | ans = GetAskClock(Cmd+1, true, false); |
f3bf15e4 | 909 | } else if (cmdp == 'f'){ |
910 | ans = GetFskClock("", true, false); | |
911 | } else if (cmdp == 'n'){ | |
912 | ans = GetNrzClock("", true, false); | |
913 | } else if (cmdp == 'p'){ | |
914 | ans = GetPskClock("", true, false); | |
915 | } else { | |
916 | PrintAndLog ("Please specify a valid modulation to detect the clock of - see option h for help"); | |
917 | } | |
918 | return ans; | |
7fe9b0b7 | 919 | } |
66707a3b | 920 | |
2767fc02 | 921 | char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert) |
922 | { | |
923 | char *fskType; | |
924 | if (fchigh==10 && fclow==8){ | |
925 | if (invert) //fsk2a | |
926 | fskType = "FSK2a"; | |
927 | else //fsk2 | |
928 | fskType = "FSK2"; | |
929 | } else if (fchigh == 8 && fclow == 5) { | |
930 | if (invert) | |
931 | fskType = "FSK1"; | |
932 | else | |
933 | fskType = "FSK1a"; | |
934 | } else { | |
935 | fskType = "FSK??"; | |
936 | } | |
937 | return fskType; | |
938 | } | |
939 | ||
2fc2150e | 940 | //by marshmellow |
eb191de6 | 941 | //fsk raw demod and print binary |
6de43508 | 942 | //takes 4 arguments - Clock, invert, fchigh, fclow |
943 | //defaults: clock = 50, invert=1, fchigh=10, fclow=8 (RF/10 RF/8 (fsk2a)) | |
4ac906d1 | 944 | int FSKrawDemod(const char *Cmd, bool verbose) |
b3b70669 | 945 | { |
e0165dcf | 946 | //raw fsk demod no manchester decoding no start bit finding just get binary from wave |
3f267966 | 947 | uint8_t rfLen, invert, fchigh, fclow; |
e0165dcf | 948 | |
3f267966 | 949 | //set defaults |
e0165dcf | 950 | //set options from parameters entered with the command |
9332b857 | 951 | rfLen = param_get8(Cmd, 0); |
952 | invert = param_get8(Cmd, 1); | |
953 | fchigh = param_get8(Cmd, 2); | |
954 | fclow = param_get8(Cmd, 3); | |
e0165dcf | 955 | if (strlen(Cmd)>0 && strlen(Cmd)<=2) { |
956 | if (rfLen==1){ | |
2eec55c8 | 957 | invert = 1; //if invert option only is used |
e0165dcf | 958 | rfLen = 0; |
959 | } | |
960 | } | |
961 | ||
962 | uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; | |
963 | size_t BitLen = getFromGraphBuf(BitStream); | |
964 | if (BitLen==0) return 0; | |
965 | //get field clock lengths | |
9332b857 | 966 | uint8_t fc1=0, fc2=0, rf1=0; |
bf32dd92 | 967 | if (!fchigh || !fclow) { |
9332b857 | 968 | uint8_t ans = fskClocks(&fc1, &fc2, &rf1, false); |
969 | if (ans == 0) { | |
970 | if (g_debugMode) PrintAndLog("\nError: cannot detect valid fsk field clocks"); | |
971 | return 0; // can't detect field clock | |
e0165dcf | 972 | } |
9332b857 | 973 | fchigh = fc1; |
974 | fclow = fc2; | |
975 | if (rfLen == 0) rfLen = rf1; | |
e0165dcf | 976 | } |
977 | //get bit clock length | |
bf32dd92 | 978 | if (!rfLen){ |
e0165dcf | 979 | rfLen = detectFSKClk(BitStream, BitLen, fchigh, fclow); |
bf32dd92 | 980 | if (!rfLen) rfLen = 50; |
e0165dcf | 981 | } |
3f267966 | 982 | int size = fskdemod(BitStream, BitLen, rfLen, invert, fchigh, fclow); |
983 | if (size > 0){ | |
984 | setDemodBuf(BitStream, size, 0); | |
e0165dcf | 985 | |
986 | // Now output the bitstream to the scrollback by line of 16 bits | |
2767fc02 | 987 | if (verbose || g_debugMode) { |
bf32dd92 | 988 | PrintAndLog("\nUsing Clock:%u, invert:%u, fchigh:%u, fclow:%u", rfLen, invert, fchigh, fclow); |
3f267966 | 989 | PrintAndLog("%s decoded bitstream:", GetFSKType(fchigh, fclow, invert)); |
2767fc02 | 990 | printDemodBuff(); |
e0165dcf | 991 | } |
bf32dd92 | 992 | |
e0165dcf | 993 | return 1; |
3f267966 | 994 | } else { |
2767fc02 | 995 | if (g_debugMode) PrintAndLog("no FSK data found"); |
e0165dcf | 996 | } |
997 | return 0; | |
b3b70669 | 998 | } |
999 | ||
4ac906d1 | 1000 | //by marshmellow |
1001 | //fsk raw demod and print binary | |
1002 | //takes 4 arguments - Clock, invert, fchigh, fclow | |
1003 | //defaults: clock = 50, invert=1, fchigh=10, fclow=8 (RF/10 RF/8 (fsk2a)) | |
1004 | int CmdFSKrawdemod(const char *Cmd) | |
1005 | { | |
e0165dcf | 1006 | char cmdp = param_getchar(Cmd, 0); |
1007 | if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') { | |
1008 | PrintAndLog("Usage: data rawdemod fs [clock] <invert> [fchigh] [fclow]"); | |
1009 | PrintAndLog(" [set clock as integer] optional, omit for autodetect."); | |
1010 | PrintAndLog(" <invert>, 1 for invert output, can be used even if the clock is omitted"); | |
1011 | PrintAndLog(" [fchigh], larger field clock length, omit for autodetect"); | |
1012 | PrintAndLog(" [fclow], small field clock length, omit for autodetect"); | |
1013 | PrintAndLog(""); | |
1014 | PrintAndLog(" sample: data rawdemod fs = demod an fsk tag from GraphBuffer using autodetect"); | |
1015 | PrintAndLog(" : data rawdemod fs 32 = demod an fsk tag from GraphBuffer using a clock of RF/32, autodetect fc"); | |
1016 | PrintAndLog(" : data rawdemod fs 1 = demod an fsk tag from GraphBuffer using autodetect, invert output"); | |
1017 | PrintAndLog(" : data rawdemod fs 32 1 = demod an fsk tag from GraphBuffer using a clock of RF/32, invert output, autodetect fc"); | |
1018 | PrintAndLog(" : data rawdemod fs 64 0 8 5 = demod an fsk1 RF/64 tag from GraphBuffer"); | |
1019 | PrintAndLog(" : data rawdemod fs 50 0 10 8 = demod an fsk2 RF/50 tag from GraphBuffer"); | |
1020 | PrintAndLog(" : data rawdemod fs 50 1 10 8 = demod an fsk2a RF/50 tag from GraphBuffer"); | |
1021 | return 0; | |
1022 | } | |
1023 | return FSKrawDemod(Cmd, TRUE); | |
4ac906d1 | 1024 | } |
1025 | ||
eb191de6 | 1026 | //by marshmellow (based on existing demod + holiman's refactor) |
1027 | //HID Prox demod - FSK RF/50 with preamble of 00011101 (then manchester encoded) | |
1028 | //print full HID Prox ID and some bit format details if found | |
b3b70669 | 1029 | int CmdFSKdemodHID(const char *Cmd) |
1030 | { | |
e0165dcf | 1031 | //raw fsk demod no manchester decoding no start bit finding just get binary from wave |
1032 | uint32_t hi2=0, hi=0, lo=0; | |
1033 | ||
1034 | uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; | |
1035 | size_t BitLen = getFromGraphBuf(BitStream); | |
1036 | if (BitLen==0) return 0; | |
1037 | //get binary from fsk wave | |
1038 | int idx = HIDdemodFSK(BitStream,&BitLen,&hi2,&hi,&lo); | |
1039 | if (idx<0){ | |
1040 | if (g_debugMode){ | |
1041 | if (idx==-1){ | |
1042 | PrintAndLog("DEBUG: Just Noise Detected"); | |
1043 | } else if (idx == -2) { | |
1044 | PrintAndLog("DEBUG: Error demoding fsk"); | |
1045 | } else if (idx == -3) { | |
1046 | PrintAndLog("DEBUG: Preamble not found"); | |
1047 | } else if (idx == -4) { | |
1048 | PrintAndLog("DEBUG: Error in Manchester data, SIZE: %d", BitLen); | |
1049 | } else { | |
1050 | PrintAndLog("DEBUG: Error demoding fsk %d", idx); | |
1051 | } | |
1052 | } | |
1053 | return 0; | |
1054 | } | |
1055 | if (hi2==0 && hi==0 && lo==0) { | |
1056 | if (g_debugMode) PrintAndLog("DEBUG: Error - no values found"); | |
1057 | return 0; | |
1058 | } | |
1059 | if (hi2 != 0){ //extra large HID tags | |
1060 | PrintAndLog("HID Prox TAG ID: %x%08x%08x (%d)", | |
1061 | (unsigned int) hi2, (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF); | |
1062 | } | |
1063 | else { //standard HID tags <38 bits | |
1064 | uint8_t fmtLen = 0; | |
1065 | uint32_t fc = 0; | |
1066 | uint32_t cardnum = 0; | |
1067 | if (((hi>>5)&1)==1){//if bit 38 is set then < 37 bit format is used | |
1068 | uint32_t lo2=0; | |
1069 | lo2=(((hi & 31) << 12) | (lo>>20)); //get bits 21-37 to check for format len bit | |
1070 | uint8_t idx3 = 1; | |
1071 | while(lo2>1){ //find last bit set to 1 (format len bit) | |
1072 | lo2=lo2>>1; | |
1073 | idx3++; | |
1074 | } | |
1075 | fmtLen =idx3+19; | |
1076 | fc =0; | |
1077 | cardnum=0; | |
1078 | if(fmtLen==26){ | |
1079 | cardnum = (lo>>1)&0xFFFF; | |
1080 | fc = (lo>>17)&0xFF; | |
1081 | } | |
1082 | if(fmtLen==34){ | |
1083 | cardnum = (lo>>1)&0xFFFF; | |
1084 | fc= ((hi&1)<<15)|(lo>>17); | |
1085 | } | |
1086 | if(fmtLen==35){ | |
1087 | cardnum = (lo>>1)&0xFFFFF; | |
1088 | fc = ((hi&1)<<11)|(lo>>21); | |
1089 | } | |
1090 | } | |
1091 | else { //if bit 38 is not set then 37 bit format is used | |
1092 | fmtLen = 37; | |
1093 | fc = 0; | |
1094 | cardnum = 0; | |
1095 | if(fmtLen == 37){ | |
1096 | cardnum = (lo>>1)&0x7FFFF; | |
1097 | fc = ((hi&0xF)<<12)|(lo>>20); | |
1098 | } | |
1099 | } | |
1100 | PrintAndLog("HID Prox TAG ID: %x%08x (%d) - Format Len: %dbit - FC: %d - Card: %d", | |
1101 | (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF, | |
1102 | (unsigned int) fmtLen, (unsigned int) fc, (unsigned int) cardnum); | |
1103 | } | |
1104 | setDemodBuf(BitStream,BitLen,idx); | |
1105 | if (g_debugMode){ | |
1106 | PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen); | |
1107 | printDemodBuff(); | |
1108 | } | |
1109 | return 1; | |
ec75f5c1 | 1110 | } |
1111 | ||
04d2721b | 1112 | //by marshmellow |
1113 | //Paradox Prox demod - FSK RF/50 with preamble of 00001111 (then manchester encoded) | |
ec75f5c1 | 1114 | //print full Paradox Prox ID and some bit format details if found |
1115 | int CmdFSKdemodParadox(const char *Cmd) | |
1116 | { | |
e0165dcf | 1117 | //raw fsk demod no manchester decoding no start bit finding just get binary from wave |
1118 | uint32_t hi2=0, hi=0, lo=0; | |
1119 | ||
1120 | uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; | |
1121 | size_t BitLen = getFromGraphBuf(BitStream); | |
1122 | if (BitLen==0) return 0; | |
1123 | //get binary from fsk wave | |
1124 | int idx = ParadoxdemodFSK(BitStream,&BitLen,&hi2,&hi,&lo); | |
1125 | if (idx<0){ | |
1126 | if (g_debugMode){ | |
1127 | if (idx==-1){ | |
1128 | PrintAndLog("DEBUG: Just Noise Detected"); | |
1129 | } else if (idx == -2) { | |
1130 | PrintAndLog("DEBUG: Error demoding fsk"); | |
1131 | } else if (idx == -3) { | |
1132 | PrintAndLog("DEBUG: Preamble not found"); | |
1133 | } else if (idx == -4) { | |
1134 | PrintAndLog("DEBUG: Error in Manchester data"); | |
1135 | } else { | |
1136 | PrintAndLog("DEBUG: Error demoding fsk %d", idx); | |
1137 | } | |
1138 | } | |
1139 | return 0; | |
1140 | } | |
1141 | if (hi2==0 && hi==0 && lo==0){ | |
1142 | if (g_debugMode) PrintAndLog("DEBUG: Error - no value found"); | |
1143 | return 0; | |
1144 | } | |
1145 | uint32_t fc = ((hi & 0x3)<<6) | (lo>>26); | |
1146 | uint32_t cardnum = (lo>>10)&0xFFFF; | |
1147 | uint32_t rawLo = bytebits_to_byte(BitStream+idx+64,32); | |
1148 | uint32_t rawHi = bytebits_to_byte(BitStream+idx+32,32); | |
1149 | uint32_t rawHi2 = bytebits_to_byte(BitStream+idx,32); | |
1150 | ||
1151 | PrintAndLog("Paradox TAG ID: %x%08x - FC: %d - Card: %d - Checksum: %02x - RAW: %08x%08x%08x", | |
1152 | hi>>10, (hi & 0x3)<<26 | (lo>>10), fc, cardnum, (lo>>2) & 0xFF, rawHi2, rawHi, rawLo); | |
1153 | setDemodBuf(BitStream,BitLen,idx); | |
1154 | if (g_debugMode){ | |
1155 | PrintAndLog("DEBUG: idx: %d, len: %d, Printing Demod Buffer:", idx, BitLen); | |
1156 | printDemodBuff(); | |
1157 | } | |
1158 | return 1; | |
b3b70669 | 1159 | } |
1160 | ||
2fc2150e | 1161 | //by marshmellow |
eb191de6 | 1162 | //IO-Prox demod - FSK RF/64 with preamble of 000000001 |
1163 | //print ioprox ID and some format details | |
b3b70669 | 1164 | int CmdFSKdemodIO(const char *Cmd) |
1165 | { | |
e0165dcf | 1166 | int idx=0; |
1167 | //something in graphbuffer? | |
1168 | if (GraphTraceLen < 65) { | |
1169 | if (g_debugMode)PrintAndLog("DEBUG: not enough samples in GraphBuffer"); | |
1170 | return 0; | |
1171 | } | |
1172 | uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; | |
1173 | size_t BitLen = getFromGraphBuf(BitStream); | |
1174 | if (BitLen==0) return 0; | |
1175 | ||
1176 | //get binary from fsk wave | |
1177 | idx = IOdemodFSK(BitStream,BitLen); | |
1178 | if (idx<0){ | |
1179 | if (g_debugMode){ | |
1180 | if (idx==-1){ | |
1181 | PrintAndLog("DEBUG: Just Noise Detected"); | |
1182 | } else if (idx == -2) { | |
1183 | PrintAndLog("DEBUG: not enough samples"); | |
1184 | } else if (idx == -3) { | |
1185 | PrintAndLog("DEBUG: error during fskdemod"); | |
1186 | } else if (idx == -4) { | |
1187 | PrintAndLog("DEBUG: Preamble not found"); | |
1188 | } else if (idx == -5) { | |
1189 | PrintAndLog("DEBUG: Separator bits not found"); | |
1190 | } else { | |
1191 | PrintAndLog("DEBUG: Error demoding fsk %d", idx); | |
1192 | } | |
1193 | } | |
1194 | return 0; | |
1195 | } | |
1196 | if (idx==0){ | |
2767fc02 | 1197 | if (g_debugMode){ |
e0165dcf | 1198 | PrintAndLog("DEBUG: IO Prox Data not found - FSK Bits: %d",BitLen); |
2767fc02 | 1199 | if (BitLen > 92) PrintAndLog("%s", sprint_bin_break(BitStream,92,16)); |
e0165dcf | 1200 | } |
1201 | return 0; | |
1202 | } | |
1203 | //Index map | |
1204 | //0 10 20 30 40 50 60 | |
1205 | //| | | | | | | | |
1206 | //01234567 8 90123456 7 89012345 6 78901234 5 67890123 4 56789012 3 45678901 23 | |
1207 | //----------------------------------------------------------------------------- | |
1208 | //00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1 ???????? 11 | |
1209 | // | |
1210 | //XSF(version)facility:codeone+codetwo (raw) | |
1211 | //Handle the data | |
1212 | if (idx+64>BitLen) { | |
2767fc02 | 1213 | if (g_debugMode) PrintAndLog("not enough bits found - bitlen: %d",BitLen); |
e0165dcf | 1214 | return 0; |
1215 | } | |
1216 | 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]); | |
1217 | 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]); | |
1218 | 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]); | |
1219 | 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]); | |
1220 | 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]); | |
1221 | PrintAndLog("%d%d%d%d%d%d%d%d %d code2",BitStream[idx+45], BitStream[idx+46], BitStream[idx+47],BitStream[idx+48],BitStream[idx+49],BitStream[idx+50],BitStream[idx+51],BitStream[idx+52],BitStream[idx+53]); | |
1222 | 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]); | |
1223 | ||
1224 | uint32_t code = bytebits_to_byte(BitStream+idx,32); | |
1225 | uint32_t code2 = bytebits_to_byte(BitStream+idx+32,32); | |
1226 | uint8_t version = bytebits_to_byte(BitStream+idx+27,8); //14,4 | |
1227 | uint8_t facilitycode = bytebits_to_byte(BitStream+idx+18,8) ; | |
1228 | uint16_t number = (bytebits_to_byte(BitStream+idx+36,8)<<8)|(bytebits_to_byte(BitStream+idx+45,8)); //36,9 | |
1229 | uint8_t crc = bytebits_to_byte(BitStream+idx+54,8); | |
1230 | uint16_t calccrc = 0; | |
1231 | ||
1232 | for (uint8_t i=1; i<6; ++i){ | |
1233 | calccrc += bytebits_to_byte(BitStream+idx+9*i,8); | |
e0165dcf | 1234 | } |
1235 | calccrc &= 0xff; | |
1236 | calccrc = 0xff - calccrc; | |
1237 | ||
1238 | char *crcStr = (crc == calccrc) ? "crc ok": "!crc"; | |
1239 | ||
1240 | PrintAndLog("IO Prox XSF(%02d)%02x:%05d (%08x%08x) [%02x %s]",version,facilitycode,number,code,code2, crc, crcStr); | |
1241 | setDemodBuf(BitStream,64,idx); | |
1242 | if (g_debugMode){ | |
1243 | PrintAndLog("DEBUG: idx: %d, Len: %d, Printing demod buffer:",idx,64); | |
1244 | printDemodBuff(); | |
1245 | } | |
1246 | return 1; | |
b3b70669 | 1247 | } |
1e090a61 | 1248 | |
1e090a61 | 1249 | //by marshmellow |
1250 | //AWID Prox demod - FSK RF/50 with preamble of 00000001 (always a 96 bit data stream) | |
1251 | //print full AWID Prox ID and some bit format details if found | |
1252 | int CmdFSKdemodAWID(const char *Cmd) | |
1253 | { | |
e0165dcf | 1254 | uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; |
1255 | size_t size = getFromGraphBuf(BitStream); | |
1256 | if (size==0) return 0; | |
1257 | ||
1258 | //get binary from fsk wave | |
1259 | int idx = AWIDdemodFSK(BitStream, &size); | |
1260 | if (idx<=0){ | |
1261 | if (g_debugMode==1){ | |
1262 | if (idx == -1) | |
1263 | PrintAndLog("DEBUG: Error - not enough samples"); | |
1264 | else if (idx == -2) | |
1265 | PrintAndLog("DEBUG: Error - only noise found"); | |
1266 | else if (idx == -3) | |
1267 | PrintAndLog("DEBUG: Error - problem during FSK demod"); | |
1268 | else if (idx == -4) | |
1269 | PrintAndLog("DEBUG: Error - AWID preamble not found"); | |
1270 | else if (idx == -5) | |
1271 | PrintAndLog("DEBUG: Error - Size not correct: %d", size); | |
1272 | else | |
1273 | PrintAndLog("DEBUG: Error %d",idx); | |
1274 | } | |
1275 | return 0; | |
1276 | } | |
1277 | ||
1278 | // Index map | |
1279 | // 0 10 20 30 40 50 60 | |
1280 | // | | | | | | | | |
1281 | // 01234567 890 1 234 5 678 9 012 3 456 7 890 1 234 5 678 9 012 3 456 7 890 1 234 5 678 9 012 3 - to 96 | |
1282 | // ----------------------------------------------------------------------------- | |
70459879 | 1283 | // 00000001 000 1 110 1 101 1 011 1 101 1 010 0 000 1 000 1 010 0 001 0 110 1 100 0 000 1 000 1 |
e0165dcf | 1284 | // premable bbb o bbb o bbw o fff o fff o ffc o ccc o ccc o ccc o ccc o ccc o wxx o xxx o xxx o - to 96 |
1285 | // |---26 bit---| |-----117----||-------------142-------------| | |
1286 | // b = format bit len, o = odd parity of last 3 bits | |
1287 | // f = facility code, c = card number | |
1288 | // w = wiegand parity | |
1289 | // (26 bit format shown) | |
1e090a61 | 1290 | |
e0165dcf | 1291 | //get raw ID before removing parities |
1292 | uint32_t rawLo = bytebits_to_byte(BitStream+idx+64,32); | |
1293 | uint32_t rawHi = bytebits_to_byte(BitStream+idx+32,32); | |
1294 | uint32_t rawHi2 = bytebits_to_byte(BitStream+idx,32); | |
1295 | setDemodBuf(BitStream,96,idx); | |
1296 | ||
1297 | size = removeParity(BitStream, idx+8, 4, 1, 88); | |
1298 | if (size != 66){ | |
1299 | if (g_debugMode==1) PrintAndLog("DEBUG: Error - at parity check-tag size does not match AWID format"); | |
1300 | return 0; | |
1301 | } | |
1302 | // ok valid card found! | |
1303 | ||
1304 | // Index map | |
1305 | // 0 10 20 30 40 50 60 | |
1306 | // | | | | | | | | |
1307 | // 01234567 8 90123456 7890123456789012 3 456789012345678901234567890123456 | |
1308 | // ----------------------------------------------------------------------------- | |
1309 | // 00011010 1 01110101 0000000010001110 1 000000000000000000000000000000000 | |
1310 | // bbbbbbbb w ffffffff cccccccccccccccc w xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx | |
1311 | // |26 bit| |-117--| |-----142------| | |
1312 | // b = format bit len, o = odd parity of last 3 bits | |
1313 | // f = facility code, c = card number | |
1314 | // w = wiegand parity | |
1315 | // (26 bit format shown) | |
1316 | ||
1317 | uint32_t fc = 0; | |
1318 | uint32_t cardnum = 0; | |
1319 | uint32_t code1 = 0; | |
1320 | uint32_t code2 = 0; | |
1321 | uint8_t fmtLen = bytebits_to_byte(BitStream,8); | |
1322 | if (fmtLen==26){ | |
1323 | fc = bytebits_to_byte(BitStream+9, 8); | |
1324 | cardnum = bytebits_to_byte(BitStream+17, 16); | |
1325 | code1 = bytebits_to_byte(BitStream+8,fmtLen); | |
1326 | PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo); | |
1327 | } else { | |
1328 | cardnum = bytebits_to_byte(BitStream+8+(fmtLen-17), 16); | |
1329 | if (fmtLen>32){ | |
1330 | code1 = bytebits_to_byte(BitStream+8,fmtLen-32); | |
1331 | code2 = bytebits_to_byte(BitStream+8+(fmtLen-32),32); | |
1332 | PrintAndLog("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo); | |
1333 | } else{ | |
1334 | code1 = bytebits_to_byte(BitStream+8,fmtLen); | |
1335 | PrintAndLog("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo); | |
1336 | } | |
1337 | } | |
1338 | if (g_debugMode){ | |
1339 | PrintAndLog("DEBUG: idx: %d, Len: %d Printing Demod Buffer:", idx, 96); | |
1340 | printDemodBuff(); | |
1341 | } | |
1342 | //todo - convert hi2, hi, lo to demodbuffer for future sim/clone commands | |
1343 | return 1; | |
1e090a61 | 1344 | } |
1345 | ||
1346 | //by marshmellow | |
1347 | //Pyramid Prox demod - FSK RF/50 with preamble of 0000000000000001 (always a 128 bit data stream) | |
1348 | //print full Farpointe Data/Pyramid Prox ID and some bit format details if found | |
1349 | int CmdFSKdemodPyramid(const char *Cmd) | |
1350 | { | |
e0165dcf | 1351 | //raw fsk demod no manchester decoding no start bit finding just get binary from wave |
1352 | uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; | |
1353 | size_t size = getFromGraphBuf(BitStream); | |
1354 | if (size==0) return 0; | |
1355 | ||
1356 | //get binary from fsk wave | |
1357 | int idx = PyramiddemodFSK(BitStream, &size); | |
1358 | if (idx < 0){ | |
1359 | if (g_debugMode==1){ | |
1360 | if (idx == -5) | |
1361 | PrintAndLog("DEBUG: Error - not enough samples"); | |
1362 | else if (idx == -1) | |
1363 | PrintAndLog("DEBUG: Error - only noise found"); | |
1364 | else if (idx == -2) | |
1365 | PrintAndLog("DEBUG: Error - problem during FSK demod"); | |
1366 | else if (idx == -3) | |
1367 | PrintAndLog("DEBUG: Error - Size not correct: %d", size); | |
1368 | else if (idx == -4) | |
1369 | PrintAndLog("DEBUG: Error - Pyramid preamble not found"); | |
1370 | else | |
1371 | PrintAndLog("DEBUG: Error - idx: %d",idx); | |
1372 | } | |
1373 | return 0; | |
1374 | } | |
1375 | // Index map | |
1376 | // 0 10 20 30 40 50 60 | |
1377 | // | | | | | | | | |
1378 | // 0123456 7 8901234 5 6789012 3 4567890 1 2345678 9 0123456 7 8901234 5 6789012 3 | |
1379 | // ----------------------------------------------------------------------------- | |
1380 | // 0000000 0 0000000 1 0000000 1 0000000 1 0000000 1 0000000 1 0000000 1 0000000 1 | |
1381 | // premable xxxxxxx o xxxxxxx o xxxxxxx o xxxxxxx o xxxxxxx o xxxxxxx o xxxxxxx o | |
1382 | ||
1383 | // 64 70 80 90 100 110 120 | |
1384 | // | | | | | | | | |
1385 | // 4567890 1 2345678 9 0123456 7 8901234 5 6789012 3 4567890 1 2345678 9 0123456 7 | |
1386 | // ----------------------------------------------------------------------------- | |
1387 | // 0000000 1 0000000 1 0000000 1 0110111 0 0011000 1 0000001 0 0001100 1 1001010 0 | |
1388 | // xxxxxxx o xxxxxxx o xxxxxxx o xswffff o ffffccc o ccccccc o ccccccw o ppppppp o | |
1389 | // |---115---||---------71---------| | |
1390 | // s = format start bit, o = odd parity of last 7 bits | |
1391 | // f = facility code, c = card number | |
1392 | // w = wiegand parity, x = extra space for other formats | |
1393 | // p = unknown checksum | |
1394 | // (26 bit format shown) | |
1395 | ||
1396 | //get bytes for checksum calc | |
1397 | uint8_t checksum = bytebits_to_byte(BitStream + idx + 120, 8); | |
1398 | uint8_t csBuff[14] = {0x00}; | |
1399 | for (uint8_t i = 0; i < 13; i++){ | |
1400 | csBuff[i] = bytebits_to_byte(BitStream + idx + 16 + (i*8), 8); | |
1401 | } | |
1402 | //check checksum calc | |
1403 | //checksum calc thanks to ICEMAN!! | |
1404 | uint32_t checkCS = CRC8Maxim(csBuff,13); | |
1405 | ||
1406 | //get raw ID before removing parities | |
1407 | uint32_t rawLo = bytebits_to_byte(BitStream+idx+96,32); | |
1408 | uint32_t rawHi = bytebits_to_byte(BitStream+idx+64,32); | |
1409 | uint32_t rawHi2 = bytebits_to_byte(BitStream+idx+32,32); | |
1410 | uint32_t rawHi3 = bytebits_to_byte(BitStream+idx,32); | |
1411 | setDemodBuf(BitStream,128,idx); | |
1412 | ||
1413 | size = removeParity(BitStream, idx+8, 8, 1, 120); | |
1414 | if (size != 105){ | |
1415 | if (g_debugMode==1) | |
1416 | PrintAndLog("DEBUG: Error at parity check - tag size does not match Pyramid format, SIZE: %d, IDX: %d, hi3: %x",size, idx, rawHi3); | |
1417 | return 0; | |
1418 | } | |
1419 | ||
1420 | // ok valid card found! | |
1421 | ||
1422 | // Index map | |
1423 | // 0 10 20 30 40 50 60 70 | |
1424 | // | | | | | | | | | |
1425 | // 01234567890123456789012345678901234567890123456789012345678901234567890 | |
1426 | // ----------------------------------------------------------------------- | |
1427 | // 00000000000000000000000000000000000000000000000000000000000000000000000 | |
1428 | // xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx | |
1429 | ||
1430 | // 71 80 90 100 | |
1431 | // | | | | | |
1432 | // 1 2 34567890 1234567890123456 7 8901234 | |
1433 | // --------------------------------------- | |
1434 | // 1 1 01110011 0000000001000110 0 1001010 | |
1435 | // s w ffffffff cccccccccccccccc w ppppppp | |
1436 | // |--115-| |------71------| | |
1437 | // s = format start bit, o = odd parity of last 7 bits | |
1438 | // f = facility code, c = card number | |
1439 | // w = wiegand parity, x = extra space for other formats | |
1440 | // p = unknown checksum | |
1441 | // (26 bit format shown) | |
1442 | ||
1443 | //find start bit to get fmtLen | |
1444 | int j; | |
1445 | for (j=0; j<size; j++){ | |
1446 | if(BitStream[j]) break; | |
1447 | } | |
1448 | uint8_t fmtLen = size-j-8; | |
1449 | uint32_t fc = 0; | |
1450 | uint32_t cardnum = 0; | |
1451 | uint32_t code1 = 0; | |
e0165dcf | 1452 | if (fmtLen==26){ |
1453 | fc = bytebits_to_byte(BitStream+73, 8); | |
1454 | cardnum = bytebits_to_byte(BitStream+81, 16); | |
1455 | code1 = bytebits_to_byte(BitStream+72,fmtLen); | |
1456 | PrintAndLog("Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi3, rawHi2, rawHi, rawLo); | |
1457 | } else if (fmtLen==45){ | |
1458 | fmtLen=42; //end = 10 bits not 7 like 26 bit fmt | |
1459 | fc = bytebits_to_byte(BitStream+53, 10); | |
1460 | cardnum = bytebits_to_byte(BitStream+63, 32); | |
1461 | PrintAndLog("Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, rawHi3, rawHi2, rawHi, rawLo); | |
1462 | } else { | |
1463 | cardnum = bytebits_to_byte(BitStream+81, 16); | |
1464 | if (fmtLen>32){ | |
1465 | //code1 = bytebits_to_byte(BitStream+(size-fmtLen),fmtLen-32); | |
1466 | //code2 = bytebits_to_byte(BitStream+(size-32),32); | |
1467 | PrintAndLog("Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo); | |
1468 | } else{ | |
1469 | //code1 = bytebits_to_byte(BitStream+(size-fmtLen),fmtLen); | |
1470 | PrintAndLog("Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo); | |
1471 | } | |
1472 | } | |
1473 | if (checksum == checkCS) | |
1474 | PrintAndLog("Checksum %02x passed", checksum); | |
1475 | else | |
1476 | PrintAndLog("Checksum %02x failed - should have been %02x", checksum, checkCS); | |
1477 | ||
1478 | if (g_debugMode){ | |
1479 | PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, 128); | |
1480 | printDemodBuff(); | |
1481 | } | |
1482 | return 1; | |
1e090a61 | 1483 | } |
1484 | ||
ad6219fc | 1485 | // FDX-B ISO11784/85 demod (aka animal tag) BIPHASE, inverted, rf/32, with preamble of 00000000001 (128bits) |
7f96433c | 1486 | // 8 databits + 1 parity (1) |
0df669a2 | 1487 | // CIITT 16 chksum |
1488 | // NATIONAL CODE, ICAR database | |
ad6219fc | 1489 | // COUNTRY CODE (ISO3166) or http://cms.abvma.ca/uploads/ManufacturersISOsandCountryCodes.pdf |
0df669a2 | 1490 | // FLAG (animal/non-animal) |
22a6a62f | 1491 | /* |
1492 | 38 IDbits | |
1493 | 10 country code | |
1494 | 1 extra app bit | |
1495 | 14 reserved bits | |
1496 | 1 animal bit | |
1497 | 16 ccitt CRC chksum over 64bit ID CODE. | |
1498 | 24 appli bits. | |
1499 | ||
ad6219fc | 1500 | -- sample: 985121004515220 [ 37FF65B88EF94 ] |
22a6a62f | 1501 | */ |
ad6219fc | 1502 | int CmdFDXBdemodBI(const char *Cmd){ |
7f96433c | 1503 | |
1504 | int invert = 1; | |
1505 | int clk = 32; | |
1506 | int errCnt = 0; | |
ad6219fc | 1507 | int maxErr = 0; |
7f96433c | 1508 | uint8_t BitStream[MAX_DEMOD_BUF_LEN]; |
1509 | size_t size = getFromGraphBuf(BitStream); | |
1510 | ||
ad6219fc | 1511 | errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0); |
1512 | if ( errCnt < 0 || errCnt > maxErr ) { | |
a71ece51 | 1513 | if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk); |
0df669a2 | 1514 | return 0; |
1515 | } | |
615f21dd | 1516 | |
ad6219fc | 1517 | errCnt = BiphaseRawDecode(BitStream, &size, maxErr, 1); |
1518 | if (errCnt < 0 || errCnt > maxErr ) { | |
7f96433c | 1519 | if (g_debugMode) PrintAndLog("Error BiphaseRawDecode: %d", errCnt); |
0df669a2 | 1520 | return 0; |
7f96433c | 1521 | } |
0df669a2 | 1522 | |
ad6219fc | 1523 | int preambleIndex = FDXBdemodBI(BitStream, &size); |
7f96433c | 1524 | if (preambleIndex < 0){ |
ad6219fc | 1525 | if (g_debugMode) PrintAndLog("Error FDXBDemod , no startmarker found :: %d",preambleIndex); |
7f96433c | 1526 | return 0; |
1527 | } | |
6426f6ba | 1528 | if (size != 128) { |
1529 | if (g_debugMode) PrintAndLog("Error incorrect data length found"); | |
1530 | return 0; | |
1531 | } | |
0df669a2 | 1532 | |
ad6219fc | 1533 | setDemodBuf(BitStream, 128, preambleIndex); |
7f96433c | 1534 | |
b10a759f | 1535 | // remove marker bits (1's every 9th digit after preamble) (pType = 2) |
a71ece51 | 1536 | size = removeParity(BitStream, preambleIndex + 11, 9, 2, 117); |
b10a759f | 1537 | if ( size != 104 ) { |
ad6219fc | 1538 | if (g_debugMode) PrintAndLog("Error removeParity:: %d", size); |
1539 | return 0; | |
0df669a2 | 1540 | } |
ad6219fc | 1541 | if (g_debugMode) { |
1542 | char *bin = sprint_bin_break(BitStream,size,16); | |
1543 | PrintAndLog("DEBUG BinStream:\n%s",bin); | |
1544 | } | |
1545 | PrintAndLog("\nFDX-B / ISO 11784/5 Animal Tag ID Found:"); | |
a71ece51 | 1546 | if (g_debugMode) PrintAndLog("Start marker %d; Size %d", preambleIndex, size); |
ad6219fc | 1547 | |
a71ece51 | 1548 | //got a good demod |
ad6219fc | 1549 | uint64_t NationalCode = ((uint64_t)(bytebits_to_byteLSBF(BitStream+32,6)) << 32) | bytebits_to_byteLSBF(BitStream,32); |
1550 | uint32_t countryCode = bytebits_to_byteLSBF(BitStream+38,10); | |
1551 | uint8_t dataBlockBit = BitStream[48]; | |
1552 | uint32_t reservedCode = bytebits_to_byteLSBF(BitStream+49,14); | |
1553 | uint8_t animalBit = BitStream[63]; | |
a71ece51 | 1554 | uint32_t crc16 = bytebits_to_byteLSBF(BitStream+64,16); |
ad6219fc | 1555 | uint32_t extended = bytebits_to_byteLSBF(BitStream+80,24); |
1556 | ||
a71ece51 | 1557 | uint64_t rawid = ((uint64_t)bytebits_to_byte(BitStream,32)<<32) | bytebits_to_byte(BitStream+32,32); |
ad6219fc | 1558 | uint8_t raw[8]; |
1559 | num_to_bytes(rawid, 8, raw); | |
a71ece51 | 1560 | |
1561 | if (g_debugMode) PrintAndLog("Raw ID Hex: %s", sprint_hex(raw,8)); | |
1562 | ||
1563 | uint16_t calcCrc = crc16_ccitt_kermit(raw, 8); | |
1564 | PrintAndLog("Animal ID: %04u-%012llu", countryCode, NationalCode); | |
ad6219fc | 1565 | PrintAndLog("National Code: %012llu", NationalCode); |
a71ece51 | 1566 | PrintAndLog("CountryCode: %04u", countryCode); |
ad6219fc | 1567 | PrintAndLog("Extended Data: %s", dataBlockBit ? "True" : "False"); |
1568 | PrintAndLog("reserved Code: %u", reservedCode); | |
1569 | PrintAndLog("Animal Tag: %s", animalBit ? "True" : "False"); | |
a71ece51 | 1570 | PrintAndLog("CRC: 0x%04X - [%04X] - %s", crc16, calcCrc, (calcCrc == crc16) ? "Passed" : "Failed"); |
1571 | PrintAndLog("Extended: 0x%X\n", extended); | |
ad6219fc | 1572 | |
615f21dd | 1573 | return 1; |
1574 | } | |
1575 | ||
1576 | ||
e770c648 | 1577 | //by marshmellow |
1578 | //attempt to psk1 demod graph buffer | |
4ac906d1 | 1579 | int PSKDemod(const char *Cmd, bool verbose) |
e770c648 | 1580 | { |
e0165dcf | 1581 | int invert=0; |
1582 | int clk=0; | |
1583 | int maxErr=100; | |
1584 | sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr); | |
1585 | if (clk==1){ | |
1586 | invert=1; | |
1587 | clk=0; | |
1588 | } | |
1589 | if (invert != 0 && invert != 1) { | |
24344f28 | 1590 | if (g_debugMode || verbose) PrintAndLog("Invalid argument: %s", Cmd); |
e0165dcf | 1591 | return 0; |
1592 | } | |
1593 | uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; | |
1594 | size_t BitLen = getFromGraphBuf(BitStream); | |
2ec87733 | 1595 | if (BitLen==0) return 0; |
2eec55c8 | 1596 | uint8_t carrier=countFC(BitStream, BitLen, 0); |
e0165dcf | 1597 | if (carrier!=2 && carrier!=4 && carrier!=8){ |
1598 | //invalid carrier | |
1599 | return 0; | |
1600 | } | |
6426f6ba | 1601 | if (g_debugMode){ |
1602 | PrintAndLog("Carrier: rf/%d",carrier); | |
1603 | } | |
e0165dcf | 1604 | int errCnt=0; |
1605 | errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert); | |
1606 | if (errCnt > maxErr){ | |
2767fc02 | 1607 | if (g_debugMode || verbose) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt); |
e0165dcf | 1608 | return 0; |
1609 | } | |
1610 | if (errCnt<0|| BitLen<16){ //throw away static - allow 1 and -1 (in case of threshold command first) | |
2767fc02 | 1611 | if (g_debugMode || verbose) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt); |
e0165dcf | 1612 | return 0; |
1613 | } | |
2767fc02 | 1614 | if (verbose || g_debugMode){ |
1615 | PrintAndLog("\nUsing Clock:%d, invert:%d, Bits Found:%d",clk,invert,BitLen); | |
e0165dcf | 1616 | if (errCnt>0){ |
2767fc02 | 1617 | PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt); |
e0165dcf | 1618 | } |
1619 | } | |
1620 | //prime demod buffer for output | |
1621 | setDemodBuf(BitStream,BitLen,0); | |
1622 | return 1; | |
4118b74d | 1623 | } |
e770c648 | 1624 | |
4118b74d | 1625 | // Indala 26 bit decode |
1626 | // by marshmellow | |
1627 | // optional arguments - same as CmdpskNRZrawDemod (clock & invert) | |
1628 | int CmdIndalaDecode(const char *Cmd) | |
1629 | { | |
b4fb11ba | 1630 | int ans; |
1631 | if (strlen(Cmd)>0){ | |
1632 | ans = PSKDemod(Cmd, 0); | |
1633 | } else{ //default to RF/32 | |
1634 | ans = PSKDemod("32", 0); | |
1635 | } | |
4118b74d | 1636 | |
7a8a982b | 1637 | if (!ans){ |
ec75f5c1 | 1638 | if (g_debugMode==1) |
b4fb11ba | 1639 | PrintAndLog("Error1: %d",ans); |
ba1a299c | 1640 | return 0; |
1641 | } | |
1642 | uint8_t invert=0; | |
57c7b44b | 1643 | size_t size = DemodBufferLen; |
1644 | size_t startIdx = indala26decode(DemodBuffer, &size, &invert); | |
6426f6ba | 1645 | if (startIdx < 1 || size > 224) { |
ec75f5c1 | 1646 | if (g_debugMode==1) |
b4fb11ba | 1647 | PrintAndLog("Error2: %d",ans); |
ba1a299c | 1648 | return -1; |
1649 | } | |
57c7b44b | 1650 | setDemodBuf(DemodBuffer, size, startIdx); |
84871873 | 1651 | if (invert) |
b4fb11ba | 1652 | if (g_debugMode==1) |
e0165dcf | 1653 | PrintAndLog("Had to invert bits"); |
ec75f5c1 | 1654 | |
57c7b44b | 1655 | PrintAndLog("BitLen: %d",DemodBufferLen); |
ba1a299c | 1656 | //convert UID to HEX |
1657 | uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7; | |
57c7b44b | 1658 | uid1=bytebits_to_byte(DemodBuffer,32); |
1659 | uid2=bytebits_to_byte(DemodBuffer+32,32); | |
ba1a299c | 1660 | if (DemodBufferLen==64){ |
52f2df61 | 1661 | PrintAndLog("Indala UID=%s (%x%08x)", sprint_bin_break(DemodBuffer,DemodBufferLen,16), uid1, uid2); |
6426f6ba | 1662 | } else { |
57c7b44b | 1663 | uid3=bytebits_to_byte(DemodBuffer+64,32); |
1664 | uid4=bytebits_to_byte(DemodBuffer+96,32); | |
1665 | uid5=bytebits_to_byte(DemodBuffer+128,32); | |
1666 | uid6=bytebits_to_byte(DemodBuffer+160,32); | |
1667 | uid7=bytebits_to_byte(DemodBuffer+192,32); | |
1668 | PrintAndLog("Indala UID=%s (%x%08x%08x%08x%08x%08x%08x)", | |
52f2df61 | 1669 | sprint_bin_break(DemodBuffer,DemodBufferLen,16), uid1, uid2, uid3, uid4, uid5, uid6, uid7); |
ba1a299c | 1670 | } |
b4fb11ba | 1671 | if (g_debugMode){ |
1672 | PrintAndLog("DEBUG: printing demodbuffer:"); | |
1673 | printDemodBuff(); | |
1674 | } | |
ba1a299c | 1675 | return 1; |
4118b74d | 1676 | } |
1677 | ||
411105e0 | 1678 | int CmdPSKNexWatch(const char *Cmd) |
1679 | { | |
1680 | if (!PSKDemod("", false)) return 0; | |
1681 | uint8_t preamble[28] = {0,0,0,0,0,1,0,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; | |
1682 | size_t startIdx = 0, size = DemodBufferLen; | |
1683 | bool invert = false; | |
1684 | if (!preambleSearch(DemodBuffer, preamble, sizeof(preamble), &size, &startIdx)){ | |
1685 | // if didn't find preamble try again inverting | |
1686 | if (!PSKDemod("1", false)) return 0; | |
1687 | size = DemodBufferLen; | |
1688 | if (!preambleSearch(DemodBuffer, preamble, sizeof(preamble), &size, &startIdx)) return 0; | |
1689 | invert = true; | |
1690 | } | |
1691 | if (size != 128) return 0; | |
1692 | setDemodBuf(DemodBuffer, size, startIdx+4); | |
1693 | startIdx = 8+32; //4 = extra i added, 8 = preamble, 32 = reserved bits (always 0) | |
1694 | //get ID | |
1695 | uint32_t ID = 0; | |
1696 | for (uint8_t wordIdx=0; wordIdx<4; wordIdx++){ | |
1697 | for (uint8_t idx=0; idx<8; idx++){ | |
1698 | ID = (ID << 1) | DemodBuffer[startIdx+wordIdx+(idx*4)]; | |
1699 | } | |
1700 | } | |
1701 | //parity check (TBD) | |
1702 | ||
1703 | //checksum check (TBD) | |
1704 | ||
1705 | //output | |
1706 | PrintAndLog("NexWatch ID: %d", ID); | |
1707 | if (invert){ | |
1708 | PrintAndLog("Had to Invert - probably NexKey"); | |
1709 | for (uint8_t idx=0; idx<size; idx++) | |
1710 | DemodBuffer[idx] ^= 1; | |
1711 | } | |
1712 | ||
1713 | CmdPrintDemodBuff("x"); | |
1714 | return 1; | |
1715 | } | |
1716 | ||
04d2721b | 1717 | // by marshmellow |
e770c648 | 1718 | // takes 3 arguments - clock, invert, maxErr as integers |
1719 | // attempts to demodulate nrz only | |
1720 | // prints binary found and saves in demodbuffer for further commands | |
b4a2fcf6 | 1721 | int NRZrawDemod(const char *Cmd, bool verbose) |
e770c648 | 1722 | { |
e0165dcf | 1723 | int invert=0; |
1724 | int clk=0; | |
1725 | int maxErr=100; | |
1726 | sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr); | |
1727 | if (clk==1){ | |
1728 | invert=1; | |
1729 | clk=0; | |
1730 | } | |
1731 | if (invert != 0 && invert != 1) { | |
1732 | PrintAndLog("Invalid argument: %s", Cmd); | |
1733 | return 0; | |
1734 | } | |
1735 | uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; | |
1736 | size_t BitLen = getFromGraphBuf(BitStream); | |
1737 | if (BitLen==0) return 0; | |
1738 | int errCnt=0; | |
6426f6ba | 1739 | errCnt = nrzRawDemod(BitStream, &BitLen, &clk, &invert); |
e0165dcf | 1740 | if (errCnt > maxErr){ |
1741 | if (g_debugMode) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt); | |
1742 | return 0; | |
1743 | } | |
2eec55c8 | 1744 | if (errCnt<0 || BitLen<16){ //throw away static - allow 1 and -1 (in case of threshold command first) |
e0165dcf | 1745 | if (g_debugMode) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt); |
1746 | return 0; | |
1747 | } | |
1748 | if (verbose || g_debugMode) PrintAndLog("Tried NRZ Demod using Clock: %d - invert: %d - Bits Found: %d",clk,invert,BitLen); | |
1749 | //prime demod buffer for output | |
1750 | setDemodBuf(BitStream,BitLen,0); | |
1751 | ||
2767fc02 | 1752 | if (errCnt>0 && (verbose || g_debugMode)) PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt); |
e0165dcf | 1753 | if (verbose || g_debugMode) { |
1754 | PrintAndLog("NRZ demoded bitstream:"); | |
1755 | // Now output the bitstream to the scrollback by line of 16 bits | |
1756 | printDemodBuff(); | |
1757 | } | |
1758 | return 1; | |
b4a2fcf6 | 1759 | } |
1760 | ||
1761 | int CmdNRZrawDemod(const char *Cmd) | |
1762 | { | |
e0165dcf | 1763 | char cmdp = param_getchar(Cmd, 0); |
1764 | if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') { | |
1765 | PrintAndLog("Usage: data rawdemod nr [clock] <0|1> [maxError]"); | |
1766 | PrintAndLog(" [set clock as integer] optional, if not set, autodetect."); | |
1767 | PrintAndLog(" <invert>, 1 for invert output"); | |
1768 | PrintAndLog(" [set maximum allowed errors], default = 100."); | |
1769 | PrintAndLog(""); | |
1770 | PrintAndLog(" sample: data rawdemod nr = demod a nrz/direct tag from GraphBuffer"); | |
1771 | PrintAndLog(" : data rawdemod nr 32 = demod a nrz/direct tag from GraphBuffer using a clock of RF/32"); | |
1772 | PrintAndLog(" : data rawdemod nr 32 1 = demod a nrz/direct tag from GraphBuffer using a clock of RF/32 and inverting data"); | |
1773 | PrintAndLog(" : data rawdemod nr 1 = demod a nrz/direct tag from GraphBuffer while inverting data"); | |
1774 | PrintAndLog(" : data rawdemod nr 64 1 0 = demod a nrz/direct tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors"); | |
1775 | return 0; | |
1776 | } | |
1777 | return NRZrawDemod(Cmd, TRUE); | |
e770c648 | 1778 | } |
1779 | ||
1780 | // by marshmellow | |
1781 | // takes 3 arguments - clock, invert, maxErr as integers | |
04d2721b | 1782 | // attempts to demodulate psk only |
1783 | // prints binary found and saves in demodbuffer for further commands | |
e770c648 | 1784 | int CmdPSK1rawDemod(const char *Cmd) |
4118b74d | 1785 | { |
e0165dcf | 1786 | int ans; |
1787 | char cmdp = param_getchar(Cmd, 0); | |
1788 | if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') { | |
1789 | PrintAndLog("Usage: data rawdemod p1 [clock] <0|1> [maxError]"); | |
1790 | PrintAndLog(" [set clock as integer] optional, if not set, autodetect."); | |
1791 | PrintAndLog(" <invert>, 1 for invert output"); | |
1792 | PrintAndLog(" [set maximum allowed errors], default = 100."); | |
1793 | PrintAndLog(""); | |
1794 | PrintAndLog(" sample: data rawdemod p1 = demod a psk1 tag from GraphBuffer"); | |
1795 | PrintAndLog(" : data rawdemod p1 32 = demod a psk1 tag from GraphBuffer using a clock of RF/32"); | |
1796 | PrintAndLog(" : data rawdemod p1 32 1 = demod a psk1 tag from GraphBuffer using a clock of RF/32 and inverting data"); | |
1797 | PrintAndLog(" : data rawdemod p1 1 = demod a psk1 tag from GraphBuffer while inverting data"); | |
1798 | PrintAndLog(" : data rawdemod p1 64 1 0 = demod a psk1 tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors"); | |
1799 | return 0; | |
1800 | } | |
1801 | ans = PSKDemod(Cmd, TRUE); | |
1802 | //output | |
1803 | if (!ans){ | |
1804 | if (g_debugMode) PrintAndLog("Error demoding: %d",ans); | |
1805 | return 0; | |
1806 | } | |
7a8a982b | 1807 | |
2767fc02 | 1808 | PrintAndLog("PSK1 demoded bitstream:"); |
e0165dcf | 1809 | // Now output the bitstream to the scrollback by line of 16 bits |
1810 | printDemodBuff(); | |
1811 | return 1; | |
4118b74d | 1812 | } |
1813 | ||
04d2721b | 1814 | // by marshmellow |
19ff0210 | 1815 | // takes same args as cmdpsk1rawdemod |
04d2721b | 1816 | int CmdPSK2rawDemod(const char *Cmd) |
1817 | { | |
e0165dcf | 1818 | int ans=0; |
1819 | char cmdp = param_getchar(Cmd, 0); | |
1820 | if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') { | |
1821 | PrintAndLog("Usage: data rawdemod p2 [clock] <0|1> [maxError]"); | |
1822 | PrintAndLog(" [set clock as integer] optional, if not set, autodetect."); | |
1823 | PrintAndLog(" <invert>, 1 for invert output"); | |
1824 | PrintAndLog(" [set maximum allowed errors], default = 100."); | |
1825 | PrintAndLog(""); | |
1826 | PrintAndLog(" sample: data rawdemod p2 = demod a psk2 tag from GraphBuffer, autodetect clock"); | |
1827 | PrintAndLog(" : data rawdemod p2 32 = demod a psk2 tag from GraphBuffer using a clock of RF/32"); | |
1828 | PrintAndLog(" : data rawdemod p2 32 1 = demod a psk2 tag from GraphBuffer using a clock of RF/32 and inverting output"); | |
1829 | PrintAndLog(" : data rawdemod p2 1 = demod a psk2 tag from GraphBuffer, autodetect clock and invert output"); | |
1830 | PrintAndLog(" : data rawdemod p2 64 1 0 = demod a psk2 tag from GraphBuffer using a clock of RF/64, inverting output and allowing 0 demod errors"); | |
1831 | return 0; | |
1832 | } | |
1833 | ans=PSKDemod(Cmd, TRUE); | |
1834 | if (!ans){ | |
1835 | if (g_debugMode) PrintAndLog("Error demoding: %d",ans); | |
1836 | return 0; | |
1837 | } | |
1838 | psk1TOpsk2(DemodBuffer, DemodBufferLen); | |
1839 | PrintAndLog("PSK2 demoded bitstream:"); | |
1840 | // Now output the bitstream to the scrollback by line of 16 bits | |
1841 | printDemodBuff(); | |
1842 | return 1; | |
04d2721b | 1843 | } |
1844 | ||
19ff0210 | 1845 | // by marshmellow - combines all raw demod functions into one menu command |
1846 | int CmdRawDemod(const char *Cmd) | |
1847 | { | |
1848 | char cmdp = Cmd[0]; //param_getchar(Cmd, 0); | |
1849 | ||
23f0a7d8 | 1850 | if (strlen(Cmd) > 20 || cmdp == 'h' || cmdp == 'H' || strlen(Cmd)<2) { |
19ff0210 | 1851 | PrintAndLog("Usage: data rawdemod [modulation] <help>|<options>"); |
b41534d1 | 1852 | PrintAndLog(" [modulation] as 2 char, 'ab' for ask/biphase, 'am' for ask/manchester, 'ar' for ask/raw, 'fs' for fsk, ..."); |
1853 | PrintAndLog(" 'nr' for nrz/direct, 'p1' for psk1, 'p2' for psk2"); | |
19ff0210 | 1854 | PrintAndLog(" <help> as 'h', prints the help for the specific modulation"); |
1855 | PrintAndLog(" <options> see specific modulation help for optional parameters"); | |
1856 | PrintAndLog(""); | |
1fbf8956 | 1857 | PrintAndLog(" sample: data rawdemod fs h = print help specific to fsk demod"); |
19ff0210 | 1858 | PrintAndLog(" : data rawdemod fs = demod GraphBuffer using: fsk - autodetect"); |
b41534d1 | 1859 | PrintAndLog(" : data rawdemod ab = demod GraphBuffer using: ask/biphase - autodetect"); |
19ff0210 | 1860 | PrintAndLog(" : data rawdemod am = demod GraphBuffer using: ask/manchester - autodetect"); |
1861 | PrintAndLog(" : data rawdemod ar = demod GraphBuffer using: ask/raw - autodetect"); | |
1862 | PrintAndLog(" : data rawdemod nr = demod GraphBuffer using: nrz/direct - autodetect"); | |
1863 | PrintAndLog(" : data rawdemod p1 = demod GraphBuffer using: psk1 - autodetect"); | |
1864 | PrintAndLog(" : data rawdemod p2 = demod GraphBuffer using: psk2 - autodetect"); | |
1865 | return 0; | |
1866 | } | |
1867 | char cmdp2 = Cmd[1]; | |
1868 | int ans = 0; | |
1869 | if (cmdp == 'f' && cmdp2 == 's'){ | |
f8f894a5 | 1870 | ans = CmdFSKrawdemod(Cmd+2); |
b41534d1 | 1871 | } else if(cmdp == 'a' && cmdp2 == 'b'){ |
f8f894a5 | 1872 | ans = Cmdaskbiphdemod(Cmd+2); |
19ff0210 | 1873 | } else if(cmdp == 'a' && cmdp2 == 'm'){ |
f8f894a5 | 1874 | ans = Cmdaskmandemod(Cmd+2); |
19ff0210 | 1875 | } else if(cmdp == 'a' && cmdp2 == 'r'){ |
f8f894a5 | 1876 | ans = Cmdaskrawdemod(Cmd+2); |
19ff0210 | 1877 | } else if(cmdp == 'n' && cmdp2 == 'r'){ |
f8f894a5 | 1878 | ans = CmdNRZrawDemod(Cmd+2); |
19ff0210 | 1879 | } else if(cmdp == 'p' && cmdp2 == '1'){ |
f8f894a5 | 1880 | ans = CmdPSK1rawDemod(Cmd+2); |
19ff0210 | 1881 | } else if(cmdp == 'p' && cmdp2 == '2'){ |
f8f894a5 | 1882 | ans = CmdPSK2rawDemod(Cmd+2); |
19ff0210 | 1883 | } else { |
1884 | PrintAndLog("unknown modulation entered - see help ('h') for parameter structure"); | |
1885 | } | |
1886 | return ans; | |
1887 | } | |
1888 | ||
7fe9b0b7 | 1889 | int CmdGrid(const char *Cmd) |
1890 | { | |
e0165dcf | 1891 | sscanf(Cmd, "%i %i", &PlotGridX, &PlotGridY); |
1892 | PlotGridXdefault= PlotGridX; | |
1893 | PlotGridYdefault= PlotGridY; | |
1894 | RepaintGraphWindow(); | |
1895 | return 0; | |
7fe9b0b7 | 1896 | } |
1897 | ||
1898 | int CmdHexsamples(const char *Cmd) | |
1899 | { | |
e0165dcf | 1900 | int i, j; |
1901 | int requested = 0; | |
1902 | int offset = 0; | |
1903 | char string_buf[25]; | |
1904 | char* string_ptr = string_buf; | |
1905 | uint8_t got[BIGBUF_SIZE]; | |
1906 | ||
1907 | sscanf(Cmd, "%i %i", &requested, &offset); | |
1908 | ||
1909 | /* if no args send something */ | |
1910 | if (requested == 0) { | |
1911 | requested = 8; | |
1912 | } | |
1913 | if (offset + requested > sizeof(got)) { | |
1914 | PrintAndLog("Tried to read past end of buffer, <bytes> + <offset> > %d", BIGBUF_SIZE); | |
1915 | return 0; | |
1916 | } | |
1917 | ||
1918 | GetFromBigBuf(got,requested,offset); | |
1919 | WaitForResponse(CMD_ACK,NULL); | |
1920 | ||
1921 | i = 0; | |
1922 | for (j = 0; j < requested; j++) { | |
1923 | i++; | |
1924 | string_ptr += sprintf(string_ptr, "%02x ", got[j]); | |
1925 | if (i == 8) { | |
1926 | *(string_ptr - 1) = '\0'; // remove the trailing space | |
1927 | PrintAndLog("%s", string_buf); | |
1928 | string_buf[0] = '\0'; | |
1929 | string_ptr = string_buf; | |
1930 | i = 0; | |
1931 | } | |
1932 | if (j == requested - 1 && string_buf[0] != '\0') { // print any remaining bytes | |
1933 | *(string_ptr - 1) = '\0'; | |
1934 | PrintAndLog("%s", string_buf); | |
1935 | string_buf[0] = '\0'; | |
1936 | } | |
1937 | } | |
1938 | return 0; | |
7fe9b0b7 | 1939 | } |
1940 | ||
7fe9b0b7 | 1941 | int CmdHide(const char *Cmd) |
1942 | { | |
e0165dcf | 1943 | HideGraphWindow(); |
1944 | return 0; | |
7fe9b0b7 | 1945 | } |
1946 | ||
78f5b1a7 | 1947 | //zero mean GraphBuffer |
7fe9b0b7 | 1948 | int CmdHpf(const char *Cmd) |
1949 | { | |
e0165dcf | 1950 | int i; |
1951 | int accum = 0; | |
7fe9b0b7 | 1952 | |
e0165dcf | 1953 | for (i = 10; i < GraphTraceLen; ++i) |
1954 | accum += GraphBuffer[i]; | |
1955 | accum /= (GraphTraceLen - 10); | |
1956 | for (i = 0; i < GraphTraceLen; ++i) | |
1957 | GraphBuffer[i] -= accum; | |
7fe9b0b7 | 1958 | |
e0165dcf | 1959 | RepaintGraphWindow(); |
1960 | return 0; | |
7fe9b0b7 | 1961 | } |
f6d9fb17 MHS |
1962 | |
1963 | bool _headBit( BitstreamOut *stream) | |
1964 | { | |
1965 | int bytepos = stream->position >> 3; // divide by 8 | |
1966 | int bitpos = (stream->position++) & 7; // mask out 00000111 | |
1967 | return (*(stream->buffer + bytepos) >> (7-bitpos)) & 1; | |
1968 | } | |
1969 | ||
1970 | uint8_t getByte(uint8_t bits_per_sample, BitstreamOut* b) | |
1971 | { | |
1972 | int i; | |
1973 | uint8_t val = 0; | |
1974 | for(i =0 ; i < bits_per_sample; i++) | |
1975 | { | |
1976 | val |= (_headBit(b) << (7-i)); | |
1977 | } | |
1978 | return val; | |
1979 | } | |
7fe9b0b7 | 1980 | |
1fbf8956 | 1981 | int getSamples(const char *Cmd, bool silent) |
7fe9b0b7 | 1982 | { |
e0165dcf | 1983 | //If we get all but the last byte in bigbuf, |
1984 | // we don't have to worry about remaining trash | |
1985 | // in the last byte in case the bits-per-sample | |
1986 | // does not line up on byte boundaries | |
1987 | ||
1988 | uint8_t got[BIGBUF_SIZE-1] = { 0 }; | |
1989 | ||
1990 | int n = strtol(Cmd, NULL, 0); | |
1991 | ||
52f2df61 | 1992 | if ( n == 0 || n > sizeof(got)) |
e0165dcf | 1993 | n = sizeof(got); |
1994 | ||
1995 | PrintAndLog("Reading %d bytes from device memory\n", n); | |
1996 | GetFromBigBuf(got,n,0); | |
1997 | PrintAndLog("Data fetched"); | |
1998 | UsbCommand response; | |
c188b1b9 | 1999 | if ( !WaitForResponseTimeout(CMD_ACK, &response, 10000) ) { |
2000 | PrintAndLog("timeout while waiting for reply."); | |
2001 | return 1; | |
2002 | } | |
2003 | ||
e0165dcf | 2004 | uint8_t bits_per_sample = 8; |
2005 | ||
2006 | //Old devices without this feature would send 0 at arg[0] | |
2007 | if(response.arg[0] > 0) | |
2008 | { | |
2009 | sample_config *sc = (sample_config *) response.d.asBytes; | |
52f2df61 | 2010 | PrintAndLog("Samples @ %d bits/smpl, decimation 1:%d ", sc->bits_per_sample, sc->decimation); |
e0165dcf | 2011 | bits_per_sample = sc->bits_per_sample; |
2012 | } | |
2013 | if(bits_per_sample < 8) | |
2014 | { | |
2015 | PrintAndLog("Unpacking..."); | |
2016 | BitstreamOut bout = { got, bits_per_sample * n, 0}; | |
2017 | int j =0; | |
e6432f05 | 2018 | for (j = 0; j * bits_per_sample < n * 8 && j < n; j++) { |
e0165dcf | 2019 | uint8_t sample = getByte(bits_per_sample, &bout); |
2020 | GraphBuffer[j] = ((int) sample )- 128; | |
2021 | } | |
2022 | GraphTraceLen = j; | |
2023 | PrintAndLog("Unpacked %d samples" , j ); | |
2024 | }else | |
2025 | { | |
2026 | for (int j = 0; j < n; j++) { | |
2027 | GraphBuffer[j] = ((int)got[j]) - 128; | |
2028 | } | |
2029 | GraphTraceLen = n; | |
2030 | } | |
2031 | ||
2032 | RepaintGraphWindow(); | |
2033 | return 0; | |
1fbf8956 | 2034 | } |
2035 | ||
2036 | int CmdSamples(const char *Cmd) | |
2037 | { | |
e0165dcf | 2038 | return getSamples(Cmd, false); |
7fe9b0b7 | 2039 | } |
2040 | ||
d6a120a2 MHS |
2041 | int CmdTuneSamples(const char *Cmd) |
2042 | { | |
3aa4014b | 2043 | int timeout = 0; |
2044 | printf("\nMeasuring antenna characteristics, please wait..."); | |
ba1a299c | 2045 | |
c188b1b9 | 2046 | UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING, {0,0,0}}; |
2047 | clearCommandBuffer(); | |
3aa4014b | 2048 | SendCommand(&c); |
3aa4014b | 2049 | UsbCommand resp; |
2050 | while(!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING,&resp,1000)) { | |
2051 | timeout++; | |
2052 | printf("."); | |
2053 | if (timeout > 7) { | |
2054 | PrintAndLog("\nNo response from Proxmark. Aborting..."); | |
2055 | return 1; | |
2056 | } | |
2057 | } | |
2058 | ||
2059 | int peakv, peakf; | |
2060 | int vLf125, vLf134, vHf; | |
2061 | vLf125 = resp.arg[0] & 0xffff; | |
2062 | vLf134 = resp.arg[0] >> 16; | |
2063 | vHf = resp.arg[1] & 0xffff;; | |
2064 | peakf = resp.arg[2] & 0xffff; | |
2065 | peakv = resp.arg[2] >> 16; | |
2066 | PrintAndLog(""); | |
2067 | PrintAndLog("# LF antenna: %5.2f V @ 125.00 kHz", vLf125/1000.0); | |
2068 | PrintAndLog("# LF antenna: %5.2f V @ 134.00 kHz", vLf134/1000.0); | |
2069 | PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1)); | |
2070 | PrintAndLog("# HF antenna: %5.2f V @ 13.56 MHz", vHf/1000.0); | |
0d0d0499 | 2071 | |
2767fc02 | 2072 | #define LF_UNUSABLE_V 2948 // was 2000. Changed due to bugfix in voltage measurements. LF results are now 47% higher. |
2073 | #define LF_MARGINAL_V 14739 // was 10000. Changed due to bugfix bug in voltage measurements. LF results are now 47% higher. | |
2074 | #define HF_UNUSABLE_V 3167 // was 2000. Changed due to bugfix in voltage measurements. HF results are now 58% higher. | |
2075 | #define HF_MARGINAL_V 7917 // was 5000. Changed due to bugfix in voltage measurements. HF results are now 58% higher. | |
0d0d0499 | 2076 | |
2077 | if (peakv < LF_UNUSABLE_V) | |
3aa4014b | 2078 | PrintAndLog("# Your LF antenna is unusable."); |
0d0d0499 | 2079 | else if (peakv < LF_MARGINAL_V) |
3aa4014b | 2080 | PrintAndLog("# Your LF antenna is marginal."); |
0d0d0499 | 2081 | if (vHf < HF_UNUSABLE_V) |
3aa4014b | 2082 | PrintAndLog("# Your HF antenna is unusable."); |
0d0d0499 | 2083 | else if (vHf < HF_MARGINAL_V) |
3aa4014b | 2084 | PrintAndLog("# Your HF antenna is marginal."); |
2085 | ||
0d0d0499 | 2086 | if (peakv >= LF_UNUSABLE_V) { |
2087 | for (int i = 0; i < 256; i++) { | |
2088 | GraphBuffer[i] = resp.d.asBytes[i] - 128; | |
2089 | } | |
2090 | PrintAndLog("Displaying LF tuning graph. Divisor 89 is 134khz, 95 is 125khz.\n"); | |
2091 | PrintAndLog("\n"); | |
2092 | GraphTraceLen = 256; | |
2093 | ShowGraphWindow(); | |
abd16c45 | 2094 | RepaintGraphWindow(); |
ba1a299c | 2095 | } |
b4fb11ba | 2096 | return 0; |
d6a120a2 MHS |
2097 | } |
2098 | ||
3aa4014b | 2099 | |
7fe9b0b7 | 2100 | int CmdLoad(const char *Cmd) |
2101 | { | |
e0165dcf | 2102 | char filename[FILE_PATH_SIZE] = {0x00}; |
2103 | int len = 0; | |
b915fda3 | 2104 | |
e0165dcf | 2105 | len = strlen(Cmd); |
2106 | if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE; | |
2107 | memcpy(filename, Cmd, len); | |
b915fda3 | 2108 | |
e0165dcf | 2109 | FILE *f = fopen(filename, "r"); |
2110 | if (!f) { | |
c188b1b9 | 2111 | PrintAndLog("couldn't open '%s'", filename); |
e0165dcf | 2112 | return 0; |
2113 | } | |
2114 | ||
2115 | GraphTraceLen = 0; | |
2116 | char line[80]; | |
2117 | while (fgets(line, sizeof (line), f)) { | |
2118 | GraphBuffer[GraphTraceLen] = atoi(line); | |
2119 | GraphTraceLen++; | |
2120 | } | |
2121 | fclose(f); | |
2122 | PrintAndLog("loaded %d samples", GraphTraceLen); | |
2123 | RepaintGraphWindow(); | |
2124 | return 0; | |
7fe9b0b7 | 2125 | } |
2126 | ||
2127 | int CmdLtrim(const char *Cmd) | |
2128 | { | |
e0165dcf | 2129 | int ds = atoi(Cmd); |
c188b1b9 | 2130 | |
2131 | if (GraphTraceLen <= 0) return 0; | |
2132 | ||
e0165dcf | 2133 | for (int i = ds; i < GraphTraceLen; ++i) |
2134 | GraphBuffer[i-ds] = GraphBuffer[i]; | |
7fe9b0b7 | 2135 | |
c188b1b9 | 2136 | GraphTraceLen -= ds; |
e0165dcf | 2137 | RepaintGraphWindow(); |
2138 | return 0; | |
7fe9b0b7 | 2139 | } |
ec75f5c1 | 2140 | |
2141 | // trim graph to input argument length | |
9ec1416a | 2142 | int CmdRtrim(const char *Cmd) |
2143 | { | |
e0165dcf | 2144 | int ds = atoi(Cmd); |
e0165dcf | 2145 | GraphTraceLen = ds; |
e0165dcf | 2146 | RepaintGraphWindow(); |
2147 | return 0; | |
9ec1416a | 2148 | } |
7fe9b0b7 | 2149 | |
7fe9b0b7 | 2150 | int CmdNorm(const char *Cmd) |
2151 | { | |
e0165dcf | 2152 | int i; |
2153 | int max = INT_MIN, min = INT_MAX; | |
7fe9b0b7 | 2154 | |
e0165dcf | 2155 | for (i = 10; i < GraphTraceLen; ++i) { |
2156 | if (GraphBuffer[i] > max) | |
2157 | max = GraphBuffer[i]; | |
2158 | if (GraphBuffer[i] < min) | |
2159 | min = GraphBuffer[i]; | |
2160 | } | |
7fe9b0b7 | 2161 | |
e0165dcf | 2162 | if (max != min) { |
2163 | for (i = 0; i < GraphTraceLen; ++i) { | |
ba1a299c | 2164 | GraphBuffer[i] = (GraphBuffer[i] - ((max + min) / 2)) * 256 / |
e0165dcf | 2165 | (max - min); |
ba1a299c | 2166 | //marshmelow: adjusted *1000 to *256 to make +/- 128 so demod commands still work |
e0165dcf | 2167 | } |
2168 | } | |
2169 | RepaintGraphWindow(); | |
2170 | return 0; | |
7fe9b0b7 | 2171 | } |
2172 | ||
2173 | int CmdPlot(const char *Cmd) | |
2174 | { | |
e0165dcf | 2175 | ShowGraphWindow(); |
2176 | return 0; | |
7fe9b0b7 | 2177 | } |
2178 | ||
2179 | int CmdSave(const char *Cmd) | |
2180 | { | |
e0165dcf | 2181 | char filename[FILE_PATH_SIZE] = {0x00}; |
2182 | int len = 0; | |
b915fda3 | 2183 | |
e0165dcf | 2184 | len = strlen(Cmd); |
2185 | if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE; | |
2186 | memcpy(filename, Cmd, len); | |
2187 | ||
b915fda3 | 2188 | |
e0165dcf | 2189 | FILE *f = fopen(filename, "w"); |
2190 | if(!f) { | |
2191 | PrintAndLog("couldn't open '%s'", filename); | |
2192 | return 0; | |
2193 | } | |
2194 | int i; | |
2195 | for (i = 0; i < GraphTraceLen; i++) { | |
2196 | fprintf(f, "%d\n", GraphBuffer[i]); | |
2197 | } | |
2198 | fclose(f); | |
2199 | PrintAndLog("saved to '%s'", Cmd); | |
2200 | return 0; | |
7fe9b0b7 | 2201 | } |
2202 | ||
2203 | int CmdScale(const char *Cmd) | |
2204 | { | |
e0165dcf | 2205 | CursorScaleFactor = atoi(Cmd); |
2206 | if (CursorScaleFactor == 0) { | |
2207 | PrintAndLog("bad, can't have zero scale"); | |
2208 | CursorScaleFactor = 1; | |
2209 | } | |
2210 | RepaintGraphWindow(); | |
2211 | return 0; | |
7fe9b0b7 | 2212 | } |
2213 | ||
d51b2eda MHS |
2214 | int CmdDirectionalThreshold(const char *Cmd) |
2215 | { | |
e0165dcf | 2216 | int8_t upThres = param_get8(Cmd, 0); |
2217 | int8_t downThres = param_get8(Cmd, 1); | |
2218 | ||
2219 | printf("Applying Up Threshold: %d, Down Threshold: %d\n", upThres, downThres); | |
2220 | ||
2221 | int lastValue = GraphBuffer[0]; | |
2222 | GraphBuffer[0] = 0; // Will be changed at the end, but init 0 as we adjust to last samples value if no threshold kicks in. | |
2223 | ||
2224 | for (int i = 1; i < GraphTraceLen; ++i) { | |
2225 | // Apply first threshold to samples heading up | |
2226 | if (GraphBuffer[i] >= upThres && GraphBuffer[i] > lastValue) | |
2227 | { | |
2228 | lastValue = GraphBuffer[i]; // Buffer last value as we overwrite it. | |
2229 | GraphBuffer[i] = 1; | |
2230 | } | |
2231 | // Apply second threshold to samples heading down | |
2232 | else if (GraphBuffer[i] <= downThres && GraphBuffer[i] < lastValue) | |
2233 | { | |
2234 | lastValue = GraphBuffer[i]; // Buffer last value as we overwrite it. | |
2235 | GraphBuffer[i] = -1; | |
2236 | } | |
2237 | else | |
2238 | { | |
2239 | lastValue = GraphBuffer[i]; // Buffer last value as we overwrite it. | |
2240 | GraphBuffer[i] = GraphBuffer[i-1]; | |
2241 | ||
2242 | } | |
2243 | } | |
2244 | GraphBuffer[0] = GraphBuffer[1]; // Aline with first edited sample. | |
2245 | RepaintGraphWindow(); | |
2246 | return 0; | |
d51b2eda MHS |
2247 | } |
2248 | ||
7fe9b0b7 | 2249 | int CmdZerocrossings(const char *Cmd) |
2250 | { | |
e0165dcf | 2251 | // Zero-crossings aren't meaningful unless the signal is zero-mean. |
2252 | CmdHpf(""); | |
2253 | ||
2254 | int sign = 1; | |
2255 | int zc = 0; | |
2256 | int lastZc = 0; | |
2257 | ||
2258 | for (int i = 0; i < GraphTraceLen; ++i) { | |
2259 | if (GraphBuffer[i] * sign >= 0) { | |
2260 | // No change in sign, reproduce the previous sample count. | |
2261 | zc++; | |
2262 | GraphBuffer[i] = lastZc; | |
2263 | } else { | |
2264 | // Change in sign, reset the sample count. | |
2265 | sign = -sign; | |
2266 | GraphBuffer[i] = lastZc; | |
2267 | if (sign > 0) { | |
2268 | lastZc = zc; | |
2269 | zc = 0; | |
2270 | } | |
2271 | } | |
2272 | } | |
2273 | ||
2274 | RepaintGraphWindow(); | |
2275 | return 0; | |
7fe9b0b7 | 2276 | } |
2277 | ||
0de8e387 | 2278 | int usage_data_bin2hex(){ |
2279 | PrintAndLog("Usage: data bin2hex <binary_digits>"); | |
2280 | PrintAndLog(" This function will ignore all characters not 1 or 0 (but stop reading on whitespace)"); | |
2281 | return 0; | |
2282 | } | |
2283 | ||
2284 | /** | |
2285 | * @brief Utility for conversion via cmdline. | |
2286 | * @param Cmd | |
2287 | * @return | |
2288 | */ | |
2289 | int Cmdbin2hex(const char *Cmd) | |
2290 | { | |
2291 | int bg =0, en =0; | |
2292 | if(param_getptr(Cmd, &bg, &en, 0)) | |
2293 | { | |
2294 | return usage_data_bin2hex(); | |
2295 | } | |
2296 | //Number of digits supplied as argument | |
2297 | size_t length = en - bg +1; | |
2298 | size_t bytelen = (length+7) / 8; | |
2299 | uint8_t* arr = (uint8_t *) malloc(bytelen); | |
2300 | memset(arr, 0, bytelen); | |
2301 | BitstreamOut bout = { arr, 0, 0 }; | |
2302 | ||
2303 | for(; bg <= en ;bg++) | |
2304 | { | |
2305 | char c = Cmd[bg]; | |
2306 | if( c == '1') pushBit(&bout, 1); | |
2307 | else if( c == '0') pushBit(&bout, 0); | |
2308 | else PrintAndLog("Ignoring '%c'", c); | |
2309 | } | |
2310 | ||
2311 | if(bout.numbits % 8 != 0) | |
2312 | { | |
2313 | printf("[padded with %d zeroes]\n", 8-(bout.numbits % 8)); | |
2314 | } | |
2315 | ||
2316 | //Uses printf instead of PrintAndLog since the latter | |
2317 | // adds linebreaks to each printout - this way was more convenient since we don't have to | |
2318 | // allocate a string and write to that first... | |
2319 | for(size_t x = 0; x < bytelen ; x++) | |
2320 | { | |
2321 | printf("%02X", arr[x]); | |
2322 | } | |
2323 | printf("\n"); | |
2324 | free(arr); | |
2325 | return 0; | |
2326 | } | |
2327 | ||
2328 | int usage_data_hex2bin(){ | |
f4d0ffd1 | 2329 | PrintAndLog("Usage: data hex2bin <hex_digits>"); |
0de8e387 | 2330 | PrintAndLog(" This function will ignore all non-hexadecimal characters (but stop reading on whitespace)"); |
2331 | return 0; | |
0de8e387 | 2332 | } |
2333 | ||
2334 | int Cmdhex2bin(const char *Cmd) | |
2335 | { | |
2336 | int bg =0, en =0; | |
f4d0ffd1 | 2337 | if(param_getptr(Cmd, &bg, &en, 0)) return usage_data_hex2bin(); |
0de8e387 | 2338 | |
2339 | while(bg <= en ) | |
2340 | { | |
2341 | char x = Cmd[bg++]; | |
2342 | // capitalize | |
2343 | if (x >= 'a' && x <= 'f') | |
2344 | x -= 32; | |
2345 | // convert to numeric value | |
2346 | if (x >= '0' && x <= '9') | |
2347 | x -= '0'; | |
2348 | else if (x >= 'A' && x <= 'F') | |
2349 | x -= 'A' - 10; | |
2350 | else | |
2351 | continue; | |
2352 | ||
2353 | //Uses printf instead of PrintAndLog since the latter | |
2354 | // adds linebreaks to each printout - this way was more convenient since we don't have to | |
2355 | // allocate a string and write to that first... | |
2356 | ||
2357 | for(int i= 0 ; i < 4 ; ++i) | |
2358 | printf("%d",(x >> (3 - i)) & 1); | |
2359 | } | |
2360 | printf("\n"); | |
2361 | ||
2362 | return 0; | |
2363 | } | |
2364 | ||
ba1a299c | 2365 | static command_t CommandTable[] = |
7fe9b0b7 | 2366 | { |
e0165dcf | 2367 | {"help", CmdHelp, 1, "This help"}, |
49bbc60a | 2368 | {"askedgedetect", CmdAskEdgeDetect, 1, "[threshold] Adjust Graph for manual ask demod using the length of sample differences to detect the edge of a wave (use 20-45, def:25)"}, |
e0165dcf | 2369 | {"askem410xdemod", CmdAskEM410xDemod, 1, "[clock] [invert<0|1>] [maxErr] -- Demodulate an EM410x tag from GraphBuffer (args optional)"}, |
2370 | {"askgproxiidemod", CmdG_Prox_II_Demod, 1, "Demodulate a G Prox II tag from GraphBuffer"}, | |
70459879 | 2371 | {"askvikingdemod", CmdVikingDemod, 1, "Demodulate a Viking AM tag from GraphBuffer"}, |
e0165dcf | 2372 | {"autocorr", CmdAutoCorr, 1, "[window length] [g] -- Autocorrelation over window - g to save back to GraphBuffer (overwrite)"}, |
fef74fdc | 2373 | {"biphaserawdecode",CmdBiphaseDecodeRaw,1, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"}, |
0de8e387 | 2374 | {"bin2hex", Cmdbin2hex, 1, "bin2hex <digits> -- Converts binary to hexadecimal"}, |
e0165dcf | 2375 | {"bitsamples", CmdBitsamples, 0, "Get raw samples as bitstring"}, |
e0165dcf | 2376 | {"buffclear", CmdBuffClear, 1, "Clear sample buffer and graph window"}, |
2377 | {"dec", CmdDec, 1, "Decimate samples"}, | |
2378 | {"detectclock", CmdDetectClockRate, 1, "[modulation] Detect clock rate of wave in GraphBuffer (options: 'a','f','n','p' for ask, fsk, nrz, psk respectively)"}, | |
ad6219fc | 2379 | {"fdxbdemod", CmdFDXBdemodBI , 1, "Demodulate a FDX-B ISO11784/85 Biphase tag from GraphBuffer"}, |
e0165dcf | 2380 | {"fskawiddemod", CmdFSKdemodAWID, 1, "Demodulate an AWID FSK tag from GraphBuffer"}, |
2381 | //{"fskfcdetect", CmdFSKfcDetect, 1, "Try to detect the Field Clock of an FSK wave"}, | |
2382 | {"fskhiddemod", CmdFSKdemodHID, 1, "Demodulate a HID FSK tag from GraphBuffer"}, | |
2383 | {"fskiodemod", CmdFSKdemodIO, 1, "Demodulate an IO Prox FSK tag from GraphBuffer"}, | |
2384 | {"fskpyramiddemod", CmdFSKdemodPyramid, 1, "Demodulate a Pyramid FSK tag from GraphBuffer"}, | |
2385 | {"fskparadoxdemod", CmdFSKdemodParadox, 1, "Demodulate a Paradox FSK tag from GraphBuffer"}, | |
2386 | {"getbitstream", CmdGetBitStream, 1, "Convert GraphBuffer's >=1 values to 1 and <1 to 0"}, | |
2387 | {"grid", CmdGrid, 1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"}, | |
2388 | {"hexsamples", CmdHexsamples, 0, "<bytes> [<offset>] -- Dump big buffer as hex bytes"}, | |
0de8e387 | 2389 | {"hex2bin", Cmdhex2bin, 1, "hex2bin <hexadecimal> -- Converts hexadecimal to binary"}, |
e0165dcf | 2390 | {"hide", CmdHide, 1, "Hide graph window"}, |
2391 | {"hpf", CmdHpf, 1, "Remove DC offset from trace"}, | |
2392 | {"load", CmdLoad, 1, "<filename> -- Load trace (to graph window"}, | |
2393 | {"ltrim", CmdLtrim, 1, "<samples> -- Trim samples from left of trace"}, | |
2394 | {"rtrim", CmdRtrim, 1, "<location to end trace> -- Trim samples from right of trace"}, | |
fef74fdc | 2395 | {"manrawdecode", Cmdmandecoderaw, 1, "[invert] [maxErr] -- Manchester decode binary stream in DemodBuffer"}, |
e0165dcf | 2396 | {"norm", CmdNorm, 1, "Normalize max/min to +/-128"}, |
2397 | {"plot", CmdPlot, 1, "Show graph window (hit 'h' in window for keystroke help)"}, | |
bf32dd92 | 2398 | {"printdemodbuffer",CmdPrintDemodBuff, 1, "[x] [o] <offset> [l] <length> -- print the data in the DemodBuffer - 'x' for hex output"}, |
e0165dcf | 2399 | {"pskindalademod", CmdIndalaDecode, 1, "[clock] [invert<0|1>] -- Demodulate an indala tag (PSK1) from GraphBuffer (args optional)"}, |
411105e0 | 2400 | {"psknexwatchdemod",CmdPSKNexWatch, 1, "Demodulate a NexWatch tag (nexkey, quadrakey) (PSK1) from GraphBuffer"}, |
e0165dcf | 2401 | {"rawdemod", CmdRawDemod, 1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"}, |
2402 | {"samples", CmdSamples, 0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"}, | |
2403 | {"save", CmdSave, 1, "<filename> -- Save trace (from graph window)"}, | |
2404 | {"scale", CmdScale, 1, "<int> -- Set cursor display scale"}, | |
a126332a | 2405 | {"setdebugmode", CmdSetDebugMode, 1, "<0|1|2> -- Turn on or off Debugging Level for lf demods"}, |
e0165dcf | 2406 | {"shiftgraphzero", CmdGraphShiftZero, 1, "<shift> -- Shift 0 for Graphed wave + or - shift value"}, |
e0165dcf | 2407 | {"dirthreshold", CmdDirectionalThreshold, 1, "<thres up> <thres down> -- Max rising higher up-thres/ Min falling lower down-thres, keep rest as prev."}, |
2408 | {"tune", CmdTuneSamples, 0, "Get hw tune samples for graph window"}, | |
2409 | {"undec", CmdUndec, 1, "Un-decimate samples by 2"}, | |
2410 | {"zerocrossings", CmdZerocrossings, 1, "Count time between zero-crossings"}, | |
2411 | {NULL, NULL, 0, NULL} | |
7fe9b0b7 | 2412 | }; |
2413 | ||
2414 | int CmdData(const char *Cmd) | |
2415 | { | |
e0165dcf | 2416 | CmdsParse(CommandTable, Cmd); |
2417 | return 0; | |
7fe9b0b7 | 2418 | } |
2419 | ||
2420 | int CmdHelp(const char *Cmd) | |
2421 | { | |
e0165dcf | 2422 | CmdsHelp(CommandTable); |
2423 | return 0; | |
7fe9b0b7 | 2424 | } |