===============
[![Build Status](https://travis-ci.org/iceman1001/proxmark3.svg?branch=master)](https://travis-ci.org/iceman1001/proxmark3) [![Coverity Status](https://scan.coverity.com/projects/5117/badge.svg)](https://scan.coverity.com/projects/proxmark3-iceman-fork) [![Latest release] (https://img.shields.io/github/release/iceman1001/proxmark3.svg)] (https://github.com/iceman1001/proxmark3/releases/latest)
-##This fork is HIGHLY EXPERIMENTAL
+##This fork is HIGHLY experimental
##Notice
There is so much in this fork, with all fixes and additions its basically the most enhanced fork to this day for the Proxmark3 device.
##Offical
The official Proxmark repository is found here: https://github.com/Proxmark/proxmark3
-##Coverity Scan Config && Run
+##Coverity Scan Config & Run
Download the Coverity Scan Self-buld and install it.
You will need to configure ARM-NON-EABI- Compiler for it to use:
##Straight from the CHANGELOG
=============================
+ - 'analyse lcr' - added a new main command group, to help analysing bytes & bits & nibbles. (iceman)
- 'lf nedap' - added identification of a NEDAP tag. (iceman)
- 'lf viking clone' - fixed a bug. (iceman)
- Added bitsliced bruteforce solver in 'hf mf hardnested' (aczid)
-> ./proxmark3 /dev/ttyACM0
##Homebrew (Mac OS X)
-==================
These instructions comes from @Chrisfu, where I got the proxmark3.rb scriptfile from.
-Further questions about Mac & Homebrew, contact @Chrisfu
+Further questions about Mac & Homebrew, contact @Chrisfu (https://github.com/chrisfu/)
1. Install homebrew if you haven't yet already done so: http://brew.sh/
I recently added a docker container on Docker HUB. You find it here: https://hub.docker.com/r/iceman1001/proxmark3/
Follow those instructions to get it up and running. No need for the old proxspace-environment anymore.
-## Enjoy
-January 2015, Sweden
-iceman at host iuse.se
-
+[1.6.0] How to start: https://www.youtube.com/watch?v=b5Zta89Cf6Q
+[1.6.0] How to connect: https://youtu.be/0ZS2t5C-caI
+[1.6.1] How to flash: https://www.youtube.com/watch?v=WXouhuGYEiw
+Recommendations:
+Use only container tag [1.6.1]
-Buying a proxmarkK3
-===================
+##Buying a proxmark3
The Proxmark 3 device is available for purchase (assembled and tested) from the following locations:
- * http://www.elechouse.com (new and revised hardware package 2015)
+ * http://proxmark3.tictail.com/ (For buyers in EU, most likely in Sweden)
+
+ * http://www.elechouse.com/ (new and revised hardware package 2015, located in China)
I recommend you to buy this version.
-The last note is from the orginal file.
-====================
+##Enjoy
+
+January 2015, Sweden
+iceman at host iuse.se
+
+
+
+##Note from Jonathan Westhues
Most of the ultra-low-volume contract assemblers could put
something like this together with a reasonable yield. A run of around
a dozen units is probably cost-effective. The BOM includes (possibly-