iceman1001
e1deabc0eb
CHG: fixes a "indent" warning
2016-09-26 11:04:04 +02:00
iceman1001
1c59e80aba
CHG: fix a "indent" warning.
2016-09-26 11:01:33 +02:00
iceman1001
cf08edc97c
Merge branch 'master' of https://github.com/iceman1001/proxmark3
2016-09-26 10:37:32 +02:00
iceman1001
7d0efb37d8
CHG: the "indent" software warns about some assingments. I've tried to fix them.
2016-09-26 10:37:00 +02:00
Iceman
dac582546a
Update README.md
2016-09-25 13:06:32 +02:00
iceman1001
25d52dd261
CHG: according to measureement by @wilrn the actual timing for receiving tag data, is 90us (ONE) and 100us (ZERO) which is not mentioned anywhere before. What a find!
2016-09-24 15:15:24 +02:00
iceman1001
d5bded10e2
CHG: lowered the timout again, but re-added the spindelay since 14a requires 5ms powerup before entering the idle-state where tag starts to listen.
...
CHG: fix the ticks compare xx > 1 into xx >= 1
2016-09-23 23:23:17 +02:00
iceman1001
93b7aa8f88
ADD; added some more descriptions of what the legic prng imp does.
2016-09-23 21:29:34 +02:00
iceman1001
f885043422
FIX: "hf 14a read" / "hf mf *" / "hf mfdes info" and failure when calling these commands serveral times in row.
...
For long transactions the sspclock compare with >1 instead of >=1 .. Now the timer resets properly.
CHG: use some #define constants for iso-commands.
2016-09-23 21:28:07 +02:00
iceman1001
9bd1640803
Merge branch 'master' of https://github.com/iceman1001/proxmark3
2016-09-23 16:36:01 +02:00
iceman1001
24c49d36ba
FIX: This commit fixes the broken LF since I change the spindelay calls. The original problem is that spindelayus calls is incremented with21.3us each step, making it very hard to find exact timings found in the datasheets for T55x7, HID etcetc. When @marshmellow and I looked into this 2014, I had this on my back of my mind but forgot it since I didn't know how the source code / pm3 worked. This behavior in spindelayus has given the bit-period for ON/OFF measured in (us) very hard to find. Its kind of magic that it worked so far so good. Well until I started to look into the "hf legic" bitbanging ASK ON/OFF keying and that one needs a much more precis timer. Same goes for the PCF7931 code.
...
I've added a precise timer in the new files ticks.c and moved some older stuff from util.c to have a solid base for this.
UNTESTED, and the timings measured for t55x7 in lfops.c and other parts has not been adjusted to this "correct" timer.
2016-09-23 16:35:26 +02:00
Iceman
ca142ab73d
Merge pull request #31 from osysltd/patch-1
...
fix typo
2016-09-23 14:31:12 +02:00
Osys
d79411bfba
fix typo
2016-09-23 15:20:57 +03:00
Iceman
8e4021fddc
Update README.md
...
Added a dontation call, https://paypal.me/iceman1001/
2016-09-21 20:37:43 +02:00
iceman1001
22f4dca88c
CHG: extracted some timers functionality, to get unified access to a timer/clock which counts in ticks. Moved stuff from util.c
2016-09-21 19:03:32 +02:00
iceman1001
4490a47690
ADD: some new mifare key found,
2016-09-20 23:20:27 +02:00
iceman1001
87342aadbc
CHG: adjusted timing according to @sentinel 's traces
2016-09-14 16:18:04 +02:00
Iceman
a5d8246568
Merge pull request #26 from ickerwx/indentation_fix
...
Indentation fix
2016-09-13 23:37:39 +02:00
René Werner
1cb9b2a3cf
used tabs instead of spaces
2016-09-13 21:04:13 +02:00
René Werner
78f59945a7
fixed indentation to get rid of warnings
...
warnings are treated as errors, so a warning due to misleading
indentation is kinda annoying
2016-09-13 20:57:25 +02:00
iceman1001
111c6934d4
CHG: Small steps, the waiting time between frames was unclear. At least now the tags answers to a readbyte command after the setup phase.
2016-09-12 09:19:49 +02:00
iceman1001
76471e5d17
CHG: reverted back from the idea of measureing in (us) microseconds, the timer is too raw, gives 10-15us delays. Now we are measuring ticks, which is (1 us = 1.5ticks)
...
like it was before. ie: 80us = 80*1.5 = 120ticks.
2016-09-11 11:14:12 +02:00
iceman1001
db44e049b0
CHG: this timing should be quite good. needs to be verified.
2016-09-10 22:47:11 +02:00
iceman1001
b4a6775b5e
CHG: a better micro second (us) spindely function. At average it has 8-10us delay, but its linear. Making error less when you want to wait longer..
...
SpinDelayCountUs(20) gives a delay of 28us.
SpinDelayCountUs(100) gives a delay of 110us.
SpinDelayCountUs(500) gives a delay of 508us.
2016-09-10 21:43:08 +02:00
iceman1001
f72669f366
ADD: since the client now calls legic prng, this is needed here too.
...
CHG: the OS X QT4 vs QT5 detection. NOT fixed yet.
2016-09-09 11:58:53 +02:00
iceman1001
5d15891e2b
FIX: Even the US clock had the issues with not resetting properly. Now its always ZERO when you call StartCountUS.
2016-09-09 11:57:31 +02:00
iceman1001
ad5bc8cc8c
In my attempts to make the LEGIC code better, its not working now. Timings if off.
...
CHG: switching to US clock.
CHG: better trace annotation for legic
CHG: Legic prng can now give a x bits in once.
2016-09-09 11:56:20 +02:00
iceman1001
1b12afbd9f
CHG: better annotation for 'legic'
2016-09-07 12:36:46 +02:00
iceman1001
e619ddc071
FIX: Better legic annotation, show which byte was targeted during read and write commands.
2016-09-03 12:20:12 +02:00
iceman1001
b98827ffc3
FIX: IV now is trunckated to 7bits in 'hf legic read,write, writeraw'
...
FIX: IV LSB bit is always set, in 'hf legic read,write, writeraw'
2016-09-03 12:19:05 +02:00
iceman1001
f7b4257301
FIX: the acknowledgement response in setup phase now deals with MIN22, MIN256, MIN1024 tag accordingly.
2016-09-03 12:18:02 +02:00
iceman1001
c71c5ee156
ADD: started to add tracelog in legic
...
ADD: remake of legic codebase.
ADD: started with a annotation for LEGIC in 'hf list'
2016-09-02 16:25:54 +02:00
iceman1001
5b4664e79f
CHG: Adding clarity to the command helptext.
2016-09-01 20:36:42 +02:00
iceman1001
d801514d88
CHG: Supressing output for LF or HF antenna values if zero, in 'hw tune' command
2016-09-01 20:36:10 +02:00
iceman1001
5735cfa58e
FIX: added a sanity check in preamble search to make sure it doesn't look out-of-bounds in the memcmp call
2016-09-01 20:34:56 +02:00
iceman1001
ab1112796e
CHG: removed call to bigbuff free.
2016-09-01 20:31:22 +02:00
iceman1001
d515e7a3a0
CHG: a different version string when compiling on systems without git or the release tags.
2016-09-01 16:11:31 +02:00
iceman1001
22635d611e
FIX: Only need to print a uint32_t,
2016-09-01 16:10:25 +02:00
iceman1001
56d0fb8e4d
FIX: bug in nextwatch demod, which if the found psk bits was smaller than the preamble the client crashed.
...
REM: removed some debugstatements
2016-09-01 16:09:31 +02:00
iceman1001
2deea574d3
CHG: reverting use of bigbuff, because I forgot that every switch between LF/HF images destroys BigBuff.
2016-09-01 00:52:54 +02:00
iceman1001
05aff802ae
CHG: removed a redundant include to strings.h, which made compilation errors on OS X
2016-08-31 22:10:06 +02:00
iceman1001
cc70dd6b60
FIX: should fix the typedefintion error for OS X regarding bool cmd_send
2016-08-31 21:11:57 +02:00
iceman1001
3fc01243b0
CHG: A repaint the plot window should be done to make sure its visual.
2016-08-31 19:24:18 +02:00
iceman1001
153a4a78fe
CHG: the loop in main, for usb_poll_validate_length, shouldn't do anything, it should be done inside the next call to usb_read...
2016-08-31 19:22:52 +02:00
iceman1001
8d61d9b114
CHG: this timeout doesn't influence the bad performance with my older pm3 device (green pcb). I think its too slow.
2016-08-31 19:18:48 +02:00
iceman1001
be818b1417
FIX: Forget that the prng was 0x8000 length and not 0xFFFF. Sorry. Also returned to the decomposed loop. Don't know if this armsrc optimises this at compilation time. Does someone know?
...
CHG: returned the iso14443a_setup order, it might influence my older PM3 device.
*Note* my Elechouse revisions PM3 works great with this but my older xpfga (green pcb) is hopeless. It can't fix onto the nonces in 'hf mf mifare' I think its too slow.
2016-08-31 19:17:39 +02:00
iceman1001
4c543dbd3f
ADD: added a simple averging filter function. input parameter K, can be 1 to 8
...
ref: http://www.edn.com/design/systems-design/4320010/A-simple-software-lowpass-filter-suits-embedded-system-applications
2016-08-29 20:29:31 +02:00
iceman1001
7aa24806f4
FIX: the check for formatlen was wrong.
...
Still missing the other formats, only 26bit in this one.
2016-08-26 22:31:45 +02:00
iceman1001
ffa306de61
CHG: starting to add the legic changes.. *work in progress*
2016-08-26 17:19:27 +02:00
iceman1001
89603cbddc
FIX: minor adjustments to 'lf awid bruteforce'
...
FIX: making the 'lf hid bruteforce' to work the same way as the awid one..
2016-08-26 17:18:48 +02:00