github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-14 18:48:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge flasher in client

Browse source
This commit is contained in:
Philippe Teuwen 2019-09-09 01:07:46 +02:00
commit afe891647f
14 changed files with 231 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

6
doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md
View file

@ -40,7 +40,7 @@ pm3-flash-all
If port detection failed, you'll have to call the flasher manually and specify the correct port:
```sh
proxmark3-flasher /dev/tty.usbmodemiceman1 -b /usr/local/share/proxmark3/firmware/bootrom.elf /usr/local/share/proxmark3/firmware/fullimage.elf
pm3-flash /dev/tty.usbmodemiceman1 -b /usr/local/share/proxmark3/firmware/bootrom.elf /usr/local/share/proxmark3/firmware/fullimage.elf
```
> Depending on the firmware version your Proxmark3 can also appear as `/dev/tty.usbmodem881`.
@ -99,13 +99,13 @@ pm3-flash-all
If port detection failed, you'll have to call the flasher manually and specify the correct port:
```sh
proxmark3-flasher /dev/tty.usbmodemiceman1 -b /usr/local/share/proxmark3/firmware/bootrom.elf /usr/local/share/proxmark3/firmware/fullimage.elf
pm3-flash /dev/tty.usbmodemiceman1 -b /usr/local/share/proxmark3/firmware/bootrom.elf /usr/local/share/proxmark3/firmware/fullimage.elf
```
or from the local repo
```sh
client/proxmark3-flasher /dev/tty.usbmodemiceman1 -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
client/pm3-flash /dev/tty.usbmodemiceman1 -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
```
Similarly, to run the client, you may try:

2
doc/md/Installation_Instructions/ModemManager-Must-Be-Discarded.md
View file

@ -121,7 +121,7 @@ In short:
* unplug device
* press button and keep it pressed (IMPORTANT)
* plug in device
* run flash command `proxmark3-flasher /dev/ttyACM0 /usr/local/share/proxmark3/firmware/fullimage.elf`
* run flash command `pm3-flash /dev/ttyACM0 /usr/local/share/proxmark3/firmware/fullimage.elf`
* wait until flash is finished
* release button
* un/plug device

18
doc/md/Installation_Instructions/Troubleshooting.md
View file

