Commit Graph
38 Commits
Author SHA1 Message Date
iZsh 238c503c38 fpga/min_max_tracker.v: english 2014-06-27 23:28:56 +02:00
iZsh 3b2fee43ea New LF edge detection algorithm + lowpass filter
This is a new LF edge detection algorithm for the FPGA.

- It uses a low-pass IIR filter to clean the signal
(see https://fail0verflow.com/blog/2014/proxmark3-fpga-iir-filter.html)
- The algorithm is able to detect consecutive peaks in the same
  direction
- It uses an envelope follower to dynamically adjust the peak thresholds
- The main threshold used in the envelope follower can be set from the ARM side

fpga/lf_edge_detect.v,
fpga/lp20khz_1MSa_iir_filter.v,
fpga/min_max_tracker.v: New file.

fpga/lo_edge_detect.v, fpga/fpga_lf.v: Modify accordingly.

armsrc/apps.h (FPGA_CMD_SET_USER_BYTE1,
FPGA_CMD_SET_EDGE_DETECT_THRESHOLD): New FPGA command.
fpga/fpga_lf.v: Modify accordingly/Add a 8bit user register.

fpga/fpga_lf.bit: Update accordingly.

fpga/tests: New directory for testbenches

fpga/tests/Makefile: New file. It compiles the testbenches
and runs all the tests by default (comparing with the golden output)

fpga/tests/tb_lp20khz_1MSa_iir_filter.v,
fpga/tests/tb_min_max_tracker.v,
fpga/tests/tb_lf_edge_detect.v: New testbenches

fpga/tests/plot_edgedetect.py: New script to plot the results from
the edge detection tests.

fpga/tests/tb_data: New directory for data and golden outputs
2014-06-27 14:27:03 +02:00
iZsh b014c96d68 new command "lf snoop" to snoop raw ADC values
fpga/lo_read.v (lf_field): new argument.
fpga/fpga_lf.v: modify accordingly.

armsrc/apps.h (FPGA_MAJOR_MODE_LF_READER): Rename as FPGA_MAJOR_MODE_LF_ADC.
armsrc/apps.h (FPGA_LF_ADC_READER_FIELD): New LF option.
armsrc/lfops.c: Modify accordingly.

client/cmdlf.c (CmdLFSnoop): New command.
armsrc/appmain.c, armsrc/lfops.c, client/cmdlf.h, include/usb_cmd.h: Modify accordingly.
2014-06-21 21:33:54 +02:00
iZsh fa57f6e12e fpga/fpga_hf.v, fpga_lf.v, lo_edge_detect.v, lo_passthru.v, lo_read.v: copyright notice 2014-06-20 12:38:58 +02:00
iZsh 62638f87db armsrc/fpgaloader.c: forgot the copyright notice 2014-06-20 12:29:58 +02:00
iZsh 7cc204bff8 THIS REQUIRES A BOOTROM UPDATE!! To save FPGA area, split the LF and HF bitstreams and load them on-demand. 2014-06-20 01:02:59 +02:00
izsh@fail0verflow.com 06b82e6a6d cmdhf14b.c: fixing a crash in the crc computation when missing data (e.g. with 'hf 14b raw -c -p') 2013-10-20 11:46:51 +00:00
izsh@fail0verflow.com 3f7c993d78 fix compilation issues with gcc 4.6: anonymous unions are not c99 2013-10-20 11:40:00 +00:00
izsh@fail0verflow.com 035303ac5f client/cmdparser.c: Remove the leading spaces before calling the subparser. client/cmdlfhid.c: Modify accordingly. 2010-03-06 00:30:24 +00:00
izsh@fail0verflow.com e7227419e5 Don't modify the PATH to prevent from mixing multiple arm-eabi compilers in the PATH 2010-03-04 00:33:05 +00:00
izsh@fail0verflow.com ed82636b49 There is no proof this fix anything. This could just be out of randomness or subtle compiler optimization differences due to the change. 2010-03-04 00:30:54 +00:00
izsh@fail0verflow.com e0c67c7f45 COMPILING.txt: Request for the arm crosscompiler to be in the PATH 2010-02-26 13:49:49 +00:00
izsh@fail0verflow.com a63deed172 common/Makefile.common: Revert the DEVKITARM change. Just need to put the cross compiler in the path. No need to hardcode for a given distribution and a given version. 2010-02-26 13:06:07 +00:00
izsh@fail0verflow.com 212ef3a04d Apply copyright patch from Michael Gernoth 2010-02-25 21:57:35 +00:00
izsh@fail0verflow.com 243dc69001 Fix memset warning 2010-02-24 20:47:32 +00:00
izsh@fail0verflow.com 9e13f87517 Fix a couple of warnings 2010-02-24 20:34:13 +00:00
izsh@fail0verflow.com e3e96e56df client/Makefile: Typo for Darwin 2010-02-24 20:33:55 +00:00
izsh@fail0verflow.com f1d7d57428 COMPILING: move to COMPILING.txt. 2010-02-24 19:49:16 +00:00
izsh@fail0verflow.com 8691f5b7bb Fix QT compilation for Windows/MinGW and update the compilation instructions accordingly. 2010-02-24 19:33:29 +00:00
izsh@fail0verflow.com 9cc7c4b4d1 client/COMPILING: move to /COMPILING and add instructions to be able to compile the firmware as well. 2010-02-23 22:10:35 +00:00
izsh@fail0verflow.com 13bb3b4b11 client/COMPILING: Simplify dev. environment initial setup for Windows (WORK STILL IN PROGRESS) 2010-02-23 20:55:35 +00:00
izsh@fail0verflow.com 913d23c661 client/cmdlfem4x.c: Fix a warning about probable uninitialized variable with gcc 4.4 2010-02-23 20:52:50 +00:00
izsh@fail0verflow.com fddf220a8b Add -O3 on the client's side and fix yielding warnings 2010-02-21 20:01:56 +00:00
izsh@fail0verflow.com 6620e46b00 Ooops, we forgot a few details 2010-02-21 19:58:32 +00:00
izsh@fail0verflow.com 62b1302c97 client/Makefile: Cosmestic changes. 2010-02-21 01:07:11 +00:00
izsh@fail0verflow.com a553f26748 Add License/Copyright headers/notices. Please add your own copyright notice if you have made any nontrivial changes or additions to the code. There are several files without any attribution, currently. 2010-02-21 00:47:22 +00:00
izsh@fail0verflow.com 46cd40465a /client/Makefile: Output object files to the obj subdir. 2010-02-21 00:16:42 +00:00
izsh@fail0verflow.com 4cd41f34ea Removing windows specific code. Everything now compile and work the same for the three OS 2010-02-20 23:35:09 +00:00
izsh@fail0verflow.com 5e174a511b marcan's patch until he gets commit access. Remove C library's includes from the firmware side since it's not available anyway and not used 2010-02-20 03:07:55 +00:00
izsh@fail0verflow.com cbb03be993 Oops forgot a file 2010-02-20 00:38:24 +00:00
izsh@fail0verflow.com 91c38cf715 Fix windows compilation issues. But still not final. We should move to pthread and factorize the code with *nix). Ideally we should move to libusb-1.0 too. 2010-02-20 00:36:48 +00:00
izsh@fail0verflow.com 8381984556 Cosmetic changes, replace mismatched indentation 2010-02-08 11:58:40 +00:00
izsh@fail0verflow.com 5a956258d3 alphabet ;) 2010-02-06 18:24:22 +00:00
izsh.f0f 41dab15305 Alphabetical order ;) And cosmetic changes (remove duplicated includes) 2010-02-05 17:16:14 +00:00
izsh.f0f 535b5a59bd Change -std=c99 to -std=gnu99 to be able to compile libusb-0.1.* which uses u_int*_t and PATH_MAX 2010-02-05 11:16:07 +00:00
izsh.f0f 040a7baad0 client/cmdparser.c: Cosmetic changes.
client/cmdlf.c: Add missing include for "WaitForResponse".
2010-02-05 01:06:53 +00:00
izsh.f0f 7fe9b0b742 Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.

The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P

The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.

Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)

client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.

client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.

client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.

client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.

include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.

common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.

armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.

common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 01:27:07 +00:00
izsh.f0f b961ef035a client/elf.h: Add missing Elf32_Phdr struct to compile under Mac OS X. client/flash.h: Add missing header ifndef. 2010-01-05 12:32:44 +00:00