diff --git a/CHANGELOG.md b/CHANGELOG.md index 44f0c9c16..2aa056743 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac - Added `hw powersave` - PM5 low-power idle, on by default: between commands the core drops to 48 MHz with the PLL off, the FPGA clock stopped and the CPU halted (WFI); USB now runs crystal-less off HICK. Ported from the Fantasi firmware (@Msprg) - Fixed `lf t55xx dump -p` - reuses the password already confirmed by `lf t55xx detect` (@iceman1001) - Fixed `lf t55xx p1detect`, `lf search` - T5577 clones with a non-Atmel manufacturer byte now recognised (@iceman1001) -- Added `PLATFORM_EXTRAS=CEP` on PM5 - wires up the Flipper Zero link on the Type-C extended port (handshake + NG frames over SPI, independent transport flag so it can run alongside BWM); RF-dependent functionality still needs the FPGA side, tracked in #3667 (@TomHarkness) +- Added Flipper Zero link on PM5's Type-C extended port (handshake + NG frames over SPI) - on by default, `PLATFORM_EXTRAS=SKIP_CEP` to disable, independent so it can run alongside BWM; RF-dependent functionality still needs the FPGA side, tracked in #3667 (@TomHarkness) - Fixed `hf mf autopwn` on FM11RF08S - static encrypted nonce is now detected via the backdoor key (@iceman1001) - Added `hf mfu view -v` - prints the UL-C 3DES key or UL-AES key stored in the dump file (@iceman1001) - Added `hf mf sen --ns` - skip writing the key and dump files (@iceman1001) diff --git a/common_arm/Makefile.hal b/common_arm/Makefile.hal index bf1f8f2a6..39321caf2 100644 --- a/common_arm/Makefile.hal +++ b/common_arm/Makefile.hal @@ -50,7 +50,7 @@ Known definitions: +--------------------------------------------+ | BWM | PM5 Battery Wireless Mod | +--------------------------------------------+ -| CEP | PM5 Flipper Zero (CEP) | +| SKIP_CEP | PM5 disable Flipper Zero (CEP)| +--------------------------------------------+ | NO_LOWBATT_BEEP | PM5 disable low-batt beep| +--------------------------------------------+ @@ -187,7 +187,7 @@ else ifeq ($(PLATFORM),PM5) FPGA_BITSTREAMS = fpga_pm3_hf.bit # TODO DXL 虽然可以不把打包比特流,但是还是得把FPGA的版本信息给生成,让EXE依赖。 SKIP_FPGA_EMBED = true # important!!! disable the fpga bit files pack to arm! SKIP_COMPRESSION = true # Skip data section compress. The new mcu has enough flash space. - PLATFORM_DEFS = -DWITH_FLASH -DPM5 -DCHIP_AT32F435_37 # TODO 暂时不要编译i2c -DWITH_SMARTCARD + PLATFORM_DEFS = -DWITH_FLASH -DPM5 -DCHIP_AT32F435_37 -DWITH_CEP # TODO 暂时不要编译i2c -DWITH_SMARTCARD PLTNAME = Proxmark5 PLATFORM_FPGA = GW1NR-LV2MG49GC6/i5 else @@ -229,14 +229,13 @@ ifneq (,$(findstring BWM,$(PLATFORM_EXTRAS_TMP))) PLATFORM_DEFS += -DWITH_BWM_FORWARD -DWITH_BWM_STATUS -DWITH_PM5_PWR_LED -DWITH_PM5_AUTOOFF -DWITH_BWM_LOWBATT_BEEP -DWITH_PM5_LOWBATT_SHUTDOWN PLATFORM_EXTRAS_TMP := $(strip $(filter-out BWM,$(PLATFORM_EXTRAS_TMP))) endif -# Flipper Zero over the Type-C extended port (CEP). Independent of BWM - both -# may be enabled together (unlike e.g. BTADDON/FPC_USART_DEV above). -ifneq (,$(findstring CEP,$(PLATFORM_EXTRAS_TMP))) +# CEP is on by default for PM5 (Flipper Zero USB link); SKIP_CEP disables it +ifneq (,$(findstring SKIP_CEP,$(PLATFORM_EXTRAS_TMP))) ifneq ($(PLATFORM),PM5) - $(error PLATFORM_EXTRAS token CEP is only valid on PLATFORM=PM5) + $(error PLATFORM_EXTRAS token SKIP_CEP is only valid on PLATFORM=PM5) endif - PLATFORM_DEFS += -DWITH_CEP - PLATFORM_EXTRAS_TMP := $(strip $(filter-out CEP,$(PLATFORM_EXTRAS_TMP))) + PLATFORM_DEFS := $(filter-out -DWITH_CEP,$(PLATFORM_DEFS)) + PLATFORM_EXTRAS_TMP := $(strip $(filter-out SKIP_CEP,$(PLATFORM_EXTRAS_TMP))) endif ifneq (,$(findstring NO_LOWBATT_SHUTDOWN,$(PLATFORM_EXTRAS_TMP))) ifneq ($(PLATFORM),PM5) diff --git a/doc/md/PM5_Start_Here/PM5-FLIPPER-USAGE.md b/doc/md/PM5_Start_Here/PM5-FLIPPER-USAGE.md index 5e1271409..c6ea1ea0f 100644 --- a/doc/md/PM5_Start_Here/PM5-FLIPPER-USAGE.md +++ b/doc/md/PM5_Start_Here/PM5-FLIPPER-USAGE.md @@ -5,7 +5,7 @@ The **CEP (Type-C Extended Port)** is the side USB-C port on the PM5 — the one [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. +and is compiled in by default when building for PM5. See [GH issue #3667](https://github.com/RfidResearchGroup/proxmark3/issues/3667) for the full protocol writeup and open hardware-verification items. @@ -25,26 +25,27 @@ for the full protocol writeup and open hardware-verification items. ``` make clean -make PLATFORM=PM5 PLATFORM_EXTRAS=CEP +make PLATFORM=PM5 make client # or your usual client build ``` -`CEP` is independent of `BWM` — both may be enabled together: +CEP is independent of `BWM` — disable it with `SKIP_CEP` if you don't want it, +with or without BWM: ``` -make PLATFORM=PM5 PLATFORM_EXTRAS="BWM CEP" +make PLATFORM=PM5 PLATFORM_EXTRAS="BWM SKIP_CEP" ``` Or set it persistently in `Makefile.platform`: ``` PLATFORM=PM5 -PLATFORM_EXTRAS=CEP +PLATFORM_EXTRAS=SKIP_CEP ``` > [!NOTE] -> Without `PLATFORM_EXTRAS=CEP` the firmware ignores the Flipper entirely — the -> CEP port stays inert, same as before this feature existed. +> With `PLATFORM_EXTRAS=SKIP_CEP` the firmware ignores the Flipper entirely — +> the CEP port stays inert, same as before this feature existed. --- diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h index 33f0564ce..e5c0c4303 100644 --- a/include/pm3_cmd.h +++ b/include/pm3_cmd.h @@ -289,7 +289,7 @@ typedef struct { bool compiled_with_bwm : 1; // PM5 built with PLATFORM_EXTRAS=BWM (battery/wireless module) // Appended in version 13. - bool compiled_with_cep : 1; // PM5 built with PLATFORM_EXTRAS=CEP (Flipper Zero, Type-C extended port) + bool compiled_with_cep : 1; // PM5 built with WITH_CEP (Flipper Zero, Type-C extended port; on by default, SKIP_CEP to disable) } PACKED capabilities_t; // Bump this whenever a command payload changes shape, so a mismatched client and // firmware refuse to talk instead of misparsing each other.