Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2024-09-20 23:06:25 +08:00
Code Issues Packages Projects Releases Wiki Activity
1181 commits 3 branches 11 tags 34 MiB
Commit graph

1181 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
iceman1001 070e36d421 ADD: identification of EM4233 2015-02-11 17:14:26 +01:00
Martin Holst Swende 24cbeb3d27 Merge pull request #58 from Proxmark/GenericTracing 
Generic tracing
 2015-02-10 21:27:47 +01:00
Martin Holst Swende 61972abbdd Merge branch 'master' into GenericTracing 
Conflicts:
	armsrc/iso14443a.c
 2015-02-10 21:25:14 +01:00
pwpiwi 92bf686817 Merge pull request #64 from jessegit/csetuidfix 
Add settable ATQA and SAK to hf mf csetuid command.
 2015-02-10 07:27:06 +01:00
Jesse Hallio 3bba7deac0 Add settable ATQA and SAK to hf mf csetuid command. 2015-02-10 04:31:53 +02:00
marshmellow42 7e72f90a7f Merge remote-tracking branch 'upstream/master' 2015-02-09 16:47:24 -05:00
pwpiwi 0d0d049967 hw tune, data tune: adjusted "unusable" and "marginal" voltages. Display LF tuning graph only when LF antenna is connected. 2015-02-09 22:36:53 +01:00
marshmellow42 19ff0210fa 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
 2015-02-09 16:25:12 -05:00
Martin Holst Swende 904a96cd80 Merge pull request #59 from marshmellow42/master 
lf demod additions/fixes
 2015-02-09 20:28:12 +01:00
marshmellow42 f3bf15e484 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.
 2015-02-09 11:11:04 -05:00
pwpiwi 0c8d25ebd8 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
 2015-02-09 06:51:04 +01:00
pwpiwi 6d3e6c740b Merge pull request #60 from pwpiwi/master 
Bugfix hw tune, hf tune: voltage measures were VERY wrong
 2015-02-08 22:09:42 +01:00
marshmellow42 b4fb11ba92 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.
 2015-02-08 00:48:00 -05:00
Martin Holst Swende beefe5bc4d Minor dox 2015-02-07 21:22:53 +01:00
Martin Holst Swende 665775c844 Some documentation and formatting to LogTraceHitag 2015-02-07 21:05:14 +01:00
Martin Holst Swende aabb719dc4 Moved LogTraceHitag to BigBuf (no changes to the function ... yet) 2015-02-07 20:55:17 +01:00
Martin Holst Swende 3000dc4e7e Generic tracing; removed iso14a_XX-functions, removed traceLen as global varible 2015-02-07 20:49:40 +01:00
pwpiwi 3b692427ac 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
 2015-02-07 10:14:49 +01:00
marshmellow42 be2cf126bf Merge remote-tracking branch 'upstream/master' 2015-02-06 14:45:46 -05:00
marshmellow42 6de4350803 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
 2015-02-06 14:36:25 -05:00
Martin Holst Swende 7d5ebac993 Merge branch 'master' into GenericTracing 
Conflicts:
	armsrc/iso14443.c
	armsrc/iso14443a.c
	client/cmdhf.c
	client/cmdhf14b.c
 2015-02-06 08:41:02 +01:00
marshmellow42 e770c64824 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)
 2015-02-05 17:01:18 -05:00
Martin Holst Swende 146c201cbe Merge pull request #55 from jessegit/master 
Add flasher from SVN r623 for HID bootprom and current Mac OS X kext
 2015-02-05 19:43:46 +01:00
Martin Holst Swende b37235637f Merge pull request #57 from iceman1001/feature 
FIX:  LF TI WRITE inparameters didn't get copied by sscanf.
 2015-02-05 19:43:26 +01:00
Martin Holst Swende bb42a03ef1 Fix #1 for pm3 iclass simulation, remove erroneous extra bit after transmission 2015-02-05 19:40:47 +01:00
iceman1001 5c2b11eb3c FIX: LF TI WRITE inparameters didn't get copied by sscanf. This removes the "PRIu64" and uses the 012"llx" instead. 2015-02-05 15:46:23 +01:00
Martin Holst Swende 73a1c1bb97 Merge pull request #56 from iceman1001/feature 
add: lots of new toytypes  in default_toys.lua
 2015-02-05 15:28:18 +01:00
iceman1001 a6cfa75035 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
 2015-02-04 11:49:21 +01:00
Jesse Hallio e9281ae812 Add flasher from SVN r623 for HID bootprom and current Mac OS X kext 2015-02-03 23:22:39 +02:00
Martin Holst Swende 1f78a4d305 Merge pull request #54 from Proxmark/lf_recorder 
LF: Ability to do longer traces/snoops
 2015-02-02 19:54:07 +01:00
Martin Holst Swende 0644d5e3a3 Merged with master 2015-01-31 18:21:38 +01:00
Martin Holst Swende c856ceae8a Fixed undecimation command 2015-01-31 12:42:40 +01:00
Martin Holst Swende 698b649e0e 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 2015-01-31 00:05:04 +01:00
Martin Holst Swende 31abe49fd3 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 2015-01-30 23:03:44 +01:00
Martin Holst Swende 15491b2d73 Merge pull request #53 from iceman1001/feature 
bounds check for loop - printDemodBuff
 2015-01-30 15:18:18 +01:00
Iceman 0c5998c051 Update cmddata.c 
as suggested,  a bitwise bounds check in cmddata.
 2015-01-30 15:17:07 +01:00
iceman1001 33c7e2f3bc wrong letter in variable name 
Conflicts:
	client/cmddata.c
 2015-01-29 22:35:19 +01:00
Martin Holst Swende 92623113b4 Minor documentation on 'hf list' 2015-01-29 20:01:30 +01:00
Martin Holst Swende b3cc5f2987 Reverted erroneous commit from bigbuf-rework 2015-01-29 19:58:46 +01:00
Martin Holst Swende 63e420b572 Merge pull request #51 from marshmellow42/master 
fix hid prox standalone bug
 2015-01-29 01:11:10 +01:00
Martin Holst Swende f6d9fb173f Added client-side support for recording longer samples, fixed last (?) issues on device-side 2015-01-29 00:57:22 +01:00
marshmellow42 0892b968ce 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)
 2015-01-28 12:55:04 -05:00
Martin Holst Swende 4c18913dd8 Merge pull request #50 from marshmellow42/master 
lf hid fskdemod bug
 2015-01-28 18:45:02 +01:00
marshmellow42 08ebca682c lf hid fskdemod bug 
re-introduced in last bigbuf changes
 2015-01-28 11:45:31 -05:00
pwpiwi f71f4deb8f 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
 2015-01-28 07:18:51 +01:00
pwpiwi 117d9ec25c Refactoring of BigBuf handling in order to prepare for more efficient memory allocation and longer traces. 2015-01-27 22:25:55 +01:00
Martin Holst Swende 936e0729f9 Merge pull request #49 from marshmellow42/master 
LF Demod Bug Fix & new traces
 2015-01-27 22:14:39 +01:00
marshmellow42 88a3e9433d Revert "Revert "Traces"" 
This reverts commit 58f478696d.
 2015-01-27 16:08:15 -05:00
marshmellow42 003ac42c71 Revert "Revert "More Testing Traces"" 
This reverts commit eb0b5130f2.
 2015-01-27 16:08:08 -05:00
marshmellow42 eb0b5130f2 Revert "More Testing Traces" 
This reverts commit f4e739ed58.
 2015-01-27 16:05:10 -05:00