Merge branch 'master' into dev_4x50_sim_full

update 210120

client/cmdscripts/rdv4_init_extflash.cmd

@@ -3,4 +3,4 @@
 mem load -f mfc_default_keys --mfc
 mem load -f t55xx_default_pwds --t55xx
 mem load -f iclass_default_keys --iclass
-lf t55xx deviceconfig z p
+lf t55xx deviceconfig -z -p

client/luascripts/init_rdv4.lua

@@ -1,9 +1,10 @@
 local getopt = require('getopt')
 local ansicolors  = require('ansicolors')
+local utils = require('utils')
 
 copyright = 'Copyright (c) 2019 IceSQL AB. All rights reserved.'
 author = 'Christian Herrmann'
-version = 'v1.0.1'
+version = 'v1.0.3'
 desc = [[
 This script initialize a Proxmark3 RDV4.0 with
   - uploading dictionary files to flashmem
@@ -82,10 +83,14 @@ function main(args)
     -- T55x7 Device configuration
     print('Configure T55XX device side to match RDV4')
     print(dash)
-    core.console('lf t55xx deviceconfig r 0 a 29 b 17 c 15 d 47 e 15 p')
-    core.console('lf t55xx deviceconfig r 1 a 29 b 17 c 18 d 50 e 15 p')
-    core.console('lf t55xx deviceconfig r 2 a 29 b 17 c 18 d 40 e 15 p')
-    core.console('lf t55xx deviceconfig r 3 a 29 b 17 c 15 d 31 e 15 f 47 g 63 p')
+    core.console('lf t55xx deviceconfig --r0 -a 29 -b 17 -c 15 -d 47 -e 15 -p')
+    utils.Sleep(1)
+    core.console('lf t55xx deviceconfig --r1 -a 29 -b 17 -c 18 -d 50 -e 15 -p')
+    utils.Sleep(1)
+    core.console('lf t55xx deviceconfig --r2 -a 29 -b 17 -c 18 -d 40 -e 15 -p')
+    utils.Sleep(1)
+    core.console('lf t55xx deviceconfig --r3 -a 29 -b 17 -c 15 -d 31 -e 15 -f 47 -g 63 -p')
+    utils.Sleep(1)
 
     print('')
     print('')

doc/cheatsheet.md

@@ -544,10 +544,10 @@ Set timings to default
 ```
 Options
 ---
-p            : persist to flashmemory
-z            : Set default t55x7 timings (use p to save if required)
+-p            : persist to flash memory (RDV4)
+-z            : Set default t55x7 timings (use `-p` to save if required)
 
-pm3 --> lf t55xx deviceconfig z p
+pm3 --> lf t55xx deviceconfig -z -p
 ```
 
 Write to T55xx block

doc/cliparser_todo.txt

@@ -122,7 +122,5 @@ lf t55xx restore
 lf t55xx trace
 lf t55xx wakeup
 lf t55xx write
-lf t55xx bruteforce
-lf t55xx chk
 lf t55xx special
 script run

doc/md/Installation_Instructions/Troubleshooting.md

@@ -123,11 +123,13 @@ proxmark3
 
 and you must adapt accordingly the file path of some commands, e.g.
 
+using the executable direct:
 ```
 proxmark3 <YOUR_PORT_HERE> --flash --image /usr/local/share/proxmark3/firmware/fullimage.elf
 <>
 proxmark3 <YOUR_PORT_HERE> --flash --image /usr/share/proxmark3/firmware/fullimage.elf
 
+using the script:
 pm3 --> smart upgrade -f /usr/local/share/proxmark3/firmware/sim011.bin
 <>
 pm3 --> smart upgrade -f /usr/share/proxmark3/firmware/sim011.bin

doc/md/Installation_Instructions/Windows-Installation-Instructions.md

@@ -1,18 +1,31 @@
 # Installing on Windows
+<a id="top"></a>
+
+## Table of Contents
+
+  * [Installing dev-environment with ProxSpace](#installing-dev-environment-with-proxspace)
+  * [Installing pre-compiled binaries with ProxSpace](#installing-pre-compiled-binaries-with-proxspace)
+  * [Installing dev-environment with WSL 1](#installing-dev-environment-with-wsl-1)
 
 There are two ways to install, build and use Proxmark3 on Windows:
 
 * Using Gator96100 **ProxSpace**, a package to assist in your Windows installation of MinGW
 * Using native **WSL 1**, if you're running a Windows 10 version recent enough (FCU 1709 or later)
 
+We have listed three ways to use these two setups  (dev environment vs pre-compiled binaries)
+
 ---
 
-# Installing on Windows with ProxSpace
+## Installing dev-environment with ProxSpace
+^[Top](#top)
 
 ## Video Installation guide
+_note:  this video is a bit out-of-date but still informative_
 [![Windows Installation tutorial](https://github.com/5w0rdfish/Proxmark3-RDV4-ParrotOS/blob/master/screenshot-www.youtube.com-2019.03.17-20-44-33.png)](https://youtu.be/zzF0NCMJnYU "Windows Installation Tutorial")
 
-## Driver Installation
+## Driver Installation ( Windows 7 )
+
+_note: for Windows 7 you will this step.  On a later Windows edition skip this._
 
 Install required drivers for your Windows installation. You may need admin privileges to do this.  
 Step by step guides are online such as [RyscCorps](https://store.ryscc.com/blogs/news/how-to-install-a-proxmark3-driver-on-windows-10).
@@ -62,9 +75,20 @@ pacman -S mingw-w64-x86_64-astyle
 
 To use the compiled client, the only differences are that executables end with `.exe` (e.g. `proxmark3.exe`) and that the Proxmark3 port is one of your `comX` ports where "X" is the com port number assigned to proxmark3 under Windows, so commands like `proxmark3 /dev/ttyACMX` become `proxmark3.exe comX`.
 
+## Done!
+
 Now you're ready to follow the [compilation instructions](/doc/md/Use_of_Proxmark/0_Compilation-Instructions.md).
 
-# Installing on Windows with WSL 1
+
+# Installing pre-compiled binaries with ProxSpace
+^[Top](#top)
+
+to be done (tcprst)
+
+
+
+# Installing dev-environment with WSL 1
+^[Top](#top)
 
 WSL 1 requires to run on Windows 10 version 1709 or above. Previous windows versions didn't have support for COM ports.
 
@@ -82,6 +106,7 @@ Make sure your WSL can launch Windows processes to get the `pm3` scripts working
 
 If you want to run the graphical components of the Proxmark3 client, you need to install a X Server such as [VcXsrv](https://sourceforge.net/projects/vcxsrv/) or [Xming](https://sourceforge.net/projects/xming/) and launch it, e.g. by executing XLaunch.
 
+
 ## Window terminal Installation
 Microsoft has recent released a new terminal for their OS.  It is much better experience than old `cmd.exe` so we strongly recommend installing it.
 It is also open sourced, ref [terminal](https://github.com/microsoft/terminal). You can download and install from here: [windows terminal](https://aka.ms/terminal)
@@ -147,5 +172,7 @@ echo "export DISPLAY=:0" >> ~/.bashrc
 
 Note that it may take a quite long time for a freshly plugged Proxmark3 to be visible on a WSL /dev/ttySX port.
 
+## Done!
+
 Now you're ready to follow the [compilation instructions](/doc/md/Use_of_Proxmark/0_Compilation-Instructions.md).
 

doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md

@@ -8,16 +8,16 @@ You will need to run these commands to make sure your rdv4 is prepared
 
 The lua script actually executes the following commands below.  These are here because of documentation, you can jump down to *Verify sim module firmware version* part.
 ```
-[usb] pm3 --> mem load f mfc_default_keys m
-[usb] pm3 --> mem load f t55xx_default_pwds t
-[usb] pm3 --> mem load f iclass_default_keys i
-[usb] pm3 --> lf t55xx deviceconfig a 29 b 17 c 15 d 47 e 15 p
-[usb] pm3 --> lf t55xx deviceconfig r 1 a 31 b 20 c 18 d 50 e 15 p
-[usb] pm3 --> lf t55xx deviceconfig r 2 a 31 b 20 c 18 d 40 e 15 p
-[usb] pm3 --> lf t55xx deviceconfig r 3 a 29 b 17 c 15 d 31 e 15 f 47 g 63 p
+[usb] pm3 --> mem load -f mfc_default_keys -m
+[usb] pm3 --> mem load -f t55xx_default_pwds -t
+[usb] pm3 --> mem load -f iclass_default_keys -i
+[usb] pm3 --> lf t55xx deviceconfig --r0 -a 29 -b 17 -c 15 -d 47 -e 15 -p
+[usb] pm3 --> lf t55xx deviceconfig --r1 -a 31 -b 20 -c 18 -d 50 -e 15 -p
+[usb] pm3 --> lf t55xx deviceconfig --r2 -a 31 -b 20 -c 18 -d 40 -e 15 -p
+[usb] pm3 --> lf t55xx deviceconfig --r3 -a 29 -b 17 -c 15 -d 31 -e 15 -f 47 -g 63 -p
 
 Set all t55xx settings to defaults (will set all 4 at once)
-[usb] pm3 --> lf t55xx deviceconfig z p
+[usb] pm3 --> lf t55xx deviceconfig -z -p
 ```