X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/9b32625c2c1d7ef36e4788c9a5f827470078f81d..1618a18e899bcec7f6a1c4ad884b84472fa67655:/armsrc/appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 1c3d9398..bfab8eb6 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -244,7 +244,7 @@ void MeasureAntennaTuning(int mode)
 		}
 	}
 
-	cmd_send(CMD_MEASURED_ANTENNA_TUNING, vLf125 | (vLf134<<16), vHf, peakf | (peakv<<16), LF_Results, 256);
+	cmd_send(CMD_MEASURED_ANTENNA_TUNING, vLf125>>1 | (vLf134>>1<<16), vHf, peakf | (peakv>>1<<16), LF_Results, 256);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LED_B_OFF();
 	return;
@@ -1408,6 +1408,25 @@ void  __attribute__((noreturn)) AppMain(void)
 	// Reset SSC
 	AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST;
 
+	// Configure MUX
+	AT91C_BASE_PIOA->PIO_OER =
+		GPIO_MUXSEL_HIPKD |
+		GPIO_MUXSEL_LOPKD |
+		GPIO_MUXSEL_LORAW |
+		GPIO_MUXSEL_HIRAW;
+
+	AT91C_BASE_PIOA->PIO_PER =
+		GPIO_MUXSEL_HIPKD |
+		GPIO_MUXSEL_LOPKD |
+		GPIO_MUXSEL_LORAW |
+		GPIO_MUXSEL_HIRAW;
+	
+	// set pins LOW
+	LOW(GPIO_MUXSEL_HIPKD);
+	LOW(GPIO_MUXSEL_LOPKD);
+	LOW(GPIO_MUXSEL_HIRAW);
+	LOW(GPIO_MUXSEL_LORAW);
+
 	// Load the FPGA image, which we have stored in our flash.
 	// (the HF version by default)
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);