2010-02-21 08:47:22 +08:00
|
|
|
//-----------------------------------------------------------------------------
|
2010-02-26 05:57:35 +08:00
|
|
|
// Copyright (C) 2009 Michael Gernoth <michael at gernoth.net>
|
2010-02-21 08:47:22 +08:00
|
|
|
// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
|
|
|
|
//
|
|
|
|
// 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.
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// UI utilities
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
|
2014-10-16 21:05:27 +08:00
|
|
|
#include "ui.h"
|
2017-03-02 21:53:50 +08:00
|
|
|
|
2017-07-28 04:05:54 +08:00
|
|
|
double CursorScaleFactor = 1;
|
|
|
|
int PlotGridX=0, PlotGridY=0, PlotGridXdefault= 64, PlotGridYdefault= 64, CursorCPos= 0, CursorDPos= 0;
|
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
|
|
|
int offline;
|
2018-04-06 15:25:34 +08:00
|
|
|
int g_flushAfterWrite = 0; //buzzy
|
2017-07-28 04:05:54 +08:00
|
|
|
int GridOffset = 0;
|
|
|
|
bool GridLocked = false;
|
|
|
|
bool showDemod = true;
|
|
|
|
|
2017-10-21 19:00:36 +08:00
|
|
|
pthread_mutex_t print_lock = PTHREAD_MUTEX_INITIALIZER;
|
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 char *logfilename = "proxmark3.log";
|
2018-05-03 00:08:47 +08:00
|
|
|
|
2018-04-03 17:58:35 +08:00
|
|
|
void PrintAndLogOptions(char *str[][2], size_t size, size_t space) {
|
2018-03-01 23:34:14 +08:00
|
|
|
char buff[2000] = "Options:\n";
|
|
|
|
char format[2000] = "";
|
|
|
|
size_t counts[2] = {0, 0};
|
|
|
|
for(int i = 0; i < size; i++)
|
|
|
|
for(int j = 0 ; j < 2 ; j++)
|
|
|
|
if(counts[j] < strlen(str[i][j]))
|
|
|
|
{
|
|
|
|
counts[j] = strlen(str[i][j]);
|
|
|
|
}
|
|
|
|
for(int i = 0; i < size; i++)
|
|
|
|
{
|
|
|
|
for(int j = 0; j < 2; j++)
|
|
|
|
{
|
|
|
|
if(j == 0)
|
Minor warning correction.
This fix resolves the warnings as printed below.
ui.c: In function ‘PrintAndLogOptions’:
ui.c:40:45: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 4 has type ‘size_t {aka long unsigned int}’ [-Wformat=]
snprintf(format, sizeof(format), "%%%us%%%us", space, counts[j]);
^
ui.c:40:50: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 5 has type ‘size_t {aka long unsigned int}’ [-Wformat=]
snprintf(format, sizeof(format), "%%%us%%%us", space, counts[j]);
^
ui.c:42:54: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 4 has type ‘size_t {aka long unsigned int}’ [-Wformat=]
snprintf(format, sizeof(format), "%%%us%%-%us", space, counts[j]);
^
ui.c:42:60: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 5 has type ‘size_t {aka long unsigned int}’ [-Wformat=]
snprintf(format, sizeof(format), "%%%us%%-%us", space, counts[j]);
2018-03-15 20:59:43 +08:00
|
|
|
snprintf(format, sizeof(format), "%%%zus%%%zus", space, counts[j]);
|
2018-03-01 23:34:14 +08:00
|
|
|
else
|
Minor warning correction.
This fix resolves the warnings as printed below.
ui.c: In function ‘PrintAndLogOptions’:
ui.c:40:45: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 4 has type ‘size_t {aka long unsigned int}’ [-Wformat=]
snprintf(format, sizeof(format), "%%%us%%%us", space, counts[j]);
^
ui.c:40:50: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 5 has type ‘size_t {aka long unsigned int}’ [-Wformat=]
snprintf(format, sizeof(format), "%%%us%%%us", space, counts[j]);
^
ui.c:42:54: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 4 has type ‘size_t {aka long unsigned int}’ [-Wformat=]
snprintf(format, sizeof(format), "%%%us%%-%us", space, counts[j]);
^
ui.c:42:60: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 5 has type ‘size_t {aka long unsigned int}’ [-Wformat=]
snprintf(format, sizeof(format), "%%%us%%-%us", space, counts[j]);
2018-03-15 20:59:43 +08:00
|
|
|
snprintf(format, sizeof(format), "%%%zus%%-%zus", space, counts[j]);
|
|
|
|
snprintf(buff + strlen(buff), sizeof(buff) - strlen(buff), format, " ", str[i][j]);
|
2018-03-01 23:34:14 +08:00
|
|
|
}
|
|
|
|
if(i<size-1)
|
|
|
|
strncat(buff, "\n", sizeof(buff)-strlen(buff) -1);
|
|
|
|
}
|
|
|
|
PrintAndLogEx(NORMAL, buff);
|
|
|
|
}
|
2018-02-21 14:10:44 +08:00
|
|
|
void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
|
2018-02-22 02:00:42 +08:00
|
|
|
|
|
|
|
// skip debug messages if client debugging is turned off i.e. 'DATA SETDEBUG 0'
|
|
|
|
if (g_debugMode == 0 && level == DEBUG)
|
|
|
|
return;
|
|
|
|
|
2018-02-15 23:32:08 +08:00
|
|
|
char buffer[MAX_PRINT_BUFFER] = {0};
|
2018-02-25 00:39:05 +08:00
|
|
|
char buffer2[MAX_PRINT_BUFFER] = {0};
|
|
|
|
char prefix[20] = {0};
|
|
|
|
char *token = NULL;
|
2018-02-21 21:52:31 +08:00
|
|
|
int size = 0;
|
2018-02-22 02:00:42 +08:00
|
|
|
// {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG}
|
2018-02-25 00:39:05 +08:00
|
|
|
static char *prefixes[7] = { "", "[+] ", "[=] ", "[-] ", "[!] ", "[!!] ", "[#] "};
|
2018-02-21 14:10:44 +08:00
|
|
|
|
2018-02-22 02:00:42 +08:00
|
|
|
switch( level ) {
|
|
|
|
case FAILED:
|
2018-02-25 00:39:05 +08:00
|
|
|
strncpy(prefix,_RED_([-] ), sizeof(prefix)-1);
|
2018-02-22 02:00:42 +08:00
|
|
|
break;
|
|
|
|
case DEBUG:
|
2018-02-25 00:39:05 +08:00
|
|
|
strncpy(prefix,_BLUE_([#] ), sizeof(prefix)-1);
|
2018-02-22 02:00:42 +08:00
|
|
|
break;
|
|
|
|
case SUCCESS:
|
2018-02-25 00:39:05 +08:00
|
|
|
strncpy(prefix,_GREEN_([+] ), sizeof(prefix)-1);
|
2018-02-22 02:00:42 +08:00
|
|
|
break;
|
2018-05-03 18:12:55 +08:00
|
|
|
case WARNING:
|
2018-05-03 18:45:27 +08:00
|
|
|
strncpy(prefix,_CYAN_([!] ), sizeof(prefix)-1);
|
2018-05-03 18:12:55 +08:00
|
|
|
break;
|
2018-02-22 02:00:42 +08:00
|
|
|
default:
|
2018-02-25 01:11:54 +08:00
|
|
|
strncpy(prefix, prefixes[level], sizeof(prefix)-1);
|
2018-02-22 02:00:42 +08:00
|
|
|
break;
|
2018-02-21 21:42:00 +08:00
|
|
|
}
|
|
|
|
|
2018-02-15 23:32:08 +08:00
|
|
|
va_list args;
|
2018-02-25 00:39:05 +08:00
|
|
|
va_start(args, fmt);
|
|
|
|
vsnprintf(buffer, sizeof(buffer), fmt, args);
|
2018-02-15 23:32:08 +08:00
|
|
|
va_end(args);
|
2018-02-25 00:39:05 +08:00
|
|
|
|
2018-04-25 15:28:27 +08:00
|
|
|
// no prefixes for normal
|
|
|
|
if ( level == NORMAL ) {
|
|
|
|
PrintAndLog(buffer);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-04-07 05:52:55 +08:00
|
|
|
if (strchr(buffer, '\n')) {
|
2018-04-27 17:22:30 +08:00
|
|
|
|
|
|
|
const char delim[2] = "\n";
|
2018-04-25 15:28:27 +08:00
|
|
|
|
2018-04-27 17:22:30 +08:00
|
|
|
// line starts with newline
|
|
|
|
if (buffer[0] == '\n')
|
|
|
|
PrintAndLog("");
|
|
|
|
|
|
|
|
token = strtok(buffer, delim);
|
2018-03-17 21:35:34 +08:00
|
|
|
|
|
|
|
while (token != NULL) {
|
2018-04-27 17:22:30 +08:00
|
|
|
|
2018-03-17 21:35:34 +08:00
|
|
|
size = strlen(buffer2);
|
2018-04-27 17:22:30 +08:00
|
|
|
|
2018-03-17 21:35:34 +08:00
|
|
|
if (strlen(token))
|
2018-02-25 00:39:05 +08:00
|
|
|
snprintf(buffer2+size, sizeof(buffer2)-size, "%s%s\n", prefix, token);
|
|
|
|
else
|
|
|
|
snprintf(buffer2+size, sizeof(buffer2)-size, "\n");
|
2018-03-17 21:35:34 +08:00
|
|
|
|
2018-04-27 17:22:30 +08:00
|
|
|
token = strtok(NULL, delim);
|
2018-02-25 00:39:05 +08:00
|
|
|
}
|
|
|
|
PrintAndLog(buffer2);
|
2018-04-25 15:28:27 +08:00
|
|
|
} else {
|
|
|
|
snprintf(buffer2, sizeof(buffer2), "%s%s", prefix, buffer);
|
|
|
|
PrintAndLog(buffer2);
|
2018-02-25 00:39:05 +08:00
|
|
|
}
|
2018-02-15 23:32:08 +08:00
|
|
|
}
|
|
|
|
|
2017-08-11 17:38:54 +08:00
|
|
|
void PrintAndLog(char *fmt, ...) {
|
2011-06-24 00:49:39 +08:00
|
|
|
char *saved_line;
|
|
|
|
int saved_point;
|
2013-09-15 17:33:17 +08:00
|
|
|
va_list argptr, argptr2;
|
|
|
|
static FILE *logfile = NULL;
|
2015-01-05 05:49:54 +08:00
|
|
|
static int logging = 1;
|
2017-01-26 21:23:05 +08:00
|
|
|
|
2017-03-14 15:30:46 +08:00
|
|
|
// lock this section to avoid interlacing prints from different threads
|
2013-09-15 17:33:17 +08:00
|
|
|
pthread_mutex_lock(&print_lock);
|
|
|
|
|
|
|
|
if (logging && !logfile) {
|
2015-01-05 05:49:54 +08:00
|
|
|
logfile = fopen(logfilename, "a");
|
2013-09-15 17:33:17 +08:00
|
|
|
if (!logfile) {
|
|
|
|
fprintf(stderr, "Can't open logfile, logging disabled!\n");
|
2018-04-27 18:15:26 +08:00
|
|
|
logging = 0;
|
2013-09-15 17:33:17 +08:00
|
|
|
}
|
|
|
|
}
|
2018-03-17 21:35:34 +08:00
|
|
|
|
|
|
|
|
|
|
|
// If there is an incoming message from the hardware (eg: lf hid read) in
|
|
|
|
// the background (while the prompt is displayed and accepting user input),
|
|
|
|
// stash the prompt and bring it back later.
|
2017-07-28 04:05:54 +08:00
|
|
|
#ifdef RL_STATE_READCMD
|
2018-03-17 21:35:34 +08:00
|
|
|
// We are using GNU readline. libedit (OSX) doesn't support this flag.
|
2011-06-24 00:49:39 +08:00
|
|
|
int need_hack = (rl_readline_state & RL_STATE_READCMD) > 0;
|
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
|
|
|
|
2011-06-24 00:49:39 +08:00
|
|
|
if (need_hack) {
|
|
|
|
saved_point = rl_point;
|
|
|
|
saved_line = rl_copy_text(0, rl_end);
|
|
|
|
rl_save_prompt();
|
|
|
|
rl_replace_line("", 0);
|
|
|
|
rl_redisplay();
|
|
|
|
}
|
2017-07-28 04:05:54 +08:00
|
|
|
#endif
|
2011-06-24 00:49:39 +08:00
|
|
|
|
2013-09-15 17:33:17 +08:00
|
|
|
va_start(argptr, fmt);
|
|
|
|
va_copy(argptr2, argptr);
|
|
|
|
vprintf(fmt, argptr);
|
|
|
|
printf(" "); // cleaning prompt
|
|
|
|
va_end(argptr);
|
|
|
|
printf("\n");
|
2011-06-24 00:49:39 +08:00
|
|
|
|
2018-03-17 21:35:34 +08:00
|
|
|
#ifdef RL_STATE_READCMD
|
|
|
|
// We are using GNU readline. libedit (OSX) doesn't support this flag.
|
2011-06-24 00:49:39 +08:00
|
|
|
if (need_hack) {
|
|
|
|
rl_restore_prompt();
|
|
|
|
rl_replace_line(saved_line, 0);
|
|
|
|
rl_point = saved_point;
|
|
|
|
rl_redisplay();
|
|
|
|
free(saved_line);
|
|
|
|
}
|
2018-03-17 21:35:34 +08:00
|
|
|
#endif
|
2011-06-24 00:49:39 +08:00
|
|
|
|
2013-09-15 17:33:17 +08:00
|
|
|
if (logging && logfile) {
|
|
|
|
vfprintf(logfile, fmt, argptr2);
|
2018-04-27 18:15:26 +08:00
|
|
|
fprintf(logfile, "\n");
|
2013-09-15 17:33:17 +08:00
|
|
|
fflush(logfile);
|
|
|
|
}
|
|
|
|
va_end(argptr2);
|
|
|
|
|
2018-04-07 05:52:55 +08:00
|
|
|
if (g_flushAfterWrite == 1)
|
2013-10-09 02:30:01 +08:00
|
|
|
fflush(NULL);
|
2018-04-07 05:52:55 +08:00
|
|
|
|
2013-09-15 17:33:17 +08:00
|
|
|
//release lock
|
|
|
|
pthread_mutex_unlock(&print_lock);
|
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
|
|
|
}
|
|
|
|
|
2016-01-13 07:24:37 +08:00
|
|
|
void SetLogFilename(char *fn) {
|
2016-10-21 22:06:53 +08:00
|
|
|
logfilename = fn;
|
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-09-16 19:56:06 +08:00
|
|
|
|
2016-04-05 10:51:06 +08:00
|
|
|
void iceIIR_Butterworth(int *data, const size_t len){
|
2014-10-16 21:05:27 +08:00
|
|
|
|
|
|
|
int i,j;
|
2014-10-27 04:25:06 +08:00
|
|
|
|
|
|
|
int * output = (int* ) malloc(sizeof(int) * len);
|
2016-08-30 02:29:31 +08:00
|
|
|
if ( !output ) return;
|
|
|
|
|
|
|
|
// clear mem
|
2014-10-27 04:25:06 +08:00
|
|
|
memset(output, 0x00, len);
|
2014-10-24 21:34:50 +08:00
|
|
|
|
2016-08-30 02:29:31 +08:00
|
|
|
size_t adjustedLen = len;
|
|
|
|
float fc = 0.1125f; // center frequency
|
|
|
|
|
2014-10-16 21:05:27 +08:00
|
|
|
// create very simple low-pass filter to remove images (2nd-order Butterworth)
|
|
|
|
float complex iir_buf[3] = {0,0,0};
|
|
|
|
float b[3] = {0.003621681514929, 0.007243363029857, 0.003621681514929};
|
|
|
|
float a[3] = {1.000000000000000, -1.822694925196308, 0.837181651256023};
|
|
|
|
|
2016-04-05 10:51:06 +08:00
|
|
|
float sample = 0; // input sample read from array
|
2014-10-24 21:34:50 +08:00
|
|
|
float complex x_prime = 1.0f; // save sample for estimating frequency
|
2014-10-16 21:05:27 +08:00
|
|
|
float complex x;
|
|
|
|
|
2016-08-30 02:29:31 +08:00
|
|
|
for (i = 0; i < adjustedLen; ++i) {
|
2014-10-16 21:05:27 +08:00
|
|
|
|
2016-04-05 10:51:06 +08:00
|
|
|
sample = data[i];
|
2014-10-16 21:05:27 +08:00
|
|
|
|
|
|
|
// remove DC offset and mix to complex baseband
|
|
|
|
x = (sample - 127.5f) * cexpf( _Complex_I * 2 * M_PI * fc * i );
|
|
|
|
|
|
|
|
// apply low-pass filter, removing spectral image (IIR using direct-form II)
|
|
|
|
iir_buf[2] = iir_buf[1];
|
|
|
|
iir_buf[1] = iir_buf[0];
|
|
|
|
iir_buf[0] = x - a[1]*iir_buf[1] - a[2]*iir_buf[2];
|
|
|
|
x = b[0]*iir_buf[0] +
|
|
|
|
b[1]*iir_buf[1] +
|
|
|
|
b[2]*iir_buf[2];
|
|
|
|
|
|
|
|
// compute instantaneous frequency by looking at phase difference
|
|
|
|
// between adjacent samples
|
2017-08-11 17:38:54 +08:00
|
|
|
float freq = cargf(x * conjf(x_prime));
|
2014-10-16 21:05:27 +08:00
|
|
|
x_prime = x; // retain this sample for next iteration
|
|
|
|
|
2016-08-30 02:29:31 +08:00
|
|
|
output[i] =(freq > 0) ? 127 : -127;
|
2014-10-16 21:05:27 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// show data
|
2016-08-30 02:29:31 +08:00
|
|
|
//memcpy(data, output, adjustedLen);
|
2014-10-24 21:34:50 +08:00
|
|
|
for (j=0; j<adjustedLen; ++j)
|
2014-10-16 21:05:27 +08:00
|
|
|
data[j] = output[j];
|
2016-08-30 02:29:31 +08:00
|
|
|
|
2014-10-27 04:25:06 +08:00
|
|
|
free(output);
|
2014-10-16 21:05:27 +08:00
|
|
|
}
|
|
|
|
|
2016-08-30 02:29:31 +08:00
|
|
|
void iceSimple_Filter(int *data, const size_t len, uint8_t k){
|
|
|
|
// ref: http://www.edn.com/design/systems-design/4320010/A-simple-software-lowpass-filter-suits-embedded-system-applications
|
|
|
|
// parameter K
|
|
|
|
#define FILTER_SHIFT 4
|
|
|
|
|
|
|
|
int32_t filter_reg = 0;
|
|
|
|
int16_t input, output;
|
|
|
|
int8_t shift = (k <=8 ) ? k : FILTER_SHIFT;
|
|
|
|
|
|
|
|
for (int i = 0; i < len; ++i){
|
|
|
|
|
|
|
|
input = data[i];
|
|
|
|
// Update filter with current sample
|
|
|
|
filter_reg = filter_reg - (filter_reg >> shift) + input;
|
|
|
|
|
|
|
|
// Scale output for unity gain
|
|
|
|
output = filter_reg >> shift;
|
|
|
|
data[i] = output;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-02-21 21:52:31 +08:00
|
|
|
float complex cexpf (float complex Z) {
|
2014-10-16 21:05:27 +08:00
|
|
|
float complex Res;
|
|
|
|
double rho = exp (__real__ Z);
|
|
|
|
__real__ Res = rho * cosf(__imag__ Z);
|
|
|
|
__imag__ Res = rho * sinf(__imag__ Z);
|
|
|
|
return Res;
|
|
|
|
}
|