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

chg: minor changes to text, explaining current implementation for "lf pyramid clone/sim" only works for 26bits.

Browse source
This commit is contained in:
iceman1001 2016-02-27 12:12:05 +01:00
commit 69c4516d32
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
armsrc/lfops.c
View file

@ -1259,7 +1259,6 @@ void T55xxWakeUp(uint32_t Pwd){
} }
/*-------------- Cloning routines -----------*/ /*-------------- Cloning routines -----------*/
void WriteT55xx(uint32_t *blockdata, uint8_t startblock, uint8_t numblocks) { void WriteT55xx(uint32_t *blockdata, uint8_t startblock, uint8_t numblocks) {
// write last block first and config block last (if included) // write last block first and config block last (if included)
for (uint8_t i = numblocks+startblock; i > startblock; i--) for (uint8_t i = numblocks+startblock; i > startblock; i--)

11
client/cmdlfpyramid.c
View file

@ -13,7 +13,8 @@ static int CmdHelp(const char *Cmd);
int usage_lf_pyramid_clone(void){ int usage_lf_pyramid_clone(void){
PrintAndLog("clone a Farpointe/Pyramid tag to a T55x7 tag."); 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("");
PrintAndLog("Usage: lf pyramid clone <Facility-Code> <Card-Number>"); PrintAndLog("Usage: lf pyramid clone <Facility-Code> <Card-Number>");
PrintAndLog("Options :"); PrintAndLog("Options :");
@ -27,7 +28,8 @@ int usage_lf_pyramid_clone(void){
int usage_lf_pyramid_sim(void) { int usage_lf_pyramid_sim(void) {
PrintAndLog("Enables simulation of Farpointe/Pyramid card with specified card number."); 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("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("");
PrintAndLog("Usage: lf pyramid sim <Card-Number>"); PrintAndLog("Usage: lf pyramid sim <Card-Number>");
PrintAndLog("Options :"); PrintAndLog("Options :");
@ -38,6 +40,8 @@ int usage_lf_pyramid_sim(void) {
return 0; return 0;
} }
// Works for 26bits.
int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) { int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
uint8_t pre[128]; uint8_t pre[128];
@ -70,11 +74,8 @@ int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
} }
int CmdPyramidRead(const char *Cmd) { int CmdPyramidRead(const char *Cmd) {
// read lf silently
CmdLFRead("s"); CmdLFRead("s");
// get samples silently
getSamples("30000",false); getSamples("30000",false);
// demod and output Pyramid ID
return CmdFSKdemodPyramid(""); return CmdFSKdemodPyramid("");
} }