From 967c2fe6f9491c2d78e39e1491237a65f46f8e42 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Fri, 28 Aug 2020 10:08:18 +0200 Subject: [PATCH] Q5/T5555 has a fix 06 first byte in the configblock. Thanks @mwalker33! --- client/src/cmdlfindala.c | 4 ++-- client/src/cmdlfjablotron.c | 2 +- client/src/cmdlfmotorola.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/src/cmdlfindala.c b/client/src/cmdlfindala.c index 4e9cf467b..7fd640378 100644 --- a/client/src/cmdlfindala.c +++ b/client/src/cmdlfindala.c @@ -604,7 +604,7 @@ static int CmdIndalaClone(const char *Cmd) { PrintAndLogEx(INFO, "RawID %s", sprint_hex(data, datalen)); if (is_t5555) - blocks[0] = T5555_SET_BITRATE(32) | T5555_MODULATION_PSK2 | (7 << T5555_MAXBLOCK_SHIFT); + blocks[0] = T5555_FIXED | T5555_SET_BITRATE(32) | T5555_MODULATION_PSK2 | (7 << T5555_MAXBLOCK_SHIFT); else blocks[0] = T55x7_BITRATE_RF_32 | T55x7_MODULATION_PSK2 | (7 << T55x7_MAXBLOCK_SHIFT); @@ -656,7 +656,7 @@ static int CmdIndalaClone(const char *Cmd) { PrintAndLogEx(INFO, "RawID %s", sprint_hex(data, datalen)); if (is_t5555) - blocks[0] = T5555_SET_BITRATE(32) | T5555_MODULATION_PSK1 | (2 << T5555_MAXBLOCK_SHIFT); + blocks[0] = T5555_FIXED | T5555_SET_BITRATE(32) | T5555_MODULATION_PSK1 | (2 << T5555_MAXBLOCK_SHIFT); else blocks[0] = T55x7_BITRATE_RF_32 | T55x7_MODULATION_PSK1 | (2 << T55x7_MAXBLOCK_SHIFT); diff --git a/client/src/cmdlfjablotron.c b/client/src/cmdlfjablotron.c index a2859fbb4..415e3e9af 100644 --- a/client/src/cmdlfjablotron.c +++ b/client/src/cmdlfjablotron.c @@ -154,7 +154,7 @@ static int CmdJablotronClone(const char *Cmd) { //Q5 if (tolower(param_getchar(Cmd, 1)) == 'q') - blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(64) | 2 << T5555_MAXBLOCK_SHIFT; + blocks[0] = T5555_FIXED | T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(64) | 2 << T5555_MAXBLOCK_SHIFT; // clearing the topbit needed for the preambl detection. if ((fullcode & 0x7FFFFFFFFF) != fullcode) { diff --git a/client/src/cmdlfmotorola.c b/client/src/cmdlfmotorola.c index 0a52f570a..5cad8028c 100644 --- a/client/src/cmdlfmotorola.c +++ b/client/src/cmdlfmotorola.c @@ -173,7 +173,7 @@ static int CmdMotorolaClone(const char *Cmd) { CLIParserFree(ctx); //TODO add selection of chip for Q5 or T55x7 - // data[0] = T5555_SET_BITRATE(32 | T5555_MODULATION_PSK1 | 2 << T5555_MAXBLOCK_SHIFT; + // data[0] = T5555_FIXED | T5555_SET_BITRATE(32 | T5555_MODULATION_PSK1 | 2 << T5555_MAXBLOCK_SHIFT; // config for Motorola 64 format (RF/32;PSK1 with RF/2; Maxblock=2) PrintAndLogEx(INFO, "Preparing to clone Motorola 64bit tag with RawID %s", sprint_hex(data, datalen));