Commit graph

1069 commits

Author SHA1 Message Date
Martin Holst Swende
616970b3d1 Created a changelog, to be used in accordance with http://keepachangelog.com 2015-03-30 07:51:45 +02:00
Martin Holst Swende
caaf9618ae Minor mod to 'hf iclass read', it now also reads and prints the configuration of the tag found 2015-03-29 21:49:58 +02:00
Martin Holst Swende
337288f9ac Merge pull request #86 from marshmellow42/master
Fixed indents to Tabs from Spaces
2015-03-25 20:23:41 +01:00
marshmellow42
e0165dcf3a Fixed indents to Tabs from Spaces
Spacing changes ONLY - no code changes
2015-03-25 14:24:36 -04:00
Martin Holst Swende
062e28912c Merge pull request #84 from marshmellow42/master
EM410x bug fix
2015-03-25 11:10:51 +01:00
marshmellow42
327a690813 EM410x bug fix 2015-03-24 23:05:46 -04:00
marshmellow42
c7d169ec02 clean up em410x output 2015-03-24 22:11:32 -04:00
marshmellow42
90677ad99b EM410x bug fix 2015-03-24 20:26:14 -04:00
Martin Holst Swende
90a8b82fb4 Merge pull request #82 from marshmellow42/master
lf ata55x7 commands and more
2015-03-24 11:10:16 +01:00
marshmellow42
9680b11d9e remove debugging print calls 2015-03-23 20:25:54 -04:00
marshmellow42
1fbf895616 lf updates
applies icemans full ata55x7 read/write settings
adds checksum to ioprox (thanks to iceman)
adds silent mode for lf read and getSamples
fix lf em em410xwatch and lf em410xspoof
improve data rawdemod ar -  for biphase demods
improve detectclock a for strong antennas
2015-03-23 16:29:50 -04:00
marshmellow42
13d77ef964 lf t5 read plus lf demod adjustments
lf t5xx commands updated from ICEMAN
lf em410x commands updated
lf search bug fix for 2 args
test scripts from iceman
lf demod:
better ask clock detection with Strong fully clipped waves
better ask raw demod with strong fully clipped waves
fsk demod add back in skipped bits during demod
nrz demod add back in skipped bits during demod
2015-03-22 15:28:48 -04:00
Martin Holst Swende
29a7954177 Merge pull request #80 from marshmellow42/master
FIX EM Error
2015-03-16 14:03:48 +01:00
marshmellow42
2147c30778 FIX EM Error
missed two files for last push..  sorry
2015-03-16 08:39:18 -04:00
Martin Holst Swende
2e7e107c82 Merge pull request #78 from marshmellow42/master
add pyramid CS, minor psk demod fixes, minor g-prox-ii demod fix, autocorrelate improvement
2015-03-16 11:39:03 +01:00
marshmellow42
b41534d142 adjust ask/biphase handling - more complete
also added XL EM410x formats
2015-03-15 22:03:50 -04:00
marshmellow42
7a8a982bde adjust pskdemod
add skipped bits before first phase back in
PSKDemod now returns 1 for success or 0 for fail like other demods
2015-03-13 20:49:34 -04:00
marshmellow42
e74fc2ecba give credit where credit is due
thanks iceman for the crc :)
2015-03-13 14:00:11 -04:00
marshmellow42
9f7bbd24c9 data autocorr additions 2015-03-13 12:23:26 -04:00
marshmellow42
5279085ae7 Merge remote-tracking branch 'upstream/master' 2015-03-13 11:20:00 -04:00
marshmellow42
d9d41e0f3f minor g-prox-ii demod fix
lf search was occasionally outputting false results.
2015-03-13 11:18:55 -04:00
marshmellow42
73d04bb417 data psk demod minor fixes, pyramid demod add CS
also adjusted autocorrelate and added a printout for lf search u
2015-03-13 11:09:12 -04:00
pwpiwi
9185099ed8 Merge pull request #75 from pwpiwi/qtmakefile
(issue #47) use Qt5 includes and libraries, if present
2015-03-13 07:24:56 +01:00
Martin Holst Swende
aaa9f05e31 Merge pull request #77 from Proxmark/usb_check
Implemented usb_poll() within LF sim.
2015-03-12 18:15:08 +01:00
Martin Holst Swende
f7048dc8a9 Implemented usb_poll() within LF sim. This means the LF sim will be aborted whenever something comes over the USB 2015-03-12 16:32:01 +01:00
pwpiwi
04bc1c660b fix: hf 14a raw was broken
(see http://www.proxmark.org/forum/viewtopic.php?id=2351)
2015-03-11 20:19:30 +01:00
pwpiwi
8c04722db6 (issue #47) use Qt5 includes and libraries, if present 2015-03-10 19:00:39 +01:00
Martin Holst Swende
58e93ff593 Merge pull request #74 from marshmellow42/master
new and fixed lf sim commands, lf demod refactoring, data gproxIIdemod
2015-03-10 00:25:51 +01:00
marshmellow42
1302428367 finish data printdemodbuffer command 2015-03-09 16:56:00 -04:00
pwpiwi
16a95d76ac fix: (issue #73) hf mf cload didn't work. Add more annotations for Magic Cards operation. 2015-03-09 21:36:27 +01:00
marshmellow42
5658e82e1e sim buffer max settings tests 2015-03-09 15:58:06 -04:00
marshmellow42
ada339a10f biphase bug fixes 2015-03-09 15:27:20 -04:00
pwpiwi
30364d2711 fix: broken edge detector implementation in hi_iso14443a.v resulted in decreased sensitivity 2015-03-09 20:01:37 +01:00
marshmellow42
d66d484347 fixed rawdemod help options 2015-03-08 18:07:01 -04:00
marshmellow42
712ebfa6df 1 bug fix + code trimming 2015-03-07 23:31:23 -05:00
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
pwpiwi
7843130a58 fix: (issue #72) LF simulation didn't work with lo_edge_detect.v 2015-03-06 07:42:54 +01: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
marshmellow42
11081e0459 finish gProxII_Demod 2015-03-03 16:20:18 -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
Martin Holst Swende
27eabcdccb Added brackets around crc field in protocol listings 2015-03-02 21:05:44 +01:00
marshmellow42
40b9bb85e6 oops... should this file should not have been there 2015-03-02 14:44:05 -05: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