Merge branch 'master' into topaz

This commit is contained in:
pwpiwi 2015-08-25 07:53:00 +02:00
commit 8e21541e77
43 changed files with 1519 additions and 231 deletions

View file

@ -1070,7 +1070,6 @@ void SimulateIso14443aTag(int tagType, int uid_1st, int uid_2nd, byte_t* data)
LED_A_ON();
for(;;) {
// Clean receive command buffer
if(!GetIso14443aCommandFromReader(receivedCmd, receivedCmdPar, &len)) {
DbpString("Button press");
break;