Commit graph

1397 commits

Author SHA1 Message Date
Martin Holst Swende
daf8b85cda Merge pull request #111 from zhovner/master
Compiling manual for MAC OS X
2015-06-01 19:56:50 +02:00
pwpiwi
0d9a86c724 Fix issue #103 (hopefully). Quite an old bug which was previously
masked by a big DMA_BUFFER_SIZE.
2015-06-01 19:47:21 +02:00
marshmellow42
4a74e2be72 add my_d move lean identification. 2015-06-01 00:18:03 -04:00
marshmellow42
be290d68bd new lua script from @iceman1001 + bug fix in hf mfu 2015-05-31 16:08:58 -04:00
pwpiwi
97a0f5f4aa fix format strings for nit picking compilers 2015-05-31 19:51:44 +02:00
Martin Holst Swende
6cb08550c4 Merge pull request #112 from marshmellow42/master
combine mfu read/write commands + various bug/typo fixes
2015-05-31 13:08:36 +02:00
marshmellow42
1c4c0b0681 add @Iceman1001 s sha1 scripting changes. 2015-05-30 21:51:15 -04:00
pwpiwi
dc20a1f639 Fix linking under linux. liblua requires libld on linux. 2015-05-29 18:18:10 +02:00
marshmellow42
185e038c7d fixed further typo in lf t5 wr help
also fixed offset option char to uint8_t warning in the new offset
option in data printdemodbuffer
2015-05-28 23:14:06 -04:00
marshmellow42
5b37e87a24 fix help typo 2015-05-28 22:52:41 -04:00
marshmellow42
979bba376d add offset option to data printdemodbuffer
easily see demod buffer's hex values at different bit offsets by using:
data printdemodbuffer x o <offset>
2015-05-28 13:23:31 -04:00
pwpiwi
fbd0526b34 delete (yet) unnecessary file client/cmdhftopaz.c 2015-05-28 02:55:57 +02:00
marshmellow42
e35031d2b7 MFU code cleanup - final ?
fixed bug in debug print in MF 1k sim.
2015-05-27 17:21:42 -04:00
marshmellow42
4973f23d3c clean up mfu device side code
+ add xor calc to util (prep for desfire)
commented out MifareUWriteBlockCompat as it isn't used in client
currently (it is a command we could support..  but why?)
relabeled a few device side mfu functions to be clearer.
2015-05-27 12:24:13 -04:00
Pavel Zhovner
799b2e2e9d Compiling manual for MAC OS X 2015-05-27 11:30:50 +03:00
marshmellow42
be10fe2f11 update changelog 2015-05-27 00:32:01 -04:00
marshmellow42
dcbaa2b582 @iceman1001 s lua script fix 2015-05-26 20:31:07 -04:00
pwpiwi
8e074056ac also delete *.bin and fpga_compressor when "make clean".
Add target to make fpga_compressor when client is not yet compiled.
Get version information and cache it when client starts (avoids clearing
BigBuf when calling hw version).
Add some comments and remove debugging printouts.
Add version info and ChangeLog in modified zlib.
2015-05-26 18:12:40 +02:00
marshmellow42
22342f6dfe Add clearCommandBuffer before SendCommand
adjust output of mfu rdbl to be consistent
fix output of mfu dump in case startPage was specified. (also was
missing "i" in second print...)
2015-05-26 10:40:23 -04:00
pwpiwi
4b3f6d79ea Add option -d (decompress) to fpga_compress. Allows testing.
Improve zlib deflate (note: no change required to inflate).
2015-05-26 08:31:35 +02:00
pwpiwi
0fa01ec7da Compress the .data section as well (saves another 4KBytes and comes for free)
zlib tuning: prevent fpga_compress from generating fixed code blocks
armsrc/Makefile: replace osimage with fullimage
2015-05-26 08:31:32 +02:00
pwpiwi
28b9faccea Tailor zlib to our needs:
- disable support for fixed code blocks. Saves 2KByte code tables in ARM Flash memory
2015-05-26 08:31:30 +02:00
pwpiwi
fb22897415 fpga_compress: interleave (combine) fpga_lf.bit and fpga_hf.bit before compression.
fpga_loader.c: change to unweave fpga_lf and fpga_hf accordingly
prepare fpga_compress, fpga_loader and Makefile to handle more than two FPGA config files
revert removal of fullimage Makefile target. Remove osimage instead.
2015-05-26 08:31:28 +02:00
pwpiwi
f39198789b replaced gzip with an own compressor tool (fpga_compress.c, based on zlib)
This allows to remove the gzip header support and the z_crc32.[ch] files
(which saves more than 2KBytes of the ARM's flash memory)
2015-05-26 08:31:26 +02:00
pwpiwi
25056d8b47 Finish support for compressed FPGA images in fpgaloader.c
- move zlib source files to separate directory zlib
- rename zlib/crc32.[ch] to zlib/z_crc32.[ch]
2015-05-26 08:31:24 +02:00
pwpiwi
add4d47046 add: compress fpga images during compile, uncompress at run time 2015-05-26 08:31:21 +02:00
pwpiwi
e61530408c add: hw ver: show FPGA versions for both HF and LF FPGA configs
add: hw ver: show used and free flash memory
chg: prepare fpgaloader for compressed FPGA configs
2015-05-26 08:31:19 +02:00
Pierre LALET
1d537ad65c Ported hf mf esave trick for unreadable UIDs to hf mf csave
Thanks: iceman1001
2015-05-25 11:47:27 +02:00
marshmellow42
e406dd5cc9 Merge remote-tracking branch 'upstream/master' 2015-05-24 22:31:13 -04:00
marshmellow42
79d7bcbb51 updated mfu rdbl and wrbl commands
@iceman1001 s rdbl and wrbl cmd updates.
dump screen output adjusted
2015-05-24 22:28:21 -04:00
Martin Holst Swende
96c4f5517e Merge pull request #107 from p-l-/fix-hfmf
Fix filenames for hf mf cload / csave
2015-05-24 23:10:21 +02:00
Pierre LALET
292fe72535 Fix filenames for hf mf cload / csave 2015-05-24 22:43:08 +02:00
Martin Holst Swende
cae00c59ff Merge pull request #106 from p-l-/fix-hfmfeload
Fix filenames for hf mf esave / eload
2015-05-24 21:32:11 +02:00
Pierre LALET
0b14440dce Fix filenames for hf mf esave / eload 2015-05-24 20:14:22 +02:00
Martin Holst Swende
f0eaac9aca Merge pull request #102 from marshmellow42/master
fix mfu dump getbigbuffer bug
2015-05-24 07:22:09 +02:00
marshmellow42
0ce03d9ab0 fix mfu dump getbigbuffer bug
Thanks @iceman1001 for catching my oops, and fixing it :)
2015-05-23 22:35:50 -04:00
Martin Holst Swende
86724c17c9 Merge pull request #101 from marshmellow42/master
hf mfu updates + hf search + bug fixes
2015-05-22 21:55:34 +02:00
marshmellow42
012c0761bd hf mfu minor output adjustments
dump key placed properly for EV1 and NTAGs

