X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/693f7cf770e830bdcd63c050ded2166a20aa06b5..431ae7e0eb45db8cdc3a8097b1b642940586fe91:/armsrc/appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index b539e667..f35a82fa 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -71,7 +71,7 @@ void DbpString(char *str)
 	/* this holds up stuff unless we're connected to usb */
 //	if (!usbattached)
 //		return;
-	
+
 	UsbCommand c;
 	c.cmd = CMD_DEBUG_PRINT_STRING;
 	c.ext1 = strlen(str);
@@ -103,10 +103,10 @@ void AcquireRawAdcSamples125k(BOOL at134khz)
 {
 	if(at134khz) {
 		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz
-		FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER | FPGA_LF_READER_USE_134_KHZ);
+		FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);
 	} else {
 		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
-		FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER | FPGA_LF_READER_USE_125_KHZ);
+		FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);
 	}
 
 	// Connect the A/D to the peak-detected low-frequency path.
@@ -157,13 +157,13 @@ void ModThenAcquireRawAdcSamples125k(int delay_off,int period_0,int period_1,BYT
 		at134khz= TRUE;
 	else
 		at134khz= FALSE;
-	
+
 	if(at134khz) {
 		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz
-		FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER | FPGA_LF_READER_USE_134_KHZ);
+		FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);
 	} else {
 		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
-		FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER | FPGA_LF_READER_USE_125_KHZ);
+		FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);
 	}
 
 	// Give it a bit of time for the resonant antenna to settle.
@@ -180,10 +180,10 @@ void ModThenAcquireRawAdcSamples125k(int delay_off,int period_0,int period_1,BYT
 		SpinDelayUs(delay_off);
 		if(at134khz) {
 			FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz
-			FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER | FPGA_LF_READER_USE_134_KHZ);
+			FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);
 		} else {
 			FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
-			FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER | FPGA_LF_READER_USE_125_KHZ);
+			FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);
 		}
 		LED_D_ON();
 		if(*(command++) == '0')
@@ -196,16 +196,88 @@ void ModThenAcquireRawAdcSamples125k(int delay_off,int period_0,int period_1,BYT
 	SpinDelayUs(delay_off);
 	if(at134khz) {
 		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz
-		FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER | FPGA_LF_READER_USE_134_KHZ);
+		FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);
 	} else {
 		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
-		FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER | FPGA_LF_READER_USE_125_KHZ);
+		FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);
 	}
 
 	// now do the read
 	DoAcquisition125k(at134khz);
 }
 
+void AcquireTiType(void)
+{
+	int i;
+	int n = 5000;
+
+	// clear buffer
+	memset(BigBuf,0,sizeof(BigBuf));
+
+	// Set up the synchronous serial port
+  PIO_DISABLE = (1<<GPIO_SSC_DIN);
+  PIO_PERIPHERAL_A_SEL = (1<<GPIO_SSC_DIN);
+
+	// steal this pin from the SSP and use it to control the modulation
+  PIO_ENABLE = (1<<GPIO_SSC_DOUT);
+	PIO_OUTPUT_ENABLE	= (1<<GPIO_SSC_DOUT);
+
+  SSC_CONTROL = SSC_CONTROL_RESET;
+  SSC_CONTROL = SSC_CONTROL_RX_ENABLE | SSC_CONTROL_TX_ENABLE;
+
+  // Sample at 2 Mbit/s, so TI tags are 16.2 vs. 14.9 clocks long
+  // 48/2 = 24 MHz clock must be divided by 12
+  SSC_CLOCK_DIVISOR = 12;
+
+  SSC_RECEIVE_CLOCK_MODE = SSC_CLOCK_MODE_SELECT(0);
+	SSC_RECEIVE_FRAME_MODE = SSC_FRAME_MODE_BITS_IN_WORD(32) | SSC_FRAME_MODE_MSB_FIRST;
+	SSC_TRANSMIT_CLOCK_MODE = 0;
+	SSC_TRANSMIT_FRAME_MODE = 0;
+
+	LED_D_ON();
+
+	// modulate antenna
+	PIO_OUTPUT_DATA_SET = (1<<GPIO_SSC_DOUT);
+
+	// Charge TI tag for 50ms.
+	SpinDelay(50);
+
+	// stop modulating antenna and listen
+	PIO_OUTPUT_DATA_CLEAR = (1<<GPIO_SSC_DOUT);
+
+	LED_D_OFF();
+
+	i = 0;
+	for(;;) {
+			if(SSC_STATUS & SSC_STATUS_RX_READY) {
+					BigBuf[i] = SSC_RECEIVE_HOLDING;	// store 32 bit values in buffer
+					i++; if(i >= n) return;
+			}
+			WDT_HIT();
+	}
+
+	// return stolen pin to SSP
+	PIO_DISABLE = (1<<GPIO_SSC_DOUT);
+	PIO_PERIPHERAL_A_SEL = (1<<GPIO_SSC_DIN) | (1<<GPIO_SSC_DOUT);
+}
+
+void AcquireRawBitsTI(void)
+{
+	LED_D_ON();
+	// TI tags charge at 134.2Khz
+	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz
+	// Place FPGA in passthrough mode, in this mode the CROSS_LO line
+	// connects to SSP_DIN and the SSP_DOUT logic level controls
+	// whether we're modulating the antenna (high)
+	// or listening to the antenna (low)
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_PASSTHRU);
+
+	// get TI tag data into the buffer
+	AcquireTiType();
+
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+}
+
 //-----------------------------------------------------------------------------
 // Read an ADC channel and block till it completes, then return the result
 // in ADC units (0 to 1023). Also a routine to average 32 samples and
