X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1c611bbd26066e1a8dd36ffd389b57040a7dfad6..30a5d3552930ab77d489484fcd47f296b69dfe34:/armsrc/appmain.c?ds=sidebyside diff --git a/armsrc/appmain.c b/armsrc/appmain.c index c1d4940d..cfde4fbb 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -744,10 +744,10 @@ void UsbPacketReceived(uint8_t *packet, int len) AcquireRawAdcSamplesIso14443(c->arg[0]); break; case CMD_READ_SRI512_TAG: - ReadSRI512Iso14443(c->arg[0]); + ReadSTMemoryIso14443(0x0F); break; case CMD_READ_SRIX4K_TAG: - ReadSRIX4KIso14443(c->arg[0]); + ReadSTMemoryIso14443(0x7F); break; case CMD_SNOOP_ISO_14443: SnoopIso14443(); @@ -755,6 +755,9 @@ void UsbPacketReceived(uint8_t *packet, int len) case CMD_SIMULATE_TAG_ISO_14443: SimulateIso14443Tag(); break; + case CMD_ISO_14443B_COMMAND: + SendRawCommand14443B(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes); + break; #endif #ifdef WITH_ISO14443a @@ -863,7 +866,7 @@ void UsbPacketReceived(uint8_t *packet, int len) LED_D_OFF(); // LED D indicates field ON or OFF break; - case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: + case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: { // UsbCommand n; // if(c->cmd == CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K) { // n.cmd = CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K; @@ -885,7 +888,7 @@ void UsbPacketReceived(uint8_t *packet, int len) // Trigger a finish downloading signal with an ACK frame cmd_send(CMD_ACK,0,0,0,0,0); LED_B_OFF(); - break; + } break; case CMD_DOWNLOADED_SIM_SAMPLES_125K: { uint8_t *b = (uint8_t *)BigBuf;