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