RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-21 15:56:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
1208 commits 3 branches 14 tags 86 MiB
Commit graph

1208 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
iceman1001 1c6490cddc FIX: test_t55x7_psk.lua now correctly handles bitrate/modulation/clockrate combinations for PSK1. 
Uncomment lines in main to test PSK2, PSK3.
 2015-03-18 20:29:18 +01:00
iceman1001 ca65d3af86 ADD: new tests for the T55XX commands. 
CHG:  minor output messages in cmdlft55xx.c
 2015-03-18 17:32:43 +01:00
iceman1001 78e875807f FIX: narrowed down the detect modulation even further. 
FIX: minor adjustment to t55xx inside of lfops.c when waiting for the antenna to settle.
FIX: added the possiblity to use graphbuffer fpr LF T55XX DETECT/TRACE/INFO .

MISSING:
the detect, trace, info,  doesn't use a password for those tags with enabled password-mode.
 2015-03-16 22:45:06 +01:00
iceman1001 a087e9cf40 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-03-16 14:02:08 +01: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
iceman1001 05446d5bc3 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/lfops.c
	client/cmddata.c
	common/crc.c
	common/crc.h
	common/lfdemod.c
	include/crc.h
	include/crc.h.old
 2015-03-16 13:13:18 +01:00
iceman1001 595b623bf4 CHG: removed an extra space. 2015-03-16 11:40:44 +01:00
iceman1001 8713b64fdf CHG: @Marshmellow came up with some nifty nice ideas for the t55xx modulation detection, and some minor corrections regarding the enum, 
CHG: @Marshmellow added PSK1, PSK2, PSK3.   Almost complete now. Waiting for Biphase.
ADD: @Marshmellows lf- psk demod changes,
CHG: In "lf t55xx info" the manufacturerer name is now identified and printed.
CHG: In "lf t55xx info" the modell name is now identified and printed,  however it can only identify two models presently.
 2015-03-16 11:39:31 +01: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
iceman1001 545158b398 FIX: lf t55xx config now handles offsets. 
FIX: lf t55xx trace now handles offsets.
FIX: lf t55xx info now handles offsets.
 2015-03-15 21:36:38 +01:00
iceman1001 db69363840 ADD: started to add a offset possibility for the LF T55XX. 
Ie.
  lf t55xx read 0
  lf t55xx special
  lf t55xx config o 2
  lf t55xx read 0

ADD:  added @marshmellows latest changes to psk
 2015-03-14 08:43:48 +01: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
iceman1001 2c5ed70651 CHG: minor output change, when printing found multiple modulations 
CHG: PSKDemod should be called like this according @Marshmellow
 2015-03-13 21:24:37 +01:00
iceman1001 8a13121435 CHG: now with enums :) 2015-03-13 21:02:04 +01:00
iceman1001 710208245b ADD: printConfiguration method for a nice printout of the selected configuration. 2015-03-13 19:12:11 +01:00
marshmellow42 e74fc2ecba give credit where credit is due 
thanks iceman for the crc :)
 2015-03-13 14:00:11 -04:00
iceman1001 8e726f6c37 CHG: Removed an unneccesary parameter for "hf mf sim" 2015-03-13 18:50:30 +01:00
iceman1001 d8c927bcec FIX: removed a debug statement 
FIX: initialisation of some variables is done correct.
 2015-03-13 18:49:43 +01:00
iceman1001 7b40affb6f FIX: lf t55xx commands seem to work like they should. Detect now detects between FSK/ASK/NZ/PSK 2015-03-13 17:36:40 +01: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
iceman1001 33add18764 CHG: rename of methods to follow naming convention 
CHG: LF T55XX CONFIG now defaults to ASK, non-inverse
 2015-03-13 10:05:37 +01:00
iceman1001 108262a145 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-03-13 09:22:12 +01:00
iceman1001 4d60f1562f FIX: Marshmellow hinted that I should use another fskclock method, which obeys the verbose parameter. 2015-03-13 09:00:04 +01:00
iceman1001 c387fd49a7 CHG: removed a loop after suggestions that it was unnecessary. 2015-03-13 08:59:07 +01: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
iceman1001 3e4811c8b7 FIX: adding a test to see if we managed to get the correct demodulation from an unknown t55x7 tag. 
By checking if the configuration data (page 0, block 0)  has some settings that must be the same.   think  reserved 7bits, This is a trail and error approach.
But together with setting a manual configuration to read a tag and this automatic verification it will help out alot I think.
 2015-03-12 23:04:02 +01:00
iceman1001 a8cd503dd5 FIX: @marshmellow found out that the CRC-8/Maxim was not always giving the right checksum. Change POLY from 0x31 -> 0x8C 2015-03-12 20:33:36 +01:00
iceman1001 118bfa1b1f ADD: LF T55XX CONFIG, is almost there, Usage: lf t55xx config [d <demodulation>] [i 1] 
Options:
       h                        This help
       d <FSK|ASK|PSK|NZ|BI>    Set demodulation FSK / ASK / PSK / NZ / Biphase
       i [1]                    Inverse data signal, defaults to normal

Examples:
      lf t55xx config d FSK     - FSK demodulation
      lf t55xx config d FSK i 1 - FSK demodulation, inverse data
 2015-03-12 19:44:07 +01:00
iceman1001 f2d46122d3 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-03-12 19:01:09 +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
iceman1001 83a42ef965 FIX: move and rename the CRC8Maxim method into crc.c 2015-03-12 14:12:14 +01:00
iceman1001 3d83b58b50 ADD: added a reference to a generic CRC-8 checksum algo in common/crc.c 2015-03-12 10:10:22 +01:00
iceman1001 5ff3c4017b add: a experimental lualib, unstable. 
fix: Introduced a wrong variable name due to "cut & paste" before, now fixed.
 2015-03-12 09:50:22 +01:00
iceman1001 04a6113fb5 FIX: correct some lookups in tnp3dump.lua, tnp3sim.lua 
ADD: added optional parameter (-p) to tnp3dump.lua
 2015-03-12 09:46:28 +01:00
iceman1001 963fa1c2b8 FIX: minor correction of the command description for HF 14A RAW. 2015-03-11 22:43:49 +01:00
iceman1001 96f39a47a9 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-03-11 22:21:01 +01:00
iceman1001 3ee8c808c4 ADD: added a CRC64_ECMA implementation 2015-03-11 22:06:23 +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
iceman1001 12d708fec1 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	client/cmddata.c
	client/cmddata.h
 2015-03-10 09:18:35 +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
iceman1001 652c39c63b Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-03-09 22:03:24 +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