X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/6949aca9fa0e37539fc277bac78e3d7a22117467..b1083ec9f753e654e8824c267b5e90298060e96a:/armsrc/appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index e2bf4033..828926f1 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -8,6 +8,7 @@
 #include <proxmark3.h>
 #include <stdlib.h>
 #include "apps.h"
+#include "legicrf.h"
 #ifdef WITH_LCD
 #include "fonts.h"
 #include "LCD.h"
@@ -540,53 +541,81 @@ void UsbPacketReceived(BYTE *packet, int len)
 			ModThenAcquireRawAdcSamples125k(c->ext1,c->ext2,c->ext3,c->d.asBytes);
 			break;
 
+#ifdef WITH_ISO15693
 		case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693:
 			AcquireRawAdcSamplesIso15693();
 			break;
+#endif
 
 		case CMD_BUFF_CLEAR:
 			BufferClear();
 			break;
 
+#ifdef WITH_ISO15693
 		case CMD_READER_ISO_15693:
 			ReaderIso15693(c->ext1);
 			break;
+#endif
 
+		case CMD_READER_LEGIC_RF:
+			LegicRfReader();
+			break;
+
+#ifdef WITH_ISO15693
 		case CMD_SIMTAG_ISO_15693:
 			SimTagIso15693(c->ext1);
 			break;
+#endif
 
+#ifdef WITH_ISO14443b
 		case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443:
 			AcquireRawAdcSamplesIso14443(c->ext1);
 			break;
+#endif
 
+#ifdef WITH_ISO14443b
 		case CMD_READ_SRI512_TAG:
 			ReadSRI512Iso14443(c->ext1);
 			break;
+#endif
 
+#ifdef WITH_ISO14443a
 		case CMD_READER_ISO_14443a:
 			ReaderIso14443a(c->ext1);
 			break;
+#endif
 
+#ifdef WITH_ISO14443b
 		case CMD_SNOOP_ISO_14443:
 			SnoopIso14443();
 			break;
+#endif
 
+#ifdef WITH_ISO14443a
 		case CMD_SNOOP_ISO_14443a:
 			SnoopIso14443a();
 			break;
+#endif
 
 		case CMD_SIMULATE_TAG_HF_LISTEN:
 			SimulateTagHfListen();
 			break;
 
+#ifdef WITH_ISO14443b
 		case CMD_SIMULATE_TAG_ISO_14443:
 			SimulateIso14443Tag();
 			break;
-
+#endif
+		
+#ifdef WITH_ISO14443a
 		case CMD_SIMULATE_TAG_ISO_14443a:
 			SimulateIso14443aTag(c->ext1, c->ext2);  // ## Simulate iso14443a tag - pass tag type & UID
 			break;
+#endif
+
+		case CMD_SIMULATE_TAG_LEGIC_RF:
+			LegicRfSimulate();
+			break;
 
 		case CMD_MEASURE_ANTENNA_TUNING:
 			MeasureAntennaTuning();
@@ -646,6 +675,14 @@ void UsbPacketReceived(BYTE *packet, int len)
 		case CMD_SET_LF_DIVISOR:
 			FpgaSendCommand(FPGA_CMD_SET_DIVISOR, c->ext1);
 			break;
+		case CMD_SET_ADC_MUX:
+			switch(c->ext1) {
+			case 0: SetAdcMuxFor(GPIO_MUXSEL_LOPKD); break;
+			case 1: SetAdcMuxFor(GPIO_MUXSEL_LORAW); break;
+			case 2: SetAdcMuxFor(GPIO_MUXSEL_HIPKD); break;
+			case 3: SetAdcMuxFor(GPIO_MUXSEL_HIRAW); break;
+			}
+			break;
 		case CMD_VERSION:
 			SendVersion();
 			break;