X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/cc70dd6b600f8343c023bad284b1d1e219e41ca8..3e750be37cd8e3231ae02260be6899391d206cb4:/armsrc/appmain.c diff --git a/armsrc/appmain.c b/armsrc/appmain.c index ead92c48..549feff0 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -194,9 +194,11 @@ int AvgAdc(int ch) // was static - merlok void MeasureAntennaTuning(void) { - uint8_t* LF_Results = BigBuf_malloc(256); + uint8_t LF_Results[256]; int i, adcval = 0, peak = 0, peakv = 0, peakf = 0; int vLf125 = 0, vLf134 = 0, vHf = 0; // in mV + + memset(LF_Results, 0, sizeof(LF_Results)); LED_B_ON(); /* @@ -210,7 +212,7 @@ void MeasureAntennaTuning(void) { FpgaDownloadAndGo(FPGA_BITSTREAM_LF); FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD); - + for (i = 255; i >= 19; i--) { WDT_HIT(); FpgaSendCommand(FPGA_CMD_SET_DIVISOR, i); @@ -227,9 +229,6 @@ void MeasureAntennaTuning(void) { } } - // for (i = 18; i >= 0; i--) - // LF_Results[i] = 0; - LED_A_ON(); // Let the FPGA drive the high-frequency antenna around 13.56 MHz. FpgaDownloadAndGo(FPGA_BITSTREAM_HF); @@ -239,8 +238,6 @@ void MeasureAntennaTuning(void) { cmd_send(CMD_MEASURED_ANTENNA_TUNING, vLf125 | (vLf134 << 16), vHf, peakf | (peakv << 16), LF_Results, 256); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); - - BigBuf_free(); BigBuf_Clear_ext(false); LEDsoff(); } @@ -1067,6 +1064,10 @@ void UsbPacketReceived(uint8_t *packet, int len) case CMD_READER_LEGIC_RF: LegicRfReader(c->arg[0], c->arg[1], c->arg[2]); break; + + case CMD_LEGIC_INFO: + LegicRfInfo(); + break; #endif #ifdef WITH_ISO14443b