iceman1001
31b3689f0b
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/epa.c
2015-02-12 09:54:21 +01:00
Martin Holst Swende
8b9393d3bd
fixed issue #65
2015-02-12 08:21:58 +01:00
pwpiwi
19a700a8b5
hf 14a: if the tag supports it, set default timeout according to ATS
...
hf epa: remove explicit but arbitrary timeout settings
Bugfix: don't timeout when frame transmission has already started
2015-02-11 22:20:22 +01:00
iceman1001
0310364d23
chg: the inital modification of t55xx commands to use Marshmellows new demod functions.
...
fix: merged readblock & readblockPWD command.
New syntax: "lf t55xx rd <block> <password>" -- OPTIONAL password
fix. merged writeblock & writeblockPWD command.
New syntax: "lf t55xx wr <block> <data> <password>" -- OPTIONAL password
2015-02-11 17:13:30 +01:00
iceman1001
00a863f9ad
ADD: identification of EM4233
2015-02-11 17:08:16 +01:00
iceman1001
4ecde0e1ff
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/appmain.c
armsrc/iclass.c
2015-02-10 21:53:16 +01:00
Martin Holst Swende
61972abbdd
Merge branch 'master' into GenericTracing
...
Conflicts:
armsrc/iso14443a.c
2015-02-10 21:25:14 +01:00
iceman1001
1e3a799d47
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2015-02-10 09:01:31 +01:00
iceman1001
2b61c24212
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/appmain.c
armsrc/apps.h
armsrc/lfops.c
2015-02-10 08:58:14 +01:00
Jesse Hallio
3bba7deac0
Add settable ATQA and SAK to hf mf csetuid command.
2015-02-10 04:31:53 +02:00
pwpiwi
0d0d049967
hw tune, data tune: adjusted "unusable" and "marginal" voltages. Display LF tuning graph only when LF antenna is connected.
2015-02-09 22:36:53 +01:00
marshmellow42
f3bf15e484
lf/data combined detectclock functions to one
...
cleaned up detect clock functions - now uses one main function that
takes a char argument to select which modulation to detect the clock for
REMOVED commands: pskdetectclock, nrzdetectclock, fskfcdetect.
renamed DetectClock function to DetectAskClock to be more descriptive.
2015-02-09 11:11:04 -05:00
marshmellow42
b4fb11ba92
fix inconsistent spacing within functions
...
did not convert spaces to tabs but made the functions consistent with
what it used so it can be auto converted.
(sorry for the annoying space/tab usage in the past.)
we can convert all to tabs later.
2015-02-08 00:48:00 -05:00
marshmellow42
be2cf126bf
Merge remote-tracking branch 'upstream/master'
2015-02-06 14:45:46 -05:00
marshmellow42
6de4350803
data askraw patches, data askedgedetect demod,
...
data askraw patches - added amp option (for stubborn waves)
NEW data askedgedetect demod for manual demod,
adjusted detectclock (ask clock) in case of cleaned (edgedetect) waves
finish maxErr args
finish psk detect
2015-02-06 14:36:25 -05:00
Martin Holst Swende
7d5ebac993
Merge branch 'master' into GenericTracing
...
Conflicts:
armsrc/iso14443.c
armsrc/iso14443a.c
client/cmdhf.c
client/cmdhf14b.c
2015-02-06 08:41:02 +01:00
marshmellow42
e770c64824
lf psk/nrz split, add maxErr argument
...
changed psk to use wave lengths instead of peaks
split out NRZ from psk demod
added maxErr argument to raw demods (except fsk)
2015-02-05 17:01:18 -05:00
Martin Holst Swende
146c201cbe
Merge pull request #55 from jessegit/master
...
Add flasher from SVN r623 for HID bootprom and current Mac OS X kext
2015-02-05 19:43:46 +01:00
Martin Holst Swende
b37235637f
Merge pull request #57 from iceman1001/feature
...
FIX: LF TI WRITE inparameters didn't get copied by sscanf.
2015-02-05 19:43:26 +01:00
iceman1001
5c2b11eb3c
FIX: LF TI WRITE inparameters didn't get copied by sscanf. This removes the "PRIu64" and uses the 012"llx" instead.
2015-02-05 15:46:23 +01:00
iceman1001
e57fe796f5
FIX: LF TI WRITE inparameters didn't get copied by sscanf. This removes the "PRIu64" and uses the 012"llx" instead.
2015-02-05 15:43:50 +01:00
iceman1001
a6cfa75035
add: lots of new toytypes in default_toys.lua
...
fix: mixture between dec & hex numbers caused wrongly identifications of toytypes (default_toys.lua)
add: showing bytes for trap-types in tnp3dump.lua
2015-02-04 11:49:21 +01:00
iceman1001
385f398740
prepare to update the LF T55XX commands
2015-02-04 11:48:36 +01:00
iceman1001
a8d4906ba5
add: lots of new toytypes in default_toys.lua
...
fix: mixture between dec & hex numbers caused wrongly identifications of toytypes (default_toys.lua)
add: showing bytes for trap-types in tnp3dump.lua
2015-02-04 11:40:49 +01:00
Jesse Hallio
e9281ae812
Add flasher from SVN r623 for HID bootprom and current Mac OS X kext
2015-02-03 23:22:39 +02:00
Martin Holst Swende
1f78a4d305
Merge pull request #54 from Proxmark/lf_recorder
...
LF: Ability to do longer traces/snoops
2015-02-02 19:54:07 +01:00
Martin Holst Swende
0644d5e3a3
Merged with master
2015-01-31 18:21:38 +01:00
Martin Holst Swende
c856ceae8a
Fixed undecimation command
2015-01-31 12:42:40 +01:00
Martin Holst Swende
698b649e0e
Added undec to un-decimate data on the client side, so we can use all those sweet demodders even if the data has been decimated on the ARM side
2015-01-31 00:05:04 +01:00
Martin Holst Swende
31abe49fd3
Some more fixes to longer lf recordings. Now also supports longer snoops, and an additional command 'lf config' has been defined, instead of having to specify all params for every call
2015-01-30 23:03:44 +01:00
iceman1001
c4e3b1b6a2
Change in progress, the adjustments to use Marshmellow's new demod for T55XX commands.
2015-01-30 15:45:56 +01:00
iceman1001
e58c712c9e
ADD: a switch to detect if Qt4 or Qt5 is used.
2015-01-30 15:23:01 +01:00
iceman1001
908536d161
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
client/cmddata.c
2015-01-30 15:22:01 +01:00
Iceman
0c5998c051
Update cmddata.c
...
as suggested, a bitwise bounds check in cmddata.
2015-01-30 15:17:07 +01:00
iceman1001
21e06301b9
Call to GetClock had wrong number of inparameters
...
Added missing functions to header file
2015-01-30 09:26:03 +01:00
iceman1001
f4a694f998
ohps, forgot to multiply it up again.
2015-01-30 09:23:49 +01:00
iceman1001
33c7e2f3bc
wrong letter in variable name
...
Conflicts:
client/cmddata.c
2015-01-29 22:35:19 +01:00
iceman1001
7ea7465bbb
wrong letter in variable name
2015-01-29 22:22:29 +01:00
iceman1001
b6bf652821
Minor bounds checks for setDemodBuf and printDemodBuff
2015-01-29 21:44:24 +01:00
iceman1001
64d1b4efc9
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/Makefile
armsrc/appmain.c
armsrc/apps.h
armsrc/epa.c
armsrc/iclass.c
armsrc/iso14443a.c
armsrc/iso14443a.h
armsrc/iso15693.c
armsrc/lfops.c
armsrc/mifarecmd.c
armsrc/mifareutil.c
armsrc/mifareutil.h
armsrc/string.h
armsrc/util.h
bootrom/bootrom.c
client/Makefile
client/cmddata.c
client/cmddata.h
client/cmdhf.c
client/cmdhf14a.c
client/cmdhf14b.c
client/cmdhf15.c
client/cmdhficlass.c
client/cmdhfmf.c
client/cmdhfmfu.c
client/cmdlf.c
client/cmdlfem4x.c
client/cmdlfhid.c
client/cmdlfhitag.c
client/cmdlfio.c
client/cmdmain.c
client/data.h
client/flash.c
client/graph.c
client/graph.h
client/loclass/elite_crack.c
client/loclass/fileutils.c
client/lualibs/commands.lua
client/lualibs/html_dumplib.lua
client/lualibs/mf_default_keys.lua
client/lualibs/utils.lua
client/mifarehost.c
client/nonce2key/crapto1.c
client/proxmark3.c
client/scripting.c
client/scripts/tnp3dump.lua
client/scripts/tnp3sim.lua
client/scripts/tracetest.lua
common/Makefile.common
common/cmd.c
common/cmd.h
common/lfdemod.c
common/lfdemod.h
common/usb_cdc.c
common/usb_cdc.h
include/usb_cmd.h
2015-01-29 21:39:33 +01:00
Martin Holst Swende
92623113b4
Minor documentation on 'hf list'
2015-01-29 20:01:30 +01:00
Martin Holst Swende
f6d9fb173f
Added client-side support for recording longer samples, fixed last (?) issues on device-side
2015-01-29 00:57:22 +01:00
pwpiwi
f71f4deb8f
BigBuf and tracing rework: allow much longer traces in in hf commands
...
- provided a BigBuf_malloc() function to dynamically allocate parts of BigBuf
e.g. for DMA-Buffers, Frame-Buffers, Emulator-Memory
- the whole rest of BigBuf is now available for traces (instead of a small fixed amount)
- send actual traceLen together with trace data
- changed client side to cope with varying traceLen
- changed small buffers to automatic variables instead of parts of BigBuf
2015-01-28 07:18:51 +01:00
Martin Holst Swende
936e0729f9
Merge pull request #49 from marshmellow42/master
...
LF Demod Bug Fix & new traces
2015-01-27 22:14:39 +01:00
Martin Holst Swende
383608a63a
Minor fixes to iso14443a annotations
2015-01-27 21:55:08 +01:00
marshmellow42
a1d17964a2
lf demod bug fix & refactor
...
fixed bug in lfops.c in hid fskdemod
refactored data fskXXXDemods for specific tags to use more common code.
2015-01-27 14:51:12 -05:00
Martin Holst Swende
08e8317c21
More annotations to iso14443b protocol listings
2015-01-27 16:34:45 +01:00
marshmellow42
8c65b650e8
clean up some comments
2015-01-26 17:49:30 -05:00
marshmellow42
04d2721b3c
lf psk demods
...
clarify existing as psk1
added psk2 demod
2015-01-26 17:23:19 -05:00
marshmellow42
9c0f13d5dd
Merge remote-tracking branch 'upstream/master'
2015-01-26 17:07:49 -05:00