X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7f3480429ba8a8fecc9768aceb11c74db7f186ae..e7aee94e6a3f4f7ef38a4d06b837cf6141e731b9:/armsrc/appmain.c diff --git a/armsrc/appmain.c b/armsrc/appmain.c index 27a7551d..fccaba54 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -17,6 +17,7 @@ // The large multi-purpose buffer, typically used to hold A/D samples, // maybe pre-processed in some way. DWORD BigBuf[16000]; +int usbattached = 0; //============================================================================= // A buffer where we can queue things up to be sent through the FPGA, for @@ -67,6 +68,10 @@ void ToSendStuffBit(int b) 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); @@ -79,6 +84,10 @@ void DbpString(char *str) void DbpIntegers(int x1, int x2, int x3) { + /* this holds up stuff unless we're connected to usb */ +// if (!usbattached) +// return; + UsbCommand c; c.cmd = CMD_DEBUG_PRINT_INTEGERS; c.ext1 = x1; @@ -144,7 +153,7 @@ void ModThenAcquireRawAdcSamples125k(int delay_off,int period_0,int period_1,BYT BOOL at134khz; // see if 'h' was specified - if(command[strlen(command) - 1] == 'h') + if(command[strlen((char *) command) - 1] == 'h') at134khz= TRUE; else at134khz= FALSE; @@ -231,73 +240,59 @@ static int AvgAdc(int ch) return (a + 15) >> 5; } -/* - * Sweeps the useful LF range of the proxmark from - * 46.8kHz (divisor=255) to 600kHz (divisor=19) and - * reads the voltage in the antenna: the result is a graph - * which should clearly show the resonating frequency of your - * LF antenna ( hopefully around 90 if it is tuned to 125kHz!) - */ -void SweepLFrange() +void MeasureAntennaTuning(void) { BYTE *dest = (BYTE *)BigBuf; - int i; + int i, ptr = 0, adcval = 0, peak = 0, peakv = 0, peakf = 0;; + int vLf125 = 0, vLf134 = 0, vHf = 0; // in mV + + UsbCommand c; - // clear buffer + DbpString("Measuring antenna characteristics, please wait."); memset(BigBuf,0,sizeof(BigBuf)); +/* + * Sweeps the useful LF range of the proxmark from + * 46.8kHz (divisor=255) to 600kHz (divisor=19) and + * read the voltage in the antenna, the result left + * in the buffer is a graph which should clearly show + * the resonating frequency of your LF antenna + * ( hopefully around 95 if it is tuned to 125kHz!) + */ FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER); for (i=255; i>19; i--) { FpgaSendCommand(FPGA_CMD_SET_DIVISOR, i); SpinDelay(20); - dest[i] = (137500 * AvgAdc(ADC_CHAN_LF)) >> 18; + // Vref = 3.3V, and a 10000:240 voltage divider on the input + // can measure voltages up to 137500 mV + adcval = ((137500 * AvgAdc(ADC_CHAN_LF)) >> 10); + if (i==95) vLf125 = adcval; // voltage at 125Khz + if (i==89) vLf134 = adcval; // voltage at 134Khz + + dest[i] = adcval>>8; // scale int to fit in byte for graphing purposes + if(dest[i] > peak) { + peakv = adcval; + peak = dest[i]; + peakf = i; + ptr = i; + } } -} - -void MeasureAntennaTuning(void) -{ -// Impedances are Zc = 1/(j*omega*C), in ohms -#define LF_TUNING_CAP_Z 1273 // 1 nF @ 125 kHz -#define HF_TUNING_CAP_Z 235 // 50 pF @ 13.56 MHz - - int vLf125, vLf134, vHf; // in mV - - UsbCommand c; - - // Let the FPGA drive the low-frequency antenna around 125 kHz. - FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz - FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER | FPGA_LF_READER_USE_125_KHZ); - SpinDelay(20); - vLf125 = AvgAdc(ADC_CHAN_LF); - // Vref = 3.3V, and a 10000:240 voltage divider on the input - // can measure voltages up to 137500 mV - vLf125 = (137500 * vLf125) >> 10; - - // Let the FPGA drive the low-frequency antenna around 134 kHz. - FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz - FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER | FPGA_LF_READER_USE_134_KHZ); - SpinDelay(20); - vLf134 = AvgAdc(ADC_CHAN_LF); - // Vref = 3.3V, and a 10000:240 voltage divider on the input - // can measure voltages up to 137500 mV - vLf134 = (137500 * vLf134) >> 10; // Let the FPGA drive the high-frequency antenna around 13.56 MHz. FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR); SpinDelay(20); - vHf = AvgAdc(ADC_CHAN_HF); // Vref = 3300mV, and an 10:1 voltage divider on the input // can measure voltages up to 33000 mV - vHf = (33000 * vHf) >> 10; + vHf = (33000 * AvgAdc(ADC_CHAN_HF)) >> 10; c.cmd = CMD_MEASURED_ANTENNA_TUNING; c.ext1 = (vLf125 << 0) | (vLf134 << 16); c.ext2 = vHf; - c.ext3 = (LF_TUNING_CAP_Z << 0) | (HF_TUNING_CAP_Z << 16); + c.ext3 = peakf | (peakv << 16); UsbSendPacket((BYTE *)&c, sizeof(c)); } -void SimulateTagLowFrequency(int period) +void SimulateTagLowFrequency(int period, int ledcontrol) { int i; BYTE *tab = (BYTE *)BigBuf; @@ -316,21 +311,26 @@ void SimulateTagLowFrequency(int period) for(;;) { while(!(PIO_PIN_DATA_STATUS & (1<= m) { break; } @@ -581,6 +589,13 @@ static void CmdHIDdemodFSK(void) if (found && (hi|lo)) { DbpString("TAG ID"); DbpIntegers(hi, lo, (lo>>1)&0xffff); + /* if we're only looking for one tag */ + if (findone) + { + *high = hi; + *low = lo; + return; + } hi=0; lo=0; found=0; @@ -607,6 +622,13 @@ static void CmdHIDdemodFSK(void) if (found && (hi|lo)) { DbpString("TAG ID"); DbpIntegers(hi, lo, (lo>>1)&0xffff); + /* if we're only looking for one tag */ + if (findone) + { + *high = hi; + *low = lo; + return; + } hi=0; lo=0; found=0; @@ -733,11 +755,11 @@ void UsbPacketReceived(BYTE *packet, int len) break; case CMD_HID_DEMOD_FSK: - CmdHIDdemodFSK(); // Demodulate HID tag + CmdHIDdemodFSK(0, 0, 0, 1); // Demodulate HID tag break; case CMD_HID_SIM_TAG: - CmdHIDsimTAG(c->ext1, c->ext2); // Simulate HID tag by ID + CmdHIDsimTAG(c->ext1, c->ext2, 1); // Simulate HID tag by ID break; case CMD_FPGA_MAJOR_MODE_OFF: // ## FPGA Control @@ -766,7 +788,7 @@ void UsbPacketReceived(BYTE *packet, int len) } case CMD_SIMULATE_TAG_125K: LED_A_ON(); - SimulateTagLowFrequency(c->ext1); + SimulateTagLowFrequency(c->ext1, 1); LED_A_OFF(); break; #ifdef WITH_LCD @@ -774,10 +796,9 @@ void UsbPacketReceived(BYTE *packet, int len) LCDReset(); break; #endif - case CMD_SWEEP_LF: - SweepLFrange(); + case CMD_READ_MEM: + ReadMem(c->ext1); break; - case CMD_SET_LF_DIVISOR: FpgaSendCommand(FPGA_CMD_SET_DIVISOR, c->ext1); break; @@ -805,6 +826,17 @@ void UsbPacketReceived(BYTE *packet, int len) } } +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) + DbpIntegers(0, data[i], data[i+1]); +} + void AppMain(void) { memset(BigBuf,0,sizeof(BigBuf)); @@ -861,60 +893,115 @@ void AppMain(void) #endif for(;;) { - UsbPoll(FALSE); + usbattached = UsbPoll(FALSE); WDT_HIT(); - } -} - -void SpinDelayUs(int us) -{ - int ticks = (48*us) >> 10; - // Borrow a PWM unit for my real-time clock - PWM_ENABLE = PWM_CHANNEL(0); - // 48 MHz / 1024 gives 46.875 kHz - PWM_CH_MODE(0) = PWM_CH_MODE_PRESCALER(10); - PWM_CH_DUTY_CYCLE(0) = 0; - PWM_CH_PERIOD(0) = 0xffff; - - WORD start = (WORD)PWM_CH_COUNTER(0); - - for(;;) { - WORD now = (WORD)PWM_CH_COUNTER(0); - if(now == (WORD)(start + ticks)) { - return; - } - WDT_HIT(); + if (BUTTON_HELD(1000) > 0) + SamyRun(); } } -void SpinDelay(int ms) -{ - int ticks = (48000*ms) >> 10; - // Borrow a PWM unit for my real-time clock - PWM_ENABLE = PWM_CHANNEL(0); - // 48 MHz / 1024 gives 46.875 kHz - PWM_CH_MODE(0) = PWM_CH_MODE_PRESCALER(10); - PWM_CH_DUTY_CYCLE(0) = 0; - PWM_CH_PERIOD(0) = 0xffff; +// samy's sniff and repeat routine +void SamyRun() +{ + DbpString("Stand-alone mode! No PC necessary."); - WORD start = (WORD)PWM_CH_COUNTER(0); + // 3 possible options? no just 2 for now +#define OPTS 2 - for(;;) { - WORD now = (WORD)PWM_CH_COUNTER(0); - if(now == (WORD)(start + ticks)) { - return; - } + int high[OPTS], low[OPTS]; + + // Oooh pretty -- notify user we're in elite samy mode now + LED(LED_RED, 200); + LED(LED_ORANGE, 200); + LED(LED_GREEN, 200); + LED(LED_ORANGE, 200); + LED(LED_RED, 200); + LED(LED_ORANGE, 200); + 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"); + + /* need this delay to prevent catching some weird data */ + SpinDelay(500); + 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) + { + // Next option if we were previously playing + if (playing) + selected = (selected + 1) % OPTS; + playing = !playing; + + LEDsoff(); + LED(selected + 1, 0); + + // Begin transmitting + if (playing) + { + LED(LED_GREEN, 0); + DbpString("Playing"); + DbpIntegers(selected, high[selected], low[selected]); + CmdHIDsimTAG(high[selected], low[selected], 0); + DbpString("Done playing"); + + /* 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; + LEDsoff(); + LED(selected + 1, 0); + } + } } } + // listen for external reader void ListenReaderField(int limit) { - int lf_av, lf_av_new, lf_baseline= -1, lf_count= 0; - int hf_av, hf_av_new, hf_baseline= -1, hf_count= 0; + 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 @@ -926,7 +1013,7 @@ void ListenReaderField(int limit) lf_av= ReadAdc(ADC_CHAN_LF); - if(limit != HF_ONLY && lf_baseline == -1) + if(limit != HF_ONLY) { DbpString("LF 125/134 Baseline:"); DbpIntegers(lf_av,0,0); @@ -936,7 +1023,7 @@ void ListenReaderField(int limit) hf_av= ReadAdc(ADC_CHAN_HF); - if (limit != LF_ONLY && hf_baseline == -1) + if (limit != LF_ONLY) { DbpString("HF 13.56 Baseline:"); DbpIntegers(hf_av,0,0); @@ -947,6 +1034,7 @@ void ListenReaderField(int limit) { if(BUTTON_PRESS()) { + DbpString("Stopped"); LED_B_OFF(); LED_D_OFF(); return;