X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/17556415a96c983ce0894adc9af64a026878195c..f1202c3fa9eb6473c3921ca56d399dee76699650:/CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b66db046..a7af5766 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,19 @@
 All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
-## [unreleased][unreleased]	
+## [unreleased][unreleased]
+
+## [1.7.0 iceman fork] [2017-03-07]
+  - hf mf dump - added retry loops to try each read attempt up to 3 times.  makes getting a complete dump easier with many antennas. (marshmellow)
+
+  - Added markers in the graph around found Sequence Terminator after askmandemod. (marshmellow)
+  - Added data mtrim <start> <stop> command to trim out samples between start and stop. (marshmellow)
+  - Added data setgraphmarkers <orange> <blue> command to set two extra markers on the graph (marshmellow)
+  - added json support in lua (vitorio)
+  - added a buspirate settings file for at91sam7s512 (adamlaurie)
+  - `lf read` timeouts is now depended on what threshold level you set in `lf config`  (marshmellow)
+  - `hf mf sim` fixed a bug which made sim fail auths. (iceman)
+  - `hf 14a read` added magic tag generation 1a and 1b detection  (iceman)
   - correctly using stdtypes.h printf and scanf format string macros (PRIx64 et al) (pwpivi)
   - fix linker warning re missing entry point when linking fullimage.elf (pwpivi)
   - small changes to lf psk and fsk demods to improve results when the trace begins with noise or the chip isn't broadcasting yet (marshmellow)
@@ -16,7 +28,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
   - Added lf em 4x05info command to read and display information about the chip (marshmellow)
   - `lf em4x em4x50***` refactoring of em4x50 commands. (iceman)
   
-## [1.6.9][icemanfork] [2017-02-06]
+## [1.6.9 iceman fork] [2017-02-06]
   - Serial speedup,  if possible 408600baud otherwise default to 115200baud (iceman)
   - `hf emv` - Added Peter Fillmore's EMV branch now compiles on iceman fork.  See seperate issue. (iceman)
   - `hf 14a reader` - Aztek detection. (iceman)
@@ -32,7 +44,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
   - `hf iclass decrypt` - only decrypt Application1 (iceman)
   - `lf t55xx detect` - when finding multiple possible config blocks, see if a known configblock exists and select. (iceman)
   
-## [1.6.7][icemanfork] [2017-01-05]
+## [1.6.7 iceman fork] [2017-01-05]
   - `lf animal` - FDX-B animal commands (iceman)
   -  Fixed bugs in `lf sim` and other lf continuous demods not turning off antenna when finished (marshmellow)
   -  `hf iclass write` - fixed bugs, added crc. (?)