github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-22 14:23:50 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/iceman1001/proxmark3

Browse source
This commit is contained in:
iceman 2016-01-13 12:33:09 +01:00
commit f10646ef74
3 changed files with 90 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/cmdhfmf.c
View file

@ -102,7 +102,7 @@ start:
}
t1 = clock() - t1;
if ( t1 > 0 ){
PrintAndLog("Time in darkside: %.0f ticks - %4.2f sec\n (%u)", (float)t1, ((float)t1)/CLOCKS_PER_SEC, CLOCKS_PER_SEC);
PrintAndLog("Time in darkside: %.0f ticks - %4.2f sec\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC);
}
return 0;
}

19
client/flasher.c
View file

@ -30,9 +30,10 @@ void cmd_debug(UsbCommand* UC) {
printf(" arg1[len=%zd]: %016"llx"\n",sizeof(UC->arg[1]),UC->arg[1]);
printf(" arg2[len=%zd]: %016"llx"\n",sizeof(UC->arg[2]),UC->arg[2]);
printf(" data[len=%zd]: ",sizeof(UC->d.asBytes));
for (size_t i=0; i<16; i++) {
for (size_t i=0; i<16; i++)
printf("%02x",UC->d.asBytes[i]);
}
printf("...\n");
}
@ -69,10 +70,11 @@ void CloseProxmark() {
int OpenProxmark(size_t i) {
sp = uart_open(serial_port_name);
if (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT) {
//poll once a second
if (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT)
return 0;
}
return 1;
}
@ -83,9 +85,14 @@ static void usage(char *argv0)
//Is the example below really true? /Martin
fprintf(stderr, "Example:\n\n\t %s path/to/osimage.elf path/to/fpgaimage.elf\n", argv0);
fprintf(stderr, "\nExample (Linux):\n\n\t %s /dev/ttyACM0 armsrc/obj/fullimage.elf\n", argv0);
fprintf(stderr, "\nExample (OS) :\n\n\t %s /dev/cu.usbmodem1451 armsrc/obj/fullimage.elf\n", argv0);
fprintf(stderr, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark to reappear on <DEVICE>',\n");
fprintf(stderr, " you need to blacklist proxmark for modem-manager - see wiki for more details:\n");
fprintf(stderr, " http://code.google.com/p/proxmark3/wiki/Linux\n\n");
fprintf(stderr, " old ref --> http://code.google.com/p/proxmark3/wiki/Linux\n\n");
fprintf(stderr, " new refs --> ");
fprintf(stderr, " https://github.com/Proxmark/proxmark3/wiki/Gentoo Linux\n\n");
fprintf(stderr, " https://github.com/Proxmark/proxmark3/wiki/Ubuntu Linux\n\n");
fprintf(stderr, " https://github.com/Proxmark/proxmark3/wiki/OSX\n\n");
}
#define MAX_FILES 4
@ -130,6 +137,7 @@ int main(int argc, char **argv)
sleep(1);
fprintf(stderr, ".");
} while (!OpenProxmark(0));
fprintf(stderr," Found.\n");
res = flash_start_flashing(can_write_bl, serial_port_name);
@ -156,6 +164,5 @@ int main(int argc, char **argv)
fprintf(stderr, "All done.\n\n");
fprintf(stderr, "Have a nice day!\n");
return 0;
}

33
client/lualibs/default_toys.lua
View file

@ -329,6 +329,39 @@ local _names = {
{"3014", "c60b", "0030", "water", "SWAPFORCE", "Rip Tide"},
{"3015", "c70b", "0030", "water", "SWAPFORCE", "Punk Shock"},
--All 16 Swap Force Characters
{"2000", "d007", "0020", "air", "SWAPFORCE", "Boom"},
{"1000", "e803", "0020", "air", "SWAPFORCE", "Jet (Rocket)"},
{"2001", "d107", "0020", "air", "SWAPFORCE", "Free"},
{"1001", "e903", "0020", "air", "SWAPFORCE", "Ranger (Spin)"},
{"2002", "d207", "0020", "earth", "SWAPFORCE", "Rubble"},
{"1002", "ea03", "0020", "earth", "SWAPFORCE", "Rouser (Dig)"},
{"2003", "d307", "0020", "earth", "SWAPFORCE", "Doom"},
{"1003", "eb03", "0020", "earth", "SWAPFORCE", "Stone (Spin)"},
{"2004", "d407", "0020", "fire", "SWAPFORCE", "Blast"},
{"1004", "ec03", "0020", "fire", "SWAPFORCE", "Zone (Rocket)"},
{"2005", "d507", "0020", "fire", "SWAPFORCE", "Fire"},
{"1005", "ed03", "0020", "fire", "SWAPFORCE", "Kraken (Bounce)"},
{"2006", "d607", "0020", "life", "SWAPFORCE", "Stink"},
{"1006", "ee03", "0020", "life", "SWAPFORCE", "Bomb (Sneak)"},
{"2007", "d707", "0020", "life", "SWAPFORCE", "Grilla"},
{"1007", "ef03", "0020", "life", "SWAPFORCE", "Drilla (Dig)"},
{"2008", "d807", "0020", "magic", "SWAPFORCE", "Hoot"},
{"1008", "f003", "0020", "magic", "SWAPFORCE", "Loop (Teleport)"},
{"2009", "d907", "0020", "magic", "SWAPFORCE", "Trap"},
{"1009", "f103", "0020", "magic", "SWAPFORCE", "Shadow (Sneak)"},
{"2010", "da07", "0020", "tech", "SWAPFORCE", "Magna"},
{"1010", "f203", "0020", "tech", "SWAPFORCE", "Charge (Speed)"},
{"2011", "db07", "0020", "tech", "SWAPFORCE", "Spy"},
{"1011", "f303", "0020", "tech", "SWAPFORCE", "Rise (Climb)"},
{"2012", "dc07", "0020", "undead", "SWAPFORCE", "Night"},
{"1012", "f403", "0020", "undead", "SWAPFORCE", "Shift (Teleport)"},
{"2013", "dd07", "0020", "undead", "SWAPFORCE", "Rattle"},
{"1013", "f503", "0020", "undead", "SWAPFORCE", "Shake (Bounce)"},
{"2014", "de07", "0020", "water", "SWAPFORCE", "Freeze"},
{"1014", "f603", "0020", "water", "SWAPFORCE", "Blade (Speed)"},
{"2015", "df07", "0020", "water", "SWAPFORCE", "Wash"},
{"1015", "f703", "0020", "water", "SWAPFORCE", "Buckler (Climb)"},
--{"", "", "0030", "water", "SWAPFORCE", "Hoot Loop"},
--{"", "", "0030", "water", "SWAPFORCE", "Trap Shadow"},
--{"", "", "0030", "water", "SWAPFORCE", "Wash Buckler"},