Commit graph

1809 commits

Author SHA1 Message Date
marshmellow42
4745afb647 Iceman's Issue #96 fix 2015-04-28 15:35:23 -04:00
Martin Holst Swende
a3abb02897 Merge branch 'master' of github.com:Proxmark/proxmark3 2015-04-23 09:51:04 +02:00
Martin Holst Swende
0e6c7336b0 Fixed issue with dumping iclass tags > 2KB in size 2015-04-23 09:50:44 +02:00
Martin Holst Swende
cb8220ee76 Merge pull request #92 from marshmellow42/master
lf cleanup, dedup & minor additions
2015-04-14 20:36:10 +02:00
marshmellow42
8e0cf02308 minor change to lf em4x menu & iceman script...
...updates
2015-04-10 00:06:59 -04:00
marshmellow42
664f658650 nexwatch fix .h file + icemans mf csetblk w arg
forgot to include the new nexwatch command in the header...
added icemans hf mf csetblk w parameter fix
2015-04-08 15:08:05 -04:00
marshmellow42
25d3e5cc83 Merge remote-tracking branch 'upstream/master' 2015-04-08 14:19:19 -04:00
marshmellow42
411105e036 added nexwatch demod & iceman lua
added nexwatch demod (also added to lf search)
added iceman's lua script adjustments
2015-04-08 14:19:03 -04:00
marshmellow42
322f7eb111 fix to lf t5 detect/read cmds
i think this functions fairly well...
still some issues with demod positioning for various reasons.
ASK/Biph/FSK work pretty well
the PSK Demod still needs a little attention to help it better demod
various carriers...
2015-04-08 11:18:29 -04:00
marshmellow42
9632ecbe3d update t5 detection test()
missed this file in last commit... sorry.
2015-04-08 10:12:24 -04:00
Martin Holst Swende
83602affe5 Fixed buffer initialization errors, as reported in http://www.proxmark.org/forum/viewtopic.php?pid=15337#p15337 2015-04-08 13:31:04 +02:00
marshmellow42
fef74fdce4 lf ask consolidation
backend:
askman and askraw demods merged into askdemod (args adjusted
accordingly)
re-arranged lfdemod.h in alphabetical order and by category

front end:
data detectclock a (ask) now also reports the selected best start
position for demod
data manrawdecode takes an invert arg now
2015-04-08 01:07:39 -04:00
marshmellow42
49bbc60af3 lf cleaning++
data askedgedetect - removed unneeded code
lf em em4x50read bug fix / error checking
graph-save/restore auto repaint after restore.
2015-04-07 00:53:06 -04:00
marshmellow42
cc15a1187b lf cleanup - fixes
more lf em em4x50read fixes
adjust heavy clipping ask clock detection
clean up t55xx minor items
2015-04-06 23:17:30 -04:00
Martin Holst Swende
2c772e6cf0 Added info to changelog about bootroom update 2015-04-06 21:47:09 +02:00
marshmellow42
1f918317e2 add maxErr to data manrawdecode 2015-04-05 21:59:36 -04:00
marshmellow42
224ce36eb1 lf t5xx - icemans update 2015-04-05 16:37:41 -04:00
pwpiwi
6306ff4bac Merge branch 'master' into topaz
Conflicts:
	armsrc/Makefile
	client/Makefile
