Decreased BigBuff mem, some elf flasher fixes (needs more work) but flashing correctl...

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 6273317e8f8983b7fe36e091afe7fe95fd68e79f..a14d8fb8415dea094da0f3a9e2ab57fa237f3cc8 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -202,6 +202,27 @@ void MeasureAntennaTuning(void)
        UsbSendPacket((BYTE *)&c, sizeof(c));\r
 }\r
 \r
+void MeasureAntennaTuningHf(void)\r
+{\r
+       int vHf = 0;    // in mV\r
+\r
+       DbpString("Measuring HF antenna, press button to exit");\r
+\r
+       for (;;) {\r
+               // Let the FPGA drive the high-frequency antenna around 13.56 MHz.\r
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);\r
+               SpinDelay(20);\r
+               // Vref = 3300mV, and an 10:1 voltage divider on the input\r
+               // can measure voltages up to 33000 mV\r
+               vHf = (33000 * AvgAdc(ADC_CHAN_HF)) >> 10;\r
+       \r
+               Dbprintf("%d mV",vHf);\r
+               if (BUTTON_PRESS()) break;\r
+       }\r
+       DbpString("cancelled");\r
+}\r
+\r
+\r
 void SimulateTagHfListen(void)\r
 {\r
        BYTE *dest = (BYTE *)BigBuf;\r
@@ -250,9 +271,9 @@ void SimulateTagHfListen(void)
 \r
 void ReadMem(int addr)\r
 {\r
-       const DWORD *data = ((DWORD *)addr);\r
+       const BYTE *data = ((BYTE *)addr);\r
 \r
-       Dbprintf("Reading memory at address %x: %02x %02x %02x %02x %02x %02x %02x %02x",\r
+       Dbprintf("%x: %02x %02x %02x %02x %02x %02x %02x %02x",\r
                addr, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);\r
 }\r
 \r
@@ -643,6 +664,10 @@ void UsbPacketReceived(BYTE *packet, int len)
                        MeasureAntennaTuning();\r
                        break;\r
 \r
+               case CMD_MEASURE_ANTENNA_TUNING_HF:\r
+                       MeasureAntennaTuningHf();\r
+                       break;\r
+\r
                case CMD_LISTEN_READER_FIELD:\r
                        ListenReaderField(c->arg[0]);\r
                        break;\r