CHG: Updated the README.md to be clearer.

diff --git a/README.md b/README.md
index 3378f33cebc165cbc8d94495d2bb6cc987921df6..76dafd06998ea9e1eccede3bbeddaee3ebe5bd3b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -3,13 +3,12 @@ The iceman fork
 
 NOTICE: 
 
 
 NOTICE: 
 

+::THIS FORK IS HIGHLY EXPERIMENTAL::
+

 The official Proxmark repository is found here: https://github.com/Proxmark/proxmark3
 
 NEWS: 
 
 The official Proxmark repository is found here: https://github.com/Proxmark/proxmark3
 
 NEWS: 
 

-::THIS FORK IS HIGHLY EXPERIMENTAL::
-
-

 ## Build Status Travis CI
 [![Build Status](https://travis-ci.org/iceman1001/proxmark3.svg?branch=master)](https://travis-ci.org/iceman1001/proxmark3)
 
 ## Build Status Travis CI
 [![Build Status](https://travis-ci.org/iceman1001/proxmark3.svg?branch=master)](https://travis-ci.org/iceman1001/proxmark3)
 


@@ -26,7 +25,7 @@ You will need to configure  ARM-NON-EABI- Compiler for it to use:
 cov-configure --comptype gcc --compiler  /opt/devkitpro/devkitARM/bin/arm-none-eabi-gcc
 
 ::run it (I'm running on Ubuntu)
 cov-configure --comptype gcc --compiler  /opt/devkitpro/devkitARM/bin/arm-none-eabi-gcc
 
 ::run it (I'm running on Ubuntu)

-cov-build --dir cov-int make all UBUNTU_1404_QT4=1
+cov-build --dir cov-int make all

 
 :: make a tarball
 tar czvf proxmark3.tgz cov-int
 
 :: make a tarball
 tar czvf proxmark3.tgz cov-int


@@ -56,7 +55,7 @@ Among the stuff is
 
        * A Bruteforce for T55XX passwords against tag.
        * A Bruteforce for AWID 26, starting w a facilitycode then trying all 0xFFFF cardnumbers via simulation. To be used against a AWID Reader.
 
        * A Bruteforce for T55XX passwords against tag.
        * A Bruteforce for AWID 26, starting w a facilitycode then trying all 0xFFFF cardnumbers via simulation. To be used against a AWID Reader.

-
+       * A Bruteforce for HID,  starting w a facilitycode then trying all 0xFFFF cardnumbers via simulation. To be used against a HID Reader.

        * Blaposts Crapto1 v3.3
        
        
        * Blaposts Crapto1 v3.3
        
        


@@ -65,71 +64,83 @@ Give me a hint, and I'll see if I can't merge in the stuff you have.
 I don't actually know how to make small pull-request to github :( and that is the number one reason for me not pushing a lot of things back to the PM3 master.
        
 PM3 GUI:
 I don't actually know how to make small pull-request to github :( and that is the number one reason for me not pushing a lot of things back to the PM3 master.
        
 PM3 GUI:

-
+--------

 I do tend to rename and move stuff around, the official PM3-GUI from Gaucho will not work so well. *sorry*     
 
 
          
 DEVELOPMENT:
 I do tend to rename and move stuff around, the official PM3-GUI from Gaucho will not work so well. *sorry*     
 
 
          
 DEVELOPMENT:

+------------
+This fork now compiles just fine on 
+       windows/mingw environment with Qt5.3.1 & GCC 4.8
+       Ubuntuu 1404, 1510
+       Mac OS X
+
+SETUP AND BUILD FOR UBUNTU
+--------------------------

 
 

-This fork is adjusted to compile on windows/mingw environment with Qt5.3.1 & GCC 4.8
-For people with linux you will need to patch some source code and some small change to one makefile.  If you are lazy, you google the forum and find asper's or holimans makefile or you find your solution below.
+GC made updates to allow this to build easily on Ubuntu 14.04.2 LTS or 15.10
+See https://github.com/Proxmark/proxmark3/wiki/Ubuntu%20Linux

 
 

-GC made updates to allow this to build easily on Ubuntu 14.04.2 LTS.
-       - See https://github.com/Proxmark/proxmark3/wiki/Ubuntu%20Linux
-       - Generally speaking, if you're running a "later" Proxmark, installation is very easy.
-       - Run "sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget"a
-       - Follow these instructions
+Run 
+       -> sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget"a
+
+Follow these instructions

 Get devkitARM release 41 from SourceForge (choose either the 64/32 ¿bit depending on your architecture, it is assumed you know how to check and recognize your architecture):
 
 (64-bit) http://sourceforge.net/projects/devkitpro/files/devkitARM/previous/devkitARM_r41-x86_64-linux.tar.bz2/download
 (32-bit) http://sourceforge.net/projects/devkitpro/files/devkitARM/previous/devkitARM_r41-i686-linux.tar.bz2/download
 Get devkitARM release 41 from SourceForge (choose either the 64/32 ¿bit depending on your architecture, it is assumed you know how to check and recognize your architecture):
 
 (64-bit) http://sourceforge.net/projects/devkitpro/files/devkitARM/previous/devkitARM_r41-x86_64-linux.tar.bz2/download
 (32-bit) http://sourceforge.net/projects/devkitpro/files/devkitARM/previous/devkitARM_r41-i686-linux.tar.bz2/download

+

 Extract the contents of the .tar.bz2:
 Extract the contents of the .tar.bz2:

- tar jxvf devkitARM_r41-<arch>-linux.tar.bz2
+       ->  tar jxvf devkitARM_r41-<arch>-linux.tar.bz2
+

 Create a directory for the arm dev kit:
 Create a directory for the arm dev kit:

- sudo mkdir -p /opt/devkitpro/
+       ->  sudo mkdir -p /opt/devkitpro/
+

 Move the ARM developer kit to the newly created directory:
 Move the ARM developer kit to the newly created directory:

- sudo mv devkitARM /opt/devkitpro/
+       -> sudo mv devkitARM /opt/devkitpro/
+

 Add the appropriate environment variable:
 Add the appropriate environment variable:

- export PATH=${PATH}:/opt/devkitpro/devkitARM/bin/
+       -> export PATH=${PATH}:/opt/devkitpro/devkitARM/bin/
+

 Add the environment variable to your profile:
 Add the environment variable to your profile:

- echo 'PATH=${PATH}:/opt/devkitpro/devkitARM/bin/ ' >> ~/.bashrc
-       - Use the magic build command "make UBUNTU_1404_QT4=1"
+       -> echo 'PATH=${PATH}:/opt/devkitpro/devkitARM/bin/ ' >> ~/.bashrc
+
+Clone iceman fork
+       -> git clone https://github.com/iceman1001/proxmark3.git

 
 

-Common errors linux/macOS finds
+Get the latest commits 
+       -> git pull
+
+CLEAN COMPILE  
+       -> make clean && make all

        
        

-Error:  
-       * \client\makefile  the parameter -lgdi32 
-Solution:
-       * Remove parameter.
+Flash the BOOTROM
+       -> client/flasher -b /dev/ttyACM0 bootrom/obj/bootrom.elf
+
+Flash the FULLIMAGE    
+       -> client/flasher /dev/ttyACM0 armsrc/obj/fullimage.elf

        
        

-Error:  
-       * Using older Qt4.6 gives compilation errors.  
-Solution
-       * Upgrade to Qt5.3.1 
-       OR 
-       * Change these two line in  \client\makefile
-               CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui -I$(QTDIR)/include/QtWidgets  -I/mingw/include
-               QTLDLIBS = -L$(QTDIR)/lib  -lQt5Core -lQt5Gui -lQt5Widgets 
-               
-               TO
-               
-               CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
-               QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
+Change into the client folder.         
+       -> cd client

        
        

-
-An old Qt4 version makefile is found here: http://www.icesql.se/proxmark3/code/linuxmakefile.txt  but this one doesn't have all new files in it. So I don't recommend it.
-                                                          
+Run the client 
+       -> ./proxmark3 /dev/ttyACM0
+                                                  

 
 January 2015, Sweden
 iceman at host iuse.se
 
 
 January 2015, Sweden
 iceman at host iuse.se
 

+BUYING A PROXMARK 3
+-------------------
+
+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)  

 
 

-The Proxmark 3 is available for purchase (assembled and tested) from the
-following locations:
+   I recommend you to buy this version. 

 
 

-   * http://www.elechouse.com  (new and revised hardware package 2015)
-   
+--------------------------------------------------------------------------

 
 Most of the ultra-low-volume contract assemblers could put
 something like this together with a reasonable yield. A run of around
 
 Most of the ultra-low-volume contract assemblers could put
 something like this together with a reasonable yield. A run of around