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

Correction to Samyrun offline mode

Browse source 
update to Samyrun offline mode to support changes to HID ARM-side commands

This code has not yet been tested
This commit is contained in:
grauerfuchs 2018-09-13 06:30:26 -04:00 • committed by GitHub
commit 53e2f2fad1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
armsrc/appmain.c
View file

@ -649,7 +649,7 @@ void SamyRun()
StandAloneMode(); StandAloneMode();
FpgaDownloadAndGo(FPGA_BITSTREAM_LF); FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
int high[OPTS], low[OPTS]; int tops[OPTS], high[OPTS], low[OPTS];
int selected = 0; int selected = 0;
int playing = 0; int playing = 0;
int cardRead = 0; int cardRead = 0;
@ -683,7 +683,10 @@ void SamyRun()
/* need this delay to prevent catching some weird data */ /* need this delay to prevent catching some weird data */
SpinDelay(500); SpinDelay(500);
CmdHIDdemodFSK(1, &high[selected], &low[selected], 0); CmdHIDdemodFSK(1, &tops[selected], &high[selected], &low[selected], 0);
if (tops[selected] > 0)
Dbprintf("Recorded %x %x%08x%08x", selected, tops[selected], high[selected], low[selected]);
else
Dbprintf("Recorded %x %x%08x", selected, high[selected], low[selected]); Dbprintf("Recorded %x %x%08x", selected, high[selected], low[selected]);
LEDsoff(); LEDsoff();
@ -705,6 +708,9 @@ void SamyRun()
LED(LED_ORANGE, 0); LED(LED_ORANGE, 0);
// record // record
if (tops[selected] > 0)
Dbprintf("Cloning %x %x%08x%08x", selected, tops[selected], high[selected], low[selected]);
else
Dbprintf("Cloning %x %x%08x", 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
@ -714,7 +720,10 @@ 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(0, high[selected], low[selected], 0); CopyHIDtoT55x7(tops[selected] & 0x000FFFFF, high[selected], low[selected], (tops[selected] != 0 && ((high[selected]& 0xFFFFFFC0) != 0)));
if (tops[selected] > 0)
Dbprintf("Cloned %x %x%08x%08x", selected, tops[selected], high[selected], low[selected]);
else
Dbprintf("Cloned %x %x%08x", selected, high[selected], low[selected]); Dbprintf("Cloned %x %x%08x", selected, high[selected], low[selected]);
LEDsoff(); LEDsoff();
@ -748,8 +757,12 @@ void SamyRun()
// wait for button to be released // wait for button to be released
while(BUTTON_PRESS()) while(BUTTON_PRESS())
WDT_HIT(); WDT_HIT();
if (tops[selected] > 0)
Dbprintf("%x %x%08x%08x", selected, tops[selected], high[selected], low[selected]);
else
Dbprintf("%x %x%08x", selected, high[selected], low[selected]); Dbprintf("%x %x%08x", selected, high[selected], low[selected]);
CmdHIDsimTAG(high[selected], low[selected], 0);
CmdHIDsimTAG(tops[selected], high[selected], low[selected], 0);
DbpString("Done playing"); DbpString("Done playing");
if (BUTTON_HELD(1000) > 0) if (BUTTON_HELD(1000) > 0)
{ {