X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1e1b3030933e49358d49a0d10a8792d95e672f11..cef938d8830cd97783cb50fe68569e59ee9a1373:/armsrc/appmain.c

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