From 7259a27f05072576c13354ab9b5f4850fabac19a Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Sat, 6 Apr 2019 22:04:02 +0200 Subject: [PATCH] Change printT55xxBlock API --- client/cmdlft55xx.c | 8 +++----- client/cmdlft55xx.h | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index 61507cea4..835df18f2 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -379,9 +379,7 @@ int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32 if (!AquireData(page1, block, usepwd, password)) return 0; if (!DecodeT55xxBlock()) return 0; - char blk[10] = {0}; - sprintf(blk, "%02d", block); - printT55xxBlock(blk); + printT55xxBlock(block); return 1; } @@ -777,7 +775,7 @@ bool GetT55xxBlockData(uint32_t *blockdata) { return true; } -void printT55xxBlock(const char *blockNum) { +void printT55xxBlock(uint8_t blockNum) { uint32_t blockData = 0; uint8_t bytes[4] = {0}; @@ -787,7 +785,7 @@ void printT55xxBlock(const char *blockNum) { num_to_bytes(blockData, 4, bytes); - PrintAndLogEx(NORMAL, " %s | %08X | %s | %s", blockNum, blockData, sprint_bin(DemodBuffer + config.offset, 32), sprint_ascii(bytes, 4)); + PrintAndLogEx(NORMAL, " %02d | %08X | %s | %s", blockNum, blockData, sprint_bin(DemodBuffer + config.offset, 32), sprint_ascii(bytes, 4)); } bool testModulation(uint8_t mode, uint8_t modread) { diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h index dca8c6f39..71526b997 100644 --- a/client/cmdlft55xx.h +++ b/client/cmdlft55xx.h @@ -157,7 +157,7 @@ char *GetModulationStr(uint32_t id, bool xmode); char *GetModelStrFromCID(uint32_t cid); char *GetSelectedModulationStr(uint8_t id); void printT5xxHeader(uint8_t page); -void printT55xxBlock(const char *demodStr); +void printT55xxBlock(uint8_t blockNum); int printConfiguration(t55xx_conf_block_t b); int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32_t password);