]>
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 | ||
6923d3f1 | 11 | #include <stdio.h> // also included in util.h |
12 | #include <string.h> // also included in util.h | |
43534cba | 13 | #include <inttypes.h> |
6923d3f1 | 14 | #include <limits.h> // for CmdNorm INT_MIN && INT_MAX |
15 | #include "data.h" // also included in util.h | |
16 | #include "cmddata.h" | |
d51b2eda | 17 | #include "util.h" |
7fe9b0b7 | 18 | #include "cmdmain.h" |
6923d3f1 | 19 | #include "proxmark3.h" |
20 | #include "ui.h" // for show graph controls | |
21 | #include "graph.h" // for graph data | |
22 | #include "cmdparser.h"// already included in cmdmain.h | |
23 | #include "usb_cmd.h" // already included in cmdmain.h and proxmark3.h | |
24 | #include "lfdemod.h" // for demod code | |
25 | #include "crc.h" // for pyramid checksum maxim | |
26 | #include "crc16.h" // for FDXB demod checksum | |
27 | #include "loclass/cipherutils.h" // for decimating samples in getsamples | |
35aa230e | 28 | #include "cmdlfem4x.h"// for em410x demod |
31abe49f | 29 | |
4118b74d | 30 | uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN]; |
b362de62 | 31 | uint8_t g_debugMode=0; |
32 | size_t DemodBufferLen=0; | |
cb86f8d6 | 33 | //size_t g_demodStartIdx=0; |
34 | //uint8_t g_demodClock=0; | |
127f1490 | 35 | |
7fe9b0b7 | 36 | static int CmdHelp(const char *Cmd); |
37 | ||
4118b74d | 38 | //set the demod buffer with given array of binary (one bit per byte) |
39 | //by marshmellow | |
ec75f5c1 | 40 | void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx) |
4118b74d | 41 | { |
13d77ef9 | 42 | if (buff == NULL) |
43 | return; | |
44 | ||
45 | if ( size >= MAX_DEMOD_BUF_LEN) | |
46 | size = MAX_DEMOD_BUF_LEN; | |
47 | ||
ec75f5c1 | 48 | size_t i = 0; |
8e2e6c8e | 49 | for (; i < size; i++){ |
ec75f5c1 | 50 | DemodBuffer[i]=buff[startIdx++]; |
ba1a299c | 51 | } |
52 | DemodBufferLen=size; | |
53 | return; | |
4118b74d | 54 | } |
55 | ||
ec75f5c1 | 56 | int CmdSetDebugMode(const char *Cmd) |
57 | { | |
e0165dcf | 58 | int demod=0; |
59 | sscanf(Cmd, "%i", &demod); | |
60 | g_debugMode=(uint8_t)demod; | |
61 | return 1; | |
ec75f5c1 | 62 | } |
63 | ||
979bba37 | 64 | int usage_data_printdemodbuf(){ |
ace26dbd | 65 | PrintAndLog("Usage: data printdemodbuffer x o <offset> l <length>"); |
979bba37 | 66 | PrintAndLog("Options: "); |
67 | PrintAndLog(" h This help"); | |
68 | PrintAndLog(" x output in hex (omit for binary output)"); | |
69 | PrintAndLog(" o <offset> enter offset in # of bits"); | |
ace26dbd | 70 | PrintAndLog(" l <length> enter length to print in # of bits or hex characters respectively"); |
979bba37 | 71 | return 0; |
72 | } | |
73 | ||
4118b74d | 74 | //by marshmellow |
abd6112f | 75 | void printDemodBuff(void) |
4118b74d | 76 | { |
ba1a299c | 77 | int bitLen = DemodBufferLen; |
2767fc02 | 78 | if (bitLen<1) { |
ba1a299c | 79 | PrintAndLog("no bits found in demod buffer"); |
80 | return; | |
81 | } | |
82 | if (bitLen>512) bitLen=512; //max output to 512 bits if we have more - should be plenty | |
e0165dcf | 83 | |
2767fc02 | 84 | char *bin = sprint_bin_break(DemodBuffer,bitLen,16); |
85 | PrintAndLog("%s",bin); | |
86 | ||
ba1a299c | 87 | return; |
4118b74d | 88 | } |
89 | ||
8d960002 | 90 | int CmdPrintDemodBuff(const char *Cmd) |
91 | { | |
979bba37 | 92 | char hex[512]={0x00}; |
93 | bool hexMode = false; | |
94 | bool errors = false; | |
ace26dbd | 95 | uint32_t offset = 0; //could be size_t but no param_get16... |
96 | uint32_t length = 512; | |
979bba37 | 97 | char cmdp = 0; |
98 | while(param_getchar(Cmd, cmdp) != 0x00) | |
99 | { | |
100 | switch(param_getchar(Cmd, cmdp)) | |
101 | { | |
102 | case 'h': | |
103 | case 'H': | |
104 | return usage_data_printdemodbuf(); | |
105 | case 'x': | |
106 | case 'X': | |
107 | hexMode = true; | |
108 | cmdp++; | |
109 | break; | |
110 | case 'o': | |
111 | case 'O': | |
ace26dbd | 112 | offset = param_get32ex(Cmd, cmdp+1, 0, 10); |
979bba37 | 113 | if (!offset) errors = true; |
114 | cmdp += 2; | |
115 | break; | |
ace26dbd | 116 | case 'l': |
117 | case 'L': | |
118 | length = param_get32ex(Cmd, cmdp+1, 512, 10); | |
119 | if (!length) errors = true; | |
120 | cmdp += 2; | |
121 | break; | |
979bba37 | 122 | default: |
123 | PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp)); | |
124 | errors = true; | |
125 | break; | |
126 | } | |
127 | if(errors) break; | |
e0165dcf | 128 | } |
979bba37 | 129 | //Validations |
130 | if(errors) return usage_data_printdemodbuf(); | |
ace26dbd | 131 | length = (length > (DemodBufferLen-offset)) ? DemodBufferLen-offset : length; |
132 | int numBits = (length) & 0x00FFC; //make sure we don't exceed our string | |
979bba37 | 133 | |
134 | if (hexMode){ | |
185e038c | 135 | char *buf = (char *) (DemodBuffer + offset); |
ace26dbd | 136 | numBits = (numBits > sizeof(hex)) ? sizeof(hex) : numBits; |
979bba37 | 137 | numBits = binarraytohex(hex, buf, numBits); |
e0165dcf | 138 | if (numBits==0) return 0; |
979bba37 | 139 | PrintAndLog("DemodBuffer: %s",hex); |
e0165dcf | 140 | } else { |
709665b5 | 141 | PrintAndLog("DemodBuffer:\n%s", sprint_bin_break(DemodBuffer+offset,numBits,16)); |
e0165dcf | 142 | } |
143 | return 1; | |
8d960002 | 144 | } |
7fe9b0b7 | 145 | |
2767fc02 | 146 | //by marshmellow |
78f5b1a7 | 147 | //this function strictly converts >1 to 1 and <1 to 0 for each sample in the graphbuffer |
148 | int CmdGetBitStream(const char *Cmd) | |
149 | { | |
e0165dcf | 150 | int i; |
151 | CmdHpf(Cmd); | |
152 | for (i = 0; i < GraphTraceLen; i++) { | |
153 | if (GraphBuffer[i] >= 1) { | |
154 | GraphBuffer[i] = 1; | |
155 | } else { | |
156 | GraphBuffer[i] = 0; | |
157 | } | |
158 | } | |
159 | RepaintGraphWindow(); | |
160 | return 0; | |
78f5b1a7 | 161 | } |
162 | ||
fef74fdc | 163 | //by marshmellow |
164 | //Cmd Args: Clock, invert, maxErr, maxLen as integers and amplify as char == 'a' | |
165 | // (amp may not be needed anymore) | |
166 | //verbose will print results and demoding messages | |
167 | //emSearch will auto search for EM410x format in bitstream | |
168 | //askType switches decode: ask/raw = 0, ask/manchester = 1 | |
d1869c33 | 169 | int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType, bool *stCheck) { |
e0165dcf | 170 | int invert=0; |
171 | int clk=0; | |
172 | int maxErr=100; | |
fef74fdc | 173 | int maxLen=0; |
01d0f8ae | 174 | uint8_t askamp = 0; |
fef74fdc | 175 | char amp = param_getchar(Cmd, 0); |
e0165dcf | 176 | uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; |
fef74fdc | 177 | sscanf(Cmd, "%i %i %i %i %c", &clk, &invert, &maxErr, &maxLen, &); |
ace26dbd | 178 | if (!maxLen) maxLen = BIGBUF_SIZE; |
e0165dcf | 179 | if (invert != 0 && invert != 1) { |
180 | PrintAndLog("Invalid argument: %s", Cmd); | |
181 | return 0; | |
182 | } | |
183 | if (clk==1){ | |
184 | invert=1; | |
185 | clk=0; | |
186 | } | |
187 | size_t BitLen = getFromGraphBuf(BitStream); | |
2767fc02 | 188 | if (g_debugMode) PrintAndLog("DEBUG: Bitlen from grphbuff: %d",BitLen); |
d1869c33 | 189 | if (BitLen < 255) return 0; |
190 | if (maxLen < BitLen && maxLen != 0) BitLen = maxLen; | |
191 | int foundclk = 0; | |
01d0f8ae | 192 | //amp before ST check |
193 | if (amp == 'a' || amp == 'A') { | |
194 | askAmp(BitStream, BitLen); | |
195 | } | |
d1869c33 | 196 | bool st = false; |
ab812dfa | 197 | size_t ststart = 0, stend = 0; |
198 | if (*stCheck) st = DetectST_ext(BitStream, &BitLen, &foundclk, &ststart, &stend); | |
d1869c33 | 199 | if (st) { |
200 | *stCheck = st; | |
201 | clk = (clk == 0) ? foundclk : clk; | |
ab812dfa | 202 | CursorCPos = ststart; |
203 | CursorDPos = stend; | |
f75b313b | 204 | if (verbose || g_debugMode) PrintAndLog("\nFound Sequence Terminator - First one is shown by orange and blue graph markers"); |
d1869c33 | 205 | } |
01d0f8ae | 206 | int errCnt = askdemod(BitStream, &BitLen, &clk, &invert, maxErr, askamp, askType); |
fef74fdc | 207 | if (errCnt<0 || BitLen<16){ //if fatal error (or -1) |
2767fc02 | 208 | if (g_debugMode) PrintAndLog("DEBUG: no data found %d, errors:%d, bitlen:%d, clock:%d",errCnt,invert,BitLen,clk); |
e0165dcf | 209 | return 0; |
210 | } | |
d1869c33 | 211 | if (errCnt > maxErr){ |
2767fc02 | 212 | if (g_debugMode) PrintAndLog("DEBUG: Too many errors found, errors:%d, bits:%d, clock:%d",errCnt, BitLen, clk); |
213 | return 0; | |
214 | } | |
215 | if (verbose || g_debugMode) PrintAndLog("\nUsing Clock:%d, Invert:%d, Bits Found:%d",clk,invert,BitLen); | |
e0165dcf | 216 | |
217 | //output | |
e0165dcf | 218 | setDemodBuf(BitStream,BitLen,0); |
fef74fdc | 219 | if (verbose || g_debugMode){ |
220 | if (errCnt>0) PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt); | |
8e2e6c8e | 221 | if (askType) PrintAndLog("ASK/Manchester - Clock: %d - Decoded bitstream:",clk); |
222 | else PrintAndLog("ASK/Raw - Clock: %d - Decoded bitstream:",clk); | |
fef74fdc | 223 | // Now output the bitstream to the scrollback by line of 16 bits |
224 | printDemodBuff(); | |
225 | ||
226 | } | |
227 | uint64_t lo = 0; | |
228 | uint32_t hi = 0; | |
e0165dcf | 229 | if (emSearch){ |
fef74fdc | 230 | AskEm410xDecode(true, &hi, &lo); |
e0165dcf | 231 | } |
232 | return 1; | |
eb191de6 | 233 | } |
d1869c33 | 234 | int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) { |
235 | bool st = false; | |
236 | return ASKDemod_ext(Cmd, verbose, emSearch, askType, &st); | |
237 | } | |
eb191de6 | 238 | |
4ac906d1 | 239 | //by marshmellow |
fef74fdc | 240 | //takes 5 arguments - clock, invert, maxErr, maxLen as integers and amplify as char == 'a' |
4ac906d1 | 241 | //attempts to demodulate ask while decoding manchester |
242 | //prints binary found and saves in graphbuffer for further commands | |
243 | int Cmdaskmandemod(const char *Cmd) | |
244 | { | |
e0165dcf | 245 | char cmdp = param_getchar(Cmd, 0); |
01d0f8ae | 246 | if (strlen(Cmd) > 45 || cmdp == 'h' || cmdp == 'H') { |
d1869c33 | 247 | PrintAndLog("Usage: data rawdemod am <s> [clock] <invert> [maxError] [maxLen] [amplify]"); |
248 | PrintAndLog(" ['s'] optional, check for Sequence Terminator"); | |
fef74fdc | 249 | PrintAndLog(" [set clock as integer] optional, if not set, autodetect"); |
250 | PrintAndLog(" <invert>, 1 to invert output"); | |
251 | PrintAndLog(" [set maximum allowed errors], default = 100"); | |
252 | PrintAndLog(" [set maximum Samples to read], default = 32768 (512 bits at rf/64)"); | |
253 | PrintAndLog(" <amplify>, 'a' to attempt demod with ask amplification, default = no amp"); | |
e0165dcf | 254 | PrintAndLog(""); |
255 | PrintAndLog(" sample: data rawdemod am = demod an ask/manchester tag from GraphBuffer"); | |
256 | PrintAndLog(" : data rawdemod am 32 = demod an ask/manchester tag from GraphBuffer using a clock of RF/32"); | |
257 | PrintAndLog(" : data rawdemod am 32 1 = demod an ask/manchester tag from GraphBuffer using a clock of RF/32 and inverting data"); | |
258 | PrintAndLog(" : data rawdemod am 1 = demod an ask/manchester tag from GraphBuffer while inverting data"); | |
259 | 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"); | |
260 | return 0; | |
261 | } | |
7cb8516c | 262 | bool st = true; |
d1869c33 | 263 | if (Cmd[0]=='s') |
7cb8516c | 264 | return ASKDemod_ext(Cmd++, true, true, 1, &st); |
d1869c33 | 265 | else if (Cmd[1] == 's') |
7cb8516c | 266 | return ASKDemod_ext(Cmd+=2, true, true, 1, &st); |
d1869c33 | 267 | else |
7cb8516c | 268 | return ASKDemod(Cmd, true, true, 1); |
4ac906d1 | 269 | } |
270 | ||
eb191de6 | 271 | //by marshmellow |
d5a72d2f | 272 | //manchester decode |
eb191de6 | 273 | //stricktly take 10 and 01 and convert to 0 and 1 |
274 | int Cmdmandecoderaw(const char *Cmd) | |
275 | { | |
e0165dcf | 276 | int i =0; |
277 | int errCnt=0; | |
278 | size_t size=0; | |
fef74fdc | 279 | int invert=0; |
6ac4cb27 | 280 | int maxErr = 20; |
e0165dcf | 281 | char cmdp = param_getchar(Cmd, 0); |
1f918317 | 282 | if (strlen(Cmd) > 5 || cmdp == 'h' || cmdp == 'H') { |
fef74fdc | 283 | PrintAndLog("Usage: data manrawdecode [invert] [maxErr]"); |
e0165dcf | 284 | PrintAndLog(" Takes 10 and 01 and converts to 0 and 1 respectively"); |
285 | PrintAndLog(" --must have binary sequence in demodbuffer (run data askrawdemod first)"); | |
fef74fdc | 286 | PrintAndLog(" [invert] invert output"); |
1f918317 | 287 | PrintAndLog(" [maxErr] set number of errors allowed (default = 20)"); |
e0165dcf | 288 | PrintAndLog(""); |
289 | PrintAndLog(" sample: data manrawdecode = decode manchester bitstream from the demodbuffer"); | |
290 | return 0; | |
291 | } | |
292 | if (DemodBufferLen==0) return 0; | |
293 | uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; | |
294 | int high=0,low=0; | |
295 | for (;i<DemodBufferLen;++i){ | |
296 | if (DemodBuffer[i]>high) high=DemodBuffer[i]; | |
297 | else if(DemodBuffer[i]<low) low=DemodBuffer[i]; | |
298 | BitStream[i]=DemodBuffer[i]; | |
299 | } | |
1f918317 | 300 | if (high>7 || low <0 ){ |
2767fc02 | 301 | PrintAndLog("Error: please raw demod the wave first then manchester raw decode"); |
e0165dcf | 302 | return 0; |
303 | } | |
1f918317 | 304 | |
fef74fdc | 305 | sscanf(Cmd, "%i %i", &invert, &maxErr); |
e0165dcf | 306 | size=i; |
127f1490 | 307 | uint8_t alignPos = 0; |
308 | errCnt=manrawdecode(BitStream, &size, invert, &alignPos); | |
e0165dcf | 309 | if (errCnt>=maxErr){ |
310 | PrintAndLog("Too many errors: %d",errCnt); | |
311 | return 0; | |
312 | } | |
313 | PrintAndLog("Manchester Decoded - # errors:%d - data:",errCnt); | |
2767fc02 | 314 | PrintAndLog("%s", sprint_bin_break(BitStream, size, 16)); |
e0165dcf | 315 | if (errCnt==0){ |
316 | uint64_t id = 0; | |
317 | uint32_t hi = 0; | |
318 | size_t idx=0; | |
319 | if (Em410xDecode(BitStream, &size, &idx, &hi, &id)){ | |
320 | //need to adjust to set bitstream back to manchester encoded data | |
321 | //setDemodBuf(BitStream, size, idx); | |
322 | ||
323 | printEM410x(hi, id); | |
324 | } | |
325 | } | |
326 | return 1; | |
d5a72d2f | 327 | } |
328 | ||
329 | //by marshmellow | |
330 | //biphase decode | |
331 | //take 01 or 10 = 0 and 11 or 00 = 1 | |
1e090a61 | 332 | //takes 2 arguments "offset" default = 0 if 1 it will shift the decode by one bit |
333 | // and "invert" default = 0 if 1 it will invert output | |
2767fc02 | 334 | // the argument offset allows us to manually shift if the output is incorrect - [EDIT: now auto detects] |
d5a72d2f | 335 | int CmdBiphaseDecodeRaw(const char *Cmd) |
336 | { | |
ba1a299c | 337 | size_t size=0; |
b41534d1 | 338 | int offset=0, invert=0, maxErr=20, errCnt=0; |
b4fb11ba | 339 | char cmdp = param_getchar(Cmd, 0); |
340 | if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H') { | |
b41534d1 | 341 | PrintAndLog("Usage: data biphaserawdecode [offset] [invert] [maxErr]"); |
342 | PrintAndLog(" Converts 10 or 01 to 1 and 11 or 00 to 0"); | |
b4fb11ba | 343 | PrintAndLog(" --must have binary sequence in demodbuffer (run data askrawdemod first)"); |
e0165dcf | 344 | PrintAndLog(" --invert for Conditional Dephase Encoding (CDP) AKA Differential Manchester"); |
b4fb11ba | 345 | PrintAndLog(""); |
346 | PrintAndLog(" [offset <0|1>], set to 0 not to adjust start position or to 1 to adjust decode start position"); | |
347 | PrintAndLog(" [invert <0|1>], set to 1 to invert output"); | |
b41534d1 | 348 | PrintAndLog(" [maxErr int], set max errors tolerated - default=20"); |
b4fb11ba | 349 | PrintAndLog(""); |
350 | PrintAndLog(" sample: data biphaserawdecode = decode biphase bitstream from the demodbuffer"); | |
351 | PrintAndLog(" sample: data biphaserawdecode 1 1 = decode biphase bitstream from the demodbuffer, set offset, and invert output"); | |
352 | return 0; | |
353 | } | |
b41534d1 | 354 | sscanf(Cmd, "%i %i %i", &offset, &invert, &maxErr); |
355 | if (DemodBufferLen==0){ | |
356 | PrintAndLog("DemodBuffer Empty - run 'data rawdemod ar' first"); | |
b4fb11ba | 357 | return 0; |
358 | } | |
b41534d1 | 359 | uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; |
360 | memcpy(BitStream, DemodBuffer, DemodBufferLen); | |
361 | size = DemodBufferLen; | |
1e090a61 | 362 | errCnt=BiphaseRawDecode(BitStream, &size, offset, invert); |
b41534d1 | 363 | if (errCnt<0){ |
364 | PrintAndLog("Error during decode:%d", errCnt); | |
365 | return 0; | |
366 | } | |
367 | if (errCnt>maxErr){ | |
b4fb11ba | 368 | PrintAndLog("Too many errors attempting to decode: %d",errCnt); |
369 | return 0; | |
370 | } | |
b41534d1 | 371 | |
372 | if (errCnt>0){ | |
2767fc02 | 373 | PrintAndLog("# Errors found during Demod (shown as 7 in bit stream): %d",errCnt); |
b41534d1 | 374 | } |
375 | PrintAndLog("Biphase Decoded using offset: %d - # invert:%d - data:",offset,invert); | |
2767fc02 | 376 | PrintAndLog("%s", sprint_bin_break(BitStream, size, 16)); |
b41534d1 | 377 | |
378 | if (offset) setDemodBuf(DemodBuffer,DemodBufferLen-offset, offset); //remove first bit from raw demod | |
b4fb11ba | 379 | return 1; |
eb191de6 | 380 | } |
381 | ||
b41534d1 | 382 | //by marshmellow |
383 | // - ASK Demod then Biphase decode GraphBuffer samples | |
384 | int ASKbiphaseDemod(const char *Cmd, bool verbose) | |
385 | { | |
386 | //ask raw demod GraphBuffer first | |
c7d67212 | 387 | int offset=0, clk=0, invert=0, maxErr=0; |
388 | sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr); | |
b41534d1 | 389 | |
8e2e6c8e | 390 | uint8_t BitStream[MAX_DEMOD_BUF_LEN]; |
391 | size_t size = getFromGraphBuf(BitStream); | |
fd227f4e | 392 | //invert here inverts the ask raw demoded bits which has no effect on the demod, but we need the pointer |
c7d67212 | 393 | int errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0); |
8e2e6c8e | 394 | if ( errCnt < 0 || errCnt > maxErr ) { |
395 | if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk); | |
396 | return 0; | |
397 | } | |
398 | ||
399 | //attempt to Biphase decode BitStream | |
400 | errCnt = BiphaseRawDecode(BitStream, &size, offset, invert); | |
b41534d1 | 401 | if (errCnt < 0){ |
402 | if (g_debugMode || verbose) PrintAndLog("Error BiphaseRawDecode: %d", errCnt); | |
403 | return 0; | |
404 | } | |
405 | if (errCnt > maxErr) { | |
406 | if (g_debugMode || verbose) PrintAndLog("Error BiphaseRawDecode too many errors: %d", errCnt); | |
407 | return 0; | |
408 | } | |
409 | //success set DemodBuffer and return | |
410 | setDemodBuf(BitStream, size, 0); | |
411 | if (g_debugMode || verbose){ | |
8e2e6c8e | 412 | PrintAndLog("Biphase Decoded using offset: %d - clock: %d - # errors:%d - data:",offset,clk,errCnt); |
b41534d1 | 413 | printDemodBuff(); |
414 | } | |
415 | return 1; | |
416 | } | |
417 | //by marshmellow - see ASKbiphaseDemod | |
418 | int Cmdaskbiphdemod(const char *Cmd) | |
419 | { | |
e0165dcf | 420 | char cmdp = param_getchar(Cmd, 0); |
fef74fdc | 421 | if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') { |
422 | PrintAndLog("Usage: data rawdemod ab [offset] [clock] <invert> [maxError] [maxLen] <amplify>"); | |
e0165dcf | 423 | PrintAndLog(" [offset], offset to begin biphase, default=0"); |
424 | PrintAndLog(" [set clock as integer] optional, if not set, autodetect"); | |
425 | PrintAndLog(" <invert>, 1 to invert output"); | |
426 | PrintAndLog(" [set maximum allowed errors], default = 100"); | |
fef74fdc | 427 | PrintAndLog(" [set maximum Samples to read], default = 32768 (512 bits at rf/64)"); |
e0165dcf | 428 | PrintAndLog(" <amplify>, 'a' to attempt demod with ask amplification, default = no amp"); |
429 | PrintAndLog(" NOTE: <invert> can be entered as second or third argument"); | |
430 | PrintAndLog(" NOTE: <amplify> can be entered as first, second or last argument"); | |
431 | PrintAndLog(" NOTE: any other arg must have previous args set to work"); | |
432 | PrintAndLog(""); | |
433 | PrintAndLog(" NOTE: --invert for Conditional Dephase Encoding (CDP) AKA Differential Manchester"); | |
434 | PrintAndLog(""); | |
fef74fdc | 435 | PrintAndLog(" sample: data rawdemod ab = demod an ask/biph tag from GraphBuffer"); |
436 | PrintAndLog(" : data rawdemod ab 0 a = demod an ask/biph tag from GraphBuffer, amplified"); | |
437 | PrintAndLog(" : data rawdemod ab 1 32 = demod an ask/biph tag from GraphBuffer using an offset of 1 and a clock of RF/32"); | |
438 | PrintAndLog(" : data rawdemod ab 0 32 1 = demod an ask/biph tag from GraphBuffer using a clock of RF/32 and inverting data"); | |
439 | PrintAndLog(" : data rawdemod ab 0 1 = demod an ask/biph tag from GraphBuffer while inverting data"); | |
440 | 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"); | |
441 | 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 | 442 | return 0; |
443 | } | |
7cb8516c | 444 | return ASKbiphaseDemod(Cmd, true); |
b41534d1 | 445 | } |
446 | ||
fef74fdc | 447 | //by marshmellow - see ASKDemod |
4ac906d1 | 448 | int Cmdaskrawdemod(const char *Cmd) |
449 | { | |
e0165dcf | 450 | char cmdp = param_getchar(Cmd, 0); |
01d0f8ae | 451 | if (strlen(Cmd) > 35 || cmdp == 'h' || cmdp == 'H') { |
fef74fdc | 452 | PrintAndLog("Usage: data rawdemod ar [clock] <invert> [maxError] [maxLen] [amplify]"); |
e0165dcf | 453 | PrintAndLog(" [set clock as integer] optional, if not set, autodetect"); |
454 | PrintAndLog(" <invert>, 1 to invert output"); | |
455 | PrintAndLog(" [set maximum allowed errors], default = 100"); | |
fef74fdc | 456 | PrintAndLog(" [set maximum Samples to read], default = 32768 (1024 bits at rf/64)"); |
e0165dcf | 457 | PrintAndLog(" <amplify>, 'a' to attempt demod with ask amplification, default = no amp"); |
458 | PrintAndLog(""); | |
fef74fdc | 459 | PrintAndLog(" sample: data rawdemod ar = demod an ask tag from GraphBuffer"); |
460 | PrintAndLog(" : data rawdemod ar a = demod an ask tag from GraphBuffer, amplified"); | |
461 | PrintAndLog(" : data rawdemod ar 32 = demod an ask tag from GraphBuffer using a clock of RF/32"); | |
462 | PrintAndLog(" : data rawdemod ar 32 1 = demod an ask tag from GraphBuffer using a clock of RF/32 and inverting data"); | |
463 | PrintAndLog(" : data rawdemod ar 1 = demod an ask tag from GraphBuffer while inverting data"); | |
464 | 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"); | |
465 | 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 | 466 | return 0; |
467 | } | |
7cb8516c | 468 | return ASKDemod(Cmd, true, false, 0); |
4ac906d1 | 469 | } |
470 | ||
73d04bb4 | 471 | int AutoCorrelate(int window, bool SaveGrph, bool verbose) |
7fe9b0b7 | 472 | { |
e0165dcf | 473 | static int CorrelBuffer[MAX_GRAPH_TRACE_LEN]; |
474 | size_t Correlation = 0; | |
475 | int maxSum = 0; | |
476 | int lastMax = 0; | |
477 | if (verbose) PrintAndLog("performing %d correlations", GraphTraceLen - window); | |
478 | for (int i = 0; i < GraphTraceLen - window; ++i) { | |
479 | int sum = 0; | |
480 | for (int j = 0; j < window; ++j) { | |
481 | sum += (GraphBuffer[j]*GraphBuffer[i + j]) / 256; | |
482 | } | |
483 | CorrelBuffer[i] = sum; | |
484 | if (sum >= maxSum-100 && sum <= maxSum+100){ | |
485 | //another max | |
486 | Correlation = i-lastMax; | |
487 | lastMax = i; | |
488 | if (sum > maxSum) maxSum = sum; | |
489 | } else if (sum > maxSum){ | |
490 | maxSum=sum; | |
491 | lastMax = i; | |
492 | } | |
493 | } | |
494 | if (Correlation==0){ | |
495 | //try again with wider margin | |
496 | for (int i = 0; i < GraphTraceLen - window; i++){ | |
497 | if (CorrelBuffer[i] >= maxSum-(maxSum*0.05) && CorrelBuffer[i] <= maxSum+(maxSum*0.05)){ | |
498 | //another max | |
499 | Correlation = i-lastMax; | |
500 | lastMax = i; | |
501 | //if (CorrelBuffer[i] > maxSum) maxSum = sum; | |
502 | } | |
503 | } | |
504 | } | |
505 | if (verbose && Correlation > 0) PrintAndLog("Possible Correlation: %d samples",Correlation); | |
506 | ||
507 | if (SaveGrph){ | |
508 | GraphTraceLen = GraphTraceLen - window; | |
509 | memcpy(GraphBuffer, CorrelBuffer, GraphTraceLen * sizeof (int)); | |
510 | RepaintGraphWindow(); | |
511 | } | |
512 | return Correlation; | |
73d04bb4 | 513 | } |
7fe9b0b7 | 514 | |
9f7bbd24 | 515 | int usage_data_autocorr(void) |
516 | { | |
e0165dcf | 517 | //print help |
518 | PrintAndLog("Usage: data autocorr [window] [g]"); | |
519 | PrintAndLog("Options: "); | |
520 | PrintAndLog(" h This help"); | |
521 | PrintAndLog(" [window] window length for correlation - default = 4000"); | |
522 | PrintAndLog(" g save back to GraphBuffer (overwrite)"); | |
523 | return 0; | |
9f7bbd24 | 524 | } |
525 | ||
73d04bb4 | 526 | int CmdAutoCorr(const char *Cmd) |
527 | { | |
e0165dcf | 528 | char cmdp = param_getchar(Cmd, 0); |
529 | if (cmdp == 'h' || cmdp == 'H') | |
530 | return usage_data_autocorr(); | |
531 | int window = 4000; //set default | |
532 | char grph=0; | |
7cb8516c | 533 | bool updateGrph = false; |
e0165dcf | 534 | sscanf(Cmd, "%i %c", &window, &grph); |
535 | ||
536 | if (window >= GraphTraceLen) { | |
537 | PrintAndLog("window must be smaller than trace (%d samples)", | |
538 | GraphTraceLen); | |
539 | return 0; | |
540 | } | |
7cb8516c | 541 | if (grph == 'g') updateGrph=true; |
542 | return AutoCorrelate(window, updateGrph, true); | |
7fe9b0b7 | 543 | } |
544 | ||
545 | int CmdBitsamples(const char *Cmd) | |
546 | { | |
e0165dcf | 547 | int cnt = 0; |
548 | uint8_t got[12288]; | |
952a8bb5 | 549 | |
e0165dcf | 550 | GetFromBigBuf(got,sizeof(got),0); |
551 | WaitForResponse(CMD_ACK,NULL); | |
7fe9b0b7 | 552 | |
e0165dcf | 553 | for (int j = 0; j < sizeof(got); j++) { |
554 | for (int k = 0; k < 8; k++) { | |
555 | if(got[j] & (1 << (7 - k))) { | |
556 | GraphBuffer[cnt++] = 1; | |
557 | } else { | |
558 | GraphBuffer[cnt++] = 0; | |
559 | } | |
560 | } | |
561 | } | |
562 | GraphTraceLen = cnt; | |
563 | RepaintGraphWindow(); | |
564 | return 0; | |
7fe9b0b7 | 565 | } |
566 | ||
7fe9b0b7 | 567 | int CmdBuffClear(const char *Cmd) |
568 | { | |
e0165dcf | 569 | UsbCommand c = {CMD_BUFF_CLEAR}; |
570 | SendCommand(&c); | |
571 | ClearGraph(true); | |
572 | return 0; | |
7fe9b0b7 | 573 | } |
574 | ||
575 | int CmdDec(const char *Cmd) | |
576 | { | |
e0165dcf | 577 | for (int i = 0; i < (GraphTraceLen / 2); ++i) |
578 | GraphBuffer[i] = GraphBuffer[i * 2]; | |
579 | GraphTraceLen /= 2; | |
580 | PrintAndLog("decimated by 2"); | |
581 | RepaintGraphWindow(); | |
582 | return 0; | |
7fe9b0b7 | 583 | } |
698b649e MHS |
584 | /** |
585 | * Undecimate - I'd call it 'interpolate', but we'll save that | |
586 | * name until someone does an actual interpolation command, not just | |
587 | * blindly repeating samples | |
588 | * @param Cmd | |
589 | * @return | |
590 | */ | |
591 | int CmdUndec(const char *Cmd) | |
592 | { | |
c856ceae MHS |
593 | if(param_getchar(Cmd, 0) == 'h') |
594 | { | |
595 | PrintAndLog("Usage: data undec [factor]"); | |
596 | PrintAndLog("This function performs un-decimation, by repeating each sample N times"); | |
597 | PrintAndLog("Options: "); | |
598 | PrintAndLog(" h This help"); | |
599 | PrintAndLog(" factor The number of times to repeat each sample.[default:2]"); | |
600 | PrintAndLog("Example: 'data undec 3'"); | |
601 | return 0; | |
602 | } | |
603 | ||
604 | uint8_t factor = param_get8ex(Cmd, 0,2, 10); | |
698b649e MHS |
605 | //We have memory, don't we? |
606 | int swap[MAX_GRAPH_TRACE_LEN] = { 0 }; | |
72c5877a | 607 | uint32_t g_index = 0, s_index = 0; |
608 | while(g_index < GraphTraceLen && s_index + factor < MAX_GRAPH_TRACE_LEN) | |
698b649e | 609 | { |
c856ceae | 610 | int count = 0; |
72c5877a | 611 | for(count = 0; count < factor && s_index + count < MAX_GRAPH_TRACE_LEN; count++) |
c856ceae | 612 | swap[s_index+count] = GraphBuffer[g_index]; |
72c5877a | 613 | |
614 | s_index += count; | |
615 | g_index++; | |
698b649e | 616 | } |
698b649e | 617 | |
72c5877a | 618 | memcpy(GraphBuffer, swap, s_index * sizeof(int)); |
c856ceae MHS |
619 | GraphTraceLen = s_index; |
620 | RepaintGraphWindow(); | |
698b649e MHS |
621 | return 0; |
622 | } | |
7fe9b0b7 | 623 | |
ec75f5c1 | 624 | //by marshmellow |
625 | //shift graph zero up or down based on input + or - | |
626 | int CmdGraphShiftZero(const char *Cmd) | |
627 | { | |
628 | ||
e0165dcf | 629 | int shift=0; |
630 | //set options from parameters entered with the command | |
631 | sscanf(Cmd, "%i", &shift); | |
632 | int shiftedVal=0; | |
633 | for(int i = 0; i<GraphTraceLen; i++){ | |
634 | shiftedVal=GraphBuffer[i]+shift; | |
635 | if (shiftedVal>127) | |
636 | shiftedVal=127; | |
637 | else if (shiftedVal<-127) | |
638 | shiftedVal=-127; | |
639 | GraphBuffer[i]= shiftedVal; | |
640 | } | |
641 | CmdNorm(""); | |
642 | return 0; | |
ec75f5c1 | 643 | } |
644 | ||
6de43508 | 645 | //by marshmellow |
646 | //use large jumps in read samples to identify edges of waves and then amplify that wave to max | |
2767fc02 | 647 | //similar to dirtheshold, threshold commands |
6de43508 | 648 | //takes a threshold length which is the measured length between two samples then determines an edge |
649 | int CmdAskEdgeDetect(const char *Cmd) | |
650 | { | |
e0165dcf | 651 | int thresLen = 25; |
de53156e | 652 | int Last = 0; |
e0165dcf | 653 | sscanf(Cmd, "%i", &thresLen); |
49bbc60a | 654 | |
e0165dcf | 655 | for(int i = 1; i<GraphTraceLen; i++){ |
656 | if (GraphBuffer[i]-GraphBuffer[i-1]>=thresLen) //large jump up | |
de53156e | 657 | Last = 127; |
e0165dcf | 658 | else if(GraphBuffer[i]-GraphBuffer[i-1]<=-1*thresLen) //large jump down |
de53156e | 659 | Last = -127; |
660 | GraphBuffer[i-1] = Last; | |
e0165dcf | 661 | } |
662 | RepaintGraphWindow(); | |
e0165dcf | 663 | return 0; |
6de43508 | 664 | } |
665 | ||
7fe9b0b7 | 666 | /* Print our clock rate */ |
ba1a299c | 667 | // uses data from graphbuffer |
f3bf15e4 | 668 | // adjusted to take char parameter for type of modulation to find the clock - by marshmellow. |
7fe9b0b7 | 669 | int CmdDetectClockRate(const char *Cmd) |
670 | { | |
f3bf15e4 | 671 | char cmdp = param_getchar(Cmd, 0); |
fef74fdc | 672 | if (strlen(Cmd) > 6 || strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') { |
673 | PrintAndLog("Usage: data detectclock [modulation] <clock>"); | |
f3bf15e4 | 674 | PrintAndLog(" [modulation as char], specify the modulation type you want to detect the clock of"); |
fef74fdc | 675 | PrintAndLog(" <clock> , specify the clock (optional - to get best start position only)"); |
f3bf15e4 | 676 | PrintAndLog(" 'a' = ask, 'f' = fsk, 'n' = nrz/direct, 'p' = psk"); |
677 | PrintAndLog(""); | |
678 | PrintAndLog(" sample: data detectclock a = detect the clock of an ask modulated wave in the GraphBuffer"); | |
679 | PrintAndLog(" data detectclock f = detect the clock of an fsk modulated wave in the GraphBuffer"); | |
680 | PrintAndLog(" data detectclock p = detect the clock of an psk modulated wave in the GraphBuffer"); | |
681 | PrintAndLog(" data detectclock n = detect the clock of an nrz/direct modulated wave in the GraphBuffer"); | |
682 | } | |
683 | int ans=0; | |
684 | if (cmdp == 'a'){ | |
fef74fdc | 685 | ans = GetAskClock(Cmd+1, true, false); |
f3bf15e4 | 686 | } else if (cmdp == 'f'){ |
687 | ans = GetFskClock("", true, false); | |
688 | } else if (cmdp == 'n'){ | |
689 | ans = GetNrzClock("", true, false); | |
690 | } else if (cmdp == 'p'){ | |
691 | ans = GetPskClock("", true, false); | |
692 | } else { | |
693 | PrintAndLog ("Please specify a valid modulation to detect the clock of - see option h for help"); | |
694 | } | |
695 | return ans; | |
7fe9b0b7 | 696 | } |
66707a3b | 697 | |
2767fc02 | 698 | char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert) |
699 | { | |
0c50084a | 700 | static char fType[8]; |
9e4cee22 | 701 | memset(fType, 0x00, 8); |
0c50084a | 702 | char *fskType = fType; |
2767fc02 | 703 | if (fchigh==10 && fclow==8){ |
704 | if (invert) //fsk2a | |
38b35095 | 705 | memcpy(fskType, "FSK2a", 5); |
2767fc02 | 706 | else //fsk2 |
38b35095 | 707 | memcpy(fskType, "FSK2", 4); |
2767fc02 | 708 | } else if (fchigh == 8 && fclow == 5) { |
709 | if (invert) | |
38b35095 | 710 | memcpy(fskType, "FSK1", 4); |
2767fc02 | 711 | else |
38b35095 | 712 | memcpy(fskType, "FSK1a", 5); |
2767fc02 | 713 | } else { |
38b35095 | 714 | memcpy(fskType, "FSK??", 5); |
2767fc02 | 715 | } |
716 | return fskType; | |
717 | } | |
718 | ||
2fc2150e | 719 | //by marshmellow |
eb191de6 | 720 | //fsk raw demod and print binary |
6de43508 | 721 | //takes 4 arguments - Clock, invert, fchigh, fclow |
722 | //defaults: clock = 50, invert=1, fchigh=10, fclow=8 (RF/10 RF/8 (fsk2a)) | |
4ac906d1 | 723 | int FSKrawDemod(const char *Cmd, bool verbose) |
b3b70669 | 724 | { |
e0165dcf | 725 | //raw fsk demod no manchester decoding no start bit finding just get binary from wave |
506672c4 | 726 | uint8_t rfLen, invert, fchigh, fclow; |
506672c4 | 727 | //set defaults |
e0165dcf | 728 | //set options from parameters entered with the command |
6ca1477c | 729 | rfLen = param_get8(Cmd, 0); |
730 | invert = param_get8(Cmd, 1); | |
731 | fchigh = param_get8(Cmd, 2); | |
732 | fclow = param_get8(Cmd, 3); | |
d1869c33 | 733 | |
e0165dcf | 734 | if (strlen(Cmd)>0 && strlen(Cmd)<=2) { |
a0cc89b4 | 735 | if (rfLen==1) { |
2eec55c8 | 736 | invert = 1; //if invert option only is used |
e0165dcf | 737 | rfLen = 0; |
a0cc89b4 | 738 | } |
e0165dcf | 739 | } |
e0165dcf | 740 | uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; |
741 | size_t BitLen = getFromGraphBuf(BitStream); | |
742 | if (BitLen==0) return 0; | |
743 | //get field clock lengths | |
a0cc89b4 | 744 | uint16_t fcs=0; |
506672c4 | 745 | if (!fchigh || !fclow) { |
a0cc89b4 | 746 | fcs = countFC(BitStream, BitLen, 1); |
747 | if (!fcs) { | |
748 | fchigh = 10; | |
749 | fclow = 8; | |
750 | } else { | |
751 | fchigh = (fcs >> 8) & 0x00FF; | |
752 | fclow = fcs & 0x00FF; | |
e0165dcf | 753 | } |
754 | } | |
755 | //get bit clock length | |
a0cc89b4 | 756 | if (!rfLen) { |
e0165dcf | 757 | rfLen = detectFSKClk(BitStream, BitLen, fchigh, fclow); |
506672c4 | 758 | if (!rfLen) rfLen = 50; |
e0165dcf | 759 | } |
506672c4 | 760 | int size = fskdemod(BitStream, BitLen, rfLen, invert, fchigh, fclow); |
a0cc89b4 | 761 | if (size > 0) { |
e0165dcf | 762 | setDemodBuf(BitStream,size,0); |
763 | ||
764 | // Now output the bitstream to the scrollback by line of 16 bits | |
2767fc02 | 765 | if (verbose || g_debugMode) { |
a0cc89b4 | 766 | PrintAndLog("\nUsing Clock:%u, invert:%u, fchigh:%u, fclow:%u", (unsigned int)rfLen, (unsigned int)invert, (unsigned int)fchigh, (unsigned int)fclow); |
2767fc02 | 767 | PrintAndLog("%s decoded bitstream:",GetFSKType(fchigh,fclow,invert)); |
768 | printDemodBuff(); | |
e0165dcf | 769 | } |
d1869c33 | 770 | |
e0165dcf | 771 | return 1; |
506672c4 | 772 | } else { |
2767fc02 | 773 | if (g_debugMode) PrintAndLog("no FSK data found"); |
e0165dcf | 774 | } |
775 | return 0; | |
b3b70669 | 776 | } |
777 | ||
4ac906d1 | 778 | //by marshmellow |
779 | //fsk raw demod and print binary | |
780 | //takes 4 arguments - Clock, invert, fchigh, fclow | |
781 | //defaults: clock = 50, invert=1, fchigh=10, fclow=8 (RF/10 RF/8 (fsk2a)) | |
782 | int CmdFSKrawdemod(const char *Cmd) | |
783 | { | |
e0165dcf | 784 | char cmdp = param_getchar(Cmd, 0); |
01d0f8ae | 785 | if (strlen(Cmd) > 20 || cmdp == 'h' || cmdp == 'H') { |
e0165dcf | 786 | PrintAndLog("Usage: data rawdemod fs [clock] <invert> [fchigh] [fclow]"); |
787 | PrintAndLog(" [set clock as integer] optional, omit for autodetect."); | |
788 | PrintAndLog(" <invert>, 1 for invert output, can be used even if the clock is omitted"); | |
789 | PrintAndLog(" [fchigh], larger field clock length, omit for autodetect"); | |
790 | PrintAndLog(" [fclow], small field clock length, omit for autodetect"); | |
791 | PrintAndLog(""); | |
792 | PrintAndLog(" sample: data rawdemod fs = demod an fsk tag from GraphBuffer using autodetect"); | |
793 | PrintAndLog(" : data rawdemod fs 32 = demod an fsk tag from GraphBuffer using a clock of RF/32, autodetect fc"); | |
794 | PrintAndLog(" : data rawdemod fs 1 = demod an fsk tag from GraphBuffer using autodetect, invert output"); | |
795 | PrintAndLog(" : data rawdemod fs 32 1 = demod an fsk tag from GraphBuffer using a clock of RF/32, invert output, autodetect fc"); | |
796 | PrintAndLog(" : data rawdemod fs 64 0 8 5 = demod an fsk1 RF/64 tag from GraphBuffer"); | |
797 | PrintAndLog(" : data rawdemod fs 50 0 10 8 = demod an fsk2 RF/50 tag from GraphBuffer"); | |
798 | PrintAndLog(" : data rawdemod fs 50 1 10 8 = demod an fsk2a RF/50 tag from GraphBuffer"); | |
799 | return 0; | |
800 | } | |
7cb8516c | 801 | return FSKrawDemod(Cmd, true); |
4ac906d1 | 802 | } |
803 | ||
04d2721b | 804 | //by marshmellow |
805 | //Paradox Prox demod - FSK RF/50 with preamble of 00001111 (then manchester encoded) | |
ec75f5c1 | 806 | //print full Paradox Prox ID and some bit format details if found |
807 | int CmdFSKdemodParadox(const char *Cmd) | |
808 | { | |
e0165dcf | 809 | //raw fsk demod no manchester decoding no start bit finding just get binary from wave |
810 | uint32_t hi2=0, hi=0, lo=0; | |
811 | ||
812 | uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; | |
813 | size_t BitLen = getFromGraphBuf(BitStream); | |
814 | if (BitLen==0) return 0; | |
815 | //get binary from fsk wave | |
816 | int idx = ParadoxdemodFSK(BitStream,&BitLen,&hi2,&hi,&lo); | |
817 | if (idx<0){ | |
818 | if (g_debugMode){ | |
819 | if (idx==-1){ | |
820 | PrintAndLog("DEBUG: Just Noise Detected"); | |
821 | } else if (idx == -2) { | |
822 | PrintAndLog("DEBUG: Error demoding fsk"); | |
823 | } else if (idx == -3) { | |
824 | PrintAndLog("DEBUG: Preamble not found"); | |
825 | } else if (idx == -4) { | |
826 | PrintAndLog("DEBUG: Error in Manchester data"); | |
827 | } else { | |
828 | PrintAndLog("DEBUG: Error demoding fsk %d", idx); | |
829 | } | |
830 | } | |
831 | return 0; | |
832 | } | |
833 | if (hi2==0 && hi==0 && lo==0){ | |
834 | if (g_debugMode) PrintAndLog("DEBUG: Error - no value found"); | |
835 | return 0; | |
836 | } | |
837 | uint32_t fc = ((hi & 0x3)<<6) | (lo>>26); | |
838 | uint32_t cardnum = (lo>>10)&0xFFFF; | |
839 | uint32_t rawLo = bytebits_to_byte(BitStream+idx+64,32); | |
840 | uint32_t rawHi = bytebits_to_byte(BitStream+idx+32,32); | |
841 | uint32_t rawHi2 = bytebits_to_byte(BitStream+idx,32); | |
842 | ||
843 | PrintAndLog("Paradox TAG ID: %x%08x - FC: %d - Card: %d - Checksum: %02x - RAW: %08x%08x%08x", | |
844 | hi>>10, (hi & 0x3)<<26 | (lo>>10), fc, cardnum, (lo>>2) & 0xFF, rawHi2, rawHi, rawLo); | |
845 | setDemodBuf(BitStream,BitLen,idx); | |
846 | if (g_debugMode){ | |
847 | PrintAndLog("DEBUG: idx: %d, len: %d, Printing Demod Buffer:", idx, BitLen); | |
848 | printDemodBuff(); | |
849 | } | |
850 | return 1; | |
b3b70669 | 851 | } |
852 | ||
e770c648 | 853 | //by marshmellow |
854 | //attempt to psk1 demod graph buffer | |
4ac906d1 | 855 | int PSKDemod(const char *Cmd, bool verbose) |
e770c648 | 856 | { |
e0165dcf | 857 | int invert=0; |
858 | int clk=0; | |
859 | int maxErr=100; | |
860 | sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr); | |
861 | if (clk==1){ | |
862 | invert=1; | |
863 | clk=0; | |
864 | } | |
865 | if (invert != 0 && invert != 1) { | |
2ec87733 | 866 | if (g_debugMode || verbose) PrintAndLog("Invalid argument: %s", Cmd); |
e0165dcf | 867 | return 0; |
868 | } | |
869 | uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; | |
870 | size_t BitLen = getFromGraphBuf(BitStream); | |
2ec87733 | 871 | if (BitLen==0) return 0; |
2eec55c8 | 872 | uint8_t carrier=countFC(BitStream, BitLen, 0); |
e0165dcf | 873 | if (carrier!=2 && carrier!=4 && carrier!=8){ |
874 | //invalid carrier | |
875 | return 0; | |
876 | } | |
6fe5c94b | 877 | if (g_debugMode){ |
878 | PrintAndLog("Carrier: rf/%d",carrier); | |
879 | } | |
e0165dcf | 880 | int errCnt=0; |
881 | errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert); | |
882 | if (errCnt > maxErr){ | |
2767fc02 | 883 | if (g_debugMode || verbose) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt); |
e0165dcf | 884 | return 0; |
885 | } | |
886 | if (errCnt<0|| BitLen<16){ //throw away static - allow 1 and -1 (in case of threshold command first) | |
2767fc02 | 887 | if (g_debugMode || verbose) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt); |
e0165dcf | 888 | return 0; |
889 | } | |
2767fc02 | 890 | if (verbose || g_debugMode){ |
891 | PrintAndLog("\nUsing Clock:%d, invert:%d, Bits Found:%d",clk,invert,BitLen); | |
e0165dcf | 892 | if (errCnt>0){ |
2767fc02 | 893 | PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt); |
e0165dcf | 894 | } |
895 | } | |
896 | //prime demod buffer for output | |
897 | setDemodBuf(BitStream,BitLen,0); | |
898 | return 1; | |
4118b74d | 899 | } |
e770c648 | 900 | |
411105e0 | 901 | int CmdPSKNexWatch(const char *Cmd) |
902 | { | |
903 | if (!PSKDemod("", false)) return 0; | |
904 | 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}; | |
905 | size_t startIdx = 0, size = DemodBufferLen; | |
906 | bool invert = false; | |
907 | if (!preambleSearch(DemodBuffer, preamble, sizeof(preamble), &size, &startIdx)){ | |
908 | // if didn't find preamble try again inverting | |
909 | if (!PSKDemod("1", false)) return 0; | |
910 | size = DemodBufferLen; | |
911 | if (!preambleSearch(DemodBuffer, preamble, sizeof(preamble), &size, &startIdx)) return 0; | |
912 | invert = true; | |
913 | } | |
914 | if (size != 128) return 0; | |
915 | setDemodBuf(DemodBuffer, size, startIdx+4); | |
916 | startIdx = 8+32; //4 = extra i added, 8 = preamble, 32 = reserved bits (always 0) | |
917 | //get ID | |
918 | uint32_t ID = 0; | |
919 | for (uint8_t wordIdx=0; wordIdx<4; wordIdx++){ | |
920 | for (uint8_t idx=0; idx<8; idx++){ | |
921 | ID = (ID << 1) | DemodBuffer[startIdx+wordIdx+(idx*4)]; | |
922 | } | |
923 | } | |
924 | //parity check (TBD) | |
925 | ||
926 | //checksum check (TBD) | |
927 | ||
928 | //output | |
929 | PrintAndLog("NexWatch ID: %d", ID); | |
930 | if (invert){ | |
931 | PrintAndLog("Had to Invert - probably NexKey"); | |
932 | for (uint8_t idx=0; idx<size; idx++) | |
933 | DemodBuffer[idx] ^= 1; | |
934 | } | |
935 | ||
936 | CmdPrintDemodBuff("x"); | |
937 | return 1; | |
938 | } | |
939 | ||
04d2721b | 940 | // by marshmellow |
e770c648 | 941 | // takes 3 arguments - clock, invert, maxErr as integers |
942 | // attempts to demodulate nrz only | |
943 | // prints binary found and saves in demodbuffer for further commands | |
b4a2fcf6 | 944 | int NRZrawDemod(const char *Cmd, bool verbose) |
e770c648 | 945 | { |
e0165dcf | 946 | int invert=0; |
947 | int clk=0; | |
948 | int maxErr=100; | |
949 | sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr); | |
950 | if (clk==1){ | |
951 | invert=1; | |
952 | clk=0; | |
953 | } | |
954 | if (invert != 0 && invert != 1) { | |
955 | PrintAndLog("Invalid argument: %s", Cmd); | |
956 | return 0; | |
957 | } | |
958 | uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; | |
959 | size_t BitLen = getFromGraphBuf(BitStream); | |
960 | if (BitLen==0) return 0; | |
961 | int errCnt=0; | |
6f36848f | 962 | int clkStartIdx = 0; |
963 | errCnt = nrzRawDemod(BitStream, &BitLen, &clk, &invert, &clkStartIdx); | |
e0165dcf | 964 | if (errCnt > maxErr){ |
965 | if (g_debugMode) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt); | |
966 | return 0; | |
967 | } | |
2eec55c8 | 968 | if (errCnt<0 || BitLen<16){ //throw away static - allow 1 and -1 (in case of threshold command first) |
e0165dcf | 969 | if (g_debugMode) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt); |
970 | return 0; | |
971 | } | |
972 | if (verbose || g_debugMode) PrintAndLog("Tried NRZ Demod using Clock: %d - invert: %d - Bits Found: %d",clk,invert,BitLen); | |
973 | //prime demod buffer for output | |
974 | setDemodBuf(BitStream,BitLen,0); | |
975 | ||
2767fc02 | 976 | if (errCnt>0 && (verbose || g_debugMode)) PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt); |
e0165dcf | 977 | if (verbose || g_debugMode) { |
978 | PrintAndLog("NRZ demoded bitstream:"); | |
979 | // Now output the bitstream to the scrollback by line of 16 bits | |
980 | printDemodBuff(); | |
981 | } | |
982 | return 1; | |
b4a2fcf6 | 983 | } |
984 | ||
985 | int CmdNRZrawDemod(const char *Cmd) | |
986 | { | |
e0165dcf | 987 | char cmdp = param_getchar(Cmd, 0); |
01d0f8ae | 988 | if (strlen(Cmd) > 16 || cmdp == 'h' || cmdp == 'H') { |
e0165dcf | 989 | PrintAndLog("Usage: data rawdemod nr [clock] <0|1> [maxError]"); |
990 | PrintAndLog(" [set clock as integer] optional, if not set, autodetect."); | |
991 | PrintAndLog(" <invert>, 1 for invert output"); | |
992 | PrintAndLog(" [set maximum allowed errors], default = 100."); | |
993 | PrintAndLog(""); | |
994 | PrintAndLog(" sample: data rawdemod nr = demod a nrz/direct tag from GraphBuffer"); | |
995 | PrintAndLog(" : data rawdemod nr 32 = demod a nrz/direct tag from GraphBuffer using a clock of RF/32"); | |
996 | PrintAndLog(" : data rawdemod nr 32 1 = demod a nrz/direct tag from GraphBuffer using a clock of RF/32 and inverting data"); | |
997 | PrintAndLog(" : data rawdemod nr 1 = demod a nrz/direct tag from GraphBuffer while inverting data"); | |
998 | 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"); | |
999 | return 0; | |
1000 | } | |
7cb8516c | 1001 | return NRZrawDemod(Cmd, true); |
e770c648 | 1002 | } |
1003 | ||
1004 | // by marshmellow | |
1005 | // takes 3 arguments - clock, invert, maxErr as integers | |
04d2721b | 1006 | // attempts to demodulate psk only |
1007 | // prints binary found and saves in demodbuffer for further commands | |
e770c648 | 1008 | int CmdPSK1rawDemod(const char *Cmd) |
4118b74d | 1009 | { |
e0165dcf | 1010 | int ans; |
1011 | char cmdp = param_getchar(Cmd, 0); | |
01d0f8ae | 1012 | if (strlen(Cmd) > 16 || cmdp == 'h' || cmdp == 'H') { |
e0165dcf | 1013 | PrintAndLog("Usage: data rawdemod p1 [clock] <0|1> [maxError]"); |
1014 | PrintAndLog(" [set clock as integer] optional, if not set, autodetect."); | |
1015 | PrintAndLog(" <invert>, 1 for invert output"); | |
1016 | PrintAndLog(" [set maximum allowed errors], default = 100."); | |
1017 | PrintAndLog(""); | |
1018 | PrintAndLog(" sample: data rawdemod p1 = demod a psk1 tag from GraphBuffer"); | |
1019 | PrintAndLog(" : data rawdemod p1 32 = demod a psk1 tag from GraphBuffer using a clock of RF/32"); | |
1020 | PrintAndLog(" : data rawdemod p1 32 1 = demod a psk1 tag from GraphBuffer using a clock of RF/32 and inverting data"); | |
1021 | PrintAndLog(" : data rawdemod p1 1 = demod a psk1 tag from GraphBuffer while inverting data"); | |
1022 | 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"); | |
1023 | return 0; | |
1024 | } | |
7cb8516c | 1025 | ans = PSKDemod(Cmd, true); |
e0165dcf | 1026 | //output |
1027 | if (!ans){ | |
1028 | if (g_debugMode) PrintAndLog("Error demoding: %d",ans); | |
1029 | return 0; | |
1030 | } | |
7a8a982b | 1031 | |
2767fc02 | 1032 | PrintAndLog("PSK1 demoded bitstream:"); |
e0165dcf | 1033 | // Now output the bitstream to the scrollback by line of 16 bits |
1034 | printDemodBuff(); | |
1035 | return 1; | |
4118b74d | 1036 | } |
1037 | ||
04d2721b | 1038 | // by marshmellow |
19ff0210 | 1039 | // takes same args as cmdpsk1rawdemod |
04d2721b | 1040 | int CmdPSK2rawDemod(const char *Cmd) |
1041 | { | |
e0165dcf | 1042 | int ans=0; |
1043 | char cmdp = param_getchar(Cmd, 0); | |
01d0f8ae | 1044 | if (strlen(Cmd) > 16 || cmdp == 'h' || cmdp == 'H') { |
e0165dcf | 1045 | PrintAndLog("Usage: data rawdemod p2 [clock] <0|1> [maxError]"); |
1046 | PrintAndLog(" [set clock as integer] optional, if not set, autodetect."); | |
1047 | PrintAndLog(" <invert>, 1 for invert output"); | |
1048 | PrintAndLog(" [set maximum allowed errors], default = 100."); | |
1049 | PrintAndLog(""); | |
1050 | PrintAndLog(" sample: data rawdemod p2 = demod a psk2 tag from GraphBuffer, autodetect clock"); | |
1051 | PrintAndLog(" : data rawdemod p2 32 = demod a psk2 tag from GraphBuffer using a clock of RF/32"); | |
1052 | PrintAndLog(" : data rawdemod p2 32 1 = demod a psk2 tag from GraphBuffer using a clock of RF/32 and inverting output"); | |
1053 | PrintAndLog(" : data rawdemod p2 1 = demod a psk2 tag from GraphBuffer, autodetect clock and invert output"); | |
1054 | 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"); | |
1055 | return 0; | |
1056 | } | |
7cb8516c | 1057 | ans=PSKDemod(Cmd, true); |
e0165dcf | 1058 | if (!ans){ |
1059 | if (g_debugMode) PrintAndLog("Error demoding: %d",ans); | |
1060 | return 0; | |
1061 | } | |
1062 | psk1TOpsk2(DemodBuffer, DemodBufferLen); | |
1063 | PrintAndLog("PSK2 demoded bitstream:"); | |
1064 | // Now output the bitstream to the scrollback by line of 16 bits | |
1065 | printDemodBuff(); | |
1066 | return 1; | |
04d2721b | 1067 | } |
1068 | ||
19ff0210 | 1069 | // by marshmellow - combines all raw demod functions into one menu command |
1070 | int CmdRawDemod(const char *Cmd) | |
1071 | { | |
1072 | char cmdp = Cmd[0]; //param_getchar(Cmd, 0); | |
1073 | ||
01d0f8ae | 1074 | if (strlen(Cmd) > 35 || cmdp == 'h' || cmdp == 'H' || strlen(Cmd)<2) { |
19ff0210 | 1075 | PrintAndLog("Usage: data rawdemod [modulation] <help>|<options>"); |
b41534d1 | 1076 | PrintAndLog(" [modulation] as 2 char, 'ab' for ask/biphase, 'am' for ask/manchester, 'ar' for ask/raw, 'fs' for fsk, ..."); |
1077 | PrintAndLog(" 'nr' for nrz/direct, 'p1' for psk1, 'p2' for psk2"); | |
19ff0210 | 1078 | PrintAndLog(" <help> as 'h', prints the help for the specific modulation"); |
1079 | PrintAndLog(" <options> see specific modulation help for optional parameters"); | |
1080 | PrintAndLog(""); | |
1fbf8956 | 1081 | PrintAndLog(" sample: data rawdemod fs h = print help specific to fsk demod"); |
19ff0210 | 1082 | PrintAndLog(" : data rawdemod fs = demod GraphBuffer using: fsk - autodetect"); |
b41534d1 | 1083 | PrintAndLog(" : data rawdemod ab = demod GraphBuffer using: ask/biphase - autodetect"); |
19ff0210 | 1084 | PrintAndLog(" : data rawdemod am = demod GraphBuffer using: ask/manchester - autodetect"); |
1085 | PrintAndLog(" : data rawdemod ar = demod GraphBuffer using: ask/raw - autodetect"); | |
1086 | PrintAndLog(" : data rawdemod nr = demod GraphBuffer using: nrz/direct - autodetect"); | |
1087 | PrintAndLog(" : data rawdemod p1 = demod GraphBuffer using: psk1 - autodetect"); | |
1088 | PrintAndLog(" : data rawdemod p2 = demod GraphBuffer using: psk2 - autodetect"); | |
1089 | return 0; | |
1090 | } | |
1091 | char cmdp2 = Cmd[1]; | |
1092 | int ans = 0; | |
1093 | if (cmdp == 'f' && cmdp2 == 's'){ | |
f8f894a5 | 1094 | ans = CmdFSKrawdemod(Cmd+2); |
b41534d1 | 1095 | } else if(cmdp == 'a' && cmdp2 == 'b'){ |
f8f894a5 | 1096 | ans = Cmdaskbiphdemod(Cmd+2); |
19ff0210 | 1097 | } else if(cmdp == 'a' && cmdp2 == 'm'){ |
f8f894a5 | 1098 | ans = Cmdaskmandemod(Cmd+2); |
19ff0210 | 1099 | } else if(cmdp == 'a' && cmdp2 == 'r'){ |
f8f894a5 | 1100 | ans = Cmdaskrawdemod(Cmd+2); |
19ff0210 | 1101 | } else if(cmdp == 'n' && cmdp2 == 'r'){ |
f8f894a5 | 1102 | ans = CmdNRZrawDemod(Cmd+2); |
19ff0210 | 1103 | } else if(cmdp == 'p' && cmdp2 == '1'){ |
f8f894a5 | 1104 | ans = CmdPSK1rawDemod(Cmd+2); |
19ff0210 | 1105 | } else if(cmdp == 'p' && cmdp2 == '2'){ |
f8f894a5 | 1106 | ans = CmdPSK2rawDemod(Cmd+2); |
19ff0210 | 1107 | } else { |
1108 | PrintAndLog("unknown modulation entered - see help ('h') for parameter structure"); | |
1109 | } | |
1110 | return ans; | |
1111 | } | |
1112 | ||
7fe9b0b7 | 1113 | int CmdGrid(const char *Cmd) |
1114 | { | |
e0165dcf | 1115 | sscanf(Cmd, "%i %i", &PlotGridX, &PlotGridY); |
1116 | PlotGridXdefault= PlotGridX; | |
1117 | PlotGridYdefault= PlotGridY; | |
1118 | RepaintGraphWindow(); | |
1119 | return 0; | |
7fe9b0b7 | 1120 | } |
1121 | ||
f9f0e83b | 1122 | int CmdSetGraphMarkers(const char *Cmd) { |
1123 | sscanf(Cmd, "%i %i", &CursorCPos, &CursorDPos); | |
1124 | RepaintGraphWindow(); | |
1125 | return 0; | |
1126 | } | |
1127 | ||
7fe9b0b7 | 1128 | int CmdHexsamples(const char *Cmd) |
1129 | { | |
e0165dcf | 1130 | int i, j; |
1131 | int requested = 0; | |
1132 | int offset = 0; | |
1133 | char string_buf[25]; | |
1134 | char* string_ptr = string_buf; | |
1135 | uint8_t got[BIGBUF_SIZE]; | |
1136 | ||
1137 | sscanf(Cmd, "%i %i", &requested, &offset); | |
1138 | ||
1139 | /* if no args send something */ | |
1140 | if (requested == 0) { | |
1141 | requested = 8; | |
1142 | } | |
1143 | if (offset + requested > sizeof(got)) { | |
1144 | PrintAndLog("Tried to read past end of buffer, <bytes> + <offset> > %d", BIGBUF_SIZE); | |
1145 | return 0; | |
1146 | } | |
1147 | ||
1148 | GetFromBigBuf(got,requested,offset); | |
1149 | WaitForResponse(CMD_ACK,NULL); | |
1150 | ||
1151 | i = 0; | |
1152 | for (j = 0; j < requested; j++) { | |
1153 | i++; | |
1154 | string_ptr += sprintf(string_ptr, "%02x ", got[j]); | |
1155 | if (i == 8) { | |
1156 | *(string_ptr - 1) = '\0'; // remove the trailing space | |
1157 | PrintAndLog("%s", string_buf); | |
1158 | string_buf[0] = '\0'; | |
1159 | string_ptr = string_buf; | |
1160 | i = 0; | |
1161 | } | |
1162 | if (j == requested - 1 && string_buf[0] != '\0') { // print any remaining bytes | |
1163 | *(string_ptr - 1) = '\0'; | |
1164 | PrintAndLog("%s", string_buf); | |
1165 | string_buf[0] = '\0'; | |
1166 | } | |
1167 | } | |
1168 | return 0; | |
7fe9b0b7 | 1169 | } |
1170 | ||
7fe9b0b7 | 1171 | int CmdHide(const char *Cmd) |
1172 | { | |
e0165dcf | 1173 | HideGraphWindow(); |
1174 | return 0; | |
7fe9b0b7 | 1175 | } |
1176 | ||
78f5b1a7 | 1177 | //zero mean GraphBuffer |
7fe9b0b7 | 1178 | int CmdHpf(const char *Cmd) |
1179 | { | |
e0165dcf | 1180 | int i; |
1181 | int accum = 0; | |
7fe9b0b7 | 1182 | |
e0165dcf | 1183 | for (i = 10; i < GraphTraceLen; ++i) |
1184 | accum += GraphBuffer[i]; | |
1185 | accum /= (GraphTraceLen - 10); | |
1186 | for (i = 0; i < GraphTraceLen; ++i) | |
1187 | GraphBuffer[i] -= accum; | |
7fe9b0b7 | 1188 | |
e0165dcf | 1189 | RepaintGraphWindow(); |
1190 | return 0; | |
7fe9b0b7 | 1191 | } |
f6d9fb17 | 1192 | |
f6821167 | 1193 | uint8_t getByte(uint8_t bits_per_sample, BitstreamIn* b) |
f6d9fb17 MHS |
1194 | { |
1195 | int i; | |
1196 | uint8_t val = 0; | |
1197 | for(i =0 ; i < bits_per_sample; i++) | |
1198 | { | |
f6821167 | 1199 | val |= (headBit(b) << (7-i)); |
f6d9fb17 MHS |
1200 | } |
1201 | return val; | |
1202 | } | |
7fe9b0b7 | 1203 | |
1fbf8956 | 1204 | int getSamples(const char *Cmd, bool silent) |
7fe9b0b7 | 1205 | { |
e0165dcf | 1206 | //If we get all but the last byte in bigbuf, |
1207 | // we don't have to worry about remaining trash | |
1208 | // in the last byte in case the bits-per-sample | |
1209 | // does not line up on byte boundaries | |
1210 | ||
1211 | uint8_t got[BIGBUF_SIZE-1] = { 0 }; | |
1212 | ||
1213 | int n = strtol(Cmd, NULL, 0); | |
1214 | ||
709665b5 | 1215 | if (n == 0 || n > sizeof(got)) |
e0165dcf | 1216 | n = sizeof(got); |
1217 | ||
1218 | PrintAndLog("Reading %d bytes from device memory\n", n); | |
1219 | GetFromBigBuf(got,n,0); | |
1220 | PrintAndLog("Data fetched"); | |
1221 | UsbCommand response; | |
1222 | WaitForResponse(CMD_ACK, &response); | |
1223 | uint8_t bits_per_sample = 8; | |
1224 | ||
1225 | //Old devices without this feature would send 0 at arg[0] | |
1226 | if(response.arg[0] > 0) | |
1227 | { | |
1228 | sample_config *sc = (sample_config *) response.d.asBytes; | |
1229 | PrintAndLog("Samples @ %d bits/smpl, decimation 1:%d ", sc->bits_per_sample | |
1230 | , sc->decimation); | |
1231 | bits_per_sample = sc->bits_per_sample; | |
1232 | } | |
1233 | if(bits_per_sample < 8) | |
1234 | { | |
1235 | PrintAndLog("Unpacking..."); | |
f6821167 | 1236 | BitstreamIn bout = { got, bits_per_sample * n, 0}; |
e0165dcf | 1237 | int j =0; |
e6432f05 | 1238 | for (j = 0; j * bits_per_sample < n * 8 && j < n; j++) { |
e0165dcf | 1239 | uint8_t sample = getByte(bits_per_sample, &bout); |
1240 | GraphBuffer[j] = ((int) sample )- 128; | |
1241 | } | |
1242 | GraphTraceLen = j; | |
1243 | PrintAndLog("Unpacked %d samples" , j ); | |
1244 | }else | |
1245 | { | |
1246 | for (int j = 0; j < n; j++) { | |
1247 | GraphBuffer[j] = ((int)got[j]) - 128; | |
1248 | } | |
1249 | GraphTraceLen = n; | |
1250 | } | |
1251 | ||
1252 | RepaintGraphWindow(); | |
1253 | return 0; | |
1fbf8956 | 1254 | } |
1255 | ||
1256 | int CmdSamples(const char *Cmd) | |
1257 | { | |
e0165dcf | 1258 | return getSamples(Cmd, false); |
7fe9b0b7 | 1259 | } |
1260 | ||
d6a120a2 MHS |
1261 | int CmdTuneSamples(const char *Cmd) |
1262 | { | |
fdcfbdcc RAB |
1263 | int timeout = 0, arg = FLAG_TUNE_ALL; |
1264 | ||
1265 | if(*Cmd == 'l') { | |
1266 | arg = FLAG_TUNE_LF; | |
1267 | } else if (*Cmd == 'h') { | |
1268 | arg = FLAG_TUNE_HF; | |
1269 | } else if (*Cmd != '\0') { | |
1270 | PrintAndLog("use 'tune' or 'tune l' or 'tune h'"); | |
1271 | return 0; | |
1272 | } | |
1273 | ||
3aa4014b | 1274 | printf("\nMeasuring antenna characteristics, please wait..."); |
ba1a299c | 1275 | |
fdcfbdcc | 1276 | UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING, {arg, 0, 0}}; |
3aa4014b | 1277 | SendCommand(&c); |
1278 | ||
1279 | UsbCommand resp; | |
1280 | while(!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING,&resp,1000)) { | |
1281 | timeout++; | |
1282 | printf("."); | |
1283 | if (timeout > 7) { | |
1284 | PrintAndLog("\nNo response from Proxmark. Aborting..."); | |
1285 | return 1; | |
1286 | } | |
1287 | } | |
1288 | ||
1289 | int peakv, peakf; | |
1290 | int vLf125, vLf134, vHf; | |
1291 | vLf125 = resp.arg[0] & 0xffff; | |
1292 | vLf134 = resp.arg[0] >> 16; | |
1293 | vHf = resp.arg[1] & 0xffff;; | |
1294 | peakf = resp.arg[2] & 0xffff; | |
1295 | peakv = resp.arg[2] >> 16; | |
1296 | PrintAndLog(""); | |
1297 | PrintAndLog("# LF antenna: %5.2f V @ 125.00 kHz", vLf125/1000.0); | |
1298 | PrintAndLog("# LF antenna: %5.2f V @ 134.00 kHz", vLf134/1000.0); | |
1299 | PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1)); | |
1300 | PrintAndLog("# HF antenna: %5.2f V @ 13.56 MHz", vHf/1000.0); | |
0d0d0499 | 1301 | |
2767fc02 | 1302 | #define LF_UNUSABLE_V 2948 // was 2000. Changed due to bugfix in voltage measurements. LF results are now 47% higher. |
1303 | #define LF_MARGINAL_V 14739 // was 10000. Changed due to bugfix bug in voltage measurements. LF results are now 47% higher. | |
1304 | #define HF_UNUSABLE_V 3167 // was 2000. Changed due to bugfix in voltage measurements. HF results are now 58% higher. | |
1305 | #define HF_MARGINAL_V 7917 // was 5000. Changed due to bugfix in voltage measurements. HF results are now 58% higher. | |
0d0d0499 | 1306 | |
1307 | if (peakv < LF_UNUSABLE_V) | |
3aa4014b | 1308 | PrintAndLog("# Your LF antenna is unusable."); |
0d0d0499 | 1309 | else if (peakv < LF_MARGINAL_V) |
3aa4014b | 1310 | PrintAndLog("# Your LF antenna is marginal."); |
0d0d0499 | 1311 | if (vHf < HF_UNUSABLE_V) |
3aa4014b | 1312 | PrintAndLog("# Your HF antenna is unusable."); |
0d0d0499 | 1313 | else if (vHf < HF_MARGINAL_V) |
3aa4014b | 1314 | PrintAndLog("# Your HF antenna is marginal."); |
1315 | ||
0d0d0499 | 1316 | if (peakv >= LF_UNUSABLE_V) { |
1317 | for (int i = 0; i < 256; i++) { | |
1318 | GraphBuffer[i] = resp.d.asBytes[i] - 128; | |
1319 | } | |
1320 | PrintAndLog("Displaying LF tuning graph. Divisor 89 is 134khz, 95 is 125khz.\n"); | |
1321 | PrintAndLog("\n"); | |
1322 | GraphTraceLen = 256; | |
1323 | ShowGraphWindow(); | |
abd16c45 | 1324 | RepaintGraphWindow(); |
ba1a299c | 1325 | } |
1326 | ||
b4fb11ba | 1327 | return 0; |
d6a120a2 MHS |
1328 | } |
1329 | ||
3aa4014b | 1330 | |
7fe9b0b7 | 1331 | int CmdLoad(const char *Cmd) |
1332 | { | |
e0165dcf | 1333 | char filename[FILE_PATH_SIZE] = {0x00}; |
1334 | int len = 0; | |
b915fda3 | 1335 | |
e0165dcf | 1336 | len = strlen(Cmd); |
1337 | if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE; | |
1338 | memcpy(filename, Cmd, len); | |
b915fda3 | 1339 | |
e0165dcf | 1340 | FILE *f = fopen(filename, "r"); |
1341 | if (!f) { | |
1342 | PrintAndLog("couldn't open '%s'", filename); | |
1343 | return 0; | |
1344 | } | |
1345 | ||
1346 | GraphTraceLen = 0; | |
1347 | char line[80]; | |
1348 | while (fgets(line, sizeof (line), f)) { | |
1349 | GraphBuffer[GraphTraceLen] = atoi(line); | |
1350 | GraphTraceLen++; | |
1351 | } | |
1352 | fclose(f); | |
1353 | PrintAndLog("loaded %d samples", GraphTraceLen); | |
1354 | RepaintGraphWindow(); | |
1355 | return 0; | |
7fe9b0b7 | 1356 | } |
1357 | ||
1358 | int CmdLtrim(const char *Cmd) | |
1359 | { | |
e0165dcf | 1360 | int ds = atoi(Cmd); |
cc15a118 | 1361 | if (GraphTraceLen<=0) return 0; |
e0165dcf | 1362 | for (int i = ds; i < GraphTraceLen; ++i) |
1363 | GraphBuffer[i-ds] = GraphBuffer[i]; | |
1364 | GraphTraceLen -= ds; | |
7fe9b0b7 | 1365 | |
e0165dcf | 1366 | RepaintGraphWindow(); |
1367 | return 0; | |
7fe9b0b7 | 1368 | } |
ec75f5c1 | 1369 | |
1370 | // trim graph to input argument length | |
9ec1416a | 1371 | int CmdRtrim(const char *Cmd) |
1372 | { | |
e0165dcf | 1373 | int ds = atoi(Cmd); |
9ec1416a | 1374 | |
e0165dcf | 1375 | GraphTraceLen = ds; |
9ec1416a | 1376 | |
e0165dcf | 1377 | RepaintGraphWindow(); |
1378 | return 0; | |
9ec1416a | 1379 | } |
7fe9b0b7 | 1380 | |
f75b313b | 1381 | // trim graph (middle) piece |
1382 | int CmdMtrim(const char *Cmd) { | |
1383 | int start = 0, stop = 0; | |
1384 | sscanf(Cmd, "%i %i", &start, &stop); | |
1385 | ||
1386 | if (start > GraphTraceLen || stop > GraphTraceLen || start > stop) return 0; | |
1387 | start++; //leave start position sample | |
1388 | ||
1389 | GraphTraceLen -= stop - start; | |
1390 | for (int i = 0; i < GraphTraceLen; i++) { | |
1391 | GraphBuffer[start+i] = GraphBuffer[stop+i]; | |
1392 | } | |
1393 | return 0; | |
1394 | } | |
1395 | ||
1396 | ||
7fe9b0b7 | 1397 | int CmdNorm(const char *Cmd) |
1398 | { | |
e0165dcf | 1399 | int i; |
1400 | int max = INT_MIN, min = INT_MAX; | |
7fe9b0b7 | 1401 | |
e0165dcf | 1402 | for (i = 10; i < GraphTraceLen; ++i) { |
1403 | if (GraphBuffer[i] > max) | |
1404 | max = GraphBuffer[i]; | |
1405 | if (GraphBuffer[i] < min) | |
1406 | min = GraphBuffer[i]; | |
1407 | } | |
7fe9b0b7 | 1408 | |
e0165dcf | 1409 | if (max != min) { |
1410 | for (i = 0; i < GraphTraceLen; ++i) { | |
ba1a299c | 1411 | GraphBuffer[i] = (GraphBuffer[i] - ((max + min) / 2)) * 256 / |
e0165dcf | 1412 | (max - min); |
ba1a299c | 1413 | //marshmelow: adjusted *1000 to *256 to make +/- 128 so demod commands still work |
e0165dcf | 1414 | } |
1415 | } | |
1416 | RepaintGraphWindow(); | |
1417 | return 0; | |
7fe9b0b7 | 1418 | } |
1419 | ||
1420 | int CmdPlot(const char *Cmd) | |
1421 | { | |
e0165dcf | 1422 | ShowGraphWindow(); |
1423 | return 0; | |
7fe9b0b7 | 1424 | } |
1425 | ||
1426 | int CmdSave(const char *Cmd) | |
1427 | { | |
e0165dcf | 1428 | char filename[FILE_PATH_SIZE] = {0x00}; |
1429 | int len = 0; | |
b915fda3 | 1430 | |
e0165dcf | 1431 | len = strlen(Cmd); |
1432 | if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE; | |
1433 | memcpy(filename, Cmd, len); | |
1434 | ||
b915fda3 | 1435 | |
e0165dcf | 1436 | FILE *f = fopen(filename, "w"); |
1437 | if(!f) { | |
1438 | PrintAndLog("couldn't open '%s'", filename); | |
1439 | return 0; | |
1440 | } | |
1441 | int i; | |
1442 | for (i = 0; i < GraphTraceLen; i++) { | |
1443 | fprintf(f, "%d\n", GraphBuffer[i]); | |
1444 | } | |
1445 | fclose(f); | |
1446 | PrintAndLog("saved to '%s'", Cmd); | |
1447 | return 0; | |
7fe9b0b7 | 1448 | } |
1449 | ||
1450 | int CmdScale(const char *Cmd) | |
1451 | { | |
e0165dcf | 1452 | CursorScaleFactor = atoi(Cmd); |
1453 | if (CursorScaleFactor == 0) { | |
1454 | PrintAndLog("bad, can't have zero scale"); | |
1455 | CursorScaleFactor = 1; | |
1456 | } | |
1457 | RepaintGraphWindow(); | |
1458 | return 0; | |
7fe9b0b7 | 1459 | } |
1460 | ||
d51b2eda MHS |
1461 | int CmdDirectionalThreshold(const char *Cmd) |
1462 | { | |
e0165dcf | 1463 | int8_t upThres = param_get8(Cmd, 0); |
1464 | int8_t downThres = param_get8(Cmd, 1); | |
1465 | ||
1466 | printf("Applying Up Threshold: %d, Down Threshold: %d\n", upThres, downThres); | |
1467 | ||
1468 | int lastValue = GraphBuffer[0]; | |
1469 | GraphBuffer[0] = 0; // Will be changed at the end, but init 0 as we adjust to last samples value if no threshold kicks in. | |
1470 | ||
1471 | for (int i = 1; i < GraphTraceLen; ++i) { | |
1472 | // Apply first threshold to samples heading up | |
1473 | if (GraphBuffer[i] >= upThres && GraphBuffer[i] > lastValue) | |
1474 | { | |
1475 | lastValue = GraphBuffer[i]; // Buffer last value as we overwrite it. | |
127f1490 | 1476 | GraphBuffer[i] = 127; |
e0165dcf | 1477 | } |
1478 | // Apply second threshold to samples heading down | |
1479 | else if (GraphBuffer[i] <= downThres && GraphBuffer[i] < lastValue) | |
1480 | { | |
1481 | lastValue = GraphBuffer[i]; // Buffer last value as we overwrite it. | |
127f1490 | 1482 | GraphBuffer[i] = -127; |
e0165dcf | 1483 | } |
1484 | else | |
1485 | { | |
1486 | lastValue = GraphBuffer[i]; // Buffer last value as we overwrite it. | |
1487 | GraphBuffer[i] = GraphBuffer[i-1]; | |
1488 | ||
1489 | } | |
1490 | } | |
1491 | GraphBuffer[0] = GraphBuffer[1]; // Aline with first edited sample. | |
1492 | RepaintGraphWindow(); | |
1493 | return 0; | |
d51b2eda MHS |
1494 | } |
1495 | ||
7fe9b0b7 | 1496 | int CmdZerocrossings(const char *Cmd) |
1497 | { | |
e0165dcf | 1498 | // Zero-crossings aren't meaningful unless the signal is zero-mean. |
1499 | CmdHpf(""); | |
1500 | ||
1501 | int sign = 1; | |
1502 | int zc = 0; | |
1503 | int lastZc = 0; | |
1504 | ||
1505 | for (int i = 0; i < GraphTraceLen; ++i) { | |
1506 | if (GraphBuffer[i] * sign >= 0) { | |
1507 | // No change in sign, reproduce the previous sample count. | |
1508 | zc++; | |
1509 | GraphBuffer[i] = lastZc; | |
1510 | } else { | |
1511 | // Change in sign, reset the sample count. | |
1512 | sign = -sign; | |
1513 | GraphBuffer[i] = lastZc; | |
1514 | if (sign > 0) { | |
1515 | lastZc = zc; | |
1516 | zc = 0; | |
1517 | } | |
1518 | } | |
1519 | } | |
1520 | ||
1521 | RepaintGraphWindow(); | |
1522 | return 0; | |
7fe9b0b7 | 1523 | } |
1524 | ||
f6821167 MHS |
1525 | int usage_data_bin2hex(){ |
1526 | PrintAndLog("Usage: data bin2hex <binary_digits>"); | |
1527 | PrintAndLog(" This function will ignore all characters not 1 or 0 (but stop reading on whitespace)"); | |
1528 | return 0; | |
1529 | } | |
1530 | ||
1531 | /** | |
1532 | * @brief Utility for conversion via cmdline. | |
1533 | * @param Cmd | |
1534 | * @return | |
1535 | */ | |
1536 | int Cmdbin2hex(const char *Cmd) | |
1537 | { | |
1538 | int bg =0, en =0; | |
1539 | if(param_getptr(Cmd, &bg, &en, 0)) | |
1540 | { | |
1541 | return usage_data_bin2hex(); | |
1542 | } | |
1543 | //Number of digits supplied as argument | |
1544 | size_t length = en - bg +1; | |
1545 | size_t bytelen = (length+7) / 8; | |
1546 | uint8_t* arr = (uint8_t *) malloc(bytelen); | |
1547 | memset(arr, 0, bytelen); | |
1548 | BitstreamOut bout = { arr, 0, 0 }; | |
1549 | ||
1550 | for(; bg <= en ;bg++) | |
1551 | { | |
1552 | char c = Cmd[bg]; | |
1553 | if( c == '1') pushBit(&bout, 1); | |
1554 | else if( c == '0') pushBit(&bout, 0); | |
1555 | else PrintAndLog("Ignoring '%c'", c); | |
1556 | } | |
1557 | ||
1558 | if(bout.numbits % 8 != 0) | |
1559 | { | |
1560 | printf("[padded with %d zeroes]\n", 8-(bout.numbits % 8)); | |
1561 | } | |
1562 | ||
1563 | //Uses printf instead of PrintAndLog since the latter | |
1564 | // adds linebreaks to each printout - this way was more convenient since we don't have to | |
1565 | // allocate a string and write to that first... | |
1566 | for(size_t x = 0; x < bytelen ; x++) | |
1567 | { | |
1568 | printf("%02X", arr[x]); | |
1569 | } | |
1570 | printf("\n"); | |
1571 | free(arr); | |
1572 | return 0; | |
1573 | } | |
1574 | ||
72c5877a | 1575 | int usage_data_hex2bin() { |
1576 | PrintAndLog("Usage: data hex2bin <hex_digits>"); | |
f6821167 MHS |
1577 | PrintAndLog(" This function will ignore all non-hexadecimal characters (but stop reading on whitespace)"); |
1578 | return 0; | |
1579 | ||
1580 | } | |
1581 | ||
1582 | int Cmdhex2bin(const char *Cmd) | |
1583 | { | |
1584 | int bg =0, en =0; | |
1585 | if(param_getptr(Cmd, &bg, &en, 0)) | |
1586 | { | |
1587 | return usage_data_hex2bin(); | |
1588 | } | |
1589 | ||
1590 | ||
1591 | while(bg <= en ) | |
1592 | { | |
1593 | char x = Cmd[bg++]; | |
1594 | // capitalize | |
1595 | if (x >= 'a' && x <= 'f') | |
1596 | x -= 32; | |
1597 | // convert to numeric value | |
1598 | if (x >= '0' && x <= '9') | |
1599 | x -= '0'; | |
1600 | else if (x >= 'A' && x <= 'F') | |
1601 | x -= 'A' - 10; | |
1602 | else | |
1603 | continue; | |
1604 | ||
1605 | //Uses printf instead of PrintAndLog since the latter | |
1606 | // adds linebreaks to each printout - this way was more convenient since we don't have to | |
1607 | // allocate a string and write to that first... | |
1608 | ||
1609 | for(int i= 0 ; i < 4 ; ++i) | |
1610 | printf("%d",(x >> (3 - i)) & 1); | |
1611 | } | |
1612 | printf("\n"); | |
1613 | ||
1614 | return 0; | |
1615 | } | |
1616 | ||
ba1a299c | 1617 | static command_t CommandTable[] = |
7fe9b0b7 | 1618 | { |
e0165dcf | 1619 | {"help", CmdHelp, 1, "This help"}, |
49bbc60a | 1620 | {"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 | 1621 | {"autocorr", CmdAutoCorr, 1, "[window length] [g] -- Autocorrelation over window - g to save back to GraphBuffer (overwrite)"}, |
fef74fdc | 1622 | {"biphaserawdecode",CmdBiphaseDecodeRaw,1, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"}, |
5d01f50a | 1623 | {"bin2hex", Cmdbin2hex, 1, "bin2hex <digits> -- Converts binary to hexadecimal"}, |
e0165dcf | 1624 | {"bitsamples", CmdBitsamples, 0, "Get raw samples as bitstring"}, |
e0165dcf | 1625 | {"buffclear", CmdBuffClear, 1, "Clear sample buffer and graph window"}, |
1626 | {"dec", CmdDec, 1, "Decimate samples"}, | |
1627 | {"detectclock", CmdDetectClockRate, 1, "[modulation] Detect clock rate of wave in GraphBuffer (options: 'a','f','n','p' for ask, fsk, nrz, psk respectively)"}, | |
e0165dcf | 1628 | //{"fskfcdetect", CmdFSKfcDetect, 1, "Try to detect the Field Clock of an FSK wave"}, |
e0165dcf | 1629 | {"fskparadoxdemod", CmdFSKdemodParadox, 1, "Demodulate a Paradox FSK tag from GraphBuffer"}, |
1630 | {"getbitstream", CmdGetBitStream, 1, "Convert GraphBuffer's >=1 values to 1 and <1 to 0"}, | |
1631 | {"grid", CmdGrid, 1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"}, | |
1632 | {"hexsamples", CmdHexsamples, 0, "<bytes> [<offset>] -- Dump big buffer as hex bytes"}, | |
f6821167 | 1633 | {"hex2bin", Cmdhex2bin, 1, "hex2bin <hexadecimal> -- Converts hexadecimal to binary"}, |
e0165dcf | 1634 | {"hide", CmdHide, 1, "Hide graph window"}, |
1635 | {"hpf", CmdHpf, 1, "Remove DC offset from trace"}, | |
1636 | {"load", CmdLoad, 1, "<filename> -- Load trace (to graph window"}, | |
1637 | {"ltrim", CmdLtrim, 1, "<samples> -- Trim samples from left of trace"}, | |
1638 | {"rtrim", CmdRtrim, 1, "<location to end trace> -- Trim samples from right of trace"}, | |
f75b313b | 1639 | {"mtrim", CmdMtrim, 1, "<start> <stop> -- Trim out samples from the specified start to the specified stop"}, |
fef74fdc | 1640 | {"manrawdecode", Cmdmandecoderaw, 1, "[invert] [maxErr] -- Manchester decode binary stream in DemodBuffer"}, |
e0165dcf | 1641 | {"norm", CmdNorm, 1, "Normalize max/min to +/-128"}, |
1642 | {"plot", CmdPlot, 1, "Show graph window (hit 'h' in window for keystroke help)"}, | |
ace26dbd | 1643 | {"printdemodbuffer",CmdPrintDemodBuff, 1, "[x] [o] <offset> [l] <length> -- print the data in the DemodBuffer - 'x' for hex output"}, |
411105e0 | 1644 | {"psknexwatchdemod",CmdPSKNexWatch, 1, "Demodulate a NexWatch tag (nexkey, quadrakey) (PSK1) from GraphBuffer"}, |
e0165dcf | 1645 | {"rawdemod", CmdRawDemod, 1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"}, |
1646 | {"samples", CmdSamples, 0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"}, | |
1647 | {"save", CmdSave, 1, "<filename> -- Save trace (from graph window)"}, | |
f9f0e83b | 1648 | {"setgraphmarkers", CmdSetGraphMarkers, 1, "[orange_marker] [blue_marker] (in graph window)"}, |
e0165dcf | 1649 | {"scale", CmdScale, 1, "<int> -- Set cursor display scale"}, |
709665b5 | 1650 | {"setdebugmode", CmdSetDebugMode, 1, "<0|1|2> -- Turn on or off Debugging Level for lf demods"}, |
e0165dcf | 1651 | {"shiftgraphzero", CmdGraphShiftZero, 1, "<shift> -- Shift 0 for Graphed wave + or - shift value"}, |
e0165dcf | 1652 | {"dirthreshold", CmdDirectionalThreshold, 1, "<thres up> <thres down> -- Max rising higher up-thres/ Min falling lower down-thres, keep rest as prev."}, |
1653 | {"tune", CmdTuneSamples, 0, "Get hw tune samples for graph window"}, | |
1654 | {"undec", CmdUndec, 1, "Un-decimate samples by 2"}, | |
1655 | {"zerocrossings", CmdZerocrossings, 1, "Count time between zero-crossings"}, | |
1656 | {NULL, NULL, 0, NULL} | |
7fe9b0b7 | 1657 | }; |
1658 | ||
1659 | int CmdData(const char *Cmd) | |
1660 | { | |
e0165dcf | 1661 | CmdsParse(CommandTable, Cmd); |
1662 | return 0; | |
7fe9b0b7 | 1663 | } |
1664 | ||
1665 | int CmdHelp(const char *Cmd) | |
1666 | { | |
e0165dcf | 1667 | CmdsHelp(CommandTable); |
1668 | return 0; | |
7fe9b0b7 | 1669 | } |