dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/lfops.c
This commit is contained in:
iceman1001
2015-02-10 08:58:14 +01:00
parent e57fe796f5 146c201cbe
commit 2b61c24212
28 changed files with 1930 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
armsrc/appmain.c
View File

@@ -22,7 +22,7 @@
#include "legicrf.h"
#include "../include/hitag2.h"
#include "lfsampling.h"
#ifdef WITH_LCD
#include "LCD.h"
@@ -626,16 +626,17 @@ void UsbPacketReceived(uint8_t *packet, int len)
switch(c->cmd) {
#ifdef WITH_LF
case CMD_SET_LF_SAMPLING_CONFIG:
setSamplingConfig((sample_config *) c->d.asBytes);
break;
case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K:
AcquireRawAdcSamples125k(c->arg[0]);
cmd_send(CMD_ACK,0,0,0,0,0);
cmd_send(CMD_ACK,SampleLF(),0,0,0,0);
break;
case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:
ModThenAcquireRawAdcSamples125k(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);
break;
case CMD_LF_SNOOP_RAW_ADC_SAMPLES:
SnoopLFRawAdcSamples(c->arg[0], c->arg[1]);
cmd_send(CMD_ACK,0,0,0,0,0);
cmd_send(CMD_ACK,SnoopLF(),0,0,0,0);
break;
case CMD_HID_DEMOD_FSK:
CmdHIDdemodFSK(c->arg[0], 0, 0, 1);
@@ -921,7 +922,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K,i,len,traceLen,BigBuf+c->arg[0]+i,len);
}
// Trigger a finish downloading signal with an ACK frame
cmd_send(CMD_ACK,0,0,traceLen,0,0);
cmd_send(CMD_ACK,1,0,traceLen,getSamplingConfig(),sizeof(sample_config));
LED_B_OFF();
break;