From 42d025d01a11b0bb25fca98b4434841fa81fd71e Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Tue, 14 May 2019 08:29:24 +0200 Subject: [PATCH] Slight rework of hw tune --- armsrc/appmain.c | 2 +- client/cmddata.c | 2 +- include/pm3_cmd.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/armsrc/appmain.c b/armsrc/appmain.c index a506f1419..883d735d1 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -296,7 +296,7 @@ void MeasureAntennaTuning(void) { arg2 <<= 32; arg2 |= peakf; - reply_old(CMD_MEASURED_ANTENNA_TUNING, arg0, v_hf, arg2, LF_Results, 256); + reply_mix(CMD_MEASURE_ANTENNA_TUNING, arg0, v_hf, arg2, LF_Results, 256); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); LEDsoff(); } diff --git a/client/cmddata.c b/client/cmddata.c index 0b63b043d..c13cbe904 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -1532,7 +1532,7 @@ int CmdTuneSamples(const char *Cmd) { clearCommandBuffer(); SendCommandNG(CMD_MEASURE_ANTENNA_TUNING, NULL, 0); PacketResponseNG resp; - while (!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING, &resp, 2000)) { + while (!WaitForResponseTimeout(CMD_MEASURE_ANTENNA_TUNING, &resp, 2000)) { timeout++; printf("."); fflush(stdout); diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h index de66f312f..6e455b36f 100644 --- a/include/pm3_cmd.h +++ b/include/pm3_cmd.h @@ -336,7 +336,6 @@ typedef struct { // For measurements of the antenna tuning #define CMD_MEASURE_ANTENNA_TUNING 0x0400 #define CMD_MEASURE_ANTENNA_TUNING_HF 0x0401 -#define CMD_MEASURED_ANTENNA_TUNING 0x0410 #define CMD_LISTEN_READER_FIELD 0x0420 // For direct FPGA control