From d7ed0d5a965526f28968a268177ad6691a986b1a Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sat, 29 Aug 2026 11:28:29 +0200 Subject: [PATCH] NG: convert CMD_LF_T55XX_SET_CONFIG to t55xx_setconfig_t --- CHANGELOG.md | 1 + armsrc/appmain.c | 8 +++- armsrc/lfops.c | 4 +- armsrc/lfops.h | 2 +- client/src/cmdlft55xx.c | 91 ++++++++++++++++++++++++----------------- include/pm3_cmd.h | 10 +++++ 6 files changed, 75 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc6d8fdd2..f48b9a860 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file. This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log... ## [unreleased][unreleased] +- Change NG: convert CMD_LF_T55XX_SET_CONFIG to t55xx_setconfig_t (@iceman1001) - Added a new ISo15693 v5 dump file format to handle 0x100 number of pages and 8 byte pages better (@iceman1001) - Fixed ISO15693 v4 file handling and converting to v5 (@iceman1001) - Fixed clock `SpinDelayUsPrecision` to not wrap. Now more 43ms issues (@iceman1001) diff --git a/armsrc/appmain.c b/armsrc/appmain.c index f21931ce8..25116a35a 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -1275,7 +1275,13 @@ static void PacketReceived(PacketCommandNG *packet) { } #ifdef WITH_LF case CMD_LF_T55XX_SET_CONFIG: { - setT55xxConfig(packet->oldarg[0], (t55xx_configurations_t *) packet->data.asBytes); + if (packet->length != sizeof(t55xx_setconfig_t)) { + reply_ng(CMD_LF_T55XX_SET_CONFIG, PM3_EINVARG, NULL, 0); + break; + } + const t55xx_setconfig_t *payload = (const t55xx_setconfig_t *)packet->data.asBytes; + setT55xxConfig(payload->persist, &payload->conf); + reply_ng(CMD_LF_T55XX_SET_CONFIG, PM3_SUCCESS, NULL, 0); break; } case CMD_LF_SAMPLING_PRINT_CONFIG: { diff --git a/armsrc/lfops.c b/armsrc/lfops.c index 776dd5907..d4b2ebdda 100644 --- a/armsrc/lfops.c +++ b/armsrc/lfops.c @@ -288,7 +288,7 @@ void printT55xxConfig(void) { DbpString(""); } -void setT55xxConfig(uint8_t arg0, const t55xx_configurations_t *c) { +void setT55xxConfig(uint8_t persist, const t55xx_configurations_t *c) { for (uint8_t i = 0; i < 4; i++) { if (c->m[i].start_gap != 0) T55xx_Timing.m[i].start_gap = c->m[i].start_gap; @@ -321,7 +321,7 @@ void setT55xxConfig(uint8_t arg0, const t55xx_configurations_t *c) { #ifdef WITH_FLASH // shall persist to flashmem - if (arg0 == 0) { + if (persist == 0) { BigBuf_free(); return; } diff --git a/armsrc/lfops.h b/armsrc/lfops.h index c8566d7ce..3e14175e6 100644 --- a/armsrc/lfops.h +++ b/armsrc/lfops.h @@ -80,7 +80,7 @@ void EM4xProtectWord(uint32_t data, uint32_t pwd, uint8_t usepwd, bool ledcontro void cotag_start_pulse(void); void Cotag(uint32_t arg0, bool ledcontrol); -void setT55xxConfig(uint8_t arg0, const t55xx_configurations_t *c); +void setT55xxConfig(uint8_t persist, const t55xx_configurations_t *c); t55xx_configurations_t *getT55xxConfig(void); void printT55xxConfig(void); void loadT55xxConfig(void); diff --git a/client/src/cmdlft55xx.c b/client/src/cmdlft55xx.c index 9a51b567e..2d331edd0 100644 --- a/client/src/cmdlft55xx.c +++ b/client/src/cmdlft55xx.c @@ -4727,57 +4727,74 @@ static int CmdT55xxSetDeviceConfig(const char *Cmd) { else if (r3) downlink_mode = ref1of4; - t55xx_configurations_t configurations = {{{0}, {0}, {0}, {0}}}; + t55xx_setconfig_t payload = { + .conf = {{{0}, {0}, {0}, {0}}}, + .persist = (shall_persist) ? 1 : 0, + .rfu = 0, + }; if (set_defaults) { // fixed bit length - configurations.m[T55XX_DLMODE_FIXED].start_gap = 29 * 8; - configurations.m[T55XX_DLMODE_FIXED].write_gap = 17 * 8; - configurations.m[T55XX_DLMODE_FIXED].write_0 = 15 * 8; - configurations.m[T55XX_DLMODE_FIXED].write_1 = 47 * 8; - configurations.m[T55XX_DLMODE_FIXED].read_gap = 15 * 8; - configurations.m[T55XX_DLMODE_FIXED].write_2 = 0; - configurations.m[T55XX_DLMODE_FIXED].write_3 = 0; + payload.conf.m[T55XX_DLMODE_FIXED].start_gap = 29 * 8; + payload.conf.m[T55XX_DLMODE_FIXED].write_gap = 17 * 8; + payload.conf.m[T55XX_DLMODE_FIXED].write_0 = 15 * 8; + payload.conf.m[T55XX_DLMODE_FIXED].write_1 = 47 * 8; + payload.conf.m[T55XX_DLMODE_FIXED].read_gap = 15 * 8; + payload.conf.m[T55XX_DLMODE_FIXED].write_2 = 0; + payload.conf.m[T55XX_DLMODE_FIXED].write_3 = 0; // long leading reference - configurations.m[T55XX_DLMODE_LLR].start_gap = 29 * 8; - configurations.m[T55XX_DLMODE_LLR].write_gap = 17 * 8; - configurations.m[T55XX_DLMODE_LLR].write_0 = 15 * 8; - configurations.m[T55XX_DLMODE_LLR].write_1 = 47 * 8; - configurations.m[T55XX_DLMODE_LLR].read_gap = 15 * 8; - configurations.m[T55XX_DLMODE_LLR].write_2 = 0; - configurations.m[T55XX_DLMODE_LLR].write_3 = 0; + payload.conf.m[T55XX_DLMODE_LLR].start_gap = 29 * 8; + payload.conf.m[T55XX_DLMODE_LLR].write_gap = 17 * 8; + payload.conf.m[T55XX_DLMODE_LLR].write_0 = 15 * 8; + payload.conf.m[T55XX_DLMODE_LLR].write_1 = 47 * 8; + payload.conf.m[T55XX_DLMODE_LLR].read_gap = 15 * 8; + payload.conf.m[T55XX_DLMODE_LLR].write_2 = 0; + payload.conf.m[T55XX_DLMODE_LLR].write_3 = 0; // leading zero - configurations.m[T55XX_DLMODE_LEADING_ZERO].start_gap = 29 * 8; - configurations.m[T55XX_DLMODE_LEADING_ZERO].write_gap = 17 * 8; - configurations.m[T55XX_DLMODE_LEADING_ZERO].write_0 = 15 * 8; - configurations.m[T55XX_DLMODE_LEADING_ZERO].write_1 = 40 * 8; - configurations.m[T55XX_DLMODE_LEADING_ZERO].read_gap = 15 * 8; - configurations.m[T55XX_DLMODE_LEADING_ZERO].write_2 = 0; - configurations.m[T55XX_DLMODE_LEADING_ZERO].write_3 = 0; + payload.conf.m[T55XX_DLMODE_LEADING_ZERO].start_gap = 29 * 8; + payload.conf.m[T55XX_DLMODE_LEADING_ZERO].write_gap = 17 * 8; + payload.conf.m[T55XX_DLMODE_LEADING_ZERO].write_0 = 15 * 8; + payload.conf.m[T55XX_DLMODE_LEADING_ZERO].write_1 = 40 * 8; + payload.conf.m[T55XX_DLMODE_LEADING_ZERO].read_gap = 15 * 8; + payload.conf.m[T55XX_DLMODE_LEADING_ZERO].write_2 = 0; + payload.conf.m[T55XX_DLMODE_LEADING_ZERO].write_3 = 0; // 1 of 4 coding reference - configurations.m[T55XX_DLMODE_1OF4].start_gap = 29 * 8; - configurations.m[T55XX_DLMODE_1OF4].write_gap = 17 * 8; - configurations.m[T55XX_DLMODE_1OF4].write_0 = 15 * 8; - configurations.m[T55XX_DLMODE_1OF4].write_1 = 31 * 8; - configurations.m[T55XX_DLMODE_1OF4].read_gap = 15 * 8; - configurations.m[T55XX_DLMODE_1OF4].write_2 = 47 * 8; - configurations.m[T55XX_DLMODE_1OF4].write_3 = 63 * 8; + payload.conf.m[T55XX_DLMODE_1OF4].start_gap = 29 * 8; + payload.conf.m[T55XX_DLMODE_1OF4].write_gap = 17 * 8; + payload.conf.m[T55XX_DLMODE_1OF4].write_0 = 15 * 8; + payload.conf.m[T55XX_DLMODE_1OF4].write_1 = 31 * 8; + payload.conf.m[T55XX_DLMODE_1OF4].read_gap = 15 * 8; + payload.conf.m[T55XX_DLMODE_1OF4].write_2 = 47 * 8; + payload.conf.m[T55XX_DLMODE_1OF4].write_3 = 63 * 8; } else { - configurations.m[downlink_mode].start_gap = startgap * 8; - configurations.m[downlink_mode].write_gap = writegap * 8; - configurations.m[downlink_mode].write_0 = write0 * 8; - configurations.m[downlink_mode].write_1 = write1 * 8; - configurations.m[downlink_mode].read_gap = readgap * 8; - configurations.m[downlink_mode].write_2 = write2 * 8; - configurations.m[downlink_mode].write_3 = write3 * 8; + payload.conf.m[downlink_mode].start_gap = startgap * 8; + payload.conf.m[downlink_mode].write_gap = writegap * 8; + payload.conf.m[downlink_mode].write_0 = write0 * 8; + payload.conf.m[downlink_mode].write_1 = write1 * 8; + payload.conf.m[downlink_mode].read_gap = readgap * 8; + payload.conf.m[downlink_mode].write_2 = write2 * 8; + payload.conf.m[downlink_mode].write_3 = write3 * 8; } clearCommandBuffer(); - SendCommandMIX(CMD_LF_T55XX_SET_CONFIG, shall_persist, 0, 0, &configurations, sizeof(t55xx_configurations_t)); + SendCommandNG(CMD_LF_T55XX_SET_CONFIG, (uint8_t *)&payload, sizeof(payload)); + + PacketResponseNG resp; + if (WaitForResponseTimeout(CMD_LF_T55XX_SET_CONFIG, &resp, 2000) == false) { + PrintAndLogEx(WARNING, "timeout while waiting for reply"); + return PM3_ETIMEOUT; + } + + if (resp.status != PM3_SUCCESS) { + PrintAndLogEx(FAILED, "Setting timings ( " _RED_("fail") " )"); + return resp.status; + } + + PrintAndLogEx(SUCCESS, "Setting timings ( " _GREEN_("ok") " )"); return PM3_SUCCESS; } diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h index 739c6b0c4..062edcb38 100644 --- a/include/pm3_cmd.h +++ b/include/pm3_cmd.h @@ -206,6 +206,16 @@ typedef struct { t55xx_config_t m[4]; // mode } t55xx_configurations_t; +// T55XX - CMD_LF_T55XX_SET_CONFIG payload +// Not PACKED on purpose: `conf` is uint16_t based and must stay 2-byte aligned for +// the ARM7TDMI, which has no unaligned access. The explicit `rfu` byte keeps the +// size at 58 with no implicit padding, so the layout is identical on both ends. +typedef struct { + t55xx_configurations_t conf; + uint8_t persist; // save the timings to flash memory + uint8_t rfu; +} t55xx_setconfig_t; + // Capabilities struct to keep track of what functions was compiled in the device firmware typedef struct { uint8_t version;