]> git.zerfleddert.de Git - proxmark3-svn/log
proxmark3-svn
9 years agoremove debugging print calls 82/head
marshmellow42 [Tue, 24 Mar 2015 00:25:54 +0000 (20:25 -0400)]
remove debugging print calls

9 years agolf updates
marshmellow42 [Mon, 23 Mar 2015 20:29:50 +0000 (16:29 -0400)]
lf updates

applies icemans full ata55x7 read/write settings
adds checksum to ioprox (thanks to iceman)
adds silent mode for lf read and getSamples
fix lf em em410xwatch and lf em410xspoof
improve data rawdemod ar -  for biphase demods
improve detectclock a for strong antennas

9 years agolf t5 read plus lf demod adjustments
marshmellow42 [Sun, 22 Mar 2015 19:28:48 +0000 (15:28 -0400)]
lf t5 read plus lf demod adjustments

lf t5xx commands updated from ICEMAN
lf em410x commands updated
lf search bug fix for 2 args
test scripts from iceman
lf demod:
better ask clock detection with Strong fully clipped waves
better ask raw demod with strong fully clipped waves
fsk demod add back in skipped bits during demod
nrz demod add back in skipped bits during demod

9 years agoMerge pull request #80 from marshmellow42/master
Martin Holst Swende [Mon, 16 Mar 2015 13:03:48 +0000 (14:03 +0100)]
Merge pull request #80 from marshmellow42/master

FIX EM Error

9 years agoFIX EM Error 80/head
marshmellow42 [Mon, 16 Mar 2015 12:39:18 +0000 (08:39 -0400)]
FIX EM Error

missed two files for last push..  sorry

9 years agoMerge pull request #78 from marshmellow42/master
Martin Holst Swende [Mon, 16 Mar 2015 10:39:03 +0000 (11:39 +0100)]
Merge pull request #78 from marshmellow42/master

add pyramid CS, minor psk demod fixes, minor g-prox-ii demod fix, autocorrelate improvement

9 years agoadjust ask/biphase handling - more complete 78/head
marshmellow42 [Mon, 16 Mar 2015 02:03:50 +0000 (22:03 -0400)]
adjust ask/biphase handling - more complete

also added XL EM410x formats

9 years agoadjust pskdemod
marshmellow42 [Sat, 14 Mar 2015 00:49:34 +0000 (20:49 -0400)]
adjust pskdemod

add skipped bits before first phase back in
PSKDemod now returns 1 for success or 0 for fail like other demods

9 years agogive credit where credit is due
marshmellow42 [Fri, 13 Mar 2015 18:00:11 +0000 (14:00 -0400)]
give credit where credit is due

thanks iceman for the crc :)

9 years agodata autocorr additions
marshmellow42 [Fri, 13 Mar 2015 16:23:26 +0000 (12:23 -0400)]
data autocorr additions

9 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Fri, 13 Mar 2015 15:20:00 +0000 (11:20 -0400)]
Merge remote-tracking branch 'upstream/master'

9 years agominor g-prox-ii demod fix
marshmellow42 [Fri, 13 Mar 2015 15:18:55 +0000 (11:18 -0400)]
minor g-prox-ii demod fix

lf search was occasionally outputting false results.

9 years agodata psk demod minor fixes, pyramid demod add CS
marshmellow42 [Fri, 13 Mar 2015 15:09:12 +0000 (11:09 -0400)]
data psk demod minor fixes, pyramid demod add CS

also adjusted autocorrelate and added a printout for lf search u

9 years agoMerge pull request #75 from pwpiwi/qtmakefile
pwpiwi [Fri, 13 Mar 2015 06:24:56 +0000 (07:24 +0100)]
Merge pull request #75 from pwpiwi/qtmakefile

