projects / fw / stlink / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 794a560 5e1e150)
Merge branch 'tmaster' into future
authorKarl Palsson <karlp@tweak.net.au>
Tue, 15 Nov 2011 00:57:09 +0000 (00:57 +0000)
committerKarl Palsson <karlp@tweak.net.au>
Tue, 15 Nov 2011 00:57:09 +0000 (00:57 +0000)
commit83a5eb2ed34ed78edacd92a69f366b89728ac5d0
tree24961b3056221468a5fc8c3f48dfc2e1db7965batree | snapshot
parent794a560ebf95fcc97a56b89827d273cf0f726c87commit | diff
parent5e1e150d5cced4770aae0f8e053c99d7d6a0d39ccommit | diff
Merge branch 'tmaster' into future

This branch should work for F1 and F4 devices.  It has currently been tested
with F1 value line, (a VL discovery board) programmed via gdb via both an
stlinkv1 and an stlinkv2.

F4 has _not_ yet been tested on this branch

Conflicts:
.gitignore
doc/tutorial/tutorial.pdf
example/blink/main.c
gdbserver/Makefile
gdbserver/gdb-server.c
src/stlink-common.c
src/stlink-common.h
src/stlink-usb.c
.gitignore diff1 | diff2 | blob | history
Makefile diff1 | diff2 | blob | history
README diff1 | diff2 | blob | history
doc/tutorial/tutorial.pdf diff1 | diff2 | blob | history
example/blink/main.c diff1 | diff2 | blob | history
flash/main.c diff1 | diff2 | blob | history
gdbserver/gdb-server.c diff1 | diff2 | blob | history
src/stlink-common.c diff1 | diff2 | blob | history
src/stlink-common.h diff1 | diff2 | blob | history
src/test_usb.c diff1 | diff2 | blob | history
STM tools with support for Altus Metrum targets