github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-24 06:55:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into fix/focus-behavior

Browse source
This commit is contained in:
pwpiwi 2018-10-08 07:19:46 +02:00 • committed by GitHub
commit 473b60d7b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 394 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

664
armsrc/iso15693.c
View file

File diff suppressed because it is too large Load diff

11
client/cmdhf15.c
View file

@ -373,7 +373,8 @@ int CmdHF15Read(const char *Cmd)
return 0; return 0;
} }
// Record Activity without enabeling carrier // Record Activity without enabling carrier
// TODO: currently it DOES enable the carrier
int CmdHF15Record(const char *Cmd) int CmdHF15Record(const char *Cmd)
{ {
UsbCommand c = {CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693}; UsbCommand c = {CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693};
@ -519,7 +520,7 @@ static command_t CommandTable15[] =
{"cmd", CmdHF15Cmd, 0, "Send direct commands to ISO15693 tag"}, {"cmd", CmdHF15Cmd, 0, "Send direct commands to ISO15693 tag"},
{"findafi", CmdHF15Afi, 0, "Brute force AFI of an ISO15693 tag"}, {"findafi", CmdHF15Afi, 0, "Brute force AFI of an ISO15693 tag"},
{"dumpmemory", CmdHF15DumpMem, 0, "Read all memory pages of an ISO15693 tag"}, {"dumpmemory", CmdHF15DumpMem, 0, "Read all memory pages of an ISO15693 tag"},
{NULL, NULL, 0, NULL} {NULL, NULL, 0, NULL}
}; };
int CmdHF15(const char *Cmd) int CmdHF15(const char *Cmd)
@ -572,9 +573,9 @@ int CmdHF15CmdInquiry(const char *Cmd)
// Turns debugging on(1)/off(0) // Turns debugging on(1)/off(0)
int CmdHF15CmdDebug( const char *cmd) { int CmdHF15CmdDebug( const char *cmd) {
int debug=atoi(cmd); int debug = atoi(cmd);
if (strlen(cmd)<1) { if (strlen(cmd) < 1) {
PrintAndLog("Usage: hf 15 cmd debug <0|1>"); PrintAndLog("Usage: hf 15 debug <0|1>");
PrintAndLog(" 0 no debugging"); PrintAndLog(" 0 no debugging");
PrintAndLog(" 1 turn debugging on"); PrintAndLog(" 1 turn debugging on");
return 0; return 0;

21
client/proxguiqt.cpp
View file

@ -195,8 +195,7 @@ ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent)
this->master = master; this->master = master;
resize(800,500); resize(800,500);
/** Setup the controller widget **/ // Setup the controller widget
controlWidget = new QWidget(); controlWidget = new QWidget();
opsController = new Ui::Form(); opsController = new Ui::Form();
opsController->setupUi(controlWidget); opsController->setupUi(controlWidget);
@ -218,23 +217,17 @@ ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent)
QObject::connect(opsController->horizontalSlider_dirthr_down, SIGNAL(valueChanged(int)), this, SLOT(vchange_dthr_down(int))); QObject::connect(opsController->horizontalSlider_dirthr_down, SIGNAL(valueChanged(int)), this, SLOT(vchange_dthr_down(int)));
QObject::connect(opsController->horizontalSlider_askedge, SIGNAL(valueChanged(int)), this, SLOT(vchange_askedge(int))); QObject::connect(opsController->horizontalSlider_askedge, SIGNAL(valueChanged(int)), this, SLOT(vchange_askedge(int)));
controlWidget->show();
// Set up the plot widget, which does the actual plotting // Set up the plot widget, which does the actual plotting
plot = new Plot(this); plot = new Plot(this);
/*
QSlider* slider = new QSlider(Qt::Horizontal);
slider->setFocusPolicy(Qt::StrongFocus);
slider->setTickPosition(QSlider::TicksBothSides);
slider->setTickInterval(10);
slider->setSingleStep(1);
*/
QVBoxLayout *layout = new QVBoxLayout; QVBoxLayout *layout = new QVBoxLayout;
//layout->addWidget(slider);
layout->addWidget(plot); layout->addWidget(plot);
setLayout(layout); setLayout(layout);
//printf("Proxwidget Constructor just set layout\r\n"); show(); // places the window on the screen.
// Move controller widget below plot
controlWidget->move(x(),y()+frameSize().height());
controlWidget->resize(size().width(), controlWidget->size().height());
controlWidget->show();
} }
// not 100% sure what i need in this block // not 100% sure what i need in this block

1
client/util_darwin.m
View file

@ -34,6 +34,7 @@ void enableAppNap() {
activity = nil; activity = nil;
} }
} }
#else #else
void disableAppNap(const char* reason) { } void disableAppNap(const char* reason) { }
void enableAppNap() { } void enableAppNap() { }