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
Martin Holst Swende
c99dc845b1
Added the ciphers also.. doh
2015-02-27 20:19:10 +01:00
Martin Holst Swende
188b2dbec4
Merge branch 'master' of github.com:Proxmark/proxmark3
2015-02-26 20:35:54 +01:00
Martin Holst Swende
10a8875c72
Implemented new optimized version of MAC-calculation for iclass
2015-02-26 20:35:35 +01:00
marshmellow42
ec9882b18c
PSKDemod Bug Fix
2015-02-22 21:11:25 -05:00
marshmellow42
3f41e73c7f
PSK demod adjustment
...
add carrier length test to weed out false positive demods
2015-02-22 20:09:58 -05:00
marshmellow42
3bc66a96fe
added PSK2 to lf simpsk
...
testing still ongoing.
2015-02-21 22:54:52 -05:00
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
Martin Holst Swende
b19caaefc2
Fixed minor bugs in iclass fullsim, does not work yet though
2015-02-21 20:47:40 +01: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
