RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-14 03:03:14 +08:00
Code Issues Projects Releases Packages Wiki Activity
4151 commits 3 branches 15 tags 87 MiB
Commit graph

4151 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chris
75c8bc0f69 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2018-08-16 16:47:54 +02:00
RFID Research Group
0cb2dc44a1
Merge pull request #9 from TomHarkness/master 
fix missing text in proxmark.sh
 2018-08-16 16:47:23 +02:00
TomHarkness
bf5d618390 fix missing test in proxmark.sh 2018-08-17 00:41:42 +10:00
Chris
c7f5ac95d8 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2018-08-16 16:31:40 +02:00
RFID Research Group
ebbc49efde
Merge pull request #7 from TomHarkness/master 
Updated update.sh - by joanbono from iceman1001/proxmark3
 2018-08-16 16:31:01 +02:00
TomHarkness
4229f7a1de Added 'proxmark.sh' from joanbono and entry in changelog 2018-08-17 00:22:54 +10:00
TomHarkness
8e1e34e66f Updated install.sh to detect OS and created a function that installs properly for OS X 2018-08-16 23:53:09 +10:00
TomHarkness
cbe74d8400 Updated update.sh from iceman1001/proxmark3 - by joanbono 2018-08-16 21:47:02 +10:00
Chris
fe332a1f2b removed unneeded ramfunc attribute 2018-08-13 23:50:17 +02:00
Chris
91dea8d694 code clean. 2018-08-13 23:49:33 +02:00
RFID Research Group
39c4548bf3
Merge pull request #2 from iceman1001/patch-1 
Update README.md
 2018-08-13 22:48:24 +02:00
Iceman
afaa20b90a
Update README.md 2018-08-13 22:41:27 +02:00
Chris
8c0aa0c86d FIX: 'hf mf chk' - chkkeys param error fix #1 2018-08-13 22:37:44 +02:00
Chris
4123f09602 update 2018-08-13 13:58:06 +02:00
Chris
cfbd67d082 Fix: 'hf emv' - some cards need to have Le=0x00, some need to not to have... (@merlokk) 2018-08-13 13:56:48 +02:00
Chris
5f77121694 initial commit to be in sync the-soon-defunct repo pm3rdv40. 2018-08-12 21:54:31 +02:00
Iceman
905df58cc3
Merge pull request #227 from drandreas/development 
Clean Legic Reader
 2018-08-12 13:58:25 +02:00
Andreas Dröscher
9ba20b590a change: reduced demodulator to bare minimum 
The initial code added complexity without improving reading distance.
Thankfully the peak detection signal path has a low noise floor.
 2018-08-12 12:51:45 +02:00
Andreas Dröscher
0d0b651246 change: re-added trace log 2018-08-12 12:51:45 +02:00
Andreas Dröscher
ff5b046903 change: re-added status LEDs 
- LED_A: FPGA and 13.56MHz carrier is active
- LED_B: Reading Byte
- LED_C: Writing Byte
 2018-08-12 12:41:45 +02:00
Andreas Dröscher
e052fbc433 change: re-added legic write support 2018-08-12 12:41:45 +02:00
Andreas Dröscher
9d330dde87 fix: 32bit tick timer based on TC0 and TC1 
TC1 counts the number of TC0 overflows (carry bits).
In random conditions TC1 would return or stay at zero,
instead of counting up. This due to the behavior of the
reset signal.

SAM7S Series Datasheet, 33.5.6 Trigger:
Regardless of the trigger used, it will be taken into account
at the following active edge of the selected clock. This means
that the counter value can be read differently from zero just
after a trigger, especially when a low frequency signal is
selected as the clock.

The new code first prepares TC1 and asserts TC1 trigger and
then prepares TC0 and asserts TC0 trigger. The TC0 start-up
will reset TC1.
 2018-08-12 12:41:11 +02:00
Andreas Dröscher
c06f0af7f3 change: switched from timestamps (us) to ticks 
GetCountUS() has a jitter of +/- 7us this is not precise
enough to keep the PRNG in sync. 1.5 * GET_TICKS on the
other hand is spot on.
 2018-08-12 09:59:48 +02:00
Andreas Dröscher
e0adc976e0 change: added rx/tx coordination timestamp 2018-08-12 09:59:48 +02:00
Andreas Dröscher
7244f5825d change: legic reader tx back to bigbang 
I've tried to modulate the Legic specific pause-puls using ssc and the default
ssc clock of 105.4 kHz (bit periode of 9.4us) - previous commit. However,
the timing was not precise enough. By increasing the ssc clock this could
be circumvented, but the adventage over bitbang would be little.
 2018-08-12 09:59:48 +02:00
Andreas Dröscher
3029223158 change: legic reader now uses xcorrelation and ssc based io 
- Even tough legic tags transmit just AM using xcorrelation
   results in a significantly better signal quality.
 - Switching from bit bang to a hardware based ssc frees
   up CPU time for other tasks e.g. demodulation
 2018-08-12 09:59:48 +02:00
