2010-02-21 08:47:22 +08:00
//-----------------------------------------------------------------------------
// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
2021-03-23 03:54:08 +08:00
// modified Marshmellow,
// modified Iceman 2019, 2020, 2021
2019-12-22 18:19:06 +08:00
//
2010-02-21 08:47:22 +08:00
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
// at your option, any later version. See the LICENSE.txt file for the text of
// the license.
//-----------------------------------------------------------------------------
// Data and Graph commands
//-----------------------------------------------------------------------------
2017-07-28 05:00:49 +08:00
# include "cmddata.h"
2019-08-08 22:57:33 +08:00
# include <stdio.h>
# include <string.h>
# include <limits.h> // for CmdNorm INT_MIN && INT_MAX
# include <math.h> // pow
# include <ctype.h> // tolower
2020-03-31 21:47:33 +08:00
# include "commonutil.h" // ARRAYLEN
# include "cmdparser.h" // for command_t
# include "ui.h" // for show graph controls
2020-05-03 06:33:28 +08:00
# include "proxgui.h"
2020-03-31 21:47:33 +08:00
# include "graph.h" // for graph data
2019-08-08 22:57:33 +08:00
# include "comms.h"
2020-03-31 21:47:33 +08:00
# include "lfdemod.h" // for demod code
2020-04-19 18:53:46 +08:00
# include "loclass/cipherutils.h" // for decimating samples in getsamples
2020-12-04 07:11:57 +08:00
# include "cmdlfem410x.h" // askem410xdecode
2020-03-31 21:47:33 +08:00
# include "fileutils.h" // searchFile
2020-03-31 21:33:07 +08:00
# include "mifare/ndef.h"
2020-04-19 16:56:16 +08:00
# include "cliparser.h"
2020-10-09 22:21:44 +08:00
# include "cmdlft55xx.h" // print...
2019-08-08 22:57:33 +08:00
2015-01-06 22:20:36 +08:00
uint8_t DemodBuffer [ MAX_DEMOD_BUF_LEN ] ;
2016-12-17 02:06:19 +08:00
size_t DemodBufferLen = 0 ;
2020-10-06 20:11:09 +08:00
int32_t g_DemodStartIdx = 0 ;
2017-11-10 02:15:56 +08:00
int g_DemodClock = 0 ;
2017-07-28 05:00:49 +08:00
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
static int CmdHelp ( const char * Cmd ) ;
2019-04-10 19:06:05 +08:00
static int usage_data_manrawdecode ( void ) {
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( NORMAL , " Usage: data manrawdecode [invert] [maxErr] " ) ;
PrintAndLogEx ( NORMAL , " Takes 10 and 01 and converts to 0 and 1 respectively " ) ;
PrintAndLogEx ( NORMAL , " --must have binary sequence in demodbuffer (run data askrawdemod first) " ) ;
PrintAndLogEx ( NORMAL , " [invert] invert output " ) ;
PrintAndLogEx ( NORMAL , " [maxErr] set number of errors allowed (default = 20) " ) ;
PrintAndLogEx ( NORMAL , " " ) ;
PrintAndLogEx ( NORMAL , " Example: data manrawdecode = decode manchester bitstream from the demodbuffer " ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2016-07-31 17:37:19 +08:00
}
2019-04-10 19:06:05 +08:00
static int usage_data_biphaserawdecode ( void ) {
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( NORMAL , " Usage: data biphaserawdecode [offset] [invert] [maxErr] " ) ;
PrintAndLogEx ( NORMAL , " Converts 10 or 01 to 1 and 11 or 00 to 0 " ) ;
PrintAndLogEx ( NORMAL , " --must have binary sequence in demodbuffer (run data askrawdemod first) " ) ;
PrintAndLogEx ( NORMAL , " --invert for Conditional Dephase Encoding (CDP) AKA Differential Manchester " ) ;
PrintAndLogEx ( NORMAL , " " ) ;
PrintAndLogEx ( NORMAL , " [offset <0|1>], set to 0 not to adjust start position or to 1 to adjust decode start position " ) ;
PrintAndLogEx ( NORMAL , " [invert <0|1>], set to 1 to invert output " ) ;
PrintAndLogEx ( NORMAL , " [maxErr int], set max errors tolerated - default=20 " ) ;
PrintAndLogEx ( NORMAL , " " ) ;
PrintAndLogEx ( NORMAL , " Example: data biphaserawdecode = decode biphase bitstream from the demodbuffer " ) ;
PrintAndLogEx ( NORMAL , " Example: data biphaserawdecode 1 1 = decode biphase bitstream from the demodbuffer, set offset, and invert output " ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2016-07-31 17:37:19 +08:00
}
2019-04-10 19:06:05 +08:00
static int usage_data_rawdemod ( void ) {
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( NORMAL , " Usage: data rawdemod [modulation] <help>|<options> " ) ;
2020-01-05 03:21:10 +08:00
PrintAndLogEx ( NORMAL , " [modulation] as 2 char, " ) ;
2020-04-22 08:22:55 +08:00
PrintAndLogEx ( NORMAL , " " _YELLOW_ ( " ab " ) " - ask/biphase " ) ;
PrintAndLogEx ( NORMAL , " " _YELLOW_ ( " am " ) " - ask/manchester " ) ;
PrintAndLogEx ( NORMAL , " " _YELLOW_ ( " ar " ) " - ask/raw " ) ;
PrintAndLogEx ( NORMAL , " " _YELLOW_ ( " fs " ) " - fsk " ) ;
PrintAndLogEx ( NORMAL , " " _YELLOW_ ( " nr " ) " - nrz/direct " ) ;
PrintAndLogEx ( NORMAL , " " _YELLOW_ ( " p1 " ) " - psk1 " ) ;
PrintAndLogEx ( NORMAL , " " _YELLOW_ ( " p2 " ) " - psk2 " ) ;
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( NORMAL , " <help> as 'h', prints the help for the specific modulation " ) ;
PrintAndLogEx ( NORMAL , " <options> see specific modulation help for optional parameters " ) ;
PrintAndLogEx ( NORMAL , " " ) ;
2020-01-05 03:21:10 +08:00
PrintAndLogEx ( NORMAL , " Example: " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod fs h = print help specific to fsk demod " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod fs = demod GraphBuffer using: fsk - autodetect " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod ab = demod GraphBuffer using: ask/biphase - autodetect " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod am = demod GraphBuffer using: ask/manchester - autodetect " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod ar = demod GraphBuffer using: ask/raw - autodetect " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod nr = demod GraphBuffer using: nrz/direct - autodetect " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod p1 = demod GraphBuffer using: psk1 - autodetect " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod p2 = demod GraphBuffer using: psk2 - autodetect " ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2016-07-31 17:37:19 +08:00
}
2019-04-10 19:06:05 +08:00
static int usage_data_rawdemod_am ( void ) {
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( NORMAL , " Usage: data rawdemod am <s> [clock] <invert> [maxError] [maxLen] [amplify] " ) ;
PrintAndLogEx ( NORMAL , " ['s'] optional, check for Sequence Terminator " ) ;
PrintAndLogEx ( NORMAL , " [set clock as integer] optional, if not set, autodetect " ) ;
PrintAndLogEx ( NORMAL , " <invert>, 1 to invert output " ) ;
PrintAndLogEx ( NORMAL , " [set maximum allowed errors], default = 100 " ) ;
PrintAndLogEx ( NORMAL , " [set maximum Samples to read], default = 32768 (512 bits at rf/64) " ) ;
PrintAndLogEx ( NORMAL , " <amplify>, 'a' to attempt demod with ask amplification, default = no amp " ) ;
PrintAndLogEx ( NORMAL , " " ) ;
2020-01-05 03:21:10 +08:00
PrintAndLogEx ( NORMAL , " Example: " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod am = demod an ask/manchester tag from GraphBuffer " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod am 32 = demod an ask/manchester tag from GraphBuffer using a clock of RF/32 " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod am 32 1 = demod an ask/manchester tag from GraphBuffer using a clock of RF/32 and inverting data " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod am 1 = demod an ask/manchester tag from GraphBuffer while inverting data " ) ;
PrintAndLogEx ( NORMAL , " 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 " ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2016-07-31 17:37:19 +08:00
}
2019-04-10 19:06:05 +08:00
static int usage_data_rawdemod_ab ( void ) {
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( NORMAL , " Usage: data rawdemod ab [offset] [clock] <invert> [maxError] [maxLen] <amplify> " ) ;
PrintAndLogEx ( NORMAL , " [offset], offset to begin biphase, default=0 " ) ;
PrintAndLogEx ( NORMAL , " [set clock as integer] optional, if not set, autodetect " ) ;
PrintAndLogEx ( NORMAL , " <invert>, 1 to invert output " ) ;
PrintAndLogEx ( NORMAL , " [set maximum allowed errors], default = 100 " ) ;
PrintAndLogEx ( NORMAL , " [set maximum Samples to read], default = 32768 (512 bits at rf/64) " ) ;
PrintAndLogEx ( NORMAL , " <amplify>, 'a' to attempt demod with ask amplification, default = no amp " ) ;
PrintAndLogEx ( NORMAL , " NOTE: <invert> can be entered as second or third argument " ) ;
PrintAndLogEx ( NORMAL , " NOTE: <amplify> can be entered as first, second or last argument " ) ;
PrintAndLogEx ( NORMAL , " NOTE: any other arg must have previous args set to work " ) ;
PrintAndLogEx ( NORMAL , " " ) ;
PrintAndLogEx ( NORMAL , " NOTE: --invert for Conditional Dephase Encoding (CDP) AKA Differential Manchester " ) ;
PrintAndLogEx ( NORMAL , " " ) ;
2020-01-05 03:21:10 +08:00
PrintAndLogEx ( NORMAL , " Example: " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod ab = demod an ask/biph tag from GraphBuffer " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod ab 0 a = demod an ask/biph tag from GraphBuffer, amplified " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod ab 1 32 = demod an ask/biph tag from GraphBuffer using an offset of 1 and a clock of RF/32 " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod ab 0 32 1 = demod an ask/biph tag from GraphBuffer using a clock of RF/32 and inverting data " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod ab 0 1 = demod an ask/biph tag from GraphBuffer while inverting data " ) ;
PrintAndLogEx ( NORMAL , " 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 " ) ;
PrintAndLogEx ( NORMAL , " 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 " ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2016-07-31 17:37:19 +08:00
}
2019-04-10 19:06:05 +08:00
static int usage_data_rawdemod_ar ( void ) {
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( NORMAL , " Usage: data rawdemod ar [clock] <invert> [maxError] [maxLen] [amplify] " ) ;
PrintAndLogEx ( NORMAL , " [set clock as integer] optional, if not set, autodetect " ) ;
PrintAndLogEx ( NORMAL , " <invert>, 1 to invert output " ) ;
PrintAndLogEx ( NORMAL , " [set maximum allowed errors], default = 100 " ) ;
PrintAndLogEx ( NORMAL , " [set maximum Samples to read], default = 32768 (1024 bits at rf/64) " ) ;
PrintAndLogEx ( NORMAL , " <amplify>, 'a' to attempt demod with ask amplification, default = no amp " ) ;
PrintAndLogEx ( NORMAL , " " ) ;
2020-01-05 03:21:10 +08:00
PrintAndLogEx ( NORMAL , " Example: " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod ar = demod an ask tag from GraphBuffer " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod ar a = demod an ask tag from GraphBuffer, amplified " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod ar 32 = demod an ask tag from GraphBuffer using a clock of RF/32 " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod ar 32 1 = demod an ask tag from GraphBuffer using a clock of RF/32 and inverting data " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod ar 1 = demod an ask tag from GraphBuffer while inverting data " ) ;
PrintAndLogEx ( NORMAL , " 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 " ) ;
PrintAndLogEx ( NORMAL , " 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 " ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2016-07-31 17:37:19 +08:00
}
2019-04-10 19:06:05 +08:00
static int usage_data_rawdemod_fs ( void ) {
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( NORMAL , " Usage: data rawdemod fs [clock] <invert> [fchigh] [fclow] " ) ;
PrintAndLogEx ( NORMAL , " [set clock as integer] optional, omit for autodetect. " ) ;
PrintAndLogEx ( NORMAL , " <invert>, 1 for invert output, can be used even if the clock is omitted " ) ;
PrintAndLogEx ( NORMAL , " [fchigh], larger field clock length, omit for autodetect " ) ;
PrintAndLogEx ( NORMAL , " [fclow], small field clock length, omit for autodetect " ) ;
PrintAndLogEx ( NORMAL , " " ) ;
2020-01-05 03:21:10 +08:00
PrintAndLogEx ( NORMAL , " Example: " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod fs = demod an fsk tag from GraphBuffer using autodetect " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod fs 32 = demod an fsk tag from GraphBuffer using a clock of RF/32, autodetect fc " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod fs 1 = demod an fsk tag from GraphBuffer using autodetect, invert output " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod fs 32 1 = demod an fsk tag from GraphBuffer using a clock of RF/32, invert output, autodetect fc " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod fs 64 0 8 5 = demod an fsk1 RF/64 tag from GraphBuffer " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod fs 50 0 10 8 = demod an fsk2 RF/50 tag from GraphBuffer " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod fs 50 1 10 8 = demod an fsk2a RF/50 tag from GraphBuffer " ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2016-07-31 17:37:19 +08:00
}
2019-04-10 19:06:05 +08:00
static int usage_data_rawdemod_nr ( void ) {
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( NORMAL , " Usage: data rawdemod nr [clock] <0|1> [maxError] " ) ;
PrintAndLogEx ( NORMAL , " [set clock as integer] optional, if not set, autodetect. " ) ;
PrintAndLogEx ( NORMAL , " <invert>, 1 for invert output " ) ;
PrintAndLogEx ( NORMAL , " [set maximum allowed errors], default = 100. " ) ;
PrintAndLogEx ( NORMAL , " " ) ;
2020-01-05 03:21:10 +08:00
PrintAndLogEx ( NORMAL , " Example: " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod nr = demod a nrz/direct tag from GraphBuffer " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod nr 32 = demod a nrz/direct tag from GraphBuffer using a clock of RF/32 " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod nr 32 1 = demod a nrz/direct tag from GraphBuffer using a clock of RF/32 and inverting data " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod nr 1 = demod a nrz/direct tag from GraphBuffer while inverting data " ) ;
PrintAndLogEx ( NORMAL , " 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 " ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2016-07-31 17:37:19 +08:00
}
2019-04-10 19:06:05 +08:00
static int usage_data_rawdemod_p1 ( void ) {
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( NORMAL , " Usage: data rawdemod p1 [clock] <0|1> [maxError] " ) ;
PrintAndLogEx ( NORMAL , " [set clock as integer] optional, if not set, autodetect. " ) ;
PrintAndLogEx ( NORMAL , " <invert>, 1 for invert output " ) ;
PrintAndLogEx ( NORMAL , " [set maximum allowed errors], default = 100. " ) ;
PrintAndLogEx ( NORMAL , " " ) ;
2020-01-05 03:21:10 +08:00
PrintAndLogEx ( NORMAL , " Example: " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod p1 = demod a psk1 tag from GraphBuffer " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod p1 32 = demod a psk1 tag from GraphBuffer using a clock of RF/32 " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod p1 32 1 = demod a psk1 tag from GraphBuffer using a clock of RF/32 and inverting data " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod p1 1 = demod a psk1 tag from GraphBuffer while inverting data " ) ;
PrintAndLogEx ( NORMAL , " 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 " ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2016-07-31 17:37:19 +08:00
}
2019-04-10 19:06:05 +08:00
static int usage_data_rawdemod_p2 ( void ) {
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( NORMAL , " Usage: data rawdemod p2 [clock] <0|1> [maxError] " ) ;
PrintAndLogEx ( NORMAL , " [set clock as integer] optional, if not set, autodetect. " ) ;
PrintAndLogEx ( NORMAL , " <invert>, 1 for invert output " ) ;
PrintAndLogEx ( NORMAL , " [set maximum allowed errors], default = 100. " ) ;
PrintAndLogEx ( NORMAL , " " ) ;
2020-01-05 03:21:10 +08:00
PrintAndLogEx ( NORMAL , " Example: " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod p2 = demod a psk2 tag from GraphBuffer, autodetect clock " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod p2 32 = demod a psk2 tag from GraphBuffer using a clock of RF/32 " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod p2 32 1 = demod a psk2 tag from GraphBuffer using a clock of RF/32 and inverting output " ) ;
PrintAndLogEx ( NORMAL , " data rawdemod p2 1 = demod a psk2 tag from GraphBuffer, autodetect clock and invert output " ) ;
PrintAndLogEx ( NORMAL , " 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 " ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2016-07-31 17:37:19 +08:00
}
2019-04-10 19:06:05 +08:00
static int usage_data_autocorr ( void ) {
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( NORMAL , " Autocorrelate is used to detect repeating sequences. We use it as detection of length in bits a message inside the signal is " ) ;
PrintAndLogEx ( NORMAL , " Usage: data autocorr w <window> [g] " ) ;
PrintAndLogEx ( NORMAL , " Options: " ) ;
PrintAndLogEx ( NORMAL , " h This help " ) ;
PrintAndLogEx ( NORMAL , " w <window> window length for correlation - default = 4000 " ) ;
PrintAndLogEx ( NORMAL , " g save back to GraphBuffer (overwrite) " ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2016-07-31 17:37:19 +08:00
}
2019-04-10 19:06:05 +08:00
static int usage_data_detectclock ( void ) {
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( NORMAL , " Usage: data detectclock [modulation] <clock> " ) ;
PrintAndLogEx ( NORMAL , " [modulation as char], specify the modulation type you want to detect the clock of " ) ;
PrintAndLogEx ( NORMAL , " <clock> , specify the clock (optional - to get best start position only) " ) ;
PrintAndLogEx ( NORMAL , " 'a' = ask, 'f' = fsk, 'n' = nrz/direct, 'p' = psk " ) ;
PrintAndLogEx ( NORMAL , " " ) ;
PrintAndLogEx ( NORMAL , " Example: data detectclock a = detect the clock of an ask modulated wave in the GraphBuffer " ) ;
PrintAndLogEx ( NORMAL , " data detectclock f = detect the clock of an fsk modulated wave in the GraphBuffer " ) ;
PrintAndLogEx ( NORMAL , " data detectclock p = detect the clock of an psk modulated wave in the GraphBuffer " ) ;
PrintAndLogEx ( NORMAL , " data detectclock n = detect the clock of an nrz/direct modulated wave in the GraphBuffer " ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2016-07-31 17:37:19 +08:00
}
2019-04-10 19:06:05 +08:00
static int usage_data_hex2bin ( void ) {
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( NORMAL , " Usage: data hex2bin <hex_digits> " ) ;
PrintAndLogEx ( NORMAL , " This function will ignore all non-hexadecimal characters (but stop reading on whitespace) " ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2016-07-31 17:37:19 +08:00
}
2019-04-10 19:06:05 +08:00
static int usage_data_bin2hex ( void ) {
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( NORMAL , " Usage: data bin2hex <binary_digits> " ) ;
PrintAndLogEx ( NORMAL , " This function will ignore all characters not 1 or 0 (but stop reading on whitespace) " ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2016-07-31 17:37:19 +08:00
}
2019-04-10 19:06:05 +08:00
static int usage_data_buffclear ( void ) {
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( NORMAL , " This function clears the bigbuff on deviceside " ) ;
2020-10-10 04:20:19 +08:00
PrintAndLogEx ( NORMAL , " Usage: data clear [h] " ) ;
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( NORMAL , " Options: " ) ;
PrintAndLogEx ( NORMAL , " h This help " ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2017-01-16 21:44:37 +08:00
}
2021-03-11 16:26:02 +08:00
2017-07-30 15:17:48 +08:00
2015-01-06 22:20:36 +08:00
//set the demod buffer with given array of binary (one bit per byte)
//by marshmellow
2019-04-07 03:46:00 +08:00
void setDemodBuff ( uint8_t * buff , size_t size , size_t start_idx ) {
if ( buff = = NULL ) return ;
2015-03-23 03:28:48 +08:00
2019-03-10 07:00:59 +08:00
if ( size > MAX_DEMOD_BUF_LEN - start_idx )
2019-03-10 06:35:06 +08:00
size = MAX_DEMOD_BUF_LEN - start_idx ;
2019-03-09 15:59:13 +08:00
2019-03-10 06:35:06 +08:00
for ( size_t i = 0 ; i < size ; i + + )
2019-04-07 03:46:00 +08:00
DemodBuffer [ i ] = buff [ start_idx + + ] ;
2019-03-09 15:59:13 +08:00
2019-03-10 06:35:06 +08:00
DemodBufferLen = size ;
2015-01-06 22:20:36 +08:00
}
2019-04-07 03:46:00 +08:00
bool getDemodBuff ( uint8_t * buff , size_t * size ) {
if ( buff = = NULL ) return false ;
2019-03-10 06:35:06 +08:00
if ( size = = NULL ) return false ;
if ( * size = = 0 ) return false ;
2017-07-30 15:17:48 +08:00
2019-03-10 06:35:06 +08:00
* size = ( * size > DemodBufferLen ) ? DemodBufferLen : * size ;
2017-07-30 15:17:48 +08:00
2019-04-07 03:46:00 +08:00
memcpy ( buff , DemodBuffer , * size ) ;
2019-03-10 06:35:06 +08:00
return true ;
2017-07-30 15:17:48 +08:00
}
2017-11-10 02:15:56 +08:00
// include <math.h>
// Root mean square
2019-04-13 06:25:43 +08:00
/*
static double rms ( double * v , size_t n ) {
2019-03-10 06:35:06 +08:00
double sum = 0.0 ;
2019-03-10 07:00:59 +08:00
for ( size_t i = 0 ; i < n ; i + + )
2019-03-10 06:35:06 +08:00
sum + = v [ i ] * v [ i ] ;
return sqrt ( sum / n ) ;
2017-11-10 02:15:56 +08:00
}
2019-04-13 06:25:43 +08:00
static int cmp_int ( const void * a , const void * b ) {
2019-03-10 07:00:59 +08:00
if ( * ( const int * ) a < * ( const int * ) b )
2019-03-10 06:35:06 +08:00
return - 1 ;
2019-03-09 15:59:13 +08:00
else
2019-03-10 06:35:06 +08:00
return * ( const int * ) a > * ( const int * ) b ;
2017-11-10 02:15:56 +08:00
}
2019-04-13 06:25:43 +08:00
static int cmp_uint8 ( const void * a , const void * b ) {
2019-03-10 07:00:59 +08:00
if ( * ( const uint8_t * ) a < * ( const uint8_t * ) b )
2019-03-10 06:35:06 +08:00
return - 1 ;
2019-03-09 15:59:13 +08:00
else
2019-03-10 06:35:06 +08:00
return * ( const uint8_t * ) a > * ( const uint8_t * ) b ;
2017-11-10 02:15:56 +08:00
}
// Median of a array of values
2019-04-13 06:25:43 +08:00
static double median_int ( int * src , size_t size ) {
2019-03-10 07:00:59 +08:00
qsort ( src , size , sizeof ( int ) , cmp_int ) ;
return 0.5 * ( src [ size / 2 ] + src [ ( size - 1 ) / 2 ] ) ;
2017-11-10 02:15:56 +08:00
}
2019-04-13 06:25:43 +08:00
static double median_uint8 ( uint8_t * src , size_t size ) {
2019-03-10 07:00:59 +08:00
qsort ( src , size , sizeof ( uint8_t ) , cmp_uint8 ) ;
return 0.5 * ( src [ size / 2 ] + src [ ( size - 1 ) / 2 ] ) ;
2017-11-10 02:15:56 +08:00
}
2019-04-13 06:25:43 +08:00
*/
2018-02-16 00:57:28 +08:00
// function to compute mean for a series
2019-03-10 18:20:22 +08:00
static double compute_mean ( const int * data , size_t n ) {
2019-03-10 06:35:06 +08:00
double mean = 0.0 ;
2019-03-10 07:00:59 +08:00
for ( size_t i = 0 ; i < n ; i + + )
2019-03-10 06:35:06 +08:00
mean + = data [ i ] ;
mean / = n ;
return mean ;
2018-02-16 00:57:28 +08:00
}
// function to compute variance for a series
2019-03-10 18:20:22 +08:00
static double compute_variance ( const int * data , size_t n ) {
2019-03-10 06:35:06 +08:00
double variance = 0.0 ;
double mean = compute_mean ( data , n ) ;
2018-02-16 00:57:28 +08:00
2019-03-10 07:00:59 +08:00
for ( size_t i = 0 ; i < n ; i + + )
variance + = pow ( ( data [ i ] - mean ) , 2.0 ) ;
2018-02-16 00:57:28 +08:00
2019-03-10 06:35:06 +08:00
variance / = n ;
return variance ;
2018-02-16 00:57:28 +08:00
}
// Function to compute autocorrelation for a series
// Author: Kenneth J. Christensen
// - Corrected divide by n to divide (n - lag) from Tobias Mueller
/*
static double compute_autoc ( const int * data , size_t n , int lag ) {
2019-03-10 06:35:06 +08:00
double autocv = 0.0 ; // Autocovariance value
double ac_value ; // Computed autocorrelation value to be returned
double variance ; // Computed variance
double mean ;
2019-03-09 15:59:13 +08:00
2019-03-10 06:35:06 +08:00
mean = compute_mean ( data , n ) ;
variance = compute_variance ( data , n ) ;
2019-03-09 15:59:13 +08:00
2019-03-10 06:35:06 +08:00
for ( size_t i = 0 ; i < ( n - lag ) ; i + + )
autocv + = ( data [ i ] - mean ) * ( data [ i + lag ] - mean ) ;
2018-02-16 00:57:28 +08:00
2019-03-10 06:35:06 +08:00
autocv = ( 1.0 / ( n - lag ) ) * autocv ;
2018-02-16 00:57:28 +08:00
2019-03-10 06:35:06 +08:00
// Autocorrelation is autocovariance divided by variance
ac_value = autocv / variance ;
return ac_value ;
2018-02-16 00:57:28 +08:00
}
*/
2017-11-10 02:15:56 +08:00
2017-07-30 15:17:48 +08:00
// option '1' to save DemodBuffer any other to restore
2019-03-10 18:20:22 +08:00
void save_restoreDB ( uint8_t saveOpt ) {
2019-03-10 06:35:06 +08:00
static uint8_t SavedDB [ MAX_DEMOD_BUF_LEN ] ;
static size_t SavedDBlen ;
static bool DB_Saved = false ;
static size_t savedDemodStartIdx = 0 ;
static int savedDemodClock = 0 ;
if ( saveOpt = = GRAPH_SAVE ) { //save
memcpy ( SavedDB , DemodBuffer , sizeof ( DemodBuffer ) ) ;
SavedDBlen = DemodBufferLen ;
DB_Saved = true ;
savedDemodStartIdx = g_DemodStartIdx ;
savedDemodClock = g_DemodClock ;
} else if ( DB_Saved ) { //restore
memcpy ( DemodBuffer , SavedDB , sizeof ( DemodBuffer ) ) ;
DemodBufferLen = SavedDBlen ;
g_DemodClock = savedDemodClock ;
g_DemodStartIdx = savedDemodStartIdx ;
}
2019-03-09 15:59:13 +08:00
}
2017-07-30 15:17:48 +08:00
2019-04-13 06:25:43 +08:00
static int CmdSetDebugMode ( const char * Cmd ) {
2021-03-23 01:02:17 +08:00
CLIParserContext * ctx ;
CLIParserInit ( & ctx , " data setdebugmode " ,
" Set debugging level on client side " ,
" data setdebugmode "
) ;
void * argtable [ ] = {
arg_param_begin ,
arg_lit0 ( " 0 " , NULL , " no debug messages " ) ,
arg_lit0 ( " 1 " , NULL , " debug " ) ,
arg_lit0 ( " 2 " , NULL , " verbose debugging " ) ,
arg_param_end
} ;
CLIExecWithReturn ( ctx , Cmd , argtable , true ) ;
2021-03-23 01:13:09 +08:00
bool dg_0 = arg_get_lit ( ctx , 1 ) ;
bool dg_1 = arg_get_lit ( ctx , 2 ) ;
bool dg_2 = arg_get_lit ( ctx , 3 ) ;
2021-03-23 01:02:17 +08:00
CLIParserFree ( ctx ) ;
if ( dg_0 + dg_1 + dg_2 > 1 ) {
PrintAndLogEx ( INFO , " Select only one option " ) ;
return PM3_EINVARG ;
}
if ( dg_0 )
g_debugMode = 0 ;
if ( dg_1 )
g_debugMode = 1 ;
if ( dg_2 )
g_debugMode = 2 ;
2021-03-23 01:13:09 +08:00
switch ( g_debugMode ) {
case 0 :
PrintAndLogEx ( INFO , " client debug level... %u ( no debug messages ) " , g_debugMode ) ;
break ;
case 1 :
PrintAndLogEx ( INFO , " client debug level... %u ( debug messages ) " , g_debugMode ) ;
break ;
case 2 :
PrintAndLogEx ( INFO , " client debug level... %u ( verbose debug messages ) " , g_debugMode ) ;
break ;
default :
break ;
}
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2015-01-21 06:28:51 +08:00
}
2019-03-26 16:09:43 +08:00
// max output to 512 bits if we have more
// doesn't take inconsideration where the demod offset or bitlen found.
2020-11-05 02:19:38 +08:00
int printDemodBuff ( uint8_t offset , bool strip_leading , bool invert , bool print_hex ) {
size_t len = DemodBufferLen ;
if ( len = = 0 ) {
PrintAndLogEx ( WARNING , " Demodbuffer is empty " ) ;
return PM3_EINVARG ;
2019-03-10 06:35:06 +08:00
}
2015-03-26 02:24:36 +08:00
2021-03-23 03:54:08 +08:00
uint8_t * buf = calloc ( len , sizeof ( uint8_t ) ) ;
if ( buf = = NULL ) {
PrintAndLogEx ( WARNING , " dail, cannot allocate memory " ) ;
return PM3_EMALLOC ;
}
memcpy ( buf , DemodBuffer , len ) ;
uint8_t * p = NULL ;
2020-11-07 08:32:43 +08:00
2020-11-05 02:19:38 +08:00
if ( strip_leading ) {
2021-03-23 03:54:08 +08:00
p = ( buf + offset ) ;
2020-11-05 02:19:38 +08:00
if ( len > ( DemodBufferLen - offset ) )
len = ( DemodBufferLen - offset ) ;
size_t i ;
for ( i = 0 ; i < len ; i + + ) {
2021-03-23 03:54:08 +08:00
if ( p [ i ] = = 1 ) break ;
2020-11-05 02:19:38 +08:00
}
offset + = i ;
}
if ( len > ( DemodBufferLen - offset ) ) {
len = ( DemodBufferLen - offset ) ;
}
if ( len > 512 ) {
len = 512 ;
}
2020-11-07 08:32:43 +08:00
2020-11-05 02:19:38 +08:00
if ( invert ) {
2021-03-23 03:54:08 +08:00
p = ( buf + offset ) ;
2020-11-05 02:19:38 +08:00
for ( size_t i = 0 ; i < len ; i + + ) {
2021-03-23 03:54:08 +08:00
if ( p [ i ] = = 1 )
p [ i ] = 0 ;
2020-11-05 02:19:38 +08:00
else {
2021-03-23 03:54:08 +08:00
if ( p [ i ] = = 0 )
p [ i ] = 1 ;
2020-11-05 02:19:38 +08:00
}
}
}
2020-11-07 08:32:43 +08:00
2020-11-05 02:19:38 +08:00
if ( print_hex ) {
2021-03-23 03:54:08 +08:00
p = ( buf + offset ) ;
2020-11-05 02:19:38 +08:00
char hex [ 512 ] = { 0x00 } ;
2021-03-23 03:54:08 +08:00
int num_bits = binarraytohex ( hex , sizeof ( hex ) , ( char * ) p , len ) ;
2020-11-05 02:19:38 +08:00
if ( num_bits = = 0 ) {
return PM3_ESOFT ;
}
2021-03-23 03:54:08 +08:00
PrintAndLogEx ( SUCCESS , " DemodBuffer: \n %s " , hex ) ;
2020-11-05 02:19:38 +08:00
} else {
2021-03-23 03:54:08 +08:00
PrintAndLogEx ( SUCCESS , " DemodBuffer: \n %s " , sprint_bin_break ( buf + offset , len , 32 ) ) ;
2020-11-05 02:19:38 +08:00
}
2021-03-23 03:54:08 +08:00
p = NULL ;
free ( buf ) ;
2020-11-05 02:19:38 +08:00
return PM3_SUCCESS ;
2015-01-06 22:20:36 +08:00
}
2019-03-10 18:20:22 +08:00
int CmdPrintDemodBuff ( const char * Cmd ) {
2021-03-23 03:54:08 +08:00
CLIParserContext * ctx ;
CLIParserInit ( & ctx , " data print " ,
" Print the data in the DemodBuffer as hex or binary. \n "
" Defaults to binary output " ,
" data print "
) ;
void * argtable [ ] = {
arg_param_begin ,
arg_lit0 ( " i " , " inv " , " invert Demodbuffer before printing " ) ,
// arg_int0("l","len", "<dec>", "length to print in # of bits or hex characters respectively"),
arg_int0 ( " o " , " offset " , " <dec> " , " offset in # of bits " ) ,
arg_lit0 ( " s " , " strip " , " strip leading zeroes, i.e. set offset to first bit equal to one " ) ,
arg_lit0 ( " x " , " hex " , " output in hex (omit for binary output) " ) ,
arg_param_end
} ;
CLIExecWithReturn ( ctx , Cmd , argtable , true ) ;
bool invert = arg_get_lit ( ctx , 1 ) ;
int os = arg_get_int_def ( ctx , 2 , 0 ) ;
bool lstrip = arg_get_lit ( ctx , 3 ) ;
bool print_hex = arg_get_lit ( ctx , 4 ) ;
CLIParserFree ( ctx ) ;
uint8_t offset = ( os & 0xFF ) ;
2019-03-10 06:35:06 +08:00
2020-11-05 02:19:38 +08:00
return printDemodBuff ( offset , lstrip , invert , print_hex ) ;
2015-03-03 03:42:55 +08:00
}
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
2021-03-23 03:54:08 +08:00
// this function strictly converts >1 to 1 and <1 to 0 for each sample in the graphbuffer
2019-03-10 18:20:22 +08:00
int CmdGetBitStream ( const char * Cmd ) {
2019-03-10 06:35:06 +08:00
CmdHpf ( Cmd ) ;
for ( uint32_t i = 0 ; i < GraphTraceLen ; i + + )
GraphBuffer [ i ] = ( GraphBuffer [ i ] > = 1 ) ? 1 : 0 ;
2019-03-09 15:59:13 +08:00
2019-03-10 06:35:06 +08:00
RepaintGraphWindow ( ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2015-03-07 01:28:54 +08:00
}
2019-10-25 06:55:16 +08:00
static int CmdConvertBitStream ( const char * Cmd ) {
2019-05-23 18:12:20 +08:00
2019-06-08 03:40:33 +08:00
if ( isGraphBitstream ( ) ) {
2019-05-23 18:12:20 +08:00
convertGraphFromBitstream ( ) ;
} else {
// get high, low
convertGraphFromBitstreamEx ( - 126 , - 127 ) ;
}
return PM3_SUCCESS ;
}
2015-03-07 01:28:54 +08:00
2021-03-23 03:54:08 +08:00
// Cmd Args: Clock, invert, maxErr, maxLen as integers and amplify as char == 'a'
2015-04-08 13:07:39 +08:00
// (amp may not be needed anymore)
2021-03-23 03:54:08 +08:00
// verbose will print results and demoding messages
// emSearch will auto search for EM410x format in bitstream
// askType switches decode: ask/raw = 0, ask/manchester = 1
2020-09-28 17:50:20 +08:00
int ASKDemod_ext ( int clk , int invert , int maxErr , size_t maxLen , bool amplify , bool verbose , bool emSearch , uint8_t askType , bool * stCheck ) {
2020-10-08 04:51:27 +08:00
PrintAndLogEx ( DEBUG , " DEBUG: (ASKDemod_ext) clk %i invert %i maxErr %i maxLen %zu amplify %i verbose %i emSearch %i askType %i " , clk , invert , maxErr , maxLen , amplify , verbose , emSearch , askType ) ;
2019-03-10 06:35:06 +08:00
uint8_t askamp = 0 ;
2019-03-28 21:19:41 +08:00
2020-06-11 05:03:03 +08:00
if ( ! maxLen ) maxLen = pm3_capabilities . bigbuf_size ;
2019-03-10 06:35:06 +08:00
2019-09-26 22:30:29 +08:00
uint8_t * bits = calloc ( MAX_GRAPH_TRACE_LEN , sizeof ( uint8_t ) ) ;
2019-09-23 23:10:43 +08:00
if ( bits = = NULL ) {
return PM3_EMALLOC ;
}
2019-03-10 06:35:06 +08:00
size_t BitLen = getFromGraphBuf ( bits ) ;
2019-10-06 05:56:19 +08:00
PrintAndLogEx ( DEBUG , " DEBUG: (ASKDemod_ext) #samples from graphbuff: %zu " , BitLen ) ;
2019-03-10 06:35:06 +08:00
2019-09-23 23:10:43 +08:00
if ( BitLen < 255 ) {
free ( bits ) ;
return PM3_ESOFT ;
}
2019-03-10 06:35:06 +08:00
if ( maxLen < BitLen & & maxLen ! = 0 ) BitLen = maxLen ;
int foundclk = 0 ;
2019-03-12 19:56:59 +08:00
//amplify signal before ST check
2020-09-28 17:50:20 +08:00
if ( amplify ) {
2019-03-10 06:35:06 +08:00
askAmp ( bits , BitLen ) ;
2019-03-20 00:53:42 +08:00
}
2019-03-28 21:19:41 +08:00
2019-03-10 06:35:06 +08:00
size_t ststart = 0 , stend = 0 ;
2019-03-19 17:20:10 +08:00
// if (*stCheck)
bool st = DetectST ( bits , & BitLen , & foundclk , & ststart , & stend ) ;
2019-03-20 00:53:42 +08:00
2019-03-28 21:19:41 +08:00
if ( clk = = 0 ) {
if ( foundclk = = 32 | | foundclk = = 64 ) {
2019-03-20 00:53:42 +08:00
clk = foundclk ;
}
}
2019-03-28 21:19:41 +08:00
2019-03-10 06:35:06 +08:00
if ( st ) {
* stCheck = st ;
CursorCPos = ststart ;
CursorDPos = stend ;
2019-03-12 19:56:59 +08:00
if ( verbose )
PrintAndLogEx ( DEBUG , " Found Sequence Terminator - First one is shown by orange / blue graph markers " ) ;
2019-03-10 06:35:06 +08:00
}
int startIdx = 0 ;
int errCnt = askdemod_ext ( bits , & BitLen , & clk , & invert , maxErr , askamp , askType , & startIdx ) ;
2019-03-10 07:00:59 +08:00
if ( errCnt < 0 | | BitLen < 16 ) { //if fatal error (or -1)
2019-10-06 05:56:19 +08:00
PrintAndLogEx ( DEBUG , " DEBUG: (ASKDemod_ext) No data found errors:%d, invert:%c, bitlen:%zu, clock:%d " , errCnt , ( invert ) ? ' Y ' : ' N ' , BitLen , clk ) ;
2019-09-23 23:10:43 +08:00
free ( bits ) ;
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
}
2019-03-10 07:00:59 +08:00
if ( errCnt > maxErr ) {
2019-10-06 05:56:19 +08:00
PrintAndLogEx ( DEBUG , " DEBUG: (ASKDemod_ext) Too many errors found, errors:%d, bits:%zu, clock:%d " , errCnt , BitLen , clk ) ;
2019-09-23 23:10:43 +08:00
free ( bits ) ;
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
}
2019-10-06 05:56:19 +08:00
if ( verbose ) PrintAndLogEx ( DEBUG , " DEBUG: (ASKDemod_ext) Using clock:%d, invert:%d, bits found:%zu, start index %d " , clk , invert , BitLen , startIdx ) ;
2019-03-10 06:35:06 +08:00
//output
2019-04-07 03:46:00 +08:00
setDemodBuff ( bits , BitLen , 0 ) ;
2019-03-10 06:35:06 +08:00
setClockGrid ( clk , startIdx ) ;
2019-03-12 19:56:59 +08:00
if ( verbose ) {
2019-03-10 06:35:06 +08:00
if ( errCnt > 0 )
2019-03-12 19:56:59 +08:00
PrintAndLogEx ( DEBUG , " # Errors during Demoding (shown as 7 in bit stream): %d " , errCnt ) ;
2019-03-10 06:35:06 +08:00
if ( askType )
2019-03-12 19:56:59 +08:00
PrintAndLogEx ( DEBUG , " ASK/Manchester - Clock: %d - Decoded bitstream: " , clk ) ;
2019-03-10 06:35:06 +08:00
else
2019-03-12 19:56:59 +08:00
PrintAndLogEx ( DEBUG , " ASK/Raw - Clock: %d - Decoded bitstream: " , clk ) ;
2019-03-26 16:09:43 +08:00
2020-11-05 02:19:38 +08:00
printDemodBuff ( 0 , false , false , false ) ;
2019-03-10 06:35:06 +08:00
}
uint64_t lo = 0 ;
uint32_t hi = 0 ;
if ( emSearch )
AskEm410xDecode ( true , & hi , & lo ) ;
2019-09-23 23:10:43 +08:00
free ( bits ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2014-12-29 09:33:32 +08:00
}
2020-09-28 17:50:20 +08:00
int ASKDemod ( int clk , int invert , int maxErr , size_t maxLen , bool amplify , bool verbose , bool emSearch , uint8_t askType ) {
2019-03-10 06:35:06 +08:00
bool st = false ;
2020-09-28 17:50:20 +08:00
return ASKDemod_ext ( clk , invert , maxErr , maxLen , amplify , verbose , emSearch , askType , & st ) ;
2016-02-20 05:30:19 +08:00
}
2014-12-29 09:33:32 +08:00
2021-03-23 03:54:08 +08:00
// takes 5 arguments - clock, invert, maxErr, maxLen as integers and amplify as char == 'a'
// attempts to demodulate ask while decoding manchester
// prints binary found and saves in graphbuffer for further commands
2019-04-13 06:25:43 +08:00
static int Cmdaskmandemod ( const char * Cmd ) {
2020-10-07 02:31:21 +08:00
size_t slen = strlen ( Cmd ) ;
2019-03-10 06:35:06 +08:00
char cmdp = tolower ( param_getchar ( Cmd , 0 ) ) ;
2020-10-07 02:31:21 +08:00
if ( slen > 45 | | cmdp = = ' h ' ) return usage_data_rawdemod_am ( ) ;
bool st = false , amplify = false ;
int clk = 0 , invert = 0 , maxErr = 100 ;
2020-09-28 17:50:20 +08:00
size_t maxLen = 0 ;
2020-10-07 02:31:21 +08:00
if ( slen ) {
2020-10-07 06:05:12 +08:00
2020-10-07 02:31:21 +08:00
if ( Cmd [ 0 ] = = ' s ' ) {
st = true ;
Cmd + + ;
} else if ( slen > 1 & & Cmd [ 1 ] = = ' s ' ) {
st = true ;
Cmd + = 2 ;
}
2020-10-12 04:40:05 +08:00
2020-10-07 02:31:21 +08:00
char amp = tolower ( param_getchar ( Cmd , 0 ) ) ;
sscanf ( Cmd , " %i %i %i %zu %c " , & clk , & invert , & maxErr , & maxLen , & amp ) ;
amplify = ( amp = = ' a ' ) ;
}
2020-09-28 17:50:20 +08:00
if ( clk = = 1 ) {
invert = 1 ;
clk = 0 ;
}
2020-10-07 02:31:21 +08:00
2020-09-28 17:50:20 +08:00
if ( invert ! = 0 & & invert ! = 1 ) {
PrintAndLogEx ( WARNING , " Invalid value for invert: %i " , invert ) ;
return PM3_EINVARG ;
}
return ASKDemod_ext ( clk , invert , maxErr , maxLen , amplify , true , true , 1 , & st ) ;
2015-02-21 13:27:48 +08:00
}
2021-03-23 03:54:08 +08:00
// manchester decode
// strictly take 10 and 01 and convert to 0 and 1
2019-04-14 03:54:04 +08:00
static int Cmdmandecoderaw ( const char * Cmd ) {
2019-03-10 06:35:06 +08:00
size_t size = 0 ;
int high = 0 , low = 0 ;
2019-04-14 05:55:58 +08:00
size_t i = 0 ;
2019-05-26 01:27:43 +08:00
uint16_t errCnt = 0 ;
int invert = 0 , maxErr = 20 ;
2019-03-10 06:35:06 +08:00
char cmdp = tolower ( param_getchar ( Cmd , 0 ) ) ;
if ( strlen ( Cmd ) > 5 | | cmdp = = ' h ' ) return usage_data_manrawdecode ( ) ;
2019-05-22 20:33:33 +08:00
if ( DemodBufferLen = = 0 ) return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
uint8_t bits [ MAX_DEMOD_BUF_LEN ] = { 0 } ;
2019-03-10 07:00:59 +08:00
for ( ; i < DemodBufferLen ; + + i ) {
2019-03-10 06:35:06 +08:00
if ( DemodBuffer [ i ] > high )
high = DemodBuffer [ i ] ;
2019-03-10 07:00:59 +08:00
else if ( DemodBuffer [ i ] < low )
2019-03-10 06:35:06 +08:00
low = DemodBuffer [ i ] ;
bits [ i ] = DemodBuffer [ i ] ;
}
2019-03-10 07:00:59 +08:00
if ( high > 7 | | low < 0 ) {
2019-07-14 06:35:18 +08:00
PrintAndLogEx ( ERR , " Error: please raw demod the wave first then manchester raw decode " ) ;
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
}
sscanf ( Cmd , " %i %i " , & invert , & maxErr ) ;
size = i ;
uint8_t alignPos = 0 ;
errCnt = manrawdecode ( bits , & size , invert , & alignPos ) ;
2019-03-10 07:00:59 +08:00
if ( errCnt > = maxErr ) {
2019-07-14 06:35:18 +08:00
PrintAndLogEx ( ERR , " Too many errors: %u " , errCnt ) ;
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
}
2019-03-10 07:00:59 +08:00
PrintAndLogEx ( NORMAL , " Manchester Decoded - # errors:%d - data: " , errCnt ) ;
2019-03-25 21:41:28 +08:00
PrintAndLogEx ( NORMAL , " %s " , sprint_bin_break ( bits , size , 32 ) ) ;
2019-03-10 06:35:06 +08:00
2019-03-10 07:00:59 +08:00
if ( errCnt = = 0 ) {
2019-03-10 06:35:06 +08:00
uint64_t id = 0 ;
uint32_t hi = 0 ;
size_t idx = 0 ;
2019-03-10 07:00:59 +08:00
if ( Em410xDecode ( bits , & size , & idx , & hi , & id ) = = 1 ) {
2019-03-10 06:35:06 +08:00
//need to adjust to set bitstream back to manchester encoded data
2019-04-07 03:46:00 +08:00
//setDemodBuff(bits, size, idx);
2020-12-09 21:48:10 +08:00
printEM410x ( hi , id , false ) ;
2019-03-10 06:35:06 +08:00
}
}
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2014-12-31 05:08:33 +08:00
}
2019-03-27 22:35:43 +08:00
/*
* @ author marshmellow
* biphase decode
2019-03-28 21:19:41 +08:00
* decodes 01 or 10 - > ZERO
2019-03-27 22:35:43 +08:00
* 11 or 00 - > ONE
* param offset adjust start position
* param invert invert output
2019-03-28 21:19:41 +08:00
* param masxErr maximum tolerated errors
2019-03-27 22:35:43 +08:00
*/
2019-04-14 03:54:04 +08:00
static int CmdBiphaseDecodeRaw ( const char * Cmd ) {
2019-03-10 06:35:06 +08:00
size_t size = 0 ;
int offset = 0 , invert = 0 , maxErr = 20 , errCnt = 0 ;
char cmdp = tolower ( param_getchar ( Cmd , 0 ) ) ;
2019-03-27 22:35:43 +08:00
if ( strlen ( Cmd ) > 5 | | cmdp = = ' h ' ) return usage_data_biphaserawdecode ( ) ;
2019-03-10 06:35:06 +08:00
sscanf ( Cmd , " %i %i %i " , & offset , & invert , & maxErr ) ;
2019-03-10 07:00:59 +08:00
if ( DemodBufferLen = = 0 ) {
2019-03-12 19:56:59 +08:00
PrintAndLogEx ( WARNING , " DemodBuffer Empty - run " _YELLOW_ ( " 'data rawdemod ar' " ) " first " ) ;
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
}
2019-03-09 15:59:13 +08:00
2019-03-10 06:35:06 +08:00
uint8_t bits [ MAX_DEMOD_BUF_LEN ] = { 0 } ;
size = sizeof ( bits ) ;
2019-05-22 20:33:33 +08:00
if ( ! getDemodBuff ( bits , & size ) ) return PM3_ESOFT ;
2019-03-09 15:59:13 +08:00
2019-03-10 06:35:06 +08:00
errCnt = BiphaseRawDecode ( bits , & size , & offset , invert ) ;
2019-03-10 07:00:59 +08:00
if ( errCnt < 0 ) {
2019-07-14 06:35:18 +08:00
PrintAndLogEx ( ERR , " Error during decode:%d " , errCnt ) ;
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
}
2019-03-10 07:00:59 +08:00
if ( errCnt > maxErr ) {
2019-07-14 06:35:18 +08:00
PrintAndLogEx ( ERR , " Too many errors attempting to decode: %d " , errCnt ) ;
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
}
2015-03-16 10:03:50 +08:00
2019-03-10 06:35:06 +08:00
if ( errCnt > 0 )
2019-07-14 18:17:34 +08:00
PrintAndLogEx ( WARNING , " # Errors found during Demod (shown as " _YELLOW_ ( " 7 " ) " in bit stream): %d " , errCnt ) ;
2017-01-16 21:44:37 +08:00
2019-03-10 07:00:59 +08:00
PrintAndLogEx ( NORMAL , " Biphase Decoded using offset: %d - # invert:%d - data: " , offset , invert ) ;
2019-03-25 21:41:28 +08:00
PrintAndLogEx ( NORMAL , " %s " , sprint_bin_break ( bits , size , 32 ) ) ;
2019-03-09 15:59:13 +08:00
2019-03-10 06:35:06 +08:00
//remove first bit from raw demod
if ( offset )
2019-04-07 03:46:00 +08:00
setDemodBuff ( DemodBuffer , DemodBufferLen - offset , offset ) ;
2019-03-09 15:59:13 +08:00
2019-03-10 07:00:59 +08:00
setClockGrid ( g_DemodClock , g_DemodStartIdx + g_DemodClock * offset / 2 ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2014-12-29 09:33:32 +08:00
}
2021-03-23 03:54:08 +08:00
// ASK Demod then Biphase decode GraphBuffer samples
2020-09-28 17:50:20 +08:00
int ASKbiphaseDemod ( int offset , int clk , int invert , int maxErr , bool verbose ) {
2019-03-10 06:35:06 +08:00
//ask raw demod GraphBuffer first
2021-01-28 08:21:52 +08:00
uint8_t bs [ MAX_DEMOD_BUF_LEN ] ;
size_t size = getFromGraphBuf ( bs ) ;
2019-03-10 07:00:59 +08:00
if ( size = = 0 ) {
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( DEBUG , " DEBUG: no data in graphbuf " ) ;
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
}
int startIdx = 0 ;
//invert here inverts the ask raw demoded bits which has no effect on the demod, but we need the pointer
2021-01-28 08:21:52 +08:00
int errCnt = askdemod_ext ( bs , & size , & clk , & invert , maxErr , 0 , 0 , & startIdx ) ;
2019-03-10 07:00:59 +08:00
if ( errCnt < 0 | | errCnt > maxErr ) {
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( DEBUG , " DEBUG: no data or error found %d, clock: %d " , errCnt , clk ) ;
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
}
//attempt to Biphase decode BitStream
2021-01-28 08:21:52 +08:00
errCnt = BiphaseRawDecode ( bs , & size , & offset , invert ) ;
2019-03-10 07:00:59 +08:00
if ( errCnt < 0 ) {
2019-03-10 06:35:06 +08:00
if ( g_debugMode | | verbose ) PrintAndLogEx ( DEBUG , " DEBUG: Error BiphaseRawDecode: %d " , errCnt ) ;
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
}
if ( errCnt > maxErr ) {
if ( g_debugMode | | verbose ) PrintAndLogEx ( DEBUG , " DEBUG: Error BiphaseRawDecode too many errors: %d " , errCnt ) ;
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
}
2019-05-28 17:15:12 +08:00
2019-03-10 06:35:06 +08:00
//success set DemodBuffer and return
2021-01-28 08:21:52 +08:00
setDemodBuff ( bs , size , 0 ) ;
2019-03-10 07:00:59 +08:00
setClockGrid ( clk , startIdx + clk * offset / 2 ) ;
if ( g_debugMode | | verbose ) {
2019-06-08 22:09:13 +08:00
PrintAndLogEx ( DEBUG , " Biphase Decoded using offset %d | clock %d | #errors %d | start index %d \n data \n " , offset , clk , errCnt , ( startIdx + clk * offset / 2 ) ) ;
2020-11-05 02:19:38 +08:00
printDemodBuff ( offset , false , false , false ) ;
2019-03-10 06:35:06 +08:00
}
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2015-03-16 10:03:50 +08:00
}
2021-03-23 03:54:08 +08:00
// see ASKbiphaseDemod
2019-04-13 06:25:43 +08:00
static int Cmdaskbiphdemod ( const char * Cmd ) {
2019-03-10 06:35:06 +08:00
char cmdp = tolower ( param_getchar ( Cmd , 0 ) ) ;
if ( strlen ( Cmd ) > 25 | | cmdp = = ' h ' ) return usage_data_rawdemod_ab ( ) ;
2020-09-28 17:50:20 +08:00
int offset = 0 , clk = 0 , invert = 0 , maxErr = 50 ;
sscanf ( Cmd , " %i %i %i %i " , & offset , & clk , & invert , & maxErr ) ;
return ASKbiphaseDemod ( offset , clk , invert , maxErr , true ) ;
2015-03-16 10:03:50 +08:00
}
2021-03-23 03:54:08 +08:00
// see ASKDemod
2019-04-13 06:25:43 +08:00
static int Cmdaskrawdemod ( const char * Cmd ) {
2019-03-10 06:35:06 +08:00
char cmdp = tolower ( param_getchar ( Cmd , 0 ) ) ;
if ( strlen ( Cmd ) > 25 | | cmdp = = ' h ' ) return usage_data_rawdemod_ar ( ) ;
2020-09-28 17:50:20 +08:00
bool st = false ;
int clk = 0 ;
int invert = 0 ;
int maxErr = 100 ;
size_t maxLen = 0 ;
bool amplify = false ;
char amp = tolower ( param_getchar ( Cmd , 0 ) ) ;
sscanf ( Cmd , " %i %i %i %zu %c " , & clk , & invert , & maxErr , & maxLen , & amp ) ;
amplify = amp = = ' a ' ;
if ( clk = = 1 ) {
invert = 1 ;
clk = 0 ;
}
if ( invert ! = 0 & & invert ! = 1 ) {
PrintAndLogEx ( WARNING , " Invalid value for invert: %i " , invert ) ;
return PM3_EINVARG ;
}
return ASKDemod_ext ( clk , invert , maxErr , maxLen , amplify , true , false , 0 , & st ) ;
2015-02-21 13:27:48 +08:00
}
2019-04-14 05:55:58 +08:00
int AutoCorrelate ( const int * in , int * out , size_t len , size_t window , bool SaveGrph , bool verbose ) {
2019-03-10 06:35:06 +08:00
// sanity check
2019-03-10 07:00:59 +08:00
if ( window > len ) window = len ;
2019-03-10 06:35:06 +08:00
2020-04-22 08:22:55 +08:00
if ( verbose ) PrintAndLogEx ( INFO , " performing " _YELLOW_ ( " %zu " ) " correlations " , GraphTraceLen - window ) ;
2019-03-10 06:35:06 +08:00
//test
double autocv = 0.0 ; // Autocovariance value
size_t correlation = 0 ;
int lastmax = 0 ;
// in, len, 4000
2019-06-08 00:41:39 +08:00
double mean = compute_mean ( in , len ) ;
// Computed variance
double variance = compute_variance ( in , len ) ;
2019-03-10 06:35:06 +08:00
2019-09-24 01:10:29 +08:00
int * correl_buf = calloc ( MAX_GRAPH_TRACE_LEN , sizeof ( int ) ) ;
2019-03-10 06:35:06 +08:00
2019-04-14 05:55:58 +08:00
for ( size_t i = 0 ; i < len - window ; + + i ) {
2019-03-10 06:35:06 +08:00
2019-03-10 07:00:59 +08:00
for ( size_t j = 0 ; j < ( len - i ) ; j + + ) {
autocv + = ( in [ j ] - mean ) * ( in [ j + i ] - mean ) ;
2019-03-10 06:35:06 +08:00
}
autocv = ( 1.0 / ( len - i ) ) * autocv ;
2019-09-24 01:10:29 +08:00
correl_buf [ i ] = autocv ;
2019-03-10 06:35:06 +08:00
2019-06-08 00:41:39 +08:00
// Computed autocorrelation value to be returned
2019-03-10 06:35:06 +08:00
// Autocorrelation is autocovariance divided by variance
2019-06-08 00:41:39 +08:00
double ac_value = autocv / variance ;
2019-03-10 06:35:06 +08:00
// keep track of which distance is repeating.
2019-03-10 07:00:59 +08:00
if ( ac_value > 1 ) {
correlation = i - lastmax ;
2019-03-10 06:35:06 +08:00
lastmax = i ;
}
}
//
int hi = 0 , idx = 0 ;
int distance = 0 , hi_1 = 0 , idx_1 = 0 ;
2019-04-14 05:55:58 +08:00
for ( size_t i = 0 ; i < = len ; + + i ) {
2019-09-24 01:10:29 +08:00
if ( correl_buf [ i ] > hi ) {
hi = correl_buf [ i ] ;
2019-03-10 06:35:06 +08:00
idx = i ;
}
}
2019-04-14 05:55:58 +08:00
for ( size_t i = idx + 1 ; i < = window ; + + i ) {
2019-09-24 01:10:29 +08:00
if ( correl_buf [ i ] > hi_1 ) {
hi_1 = correl_buf [ i ] ;
2019-03-10 06:35:06 +08:00
idx_1 = i ;
}
}
2019-03-10 07:00:59 +08:00
int foo = ABS ( hi - hi_1 ) ;
2019-03-13 03:50:44 +08:00
int bar = ( int ) ( ( int ) ( ( hi + hi_1 ) / 2 ) * 0.04 ) ;
2019-03-14 19:30:32 +08:00
2019-03-10 07:00:59 +08:00
if ( verbose & & foo < bar ) {
2019-03-10 06:35:06 +08:00
distance = idx_1 - idx ;
2020-04-22 08:22:55 +08:00
PrintAndLogEx ( SUCCESS , " possible visible correlation " _YELLOW_ ( " %4d " ) " samples " , distance ) ;
2019-03-10 07:00:59 +08:00
} else if ( verbose & & ( correlation > 1 ) ) {
2020-04-22 08:22:55 +08:00
PrintAndLogEx ( SUCCESS , " possible correlation " _YELLOW_ ( " %4zu " ) " samples " , correlation ) ;
2019-03-10 06:35:06 +08:00
} else {
PrintAndLogEx ( FAILED , " no repeating pattern found, try increasing window size " ) ;
}
int retval = correlation ;
if ( SaveGrph ) {
//GraphTraceLen = GraphTraceLen - window;
2019-09-24 01:10:29 +08:00
memcpy ( out , correl_buf , len * sizeof ( int ) ) ;
2019-03-10 07:00:59 +08:00
if ( distance > 0 ) {
2019-03-10 06:35:06 +08:00
setClockGrid ( distance , idx ) ;
retval = distance ;
2019-03-10 07:00:59 +08:00
} else
2019-03-10 06:35:06 +08:00
setClockGrid ( correlation , idx ) ;
CursorCPos = idx_1 ;
2019-03-10 07:00:59 +08:00
CursorDPos = idx_1 + retval ;
2019-03-10 06:35:06 +08:00
DemodBufferLen = 0 ;
RepaintGraphWindow ( ) ;
}
2019-09-24 01:10:29 +08:00
free ( correl_buf ) ;
2019-03-10 06:35:06 +08:00
return retval ;
2015-03-13 23:09:12 +08:00
}
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
2019-04-14 03:54:04 +08:00
static int CmdAutoCorr ( const char * Cmd ) {
2018-02-16 00:57:28 +08:00
2019-03-10 06:35:06 +08:00
uint32_t window = 4000 ;
uint8_t cmdp = 0 ;
bool updateGrph = false ;
bool errors = false ;
while ( param_getchar ( Cmd , cmdp ) ! = 0x00 & & ! errors ) {
switch ( tolower ( param_getchar ( Cmd , cmdp ) ) ) {
case ' h ' :
return usage_data_autocorr ( ) ;
case ' g ' :
updateGrph = true ;
cmdp + + ;
break ;
case ' w ' :
2019-03-10 07:00:59 +08:00
window = param_get32ex ( Cmd , cmdp + 1 , 4000 , 10 ) ;
2019-03-10 06:35:06 +08:00
if ( window > = GraphTraceLen ) {
2019-10-06 05:56:19 +08:00
PrintAndLogEx ( WARNING , " window must be smaller than trace (%zu samples) " , GraphTraceLen ) ;
2019-03-10 06:35:06 +08:00
errors = true ;
}
cmdp + = 2 ;
break ;
default :
PrintAndLogEx ( WARNING , " Unknown parameter '%c' " , param_getchar ( Cmd , cmdp ) ) ;
errors = true ;
break ;
}
}
//Validations
2019-03-10 07:00:59 +08:00
if ( errors | | cmdp = = 0 ) return usage_data_autocorr ( ) ;
2019-03-10 06:35:06 +08:00
2019-05-23 18:12:20 +08:00
AutoCorrelate ( GraphBuffer , GraphBuffer , GraphTraceLen , window , updateGrph , true ) ;
return PM3_SUCCESS ;
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
}
2019-04-14 03:54:04 +08:00
static int CmdBitsamples ( const char * Cmd ) {
2019-04-10 18:23:40 +08:00
( void ) Cmd ; // Cmd is not used so far
2019-03-10 06:35:06 +08:00
int cnt = 0 ;
uint8_t got [ 12288 ] ;
2019-07-24 03:33:52 +08:00
if ( ! GetFromDevice ( BIG_BUF , got , sizeof ( got ) , 0 , NULL , 0 , NULL , 2500 , false ) ) {
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( WARNING , " command execution time out " ) ;
2019-05-22 20:33:33 +08:00
return PM3_ETIMEOUT ;
2019-03-10 06:35:06 +08:00
}
2019-08-01 06:14:09 +08:00
for ( size_t j = 0 ; j < ARRAYLEN ( got ) ; j + + ) {
2019-04-14 05:55:58 +08:00
for ( uint8_t k = 0 ; k < 8 ; k + + ) {
2019-03-10 07:00:59 +08:00
if ( got [ j ] & ( 1 < < ( 7 - k ) ) )
2019-03-10 06:35:06 +08:00
GraphBuffer [ cnt + + ] = 1 ;
else
GraphBuffer [ cnt + + ] = 0 ;
}
}
GraphTraceLen = cnt ;
RepaintGraphWindow ( ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
}
2019-04-14 03:54:04 +08:00
static int CmdBuffClear ( const char * Cmd ) {
2019-03-10 06:35:06 +08:00
char cmdp = tolower ( param_getchar ( Cmd , 0 ) ) ;
if ( cmdp = = ' h ' ) return usage_data_buffclear ( ) ;
2019-03-09 15:59:13 +08:00
2019-03-10 06:35:06 +08:00
clearCommandBuffer ( ) ;
2019-05-08 01:51:33 +08:00
SendCommandNG ( CMD_BUFF_CLEAR , NULL , 0 ) ;
2019-03-10 06:35:06 +08:00
ClearGraph ( true ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
}
2020-10-10 00:08:46 +08:00
static int CmdDecimate ( const char * Cmd ) {
CLIParserContext * ctx ;
CLIParserInit ( & ctx , " data decimate " ,
2020-10-10 00:11:27 +08:00
" Performs decimation, by reducing samples N times in the grapbuf. Good for PSK \n " ,
2020-10-10 00:08:46 +08:00
" data decimate \n "
" data decimate 4 "
2020-10-12 04:40:05 +08:00
) ;
2020-10-10 00:08:46 +08:00
void * argtable [ ] = {
arg_param_begin ,
2020-10-10 00:11:27 +08:00
arg_int0 ( NULL , NULL , " <dec> " , " factor to reduce sample set (default 2) " ) ,
2020-10-10 00:08:46 +08:00
arg_param_end
} ;
CLIExecWithReturn ( ctx , Cmd , argtable , true ) ;
int n = arg_get_int_def ( ctx , 1 , 2 ) ;
2020-10-12 04:40:05 +08:00
CLIParserFree ( ctx ) ;
2020-10-10 00:08:46 +08:00
for ( size_t i = 0 ; i < ( GraphTraceLen / n ) ; + + i )
GraphBuffer [ i ] = GraphBuffer [ i * n ] ;
2020-10-12 04:40:05 +08:00
2020-10-10 00:08:46 +08:00
GraphTraceLen / = n ;
PrintAndLogEx ( SUCCESS , " decimated by " _GREEN_ ( " %u " ) , n ) ;
2019-03-10 06:35:06 +08:00
RepaintGraphWindow ( ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
}
2015-01-31 07:05:04 +08:00
/**
* Undecimate - I ' d call it ' interpolate ' , but we ' ll save that
* name until someone does an actual interpolation command , not just
* blindly repeating samples
* @ param Cmd
* @ return
*/
2020-10-10 00:08:46 +08:00
static int CmdUndecimate ( const char * Cmd ) {
CLIParserContext * ctx ;
CLIParserInit ( & ctx , " data undecimate " ,
2020-10-10 00:11:27 +08:00
" Performs un-decimation, by repeating each sample N times in the graphbuf " ,
2020-10-10 00:08:46 +08:00
" data undecimate \n "
" data undecimate 4 \n "
2020-10-12 04:40:05 +08:00
) ;
2019-03-10 06:35:06 +08:00
2020-10-10 00:08:46 +08:00
void * argtable [ ] = {
arg_param_begin ,
2020-10-10 00:11:27 +08:00
arg_int0 ( NULL , NULL , " <dec> " , " factor to repeat each sample (default 2) " ) ,
2020-10-10 00:08:46 +08:00
arg_param_end
} ;
CLIExecWithReturn ( ctx , Cmd , argtable , true ) ;
int factor = arg_get_int_def ( ctx , 1 , 2 ) ;
2020-10-12 04:40:05 +08:00
CLIParserFree ( ctx ) ;
2019-03-10 06:35:06 +08:00
//We have memory, don't we?
int swap [ MAX_GRAPH_TRACE_LEN ] = { 0 } ;
uint32_t g_index = 0 , s_index = 0 ;
2019-03-10 07:00:59 +08:00
while ( g_index < GraphTraceLen & & s_index + factor < MAX_GRAPH_TRACE_LEN ) {
2019-03-10 06:35:06 +08:00
int count = 0 ;
2020-10-10 00:08:46 +08:00
for ( count = 0 ; count < factor & & s_index + count < MAX_GRAPH_TRACE_LEN ; count + + ) {
swap [ s_index + count ] = (
2020-10-12 04:40:05 +08:00
( double ) ( factor - count ) / ( factor - 1 ) ) * GraphBuffer [ g_index ] +
( ( double ) count / factor ) * GraphBuffer [ g_index + 1 ]
;
2020-10-10 00:08:46 +08:00
}
2019-03-10 06:35:06 +08:00
s_index + = count ;
g_index + + ;
}
2015-01-31 07:05:04 +08:00
2019-03-10 06:35:06 +08:00
memcpy ( GraphBuffer , swap , s_index * sizeof ( int ) ) ;
GraphTraceLen = s_index ;
RepaintGraphWindow ( ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2015-01-31 07:05:04 +08:00
}
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
2021-03-23 03:54:08 +08:00
// shift graph zero up or down based on input + or -
2019-04-14 03:54:04 +08:00
static int CmdGraphShiftZero ( const char * Cmd ) {
2019-06-12 21:41:23 +08:00
int shift = 0 ;
2019-03-10 06:35:06 +08:00
//set options from parameters entered with the command
sscanf ( Cmd , " %i " , & shift ) ;
2019-04-14 05:55:58 +08:00
for ( size_t i = 0 ; i < GraphTraceLen ; i + + ) {
2019-06-12 21:41:23 +08:00
int shiftedVal = GraphBuffer [ i ] + shift ;
2019-03-10 06:35:06 +08:00
if ( shiftedVal > 127 )
shiftedVal = 127 ;
else if ( shiftedVal < - 127 )
shiftedVal = - 127 ;
GraphBuffer [ i ] = shiftedVal ;
}
CmdNorm ( " " ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2015-01-21 06:28:51 +08:00
}
2019-03-10 18:20:22 +08:00
int AskEdgeDetect ( const int * in , int * out , int len , int threshold ) {
2019-03-10 06:35:06 +08:00
int last = 0 ;
2019-03-10 07:00:59 +08:00
for ( int i = 1 ; i < len ; i + + ) {
if ( in [ i ] - in [ i - 1 ] > = threshold ) //large jump up
2019-03-10 06:35:06 +08:00
last = 127 ;
2019-03-10 07:00:59 +08:00
else if ( in [ i ] - in [ i - 1 ] < = - 1 * threshold ) //large jump down
2019-03-10 06:35:06 +08:00
last = - 127 ;
2019-03-10 07:00:59 +08:00
out [ i - 1 ] = last ;
2019-03-10 06:35:06 +08:00
}
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2017-07-28 06:50:27 +08:00
}
2021-03-23 03:54:08 +08:00
// use large jumps in read samples to identify edges of waves and then amplify that wave to max
// similar to dirtheshold, threshold commands
// takes a threshold length which is the measured length between two samples then determines an edge
2019-04-13 06:25:43 +08:00
static int CmdAskEdgeDetect ( const char * Cmd ) {
2019-03-10 06:35:06 +08:00
int thresLen = 25 ;
int ans = 0 ;
sscanf ( Cmd , " %i " , & thresLen ) ;
2015-04-07 12:53:06 +08:00
2019-03-10 06:35:06 +08:00
ans = AskEdgeDetect ( GraphBuffer , GraphBuffer , GraphTraceLen , thresLen ) ;
RepaintGraphWindow ( ) ;
return ans ;
2015-02-07 03:36:25 +08:00
}
2021-03-23 03:54:08 +08:00
// Print our clock rate
2015-01-07 12:29:45 +08:00
// uses data from graphbuffer
2015-02-10 00:11:04 +08:00
// adjusted to take char parameter for type of modulation to find the clock - by marshmellow.
2019-04-13 06:25:43 +08:00
static int CmdDetectClockRate ( const char * Cmd ) {
2019-03-10 06:35:06 +08:00
char cmdp = tolower ( param_getchar ( Cmd , 0 ) ) ;
if ( strlen ( Cmd ) > 6 | | strlen ( Cmd ) = = 0 | | cmdp = = ' h ' )
return usage_data_detectclock ( ) ;
2019-04-08 15:50:06 +08:00
int clock1 = 0 ;
2019-03-10 07:00:59 +08:00
switch ( cmdp ) {
2019-03-10 06:35:06 +08:00
case ' a ' :
2019-04-08 15:50:06 +08:00
clock1 = GetAskClock ( Cmd + 1 , true ) ;
2019-03-10 06:35:06 +08:00
break ;
case ' f ' :
2019-04-08 15:50:06 +08:00
clock1 = GetFskClock ( " " , true ) ;
2019-03-10 06:35:06 +08:00
break ;
case ' n ' :
2019-04-08 15:50:06 +08:00
clock1 = GetNrzClock ( " " , true ) ;
2019-03-10 06:35:06 +08:00
break ;
case ' p ' :
2019-04-08 15:50:06 +08:00
clock1 = GetPskClock ( " " , true ) ;
2019-03-10 06:35:06 +08:00
break ;
default :
PrintAndLogEx ( NORMAL , " Please specify a valid modulation to detect the clock of - see option h for help " ) ;
break ;
}
RepaintGraphWindow ( ) ;
2019-04-08 15:50:06 +08:00
return clock1 ;
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
}
2014-12-30 04:32:53 +08:00
2019-04-13 06:25:43 +08:00
static char * GetFSKType ( uint8_t fchigh , uint8_t fclow , uint8_t invert ) {
2019-03-10 06:35:06 +08:00
static char fType [ 8 ] ;
memset ( fType , 0x00 , 8 ) ;
char * fskType = fType ;
2019-03-09 15:59:13 +08:00
2019-03-10 07:00:59 +08:00
if ( fchigh = = 10 & & fclow = = 8 ) {
2019-03-09 15:59:13 +08:00
2019-03-10 06:35:06 +08:00
if ( invert )
memcpy ( fskType , " FSK2a " , 5 ) ;
else
memcpy ( fskType , " FSK2 " , 4 ) ;
2019-03-09 15:59:13 +08:00
2019-03-10 06:35:06 +08:00
} else if ( fchigh = = 8 & & fclow = = 5 ) {
2019-03-09 15:59:13 +08:00
2019-03-10 06:35:06 +08:00
if ( invert )
memcpy ( fskType , " FSK1 " , 4 ) ;
else
memcpy ( fskType , " FSK1a " , 5 ) ;
2019-03-09 15:59:13 +08:00
2019-03-10 06:35:06 +08:00
} else {
memcpy ( fskType , " FSK?? " , 5 ) ;
}
return fskType ;
2015-04-05 12:58:57 +08:00
}
2021-03-23 03:54:08 +08:00
// fsk raw demod and print binary
// takes 4 arguments - Clock, invert, fchigh, fclow
// defaults: clock = 50, invert=1, fchigh=10, fclow=8 (RF/10 RF/8 (fsk2a))
2020-09-28 17:50:20 +08:00
int FSKrawDemod ( uint8_t rfLen , uint8_t invert , uint8_t fchigh , uint8_t fclow , bool verbose ) {
2019-03-10 06:35:06 +08:00
//raw fsk demod no manchester decoding no start bit finding just get binary from wave
2019-03-09 20:54:03 +08:00
if ( getSignalProperties ( ) - > isnoise )
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
2019-09-24 01:10:29 +08:00
uint8_t * bits = calloc ( MAX_GRAPH_TRACE_LEN , sizeof ( uint8_t ) ) ;
if ( bits = = NULL ) {
return PM3_EMALLOC ;
}
2019-09-26 22:30:29 +08:00
2019-03-10 06:35:06 +08:00
size_t BitLen = getFromGraphBuf ( bits ) ;
2019-09-24 01:10:29 +08:00
if ( BitLen = = 0 ) {
free ( bits ) ;
return PM3_ESOFT ;
}
2019-09-26 22:30:29 +08:00
2019-03-10 06:35:06 +08:00
//get field clock lengths
if ( ! fchigh | | ! fclow ) {
2019-04-08 15:50:06 +08:00
uint16_t fcs = countFC ( bits , BitLen , true ) ;
2019-03-10 06:35:06 +08:00
if ( ! fcs ) {
fchigh = 10 ;
fclow = 8 ;
} else {
fchigh = ( fcs > > 8 ) & 0x00FF ;
fclow = fcs & 0x00FF ;
}
}
//get bit clock length
if ( ! rfLen ) {
int firstClockEdge = 0 ; //todo - align grid on graph with this...
rfLen = detectFSKClk ( bits , BitLen , fchigh , fclow , & firstClockEdge ) ;
if ( ! rfLen ) rfLen = 50 ;
}
int startIdx = 0 ;
int size = fskdemod ( bits , BitLen , rfLen , invert , fchigh , fclow , & startIdx ) ;
if ( size > 0 ) {
2019-04-07 03:46:00 +08:00
setDemodBuff ( bits , size , 0 ) ;
2019-03-10 06:35:06 +08:00
setClockGrid ( rfLen , startIdx ) ;
// Now output the bitstream to the scrollback by line of 16 bits
if ( verbose | | g_debugMode ) {
PrintAndLogEx ( DEBUG , " DEBUG: (FSKrawDemod) Using Clock:%u, invert:%u, fchigh:%u, fclow:%u " , rfLen , invert , fchigh , fclow ) ;
PrintAndLogEx ( NORMAL , " %s decoded bitstream: " , GetFSKType ( fchigh , fclow , invert ) ) ;
2020-11-05 02:19:38 +08:00
printDemodBuff ( 0 , false , invert , false ) ;
2019-03-10 06:35:06 +08:00
}
2019-09-24 01:10:29 +08:00
goto out ;
2019-03-10 06:35:06 +08:00
} else {
2019-03-12 19:56:59 +08:00
PrintAndLogEx ( DEBUG , " no FSK data found " ) ;
2019-03-10 06:35:06 +08:00
}
2019-09-24 01:10:29 +08:00
2019-10-13 06:48:26 +08:00
out :
2019-09-24 01:10:29 +08:00
free ( bits ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2014-12-20 01:14:27 +08:00
}
2021-03-23 03:54:08 +08:00
// fsk raw demod and print binary
// takes 4 arguments - Clock, invert, fchigh, fclow
// defaults: clock = 50, invert=1, fchigh=10, fclow=8 (RF/10 RF/8 (fsk2a))
2019-04-13 06:25:43 +08:00
static int CmdFSKrawdemod ( const char * Cmd ) {
2019-03-10 06:35:06 +08:00
char cmdp = tolower ( param_getchar ( Cmd , 0 ) ) ;
if ( strlen ( Cmd ) > 20 | | cmdp = = ' h ' ) return usage_data_rawdemod_fs ( ) ;
2020-09-28 17:50:20 +08:00
uint8_t rfLen , invert , fchigh , fclow ;
//set defaults
//set options from parameters entered with the command
rfLen = param_get8 ( Cmd , 0 ) ;
invert = param_get8 ( Cmd , 1 ) ;
fchigh = param_get8 ( Cmd , 2 ) ;
fclow = param_get8 ( Cmd , 3 ) ;
2016-07-31 17:37:19 +08:00
2020-09-28 17:50:20 +08:00
if ( strlen ( Cmd ) > 0 & & strlen ( Cmd ) < = 2 ) {
if ( rfLen = = 1 ) {
invert = 1 ; //if invert option only is used
rfLen = 0 ;
}
}
return FSKrawDemod ( rfLen , invert , fchigh , fclow , true ) ;
2015-02-21 13:27:48 +08:00
}
2021-03-23 03:54:08 +08:00
// attempt to psk1 demod graph buffer
2020-09-28 17:50:20 +08:00
int PSKDemod ( int clk , int invert , int maxErr , bool verbose ) {
2019-03-09 20:54:03 +08:00
if ( getSignalProperties ( ) - > isnoise )
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
2019-09-24 01:10:29 +08:00
uint8_t * bits = calloc ( MAX_GRAPH_TRACE_LEN , sizeof ( uint8_t ) ) ;
if ( bits = = NULL ) {
return PM3_EMALLOC ;
}
2019-03-25 21:41:28 +08:00
size_t bitlen = getFromGraphBuf ( bits ) ;
2019-09-24 01:10:29 +08:00
if ( bitlen = = 0 ) {
free ( bits ) ;
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-09-24 01:10:29 +08:00
}
2019-10-13 06:48:26 +08:00
2019-03-10 06:35:06 +08:00
int startIdx = 0 ;
2019-03-25 21:41:28 +08:00
int errCnt = pskRawDemod_ext ( bits , & bitlen , & clk , & invert , & startIdx ) ;
2019-03-10 07:00:59 +08:00
if ( errCnt > maxErr ) {
2019-10-06 05:56:19 +08:00
if ( g_debugMode | | verbose ) PrintAndLogEx ( DEBUG , " DEBUG: (PSKdemod) Too many errors found, clk: %d, invert: %d, numbits: %zu, errCnt: %d " , clk , invert , bitlen , errCnt ) ;
2019-09-24 01:10:29 +08:00
free ( bits ) ;
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
}
2019-03-25 21:41:28 +08:00
if ( errCnt < 0 | | bitlen < 16 ) { //throw away static - allow 1 and -1 (in case of threshold command first)
2019-10-06 05:56:19 +08:00
if ( g_debugMode | | verbose ) PrintAndLogEx ( DEBUG , " DEBUG: (PSKdemod) no data found, clk: %d, invert: %d, numbits: %zu, errCnt: %d " , clk , invert , bitlen , errCnt ) ;
2019-09-24 01:10:29 +08:00
free ( bits ) ;
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
}
2019-03-10 07:00:59 +08:00
if ( verbose | | g_debugMode ) {
2019-10-06 05:56:19 +08:00
PrintAndLogEx ( DEBUG , " DEBUG: (PSKdemod) Using Clock:%d, invert:%d, Bits Found:%zu " , clk , invert , bitlen ) ;
2019-03-10 07:00:59 +08:00
if ( errCnt > 0 ) {
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( DEBUG , " DEBUG: (PSKdemod) errors during Demoding (shown as 7 in bit stream): %d " , errCnt ) ;
}
}
//prime demod buffer for output
2019-04-07 03:46:00 +08:00
setDemodBuff ( bits , bitlen , 0 ) ;
2019-03-10 06:35:06 +08:00
setClockGrid ( clk , startIdx ) ;
2019-09-24 01:10:29 +08:00
free ( bits ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2015-01-06 22:20:36 +08:00
}
2015-02-06 06:01:18 +08:00
// takes 3 arguments - clock, invert, maxErr as integers
// attempts to demodulate nrz only
// prints binary found and saves in demodbuffer for further commands
2020-09-28 17:50:20 +08:00
int NRZrawDemod ( int clk , int invert , int maxErr , bool verbose ) {
2018-09-06 00:56:21 +08:00
2019-03-10 06:35:06 +08:00
int errCnt = 0 , clkStartIdx = 0 ;
2019-03-09 20:54:03 +08:00
if ( getSignalProperties ( ) - > isnoise )
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-09 15:59:13 +08:00
2019-09-24 01:10:29 +08:00
uint8_t * bits = calloc ( MAX_GRAPH_TRACE_LEN , sizeof ( uint8_t ) ) ;
if ( bits = = NULL ) {
return PM3_EMALLOC ;
}
2019-10-13 06:48:26 +08:00
2019-03-10 06:35:06 +08:00
size_t BitLen = getFromGraphBuf ( bits ) ;
2019-03-09 15:59:13 +08:00
2019-09-24 01:10:29 +08:00
if ( BitLen = = 0 ) {
free ( bits ) ;
return PM3_ESOFT ;
}
2019-03-09 15:59:13 +08:00
2019-03-10 06:35:06 +08:00
errCnt = nrzRawDemod ( bits , & BitLen , & clk , & invert , & clkStartIdx ) ;
2019-03-10 07:00:59 +08:00
if ( errCnt > maxErr ) {
2019-10-06 05:56:19 +08:00
PrintAndLogEx ( DEBUG , " DEBUG: (NRZrawDemod) Too many errors found, clk: %d, invert: %d, numbits: %zu, errCnt: %d " , clk , invert , BitLen , errCnt ) ;
2019-09-24 01:10:29 +08:00
free ( bits ) ;
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
}
2019-03-10 07:00:59 +08:00
if ( errCnt < 0 | | BitLen < 16 ) { //throw away static - allow 1 and -1 (in case of threshold command first)
2019-10-06 05:56:19 +08:00
PrintAndLogEx ( DEBUG , " DEBUG: (NRZrawDemod) no data found, clk: %d, invert: %d, numbits: %zu, errCnt: %d " , clk , invert , BitLen , errCnt ) ;
2019-09-24 01:10:29 +08:00
free ( bits ) ;
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
}
2019-10-13 06:48:26 +08:00
2019-10-06 05:56:19 +08:00
if ( verbose | | g_debugMode ) PrintAndLogEx ( DEBUG , " DEBUG: (NRZrawDemod) Tried NRZ Demod using Clock: %d - invert: %d - Bits Found: %zu " , clk , invert , BitLen ) ;
2019-03-10 06:35:06 +08:00
//prime demod buffer for output
2019-04-07 03:46:00 +08:00
setDemodBuff ( bits , BitLen , 0 ) ;
2019-03-10 06:35:06 +08:00
setClockGrid ( clk , clkStartIdx ) ;
2017-07-30 15:17:48 +08:00
2015-03-26 02:24:36 +08:00
2019-03-10 06:35:06 +08:00
if ( errCnt > 0 & & ( verbose | | g_debugMode ) ) PrintAndLogEx ( DEBUG , " DEBUG: (NRZrawDemod) Errors during Demoding (shown as 7 in bit stream): %d " , errCnt ) ;
if ( verbose | | g_debugMode ) {
PrintAndLogEx ( NORMAL , " NRZ demoded bitstream: " ) ;
// Now output the bitstream to the scrollback by line of 16 bits
2020-11-05 02:19:38 +08:00
printDemodBuff ( 0 , false , invert , false ) ;
2019-03-10 06:35:06 +08:00
}
2019-10-13 06:48:26 +08:00
2019-09-24 01:10:29 +08:00
free ( bits ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2015-02-22 07:37:15 +08:00
}
2019-04-13 06:25:43 +08:00
static int CmdNRZrawDemod ( const char * Cmd ) {
2019-03-10 06:35:06 +08:00
char cmdp = tolower ( param_getchar ( Cmd , 0 ) ) ;
if ( strlen ( Cmd ) > 16 | | cmdp = = ' h ' ) return usage_data_rawdemod_nr ( ) ;
2020-09-28 17:50:20 +08:00
int invert = 0 , clk = 0 , maxErr = 100 ;
sscanf ( Cmd , " %i %i %i " , & clk , & invert , & maxErr ) ;
if ( clk = = 1 ) {
invert = 1 ;
clk = 0 ;
}
2016-07-31 17:37:19 +08:00
2020-09-28 17:50:20 +08:00
if ( invert ! = 0 & & invert ! = 1 ) {
PrintAndLogEx ( WARNING , " (NRZrawDemod) Invalid argument: %s " , Cmd ) ;
return PM3_EINVARG ;
}
return NRZrawDemod ( clk , invert , maxErr , true ) ;
2015-02-06 06:01:18 +08:00
}
2020-11-05 02:19:38 +08:00
// takes 3 arguments - clock, invert, max_err as integers
2015-01-27 06:23:19 +08:00
// attempts to demodulate psk only
// prints binary found and saves in demodbuffer for further commands
2019-03-10 18:20:22 +08:00
int CmdPSK1rawDemod ( const char * Cmd ) {
2019-03-10 06:35:06 +08:00
char cmdp = tolower ( param_getchar ( Cmd , 0 ) ) ;
if ( strlen ( Cmd ) > 16 | | cmdp = = ' h ' ) return usage_data_rawdemod_p1 ( ) ;
2020-11-05 02:19:38 +08:00
int clk = 0 , invert = 0 , max_err = 100 ;
sscanf ( Cmd , " %i %i %i " , & clk , & invert , & max_err ) ;
2020-09-28 17:50:20 +08:00
if ( clk = = 1 ) {
invert = 1 ;
clk = 0 ;
}
if ( invert ! = 0 & & invert ! = 1 ) {
PrintAndLogEx ( WARNING , " Invalid value for invert: %i " , invert ) ;
return PM3_EINVARG ;
}
2020-11-05 02:19:38 +08:00
int ans = PSKDemod ( clk , invert , max_err , true ) ;
2019-03-10 06:35:06 +08:00
//output
2019-05-22 20:33:33 +08:00
if ( ans ! = PM3_SUCCESS ) {
2019-07-14 06:35:18 +08:00
if ( g_debugMode ) PrintAndLogEx ( ERR , " Error demoding: %d " , ans ) ;
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
}
PrintAndLogEx ( NORMAL , " PSK1 demoded bitstream: " ) ;
// Now output the bitstream to the scrollback by line of 16 bits
2020-11-05 02:19:38 +08:00
printDemodBuff ( 0 , false , invert , false ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2015-01-06 22:20:36 +08:00
}
2015-02-10 05:25:12 +08:00
// takes same args as cmdpsk1rawdemod
2019-04-13 06:25:43 +08:00
static int CmdPSK2rawDemod ( const char * Cmd ) {
2019-03-10 06:35:06 +08:00
char cmdp = tolower ( param_getchar ( Cmd , 0 ) ) ;
if ( strlen ( Cmd ) > 16 | | cmdp = = ' h ' ) return usage_data_rawdemod_p2 ( ) ;
2020-11-05 02:19:38 +08:00
int clk = 0 , invert = 0 , max_err = 100 ;
sscanf ( Cmd , " %i %i %i " , & clk , & invert , & max_err ) ;
2020-09-28 17:50:20 +08:00
if ( clk = = 1 ) {
invert = 1 ;
clk = 0 ;
}
if ( invert ! = 0 & & invert ! = 1 ) {
PrintAndLogEx ( WARNING , " Invalid value for invert: %i " , invert ) ;
return PM3_EINVARG ;
}
2020-11-05 02:19:38 +08:00
int ans = PSKDemod ( clk , invert , max_err , true ) ;
2019-05-22 20:33:33 +08:00
if ( ans ! = PM3_SUCCESS ) {
2019-07-14 06:35:18 +08:00
if ( g_debugMode ) PrintAndLogEx ( ERR , " Error demoding: %d " , ans ) ;
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
}
psk1TOpsk2 ( DemodBuffer , DemodBufferLen ) ;
PrintAndLogEx ( NORMAL , " PSK2 demoded bitstream: " ) ;
// Now output the bitstream to the scrollback by line of 16 bits
2020-11-05 02:19:38 +08:00
printDemodBuff ( 0 , false , invert , false ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2015-01-27 06:23:19 +08:00
}
2021-03-23 03:54:08 +08:00
// combines all raw demod functions into one menu command
2019-04-13 06:25:43 +08:00
static int CmdRawDemod ( const char * Cmd ) {
2019-03-10 06:35:06 +08:00
int ans = 0 ;
2016-07-31 17:37:19 +08:00
2019-03-10 06:35:06 +08:00
if ( strlen ( Cmd ) > 35 | | strlen ( Cmd ) < 2 )
return usage_data_rawdemod ( ) ;
2019-03-09 15:59:13 +08:00
2019-03-10 07:00:59 +08:00
str_lower ( ( char * ) Cmd ) ;
2016-07-31 17:37:19 +08:00
2019-04-14 17:43:05 +08:00
if ( str_startswith ( Cmd , " fs " ) | | Cmd [ 0 ] = = ' f ' ) ans = CmdFSKrawdemod ( Cmd + 2 ) ;
2019-03-10 07:00:59 +08:00
else if ( str_startswith ( Cmd , " ab " ) ) ans = Cmdaskbiphdemod ( Cmd + 2 ) ;
else if ( str_startswith ( Cmd , " am " ) ) ans = Cmdaskmandemod ( Cmd + 2 ) ;
else if ( str_startswith ( Cmd , " ar " ) ) ans = Cmdaskrawdemod ( Cmd + 2 ) ;
2019-04-14 17:43:05 +08:00
else if ( str_startswith ( Cmd , " nr " ) | | Cmd [ 0 ] = = ' n ' ) ans = CmdNRZrawDemod ( Cmd + 2 ) ;
2020-12-11 08:17:51 +08:00
else if ( str_startswith ( Cmd , " p1 " ) ) ans = CmdPSK1rawDemod ( Cmd + 2 ) ;
2019-03-10 07:00:59 +08:00
else if ( str_startswith ( Cmd , " p2 " ) ) ans = CmdPSK2rawDemod ( Cmd + 2 ) ;
2019-03-10 06:35:06 +08:00
else PrintAndLogEx ( WARNING , " Unknown modulation entered - see help ('h') for parameter structure " ) ;
2016-07-31 17:37:19 +08:00
2019-03-10 06:35:06 +08:00
return ans ;
2015-02-10 05:25:12 +08:00
}
2017-07-30 15:17:48 +08:00
2019-04-14 06:45:27 +08:00
void setClockGrid ( uint32_t clk , int offset ) {
2019-03-10 06:35:06 +08:00
g_DemodStartIdx = offset ;
g_DemodClock = clk ;
2019-03-28 21:19:41 +08:00
if ( clk = = 0 & & offset = = 0 )
2019-03-27 03:22:39 +08:00
PrintAndLogEx ( DEBUG , " DEBUG: (setClockGrid) clear settings " ) ;
else
PrintAndLogEx ( DEBUG , " DEBUG: (setClockGrid) demodoffset %d, clk %d " , offset , clk ) ;
2019-03-10 06:35:06 +08:00
if ( offset > clk ) offset % = clk ;
if ( offset < 0 ) offset + = clk ;
if ( offset > GraphTraceLen | | offset < 0 ) return ;
if ( clk < 8 | | clk > GraphTraceLen ) {
GridLocked = false ;
GridOffset = 0 ;
PlotGridX = 0 ;
PlotGridXdefault = 0 ;
RepaintGraphWindow ( ) ;
} else {
GridLocked = true ;
GridOffset = offset ;
PlotGridX = clk ;
PlotGridXdefault = clk ;
RepaintGraphWindow ( ) ;
}
2017-07-30 15:17:48 +08:00
}
2019-03-10 18:20:22 +08:00
int CmdGrid ( const char * Cmd ) {
2020-10-09 22:49:50 +08:00
sscanf ( Cmd , " %lf %lf " , & PlotGridX , & PlotGridY ) ;
2019-03-10 06:35:06 +08:00
PlotGridXdefault = PlotGridX ;
PlotGridYdefault = PlotGridY ;
RepaintGraphWindow ( ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
}
2017-02-28 23:55:16 +08:00
2019-04-13 06:25:43 +08:00
static int CmdSetGraphMarkers ( const char * Cmd ) {
2019-03-10 06:35:06 +08:00
sscanf ( Cmd , " %i %i " , & CursorCPos , & CursorDPos ) ;
RepaintGraphWindow ( ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2017-03-02 03:14:46 +08:00
}
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
2019-04-13 06:25:43 +08:00
static int CmdHexsamples ( const char * Cmd ) {
2019-04-14 06:45:27 +08:00
uint32_t requested = 0 ;
uint32_t offset = 0 ;
2019-03-10 06:35:06 +08:00
char string_buf [ 25 ] ;
2019-03-10 07:00:59 +08:00
char * string_ptr = string_buf ;
2020-06-11 07:18:50 +08:00
uint8_t got [ pm3_capabilities . bigbuf_size ] ;
2019-03-10 06:35:06 +08:00
2019-04-14 06:45:27 +08:00
sscanf ( Cmd , " %u %u " , & requested , & offset ) ;
2019-03-10 06:35:06 +08:00
/* if no args send something */
if ( requested = = 0 )
requested = 8 ;
2020-06-11 05:03:03 +08:00
if ( requested > pm3_capabilities . bigbuf_size )
requested = pm3_capabilities . bigbuf_size ;
2019-03-10 06:35:06 +08:00
if ( offset + requested > sizeof ( got ) ) {
2020-06-11 05:03:03 +08:00
PrintAndLogEx ( NORMAL , " Tried to read past end of buffer, <bytes> + <offset> > %d " , pm3_capabilities . bigbuf_size ) ;
2019-05-22 20:33:33 +08:00
return PM3_EINVARG ;
2019-03-10 06:35:06 +08:00
}
2019-07-24 03:33:52 +08:00
if ( ! GetFromDevice ( BIG_BUF , got , requested , offset , NULL , 0 , NULL , 2500 , false ) ) {
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( WARNING , " command execution time out " ) ;
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
}
2019-04-14 06:45:27 +08:00
uint8_t i = 0 ;
for ( uint32_t j = 0 ; j < requested ; j + + ) {
2019-03-10 06:35:06 +08:00
i + + ;
string_ptr + = sprintf ( string_ptr , " %02x " , got [ j ] ) ;
if ( i = = 8 ) {
* ( string_ptr - 1 ) = ' \0 ' ; // remove the trailing space
PrintAndLogEx ( NORMAL , " %s " , string_buf ) ;
string_buf [ 0 ] = ' \0 ' ;
string_ptr = string_buf ;
i = 0 ;
}
if ( j = = requested - 1 & & string_buf [ 0 ] ! = ' \0 ' ) { // print any remaining bytes
* ( string_ptr - 1 ) = ' \0 ' ;
PrintAndLogEx ( NORMAL , " %s " , string_buf ) ;
string_buf [ 0 ] = ' \0 ' ;
}
}
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
}
2019-04-14 03:54:04 +08:00
static int CmdHide ( const char * Cmd ) {
2021-03-23 01:07:33 +08:00
CLIParserContext * ctx ;
CLIParserInit ( & ctx , " data hide " ,
" Show graph window " ,
" data hide "
) ;
void * argtable [ ] = {
arg_param_begin ,
arg_param_end
} ;
CLIExecWithReturn ( ctx , Cmd , argtable , true ) ;
CLIParserFree ( ctx ) ;
2019-03-10 06:35:06 +08:00
HideGraphWindow ( ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
}
2021-03-23 03:54:08 +08:00
// zero mean GraphBuffer
2019-03-10 18:20:22 +08:00
int CmdHpf ( const char * Cmd ) {
2019-04-10 18:23:40 +08:00
( void ) Cmd ; // Cmd is not used so far
2019-03-10 06:35:06 +08:00
uint8_t bits [ GraphTraceLen ] ;
size_t size = getFromGraphBuf ( bits ) ;
removeSignalOffset ( bits , size ) ;
// push it back to graph
setGraphBuf ( bits , size ) ;
// set signal properties low/high/mean/amplitude and is_noise detection
computeSignalProperties ( bits , size ) ;
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
2019-03-10 06:35:06 +08:00
RepaintGraphWindow ( ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
}
2015-01-29 07:57:22 +08:00
2019-04-14 03:54:04 +08:00
static bool _headBit ( BitstreamOut * stream ) {
2019-03-10 06:35:06 +08:00
int bytepos = stream - > position > > 3 ; // divide by 8
int bitpos = ( stream - > position + + ) & 7 ; // mask out 00000111
2019-03-10 07:00:59 +08:00
return ( * ( stream - > buffer + bytepos ) > > ( 7 - bitpos ) ) & 1 ;
2015-01-29 07:57:22 +08:00
}
2019-04-14 03:54:04 +08:00
static uint8_t getByte ( uint8_t bits_per_sample , BitstreamOut * b ) {
2019-03-10 06:35:06 +08:00
uint8_t val = 0 ;
2019-03-10 07:00:59 +08:00
for ( int i = 0 ; i < bits_per_sample ; i + + )
val | = ( _headBit ( b ) < < ( 7 - i ) ) ;
2016-07-31 17:37:19 +08:00
2019-03-10 06:35:06 +08:00
return val ;
2015-01-29 07:57:22 +08:00
}
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
2020-01-08 05:05:01 +08:00
int getSamples ( uint32_t n , bool verbose ) {
2020-06-18 17:05:21 +08:00
return getSamplesEx ( 0 , n , verbose ) ;
}
int getSamplesEx ( uint32_t start , uint32_t end , bool verbose ) {
if ( end < start ) {
PrintAndLogEx ( WARNING , " error, end (%u) is smaller than start (%u) " , end , start ) ;
return PM3_EINVARG ;
}
2019-03-10 06:35:06 +08:00
//If we get all but the last byte in bigbuf,
// we don't have to worry about remaining trash
// in the last byte in case the bits-per-sample
// does not line up on byte boundaries
2020-06-11 07:18:50 +08:00
uint8_t got [ pm3_capabilities . bigbuf_size - 1 ] ;
memset ( got , 0x00 , sizeof ( got ) ) ;
2015-03-26 02:24:36 +08:00
2020-06-18 17:05:21 +08:00
uint32_t n = end - start ;
2021-01-28 21:09:25 +08:00
if ( n = = 0 | | n > pm3_capabilities . bigbuf_size - 1 )
2020-06-11 07:18:50 +08:00
n = pm3_capabilities . bigbuf_size - 1 ;
2015-03-26 02:24:36 +08:00
2020-06-18 17:05:21 +08:00
if ( verbose )
PrintAndLogEx ( INFO , " Reading " _YELLOW_ ( " %u " ) " bytes from device memory " , n ) ;
2017-07-30 15:17:48 +08:00
2019-04-18 18:43:35 +08:00
PacketResponseNG response ;
2020-06-18 17:05:21 +08:00
if ( ! GetFromDevice ( BIG_BUF , got , n , start , NULL , 0 , & response , 10000 , true ) ) {
2018-04-27 17:22:30 +08:00
PrintAndLogEx ( WARNING , " timeout while waiting for reply. " ) ;
2019-05-22 20:33:33 +08:00
return PM3_ETIMEOUT ;
2015-11-27 23:24:00 +08:00
}
2018-04-27 22:50:22 +08:00
2020-01-15 20:07:51 +08:00
if ( verbose ) PrintAndLogEx ( SUCCESS , " Data fetched " ) ;
2019-03-09 15:59:13 +08:00
2019-03-10 06:35:06 +08:00
uint8_t bits_per_sample = 8 ;
2015-03-26 02:24:36 +08:00
2019-03-10 06:35:06 +08:00
//Old devices without this feature would send 0 at arg[0]
2019-04-18 05:44:48 +08:00
if ( response . oldarg [ 0 ] > 0 ) {
sample_config * sc = ( sample_config * ) response . data . asBytes ;
2020-04-22 08:22:55 +08:00
if ( verbose ) PrintAndLogEx ( INFO , " Samples @ " _YELLOW_ ( " %d " ) " bits/smpl, decimation 1:%d " , sc - > bits_per_sample , sc - > decimation ) ;
2019-03-10 06:35:06 +08:00
bits_per_sample = sc - > bits_per_sample ;
}
2019-03-09 15:59:13 +08:00
2019-03-10 06:35:06 +08:00
if ( bits_per_sample < 8 ) {
2019-03-09 15:59:13 +08:00
2020-01-15 20:07:51 +08:00
if ( verbose ) PrintAndLogEx ( INFO , " Unpacking... " ) ;
2019-03-09 15:59:13 +08:00
2019-03-10 06:35:06 +08:00
BitstreamOut bout = { got , bits_per_sample * n , 0 } ;
2020-05-26 16:59:12 +08:00
uint32_t j = 0 ;
2019-03-10 06:35:06 +08:00
for ( j = 0 ; j * bits_per_sample < n * 8 & & j < n ; j + + ) {
uint8_t sample = getByte ( bits_per_sample , & bout ) ;
2019-05-23 18:12:20 +08:00
GraphBuffer [ j ] = ( ( int ) sample ) - 127 ;
2019-03-10 06:35:06 +08:00
}
GraphTraceLen = j ;
2019-03-09 15:59:13 +08:00
2020-01-15 20:07:51 +08:00
if ( verbose ) PrintAndLogEx ( INFO , " Unpacked %d samples " , j ) ;
2019-03-09 15:59:13 +08:00
2019-03-10 06:35:06 +08:00
} else {
2020-05-26 16:59:12 +08:00
for ( uint32_t j = 0 ; j < n ; j + + ) {
2019-05-23 18:12:20 +08:00
GraphBuffer [ j ] = ( ( int ) got [ j ] ) - 127 ;
2019-03-10 06:35:06 +08:00
}
GraphTraceLen = n ;
}
2015-03-26 02:24:36 +08:00
2019-03-10 06:35:06 +08:00
uint8_t bits [ GraphTraceLen ] ;
size_t size = getFromGraphBuf ( bits ) ;
// set signal properties low/high/mean/amplitude and is_noise detection
computeSignalProperties ( bits , size ) ;
2019-03-09 02:06:55 +08:00
2019-03-10 06:35:06 +08:00
setClockGrid ( 0 , 0 ) ;
DemodBufferLen = 0 ;
RepaintGraphWindow ( ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2015-03-24 04:29:50 +08:00
}
2019-04-13 06:25:43 +08:00
static int CmdSamples ( const char * Cmd ) {
2021-03-23 01:21:35 +08:00
CLIParserContext * ctx ;
CLIParserInit ( & ctx , " data samples " ,
" Get raw samples for graph window (GraphBuffer) from device. \n "
" If 0, then get whole big buffer from device. " ,
" data samples "
) ;
void * argtable [ ] = {
arg_param_begin ,
arg_int0 ( " n " , " " , " <dec> " , " num of samples (512 - 40000) " ) ,
arg_lit0 ( " v " , " verbose " , " verbose " ) ,
arg_param_end
} ;
CLIExecWithReturn ( ctx , Cmd , argtable , true ) ;
int n = arg_get_int_def ( ctx , 1 , 0 ) ;
bool verbose = arg_get_lit ( ctx , 2 ) ;
CLIParserFree ( ctx ) ;
return getSamples ( n , verbose ) ;
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
}
2019-03-10 18:20:22 +08:00
int CmdTuneSamples ( const char * Cmd ) {
2021-03-23 01:02:17 +08:00
CLIParserContext * ctx ;
CLIParserInit ( & ctx , " data tune " ,
" Measure tuning of device antenna. Results shown in graph window. \n "
" This command doesn't actively tune your antennas, \n "
" it's only informative by measuring voltage that the antennas will generate " ,
" data tune "
) ;
void * argtable [ ] = {
arg_param_begin ,
arg_param_end
} ;
CLIExecWithReturn ( ctx , Cmd , argtable , true ) ;
CLIParserFree ( ctx ) ;
2019-03-10 06:35:06 +08:00
# define NON_VOLTAGE 1000
# define LF_UNUSABLE_V 2000
# define LF_MARGINAL_V 10000
# define HF_UNUSABLE_V 3000
# define HF_MARGINAL_V 5000
2020-02-24 16:45:56 +08:00
# define ANTENNA_ERROR 1.00 // current algo has 3% error margin.
2019-03-10 06:35:06 +08:00
// hide demod plot line
DemodBufferLen = 0 ;
setClockGrid ( 0 , 0 ) ;
RepaintGraphWindow ( ) ;
int timeout = 0 ;
2020-05-14 05:20:46 +08:00
int timeout_max = 20 ;
2021-03-23 01:07:33 +08:00
PrintAndLogEx ( INFO , " ---------- " _CYAN_ ( " Reminder " ) " ------------------------ " ) ;
PrintAndLogEx ( INFO , " ` " _YELLOW_ ( " hw tune " ) " ` doesn't actively tune your antennas, " ) ;
2021-03-23 01:02:17 +08:00
PrintAndLogEx ( INFO , " it's only informative. " ) ;
2020-02-24 16:45:56 +08:00
PrintAndLogEx ( INFO , " Measuring antenna characteristics, please wait... " ) ;
2019-03-10 06:35:06 +08:00
clearCommandBuffer ( ) ;
2019-05-08 01:51:33 +08:00
SendCommandNG ( CMD_MEASURE_ANTENNA_TUNING , NULL , 0 ) ;
2019-04-18 18:43:35 +08:00
PacketResponseNG resp ;
2020-05-14 05:20:46 +08:00
PrintAndLogEx ( INPLACE , " % 3i " , timeout_max - timeout ) ;
while ( ! WaitForResponseTimeout ( CMD_MEASURE_ANTENNA_TUNING , & resp , 500 ) ) {
2019-03-10 07:00:59 +08:00
fflush ( stdout ) ;
2020-05-14 05:20:46 +08:00
if ( timeout > = timeout_max ) {
2019-04-17 02:00:25 +08:00
PrintAndLogEx ( WARNING , " \n No response from Proxmark3. Aborting... " ) ;
2019-05-22 20:33:33 +08:00
return PM3_ETIMEOUT ;
2019-03-10 06:35:06 +08:00
}
2020-05-14 05:20:46 +08:00
timeout + + ;
PrintAndLogEx ( INPLACE , " % 3i " , timeout_max - timeout ) ;
2019-03-10 06:35:06 +08:00
}
2019-10-03 22:15:47 +08:00
if ( resp . status ! = PM3_SUCCESS ) {
PrintAndLogEx ( WARNING , " Antenna tuning failed " ) ;
return PM3_ESOFT ;
}
2020-02-24 16:45:56 +08:00
PrintAndLogEx ( NORMAL , " " ) ;
2020-06-29 16:25:51 +08:00
PrintAndLogEx ( INFO , " ---------- " _CYAN_ ( " LF Antenna " ) " ---------- " ) ;
2019-10-03 22:15:47 +08:00
// in mVolt
struct p {
uint32_t v_lf134 ;
uint32_t v_lf125 ;
uint32_t v_lfconf ;
uint32_t v_hf ;
uint32_t peak_v ;
uint32_t peak_f ;
int divisor ;
uint8_t results [ 256 ] ;
} PACKED ;
2019-10-13 06:48:26 +08:00
struct p * package = ( struct p * ) resp . data . asBytes ;
2019-10-03 22:15:47 +08:00
if ( package - > v_lf125 > NON_VOLTAGE )
2019-10-25 06:42:47 +08:00
PrintAndLogEx ( SUCCESS , " LF antenna: %5.2f V - %.2f kHz " , ( package - > v_lf125 * ANTENNA_ERROR ) / 1000.0 , LF_DIV2FREQ ( LF_DIVISOR_125 ) ) ;
2019-03-10 06:35:06 +08:00
2019-10-03 22:15:47 +08:00
if ( package - > v_lf134 > NON_VOLTAGE )
2019-10-25 06:42:47 +08:00
PrintAndLogEx ( SUCCESS , " LF antenna: %5.2f V - %.2f kHz " , ( package - > v_lf134 * ANTENNA_ERROR ) / 1000.0 , LF_DIV2FREQ ( LF_DIVISOR_134 ) ) ;
2019-03-10 06:35:06 +08:00
2019-10-04 00:25:21 +08:00
if ( package - > v_lfconf > NON_VOLTAGE & & package - > divisor > 0 & & package - > divisor ! = LF_DIVISOR_125 & & package - > divisor ! = LF_DIVISOR_134 )
2019-10-25 06:42:47 +08:00
PrintAndLogEx ( SUCCESS , " LF antenna: %5.2f V - %.2f kHz " , ( package - > v_lfconf * ANTENNA_ERROR ) / 1000.0 , LF_DIV2FREQ ( package - > divisor ) ) ;
2019-03-10 06:35:06 +08:00
2019-10-03 22:15:47 +08:00
if ( package - > peak_v > NON_VOLTAGE & & package - > peak_f > 0 )
2019-10-25 06:42:47 +08:00
PrintAndLogEx ( SUCCESS , " LF optimal: %5.2f V - %6.2f kHz " , ( package - > peak_v * ANTENNA_ERROR ) / 1000.0 , LF_DIV2FREQ ( package - > peak_f ) ) ;
2019-03-10 06:35:06 +08:00
2020-12-03 21:52:07 +08:00
// Empirical measures in mV
2020-10-10 07:43:39 +08:00
const double vdd_rdv4 = 9000 ;
2020-12-03 21:52:07 +08:00
const double vdd_other = 5400 ;
2020-10-10 07:43:39 +08:00
double vdd = IfPm3Rdv4Fw ( ) ? vdd_rdv4 : vdd_other ;
2020-12-03 21:52:07 +08:00
2020-10-10 06:55:50 +08:00
if ( package - > peak_v > NON_VOLTAGE & & package - > peak_f > 0 ) {
// Q measure with Q=f/delta_f
double v_3db_scaled = ( double ) ( package - > peak_v * 0.707 ) / 512 ; // /512 == >>9
2020-10-12 04:40:05 +08:00
uint32_t s2 = 0 , s4 = 0 ;
2020-10-10 06:55:50 +08:00
for ( int i = 1 ; i < 256 ; i + + ) {
if ( ( s2 = = 0 ) & & ( package - > results [ i ] > v_3db_scaled ) ) {
s2 = i ;
}
if ( ( s2 ! = 0 ) & & ( package - > results [ i ] < v_3db_scaled ) ) {
s4 = i ;
break ;
}
}
2020-10-10 07:43:39 +08:00
double lfq1 = 0 ;
2020-10-10 06:55:50 +08:00
if ( s4 ! = 0 ) { // we got all our points of interest
double a = package - > results [ s2 - 1 ] ;
double b = package - > results [ s2 ] ;
2020-10-12 04:40:05 +08:00
double f1 = LF_DIV2FREQ ( s2 - 1 + ( v_3db_scaled - a ) / ( b - a ) ) ;
2020-10-10 06:55:50 +08:00
double c = package - > results [ s4 - 1 ] ;
double d = package - > results [ s4 ] ;
2020-10-12 04:40:05 +08:00
double f2 = LF_DIV2FREQ ( s4 - 1 + ( c - v_3db_scaled ) / ( c - d ) ) ;
2020-10-10 07:43:39 +08:00
lfq1 = LF_DIV2FREQ ( package - > peak_f ) / ( f1 - f2 ) ;
PrintAndLogEx ( SUCCESS , " Approx. Q factor (*): %.1lf by frequency bandwidth measurement " , lfq1 ) ;
2020-10-10 06:55:50 +08:00
}
// Q measure with Vlr=Q*(2*Vdd/pi)
2020-10-10 07:43:39 +08:00
double lfq2 = ( double ) package - > peak_v * 3.14 / 2 / vdd ;
PrintAndLogEx ( SUCCESS , " Approx. Q factor (*): %.1lf by peak voltage measurement " , lfq2 ) ;
// cross-check results
if ( lfq1 > 3 ) {
double approx_vdd = ( double ) package - > peak_v * 3.14 / 2 / lfq1 ;
2020-12-03 21:52:07 +08:00
// Got 8858 on a RDV4 with large antenna 134/14
// Got 8761 on a non-RDV4
const double approx_vdd_other_max = 8840 ;
// 1% over threshold and supposedly non-RDV4
if ( ( approx_vdd > approx_vdd_other_max * 1.01 ) & & ( ! IfPm3Rdv4Fw ( ) ) )
2020-10-10 07:43:39 +08:00
PrintAndLogEx ( WARNING , " Contradicting measures seem to indicate you're running a " _YELLOW_ ( " PM3_OTHER firmware on a RDV4 " ) " , please check your setup " ) ;
2020-12-03 21:52:07 +08:00
// 1% below threshold and supposedly RDV4
if ( ( approx_vdd < approx_vdd_other_max * 0.99 ) & & ( IfPm3Rdv4Fw ( ) ) )
2020-10-10 07:43:39 +08:00
PrintAndLogEx ( WARNING , " Contradicting measures seem to indicate you're running a " _YELLOW_ ( " PM3_RDV4 firmware on a non-RDV4 " ) " , please check your setup " ) ;
}
2020-10-10 06:55:50 +08:00
}
2019-03-10 06:35:06 +08:00
char judgement [ 20 ] ;
memset ( judgement , 0 , sizeof ( judgement ) ) ;
// LF evaluation
2019-10-03 22:15:47 +08:00
if ( package - > peak_v < LF_UNUSABLE_V )
2019-03-10 07:56:00 +08:00
sprintf ( judgement , _RED_ ( " UNUSABLE " ) ) ;
2019-10-03 22:15:47 +08:00
else if ( package - > peak_v < LF_MARGINAL_V )
2019-03-10 07:56:00 +08:00
sprintf ( judgement , _YELLOW_ ( " MARGINAL " ) ) ;
2019-03-10 06:35:06 +08:00
else
2019-03-10 07:56:00 +08:00
sprintf ( judgement , _GREEN_ ( " OK " ) ) ;
2019-03-10 06:35:06 +08:00
2020-06-29 16:25:51 +08:00
PrintAndLogEx ( ( package - > peak_v < LF_UNUSABLE_V ) ? WARNING : SUCCESS , " LF antenna is %s " , judgement ) ;
2019-03-10 06:35:06 +08:00
2020-06-29 16:25:51 +08:00
PrintAndLogEx ( INFO , " ---------- " _CYAN_ ( " HF Antenna " ) " ---------- " ) ;
2019-03-10 06:35:06 +08:00
// HF evaluation
2019-10-03 22:15:47 +08:00
if ( package - > v_hf > NON_VOLTAGE )
PrintAndLogEx ( SUCCESS , " HF antenna: %5.2f V - 13.56 MHz " , ( package - > v_hf * ANTENNA_ERROR ) / 1000.0 ) ;
2019-03-10 06:35:06 +08:00
memset ( judgement , 0 , sizeof ( judgement ) ) ;
2020-10-10 06:55:50 +08:00
if ( package - > v_hf > = HF_UNUSABLE_V ) {
// Q measure with Vlr=Q*(2*Vdd/pi)
2020-10-10 07:43:39 +08:00
double hfq = ( double ) package - > v_hf * 3.14 / 2 / vdd ;
PrintAndLogEx ( SUCCESS , " Approx. Q factor (*): %.1lf by peak voltage measurement " , hfq ) ;
2020-10-10 06:55:50 +08:00
}
2019-10-03 22:15:47 +08:00
if ( package - > v_hf < HF_UNUSABLE_V )
2019-03-10 07:56:00 +08:00
sprintf ( judgement , _RED_ ( " UNUSABLE " ) ) ;
2019-10-03 22:15:47 +08:00
else if ( package - > v_hf < HF_MARGINAL_V )
2019-03-10 07:56:00 +08:00
sprintf ( judgement , _YELLOW_ ( " MARGINAL " ) ) ;
2019-03-10 06:35:06 +08:00
else
2019-03-10 07:56:00 +08:00
sprintf ( judgement , _GREEN_ ( " OK " ) ) ;
2019-03-10 06:35:06 +08:00
2020-06-29 16:25:51 +08:00
PrintAndLogEx ( ( package - > v_hf < HF_UNUSABLE_V ) ? WARNING : SUCCESS , " HF antenna is %s " , judgement ) ;
2020-10-10 06:55:50 +08:00
PrintAndLogEx ( NORMAL , " \n (*) Q factor must be measured without tag on the antenna " ) ;
2019-03-10 06:35:06 +08:00
// graph LF measurements
// even here, these values has 3% error.
2019-04-08 16:30:20 +08:00
uint16_t test1 = 0 ;
2019-03-10 06:35:06 +08:00
for ( int i = 0 ; i < 256 ; i + + ) {
2019-10-03 22:15:47 +08:00
GraphBuffer [ i ] = package - > results [ i ] - 128 ;
test1 + = package - > results [ i ] ;
2019-03-10 06:35:06 +08:00
}
2019-04-10 15:36:23 +08:00
2019-04-08 16:30:20 +08:00
if ( test1 > 0 ) {
2020-10-10 06:55:50 +08:00
PrintAndLogEx ( SUCCESS , " \n Displaying LF tuning graph. Divisor %d (blue) is %.2f kHz, %d (red) is %.2f kHz. \n \n " ,
2019-10-25 06:42:47 +08:00
LF_DIVISOR_134 , LF_DIV2FREQ ( LF_DIVISOR_134 ) , LF_DIVISOR_125 , LF_DIV2FREQ ( LF_DIVISOR_125 ) ) ;
2019-03-10 06:35:06 +08:00
GraphTraceLen = 256 ;
2020-10-10 03:51:28 +08:00
CursorCPos = LF_DIVISOR_125 ;
CursorDPos = LF_DIVISOR_134 ;
2019-03-10 06:35:06 +08:00
ShowGraphWindow ( ) ;
RepaintGraphWindow ( ) ;
} else {
PrintAndLogEx ( FAILED , " \n Not showing LF tuning graph since all values is zero. \n \n " ) ;
}
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2014-12-01 05:30:36 +08:00
}
2019-04-13 06:25:43 +08:00
static int CmdLoad ( const char * Cmd ) {
2019-03-10 06:35:06 +08:00
2020-10-10 04:20:19 +08:00
CLIParserContext * ctx ;
CLIParserInit ( & ctx , " data load " ,
" This command loads the contents of a pm3 file into graph window \n " ,
" data load -f myfilename "
) ;
2019-09-21 14:47:12 +08:00
2020-10-10 04:20:19 +08:00
void * argtable [ ] = {
arg_param_begin ,
arg_strx0 ( " f " , " file " , " <filename> " , " file to load " ) ,
arg_param_end
} ;
CLIExecWithReturn ( ctx , Cmd , argtable , false ) ;
2019-03-10 06:35:06 +08:00
2020-10-10 04:20:19 +08:00
int fnlen = 0 ;
char filename [ FILE_PATH_SIZE ] = { 0 } ;
CLIParamStrToBuf ( arg_get_str ( ctx , 1 ) , ( uint8_t * ) filename , FILE_PATH_SIZE , & fnlen ) ;
CLIParserFree ( ctx ) ;
char * path = NULL ;
2019-09-05 04:53:54 +08:00
if ( searchFile ( & path , TRACES_SUBDIR , filename , " .pm3 " , true ) ! = PM3_SUCCESS ) {
if ( searchFile ( & path , TRACES_SUBDIR , filename , " " , false ) ! = PM3_SUCCESS ) {
return PM3_EFILE ;
}
2019-08-30 14:32:34 +08:00
}
FILE * f = fopen ( path , " r " ) ;
2019-03-10 06:35:06 +08:00
if ( ! f ) {
2019-08-30 14:32:34 +08:00
PrintAndLogEx ( WARNING , " couldn't open '%s' " , path ) ;
free ( path ) ;
2019-05-15 16:24:06 +08:00
return PM3_EFILE ;
2019-03-10 06:35:06 +08:00
}
2019-08-30 14:32:34 +08:00
free ( path ) ;
2019-03-10 06:35:06 +08:00
GraphTraceLen = 0 ;
char line [ 80 ] ;
2019-03-10 07:00:59 +08:00
while ( fgets ( line , sizeof ( line ) , f ) ) {
2019-03-10 06:35:06 +08:00
GraphBuffer [ GraphTraceLen ] = atoi ( line ) ;
GraphTraceLen + + ;
2019-03-10 07:00:59 +08:00
if ( GraphTraceLen > = MAX_GRAPH_TRACE_LEN )
2019-03-10 03:47:57 +08:00
break ;
2019-03-10 06:35:06 +08:00
}
2019-03-19 17:20:10 +08:00
fclose ( f ) ;
2019-03-09 15:59:13 +08:00
2020-05-11 23:23:01 +08:00
PrintAndLogEx ( SUCCESS , " loaded " _YELLOW_ ( " %zu " ) " samples " , GraphTraceLen ) ;
2019-03-09 02:06:55 +08:00
2019-03-10 06:35:06 +08:00
uint8_t bits [ GraphTraceLen ] ;
size_t size = getFromGraphBuf ( bits ) ;
removeSignalOffset ( bits , size ) ;
setGraphBuf ( bits , size ) ;
computeSignalProperties ( bits , size ) ;
2019-03-10 07:00:59 +08:00
setClockGrid ( 0 , 0 ) ;
2019-03-10 06:35:06 +08:00
DemodBufferLen = 0 ;
RepaintGraphWindow ( ) ;
2019-05-15 16:24:06 +08:00
return PM3_SUCCESS ;
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
}
2018-09-06 00:56:21 +08:00
// trim graph from the end
2019-03-10 18:20:22 +08:00
int CmdLtrim ( const char * Cmd ) {
2021-03-23 04:11:24 +08:00
CLIParserContext * ctx ;
CLIParserInit ( & ctx , " data ltrim " ,
" Trim samples from left of trace " ,
" data ltrim -i 300 --> keep 300 - end "
) ;
void * argtable [ ] = {
arg_param_begin ,
arg_u64_1 ( " i " , " idx " , " <dec> " , " from index to beginning trace " ) ,
arg_param_end
} ;
CLIExecWithReturn ( ctx , Cmd , argtable , false ) ;
uint32_t ds = arg_get_u32 ( ctx , 1 ) ;
CLIParserFree ( ctx ) ;
2019-04-14 06:45:27 +08:00
2019-03-10 06:35:06 +08:00
// sanitycheck
2021-03-23 04:11:24 +08:00
if ( GraphTraceLen < = ds ) {
PrintAndLogEx ( WARNING , " index out of bounds " ) ;
return PM3_EINVARG ;
}
2015-11-27 23:24:00 +08:00
2019-04-14 06:45:27 +08:00
for ( uint32_t i = ds ; i < GraphTraceLen ; + + i )
2019-03-10 07:00:59 +08:00
GraphBuffer [ i - ds ] = GraphBuffer [ i ] ;
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
2019-03-10 06:35:06 +08:00
GraphTraceLen - = ds ;
2020-10-06 20:11:09 +08:00
g_DemodStartIdx - = ds ;
2019-03-10 06:35:06 +08:00
RepaintGraphWindow ( ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
}
2015-01-21 06:28:51 +08:00
2018-09-06 00:56:21 +08:00
// trim graph from the beginning
2019-04-13 06:25:43 +08:00
static int CmdRtrim ( const char * Cmd ) {
2019-03-09 15:59:13 +08:00
2021-03-23 04:11:24 +08:00
CLIParserContext * ctx ;
CLIParserInit ( & ctx , " data rtrim " ,
" Trim samples from right of trace " ,
" data rtrim -i 4000 --> keep 0 - 4000 "
) ;
void * argtable [ ] = {
arg_param_begin ,
arg_u64_1 ( " i " , " idx " , " <dec> " , " from index to end trace " ) ,
arg_param_end
} ;
CLIExecWithReturn ( ctx , Cmd , argtable , false ) ;
uint32_t ds = arg_get_u32 ( ctx , 1 ) ;
CLIParserFree ( ctx ) ;
2018-09-06 00:56:21 +08:00
2019-03-10 06:35:06 +08:00
// sanitycheck
2021-03-23 04:11:24 +08:00
if ( GraphTraceLen < = ds ) {
PrintAndLogEx ( WARNING , " index out of bounds " ) ;
return PM3_EINVARG ;
}
2018-09-06 00:56:21 +08:00
2019-03-10 06:35:06 +08:00
GraphTraceLen = ds ;
RepaintGraphWindow ( ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2015-01-01 03:43:49 +08:00
}
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
2017-03-02 03:14:46 +08:00
// trim graph (middle) piece
2019-04-13 06:25:43 +08:00
static int CmdMtrim ( const char * Cmd ) {
2017-03-02 03:14:46 +08:00
2021-03-23 04:11:24 +08:00
CLIParserContext * ctx ;
CLIParserInit ( & ctx , " data mtrim " ,
" Trim out samples from the specified start to the specified end point " ,
" data mtrim -s 1000 -e 2000 --> keep between 1000 and 2000 "
) ;
void * argtable [ ] = {
arg_param_begin ,
arg_u64_1 ( " s " , " start " , " <dec> " , " start point " ) ,
arg_u64_1 ( " e " , " end " , " <dec> " , " end point " ) ,
arg_param_end
} ;
CLIExecWithReturn ( ctx , Cmd , argtable , false ) ;
uint32_t start = arg_get_u32 ( ctx , 1 ) ;
uint32_t stop = arg_get_u32 ( ctx , 2 ) ;
CLIParserFree ( ctx ) ;
if ( start > GraphTraceLen | | stop > GraphTraceLen | | start > = stop ) {
PrintAndLogEx ( WARNING , " start and end points doesn't align " ) ;
return PM3_EINVARG ;
}
2019-03-09 15:59:13 +08:00
2019-03-10 06:35:06 +08:00
// leave start position sample
start + + ;
2017-03-02 03:14:46 +08:00
2019-03-10 06:35:06 +08:00
GraphTraceLen = stop - start ;
2021-03-23 04:11:24 +08:00
for ( uint32_t i = 0 ; i < GraphTraceLen ; i + + ) {
2019-03-10 07:00:59 +08:00
GraphBuffer [ i ] = GraphBuffer [ start + i ] ;
2021-03-23 04:11:24 +08:00
}
2018-09-06 00:56:21 +08:00
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2017-03-02 03:14:46 +08:00
}
2019-03-10 18:20:22 +08:00
int CmdNorm ( const char * Cmd ) {
2021-03-23 04:11:24 +08:00
CLIParserContext * ctx ;
CLIParserInit ( & ctx , " data norm " ,
" Normalize max/min to +/-128 " ,
" data norm "
) ;
void * argtable [ ] = {
arg_param_begin ,
arg_param_end
} ;
CLIExecWithReturn ( ctx , Cmd , argtable , true ) ;
CLIParserFree ( ctx ) ;
2019-03-10 06:35:06 +08:00
int max = INT_MIN , min = INT_MAX ;
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
2019-03-10 06:35:06 +08:00
// Find local min, max
2019-04-14 06:45:27 +08:00
for ( uint32_t i = 10 ; i < GraphTraceLen ; + + i ) {
2019-03-10 06:35:06 +08:00
if ( GraphBuffer [ i ] > max ) max = GraphBuffer [ i ] ;
if ( GraphBuffer [ i ] < min ) min = GraphBuffer [ i ] ;
}
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
2019-03-10 06:35:06 +08:00
if ( max ! = min ) {
2019-04-14 06:45:27 +08:00
for ( uint32_t i = 0 ; i < GraphTraceLen ; + + i ) {
2019-03-10 06:35:06 +08:00
GraphBuffer [ i ] = ( ( long ) ( GraphBuffer [ i ] - ( ( max + min ) / 2 ) ) * 256 ) / ( max - min ) ;
//marshmelow: adjusted *1000 to *256 to make +/- 128 so demod commands still work
}
}
2018-09-10 01:56:11 +08:00
2019-03-10 06:35:06 +08:00
uint8_t bits [ GraphTraceLen ] ;
size_t size = getFromGraphBuf ( bits ) ;
// set signal properties low/high/mean/amplitude and is_noise detection
computeSignalProperties ( bits , size ) ;
2019-03-09 02:06:55 +08:00
2019-03-10 06:35:06 +08:00
RepaintGraphWindow ( ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
}
2019-03-10 18:20:22 +08:00
int CmdPlot ( const char * Cmd ) {
2021-03-23 01:02:17 +08:00
CLIParserContext * ctx ;
CLIParserInit ( & ctx , " data plot " ,
" Show graph window \n "
" hit 'h' in window for detail keystroke help available " ,
" data plot "
) ;
void * argtable [ ] = {
arg_param_begin ,
arg_param_end
} ;
CLIExecWithReturn ( ctx , Cmd , argtable , true ) ;
CLIParserFree ( ctx ) ;
2019-03-10 06:35:06 +08:00
ShowGraphWindow ( ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
}
2019-10-19 19:13:00 +08:00
int CmdSave ( const char * Cmd ) {
2018-09-06 00:56:21 +08:00
2020-10-10 04:20:19 +08:00
CLIParserContext * ctx ;
CLIParserInit ( & ctx , " data save " ,
" Save trace from graph window , i.e. the GraphBuffer \n "
" This is a text file with number -127 to 127. With the option `w` you can save it as wave file \n "
" Filename should be without file extension " ,
" data save -f myfilename -> save graph buffer to file \n "
" data save --wave -f myfilename -> save graph buffer to wave file "
) ;
2017-01-16 21:44:37 +08:00
2020-10-10 04:20:19 +08:00
void * argtable [ ] = {
arg_param_begin ,
arg_lit0 ( " w " , " wave " , " save as wave format (.wav) " ) ,
2020-10-12 12:33:14 +08:00
arg_str1 ( " f " , " file " , " <fn w/o ext> " , " save file name " ) ,
2020-10-10 04:20:19 +08:00
arg_param_end
} ;
CLIExecWithReturn ( ctx , Cmd , argtable , false ) ;
2017-01-16 21:44:37 +08:00
2020-10-10 04:20:19 +08:00
bool as_wave = arg_get_lit ( ctx , 1 ) ;
2020-10-12 04:40:05 +08:00
2020-10-10 04:20:19 +08:00
int fnlen = 0 ;
char filename [ FILE_PATH_SIZE ] = { 0 } ;
2020-10-12 12:33:14 +08:00
// CLIGetStrWithReturn(ctx, 2, (uint8_t *)filename, &fnlen);
CLIParamStrToBuf ( arg_get_str ( ctx , 2 ) , ( uint8_t * ) filename , FILE_PATH_SIZE , & fnlen ) ;
2020-10-10 04:20:19 +08:00
CLIParserFree ( ctx ) ;
2017-01-20 17:03:53 +08:00
2019-12-22 19:51:40 +08:00
if ( as_wave )
return saveFileWAVE ( filename , GraphBuffer , GraphTraceLen ) ;
2019-12-22 18:19:06 +08:00
else
2019-12-22 19:51:40 +08:00
return saveFilePM3 ( filename , GraphBuffer , GraphTraceLen ) ;
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
}
2020-10-06 18:13:39 +08:00
static int CmdTimeScale ( const char * Cmd ) {
2019-10-01 05:17:19 +08:00
2020-10-04 21:14:56 +08:00
CLIParserContext * ctx ;
2020-10-06 18:13:39 +08:00
CLIParserInit ( & ctx , " data timescale " ,
" Set cursor display timescale. \n "
" Setting the timescale makes the differential `dt` reading between the yellow and purple markers meaningful. \n "
" once the timescale is set, the differential reading between brackets can become a time duration. " ,
" data timescale --sr 125 -u ms -> for LF sampled at 125 kHz. Reading will be in milliseconds \n "
" data timescale --sr 1.695 -u us -> for HF sampled at 16 * fc/128. Reading will be in microseconds \n "
" data timescale --sr 16 -u ETU -> for HF with 16 samples per ETU (fc/128). Reading will be in ETUs "
2020-10-07 00:00:00 +08:00
) ;
2020-10-04 21:14:56 +08:00
void * argtable [ ] = {
arg_param_begin ,
2020-10-06 18:13:39 +08:00
arg_dbl1 ( NULL , " sr " , " <float> " , " sets timescale factor according to sampling rate " ) ,
2020-10-04 21:14:56 +08:00
arg_str0 ( " u " , " unit " , " <string> " , " time unit to display (max 10 chars) " ) ,
arg_param_end
} ;
CLIExecWithReturn ( ctx , Cmd , argtable , false ) ;
2020-10-04 21:20:28 +08:00
CursorScaleFactor = arg_get_dbl_def ( ctx , 1 , 1 ) ;
if ( CursorScaleFactor < = 0 ) {
2020-10-06 18:13:39 +08:00
PrintAndLogEx ( FAILED , " bad, can't have negative or zero timescale factor " ) ;
2019-03-10 06:35:06 +08:00
CursorScaleFactor = 1 ;
}
2020-10-04 21:14:56 +08:00
int len = 0 ;
2020-10-05 02:01:08 +08:00
CursorScaleFactorUnit [ 0 ] = ' \x00 ' ;
2020-10-07 00:00:00 +08:00
CLIParamStrToBuf ( arg_get_str ( ctx , 2 ) , ( uint8_t * ) CursorScaleFactorUnit , sizeof ( CursorScaleFactorUnit ) , & len ) ;
2020-10-04 21:14:56 +08:00
CLIParserFree ( ctx ) ;
2019-03-10 06:35:06 +08:00
RepaintGraphWindow ( ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
}
2017-07-30 15:17:48 +08:00
2019-03-10 18:20:22 +08:00
int directionalThreshold ( const int * in , int * out , size_t len , int8_t up , int8_t down ) {
2018-09-06 00:56:21 +08:00
2019-03-10 06:35:06 +08:00
int lastValue = in [ 0 ] ;
// Will be changed at the end, but init 0 as we adjust to last samples
// value if no threshold kicks in.
out [ 0 ] = 0 ;
for ( size_t i = 1 ; i < len ; + + i ) {
// Apply first threshold to samples heading up
2019-03-10 07:00:59 +08:00
if ( in [ i ] > = up & & in [ i ] > lastValue ) {
2019-03-10 06:35:06 +08:00
lastValue = out [ i ] ; // Buffer last value as we overwrite it.
out [ i ] = 1 ;
}
// Apply second threshold to samples heading down
2019-03-10 07:00:59 +08:00
else if ( in [ i ] < = down & & in [ i ] < lastValue ) {
2019-03-10 06:35:06 +08:00
lastValue = out [ i ] ; // Buffer last value as we overwrite it.
out [ i ] = - 1 ;
2019-03-10 07:00:59 +08:00
} else {
2019-03-10 06:35:06 +08:00
lastValue = out [ i ] ; // Buffer last value as we overwrite it.
2019-03-10 07:00:59 +08:00
out [ i ] = out [ i - 1 ] ;
2019-03-10 06:35:06 +08:00
}
}
// Align with first edited sample.
out [ 0 ] = out [ 1 ] ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2017-07-28 04:17:16 +08:00
}
2019-04-13 06:25:43 +08:00
static int CmdDirectionalThreshold ( const char * Cmd ) {
2019-03-10 06:35:06 +08:00
int8_t up = param_get8 ( Cmd , 0 ) ;
int8_t down = param_get8 ( Cmd , 1 ) ;
2017-07-28 04:17:16 +08:00
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( INFO , " Applying Up Threshold: %d, Down Threshold: %d \n " , up , down ) ;
2017-07-28 04:17:16 +08:00
2019-03-10 06:35:06 +08:00
directionalThreshold ( GraphBuffer , GraphBuffer , GraphTraceLen , up , down ) ;
2019-03-09 15:59:13 +08:00
2019-03-10 06:35:06 +08:00
// set signal properties low/high/mean/amplitude and isnoice detection
uint8_t bits [ GraphTraceLen ] ;
size_t size = getFromGraphBuf ( bits ) ;
// set signal properties low/high/mean/amplitude and is_noice detection
computeSignalProperties ( bits , size ) ;
2018-09-10 01:56:11 +08:00
2019-03-10 06:35:06 +08:00
RepaintGraphWindow ( ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2014-06-11 14:42:37 +08:00
}
2019-04-13 06:25:43 +08:00
static int CmdZerocrossings ( const char * Cmd ) {
2019-04-10 18:23:40 +08:00
( void ) Cmd ; // Cmd is not used so far
2019-03-10 06:35:06 +08:00
// Zero-crossings aren't meaningful unless the signal is zero-mean.
CmdHpf ( " " ) ;
int sign = 1 , zc = 0 , lastZc = 0 ;
2019-04-14 06:45:27 +08:00
for ( uint32_t i = 0 ; i < GraphTraceLen ; + + i ) {
2019-03-10 06:35:06 +08:00
if ( GraphBuffer [ i ] * sign > = 0 ) {
// No change in sign, reproduce the previous sample count.
zc + + ;
GraphBuffer [ i ] = lastZc ;
} else {
// Change in sign, reset the sample count.
sign = - sign ;
GraphBuffer [ i ] = lastZc ;
if ( sign > 0 ) {
lastZc = zc ;
zc = 0 ;
}
}
}
uint8_t bits [ GraphTraceLen ] ;
size_t size = getFromGraphBuf ( bits ) ;
// set signal properties low/high/mean/amplitude and is_noise detection
computeSignalProperties ( bits , size ) ;
RepaintGraphWindow ( ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
}
2015-10-05 00:01:33 +08:00
/**
* @ brief Utility for conversion via cmdline .
* @ param Cmd
* @ return
*/
2019-04-13 06:25:43 +08:00
static int Cmdbin2hex ( const char * Cmd ) {
2019-03-10 06:35:06 +08:00
int bg = 0 , en = 0 ;
if ( param_getptr ( Cmd , & bg , & en , 0 ) )
return usage_data_bin2hex ( ) ;
//Number of digits supplied as argument
size_t length = en - bg + 1 ;
2019-03-10 07:00:59 +08:00
size_t bytelen = ( length + 7 ) / 8 ;
uint8_t * arr = ( uint8_t * ) calloc ( bytelen , sizeof ( uint8_t ) ) ;
2019-03-10 06:35:06 +08:00
memset ( arr , 0 , bytelen ) ;
BitstreamOut bout = { arr , 0 , 0 } ;
for ( ; bg < = en ; bg + + ) {
char c = Cmd [ bg ] ;
2019-03-10 07:00:59 +08:00
if ( c = = ' 1 ' )
2019-03-10 06:35:06 +08:00
pushBit ( & bout , 1 ) ;
2019-03-10 07:00:59 +08:00
else if ( c = = ' 0 ' )
2019-03-10 06:35:06 +08:00
pushBit ( & bout , 0 ) ;
else
PrintAndLogEx ( NORMAL , " Ignoring '%c' " , c ) ;
}
if ( bout . numbits % 8 ! = 0 )
PrintAndLogEx ( NORMAL , " [padded with %d zeroes] " , 8 - ( bout . numbits % 8 ) ) ;
PrintAndLogEx ( NORMAL , " %s " , sprint_hex ( arr , bytelen ) ) ;
free ( arr ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2015-10-05 00:01:33 +08:00
}
2019-04-13 06:25:43 +08:00
static int Cmdhex2bin ( const char * Cmd ) {
2019-03-10 06:35:06 +08:00
int bg = 0 , en = 0 ;
if ( param_getptr ( Cmd , & bg , & en , 0 ) ) return usage_data_hex2bin ( ) ;
2019-03-10 07:00:59 +08:00
while ( bg < = en ) {
2019-03-10 06:35:06 +08:00
char x = Cmd [ bg + + ] ;
// capitalize
if ( x > = ' a ' & & x < = ' f ' )
x - = 32 ;
// convert to numeric value
if ( x > = ' 0 ' & & x < = ' 9 ' )
x - = ' 0 ' ;
else if ( x > = ' A ' & & x < = ' F ' )
x - = ' A ' - 10 ;
else
continue ;
2019-03-10 07:00:59 +08:00
for ( int i = 0 ; i < 4 ; + + i )
2020-08-29 01:17:11 +08:00
PrintAndLogEx ( NORMAL , " %d " NOLF , ( x > > ( 3 - i ) ) & 1 ) ;
2019-03-10 06:35:06 +08:00
}
2020-08-29 01:17:11 +08:00
PrintAndLogEx ( NORMAL , " " ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2019-03-10 06:35:06 +08:00
}
2019-03-10 07:00:59 +08:00
/* // example of FSK2 RF/50 Tones
static const int LowTone [ ] = {
1 , 1 , 1 , 1 , 1 , - 1 , - 1 , - 1 , - 1 , - 1 ,
1 , 1 , 1 , 1 , 1 , - 1 , - 1 , - 1 , - 1 , - 1 ,
1 , 1 , 1 , 1 , 1 , - 1 , - 1 , - 1 , - 1 , - 1 ,
1 , 1 , 1 , 1 , 1 , - 1 , - 1 , - 1 , - 1 , - 1 ,
1 , 1 , 1 , 1 , 1 , - 1 , - 1 , - 1 , - 1 , - 1
} ;
static const int HighTone [ ] = {
1 , 1 , 1 , 1 , 1 , - 1 , - 1 , - 1 , - 1 , // note one extra 1 to padd due to 50/8 remainder (1/2 the remainder)
1 , 1 , 1 , 1 , - 1 , - 1 , - 1 , - 1 ,
1 , 1 , 1 , 1 , - 1 , - 1 , - 1 , - 1 ,
1 , 1 , 1 , 1 , - 1 , - 1 , - 1 , - 1 ,
1 , 1 , 1 , 1 , - 1 , - 1 , - 1 , - 1 ,
1 , 1 , 1 , 1 , - 1 , - 1 , - 1 , - 1 , - 1 , // note one extra -1 to padd due to 50/8 remainder
} ;
*/
2019-04-13 06:25:43 +08:00
static void GetHiLoTone ( int * LowTone , int * HighTone , int clk , int LowToneFC , int HighToneFC ) {
2019-03-10 07:00:59 +08:00
int i , j = 0 ;
int Left_Modifier = ( ( clk % LowToneFC ) % 2 ) + ( ( clk % LowToneFC ) / 2 ) ;
2019-03-10 06:35:06 +08:00
int Right_Modifier = ( clk % LowToneFC ) / 2 ;
//int HighToneMod = clk mod HighToneFC;
2019-03-10 07:00:59 +08:00
int LeftHalfFCCnt = ( LowToneFC % 2 ) + ( LowToneFC / 2 ) ; //truncate
2019-03-10 06:35:06 +08:00
int FCs_per_clk = clk / LowToneFC ;
// need to correctly split up the clock to field clocks.
// First attempt uses modifiers on each end to make up for when FCs don't evenly divide into Clk
// start with LowTone
// set extra 1 modifiers to make up for when FC doesn't divide evenly into Clk
for ( i = 0 ; i < Left_Modifier ; i + + ) {
LowTone [ i ] = 1 ;
}
// loop # of field clocks inside the main clock
for ( i = 0 ; i < ( FCs_per_clk ) ; i + + ) {
// loop # of samples per field clock
for ( j = 0 ; j < LowToneFC ; j + + ) {
2019-03-10 07:00:59 +08:00
LowTone [ ( i * LowToneFC ) + Left_Modifier + j ] = ( j < LeftHalfFCCnt ) ? 1 : - 1 ;
2019-03-10 06:35:06 +08:00
}
}
int k ;
// add last -1 modifiers
for ( k = 0 ; k < Right_Modifier ; k + + ) {
2019-03-10 07:00:59 +08:00
LowTone [ ( ( i - 1 ) * LowToneFC ) + Left_Modifier + j + k ] = - 1 ;
2019-03-10 06:35:06 +08:00
}
// now do hightone
2019-03-10 07:00:59 +08:00
Left_Modifier = ( ( clk % HighToneFC ) % 2 ) + ( ( clk % HighToneFC ) / 2 ) ;
2019-03-10 06:35:06 +08:00
Right_Modifier = ( clk % HighToneFC ) / 2 ;
2019-03-10 07:00:59 +08:00
LeftHalfFCCnt = ( HighToneFC % 2 ) + ( HighToneFC / 2 ) ; //truncate
FCs_per_clk = clk / HighToneFC ;
2019-03-10 06:35:06 +08:00
for ( i = 0 ; i < Left_Modifier ; i + + ) {
HighTone [ i ] = 1 ;
}
// loop # of field clocks inside the main clock
for ( i = 0 ; i < ( FCs_per_clk ) ; i + + ) {
// loop # of samples per field clock
for ( j = 0 ; j < HighToneFC ; j + + ) {
2019-03-10 07:00:59 +08:00
HighTone [ ( i * HighToneFC ) + Left_Modifier + j ] = ( j < LeftHalfFCCnt ) ? 1 : - 1 ;
2019-03-10 06:35:06 +08:00
}
}
// add last -1 modifiers
for ( k = 0 ; k < Right_Modifier ; k + + ) {
2019-03-10 07:00:59 +08:00
PrintAndLogEx ( NORMAL , " (i-1)*HighToneFC+lm+j+k %i " , ( ( i - 1 ) * HighToneFC ) + Left_Modifier + j + k ) ;
HighTone [ ( ( i - 1 ) * HighToneFC ) + Left_Modifier + j + k ] = - 1 ;
2019-03-10 06:35:06 +08:00
}
if ( g_debugMode = = 2 ) {
2019-03-10 07:00:59 +08:00
for ( i = 0 ; i < clk ; i + + ) {
2019-03-10 06:35:06 +08:00
PrintAndLogEx ( NORMAL , " Low: %i, High: %i " , LowTone [ i ] , HighTone [ i ] ) ;
}
}
2017-07-30 15:17:48 +08:00
}
2019-03-09 15:59:13 +08:00
//old CmdFSKdemod adapted by marshmellow
2017-07-30 15:17:48 +08:00
//converts FSK to clear NRZ style wave. (or demodulates)
2019-04-14 06:45:27 +08:00
static int FSKToNRZ ( int * data , size_t * dataLen , uint8_t clk , uint8_t LowToneFC , uint8_t HighToneFC ) {
2019-03-10 06:35:06 +08:00
uint8_t ans = 0 ;
if ( clk = = 0 | | LowToneFC = = 0 | | HighToneFC = = 0 ) {
2019-03-10 07:00:59 +08:00
int firstClockEdge = 0 ;
2019-03-10 06:35:06 +08:00
ans = fskClocks ( ( uint8_t * ) & LowToneFC , ( uint8_t * ) & HighToneFC , ( uint8_t * ) & clk , & firstClockEdge ) ;
if ( g_debugMode > 1 ) {
2019-04-08 00:12:58 +08:00
PrintAndLogEx ( NORMAL , " DEBUG FSKtoNRZ: detected clocks: fc_low %i, fc_high %i, clk %i, firstClockEdge %i, ans %u " , LowToneFC , HighToneFC , clk , firstClockEdge , ans ) ;
2019-03-10 06:35:06 +08:00
}
}
// currently only know fsk modulations with field clocks < 10 samples and > 4 samples. filter out to remove false positives (and possibly destroying ask/psk modulated waves...)
if ( ans = = 0 | | clk = = 0 | | LowToneFC = = 0 | | HighToneFC = = 0 | | LowToneFC > 10 | | HighToneFC < 4 ) {
if ( g_debugMode > 1 ) {
2019-04-10 15:36:23 +08:00
PrintAndLogEx ( NORMAL , " DEBUG FSKtoNRZ: no fsk clocks found " ) ;
2019-03-10 06:35:06 +08:00
}
2019-05-22 20:33:33 +08:00
return PM3_ESOFT ;
2019-03-10 06:35:06 +08:00
}
int LowTone [ clk ] ;
int HighTone [ clk ] ;
GetHiLoTone ( LowTone , HighTone , clk , LowToneFC , HighToneFC ) ;
// loop through ([all samples] - clk)
2019-04-14 05:38:34 +08:00
for ( size_t i = 0 ; i < * dataLen - clk ; + + i ) {
2019-03-10 06:35:06 +08:00
int lowSum = 0 , highSum = 0 ;
// sum all samples together starting from this sample for [clk] samples for each tone (multiply tone value with sample data)
2019-04-14 05:38:34 +08:00
for ( size_t j = 0 ; j < clk ; + + j ) {
2019-03-10 06:35:06 +08:00
lowSum + = LowTone [ j ] * data [ i + j ] ;
highSum + = HighTone [ j ] * data [ i + j ] ;
}
// get abs( [average sample value per clk] * 100 ) (or a rolling average of sorts)
lowSum = abs ( 100 * lowSum / clk ) ;
highSum = abs ( 100 * highSum / clk ) ;
// save these back to buffer for later use
data [ i ] = ( highSum < < 16 ) | lowSum ;
}
// now we have the abs( [average sample value per clk] * 100 ) for each tone
// loop through again [all samples] - clk - 16
// note why 16??? is 16 the largest FC? changed to LowToneFC as that should be the > fc
2019-04-14 05:38:34 +08:00
for ( size_t i = 0 ; i < * dataLen - clk - LowToneFC ; + + i ) {
2019-03-10 06:35:06 +08:00
int lowTot = 0 , highTot = 0 ;
// sum a field clock width of abs( [average sample values per clk] * 100) for each tone
2019-04-14 05:38:34 +08:00
for ( size_t j = 0 ; j < LowToneFC ; + + j ) { //10 for fsk2
2019-03-10 07:00:59 +08:00
lowTot + = ( data [ i + j ] & 0xffff ) ;
2019-03-10 06:35:06 +08:00
}
2019-04-14 05:38:34 +08:00
for ( size_t j = 0 ; j < HighToneFC ; j + + ) { //8 for fsk2
2019-03-10 07:00:59 +08:00
highTot + = ( data [ i + j ] > > 16 ) ;
2019-03-10 06:35:06 +08:00
}
// subtract the sum of lowTone averages by the sum of highTone averages as it
// and write back the new graph value
data [ i ] = lowTot - highTot ;
}
// update dataLen to what we put back to the data sample buffer
* dataLen - = ( clk + LowToneFC ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2017-07-30 15:17:48 +08:00
}
2019-04-13 06:25:43 +08:00
static int CmdFSKToNRZ ( const char * Cmd ) {
2021-03-11 16:26:02 +08:00
CLIParserContext * ctx ;
CLIParserInit ( & ctx , " data fsktonrz " ,
" Convert fsk2 to nrz wave for alternate fsk demodulating (for weak fsk) \n "
" Omitted values are autodetect instead " ,
" data fsktonrz \n "
" data fsktonrz -c 32 --low 8 --hi 10 " ) ;
void * argtable [ ] = {
arg_param_begin ,
arg_int0 ( " c " , " clk " , " <dec> " , " clock " ) ,
arg_int0 ( NULL , " low " , " <dec> " , " low field clock " ) ,
arg_int0 ( NULL , " hi " , " <dec> " , " high field clock " ) ,
arg_param_end
} ;
CLIExecWithReturn ( ctx , Cmd , argtable , true ) ;
int clk = arg_get_int_def ( ctx , 1 , 0 ) ;
int fc_low = arg_get_int_def ( ctx , 2 , 0 ) ;
int fc_high = arg_get_int_def ( ctx , 3 , 0 ) ;
CLIParserFree ( ctx ) ;
2019-03-10 06:35:06 +08:00
setClockGrid ( 0 , 0 ) ;
DemodBufferLen = 0 ;
int ans = FSKToNRZ ( GraphBuffer , & GraphTraceLen , clk , fc_low , fc_high ) ;
CmdNorm ( " " ) ;
RepaintGraphWindow ( ) ;
return ans ;
2017-07-30 15:17:48 +08:00
}
2019-04-13 06:25:43 +08:00
static int CmdDataIIR ( const char * Cmd ) {
2019-03-10 06:35:06 +08:00
uint8_t k = param_get8 ( Cmd , 0 ) ;
//iceIIR_Butterworth(GraphBuffer, GraphTraceLen);
iceSimple_Filter ( GraphBuffer , GraphTraceLen , k ) ;
2018-09-10 01:56:11 +08:00
2019-03-10 06:35:06 +08:00
uint8_t bits [ GraphTraceLen ] ;
size_t size = getFromGraphBuf ( bits ) ;
// set signal properties low/high/mean/amplitude and is_noise detection
computeSignalProperties ( bits , size ) ;
RepaintGraphWindow ( ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2016-04-14 17:37:17 +08:00
}
2020-03-31 21:33:07 +08:00
static int CmdDataNDEF ( const char * Cmd ) {
# ifndef MAX_NDEF_LEN
# define MAX_NDEF_LEN 2048
# endif
2020-06-01 23:30:33 +08:00
CLIParserContext * ctx ;
CLIParserInit ( & ctx , " data ndef " ,
2020-06-21 22:40:12 +08:00
" Decode and print NFC Data Exchange Format (NDEF) " ,
2020-09-30 05:55:51 +08:00
" data ndef -d 9101085402656e48656c6c6f5101085402656e576f726c64 \n "
" data ndef -d 0103d020240203e02c040300fe \n "
2020-08-13 18:25:04 +08:00
) ;
2020-03-31 21:33:07 +08:00
void * argtable [ ] = {
arg_param_begin ,
2020-09-30 05:55:51 +08:00
arg_strx0 ( " d " , " data " , " <hex> " , " NDEF data to decode " ) ,
arg_lit0 ( " v " , " verbose " , " verbose mode " ) ,
2020-03-31 21:33:07 +08:00
arg_param_end
} ;
2020-06-18 17:05:21 +08:00
CLIExecWithReturn ( ctx , Cmd , argtable , false ) ;
2020-03-31 21:33:07 +08:00
int datalen = 0 ;
uint8_t data [ MAX_NDEF_LEN ] = { 0 } ;
2020-06-01 23:30:33 +08:00
CLIGetHexWithReturn ( ctx , 1 , data , & datalen ) ;
2020-06-21 22:34:56 +08:00
bool verbose = arg_get_lit ( ctx , 2 ) ;
2020-06-01 23:30:33 +08:00
CLIParserFree ( ctx ) ;
2020-04-01 15:26:39 +08:00
if ( datalen = = 0 )
return PM3_EINVARG ;
2020-03-31 21:33:07 +08:00
2020-06-21 22:34:56 +08:00
int res = NDEFDecodeAndPrint ( data , datalen , verbose ) ;
if ( res ! = PM3_SUCCESS ) {
PrintAndLogEx ( INFO , " Trying to parse NDEF records w/o NDEF header " ) ;
res = NDEFRecordsDecodeAndPrint ( data , datalen ) ;
}
return res ;
2020-03-31 21:33:07 +08:00
}
2020-10-09 22:21:44 +08:00
typedef struct {
t55xx_modulation modulation ;
int bitrate ;
2020-10-09 23:02:28 +08:00
int carrier ;
uint8_t fc1 ;
uint8_t fc2 ;
2020-10-09 22:21:44 +08:00
} lf_modulation_t ;
static int print_modulation ( lf_modulation_t b ) {
2020-10-09 23:02:28 +08:00
PrintAndLogEx ( INFO , " Modulation.... " _GREEN_ ( " %s " ) , GetSelectedModulationStr ( b . modulation ) ) ;
PrintAndLogEx ( INFO , " Bit clock..... " _GREEN_ ( " RF/%d " ) , b . bitrate ) ;
switch ( b . modulation ) {
case DEMOD_PSK1 :
case DEMOD_PSK2 :
case DEMOD_PSK3 :
PrintAndLogEx ( SUCCESS , " Carrier rate.. %d " , b . carrier ) ;
break ;
case DEMOD_FSK :
case DEMOD_FSK1 :
case DEMOD_FSK1a :
case DEMOD_FSK2 :
case DEMOD_FSK2a :
PrintAndLogEx ( SUCCESS , " Field Clocks.. FC/%u, FC/%u " , b . fc1 , b . fc2 ) ;
break ;
case DEMOD_NRZ :
case DEMOD_ASK :
case DEMOD_BI :
case DEMOD_BIa :
default :
break ;
}
2020-10-09 22:21:44 +08:00
PrintAndLogEx ( NORMAL , " " ) ;
return PM3_SUCCESS ;
}
static int try_detect_modulation ( void ) {
lf_modulation_t tests [ 6 ] ;
int clk = 0 , firstClockEdge = 0 ;
2020-10-09 23:02:28 +08:00
uint8_t hits = 0 , ans = 0 ;
uint8_t fc1 = 0 , fc2 = 0 ;
2020-10-09 22:21:44 +08:00
bool st = false ;
ans = fskClocks ( & fc1 , & fc2 , ( uint8_t * ) & clk , & firstClockEdge ) ;
if ( ans & & ( ( fc1 = = 10 & & fc2 = = 8 ) | | ( fc1 = = 8 & & fc2 = = 5 ) ) ) {
if ( ( FSKrawDemod ( 0 , 0 , 0 , 0 , false ) = = PM3_SUCCESS ) ) {
tests [ hits ] . modulation = DEMOD_FSK ;
2020-10-09 23:02:28 +08:00
if ( fc1 = = 8 & & fc2 = = 5 ) {
2020-10-09 22:21:44 +08:00
tests [ hits ] . modulation = DEMOD_FSK1a ;
2020-10-09 23:02:28 +08:00
} else if ( fc1 = = 10 & & fc2 = = 8 ) {
2020-10-09 22:21:44 +08:00
tests [ hits ] . modulation = DEMOD_FSK2 ;
2020-10-09 23:02:28 +08:00
}
2020-10-09 22:21:44 +08:00
tests [ hits ] . bitrate = clk ;
2020-10-09 23:02:28 +08:00
tests [ hits ] . fc1 = fc1 ;
tests [ hits ] . fc2 = fc2 ;
2020-10-09 22:21:44 +08:00
+ + hits ;
}
} else {
clk = GetAskClock ( " " , false ) ;
if ( clk > 0 ) {
// 0 = auto clock
2020-10-12 04:40:05 +08:00
// 0 = no invert
2020-10-09 22:21:44 +08:00
// 1 = maxError 1
// 0 = max len
2020-10-12 04:40:05 +08:00
// false = no amplify
2020-10-09 22:21:44 +08:00
// false = no verbose
// false = no emSearch
// 1 = Ask/Man
// st = true
if ( ( ASKDemod_ext ( 0 , 0 , 1 , 0 , false , false , false , 1 , & st ) = = PM3_SUCCESS ) ) {
tests [ hits ] . modulation = DEMOD_ASK ;
tests [ hits ] . bitrate = clk ;
+ + hits ;
}
// "0 0 1 " == clock auto, invert true, maxError 1.
// false = no verbose
// false = no emSearch
// 1 = Ask/Man
// st = true
2020-10-12 04:40:05 +08:00
2020-10-09 22:21:44 +08:00
// ASK / biphase
if ( ( ASKbiphaseDemod ( 0 , 0 , 0 , 2 , false ) = = PM3_SUCCESS ) ) {
tests [ hits ] . modulation = DEMOD_BI ;
tests [ hits ] . bitrate = clk ;
+ + hits ;
}
// ASK / Diphase
if ( ( ASKbiphaseDemod ( 0 , 0 , 1 , 2 , false ) = = PM3_SUCCESS ) ) {
tests [ hits ] . modulation = DEMOD_BIa ;
tests [ hits ] . bitrate = clk ;
+ + hits ;
}
}
clk = GetNrzClock ( " " , false ) ;
2020-10-12 04:40:05 +08:00
if ( ( NRZrawDemod ( 0 , 0 , 1 , false ) = = PM3_SUCCESS ) ) {
tests [ hits ] . modulation = DEMOD_NRZ ;
tests [ hits ] . bitrate = clk ;
+ + hits ;
}
2020-10-09 22:21:44 +08:00
clk = GetPskClock ( " " , false ) ;
if ( clk > 0 ) {
// allow undo
save_restoreGB ( GRAPH_SAVE ) ;
// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
CmdLtrim ( " 160 " ) ;
if ( ( PSKDemod ( 0 , 0 , 6 , false ) = = PM3_SUCCESS ) ) {
tests [ hits ] . modulation = DEMOD_PSK1 ;
tests [ hits ] . bitrate = clk ;
+ + hits ;
2020-10-12 04:40:05 +08:00
2020-10-09 23:02:28 +08:00
// get psk carrier
tests [ hits ] . carrier = GetPskCarrier ( false ) ;
2020-10-09 22:21:44 +08:00
}
//undo trim samples
save_restoreGB ( GRAPH_RESTORE ) ;
}
}
if ( hits ) {
PrintAndLogEx ( SUCCESS , " Found [%d] possible matches for modulation. " , hits ) ;
for ( int i = 0 ; i < hits ; + + i ) {
2020-10-12 04:40:05 +08:00
PrintAndLogEx ( INFO , " --[%d]--------------- " , i + 1 ) ;
print_modulation ( tests [ i ] ) ;
2020-10-09 22:21:44 +08:00
}
return PM3_SUCCESS ;
} else {
PrintAndLogEx ( INFO , " Signal doesn't match " ) ;
return PM3_ESOFT ;
}
}
2020-10-10 00:08:46 +08:00
static int CmdDataModulationSearch ( const char * Cmd ) {
2020-10-09 22:21:44 +08:00
CLIParserContext * ctx ;
2020-10-10 00:08:46 +08:00
CLIParserInit ( & ctx , " data modulation " ,
2020-10-09 22:21:44 +08:00
" search LF signal after clock and modulation \n " ,
2020-10-10 00:08:46 +08:00
" data modulation "
2020-10-12 04:40:05 +08:00
) ;
2020-10-09 22:21:44 +08:00
void * argtable [ ] = {
arg_param_begin ,
arg_param_end
} ;
CLIExecWithReturn ( ctx , Cmd , argtable , true ) ;
2020-10-12 04:40:05 +08:00
CLIParserFree ( ctx ) ;
2020-10-10 00:08:46 +08:00
return try_detect_modulation ( ) ;
2020-10-09 22:21:44 +08:00
}
2018-09-06 00:56:21 +08:00
static command_t CommandTable [ ] = {
2020-10-10 01:45:29 +08:00
{ " help " , CmdHelp , AlwaysAvailable , " This help " } ,
2020-10-12 04:40:05 +08:00
2020-10-10 04:20:19 +08:00
{ " ----------- " , CmdHelp , AlwaysAvailable , " ------------------------- " _CYAN_ ( " Modulation " ) " ------------------------- " } ,
{ " biphaserawdecode " , CmdBiphaseDecodeRaw , AlwaysAvailable , " Biphase decode bin stream in DemodBuffer " } ,
{ " detectclock " , CmdDetectClockRate , AlwaysAvailable , " Detect ASK, FSK, NRZ, PSK clock rate of wave in GraphBuffer " } ,
{ " fsktonrz " , CmdFSKToNRZ , AlwaysAvailable , " Convert fsk2 to nrz wave for alternate fsk demodulating (for weak fsk) " } ,
{ " manrawdecode " , Cmdmandecoderaw , AlwaysAvailable , " Manchester decode binary stream in DemodBuffer " } ,
{ " modulation " , CmdDataModulationSearch , AlwaysAvailable , " Identify LF signal for clock and modulation " } ,
{ " rawdemod " , CmdRawDemod , AlwaysAvailable , " Demodulate the data in the GraphBuffer and output binary " } ,
2020-10-12 04:40:05 +08:00
2020-10-10 04:20:19 +08:00
{ " ----------- " , CmdHelp , AlwaysAvailable , " ------------------------- " _CYAN_ ( " Graph " ) " ------------------------- " } ,
2020-10-10 01:45:29 +08:00
{ " askedgedetect " , CmdAskEdgeDetect , AlwaysAvailable , " [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) " } ,
2020-10-10 04:20:19 +08:00
{ " autocorr " , CmdAutoCorr , AlwaysAvailable , " Autocorrelation over window " } ,
{ " dirthreshold " , CmdDirectionalThreshold , AlwaysAvailable , " <thres up> <thres down> -- Max rising higher up-thres/ Min falling lower down-thres, keep rest as prev. " } ,
2020-10-10 01:45:29 +08:00
{ " decimate " , CmdDecimate , AlwaysAvailable , " Decimate samples " } ,
2020-10-10 04:20:19 +08:00
{ " undecimate " , CmdUndecimate , AlwaysAvailable , " Un-decimate samples " } ,
2020-10-10 01:45:29 +08:00
{ " hide " , CmdHide , AlwaysAvailable , " Hide graph window " } ,
{ " hpf " , CmdHpf , AlwaysAvailable , " Remove DC offset from trace " } ,
2021-03-23 03:54:08 +08:00
{ " iir " , CmdDataIIR , AlwaysAvailable , " Apply IIR buttersworth filter on plotdata " } ,
2020-10-10 04:20:19 +08:00
{ " grid " , CmdGrid , AlwaysAvailable , " <x> <y> -- overlay grid on graph window, use zero value to turn off either " } ,
2021-03-23 04:11:24 +08:00
{ " ltrim " , CmdLtrim , AlwaysAvailable , " Trim samples from left of trace " } ,
{ " mtrim " , CmdMtrim , AlwaysAvailable , " Trim out samples from the specified start to the specified stop " } ,
2020-10-10 01:45:29 +08:00
{ " norm " , CmdNorm , AlwaysAvailable , " Normalize max/min to +/-128 " } ,
2021-03-23 01:02:17 +08:00
{ " plot " , CmdPlot , AlwaysAvailable , " Show graph window " } ,
2021-03-23 04:11:24 +08:00
{ " rtrim " , CmdRtrim , AlwaysAvailable , " Trim samples from right of trace " } ,
2020-10-10 01:45:29 +08:00
{ " setgraphmarkers " , CmdSetGraphMarkers , AlwaysAvailable , " [orange_marker] [blue_marker] (in graph window) " } ,
{ " shiftgraphzero " , CmdGraphShiftZero , AlwaysAvailable , " <shift> -- Shift 0 for Graphed wave + or - shift value " } ,
2020-10-10 04:20:19 +08:00
{ " timescale " , CmdTimeScale , AlwaysAvailable , " Set a timescale to get a differential reading between the yellow and purple markers as time duration \n " } ,
2020-10-10 01:45:29 +08:00
{ " zerocrossings " , CmdZerocrossings , AlwaysAvailable , " Count time between zero-crossings " } ,
2020-10-10 04:20:19 +08:00
{ " convertbitstream " , CmdConvertBitStream , AlwaysAvailable , " Convert GraphBuffer's 0/1 values to 127 / -127 " } ,
{ " getbitstream " , CmdGetBitStream , AlwaysAvailable , " Convert GraphBuffer's >=1 values to 1 and <1 to 0 " } ,
2020-10-12 04:40:05 +08:00
2020-10-10 04:20:19 +08:00
{ " ----------- " , CmdHelp , AlwaysAvailable , " ------------------------- " _CYAN_ ( " General " ) " ------------------------- " } ,
{ " bin2hex " , Cmdbin2hex , AlwaysAvailable , " Converts binary to hexadecimal " } ,
{ " bitsamples " , CmdBitsamples , IfPm3Present , " Get raw samples as bitstring " } ,
{ " clear " , CmdBuffClear , AlwaysAvailable , " Clears bigbuf on deviceside and graph window " } ,
{ " hexsamples " , CmdHexsamples , IfPm3Present , " <bytes> [<offset>] -- Dump big buffer as hex bytes " } ,
{ " hex2bin " , Cmdhex2bin , AlwaysAvailable , " Converts hexadecimal to binary " } ,
{ " load " , CmdLoad , AlwaysAvailable , " Load contents of file into graph window " } ,
2020-03-31 21:33:07 +08:00
{ " ndef " , CmdDataNDEF , AlwaysAvailable , " Decode NDEF records " } ,
2021-03-23 03:54:08 +08:00
{ " print " , CmdPrintDemodBuff , AlwaysAvailable , " Print the data in the DemodBuffer " } ,
2021-03-23 01:21:35 +08:00
{ " samples " , CmdSamples , IfPm3Present , " Get raw samples for graph window (GraphBuffer) " } ,
2020-10-10 04:20:19 +08:00
{ " save " , CmdSave , AlwaysAvailable , " Save signal trace data (from graph window) " } ,
2021-03-23 03:54:08 +08:00
{ " setdebugmode " , CmdSetDebugMode , AlwaysAvailable , " Set Debugging Level on client side " } ,
2020-10-10 04:20:19 +08:00
{ " tune " , CmdTuneSamples , IfPm3Present , " Measure tuning of device antenna. Results shown in graph window " } ,
2019-05-02 02:48:15 +08:00
{ NULL , NULL , NULL , NULL }
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
} ;
2019-04-13 06:25:43 +08:00
static int CmdHelp ( const char * Cmd ) {
( void ) Cmd ; // Cmd is not used so far
CmdsHelp ( CommandTable ) ;
2019-05-22 20:33:33 +08:00
return PM3_SUCCESS ;
2019-04-13 06:25:43 +08:00
}
2019-03-10 18:20:22 +08:00
int CmdData ( const char * Cmd ) {
2019-03-10 06:35:06 +08:00
clearCommandBuffer ( ) ;
2019-04-19 06:47:51 +08:00
return CmdsParse ( CommandTable , Cmd ) ;
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
}