2015-04-05 19:45:59 +02:00
marshmellow42
2767fc0291 lf cleaning
remove unneeded code/functions
fix lfdemod askmandemod bug with maxErr=0
silence output for getting samples in lf search
2015-04-05 00:58:57 -04:00
marshmellow42
643fb10b2d Merge remote-tracking branch 'upstream/master' 2015-04-04 21:29:16 -04:00
marshmellow42
acaeccf841 update changelog 2015-04-03 00:40:38 -04:00
marshmellow42
6e98444637 lfdemod reduce duplicate code
remove check for best start position in demods and adjust the clock
detect to always return best start position to the demods
also small bug fix in lf em em4x50read
2015-04-02 23:55:12 -04:00
marshmellow42
23f0a7d862 lfem4x cleanup/add/fix
changed spacing to tabs for cmdlfem4x.c
finished the partially built lf em em4x50read function
added save/restore GraphBuffer function in graph.c
adjusted some tolerances in lfdemod.c
added a maxLen argument to the askmandemod
2015-04-02 12:48:52 -04:00
Martin Holst Swende
9795e535c9 Compiler correctly identified a buffer overflow, fixed that and made the code use snprintf instead of unsafe sprintf 2015-04-01 09:24:29 +02:00
pwpiwi
f83c41c75b Merge pull request #89 from pwpiwi/image_shrink
Reclaim more than 19K of ARM flash memory.
2015-03-31 22:57:33 +02:00
Martin Holst Swende
d5d6f22718 Merge pull request #91 from marshmellow42/master
lfdemod.c refactoring  (+ bug fixes)
2015-03-31 22:11:19 +02:00
pwpiwi
7009555e44 temporarily revert lfdemod float removal 2015-03-31 21:38:58 +02:00
marshmellow42
a4669d6ef3 small fix in t5 trace data 2015-03-31 11:30:16 -04:00
marshmellow42
75cbbe9a69 remove floats per piwi 2015-03-31 10:49:06 -04:00
pwpiwi
e335ca2846 Reclaim more than 19K of ARM flash memory.
- added compiler options -fdata-sections and -ffunction-sections (thanks to iceman for the hint)
- removed float operations from common/lfdemod.c to avoid adding float libraries to the ARM os image
- moved the fpga images to the data section to avoid reserving unused space for a separate section
2015-03-31 08:07:26 +02:00
pwpiwi
c5847ae8af refactoring hf topaz reader 2015-03-31 07:09:55 +02:00
Martin Holst Swende
616970b3d1 Created a changelog, to be used in accordance with http://keepachangelog.com 2015-03-30 07:51:45 +02:00
Martin Holst Swende
caaf9618ae Minor mod to 'hf iclass read', it now also reads and prints the configuration of the tag found 2015-03-29 21:49:58 +02:00
marshmellow42
070e3c4305 Merge remote-tracking branch 'upstream/master' 2015-03-27 23:49:14 -04:00
marshmellow42
f8f894a50f rawdemod param cleanup
plus lfdemod.h cleanup
2015-03-27 23:47:31 -04:00
marshmellow42
2eec55c8a4 lfdemods streamline & bug fixes
removed duplicate code countPSK_FC - adjusted countFC to work.
bug fixes & streamlined code in:
lf hid fskdemod
lf em em410xdemod

cleaned up lfdemod.c some
2015-03-27 00:02:30 -04:00
pwpiwi
de15fc5fe3 add: hf topaz reader (basic functionality) 2015-03-25 22:00:48 +01:00
Martin Holst Swende
337288f9ac Merge pull request #86 from marshmellow42/master
Fixed indents to Tabs from Spaces
2015-03-25 20:23:41 +01:00
marshmellow42
e0165dcf3a Fixed indents to Tabs from Spaces
Spacing changes ONLY - no code changes
2015-03-25 14:24:36 -04:00
Martin Holst Swende
062e28912c Merge pull request #84 from marshmellow42/master
EM410x bug fix
2015-03-25 11:10:51 +01:00
marshmellow42
327a690813 EM410x bug fix 2015-03-24 23:05:46 -04:00
marshmellow42
c7d169ec02 clean up em410x output 2015-03-24 22:11:32 -04:00
marshmellow42
90677ad99b EM410x bug fix 2015-03-24 20:26:14 -04:00
Martin Holst Swende
90a8b82fb4 Merge pull request #82 from marshmellow42/master
lf ata55x7 commands and more
2015-03-24 11:10:16 +01:00
marshmellow42
9680b11d9e remove debugging print calls 2015-03-23 20:25:54 -04:00
marshmellow42
1fbf895616 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
2015-03-23 16:29:50 -04:00
marshmellow42
13d77ef964 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
2015-03-22 15:28:48 -04:00
pwpiwi
48ece4a750 add: Topaz mode for "hf 14a raw" (new option -T)
chg: allow tracing without parity
chg: make "hf list topaz" aware of additional commands for Dynamic Memory Model
2015-03-20 21:06:51 +01:00
pwpiwi
05ddb52c43 fix: introduced a stupid error when refactoring the start bit detector in MillerDecoding()
chg: use -O2 instead of -Os when compiling ARM sources
chg: don't clear the Miller decoders input buffer on reset
chg: be more specific for the Miller decoders start bit pattern
add: new option c in hf list: mark CRC bytes (default is off)
2015-03-18 18:32:43 +01:00
pwpiwi
ef00343cb1 revert change "hf list topaz" to "hf list nfc"
refactored Startbit detection in MillerDecoding()
relaxed startbit detection in MillerDecoding()
fixed CRC checking and CRC bytes marking in hf list
fixed topaz multi frame command listing in hf list topaz
2015-03-17 07:41:08 +01:00