From: martin.holst@gmail.com Date: Sun, 1 Sep 2013 20:00:56 +0000 (+0000) Subject: Merged latest trunk changes into scripting-branch X-Git-Tag: v1.0.0~80^2~7 X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/cda2a4c0a5e9b9e2a373aeb822111237ff9ec710 Merged latest trunk changes into scripting-branch --- cda2a4c0a5e9b9e2a373aeb822111237ff9ec710 diff --cc armsrc/appmain.c index cecf4d35,4477a120..cfde4fbb --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@@ -877,15 -880,15 +880,15 @@@ void UsbPacketReceived(uint8_t *packet // UsbSendPacket((uint8_t *)&n, sizeof(n)); // LED_B_OFF(); - LED_B_ON(); - for(size_t i=0; iarg[1]; i += USB_CMD_DATA_SIZE) { - size_t len = MIN((c->arg[1] - i),USB_CMD_DATA_SIZE); - cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K,i,len,0,((byte_t*)BigBuf)+c->arg[0]+i,len); - } - // Trigger a finish downloading signal with an ACK frame - cmd_send(CMD_ACK,0,0,0,0,0); + LED_B_ON(); + for(size_t i=0; iarg[1]; i += USB_CMD_DATA_SIZE) { + size_t len = MIN((c->arg[1] - i),USB_CMD_DATA_SIZE); + cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K,i,len,0,((byte_t*)BigBuf)+c->arg[0]+i,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; diff --cc client/Makefile index 1f2f23e8,ff701a9f..b7376c92 --- a/client/Makefile +++ b/client/Makefile @@@ -32,7 -28,8 +32,9 @@@ els CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4 QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null) MOC = $(shell pkg-config --variable=moc_location QtCore) + # Below is a variant you can use if you have problems compiling with QT5 on ubuntu. see http://www.proxmark.org/forum/viewtopic.php?id=1661 for more info. + #MOC = /usr/lib/x86_64-linux-gnu/qt4/bin/moc +LUAPLATFORM = linux endif diff --cc client/cmdmain.c index 9da1b308,64e0c1b4..b6f32ada --- a/client/cmdmain.c +++ b/client/cmdmain.c @@@ -24,8 -24,8 +24,9 @@@ #include "cmdlf.h" #include "cmdmain.h" #include "util.h" +#include "cmdscript.h" + unsigned int current_command = CMD_UNKNOWN; //unsigned int received_command = CMD_UNKNOWN; //UsbCommand current_response;