@@ -288,7 +360,7 @@ void MeasureAntennaTuning(void)
 	c.cmd = CMD_MEASURED_ANTENNA_TUNING;
 	c.ext1 = (vLf125 << 0) | (vLf134 << 16);
 	c.ext2 = vHf;
-	c.ext3 =  peakf | (peakv << 16);
+	c.ext3 = peakf | (peakv << 16);
 	UsbSendPacket((BYTE *)&c, sizeof(c));
 }
 
@@ -324,7 +396,7 @@ void SimulateTagLowFrequency(int period, int ledcontrol)
 			OPEN_COIL();
 		else
 			SHORT_COIL();
-		
+
 		if (ledcontrol)
 			LED_D_OFF();
 
@@ -439,7 +511,7 @@ static void CmdHIDsimTAG(int hi, int lo, int ledcontrol)
 	if (ledcontrol)
 		LED_A_ON();
 	SimulateTagLowFrequency(n, ledcontrol);
-	
+
 	if (ledcontrol)
 		LED_A_OFF();
 }
@@ -452,7 +524,7 @@ static void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
 	DWORD hi=0, lo=0;
 
 	FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER | FPGA_LF_READER_USE_125_KHZ);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);
 
 	// Connect the A/D to the peak-detected low-frequency path.
 	SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
@@ -698,6 +770,10 @@ void UsbPacketReceived(BYTE *packet, int len)
 			ModThenAcquireRawAdcSamples125k(c->ext1,c->ext2,c->ext3,c->d.asBytes);
 			break;
 
+		case CMD_ACQUIRE_RAW_BITS_TI_TYPE:
+			AcquireRawBitsTI();
+			break;
+
 		case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693:
 			AcquireRawAdcSamplesIso15693();
 			break;
