diff --git a/CHANGELOG.md b/CHANGELOG.md index ff3a50309..bd984ee51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac ## [unreleased][unreleased] - Fixed `lf search`, `lf t55xx detect`, `data modulation` and the TI/Visa2000/ZX8211 demods leaking the saved graph and demod buffers on every call (@r3wretrhy) +- Updated the PM5 start guide (@innocentbystanderproxmark) - Fixed corrected `sim014.bin` references to `sim024.bin` as `sim014.bin` does not exist in this repo currently, thus removing some newbie confusion. (@innocentbystanderproxmark) - Added `A1856618` (an EM4305 anti-clone card password) to the `t55xx_default_pwds` dictionary used by `lf em 4x05 chk` (@nemanjan00) - Added `hw bwm ble` - the BWM's BLE settings: `on`/`off` (persisted radio switch), `pairing` (require a 6-digit passkey, LE Secure Connections; the module ships open), `forget` bonded devices, `txpower`, `status` (@Msprg) diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c index 618f2e04f..9af080e9e 100644 --- a/armsrc/iso15693.c +++ b/armsrc/iso15693.c @@ -2356,6 +2356,7 @@ void SimTagIso15693(const uint8_t *uid, uint8_t block_size) { // remove the CRC from the cmd cmd_len -= 2; recvLen = 0; + error = 0; // inventory mask mismatch left it set tag->expectFast = ((cmd[0] & ISO15_REQ_DATARATE_HIGH) == ISO15_REQ_DATARATE_HIGH); tag->expectFsk = ((cmd[0] & ISO15_REQ_SUBCARRIER_TWO) == ISO15_REQ_SUBCARRIER_TWO); diff --git a/doc/md/PM5_Start_Here/Getting_Started_With_PM5.md b/doc/md/PM5_Start_Here/Getting_Started_With_PM5.md index 3dcc7e403..8b99af022 100644 --- a/doc/md/PM5_Start_Here/Getting_Started_With_PM5.md +++ b/doc/md/PM5_Start_Here/Getting_Started_With_PM5.md @@ -61,6 +61,11 @@ For more options, look [here](#Build-Extras) * If you see 2 lights (B & D) go on and then OFF, you're in *DFU mode*. Unplug, and try the previous step again. * Run `./pm3-flash-bootrom` * If you see "🚨 The elf file is not applicable to the currently connected device.", you probably forgot to add `PLATFORM=PM5` in your `Makefile.platform` + * `./pm3-flash-bootrom` uses the repo version. + * `pm3-flash-bootrom` uses the system installed version. + * Using the wrong version can throw unexpected errors for the Proxmark5 like these: + * `[=] Permitted flash range: 0x08000000-0x08100000` + * `[!!] The elf file is not applicable to the currently connected device.` * If the above hangs or thows and error, try this: [DFU Install](#DFU-Install) * Unplug. @@ -202,3 +207,4 @@ Do not use them unless you fully understand what you're doing. - [PM5 Button Controller](./PM5_Controllers/PM5_Button_Controller_RM.md) - [PM5 RGB Controller](./PM5_Controllers/PM5_RGB_Controller_RM.md) - [PM5 BWM Install](https://github.com/RfidResearchGroup/Proxmark5_BWM_esp32/blob/master/INSTALL.md) +- [PM5 <--> Flipper Usage](./PM5-FLIPPER-USAGE.md) diff --git a/doc/md/PM5_Start_Here/PM5-FLIPPER-USAGE.md b/doc/md/PM5_Start_Here/PM5-FLIPPER-USAGE.md index aaa7f1992..f8801f7de 100644 --- a/doc/md/PM5_Start_Here/PM5-FLIPPER-USAGE.md +++ b/doc/md/PM5_Start_Here/PM5-FLIPPER-USAGE.md @@ -36,15 +36,19 @@ Build as usual, CEP is available by default. (`SKIP_CEP=1` to remove CEP support ## What works today - The FAP handshake completing (app leaves "connecting"). -- Standard commands that don't touch the antenna frontend — `hw - version`, `hw status`, memory/flash operations, etc. +- Standard commands — `hw version`, `hw status`, memory/flash operations, + `CMD_CEP_STATUS` (compact binary snapshot: CEP link state, BWM battery, + firmware version — feeds the FAP's Hardware Status dashboard). +- `hf`/`lf` reads in general, same as over USB, once the device's one-time + FPGA bitstream step is done (see `Getting_Started_With_PM5.md`) — CEP + itself doesn't block RF. ## 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. +- The FAP's "Read Hitag2" menu item specifically. Every attempt over CEP + replies `PM3_EFAILED` with stale cached UID data, even though the same + reader succeeds moments later over plain USB against the same tag. + Firmware-side, root cause open, out of scope for the CEP transport itself. --- @@ -64,7 +68,5 @@ Build as usual, CEP is available by default. (`SKIP_CEP=1` to remove CEP support ## Notes - CEP uses its own reply-routing flag (`g_reply_via_cep`). -- 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. +- SPI bit-order/clock-phase settings are confirmed correct against real + Flipper traffic (logic analyzer): MSB-first, mode 0, CS active-low.