From: Iceman <iceman@iuse.se>
Date: Sat, 25 Mar 2017 12:12:05 +0000 (+0100)
Subject: Merge pull request #246 from marshmellow42/master
X-Git-Tag: v3.0.0~35
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/a7e0d39ce3f172646d78cb5fd4acd99be3e14d38?hp=edf751bb62607c66684fd0750888d1fd6efd30e7

Merge pull request #246 from marshmellow42/master

hitag sim fix

mea culpa.
---

diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index 6a072bf4..dd0211da 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -993,7 +993,7 @@ void SimulateHitagTag(bool tag_mem_supplied, byte_t* data) {
 	
 	// Set up simulator mode, frequency divisor which will drive the FPGA
 	// and analog mux selection.
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
 	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
 	SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
 	RELAY_OFF();
diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index 58e09a45..dc2281b9 100644
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -1023,8 +1023,7 @@ void SimulateHitagSTag(bool tag_mem_supplied, byte_t* data) {
 // Set up simulator mode, frequency divisor which will drive the FPGA
 // and analog mux selection.
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-	FpgaWriteConfWord(
-	FPGA_MAJOR_MODE_LF_EDGE_DETECT | FPGA_LF_EDGE_DETECT_READER_FIELD);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_EDGE_DETECT);
 	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
 	SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
 	RELAY_OFF();