From: marshmellow42 <marshmellowrf@gmail.com>
Date: Wed, 4 Nov 2015 01:19:46 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v2.3.0~15^2~4
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/8949e0458403298a700340bd304f501dd7577fbb

Merge remote-tracking branch 'upstream/master'
---

8949e0458403298a700340bd304f501dd7577fbb
diff --cc CHANGELOG.md
index 2816084b,80c16ffa..163bc42a
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -19,14 -16,11 +19,17 @@@ of stream transmissions (marshmellow
  - Added 'hw status'. This command makes the ARM print out some runtime information. (holiman) 
  - Added 'hw ping'. This command just sends a usb packets and checks if the pm3 is responsive. Can be used to abort certain operations which supports abort over usb. (holiman)
  - Added `data hex2bin` and `data bin2hex` for command line conversion between binary and hexadecimal (holiman)
+ - Added 'hf snoop'. This command take digitalized signal from FPGA and put in BigBuffer. (pwpiwi + enio)
+ - Added Topaz (NFC type 1) protocol support ('hf topaz reader', 'hf list topaz', 'hf 14a raw -T', 'hf topaz snoop'). (piwi)
+ - Added option c to 'hf list' (mark CRC bytes) (piwi)
  
  ### Changed
 +- Adjusted lf t55xx dump to allow overriding the safety check and warning text (marshmellow)
 +- Adjusted lf t55xx write input variables (marshmellow)
 +- Adjusted lf t55xx read with password safety check and warning text and adjusted the input variables (marshmellow & iceman)
 +- Adjusted LF FSK demod to account for cross threshold fluctuations (898 count waves will adjust the 9 to 8 now...) more accurate.
 +- Adjusted timings for t55xx commands.  more reliable now. (marshmellow & iceman)
 +- `lf cmdread` adjusted input methods and added help text (marshmellow & iceman)
  - changed `lf config t <threshold>` to be 0 - 128 and will trigger on + or - threshold value (marshmellow) 
  - `hf iclass dump` cli options - can now dump AA1 and AA2 with different keys in one run (does not go to muliple pages for the larger tags yet)
  - Revised workflow for StandAloneMode14a (Craig Young)