CHG: a select_legic function with structs and stuff and

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index aa873e42263bba0da28815a9328e06c0abefe93a..549feff0bb25e82ee230d0163b65d9bba29bb97b 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -10,7 +10,7 @@
 // executes.
 //-----------------------------------------------------------------------------
 #include "usb_cdc.h"
 // executes.
 //-----------------------------------------------------------------------------
 #include "usb_cdc.h"

-#include "cmd.h"
+//#include "cmd.h"

 #include "proxmark3.h"
 #include "apps.h"
 #include "util.h"
 #include "proxmark3.h"
 #include "apps.h"
 #include "util.h"


@@ -194,9 +194,11 @@ int AvgAdc(int ch) // was static - merlok
 
 void MeasureAntennaTuning(void) {
 
 
 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
        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();
 
 /*
        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);
   
        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);
        for  (i = 255; i >= 19; i--) {
                WDT_HIT();
                FpgaSendCommand(FPGA_CMD_SET_DIVISOR, i);


@@ -219,7 +221,7 @@ void MeasureAntennaTuning(void) {
                if (i==95)      vLf125 = adcval; // voltage at 125Khz
                if (i==89)      vLf134 = adcval; // voltage at 134Khz
 
                if (i==95)      vLf125 = adcval; // voltage at 125Khz
                if (i==89)      vLf134 = adcval; // voltage at 134Khz
 

-               LF_Results[i] = adcval>>8; // scale int to fit in byte for graphing purposes
+               LF_Results[i] = adcval >> 8; // scale int to fit in byte for graphing purposes

                if(LF_Results[i] > peak) {
                        peakv = adcval;
                        peak = LF_Results[i];
                if(LF_Results[i] > peak) {
                        peakv = adcval;
                        peak = LF_Results[i];


@@ -227,8 +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);
        LED_A_ON();
        // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);


@@ -236,10 +236,8 @@ void MeasureAntennaTuning(void) {
        SpinDelay(20);
        vHf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
 
        SpinDelay(20);
        vHf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
 

-       cmd_send(CMD_MEASURED_ANTENNA_TUNING, vLf125 | (vLf134<<16), vHf, peakf | (peakv<<16), LF_Results, 256);
+       cmd_send(CMD_MEASURED_ANTENNA_TUNING, vLf125 | (vLf134 << 16), vHf, peakf | (peakv << 16), LF_Results, 256);

        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

-
-       BigBuf_free(); BigBuf_Clear_ext(false);

        LEDsoff();
 }
 
        LEDsoff();
 }
 


@@ -1066,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_READER_LEGIC_RF:
                        LegicRfReader(c->arg[0], c->arg[1], c->arg[2]);
                        break;

+                       
+               case CMD_LEGIC_INFO:
+                       LegicRfInfo();
+                       break;

 #endif
 
 #ifdef WITH_ISO14443b
 #endif
 
 #ifdef WITH_ISO14443b