From: pwpiwi Date: Wed, 11 Feb 2015 20:14:34 +0000 (+0100) Subject: bugfix hf 14a sim / hf mf sim: polarity of tag subcarrier modulation was wrong X-Git-Tag: v2.0.0-rc1~22 X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/7554370c309e934787410041e2f747ed656acce0 bugfix hf 14a sim / hf mf sim: polarity of tag subcarrier modulation was wrong --- diff --git a/fpga/fpga_hf.bit b/fpga/fpga_hf.bit index 8b0c7a37..4910e6ac 100644 Binary files a/fpga/fpga_hf.bit and b/fpga/fpga_hf.bit differ diff --git a/fpga/hi_iso14443a.v b/fpga/hi_iso14443a.v index 3f614fdd..46adda12 100644 --- a/fpga/hi_iso14443a.v +++ b/fpga/hi_iso14443a.v @@ -570,7 +570,7 @@ assign pwr_oe3 = 1'b0; // TAGSIM_MOD: short circuit antenna with different resistances (modulated by sub_carrier modulated by mod_sig_coil) // for pwr_oe4 = 1 (tristate): antenna load = 10k || 33 = 32,9 Ohms // for pwr_oe4 = 0 (active): antenna load = 10k || 33 || 33 = 16,5 Ohms -assign pwr_oe4 = ~(mod_sig_coil & sub_carrier & (mod_type == `TAGSIM_MOD)); +assign pwr_oe4 = mod_sig_coil & sub_carrier & (mod_type == `TAGSIM_MOD); // This is all LF, so doesn't matter. assign pwr_oe2 = 1'b0;