diff --git a/doc/md/Installation_Instructions/Troubleshooting.md b/doc/md/Installation_Instructions/Troubleshooting.md index 85a45f852..273bab50d 100644 --- a/doc/md/Installation_Instructions/Troubleshooting.md +++ b/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 --flash --image /usr/local/share/proxmark3/firmware/fullimage.elf <> proxmark3 --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 diff --git a/doc/md/Installation_Instructions/Windows-Installation-Instructions.md b/doc/md/Installation_Instructions/Windows-Installation-Instructions.md index 6000f42f2..842fa3773 100644 --- a/doc/md/Installation_Instructions/Windows-Installation-Instructions.md +++ b/doc/md/Installation_Instructions/Windows-Installation-Instructions.md @@ -1,15 +1,26 @@ # Installing on Windows + + +## 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 @@ -64,7 +75,15 @@ To use the compiled client, the only differences are that executables end with ` 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 +101,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)