Merge branch 'master' into master

This commit is contained in:
grauerfuchs 2018-09-13 21:30:24 -04:00 committed by GitHub
commit 173ba1e1a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 6161 additions and 610 deletions

View file

@ -21,6 +21,7 @@
#include "printf.h"
#include "string.h"
#include "legicrf.h"
#include "legicrfsim.h"
#include "hitag2.h"
#include "hitagS.h"
#include "lfsampling.h"
@ -1103,7 +1104,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
#ifdef WITH_LEGICRF
case CMD_SIMULATE_TAG_LEGIC_RF:
LegicRfSimulate(c->arg[0], c->arg[1], c->arg[2]);
LegicRfSimulate(c->arg[0]);
break;
case CMD_WRITER_LEGIC_RF: