proxmark3-svn
7 years agoMerge pull request #63 from marshmellow42/master
Martin Holst Swende [Fri, 13 Feb 2015 09:11:40 +0000 (10:11 +0100)]
Merge pull request #63 from marshmellow42/master

lf data combine rawdemods & depreciate cmds

7 years agoMerge pull request #66 from iceman1001/feature
Martin Holst Swende [Fri, 13 Feb 2015 09:11:09 +0000 (10:11 +0100)]
Merge pull request #66 from iceman1001/feature

ADD:  identification of EM4233

7 years agofixed issue #65
Martin Holst Swende [Thu, 12 Feb 2015 07:21:58 +0000 (08:21 +0100)]
fixed issue #65

7 years agohf 14a: if the tag supports it, set default timeout according to ATS
pwpiwi [Wed, 11 Feb 2015 17:30:36 +0000 (18:30 +0100)]
hf 14a: if the tag supports it, set default timeout according to ATS
hf epa: remove explicit but arbitrary timeout settings
Bugfix: don't timeout when frame transmission has already started

7 years agobugfix hf 14a sim / hf mf sim: polarity of tag subcarrier modulation was wrong
pwpiwi [Wed, 11 Feb 2015 20:14:34 +0000 (21:14 +0100)]
bugfix hf 14a sim / hf mf sim: polarity of tag subcarrier modulation was wrong

7 years agoADD: identification of EM4233 66/head
iceman1001 [Wed, 11 Feb 2015 16:08:16 +0000 (17:08 +0100)]
ADD:  identification of EM4233

7 years agoMerge pull request #58 from Proxmark/GenericTracing
Martin Holst Swende [Tue, 10 Feb 2015 20:27:47 +0000 (21:27 +0100)]
Merge pull request #58 from Proxmark/GenericTracing

Generic tracing

7 years agoMerge branch 'master' into GenericTracing 58/head
Martin Holst Swende [Tue, 10 Feb 2015 20:25:14 +0000 (21:25 +0100)]
Merge branch 'master' into GenericTracing

Conflicts:
armsrc/iso14443a.c

7 years agoMerge pull request #64 from jessegit/csetuidfix
pwpiwi [Tue, 10 Feb 2015 06:27:06 +0000 (07:27 +0100)]
Merge pull request #64 from jessegit/csetuidfix

Add settable ATQA and SAK to hf mf csetuid command.

7 years agoAdd settable ATQA and SAK to hf mf csetuid command. 64/head
Jesse Hallio [Tue, 10 Feb 2015 02:31:53 +0000 (04:31 +0200)]
Add settable ATQA and SAK to hf mf csetuid command.

7 years agoMerge remote-tracking branch 'upstream/master' 63/head
marshmellow42 [Mon, 9 Feb 2015 21:47:24 +0000 (16:47 -0500)]
Merge remote-tracking branch 'upstream/master'

7 years agohw tune, data tune: adjusted "unusable" and "marginal" voltages. Display LF tuning...
pwpiwi [Mon, 9 Feb 2015 07:53:39 +0000 (08:53 +0100)]
hw tune, data tune: adjusted "unusable" and "marginal" voltages. Display LF tuning graph only when LF antenna is connected.

7 years agolf data combine rawdemods & depreciate cmds
marshmellow42 [Mon, 9 Feb 2015 21:25:12 +0000 (16:25 -0500)]
lf data combine rawdemods & depreciate cmds

new:
data rawdemod
replaces:
data askmandemod
data askrawdemod
data fskrawdemod
data nrzrawdemod
data psk1rawdemod
data psk2rawdemod

also commented out of the CommandTable but did not remove the commands:
data askdemod
data bitstream
data fskdemod
data mandemod
data threshold

7 years agoMerge pull request #59 from marshmellow42/master
Martin Holst Swende [Mon, 9 Feb 2015 19:28:12 +0000 (20:28 +0100)]
Merge pull request #59 from marshmellow42/master

lf demod additions/fixes

7 years agolf/data combined detectclock functions to one 59/head
marshmellow42 [Mon, 9 Feb 2015 16:11:04 +0000 (11:11 -0500)]
lf/data combined detectclock functions to one

cleaned up detect clock functions - now uses one main function that
takes a char argument to select which modulation to detect the clock for
REMOVED commands: pskdetectclock, nrzdetectclock, fskfcdetect.
renamed DetectClock function to DetectAskClock to be more descriptive.

7 years agoFixed: hf mf sim failed on fast reader responses
pwpiwi [Sun, 8 Feb 2015 21:14:20 +0000 (22:14 +0100)]
Fixed: hf mf sim failed on fast reader responses
In Miller Decoder: don't wait too long for a stable signal
In Miller Decoder: Don't accept sequences of four or more zeroes as start bit
In EmSendCmd14443aRaw: don't wait for emptying the FPGA delay queue if it isn't filled

7 years agoMerge pull request #60 from pwpiwi/master
pwpiwi [Sun, 8 Feb 2015 21:09:42 +0000 (22:09 +0100)]
Merge pull request #60 from pwpiwi/master

Bugfix hw tune, hf tune: voltage measures were VERY wrong

7 years agofix inconsistent spacing within functions
marshmellow42 [Sun, 8 Feb 2015 05:48:00 +0000 (00:48 -0500)]
fix inconsistent spacing within functions

did not convert spaces to tabs but made the functions consistent with
what it used so it can be auto converted.
(sorry for the annoying space/tab usage in the past.)
we can convert all to tabs later.

7 years agoMinor dox
Martin Holst Swende [Sat, 7 Feb 2015 20:22:53 +0000 (21:22 +0100)]
Minor dox

7 years agoSome documentation and formatting to LogTraceHitag
Martin Holst Swende [Sat, 7 Feb 2015 20:05:14 +0000 (21:05 +0100)]
Some documentation and formatting to LogTraceHitag

7 years agoMoved LogTraceHitag to BigBuf (no changes to the function ... yet)
Martin Holst Swende [Sat, 7 Feb 2015 19:55:17 +0000 (20:55 +0100)]
Moved LogTraceHitag to BigBuf (no changes to the function ... yet)

7 years agoGeneric tracing; removed iso14a_XX-functions, removed traceLen as global varible
Martin Holst Swende [Sat, 7 Feb 2015 19:49:40 +0000 (20:49 +0100)]
Generic tracing; removed iso14a_XX-functions, removed traceLen as global varible

7 years agoBugfix hw tune, hf tune: voltage measures were VERY wrong 60/head
pwpiwi [Tue, 3 Feb 2015 06:21:57 +0000 (07:21 +0100)]
Bugfix hw tune, hf tune: voltage measures were VERY wrong
Modified hw detectreader: display reader field strength in mV units and to be less phony

7 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Fri, 6 Feb 2015 19:45:46 +0000 (14:45 -0500)]
Merge remote-tracking branch 'upstream/master'

7 years agodata askraw patches, data askedgedetect demod,
marshmellow42 [Fri, 6 Feb 2015 19:36:25 +0000 (14:36 -0500)]
data askraw patches, data askedgedetect demod,

data askraw patches - added amp option (for stubborn waves)
NEW data askedgedetect demod for manual demod,
adjusted detectclock (ask clock) in case of cleaned (edgedetect) waves
finish maxErr args
finish psk detect

7 years agoMerge branch 'master' into GenericTracing
Martin Holst Swende [Fri, 6 Feb 2015 07:41:02 +0000 (08:41 +0100)]
Merge branch 'master' into GenericTracing

Conflicts:
armsrc/iso14443.c
armsrc/iso14443a.c
client/cmdhf.c
client/cmdhf14b.c

7 years agolf psk/nrz split, add maxErr argument
marshmellow42 [Thu, 5 Feb 2015 22:01:18 +0000 (17:01 -0500)]
lf psk/nrz split, add maxErr argument

changed psk to use wave lengths instead of peaks
split out NRZ from psk demod
added maxErr argument to raw demods (except fsk)

7 years agoMerge pull request #55 from jessegit/master
Martin Holst Swende [Thu, 5 Feb 2015 18:43:46 +0000 (19:43 +0100)]
Merge pull request #55 from jessegit/master

Add flasher from SVN r623 for HID bootprom and current Mac OS X kext

7 years agoMerge pull request #57 from iceman1001/feature
Martin Holst Swende [Thu, 5 Feb 2015 18:43:26 +0000 (19:43 +0100)]
Merge pull request #57 from iceman1001/feature

FIX:  LF TI WRITE inparameters didn't get copied by sscanf.

7 years agoFix #1 for pm3 iclass simulation, remove erroneous extra bit after transmission
Martin Holst Swende [Thu, 5 Feb 2015 18:40:47 +0000 (19:40 +0100)]
Fix #1 for pm3 iclass simulation, remove erroneous extra bit after transmission

7 years agoFIX: LF TI WRITE inparameters didn't get copied by sscanf. This removes the "PRIu64... 57/head
iceman1001 [Thu, 5 Feb 2015 14:43:50 +0000 (15:43 +0100)]
FIX:  LF TI WRITE inparameters didn't get copied by sscanf.  This removes the "PRIu64" and uses the 012"llx" instead.

7 years agoMerge pull request #56 from iceman1001/feature
Martin Holst Swende [Thu, 5 Feb 2015 14:28:18 +0000 (15:28 +0100)]
Merge pull request #56 from iceman1001/feature

add: lots of new toytypes  in default_toys.lua

7 years agoadd: lots of new toytypes in default_toys.lua 56/head
iceman1001 [Wed, 4 Feb 2015 10:40:49 +0000 (11:40 +0100)]
add: lots of new toytypes  in default_toys.lua
fix: mixture between dec & hex numbers caused wrongly identifications of toytypes (default_toys.lua)
add: showing bytes for trap-types in tnp3dump.lua

7 years agoAdd flasher from SVN r623 for HID bootprom and current Mac OS X kext 55/head
Jesse Hallio [Tue, 3 Feb 2015 21:22:39 +0000 (23:22 +0200)]
Add flasher from SVN r623 for HID bootprom and current Mac OS X kext

7 years agoMerge pull request #54 from Proxmark/lf_recorder
Martin Holst Swende [Mon, 2 Feb 2015 18:54:07 +0000 (19:54 +0100)]
Merge pull request #54 from Proxmark/lf_recorder

LF: Ability to do longer traces/snoops

7 years agoMerged with master 54/head
Martin Holst Swende [Sat, 31 Jan 2015 17:21:38 +0000 (18:21 +0100)]
Merged with master

7 years agoFixed undecimation command
Martin Holst Swende [Sat, 31 Jan 2015 11:42:40 +0000 (12:42 +0100)]
Fixed undecimation command

7 years agoAdded undec to un-decimate data on the client side, so we can use all those sweet...
Martin Holst Swende [Fri, 30 Jan 2015 23:05:04 +0000 (00:05 +0100)]
Added undec to un-decimate data on the client side, so we can use all those sweet demodders even if the data has been decimated on the ARM side

7 years agoSome more fixes to longer lf recordings. Now also supports longer snoops, and an...
Martin Holst Swende [Fri, 30 Jan 2015 22:03:44 +0000 (23:03 +0100)]
Some more fixes to longer lf recordings. Now also supports longer snoops, and an additional command 'lf config' has been defined, instead of having to specify all params for every call

7 years agoMerge pull request #53 from iceman1001/feature
Martin Holst Swende [Fri, 30 Jan 2015 14:18:18 +0000 (15:18 +0100)]
Merge pull request #53 from iceman1001/feature

bounds check for loop - printDemodBuff

7 years agoUpdate cmddata.c 53/head
Iceman [Fri, 30 Jan 2015 14:17:07 +0000 (15:17 +0100)]
Update cmddata.c

as suggested,  a bitwise bounds check in cmddata.

7 years agowrong letter in variable name
iceman1001 [Thu, 29 Jan 2015 21:22:29 +0000 (22:22 +0100)]
wrong letter in variable name

Conflicts:
client/cmddata.c

7 years agoMinor documentation on 'hf list'
Martin Holst Swende [Thu, 29 Jan 2015 19:01:30 +0000 (20:01 +0100)]
Minor documentation on 'hf list'

7 years agoReverted erroneous commit from bigbuf-rework
Martin Holst Swende [Thu, 29 Jan 2015 18:58:46 +0000 (19:58 +0100)]
Reverted erroneous commit from bigbuf-rework

7 years agoMerge pull request #51 from marshmellow42/master
Martin Holst Swende [Thu, 29 Jan 2015 00:11:10 +0000 (01:11 +0100)]
Merge pull request #51 from marshmellow42/master

fix hid prox standalone bug

7 years agoAdded client-side support for recording longer samples, fixed last (?) issues on...
Martin Holst Swende [Wed, 28 Jan 2015 23:57:22 +0000 (00:57 +0100)]
Added client-side support for recording longer samples, fixed last (?) issues on device-side

7 years agofix hid prox standalone bug 51/head
marshmellow42 [Wed, 28 Jan 2015 17:55:04 +0000 (12:55 -0500)]
fix hid prox standalone bug

Fixed standalone bug by re-making the function return the hi and lo
values. (used only by samyrun function in appmain.c)

7 years agoMerge pull request #50 from marshmellow42/master
Martin Holst Swende [Wed, 28 Jan 2015 17:45:02 +0000 (18:45 +0100)]
Merge pull request #50 from marshmellow42/master

lf hid fskdemod bug

7 years agolf hid fskdemod bug 50/head
marshmellow42 [Wed, 28 Jan 2015 16:45:31 +0000 (11:45 -0500)]
lf hid fskdemod bug

re-introduced in last bigbuf changes

7 years agoBigBuf and tracing rework: allow much longer traces in in hf commands
pwpiwi [Tue, 27 Jan 2015 07:34:48 +0000 (08:34 +0100)]
BigBuf and tracing rework: allow much longer traces in in hf commands
- provided a BigBuf_malloc() function to dynamically allocate parts of BigBuf
  e.g. for DMA-Buffers, Frame-Buffers, Emulator-Memory
- the whole rest of BigBuf is now available for traces (instead of a small fixed amount)
- send actual traceLen together with trace data
- changed client side to cope with varying traceLen
- changed small buffers to automatic variables instead of parts of BigBuf

7 years agoRefactoring of BigBuf handling in order to prepare for more efficient memory allocati...
pwpiwi [Fri, 16 Jan 2015 10:00:17 +0000 (11:00 +0100)]
Refactoring of BigBuf handling in order to prepare for more efficient memory allocation and longer traces.

7 years agoMerge pull request #49 from marshmellow42/master
Martin Holst Swende [Tue, 27 Jan 2015 21:14:39 +0000 (22:14 +0100)]
Merge pull request #49 from marshmellow42/master

LF Demod Bug Fix & new traces

7 years agoRevert "Revert "Traces"" 49/head
marshmellow42 [Tue, 27 Jan 2015 21:08:15 +0000 (16:08 -0500)]
Revert "Revert "Traces""

This reverts commit 58f478696de57e7c6f70a5ca0c0fefaf86960b18.

7 years agoRevert "Revert "More Testing Traces""
marshmellow42 [Tue, 27 Jan 2015 21:08:08 +0000 (16:08 -0500)]
Revert "Revert "More Testing Traces""

This reverts commit eb0b5130f20ae3d9ca82b6b76779be44d7367311.

7 years agoRevert "More Testing Traces"
marshmellow42 [Tue, 27 Jan 2015 21:05:10 +0000 (16:05 -0500)]
Revert "More Testing Traces"

This reverts commit f4e739ed5897b26a5b310c610fe6bc53a6015c94.

7 years agoRevert "Traces"
marshmellow42 [Tue, 27 Jan 2015 21:05:05 +0000 (16:05 -0500)]
Revert "Traces"

This reverts commit 7f9064c6418f63be68a246111c13fb6915b715b5.

7 years agoTraces
marshmellow42 [Tue, 27 Jan 2015 20:56:03 +0000 (15:56 -0500)]
Traces

7 years agoMinor fixes to iso14443a annotations
Martin Holst Swende [Tue, 27 Jan 2015 20:55:08 +0000 (21:55 +0100)]
Minor fixes to iso14443a annotations

7 years agoMore Testing Traces
marshmellow42 [Tue, 27 Jan 2015 20:09:45 +0000 (15:09 -0500)]
More Testing Traces

7 years agolf demod bug fix & refactor
marshmellow42 [Tue, 27 Jan 2015 19:51:12 +0000 (14:51 -0500)]
lf demod bug fix & refactor

fixed bug in lfops.c in hid fskdemod
refactored data fskXXXDemods for specific tags to use more common code.

7 years agoMore annotations to iso14443b protocol listings
Martin Holst Swende [Tue, 27 Jan 2015 15:34:45 +0000 (16:34 +0100)]
More annotations to iso14443b protocol listings

7 years agoMinor tweaks to iso14443b snoop tracing
Martin Holst Swende [Tue, 27 Jan 2015 15:34:11 +0000 (16:34 +0100)]
Minor tweaks to iso14443b snoop tracing

7 years agoMerge pull request #48 from marshmellow42/master
Martin Holst Swende [Tue, 27 Jan 2015 09:21:22 +0000 (10:21 +0100)]
Merge pull request #48 from marshmellow42/master

lf demod additions & bugfixes from marshmellow

7 years agoMinor refactoring
Martin Holst Swende [Tue, 27 Jan 2015 08:06:01 +0000 (09:06 +0100)]
Minor refactoring

7 years agoclean up some comments 48/head
marshmellow42 [Mon, 26 Jan 2015 22:49:30 +0000 (17:49 -0500)]
clean up some comments

7 years agolf psk demods
marshmellow42 [Mon, 26 Jan 2015 22:23:19 +0000 (17:23 -0500)]
lf psk demods

clarify existing as psk1
added psk2 demod

7 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Mon, 26 Jan 2015 22:07:49 +0000 (17:07 -0500)]
Merge remote-tracking branch 'upstream/master'

7 years agoGeneric tracing: Some fixes in iso14443b snooping, to how DMA access is performed...
Martin Holst Swende [Mon, 26 Jan 2015 21:10:05 +0000 (22:10 +0100)]
Generic tracing: Some fixes in iso14443b snooping, to how DMA access is performed, sizes and buffers.

7 years agoSome documentation
Martin Holst Swende [Mon, 26 Jan 2015 20:15:28 +0000 (21:15 +0100)]
Some documentation

7 years agoMerge pull request #46 from holiman/master
Martin Holst Swende [Mon, 26 Jan 2015 19:59:36 +0000 (20:59 +0100)]
Merge pull request #46 from holiman/master

Iceman's changes, part 2

7 years agoRemoved last trace of crypto from makefile 46/head
Martin Holst Swende [Mon, 26 Jan 2015 19:56:33 +0000 (20:56 +0100)]
Removed last trace of crypto from makefile

7 years agobugfix
Martin Holst Swende [Thu, 22 Jan 2015 22:04:59 +0000 (23:04 +0100)]
bugfix

7 years agoAdded a lf acquisition-mode which can do decimation and quantization, in order to...
Martin Holst Swende [Thu, 22 Jan 2015 22:01:29 +0000 (23:01 +0100)]
Added a lf acquisition-mode which can do decimation and quantization, in order to be able to record longer transactions

7 years agoFixed issue where -1 size_t was returned
Martin Holst Swende [Thu, 22 Jan 2015 20:04:16 +0000 (21:04 +0100)]
Fixed issue where -1 size_t was returned

7 years agoRemoved openssl from the mfu-stuff
Martin Holst Swende [Thu, 22 Jan 2015 20:02:21 +0000 (21:02 +0100)]
Removed openssl from the mfu-stuff

7 years agolf FSK demod tools/fixes
marshmellow42 [Thu, 22 Jan 2015 19:24:03 +0000 (14:24 -0500)]
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)

7 years agoOn another note; a nice udev-rule to have pm3 appear as /dev/pm3-1 (or /dev/pm3-2...
Martin Holst Swende [Wed, 21 Jan 2015 23:33:49 +0000 (00:33 +0100)]
On another note; a nice udev-rule to have pm3 appear as /dev/pm3-1 (or /dev/pm3-2 if you have multiple)

7 years agoGeneric tracing pt.4: Deprecated old 'hf 14b list' command
Martin Holst Swende [Wed, 21 Jan 2015 23:19:20 +0000 (00:19 +0100)]
Generic tracing pt.4: Deprecated old 'hf 14b list' command

7 years agoFixed compiler error
Martin Holst Swende [Wed, 21 Jan 2015 23:10:09 +0000 (00:10 +0100)]
Fixed compiler error

7 years agoGeneric tracing pt.3 : reworking how iso14443b-traces are stored in ARM-memory
Martin Holst Swende [Wed, 21 Jan 2015 22:53:40 +0000 (23:53 +0100)]
Generic tracing pt.3 : reworking how iso14443b-traces are stored in ARM-memory

7 years agominor fix for a help in "hf 14a snoop"
iceman1001 [Wed, 21 Jan 2015 20:24:37 +0000 (21:24 +0100)]
minor fix for a help in "hf 14a snoop"

7 years agolf Bug Fixes and lf demod additions
marshmellow42 [Tue, 20 Jan 2015 22:28:51 +0000 (17:28 -0500)]
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)

7 years agoMinor fixes: Array inits, some array bounds checks.
iceman1001 [Tue, 20 Jan 2015 21:14:56 +0000 (22:14 +0100)]
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

7 years agoFIX: another file_path found in loadTraceCard and saveTraceCard, is now corrected...
iceman1001 [Tue, 20 Jan 2015 20:58:53 +0000 (21:58 +0100)]
FIX:  another file_path found  in loadTraceCard and saveTraceCard,  is now corrected to follow  FILE_PATH_SIZE variable.

FIX: some filehandles that didn't get closed.

7 years agoSUGGESTED FIX:
iceman1001 [Tue, 20 Jan 2015 20:55:19 +0000 (21:55 +0100)]
SUGGESTED FIX:

Issue: https://github.com/Proxmark/proxmark3/issues/35
Forum:  http://www.proxmark.org/forum/viewtopic.php?pid=7883#p7883

Where "hf mf csetuid"  empties the rest of the block0 bytes.
This fix loads the old block0 and replaces the uid+sak+ataq bytes only.

7 years agoFIX: The 14b write command (CmdHF14BWrite) now turns off antenna after call.
iceman1001 [Tue, 20 Jan 2015 20:50:49 +0000 (21:50 +0100)]
FIX:  The 14b write command (CmdHF14BWrite) now turns off antenna after call.

7 years agoMinor fixes to some help-texts.
iceman1001 [Tue, 20 Jan 2015 20:48:39 +0000 (21:48 +0100)]
Minor fixes to some help-texts.

7 years agoSTEP 3 - the actual new files for Ultralight.
iceman1001 [Tue, 20 Jan 2015 20:29:55 +0000 (21:29 +0100)]
STEP 3 -  the actual new files for Ultralight.
ADD: script remagic.lua  --  a script to make a "dead" Mifare s50 generation 1 alive again.
ADD: tracetest.lua  - This script will load several traces files in ../traces/ folder and do
"data load"
"lf search"
ADD: test_t55x7_psk.lua   -  iterates thru a lot of calls to check the new psk demods.

all new scripts implements the  "-h"  for help text.

7 years agoStep 2 - Ultralight / Ultralight-C
iceman1001 [Tue, 20 Jan 2015 20:23:04 +0000 (21:23 +0100)]
Step 2 -  Ultralight / Ultralight-C

With this the Pentura Labs / Midnitsnakes's original ultralight / ultralight-c implementation is enhanced and move to its own file. cmdhfmfu.c

7 years agoMerge branch 'master' of https://github.com/holiman/proxmark3
iceman1001 [Tue, 20 Jan 2015 19:59:24 +0000 (20:59 +0100)]
Merge branch 'master' of https://github.com/holiman/proxmark3

Conflicts:
armsrc/appmain.c
armsrc/apps.h

Step 1 for the Ultralight / Ultralight-c

7 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
iceman1001 [Tue, 20 Jan 2015 08:32:53 +0000 (09:32 +0100)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/appmain.c
armsrc/apps.h

7 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Sun, 18 Jan 2015 23:19:26 +0000 (18:19 -0500)]
Merge remote-tracking branch 'upstream/master'

7 years agolf demod additions
marshmellow42 [Sun, 18 Jan 2015 23:13:32 +0000 (18:13 -0500)]
lf demod additions

data fskfcdetect (field clock and bit clock detect for FSK)
data fskdemodawid -AWID demod/decode
data fskdemodpyramid - AWID demod/decode

7 years agoGeneric trace pt2: made iso14443b use standard trace format
Martin Holst Swende [Sun, 18 Jan 2015 19:23:58 +0000 (20:23 +0100)]
Generic trace pt2: made iso14443b use standard trace format

7 years agoGeneric trace pt1: Moved arm-side trace functionality into util-package
Martin Holst Swende [Sun, 18 Jan 2015 19:21:53 +0000 (20:21 +0100)]
Generic trace pt1: Moved arm-side trace functionality into util-package

7 years agoBugfix 'hf list 14b' and 'hf list raw'
Martin Holst Swende [Fri, 16 Jan 2015 21:48:30 +0000 (22:48 +0100)]
Bugfix 'hf list 14b' and 'hf list raw'

7 years agoFirst stab at adding 'hf list 14b' and 'hf list raw'
Martin Holst Swende [Fri, 16 Jan 2015 21:41:19 +0000 (22:41 +0100)]
First stab at adding 'hf list 14b' and 'hf list raw'

7 years agoMerge branch 'master' of github.com:Proxmark/proxmark3
Martin Holst Swende [Fri, 16 Jan 2015 14:49:11 +0000 (15:49 +0100)]
Merge branch 'master' of github.com:Proxmark/proxmark3

7 years agoImproved 'hf list iclass' a bit, better understanding of the protocol and when to...
Martin Holst Swende [Thu, 15 Jan 2015 22:00:39 +0000 (23:00 +0100)]
Improved 'hf list iclass' a bit, better understanding of the protocol and when to apply CRC checks

7 years agoMerge pull request #44 from marshmellow42/master
Martin Holst Swende [Thu, 15 Jan 2015 20:53:18 +0000 (21:53 +0100)]
Merge pull request #44 from marshmellow42/master

small lf demod bug fixes and threshold adjustments

Impressum, Datenschutz