RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-12 18:25:07 +08:00
Code Issues Projects Releases Packages Wiki Activity

rename flasher -> proxmark3-flasher

Browse source
This commit is contained in:
Philippe Teuwen 2019-08-30 21:57:43 +02:00
parent 4fdb5a2f4b
commit d772c6169a
7 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
client/Makefile
View file

@ -17,8 +17,7 @@ endif
INSTALLBINRELPATH = /bin/
INSTALLSHARERELPATH = /share/proxmark3/
#TODO INSTALLBIN = proxmark3 proxmark3-flasher
INSTALLBIN = proxmark3 flasher
INSTALLBIN = proxmark3 proxmark3-flasher
INSTALLSHARE = lualibs luascripts resources dictionaries
CC = gcc
@ -297,8 +296,10 @@ ifeq "$(SUPPORTS_AVX512)" "True"
MULTIARCHOBJS += $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX512.o)
endif
BINS = proxmark3 flasher
BINS = proxmark3 proxmark3-flasher
CLEAN = $(BINS) *.moc.cpp ui/ui_overlays.h lualibs/pm3_cmd.lua lualibs/mfc_default_keys.lua
# transition: make sure old flasher is gone too
CLEAN += flasher
# need to assign dependancies to build these first...
all: $(BINS)
@ -311,7 +312,7 @@ proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS)
$(info [=] LD $@)
$(Q)$(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(LDLIBS) -o $@
flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS) $(OBJCOBJS)
proxmark3-flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS) $(OBJCOBJS)
$(info [=] LD $@)
$(Q)$(LD) $(LDFLAGS) $^ $(LDLIBS) -o $@
@ -459,7 +460,7 @@ DEPENDENCY_FILES = $(patsubst %.c, $(OBJDIR)/%.d, $(CORESRCS) $(CMDSRCS) $(REVEN
$(patsubst %.o, %.d, $(MULTIARCHOBJS)) \
$(patsubst %.cpp, $(OBJDIR)/%.d, $(QTGUISRCS)) \
$(patsubst %.m, $(OBJDIR)/%.d, $(OBJCSRCS)) \
$(OBJDIR)/proxmark3.d $(OBJDIR)/flash.d $(OBJDIR)/flasher.d
$(OBJDIR)/proxmark3.d $(OBJDIR)/flash.d $(OBJDIR)/proxmark3-flasher.d $(OBJDIR)/flasher.d
$(DEPENDENCY_FILES): ;
.PRECIOUS: $(DEPENDENCY_FILES)

6
doc/bt_manual_v10.md
View file

@ -128,7 +128,7 @@ connection is successful.
4. Use Proxmark client on BT-serial port
```sh
./proxmark /dev/rfcomm0
./proxmark3 /dev/rfcomm0
```
The first time, your OS will ask you for pairing. The default PIN is
1234. If PIN is not typed in quickly, the client might timeout. Simply
@ -169,7 +169,7 @@ turn on solid.
4. a serial port `/dev/ttyUSB0` will be created, use Proxmark3 client on it
```sh
./proxmark /dev/ttyUSB0
./proxmark3 /dev/ttyUSB0
```
#### MacOS
@ -191,7 +191,7 @@ After reboot you can go ahead to pairing your Proxmark3 RDV4 Blue Shark:
8. A serial port like `/dev/tty.PM3_RDV40-DevB` will be created, use Proxmark3 client on it
```sh
./proxmark /dev/tty.PM3_RDV40-DevB
./proxmark3 /dev/tty.PM3_RDV40-DevB
```
#### Android

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

@ -87,7 +87,7 @@ In principle, the helper script `flash-all.sh` should auto-detect your port, so
If port detection failed, you'll have to call the flasher manually and specify the correct port:
```sh
client/flasher /dev/tty.usbmodemiceman1 -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
client/proxmark3-flasher /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 `sudo client/flasher /dev/ttyACM0 armsrc/obj/fullimage.elf`
* run flash command `sudo client/proxmark3-flasher /dev/ttyACM0 armsrc/obj/fullimage.elf`
* wait until flash is finished
* release button
* un/plug device

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

@ -4,13 +4,13 @@
Always use the latest repository commits from *master* branch. There are always many fixes done almost daily.
## `./proxmark.sh` or `./flash-*.sh` doesn't see my Proxmark
## `./proxmark3.sh` or `./proxmark3-flash-*.sh` doesn't see my Proxmark
Try using directly the client or flasher:
```
client/flasher <YOUR_PORT_HERE> ...
client/proxmark <YOUR_PORT_HERE> ...
client/proxmark3-flasher <YOUR_PORT_HERE> ...
client/proxmark3 <YOUR_PORT_HERE> ...
```
Refer to the installation guide specific to your OS for details about ports.
@ -35,8 +35,8 @@ The flasher refused to flash your Proxmark3? Are there any messages in *red*? Th
```
or
```
client/flasher <YOUR_PORT_HERE> -b bootrom/obj/bootrom.elf
client/flasher <YOUR_PORT_HERE> armsrc/obj/fullimage.elf
client/proxmark3-flasher <YOUR_PORT_HERE> -b bootrom/obj/bootrom.elf
client/proxmark3-flasher <YOUR_PORT_HERE> armsrc/obj/fullimage.elf
```
### Find out why it would be bricked
@ -57,7 +57,7 @@ Once in bootloader mode, flash the main image.
```
or
```
client/flasher <YOUR_PORT_HERE> armsrc/obj/fullimage.elf
client/proxmark3-flasher <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.
@ -67,7 +67,7 @@ You should be back on tracks now. In case the flasher complains about bootloader
```
or
```
client/flasher <YOUR_PORT_HERE> -b bootrom/obj/bootrom.elf
client/proxmark3-flasher <YOUR_PORT_HERE> -b bootrom/obj/bootrom.elf
```
### Ok, my bootloader is definitively dead, now what?
@ -98,14 +98,14 @@ Instructions evolve over time so check if you're still up to date!
Depending how you launch the client, your working directory might be the root of the repository:
```
./proxmark.sh ...
client/proxmark ...
./proxmark3.sh ...
client/proxmark3 ...
```
or the `client/` subdirectory:
```
cd client; ./proxmark ...
cd client; ./proxmark3 ...
```
Therefore client commands referring to files of the repo must be adapted, e.g.

6
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. `client/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. `client/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 flash: In principle, the helper script `flash-all.sh` should auto-detect your COM port, so you can just try:
@ -65,7 +65,7 @@ To flash: In principle, the helper script `flash-all.sh` should auto-detect your
If COM port detection failed, you'll have to call the flasher manually and specify the correct port:
```sh
client/flasher.exe comX -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
client/proxmark3-flasher.exe comX -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
```
Similarly, to run the client, you may try:
@ -151,7 +151,7 @@ To flash: In principle, the helper script `flash-all.sh` should auto-detect your
If port detection failed, you'll have to call the flasher manually and specify the correct port:
```sh
client/flasher /dev/ttySX -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
client/proxmark3-flasher /dev/ttySX -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
```
Similarly, to run the client, you may try:

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

@ -31,7 +31,7 @@ In most cases, you can run the script `flash-all.sh` which try to auto-detect th
For the other cases, specify the port by yourself. For example, for a Proxmark3 connected via USB under Linux:
```sh
client/flasher /dev/ttyACM0 -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
client/proxmark3-flasher /dev/ttyACM0 -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
```
## Run the client