(issue #47) use Qt5 includes and libraries, if present

9 years agoMerge pull request #77 from Proxmark/usb_check
Martin Holst Swende [Thu, 12 Mar 2015 17:15:08 +0000 (18:15 +0100)]
Merge pull request #77 from Proxmark/usb_check

Implemented usb_poll() within LF sim.

9 years agoImplemented usb_poll() within LF sim. This means the LF sim will be aborted whenever... 77/head
Martin Holst Swende [Thu, 12 Mar 2015 15:32:01 +0000 (16:32 +0100)]
Implemented usb_poll() within LF sim. This means the LF sim will be aborted whenever something comes over the USB

9 years agofix: hf 14a raw was broken
pwpiwi [Wed, 11 Mar 2015 19:17:24 +0000 (20:17 +0100)]
fix: hf 14a raw was broken
(see http://www.proxmark.org/forum/viewtopic.php?id=2351)

9 years ago(issue #47) use Qt5 includes and libraries, if present 75/head
pwpiwi [Tue, 10 Mar 2015 18:00:39 +0000 (19:00 +0100)]
(issue #47) use Qt5 includes and libraries, if present

9 years agoMerge pull request #74 from marshmellow42/master
Martin Holst Swende [Mon, 9 Mar 2015 23:25:51 +0000 (00:25 +0100)]
Merge pull request #74 from marshmellow42/master

new and fixed lf sim commands, lf demod refactoring, data gproxIIdemod

9 years agofinish data printdemodbuffer command 74/head
marshmellow42 [Mon, 9 Mar 2015 20:56:00 +0000 (16:56 -0400)]
finish data printdemodbuffer command

9 years agofix: (issue #73) hf mf cload didn't work. Add more annotations for Magic Cards operation.
pwpiwi [Mon, 9 Mar 2015 20:36:27 +0000 (21:36 +0100)]
fix: (issue #73) hf mf cload didn't work. Add more annotations for Magic Cards operation.

9 years agosim buffer max settings tests
marshmellow42 [Mon, 9 Mar 2015 19:58:06 +0000 (15:58 -0400)]
sim buffer max settings tests

9 years agobiphase bug fixes
marshmellow42 [Mon, 9 Mar 2015 19:27:20 +0000 (15:27 -0400)]
biphase bug fixes

9 years agofix: broken edge detector implementation in hi_iso14443a.v resulted in decreased...
pwpiwi [Mon, 9 Mar 2015 19:01:37 +0000 (20:01 +0100)]
fix: broken edge detector implementation in hi_iso14443a.v resulted in decreased sensitivity

9 years agofixed rawdemod help options
marshmellow42 [Sun, 8 Mar 2015 22:07:01 +0000 (18:07 -0400)]
fixed rawdemod help options

9 years ago1 bug fix + code trimming
marshmellow42 [Sun, 8 Mar 2015 04:31:23 +0000 (23:31 -0500)]
1 bug fix + code trimming

9 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Fri, 6 Mar 2015 17:30:16 +0000 (12:30 -0500)]
Merge remote-tracking branch 'upstream/master'

9 years agolf sim fixes/creations correct now
marshmellow42 [Fri, 6 Mar 2015 17:28:54 +0000 (12:28 -0500)]
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)

9 years agoRevert "lf sim fixes/creations"
marshmellow42 [Fri, 6 Mar 2015 17:26:33 +0000 (12:26 -0500)]
Revert "lf sim fixes/creations"

This reverts commit 293de1bad7bbea39eb285b2297760d51cccf07b3.

9 years agolf sim fixes/creations
marshmellow42 [Fri, 6 Mar 2015 17:25:36 +0000 (12:25 -0500)]
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)

9 years agofix: (issue #72) LF simulation didn't work with lo_edge_detect.v v2.0.0-rc2
pwpiwi [Fri, 6 Mar 2015 06:39:34 +0000 (07:39 +0100)]
fix: (issue #72) LF simulation didn't work with lo_edge_detect.v

9 years agoFixed issue #36 & improved file consistency.
ikarus [Wed, 4 Mar 2015 10:00:39 +0000 (11:00 +0100)]
Fixed issue #36 & improved file consistency.

9 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Wed, 4 Mar 2015 01:44:37 +0000 (20:44 -0500)]
Merge remote-tracking branch 'upstream/master'

9 years agofinish gProxII_Demod
marshmellow42 [Tue, 3 Mar 2015 21:20:18 +0000 (16:20 -0500)]
finish gProxII_Demod

9 years agoiClass full simulation of tags now officially works, with some cheating regarding... v2.0.0-rc1
Martin Holst Swende [Mon, 2 Mar 2015 20:30:22 +0000 (21:30 +0100)]
iClass full simulation of tags now officially works, with some cheating regarding reader update and write commands

9 years agoAdded brackets around crc field in protocol listings
Martin Holst Swende [Mon, 2 Mar 2015 20:05:44 +0000 (21:05 +0100)]
Added brackets around crc field in protocol listings

9 years agooops... should this file should not have been there
marshmellow42 [Mon, 2 Mar 2015 19:44:05 +0000 (14:44 -0500)]
oops... should this file should not have been there

9 years agolf cmds fix, add, show
marshmellow42 [Mon, 2 Mar 2015 19:42:55 +0000 (14:42 -0500)]
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

9 years agoTag MAC finally works! (Full sim not yet, though)
Martin Holst Swende [Mon, 2 Mar 2015 19:14:35 +0000 (20:14 +0100)]
Tag MAC finally works! (Full sim not yet, though)

9 years agoImplemented the correct way to calculate MAC from a tag, feeding it an extra 32 zeroe...
Martin Holst Swende [Sun, 1 Mar 2015 23:38:36 +0000 (00:38 +0100)]
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

9 years agolf simulation tests
marshmellow42 [Sat, 28 Feb 2015 19:33:05 +0000 (14:33 -0500)]
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.

9 years agoAdded the ciphers also.. doh
Martin Holst Swende [Fri, 27 Feb 2015 19:19:10 +0000 (20:19 +0100)]
Added the ciphers also.. doh

9 years agoMerge branch 'master' of github.com:Proxmark/proxmark3
Martin Holst Swende [Thu, 26 Feb 2015 19:35:54 +0000 (20:35 +0100)]
Merge branch 'master' of github.com:Proxmark/proxmark3

9 years agoImplemented new optimized version of MAC-calculation for iclass
Martin Holst Swende [Thu, 26 Feb 2015 19:35:35 +0000 (20:35 +0100)]
Implemented new optimized version of MAC-calculation for iclass

9 years agoPSKDemod Bug Fix
marshmellow42 [Mon, 23 Feb 2015 02:11:25 +0000 (21:11 -0500)]
PSKDemod Bug Fix

9 years agoPSK demod adjustment
marshmellow42 [Mon, 23 Feb 2015 01:09:58 +0000 (20:09 -0500)]
PSK demod adjustment

add carrier length test to weed out false positive demods

9 years agoadded PSK2 to lf simpsk
marshmellow42 [Sun, 22 Feb 2015 03:54:52 +0000 (22:54 -0500)]
added PSK2 to lf simpsk

testing still ongoing.

9 years agoNEW lf simpsk
marshmellow42 [Sun, 22 Feb 2015 02:36:02 +0000 (21:36 -0500)]
NEW lf simpsk

9 years agoSplit output from nrz raw demod function
marshmellow42 [Sat, 21 Feb 2015 23:37:15 +0000 (18:37 -0500)]
Split output from nrz raw demod function

missed this one last time

9 years agoFixed minor bugs in iclass fullsim, does not work yet though
Martin Holst Swende [Sat, 21 Feb 2015 19:47:40 +0000 (20:47 +0100)]
Fixed minor bugs in iclass fullsim, does not work yet though

9 years agosplit output from rawdemod functions
marshmellow42 [Sat, 21 Feb 2015 05:27:48 +0000 (00:27 -0500)]
split output from rawdemod functions

now allows for non-verbose calling:
ASKmanDemod
ASKrawDemod
FSKrawDemod
PSKDemod

9 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Fri, 20 Feb 2015 02:38:17 +0000 (21:38 -0500)]
Merge remote-tracking branch 'upstream/master'

9 years agoRevert "Revert "lf simask, lf simfsk and bug fixes""
marshmellow42 [Fri, 20 Feb 2015 02:35:34 +0000 (21:35 -0500)]
Revert "Revert "lf simask, lf simfsk and bug fixes""

This reverts commit e396001c47364fd52177960ef3b9ca3bef7adc3f.

9 years agoRevert "lf simask, lf simfsk and bug fixes"
marshmellow42 [Fri, 20 Feb 2015 02:22:05 +0000 (21:22 -0500)]
Revert "lf simask, lf simfsk and bug fixes"

This reverts commit fb0c84c3df8bb19bcefb5d2124d61ff2ac3d0af7.

9 years agolf simask, lf simfsk and bug fixes
marshmellow42 [Fri, 20 Feb 2015 02:21:11 +0000 (21:21 -0500)]
lf simask, lf simfsk and bug fixes

9 years agoMerge pull request #68 from iceman1001/feature
Martin Holst Swende [Thu, 19 Feb 2015 09:51:10 +0000 (10:51 +0100)]
Merge pull request #68 from iceman1001/feature

ADD: identifications.

9 years agoMerge pull request #67 from marshmellow42/master
Martin Holst Swende [Thu, 19 Feb 2015 09:50:51 +0000 (10:50 +0100)]
Merge pull request #67 from marshmellow42/master

Small help and command description updates

9 years agoMore work on iclass full simulation, and some work on iclass tag dump parsing
Martin Holst Swende [Thu, 19 Feb 2015 09:48:33 +0000 (10:48 +0100)]
More work on iclass full simulation, and some work on iclass tag dump parsing

9 years agoFurther implementation of iclass 'fullsim'. Moved protocol definitions to shared...
Martin Holst Swende [Wed, 18 Feb 2015 19:02:44 +0000 (20:02 +0100)]
Further implementation of iclass 'fullsim'. Moved protocol definitions to shared file. Had to add some loclass-function to arm-side to support authentication in fullsim mode

9 years agoIclass decrypt error, shouldn't have decrypted block 6 according to Heart of darkness...
Martin Holst Swende [Tue, 17 Feb 2015 22:17:43 +0000 (23:17 +0100)]
Iclass decrypt error, shouldn't have decrypted block 6 according to Heart of darkness-paper

9 years agoImplemented 'hf iclass decrypt <tagdump>'. This performs the 3des decryption of iclas...
Martin Holst Swende [Tue, 17 Feb 2015 21:07:40 +0000 (22:07 +0100)]
Implemented 'hf iclass decrypt <tagdump>'. This performs the 3des decryption of iclass tag dumps, but requires the decryption file to be present on the filesystem

9 years agoADD: added the missing EM identifications. Thanks to Asper for providing the needed... 68/head
iceman1001 [Mon, 16 Feb 2015 18:01:09 +0000 (19:01 +0100)]
ADD:  added the missing EM identifications. Thanks to Asper for providing the needed information about LC ID's

9 years agoCHG: added some more token-tags.
iceman1001 [Mon, 16 Feb 2015 18:00:17 +0000 (19:00 +0100)]
CHG:  added some more token-tags.

9 years agoMerge remote-tracking branch 'upstream/master' 67/head
marshmellow42 [Sun, 15 Feb 2015 02:16:27 +0000 (21:16 -0500)]
Merge remote-tracking branch 'upstream/master'

9 years agoClean up Helps and command descriptions
marshmellow42 [Sun, 15 Feb 2015 02:15:13 +0000 (21:15 -0500)]
Clean up Helps and command descriptions

9 years agoStarted iclass emulator support on device side. Not functional yet
Martin Holst Swende [Sat, 14 Feb 2015 20:30:26 +0000 (21:30 +0100)]
Started iclass emulator support on device side. Not functional yet

9 years agoRemoved un-implemented 'hf iclass write', it's confusing to have there since there...
Martin Holst Swende [Sat, 14 Feb 2015 20:18:39 +0000 (21:18 +0100)]
Removed un-implemented 'hf iclass write', it's confusing to have there since there's no actual support for this on the device side

9 years agoReformatted
Martin Holst Swende [Sat, 14 Feb 2015 20:17:08 +0000 (21:17 +0100)]
Reformatted

9 years agoStarted work on 'hf iclass eload' - only client side so far, not yet supported in...
Martin Holst Swende [Sat, 14 Feb 2015 20:15:53 +0000 (21:15 +0100)]
Started work on 'hf iclass eload' - only client side so far, not yet supported in the device

9 years agoFixed bug with iclass dump which prevented saving to file
Martin Holst Swende [Sat, 14 Feb 2015 19:42:23 +0000 (20:42 +0100)]
Fixed bug with iclass dump which prevented saving to file

9 years agoMade 125KHz default sampling, instead of 134KHz for LF
Martin Holst Swende [Sat, 14 Feb 2015 18:55:23 +0000 (19:55 +0100)]
Made 125KHz default sampling, instead of 134KHz for LF

9 years agofix help on data rawdemod commands
marshmellow42 [Sat, 14 Feb 2015 02:17:15 +0000 (21:17 -0500)]
fix help on data rawdemod commands

9 years agoMerge branch 'master' of github.com:Proxmark/proxmark3
Martin Holst Swende [Fri, 13 Feb 2015 18:59:50 +0000 (19:59 +0100)]
Merge branch 'master' of github.com:Proxmark/proxmark3

9 years agoRemoved some dev- printouts
Martin Holst Swende [Fri, 13 Feb 2015 18:59:28 +0000 (19:59 +0100)]
Removed some dev- printouts

9 years agoMerge pull request #63 from marshmellow42/master
Martin Holst Swende [Fri, 13 Feb 2015 09:11:40 +0000 (10:11 +0100)]
Merge pull request #63 from marshmellow42/master

lf data combine rawdemods & depreciate cmds

9 years agoMerge pull request #66 from iceman1001/feature
Martin Holst Swende [Fri, 13 Feb 2015 09:11:09 +0000 (10:11 +0100)]
Merge pull request #66 from iceman1001/feature

ADD:  identification of EM4233

9 years agofixed issue #65
Martin Holst Swende [Thu, 12 Feb 2015 07:21:58 +0000 (08:21 +0100)]
fixed issue #65

9 years agohf 14a: if the tag supports it, set default timeout according to ATS
pwpiwi [Wed, 11 Feb 2015 17:30:36 +0000 (18:30 +0100)]
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

9 years agobugfix hf 14a sim / hf mf sim: polarity of tag subcarrier modulation was wrong
pwpiwi [Wed, 11 Feb 2015 20:14:34 +0000 (21:14 +0100)]
bugfix hf 14a sim / hf mf sim: polarity of tag subcarrier modulation was wrong

9 years agoADD: identification of EM4233 66/head
iceman1001 [Wed, 11 Feb 2015 16:08:16 +0000 (17:08 +0100)]
ADD:  identification of EM4233

9 years agoMerge pull request #58 from Proxmark/GenericTracing
Martin Holst Swende [Tue, 10 Feb 2015 20:27:47 +0000 (21:27 +0100)]
Merge pull request #58 from Proxmark/GenericTracing

Generic tracing

9 years agoMerge branch 'master' into GenericTracing 58/head
Martin Holst Swende [Tue, 10 Feb 2015 20:25:14 +0000 (21:25 +0100)]
Merge branch 'master' into GenericTracing

Conflicts:
armsrc/iso14443a.c

9 years agoMerge pull request #64 from jessegit/csetuidfix
pwpiwi [Tue, 10 Feb 2015 06:27:06 +0000 (07:27 +0100)]
Merge pull request #64 from jessegit/csetuidfix

Add settable ATQA and SAK to hf mf csetuid command.

9 years agoAdd settable ATQA and SAK to hf mf csetuid command. 64/head
Jesse Hallio [Tue, 10 Feb 2015 02:31:53 +0000 (04:31 +0200)]
Add settable ATQA and SAK to hf mf csetuid command.

9 years agoMerge remote-tracking branch 'upstream/master' 63/head
marshmellow42 [Mon, 9 Feb 2015 21:47:24 +0000 (16:47 -0500)]
Merge remote-tracking branch 'upstream/master'

9 years agohw tune, data tune: adjusted "unusable" and "marginal" voltages. Display LF tuning...
pwpiwi [Mon, 9 Feb 2015 07:53:39 +0000 (08:53 +0100)]
hw tune, data tune: adjusted "unusable" and "marginal" voltages. Display LF tuning graph only when LF antenna is connected.

9 years agolf data combine rawdemods & depreciate cmds
marshmellow42 [Mon, 9 Feb 2015 21:25:12 +0000 (16:25 -0500)]
lf data combine rawdemods & depreciate cmds

new:
data rawdemod
replaces:
data askmandemod
data askrawdemod
data fskrawdemod
data nrzrawdemod
data psk1rawdemod
data psk2rawdemod

also commented out of the CommandTable but did not remove the commands:
data askdemod
data bitstream
data fskdemod
data mandemod
data threshold

9 years agoMerge pull request #59 from marshmellow42/master
Martin Holst Swende [Mon, 9 Feb 2015 19:28:12 +0000 (20:28 +0100)]
Merge pull request #59 from marshmellow42/master

lf demod additions/fixes

9 years agolf/data combined detectclock functions to one 59/head
marshmellow42 [Mon, 9 Feb 2015 16:11:04 +0000 (11:11 -0500)]
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.

9 years agoFixed: hf mf sim failed on fast reader responses
pwpiwi [Sun, 8 Feb 2015 21:14:20 +0000 (22:14 +0100)]
Fixed: hf mf sim failed on fast reader responses
In Miller Decoder: don't wait too long for a stable signal
In Miller Decoder: Don't accept sequences of four or more zeroes as start bit
In EmSendCmd14443aRaw: don't wait for emptying the FPGA delay queue if it isn't filled

9 years agoMerge pull request #60 from pwpiwi/master
pwpiwi [Sun, 8 Feb 2015 21:09:42 +0000 (22:09 +0100)]
Merge pull request #60 from pwpiwi/master

Bugfix hw tune, hf tune: voltage measures were VERY wrong

9 years agofix inconsistent spacing within functions
marshmellow42 [Sun, 8 Feb 2015 05:48:00 +0000 (00:48 -0500)]
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.

9 years agoMinor dox
Martin Holst Swende [Sat, 7 Feb 2015 20:22:53 +0000 (21:22 +0100)]
Minor dox

9 years agoSome documentation and formatting to LogTraceHitag
Martin Holst Swende [Sat, 7 Feb 2015 20:05:14 +0000 (21:05 +0100)]
Some documentation and formatting to LogTraceHitag

9 years agoMoved LogTraceHitag to BigBuf (no changes to the function ... yet)
Martin Holst Swende [Sat, 7 Feb 2015 19:55:17 +0000 (20:55 +0100)]
Moved LogTraceHitag to BigBuf (no changes to the function ... yet)

9 years agoGeneric tracing; removed iso14a_XX-functions, removed traceLen as global varible
Martin Holst Swende [Sat, 7 Feb 2015 19:49:40 +0000 (20:49 +0100)]
Generic tracing; removed iso14a_XX-functions, removed traceLen as global varible

9 years agoBugfix hw tune, hf tune: voltage measures were VERY wrong 60/head
pwpiwi [Tue, 3 Feb 2015 06:21:57 +0000 (07:21 +0100)]
Bugfix hw tune, hf tune: voltage measures were VERY wrong
Modified hw detectreader: display reader field strength in mV units and to be less phony

9 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Fri, 6 Feb 2015 19:45:46 +0000 (14:45 -0500)]
Merge remote-tracking branch 'upstream/master'

9 years agodata askraw patches, data askedgedetect demod,
marshmellow42 [Fri, 6 Feb 2015 19:36:25 +0000 (14:36 -0500)]
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

9 years agoMerge branch 'master' into GenericTracing
Martin Holst Swende [Fri, 6 Feb 2015 07:41:02 +0000 (08:41 +0100)]
Merge branch 'master' into GenericTracing

Conflicts:
armsrc/iso14443.c
armsrc/iso14443a.c
client/cmdhf.c
client/cmdhf14b.c

Impressum, Datenschutz