Andreas Dröscher
c59150657c add: xcorr 211.875 kHz option 
The FPGA supported this frequency for a long time, just the ARM code
had no define to enable it.
 2018-08-12 09:59:48 +02:00
Andreas Dröscher
bf123082e8 change: remove jerry-riged hysteresis based receiver from hi_read_tx 
This future got obsolete by a x-correlation based receiver.

This reverts commit 24fe4dffb4.
 2018-08-12 09:59:48 +02:00
Andreas Dröscher
db70ab8f7d change: remove broken legic simulator 
It will be rewritten in a later commit
 2018-08-12 09:59:48 +02:00
Andreas Dröscher
8a53137ab0 change: remove dead legic code 
This code was either disabled or never reached.
 2018-08-12 09:59:48 +02:00
Andreas Dröscher
e779f06c5e change: clean up Legic interface 
I see no adventage in poluting all sources that include legicrf.h
with our internal depedencies (includes) and function names.
 2018-08-12 09:59:48 +02:00
Iceman
9b03cd9cd6
Update cmdhfmf.c 
fix #225
 2018-08-10 18:28:51 +02:00
Iceman
824d10005c
Merge pull request #223 from drandreas/xcorr 
change: fixed xcorrelation for strong signal
 2018-08-10 06:27:57 +02:00
Andreas Dröscher
83a4259ddc change: fixed xcorrelation for strong signal 
The initial code assumed phase shift modulation only. Lately,
xcorrelation is also used for load modulation. But the initial
the assumption that 11 bits are enough isn't true for load
modulation.

This change extends the registers by 2 bits and compresses the
uper bits to preserve the sensitivity on the lower end.
 2018-08-10 02:36:04 +02:00
Iceman
0830677923
Merge pull request #221 from iceman1001/revert-219-master 
Revert "WIP: Clean Legic Reader"
 2018-08-06 15:05:53 +02:00
Iceman
c339035ec5
Revert "WIP: Clean Legic Reader" 2018-08-06 15:05:36 +02:00
Iceman
0df3a49ecc
Merge pull request #219 from drandreas/master 
WIP: Clean Legic Reader
 2018-08-06 14:55:08 +02:00
Iceman
7d0fd7203e
Merge pull request #220 from grauerfuchs/iceman_fork 
fixed: lf t55 config d won't accept FSK2a
 2018-08-05 10:26:52 +02:00
grauerfuchs
910c86a30f fixed: "lf t55 config d" won't accept modulations with length > 4 chars (FSK2a, etc.) 2018-08-04 20:49:20 -04:00
grauerfuchs
1e48d34612
Merge pull request #1 from iceman1001/master 
cross-merging fork to branch from Iceman's repository
 2018-08-04 20:40:03 -04:00
Andreas Dröscher
058426fa17 change: added rx/tx coordination timestamp 2018-08-05 00:57:20 +02:00
Andreas Dröscher
8f797d1388 change: legic reader tx back to bigbang 
I've tried to modulate the Legic specific pause-puls using ssc and the default
ssc clock of 105.4 kHz (bit periode of 9.4us) - previous commit. However,
the timing was not precise enough. By increasing the ssc clock this could
be circumvented, but the adventage over bitbang would be little.
 2018-08-05 00:57:20 +02:00
Andreas Dröscher
78d5188922 change: legic reader now uses xcorrelation and ssc based io 
- Even tough legic tags transmit just AM using xcorrelation
   results in a significantly better signal quality.
 - Switching from bit bang to a hardware based ssc frees
   up CPU time for other tasks e.g. demodulation
 2018-08-04 23:13:17 +02:00
Andreas Dröscher
d7c57dbc08 add: xcorr 211.875 kHz option 
The FPGA supported this frequency for a long time, just the ARM code
had no define to enable it.
 2018-08-04 23:13:17 +02:00
Andreas Dröscher
7517c894d2 change: remove jerry-riged hysteresis based receiver from hi_read_tx 
This future got obsolete by a x-correlation based receiver.

This reverts commit 24fe4dffb4.
 2018-08-04 23:13:17 +02:00
Andreas Dröscher
1adff322b1 change: remove broken legic simulator 
It will be rewritten in a later commit
 2018-08-04 23:13:17 +02:00
Andreas Dröscher
33eb2f5fa0 change: remove dead legic code 
This code was either disabled or never reached.
 2018-08-04 23:13:17 +02:00
Andreas Dröscher
37867fbf3b change: clean up Legic interface 
I see no adventage in poluting all sources that include legicrf.h
with our internal depedencies (includes) and function names.
 2018-08-04 23:13:17 +02:00
Chris
bacf8aff0f add: FPC connector skeleton usart. Not working but if will be a starting point for those who might want to help out with it. 2018-07-30 09:54:44 +02:00
iceman1001
08d9d9daf9 cleaning 2018-07-29 18:20:56 +02:00