@@ -830,7 +906,7 @@ void ReadMem(int addr)
 {
 	const DWORD *data = ((DWORD *)addr);
 	int i;
-	
+
 	DbpString("Reading memory at address");
 	DbpIntegers(0, 0, addr);
 	for (i = 0; i < 8; i+= 2)
@@ -911,7 +987,7 @@ void SamyRun()
 #define OPTS 2
 
 	int high[OPTS], low[OPTS];
-	
+
 	// Oooh pretty -- notify user we're in elite samy mode now
 	LED(LED_RED,	200);
 	LED(LED_ORANGE, 200);
@@ -922,29 +998,29 @@ void SamyRun()
 	LED(LED_GREEN,	200);
 	LED(LED_ORANGE, 200);
 	LED(LED_RED,	200);
-	
+
 	int selected = 0;
 	int playing = 0;
-	
+
 	// Turn on selected LED
 	LED(selected + 1, 0);
-	
+
 	for (;;)
 	{
 		usbattached = UsbPoll(FALSE);
 		WDT_HIT();
-		
+
 		// Was our button held down or pressed?
 		int button_pressed = BUTTON_HELD(1000);
 		SpinDelay(300);
-		
+
 		// Button was held for a second, begin recording
 		if (button_pressed > 0)
 		{
 			LEDsoff();
 			LED(selected + 1, 0);
 			LED(LED_RED2, 0);
-						
+
 			// record
 			DbpString("Starting recording");
 
@@ -958,16 +1034,16 @@ void SamyRun()
 			CmdHIDdemodFSK(1, &high[selected], &low[selected], 0);
 			DbpString("Recorded");
 			DbpIntegers(selected, high[selected], low[selected]);
-			
+
 			LEDsoff();
 			LED(selected + 1, 0);
 			// Finished recording
-			
+
 			// If we were previously playing, set playing off
 			// so next button push begins playing what we recorded
 			playing = 0;
 		}
-		
+
 		// Change where to record (or begin playing)
 		else if (button_pressed)
 		{
@@ -975,10 +1051,10 @@ void SamyRun()
 			if (playing)
 				selected = (selected + 1) % OPTS;
 			playing = !playing;
-			
+
 			LEDsoff();
 			LED(selected + 1, 0);
-			
+
 			// Begin transmitting
 			if (playing)
 			{
@@ -996,10 +1072,10 @@ void SamyRun()
 					LEDsoff();
 					return;
 					}
-				
+
 				/* We pressed a button so ignore it here with a delay */
 				SpinDelay(300);
-				
+
 				// when done, we're done playing, move to next option
 				selected = (selected + 1) % OPTS;
 				playing = !playing;
@@ -1014,85 +1090,168 @@ void SamyRun()
 }
 
 
-// listen for external reader 
-void ListenReaderField(int limit)
-{
-	int lf_av, lf_av_new, lf_baseline= 0, lf_count= 0;
-	int hf_av, hf_av_new,  hf_baseline= 0, hf_count= 0;
-
-#define LF_ONLY		1
-#define HF_ONLY		2
-
-	LED_A_OFF();
-	LED_B_OFF();
-	LED_C_OFF();
-	LED_D_OFF();
-
-	lf_av= ReadAdc(ADC_CHAN_LF);
-
-	if(limit != HF_ONLY) 
-		{
-		DbpString("LF 125/134 Baseline:");
-		DbpIntegers(lf_av,0,0);
-		lf_baseline= lf_av;
-		}
-
-	hf_av= ReadAdc(ADC_CHAN_HF);
-
-
-	if (limit != LF_ONLY) 
-		{
-		DbpString("HF 13.56 Baseline:");
-		DbpIntegers(hf_av,0,0);
-		hf_baseline= hf_av;
-		}
-
-	for(;;) 
-		{
-		if(BUTTON_PRESS()) 
-			{
-			DbpString("Stopped");
-			LED_B_OFF();
-			LED_D_OFF();
-			return;
-			}
-		WDT_HIT();
-
-
-		if (limit != HF_ONLY) 
-			{
-			if (abs(lf_av - lf_baseline) > 10)
-				LED_D_ON();
-			else
-				LED_D_OFF();
-			++lf_count;
-			lf_av_new= ReadAdc(ADC_CHAN_LF);
-			// see if there's a significant change
-			if(abs(lf_av - lf_av_new) > 10) 
-				{
-				DbpString("LF 125/134 Field Change:");
-				DbpIntegers(lf_av,lf_av_new,lf_count);
-				lf_av= lf_av_new;
-				lf_count= 0;
-				}
-			}
-
-		if (limit != LF_ONLY) 
-			{
-			if (abs(hf_av - hf_baseline) > 10)
-				LED_B_ON();
-			else
-				LED_B_OFF();
-			++hf_count;
-			hf_av_new= ReadAdc(ADC_CHAN_HF);
-			// see if there's a significant change
-			if(abs(hf_av - hf_av_new) > 10) 
-				{
-				DbpString("HF 13.56 Field Change:");
-				DbpIntegers(hf_av,hf_av_new,hf_count);
-				hf_av= hf_av_new;
-				hf_count= 0;
-				}
-			}
-		}
-}
+/* 
+OBJECTIVE
+Listen and detect an external reader. Determine the best location
+for the antenna.
+
+INSTRUCTIONS:
+Inside the ListenReaderField() function, there is two mode. 
+By default, when you call the function, you will enter mode 1.
+If you press the PM3 button one time, you will enter mode 2.
+If you press the PM3 button a second time, you will exit the function.
+
+DESCRIPTION OF MODE 1:
+This mode just listens for an external reader field and lights up green 
+for HF and/or red for LF. This is the original mode of the detectreader
+function.
+
+DESCRIPTION OF MODE 2:
+This mode will visually represent, using the LEDs, the actual strength of the
+current compared to the maximum current detected. Basically, once you know 
+what kind of external reader is present, it will help you spot the best location to place
+your antenna. You will probably not get some good results if there is a LF and a HF reader
+at the same place! :-)
+
+LIGHT SCHEME USED:
+
+Light scheme | Descriptiong
+----------------------------------------------------
+    ----     | No field detected
+    X---     | 14% of maximum current detected
+    -X--     | 29% of maximum current detected
+    --X-     | 43% of maximum current detected
+    ---X     | 57% of maximum current detected
+    --XX     | 71% of maximum current detected
+    -XXX     | 86% of maximum current detected
+    XXXX     | 100% of maximum current detected
+
+TODO:
+Add the LF part for MODE 2
+
+*/
+void ListenReaderField(int limit)
+{
+	int lf_av, lf_av_new, lf_baseline= 0, lf_count= 0;
+	int hf_av, hf_av_new,  hf_baseline= 0, hf_count= 0, hf_max;
+	int mode=1;
+
+#define LF_ONLY		1
+#define HF_ONLY		2
+
+	LED_A_OFF();
+	LED_B_OFF();
+	LED_C_OFF();
+	LED_D_OFF();
+
+	lf_av= ReadAdc(ADC_CHAN_LF);
+
+	if(limit != HF_ONLY) 
+		{
+		DbpString("LF 125/134 Baseline:");
+		DbpIntegers(lf_av,0,0);
+		lf_baseline= lf_av;
+		}
+
+	hf_av=hf_max=ReadAdc(ADC_CHAN_HF);
+
+	if (limit != LF_ONLY) 
+		{
+		DbpString("HF 13.56 Baseline:");
+		DbpIntegers(hf_av,0,0);
+		hf_baseline= hf_av;
+		}
+
+	for(;;) 
+		{
+		if (BUTTON_PRESS()) {
+			SpinDelay(500);
+			switch (mode) {
+				case 1:
+					mode=2;
+					DbpString("Signal Strength Mode");
+					break;
+				case 2:
+				default:
+					DbpString("Stopped");
+					LED_A_OFF();
+					LED_B_OFF();
+					LED_C_OFF();
+					LED_D_OFF();
+					return;
+					break;
+			}
+		}
+		WDT_HIT();
+
+		if (limit != HF_ONLY) 
+			{
+			if (abs(lf_av - lf_baseline) > 10)
+				LED_D_ON();
+			else
+				LED_D_OFF();
+			++lf_count;
+			lf_av_new= ReadAdc(ADC_CHAN_LF);
+			// see if there's a significant change
+			if(abs(lf_av - lf_av_new) > 10) 
+				{
+				DbpString("LF 125/134 Field Change:");
+				DbpIntegers(lf_av,lf_av_new,lf_count);
+				lf_av= lf_av_new;
+				lf_count= 0;
+				}
+			}
+
+		if (limit != LF_ONLY) 
+			{
+			if (abs(hf_av - hf_baseline) > 10) {
+				if (mode == 1)
+					LED_B_ON();
+				if (mode == 2) {
+					if ( hf_av>(hf_max/7)*6) {
+						LED_A_ON();	LED_B_ON();	LED_C_ON();	LED_D_ON();
+					}
+					if ( (hf_av>(hf_max/7)*5) && (hf_av<=(hf_max/7)*6) ) {
+						LED_A_ON();	LED_B_ON();	LED_C_OFF(); LED_D_ON();
+					}
+					if ( (hf_av>(hf_max/7)*4) && (hf_av<=(hf_max/7)*5) ) {
+						LED_A_OFF(); LED_B_ON(); LED_C_OFF(); LED_D_ON();
+					}
+					if ( (hf_av>(hf_max/7)*3) && (hf_av<=(hf_max/7)*4) ) {
+						LED_A_OFF(); LED_B_OFF(); LED_C_OFF(); LED_D_ON();
+					}
+					if ( (hf_av>(hf_max/7)*2) && (hf_av<=(hf_max/7)*3) ) {
+						LED_A_OFF(); LED_B_ON(); LED_C_OFF(); LED_D_OFF();
+					}
+					if ( (hf_av>(hf_max/7)*1) && (hf_av<=(hf_max/7)*2) ) {
+						LED_A_ON();	LED_B_OFF(); LED_C_OFF(); LED_D_OFF();
+					}
+					if ( (hf_av>(hf_max/7)*0) && (hf_av<=(hf_max/7)*1) ) {
+						LED_A_OFF(); LED_B_OFF(); LED_C_ON(); LED_D_OFF();
+					}
+				} 
+			} else {
+				if (mode == 1) {
+					LED_B_OFF();
+				}
+				if (mode == 2) {
+					LED_A_OFF(); LED_B_OFF(); LED_C_OFF(); LED_D_OFF();
+				}
+			}
+
+			++hf_count;
+			hf_av_new= ReadAdc(ADC_CHAN_HF);
+			// see if there's a significant change
+			if(abs(hf_av - hf_av_new) > 10) 
+				{
+				DbpString("HF 13.56 Field Change:");
+				DbpIntegers(hf_av,hf_av_new,hf_count);
+				hf_av= hf_av_new;
+				if (hf_av > hf_max)
+					hf_max = hf_av;
+				hf_count= 0;
+				}
+			}
+		}
+}
+