RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-11-12 20:45:28 +08:00
Code Issues Projects Releases Packages Wiki Activity
1101 commits 3 branches 14 tags 87 MiB
Commit graph

1101 commits

This branch
This branch
All branches
Author SHA1 Message Date
iceman1001
6af88242eb Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	client/util.c
 2015-02-14 12:30:08 +01:00
iceman1001
68008fb517 add: timeouts for "lf read" 
chg: change command consistency "lf t55xx rd" -> "lf t55xx read"
chg: buffer size used for armside is quite big. maybe to big. takes too long to read.
 2015-02-14 12:29:02 +01:00
Martin Holst Swende
2e2fc9fa6b Merge branch 'master' of github.com:Proxmark/proxmark3 2015-02-13 19:59:50 +01:00
Martin Holst Swende
699bb9dc27 Removed some dev- printouts 2015-02-13 19:59:28 +01:00
iceman1001
b359cee677 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-02-13 10:16:39 +01:00
iceman1001
4e7af352b4 chg: step two for t55xx commnads 2015-02-13 10:16:21 +01:00
Martin Holst Swende
17c60b1248 Merge pull request #63 from marshmellow42/master 
lf data combine rawdemods & depreciate cmds
 2015-02-13 10:11:40 +01:00
Martin Holst Swende
37735250ca Merge pull request #66 from iceman1001/feature 
ADD:  identification of EM4233
 2015-02-13 10:11:09 +01:00
iceman1001
31b3689f0b Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/epa.c
 2015-02-12 09:54:21 +01:00
Martin Holst Swende
8b9393d3bd fixed issue #65 2015-02-12 08:21:58 +01:00
pwpiwi
19a700a8b5 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
 2015-02-11 22:20:22 +01:00
pwpiwi
7554370c30 bugfix hf 14a sim / hf mf sim: polarity of tag subcarrier modulation was wrong 2015-02-11 21:14:34 +01:00
iceman1001
070e36d421 ADD: identification of EM4233 2015-02-11 17:14:26 +01:00
iceman1001
0310364d23 chg: the inital modification of t55xx commands to use Marshmellows new demod functions. 
fix:  merged  readblock & readblockPWD command.
      New syntax:    "lf t55xx rd <block> <password>"   -- OPTIONAL password

fix.  merged  writeblock & writeblockPWD command.
      New syntax:    "lf t55xx wr <block> <data> <password>"   -- OPTIONAL password
 2015-02-11 17:13:30 +01:00
iceman1001
00a863f9ad ADD: identification of EM4233 2015-02-11 17:08:16 +01:00
iceman1001
4ecde0e1ff Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/appmain.c
	armsrc/iclass.c
 2015-02-10 21:53:16 +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
iceman1001
1e3a799d47 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-02-10 09:01:31 +01:00
iceman1001
2b61c24212 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/lfops.c
 2015-02-10 08:58: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
iceman1001
e57fe796f5 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:43:50 +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
iceman1001
385f398740 prepare to update the LF T55XX commands 2015-02-04 11:48:36 +01:00
iceman1001
a8d4906ba5 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:40:49 +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