Commit graph

256 commits

Author SHA1 Message Date
marshmellow42
04d2721b3c lf psk demods
clarify existing as psk1
added psk2 demod
2015-01-26 17:23:19 -05:00
marshmellow42
9c0f13d5dd Merge remote-tracking branch 'upstream/master' 2015-01-26 17:07:49 -05:00
marshmellow42
03e6bb4aed lf FSK demod tools/fixes
added full ability to detect FSK clocks
applied autodetect of fsk clock to data fskrawdemod
this finished data fskfcdetect (now detects field clocks and bit clock)
2015-01-22 14:24:03 -05:00
marshmellow42
ec75f5c10a lf Bug Fixes and lf demod additions
added data fskparadoxdemod
added data setdebugmode (for demods)
added data shiftgraphzero (to help clean weak reads)
fixed a few bugs with the data detectaskclock
added data fskfcdetect to detect FSK clocks
adjusted most of my demods to put raw tag binary to demod buffer for
future sim and clone commands (psk still needs work)
2015-01-20 17:28:51 -05:00
iceman1001
a1557c4c2f Minor fixes: Array inits, some array bounds checks.
ADD: some extra help text for lf snoop
ADD: HasGraphData - function in graph.c
ADD: DetectHighLowInGraph  - function in graph.c
2015-01-20 22:14:56 +01:00
marshmellow42
1e090a61a1 lf demod additions
data fskfcdetect (field clock and bit clock detect for FSK)
data fskdemodawid -AWID demod/decode
data fskdemodpyramid - AWID demod/decode
2015-01-18 18:13:32 -05:00
marshmellow42
84871873a4 Small lf bug fixes and threshold adjustments
adjusted lf demod thresholds based on additional testing
fixed bug in hid bit length calc in cmddata.c
fixed bugs in lf search
2015-01-13 17:21:36 -05:00
marshmellow42
ae6ead3dc8 Merge remote-tracking branch 'upstream/master'
Conflicts:
	client/cmdlf.c
2015-01-13 16:02:23 -05:00
marshmellow42
ac3ba7ee69 lf search use new psk, small demod adjustments
adjust thresholds for ask, fsk, io, psk based on more sample testing
adjust indala decode to set clock to 32 if no input (autodetect not
always correct)
2015-01-09 16:46:17 -05:00
iceman1001
952a8bb59b Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
	armsrc/lfops.c
	client/cmddata.c
	client/graph.c
