Merge branch 'master' into pm5-idle-lowpower
Signed-off-by: Iceman <iceman@iuse.se>
This commit is contained in:
17 files changed
+1053
-294
No files matched your search
+2
-2
@@ -1913,7 +1913,7 @@
|
||||
},
|
||||
"hf 15 cfinalize": {
|
||||
"command": "hf 15 cfinalize",
|
||||
"description": "Finalize a magic ISO15693 'V3' tag. This operation is irreversible. After finalize the configuration area is erased and the UID can no longer be changed. Set the UID with `hf 15 csetuid --v3` first, then lock it in with this command.",
|
||||
"description": "Finalize a magic ISO15693 'V3' tag. This operation is irreversible. It locks the UID for good, clears the configuration blocks and shifts the block numbering. Set it with `hf 15 csetuid --v3` first, then lock it in with this command.",
|
||||
"notes": [
|
||||
"hf 15 cfinalize -y"
|
||||
],
|
||||
@@ -1926,7 +1926,7 @@
|
||||
},
|
||||
"hf 15 csetuid": {
|
||||
"command": "hf 15 csetuid",
|
||||
"description": "Set UID for magic Chinese card (only works with such cards) For magic 'V3' tags this writes the UID configuration only and is repeatable; run `hf 15 cfinalize` afterwards to lock the UID permanently.",
|
||||
"description": "Set UID for magic Chinese card (only works with such cards) Gen1 and V3 probe their backdoor blocks first and refuse to write if they read back real data, to avoid corrupting a normal (non-magic) tag. For magic 'V3' tags this writes the UID configuration only and is repeatable; run `hf 15 cfinalize` afterwards to lock the UID permanently.",
|
||||
"notes": [
|
||||
"hf 15 csetuid -u E011223344556677 -> use gen1 command",
|
||||
"hf 15 csetuid -u E011223344556677 --v2 -> use gen2 command",
|
||||
|
||||
@@ -2716,7 +2716,7 @@ V3: blocks `0x14` and `0x15` hold a signature while the tag is not finalized.
|
||||
|
||||
```
|
||||
hf 15 raw -ac -d 022014 # A5 2B 44 2C
|
||||
hf 15 raw -ac -d 022015 # 21 AE 93 00 (69 E2 5D 00 after finalize)
|
||||
hf 15 raw -ac -d 022015 # 21 AE 93 00 (00 00 00 00 after finalize)
|
||||
```
|
||||
|
||||
|
||||
@@ -2765,7 +2765,10 @@ hf 15 raw -acw -d 02211077665544
|
||||
hf 15 raw -acw -d 022111332211E0
|
||||
```
|
||||
|
||||
Finalize locks the UID for good and can't be undone, block `0x15` changes to `69 E2 5D 00`:
|
||||
Finalize locks the UID for good and can't be undone. It clears the configuration
|
||||
blocks and changes the block numbering: on the tag tested, data written to block
|
||||
`0x38` before finalize read back at block `0x20` afterwards, a shift of `0x18`.
|
||||
User data is moved, not erased. Note down what is where before finalizing:
|
||||
|
||||
```
|
||||
hf 15 raw -acw -d 022114A52B442C
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
# Proxmark5 CEP — Flipper Zero link
|
||||
|
||||
The **CEP (Type-C Extended Port)** is the side USB-C port on the PM5 — the one
|
||||
**not** used for flashing/DFU. It lets a Flipper Zero, running the
|
||||
[Proxmark5_FlipperZero_FAP](https://github.com/RfidResearchGroup/Proxmark5_FlipperZero_FAP)
|
||||
app, talk to the PM5 over a one-shot UART handshake followed by standard PM3
|
||||
NG command/response frames carried over SPI. Everything below is **PM5-only**
|
||||
and is compiled in with the `CEP` platform extra.
|
||||
|
||||
See [GH issue #3667](https://github.com/RfidResearchGroup/proxmark3/issues/3667)
|
||||
for the full protocol writeup and open hardware-verification items.
|
||||
|
||||
## Contents
|
||||
|
||||
- [Build](#build)
|
||||
- [Physical hookup](#physical-hookup)
|
||||
- [What works today](#what-works-today)
|
||||
- [What doesn't (yet)](#what-doesnt-yet)
|
||||
- [Status / debugging](#status--debugging)
|
||||
- [Notes](#notes)
|
||||
|
||||
---
|
||||
|
||||
## Build
|
||||
|
||||
```
|
||||
make clean
|
||||
make PLATFORM=PM5 PLATFORM_EXTRAS=CEP
|
||||
make client # or your usual client build
|
||||
```
|
||||
|
||||
`CEP` is independent of `BWM` — both may be enabled together:
|
||||
|
||||
```
|
||||
make PLATFORM=PM5 PLATFORM_EXTRAS="BWM CEP"
|
||||
```
|
||||
|
||||
Or set it persistently in `Makefile.platform`:
|
||||
|
||||
```
|
||||
PLATFORM=PM5
|
||||
PLATFORM_EXTRAS=CEP
|
||||
```
|
||||
|
||||
> [!NOTE]
|
||||
> Without `PLATFORM_EXTRAS=CEP` the firmware ignores the Flipper entirely — the
|
||||
> CEP port stays inert, same as before this feature existed.
|
||||
|
||||
---
|
||||
|
||||
## Physical hookup
|
||||
|
||||
- Use the **side** USB-C port (the button-side port stays reserved for
|
||||
flashing/DFU).
|
||||
- Attach a Flipper Zero fitted with the Flipper transfer module/cable, running
|
||||
the Proxmark5_FlipperZero_FAP app.
|
||||
- The Flipper supplies 5V to the PM5 via USB OTG when the app launches.
|
||||
|
||||
---
|
||||
|
||||
## What works today
|
||||
|
||||
- The FAP handshake completing (app leaves "connecting").
|
||||
- Standard PM3 NG commands that don't touch the antenna frontend — `hw
|
||||
version`, `hw status`, memory/flash operations, etc.
|
||||
|
||||
## What doesn't (yet)
|
||||
|
||||
- Any RF operation over this link — `hf`/`lf` reads, the FAP's "Read Hitag2"
|
||||
menu item. These need the real PM5 FPGA/RF configuration, which isn't
|
||||
shipped in this repo. Tracked separately, out of scope for the CEP
|
||||
transport itself — see GH issue #3667.
|
||||
|
||||
---
|
||||
|
||||
## Status / debugging
|
||||
|
||||
- `hw status` reports a **CEP (Flipper) link** line: `attached` /
|
||||
`not attached`.
|
||||
- **Flipper side**: `./fbt cli` → `log debug`, then watch the
|
||||
`Proxmark5_COM` tag while the FAP runs.
|
||||
- **PM5 side**: keep the normal button-side USB-C cable attached to a PC
|
||||
running the standard client at the same time as the Flipper is on CEP —
|
||||
`Dbprintf()` output in the new CEP code surfaces there as usual, regardless
|
||||
of what's happening over CEP.
|
||||
|
||||
---
|
||||
|
||||
## Notes
|
||||
|
||||
- CEP uses its own reply-routing flag (`g_reply_via_cep`), independent of
|
||||
BWM's (`g_reply_via_fpc`) — this is what lets both transports run
|
||||
concurrently on hardware that has both fitted.
|
||||
- The SPI bit-order/clock-phase settings are a best-effort port from prior
|
||||
bring-up code, pending confirmation against real Flipper traffic (logic
|
||||
analyzer). If the handshake never completes, this is the first thing to
|
||||
check — see GH issue #3667.
|
||||
Reference in new issue
Block a user