github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 13:00:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Change printT55xxBlock API

Browse source
This commit is contained in:
Philippe Teuwen 2019-04-06 22:04:02 +02:00
commit 7259a27f05
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/cmdlft55xx.c
View file

@ -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 (!AquireData(page1, block, usepwd, password)) return 0;
if (!DecodeT55xxBlock()) return 0; if (!DecodeT55xxBlock()) return 0;
char blk[10] = {0}; printT55xxBlock(block);
sprintf(blk, "%02d", block);
printT55xxBlock(blk);
return 1; return 1;
} }
@ -777,7 +775,7 @@ bool GetT55xxBlockData(uint32_t *blockdata) {
return true; return true;
} }
void printT55xxBlock(const char *blockNum) { void printT55xxBlock(uint8_t blockNum) {
uint32_t blockData = 0; uint32_t blockData = 0;
uint8_t bytes[4] = {0}; uint8_t bytes[4] = {0};
@ -787,7 +785,7 @@ void printT55xxBlock(const char *blockNum) {
num_to_bytes(blockData, 4, bytes); 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) { bool testModulation(uint8_t mode, uint8_t modread) {

2
client/cmdlft55xx.h
View file

@ -157,7 +157,7 @@ char *GetModulationStr(uint32_t id, bool xmode);
char *GetModelStrFromCID(uint32_t cid); char *GetModelStrFromCID(uint32_t cid);
char *GetSelectedModulationStr(uint8_t id); char *GetSelectedModulationStr(uint8_t id);
void printT5xxHeader(uint8_t page); void printT5xxHeader(uint8_t page);
void printT55xxBlock(const char *demodStr); void printT55xxBlock(uint8_t blockNum);
int printConfiguration(t55xx_conf_block_t b); int printConfiguration(t55xx_conf_block_t b);
int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32_t password); int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32_t password);