RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-04-01 18:09:59 +08:00
Code Issues Projects Releases Packages Wiki Activity

make style

Browse source
This commit is contained in:
Philippe Teuwen 2021-12-13 00:35:10 +01:00
parent f2650e7279
commit 0673dd206e
3 changed files with 9 additions and 31 deletions

4
client/pyscripts/pm3_help2list.py
View file

@ -8,7 +8,7 @@ It is based on pm3_help2JSON.py by
Original Authors / Maintainers:
- Samuel Windall
This version
This version
- Iceman
Note:
@ -92,7 +92,7 @@ const static vocabulory_t vocabulory[] = {\n""")
args.output_file.write(""" {0, NULL}\n};
char **rl_command_completion(const char *text, int start, int end) {
char **rl_command_completion(const char *text, int start, int end) {
rl_attempted_completion_over = 1;
return rl_completion_matches (text, rl_command_generator);
}

12
client/src/rl_vocabulory.h
View file

@ -76,7 +76,6 @@ const static vocabulory_t vocabulory[] = {
{ 1, "data fsktonrz" },
{ 1, "data manrawdecode" },
{ 1, "data modulation" },
{ 1, "data pwmdemod" },
{ 1, "data rawdemod" },
{ 1, "data askedgedetect" },
{ 1, "data autocorr" },
@ -703,8 +702,8 @@ const static vocabulory_t vocabulory[] = {
};
char **rl_command_completion(const char *text, int start, int end) {
rl_attempted_completion_over = 0;
char **rl_command_completion(const char *text, int start, int end) {
rl_attempted_completion_over = 1;
return rl_completion_matches (text, rl_command_generator);
}
@ -732,12 +731,7 @@ char* rl_command_generator(const char *text, int state) {
index++;
if (strncmp (command, rl_line_buffer, rlen) == 0) {
const char *next = command + (rlen - len);
const char *space = strstr(next, " ");
if (space != NULL) {
return strndup(next, space - next);
}
return strdup(next);
return strdup(command + (rlen - len));
}
}

24
doc/commands.json
View file

@ -357,7 +357,7 @@
},
"data help": {
"command": "data help",
"description": "help this help ----------- ------------------------- modulation------------------------- biphaserawdecode biphase decode bin stream in demodbuffer detectclock detect ask, fsk, nrz, psk clock rate of wave in graphbuffer fsktonrz convert fsk2 to nrz wave for alternate fsk demodulating (for weak fsk) manrawdecode manchester decode binary stream in demodbuffer modulation identify lf signal for clock and modulation pwmdemod pwm demodulate the data in the graphbuffer and output binary rawdemod demodulate the data in the graphbuffer and output binary ----------- ------------------------- graph------------------------- askedgedetect adjust graph for manual ask demod using the length of sample differences to detect the edge of a wave autocorr autocorrelation over window dirthreshold max rising higher up-thres/ min falling lower down-thres, keep rest as prev. decimate decimate samples undecimate un-decimate samples hide hide graph window hpf remove dc offset from trace iir apply iir buttersworth filter on plot data grid overlay grid on graph window ltrim trim samples from left of trace mtrim trim out samples from the specified start to the specified stop norm normalize max/min to +/-128 plot show graph window rtrim trim samples from right of trace setgraphmarkers set blue and orange marker in graph window shiftgraphzero shift 0 for graphed wave + or - shift value timescale set a timescale to get a differential reading between the yellow and purple markers as time duration zerocrossings count time between zero-crossings convertbitstream convert graphbuffer's 0/1 values to 127 / -127 getbitstream convert graphbuffer's >=1 values to 1 and <1 to 0 ----------- ------------------------- general------------------------- asn1 asn1 decoder bin2hex converts binary to hexadecimal clear clears bigbuf on deviceside and graph window hex2bin converts hexadecimal to binary load load contents of file into graph window print print the data in the demodbuffer save save signal trace data (from graph window) setdebugmode set debugging level on client side --------------------------------------------------------------------------------------- data biphaserawdecode available offline: yes biphase decode binary stream in demodbuffer converts 10 or 01 -> 1 and 11 or 00 -> 0 - must have binary sequence in demodbuffer (run `data rawdemod --ar` before) - invert for conditional dephase encoding (cdp) aka differential manchester",
"description": "help this help ----------- ------------------------- modulation------------------------- biphaserawdecode biphase decode bin stream in demodbuffer detectclock detect ask, fsk, nrz, psk clock rate of wave in graphbuffer fsktonrz convert fsk2 to nrz wave for alternate fsk demodulating (for weak fsk) manrawdecode manchester decode binary stream in demodbuffer modulation identify lf signal for clock and modulation rawdemod demodulate the data in the graphbuffer and output binary ----------- ------------------------- graph------------------------- askedgedetect adjust graph for manual ask demod using the length of sample differences to detect the edge of a wave autocorr autocorrelation over window dirthreshold max rising higher up-thres/ min falling lower down-thres, keep rest as prev. decimate decimate samples undecimate un-decimate samples hide hide graph window hpf remove dc offset from trace iir apply iir buttersworth filter on plot data grid overlay grid on graph window ltrim trim samples from left of trace mtrim trim out samples from the specified start to the specified stop norm normalize max/min to +/-128 plot show graph window rtrim trim samples from right of trace setgraphmarkers set blue and orange marker in graph window shiftgraphzero shift 0 for graphed wave + or - shift value timescale set a timescale to get a differential reading between the yellow and purple markers as time duration zerocrossings count time between zero-crossings convertbitstream convert graphbuffer's 0/1 values to 127 / -127 getbitstream convert graphbuffer's >=1 values to 1 and <1 to 0 ----------- ------------------------- general------------------------- asn1 asn1 decoder bin2hex converts binary to hexadecimal clear clears bigbuf on deviceside and graph window hex2bin converts hexadecimal to binary load load contents of file into graph window print print the data in the demodbuffer save save signal trace data (from graph window) setdebugmode set debugging level on client side --------------------------------------------------------------------------------------- data biphaserawdecode available offline: yes biphase decode binary stream in demodbuffer converts 10 or 01 -> 1 and 11 or 00 -> 0 - must have binary sequence in demodbuffer (run `data rawdemod --ar` before) - invert for conditional dephase encoding (cdp) aka differential manchester",
"notes": [
"data biphaserawdecode -> decode biphase bitstream from the demodbuffer",
"data biphaserawdecode -oi -> decode biphase bitstream from the demodbuffer, adjust offset, and invert output"
@ -542,22 +542,6 @@
],
"usage": "data print [-hisx] [-o <dec>]"
},
"data pwmdemod": {
"command": "data pwmdemod",
"description": "pulse width demodulate the data in the graphbuffer and output binary",
"notes": [
"data pwmdemod",
"data pwmdemod -t 65 -> specify first wave index"
],
"offline": true,
"options": [
"-h, --help this help",
"-t, --tol <dec> set tolerance level (default 5)",
"-o, --one <dec> set samples width for one pulse (default auto)",
"-z, --zero <dec> set samples width for zero pulse (default auto)"
],
"usage": "data pwmdemod [-h] [-t <dec>] [-o <dec>] [-z <dec>]"
},
"data rawdemod": {
"command": "data rawdemod",
"description": "demodulate the data in the graphbuffer and output binary",
@ -992,7 +976,7 @@
},
"help": {
"command": "help",
"description": "help use `<command> help` for details of a command prefs { edit client/device preferences... } -------- ----------------------- technology ----------------------- analyse { analyse utils... } data { plot window / data buffer manipulation... } emv { emv iso-14443 / iso-7816... } hf { high frequency commands... } hw { hardware commands... } lf { low frequency commands... } nfc { nfc commands... } reveng { crc calculations from reveng software... } smart { smart card iso-7816 commands... } script { scripting commands... } trace { trace manipulation... } wiegand { wiegand format manipulation... } -------- ----------------------- general ----------------------- clear clear screen hints turn hints on / off msleep add a pause in milliseconds rem add a text line in log file quit exit exit program [=] session log /home/iceman/.proxmark3/logs/log_20211118.txt --------------------------------------------------------------------------------------- auto available offline: no run lf search / hf search / data plot / data save",
"description": "help use `<command> help` for details of a command prefs { edit client/device preferences... } -------- ----------------------- technology ----------------------- analyse { analyse utils... } data { plot window / data buffer manipulation... } emv { emv iso-14443 / iso-7816... } hf { high frequency commands... } hw { hardware commands... } lf { low frequency commands... } nfc { nfc commands... } reveng { crc calculations from reveng software... } smart { smart card iso-7816 commands... } script { scripting commands... } trace { trace manipulation... } wiegand { wiegand format manipulation... } -------- ----------------------- general ----------------------- clear clear screen hints turn hints on / off msleep add a pause in milliseconds rem add a text line in log file quit exit exit program [=] session log /home/phil/.proxmark3/logs/log_20211212.txt --------------------------------------------------------------------------------------- auto available offline: no run lf search / hf search / data plot / data save",
"notes": [
"auto"
],
@ -10055,8 +10039,8 @@
}
},
"metadata": {
"commands_extracted": 590,
"commands_extracted": 589,
"extracted_by": "PM3Help2JSON v1.00",
"extracted_on": "2021-11-18T23:46:29"
"extracted_on": "2021-12-12T23:34:36"
}
}