config pages for ntags corrected in printout

note on config that PWD and PACK cannot
actually be read from memory  (probably could just delete them (other
than it shows what memory block they are stored in for changing...)
2015-05-22 13:17:51 -04:00
marshmellow42
8f2e50b4c5 mfu info authkeyptr fix
didn't follow @iceman1001 s l parameter changes fully...  fixed now..
:)
2015-05-22 07:29:18 -04:00
marshmellow42
06561c34ef fix to dump cmd print keys.
add l option to info cmd.
add ascii print to dump (screen only)
other minor clean up
2015-05-22 00:15:57 -04:00
marshmellow42
efd193519c hf mfu bug fixes, and help text fixes 2015-05-21 11:17:01 -04:00
marshmellow42
1c429594a1 further mfu info updates
needed to auth select when a command failed for locked tags.
some output cleanups from @iceman1001
2015-05-20 16:47:40 -04:00
marshmellow42
cd87ee9133 finish NTAG i2c +...
thanks iceman
2015-05-20 15:42:58 -04:00
marshmellow42
46fcd738e0 finish NTAG i2c +...
thanks @iceman1001
2015-05-20 15:41:48 -04:00
marshmellow42
8241872c47 ULEV1_48 had the wrong max block 2015-05-20 14:22:26 -04:00
marshmellow42
ea11861793 minor adjustments to hf mfu 2015-05-20 14:17:43 -04:00
marshmellow42
c7442b7673 Add NTAG i2c and bug fix
also streamlined select tag code
2015-05-20 14:06:46 -04:00
marshmellow42
a383f4b708 Add ntag 210, 212, 203 and bug fix 2015-05-20 11:27:44 -04:00
marshmellow42
a98b05b71d missed file in previous commit...
duh...
2015-05-19 15:03:35 -04:00
marshmellow42
d7acc6403e hf mfu dump - bigbuf allocation fix
some larger nfc tags can get large so set the allocation to the 4k
CARD_MEMORY_SIZE buffersize.
2015-05-19 11:30:50 -04:00