@ -23,7 +23,7 @@ Always use the latest repository commits from *master* branch. There are always
Try using directly the client or flasher:
```
client/proxmark3-flasher <YOUR_PORT_HERE> ...
client/pm3-flash <YOUR_PORT_HERE> ...
client/proxmark3 <YOUR_PORT_HERE> ...
```
@ -49,8 +49,8 @@ pm3-flash-fullimage
```
or
```
proxmark3-flasher <YOUR_PORT_HERE> -b bootrom/obj/bootrom.elf
proxmark3-flasher <YOUR_PORT_HERE> armsrc/obj/fullimage.elf
pm3-flash <YOUR_PORT_HERE> -b bootrom/obj/bootrom.elf
pm3-flash <YOUR_PORT_HERE> armsrc/obj/fullimage.elf
```
### Find out why it would be bricked
@ -71,7 +71,7 @@ pm3-flash-fullimage
```
or
```
proxmark3-flasher <YOUR_PORT_HERE> armsrc/obj/fullimage.elf
pm3-flash <YOUR_PORT_HERE> armsrc/obj/fullimage.elf
```
You should be back on tracks now. In case the flasher complains about bootloader version, you can follow the button procedure and flash first your bootloader.
@ -81,7 +81,7 @@ pm3-flash-bootrom
```
or
```
proxmark3-flasher <YOUR_PORT_HERE> -b bootrom/obj/bootrom.elf
pm3-flash <YOUR_PORT_HERE> -b bootrom/obj/bootrom.elf
```
### Ok, my bootloader is definitively dead, now what?
@ -119,9 +119,9 @@ proxmark3
and you must adapt accordingly the file path of some commands, e.g.
```
proxmark3-flasher <YOUR_PORT_HERE> /usr/local/share/proxmark3/firmware/fullimage.elf
pm3-flash <YOUR_PORT_HERE> /usr/local/share/proxmark3/firmware/fullimage.elf
<>
proxmark3-flasher <YOUR_PORT_HERE> /usr/share/proxmark3/firmware/fullimage.elf
pm3-flash <YOUR_PORT_HERE> /usr/share/proxmark3/firmware/fullimage.elf
pm3 --> sc upgrade f /usr/local/share/proxmark3/firmware/sim011.bin
<>
@ -144,9 +144,9 @@ cd client; ./proxmark3 ...
Therefore client commands referring to files of the repo must be adapted, e.g.
```
client/proxmark3-flasher <YOUR_PORT_HERE> armsrc/obj/fullimage.elf
client/pm3-flash <YOUR_PORT_HERE> armsrc/obj/fullimage.elf
<>
./proxmark3-flasher <YOUR_PORT_HERE> ../armsrc/obj/fullimage.elf
./pm3-flash <YOUR_PORT_HERE> ../armsrc/obj/fullimage.elf
pm3 --> sc upgrade f tools/simmodule/sim011.bin
<>

10
doc/md/Installation_Instructions/Windows-Installation-Instructions.md
View file

@ -54,7 +54,7 @@ pacman -S mingw-w64-x86_64-astyle
Now you're ready to follow the [compilation instructions](/doc/md/Use_of_Proxmark/0_Compilation-Instructions.md).
To use the compiled client and flasher, the only differences are that executables end with `.exe` (e.g. `proxmark3-flasher.exe`) and that the Proxmark3 port is one of your `comX` ports where "X" is the com port number assigned to proxmark3 under Windows.
To use the compiled client and flasher, 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.
To flash: In principle, the helper script `pm3-flash-all` should auto-detect your COM port, so you can just try:
@ -65,13 +65,13 @@ pm3-flash-all
If COM port detection failed, you'll have to call the flasher manually and specify the correct port:
```sh
proxmark3-flasher.exe comX -b /usr/local/share/proxmark3/firmware/bootrom.elf /usr/local/share/proxmark3/firmware/fullimage.elf
pm3-flash comX -b /usr/local/share/proxmark3/firmware/bootrom.elf /usr/local/share/proxmark3/firmware/fullimage.elf
```
or from the local repo
```sh
client/proxmark3-flasher.exe comX -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
client/pm3-flash comX -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
```
Similarly, to run the client, you may try:
@ -156,13 +156,13 @@ pm3-flash-all
If port detection failed, you'll have to call the flasher manually and specify the correct port:
```sh
proxmark3-flasher.exe /dev/ttySX -b /usr/local/share/proxmark3/firmware/bootrom.elf /usr/local/share/proxmark3/firmware/fullimage.elf
pm3-flash /dev/ttySX -b /usr/local/share/proxmark3/firmware/bootrom.elf /usr/local/share/proxmark3/firmware/fullimage.elf
```
or from the local repo
```sh
client/proxmark3-flasher.exe /dev/ttySX -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
client/pm3-flash /dev/ttySX -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
```
Similarly, to run the client, you may try:

4
doc/md/Use_of_Proxmark/0_Compilation-Instructions.md
View file

@ -45,13 +45,13 @@ In most cases, you can run the script `pm3-flash-all` which try to auto-detect t
For the other cases, specify the port by yourself. For example, for a Proxmark3 connected via USB under Linux:
```sh
proxmark3-flasher /dev/ttyACM0 -b /usr/local/share/proxmark3/firmware/bootrom.elf /usr/local/share/proxmark3/firmware/fullimage.elf
pm3-flash /dev/ttyACM0 -b /usr/local/share/proxmark3/firmware/bootrom.elf /usr/local/share/proxmark3/firmware/fullimage.elf
```
or from the local repo
```sh
client/proxmark3-flasher /dev/ttyACM0 -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
client/pm3-flash /dev/ttyACM0 -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
```
## Run the client

4
doc/path_notes.md
View file

@ -15,8 +15,8 @@ The main Proxmark3 executables / shellscripts will be copied to
/usr/local/bin/
```
* executables: `proxmark3`, `proxmark3-flasher`
* scripts: `pm3`, `pm3-flash-all`, `pm3-flash-bootloader`, `pm3-flash-fullimage`
* executables: `proxmark3`
* scripts: `pm3`, `pm3-flash`, `pm3-flash-all`, `pm3-flash-bootloader`, `pm3-flash-fullimage`
Some more executable / scripts will be copied to