From: iceman1001 Date: Sat, 27 Feb 2016 11:12:05 +0000 (+0100) Subject: chg: minor changes to text, explaining current implementation for "lf pyramid clone... X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/69c4516d32bdd01a5220d7e25dc41b3922a46bb4 chg: minor changes to text, explaining current implementation for "lf pyramid clone/sim" only works for 26bits. --- diff --git a/armsrc/lfops.c b/armsrc/lfops.c index 2e2cfd57..7f61c78d 100644 --- a/armsrc/lfops.c +++ b/armsrc/lfops.c @@ -1259,7 +1259,6 @@ void T55xxWakeUp(uint32_t Pwd){ } /*-------------- Cloning routines -----------*/ - void WriteT55xx(uint32_t *blockdata, uint8_t startblock, uint8_t numblocks) { // write last block first and config block last (if included) for (uint8_t i = numblocks+startblock; i > startblock; i--) diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c index 3e94ce44..d1b8f6b8 100644 --- a/client/cmdlfpyramid.c +++ b/client/cmdlfpyramid.c @@ -13,7 +13,8 @@ static int CmdHelp(const char *Cmd); int usage_lf_pyramid_clone(void){ PrintAndLog("clone a Farpointe/Pyramid tag to a T55x7 tag."); - PrintAndLog("Per pyramid format, the facility-code is 8-bit and the card number is 16-bit. Larger values are truncated."); + PrintAndLog("The facility-code is 8-bit and the card number is 16-bit. Larger values are truncated. "); + PrintAndLog("Currently work only on 26bit"); PrintAndLog(""); PrintAndLog("Usage: lf pyramid clone "); PrintAndLog("Options :"); @@ -27,7 +28,8 @@ int usage_lf_pyramid_clone(void){ int usage_lf_pyramid_sim(void) { PrintAndLog("Enables simulation of Farpointe/Pyramid card with specified card number."); PrintAndLog("Simulation runs until the button is pressed or another USB command is issued."); - PrintAndLog("Per pyramid format, the facility-code is 8-bit and the card number is 16-bit. Larger values are truncated."); + PrintAndLog("The facility-code is 8-bit and the card number is 16-bit. Larger values are truncated."); + PrintAndLog("Currently work only on 26bit"); PrintAndLog(""); PrintAndLog("Usage: lf pyramid sim "); PrintAndLog("Options :"); @@ -38,6 +40,8 @@ int usage_lf_pyramid_sim(void) { return 0; } + +// Works for 26bits. int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) { uint8_t pre[128]; @@ -70,11 +74,8 @@ int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) { } int CmdPyramidRead(const char *Cmd) { - // read lf silently CmdLFRead("s"); - // get samples silently getSamples("30000",false); - // demod and output Pyramid ID return CmdFSKdemodPyramid(""); }