2015-01-08 22:23:45 +01:00
marshmellow42
d6d20c5435 cmddata.c changes by others - reapply
i overwrote some changes in cmdsamples.  i fixed that
i also removed some comments in graph.c
2015-01-07 19:06:29 -05:00
marshmellow42
3aa4014baa Fix Tune Samples (broken in commit 12/31 by me) 2015-01-07 18:14:28 -05:00
marshmellow42
ba1a299ce6 code cleanup. re-added psk commands.
also fixed a bug in detect clock functions.
sync with master prep for pull request
2015-01-07 18:14:27 -05:00
marshmellow42
4118b74dc8 added data psk* cmds for pskdemod
fixed a couple small bugs in other lf functions as well including
detectaskclock,  stopped changes from being made to graphbuffer.
2015-01-07 18:13:26 -05:00
iceman1001
b915fda392 FIX: a solution for the issue "hf mf esave - always saves 4K"
FIX: a solution for the issue "hf eload, esave, cload, save - filepath variable too short"
CHG: minor code clean up.
ADD: AES / CRC16 for lua. (and tnp3xx scripts.)
ADD: tnp3dump.lua  script to dump tnp3xx tags.
ADD: tnp3sim.lua script to let PM3 imitate an tnp3xx tag. Needs to be tested live
2015-01-07 22:00:29 +01:00
iceman1001
d91a31f935 CHG: minor code clean up.
ADD: tunesamples in cmddata.c  pullrequest #33,  was removed by Marshmellows other commits. I returned it.
2015-01-07 21:29:38 +01:00
iceman1001
3fe4ff4f03 CHG: generic code clean up. Removal of commented code.
CHG: USB_CMD_DATA_SIZE is now used as maxsize for transfer of data between client and pm3device
CHG: suggested a fix for the underscore problem in ioclass\fileutils.c
ADD:  tnp3xx support
ADD:  nxp tag idents.
ADD:  identifiction of chinese backdoor commands to hf 14a reader.
2015-01-05 15:51:27 +01:00
marshmellow42
ac914e56db minor adjustment to askmandemod for lf search
returns false if it finds data but not an EM410x format.
2014-12-31 14:55:58 -05:00
marshmellow42
9ec1416ad2 added data rtrim command
enter location to trim all samples after
2014-12-31 14:43:49 -05:00
marshmellow42
f822a063b3 lf demod code cleanup - added fskraw arguments
merged code and added arguments to data fskrawdemod to allow other fsk
mode demodulations (FSK2a = RF/10 & RF/8) another might be (RF/8 & RF/5)
2014-12-31 02:27:30 -05:00
marshmellow42
d5a72d2fee LF demod/cmd code cleanup + new lf search
cleaned up and error proof code.  plus added new command    lf search
when online it will lf read - data samples 20000 - and test for EM410x,
HID, IO Prox, and indala cards.  when offline it will test current
graphbuffer.
2014-12-30 16:08:33 -05:00
marshmellow42
6bfa18eab4 Merge pull request #1 from Proxmark/master
Test
2014-12-29 16:14:23 -05:00
marshmellow42
2df8c07907 minor setting adjustments/cleanup
clean up code
2014-12-29 15:58:59 -05:00
marshmellow42
66707a3b3c LF Demod bug fixes and add lf em em410xdemod
fixed a few bugs in lf demod that the streamlining added.  added new lf
em em410xdemod command that loops until button pressed. (similar to lf
hid fskdemod
2014-12-29 15:32:53 -05:00
marshmellow42
7db5f1ca25 slight adjustment to include
removed extra unneeded path
2014-12-28 21:29:33 -05:00
marshmellow42
eb191de615 LF Demod streamlining
one shared location for demoding lf for arm and client.  also added a
few raw demod commands.
2014-12-28 20:33:32 -05:00
marshmellow42
9e6dd4eb69 rename askrawdemod to askmandemod 2014-12-24 13:01:09 -05:00
marshmellow42
0e74c023bd Created new detectclock function + EM decode addons
new detectclock is somewhat more reliable for ASK modulated tags.  added
this detect to askrawdemod if no clock in passed as an argument.  also
added more EM ID formats to output
2014-12-24 11:48:41 -05:00
marshmellow42
cd48c19c31 minor askrawdemod adjustment if errors in demoding are found
if it can't find a demod position with no errors it will find the one
with fewest errors and mark errors with 77.
2014-12-23 15:16:53 -05:00
marshmellow42
2fc2150ea8 Add auto check for EM410x format to askrawdemod cmd
added EM410x format check and print to the data askrawdemod command.  if
it finds valid em410x format & parities it will print the EM ID and
Unique ID and a few others.
2014-12-23 12:00:13 -05:00
marshmellow42
ea7d657f75 minor fix - got too comment happy removing test code
should not have commented this code out
2014-12-22 22:50:13 -05:00
marshmellow42
e888ed8e62 added new data askrawdemod command
added new data askrawdemod command returned data fskdemod and separated
out new fskrawdemod commands
2014-12-22 17:46:28 -05:00
marshmellow42
ae2f73c12d put ask demod and mandemod
put ask demod and mandemod back until i have time to test it
2014-12-19 12:39:41 -05:00
marshmellow42
b3b706693b Final touches on IO prox and HID prox demod
makes both more robust and handles various error situations.
2014-12-19 12:14:27 -05:00
pwpiwi
2bdd68c370 unify/refactor hw tune and data tune
- unified hw tune and Enio's great data tune
- don't use BigBuf (and hardcoded Offset)
- removed special handling of CMD_MEASURED_ANTENNA_TUNING
  in UsbCommandReceived()
2014-12-17 20:57:26 +01:00
Martin Holst Swende
d6a120a25b Added Enios cool tuning-trick (LF) from forum-post: http://www.proxmark.org/forum/viewtopic.php?pid=13060#p13060 2014-11-30 22:30:36 +01:00
Martin Holst Swende
90e278d3da Fixed several issues found using a coverity-scan 2014-10-27 21:46:04 +01:00
Martin Holst Swende
d51b2eda8f Added enios dirthreshold command, patch from http://www.proxmark.org/forum/viewtopic.php?pid=11577#p11577 2014-06-11 08:42:37 +02:00
Martin Holst Swende
57c695563f Fixes to implement generation of markdown auto-generated documentation 2014-03-26 22:39:37 +01:00
roel@libnfc.org
7bb9d33e2c fixed warnings on Mac OS 10.8, xcode 5 2013-09-25 10:40:16 +00:00
martin.holst@gmail.com
4961e292aa More patches from en4rab to the hexsamples, plus patches to legicsave and legicdecode (also by en4rab). 2013-07-12 20:03:31 +00:00
roel@libnfc.org
90d74dc206 next update from en4rab on data samples 2013-04-26 20:33:05 +00:00
roel@libnfc.org
a2847518d2 en4rab fixed the 'data samples' command 2013-04-23 19:55:43 +00:00
roel@libnfc.org
28fdb04fd8 Finally, rewrote bootrom and flasher program, much faster now 2013-02-28 15:11:52 +00:00
roel@libnfc.org
902cb3c00b major USB update 2012-12-04 23:39:18 +00:00
fnargwibble@gmail.com
7ddb990032 Add plot window keystroke help
Add grid display/lock commands to plot window
2012-01-21 13:32:54 +00:00
ksjoberg
15cdabd474 Fix issue 14: mandemod and lf em4x em410xread crashes the proxmark3 client app
This fix is quick-and-dirty since it only reduces the amount of stackspace allocated by changing the data type of the array to uint8_t instead of the 32 bit integers. The reduced number of bits is OK since only (at most) 2 of the available bits are used in each element.

At least array bit utilization is improved from 6.66% to 25% :)

Large structures such as these should probably be malloc()ed.
2010-04-06 13:41:37 +00:00
adam@algroup.co.uk
c6f1fb9dbd revert command offsets now leading spaces have been stripped (thanks iZsh!) 2010-03-06 08:01:08 +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
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
adam@algroup.co.uk
fffad860fc fix output inversion in mandemod 2010-02-15 21:15:52 +00:00
adam@algroup.co.uk
dbf444a179 missing parameter in 'threshold' command help 2010-02-08 22:02:18 +00:00
adam@algroup.co.uk
33984c6a82 fix 'data load' filename pointer 2010-02-08 17:37:02 +00:00
adam@algroup.co.uk
26aa7d73ad damn that alphabet! 2010-02-06 18:11:49 +00:00
adam@algroup.co.uk
8d183c53b6 merge 'lfsamples' and 'hfsamples' into 'samples' 2010-02-06 18:06:31 +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