marshmellow42
872e3d4d6f
NEW lf simpsk
2015-02-21 21:36:02 -05:00
marshmellow42
b4a2fcf676
Split output from nrz raw demod function
...
missed this one last time
2015-02-21 18:37:15 -05:00
marshmellow42
4ac906d1c2
split output from rawdemod functions
...
now allows for non-verbose calling:
ASKmanDemod
ASKrawDemod
FSKrawDemod
PSKDemod
2015-02-21 00:27:48 -05:00
marshmellow42
40148ab609
Merge remote-tracking branch 'upstream/master'
2015-02-19 21:38:17 -05:00
marshmellow42
abd6112fc4
Revert "Revert "lf simask, lf simfsk and bug fixes""
...
This reverts commit e396001c47
2015-02-19 21:35:34 -05:00
marshmellow42
e396001c47
Revert "lf simask, lf simfsk and bug fixes"
...
This reverts commit fb0c84c3df
2015-02-19 21:22:05 -05:00
marshmellow42
fb0c84c3df
lf simask, lf simfsk and bug fixes
2015-02-19 21:21:11 -05:00
Martin Holst Swende
0387cd3393
Merge pull request #68 from iceman1001/feature
...
ADD: identifications.
2015-02-19 10:51:10 +01:00
Martin Holst Swende
181e6db6a9
Merge pull request #67 from marshmellow42/master
...
Small help and command description updates
2015-02-19 10:50:51 +01:00
Martin Holst Swende
1defcf606f
More work on iclass full simulation, and some work on iclass tag dump parsing
2015-02-19 10:48:33 +01:00
Martin Holst Swende
b67f7ec359
Further implementation of iclass 'fullsim'. Moved protocol definitions to shared file. Had to add some loclass-function to arm-side to support authentication in fullsim mode
2015-02-18 20:02:44 +01:00
Martin Holst Swende
9a9bcea82b
Iclass decrypt error, shouldn't have decrypted block 6 according to Heart of darkness-paper
2015-02-17 23:17:43 +01:00
Martin Holst Swende
41524d8a39
Implemented 'hf iclass decrypt <tagdump>'. This performs the 3des decryption of iclass tag dumps, but requires the decryption file to be present on the filesystem
2015-02-17 22:07:40 +01:00
iceman1001
0853ffa29c
ADD: added the missing EM identifications. Thanks to Asper for providing the needed information about LC ID's
2015-02-16 19:06:24 +01:00
iceman1001
33315928fb
CHG: added some more token-tags.
2015-02-16 19:05:59 +01:00
marshmellow42
8db0534ed1
Merge remote-tracking branch 'upstream/master'
2015-02-14 21:16:27 -05:00
marshmellow42
cc2ea5ed82
Clean up Helps and command descriptions
2015-02-14 21:15:13 -05:00
Martin Holst Swende
e80aeb9695
Started iclass emulator support on device side. Not functional yet
2015-02-14 21:30:26 +01:00
Martin Holst Swende
a4749080d9
Removed un-implemented 'hf iclass write', it's confusing to have there since there's no actual support for this on the device side
2015-02-14 21:18:39 +01:00
Martin Holst Swende
534445139c
Reformatted
2015-02-14 21:17:08 +01:00
Martin Holst Swende
7781a65656
Started work on 'hf iclass eload' - only client side so far, not yet supported in the device
2015-02-14 21:15:53 +01:00
Martin Holst Swende
428d622160
Fixed bug with iclass dump which prevented saving to file
2015-02-14 20:42:23 +01:00
Martin Holst Swende
0cd2a41ac0
Made 125KHz default sampling, instead of 134KHz for LF
2015-02-14 19:55:23 +01:00
marshmellow42
abd16c456a
fix help on data rawdemod commands
2015-02-13 21:17:15 -05: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
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
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
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
