github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-29 19:18:35 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #160 from marshmellow42/master

Browse source 
lf viking and standalone bug fixes
This commit is contained in:
Martin Holst Swende 2016-02-15 18:39:42 +01:00
commit b5cefff12c
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
armsrc/appmain.c
View file

@ -662,7 +662,7 @@ void SamyRun()
SpinDelay(500); SpinDelay(500);
CmdHIDdemodFSK(1, &high[selected], &low[selected], 0); CmdHIDdemodFSK(1, &high[selected], &low[selected], 0);
Dbprintf("Recorded %x %x %x", selected, high[selected], low[selected]); Dbprintf("Recorded %x %x%08x", selected, high[selected], low[selected]);
LEDsoff(); LEDsoff();
LED(selected + 1, 0); LED(selected + 1, 0);
@ -683,7 +683,7 @@ void SamyRun()
LED(LED_ORANGE, 0); LED(LED_ORANGE, 0);
// record // record
Dbprintf("Cloning %x %x %x", selected, high[selected], low[selected]); Dbprintf("Cloning %x %x%08x", selected, high[selected], low[selected]);
// wait for button to be released // wait for button to be released
while(BUTTON_PRESS()) while(BUTTON_PRESS())
@ -692,8 +692,8 @@ void SamyRun()
/* need this delay to prevent catching some weird data */ /* need this delay to prevent catching some weird data */
SpinDelay(500); SpinDelay(500);
CopyHIDtoT55x7(high[selected], low[selected], 0, 0); CopyHIDtoT55x7(0, high[selected], low[selected], 0);
Dbprintf("Cloned %x %x %x", selected, high[selected], low[selected]); Dbprintf("Cloned %x %x%08x", selected, high[selected], low[selected]);
LEDsoff(); LEDsoff();
LED(selected + 1, 0); LED(selected + 1, 0);
@ -726,7 +726,7 @@ void SamyRun()
// wait for button to be released // wait for button to be released
while(BUTTON_PRESS()) while(BUTTON_PRESS())
WDT_HIT(); WDT_HIT();
Dbprintf("%x %x %x", selected, high[selected], low[selected]); Dbprintf("%x %x%08x", selected, high[selected], low[selected]);
CmdHIDsimTAG(high[selected], low[selected], 0); CmdHIDsimTAG(high[selected], low[selected], 0);
DbpString("Done playing"); DbpString("Done playing");
if (BUTTON_HELD(1000) > 0) if (BUTTON_HELD(1000) > 0)

4
client/cmdlfviking.c
View file

@ -74,8 +74,8 @@ int CmdVikingClone(const char *Cmd) {
Q5 = true; Q5 = true;
rawID = getVikingBits(id); rawID = getVikingBits(id);
PrintAndLog("Cloning - ID: %08X, Raw: %08X%08X",id,(uint32_t)(rawID >> 32),(uint32_t) (rawID & 0xFFFFFFFF));
UsbCommand c = {CMD_VIKING_CLONE_TAG,{rawID >> 32, rawID & 0xFFFF, Q5}}; UsbCommand c = {CMD_VIKING_CLONE_TAG,{rawID >> 32, rawID & 0xFFFFFFFF, Q5}};
clearCommandBuffer(); clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
//check for ACK //check for ACK