marshmellow42
df51693f95
Merge remote-tracking branch 'upstream/master'
2015-03-06 12:30:16 -05:00
marshmellow42
78f5b1a77c
lf sim fixes/creations correct now
...
fixed lf simpsk
fixed lf em em410xsim
fixed lf sim (can go right from lf search to lf sim if you have a
strong antenna - if not use a demod first)
2015-03-06 12:28:54 -05:00
marshmellow42
e09f21fa7b
Revert "lf sim fixes/creations"
...
This reverts commit 293de1bad7
2015-03-06 12:26:33 -05:00
marshmellow42
293de1bad7
lf sim fixes/creations
...
fixed lf simpsk
fixed lf em em410xsim
fixed lf sim (can go right from lf search to lf sim if you have a
strong antenna - if not use a demod first)
2015-03-06 12:25:36 -05:00
ikarus
9cefee6f42
Fixed issue #36 & improved file consistency.
2015-03-04 11:00:39 +01:00
marshmellow42
39676885b4
Merge remote-tracking branch 'upstream/master'
2015-03-03 20:44:37 -05:00
Martin Holst Swende
c8387e85e3
iClass full simulation of tags now officially works, with some cheating regarding reader update and write commands
2015-03-02 21:30:22 +01:00
marshmellow42
8d960002c8
lf cmds fix, add, show
...
show command to UI:
data printdemodbuffer - allow printing of demod buffer
Add:
data askgproxiidemod - demod a gproxii tag
Fix:
adjust lf simxxx commands further for testing
2015-03-02 14:42:55 -05:00
Martin Holst Swende
e5cd4ee4b4
Tag MAC finally works! (Full sim not yet, though)
2015-03-02 20:14:35 +01:00
Martin Holst Swende
61fe90736b
Implemented the correct way to calculate MAC from a tag, feeding it an extra 32 zeroes. Also divided it up into two parts, one of which can be precalculated by the device before the simulation begins
2015-03-02 00:38:36 +01:00
marshmellow42
73da818743
lf simulation tests
...
added SimulateTagLowFrequencyTest function
with some adjustments that help ASK simulations
FSK and PSK still need help. Left original HID sim alone as for some it
may partially work.
2015-02-28 14:33:05 -05:00
Martin Holst Swende
c99dc845b1
Added the ciphers also.. doh
2015-02-27 20:19:10 +01:00
Martin Holst Swende
10a8875c72
Implemented new optimized version of MAC-calculation for iclass
2015-02-26 20:35:35 +01:00
marshmellow42
872e3d4d6f
NEW lf simpsk
2015-02-21 21:36:02 -05:00
Martin Holst Swende
b19caaefc2
Fixed minor bugs in iclass fullsim, does not work yet though
2015-02-21 20:47:40 +01: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
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
e80aeb9695
Started iclass emulator support on device side. Not functional yet
2015-02-14 21:30:26 +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
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
Martin Holst Swende
61972abbdd
Merge branch 'master' into GenericTracing
...
Conflicts:
armsrc/iso14443a.c
2015-02-10 21:25:14 +01:00
Martin Holst Swende
904a96cd80
Merge pull request #59 from marshmellow42/master
...
lf demod additions/fixes
2015-02-09 20:28:12 +01: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
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
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
bb42a03ef1
Fix #1 for pm3 iclass simulation, remove erroneous extra bit after transmission
2015-02-05 19:40:47 +01:00
Martin Holst Swende
0644d5e3a3
Merged with master
2015-01-31 18:21:38 +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
b3cc5f2987
Reverted erroneous commit from bigbuf-rework
2015-01-29 19:58:46 +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
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
marshmellow42
a1d17964a2
lf demod bug fix & refactor
...
fixed bug in lfops.c in hid fskdemod
refactored data fskXXXDemods for specific tags to use more common code.
2015-01-27 14:51:12 -05:00
Martin Holst Swende
16b75f27c3
Minor tweaks to iso14443b snoop tracing
2015-01-27 16:34:11 +01:00
Martin Holst Swende
03dc174036
Minor refactoring
2015-01-27 09:06:01 +01:00
marshmellow42
9c0f13d5dd
Merge remote-tracking branch 'upstream/master'
2015-01-26 17:07:49 -05:00
Martin Holst Swende
aeadbdb216
Generic tracing: Some fixes in iso14443b snooping, to how DMA access is performed, sizes and buffers.
2015-01-26 22:10:05 +01:00
