~ruther/qmk_firmware

d9e4dad0a828a8a904f44dda090a4d6d08fe2948 — Jack Humbert 9 years ago a5d638a
Makefile redo & other features (#395)

* .build containment implemented

* no destructive variable setting - builds in either folder

* make from 3 places

* cleans before each build
* make from root with keyboard=keyboard, keymap=keymap
* make from keyboard/keyboard with keymap=keymap
* make from keymaps/keymap
* only implemented on planck

* adds color diag to avr-gcc

* makefiles for all plancks, clean-up

* quick build-all makefile for plancks

* reformatting of make output (colors)

* color toggle, tmk path corrections

* correct if statement for color

* move config.h to main makefile, updates preonic, atomic

* format update, all keyboards targets

* makefile optional for build all target, alps and arrow_pad updated

* alps updated

* make planck default, trying out travis recipe for all-keyboards

* all-keymaps target, different travis recipe

* updates alps64

* updates keyboards to new format

* updates clue* projects

* all projects updated, specialise EZ .hex, let .hex through

* updates travis

* automatically find root, keyboard, keymap

* silent echo, cleaned-up mass make output

* updates all keyboards' .hex files except EZ

* Rename Bantam44.c to bantam44.c

* Rename Bantam44.h to bantam44.h

* nananana

* adds six key keyboard

* does same to ez as rest

* updates send_string example

* brings ergodox_ez up to date

* updates template/new project script

* adds sixkeyboard

* adds readme for sixkeyboard

* adds sixkeyboard to travis

* filenames, gitignore mess

* define clock prescaler stuff manually

* make quick, size test example

* documentation and dfu-no-build
315 files changed, 135530 insertions(+), 67383 deletions(-)

M .gitignore
M .travis.yml
A Makefile
M doc/BUILD_GUIDE.md
A doc/keymap_makefile_example.mk
M keyboard/alps64/Makefile
M keyboard/alps64/alps64.h
A keyboard/alps64/keymaps/default/compiled.hex
R keyboard/alps64/keymaps/{default => default/keymap}.c
D keyboard/alps64/keymaps/hasu.c
M keyboard/arrow_pad/Makefile
A keyboard/arrow_pad/keymaps/default/compiled.hex
R keyboard/arrow_pad/keymaps/{default => default/keymap}.c
R keyboard/arrow_pad/keymaps/pad_21/{makefile.mk => Makefile}
A keyboard/arrow_pad/keymaps/pad_21/compiled.hex
R keyboard/arrow_pad/keymaps/pad_24/{makefile.mk => Makefile}
A keyboard/arrow_pad/keymaps/pad_24/compiled.hex
M keyboard/atomic/Makefile
A keyboard/atomic/keymaps/default/compiled.hex
R keyboard/atomic/keymaps/{default => default/keymap}.c
R keyboard/atomic/keymaps/pvc/{makefile.mk => Makefile}
A keyboard/atomic/keymaps/pvc/compiled.hex
M keyboard/atreus/Makefile
A keyboard/atreus/keymaps/default/compiled.hex
R keyboard/atreus/keymaps/{default => default/keymap}.c
A keyboard/atreus/keymaps/gerb/compiled.hex
R keyboard/atreus/keymaps/{gerb => gerb/keymap}.c
M keyboard/bantam44/Makefile
R keyboard/bantam44/{Bantam44 => bantam44}.c
R keyboard/bantam44/{Bantam44 => bantam44}.h
A keyboard/bantam44/keymaps/default/compiled.hex
R keyboard/bantam44/keymaps/{default => default/keymap}.c
M keyboard/clueboard1/Makefile
A keyboard/clueboard1/keymaps/default/compiled.hex
R keyboard/clueboard1/keymaps/{keymap_default => default/keymap}.c
M keyboard/clueboard2/Makefile
A keyboard/clueboard2/keymaps/default/compiled.hex
R keyboard/clueboard2/keymaps/{keymap_default => default/keymap}.c
R keyboard/{gh60/Makefile.pjrc => clueboard2/keymaps/max/Makefile}
A keyboard/clueboard2/keymaps/max/compiled.hex
R keyboard/clueboard2/keymaps/{keymap_max => max/keymap}.c
A keyboard/clueboard2/keymaps/skully/compiled.hex
R keyboard/clueboard2/keymaps/{keymap_skully => skully/keymap}.c
M keyboard/cluepad/Makefile
A keyboard/cluepad/keymaps/default/compiled.hex
R keyboard/cluepad/keymaps/{keymap_default => default/keymap}.c
M keyboard/ergodox_ez/Makefile
D keyboard/ergodox_ez/keymaps/ab/ab.hex
A keyboard/ergodox_ez/keymaps/ab/compiled.hex
D keyboard/ergodox_ez/keymaps/adnw/k_o_y/k_o_y.hex
A keyboard/ergodox_ez/keymaps/adnw_k_o_y/compiled.hex
R keyboard/ergodox_ez/keymaps/{adnw/k_o_y => adnw_k_o_y}/keymap.c
R keyboard/ergodox_ez/keymaps/{adnw/k_o_y => adnw_k_o_y}/readme.md
A keyboard/ergodox_ez/keymaps/alexjj/compiled.hex
D keyboard/ergodox_ez/keymaps/alexjj/keymap.hex
R keyboard/ergodox_ez/keymaps/algernon/{makefile.mk => Makefile}
D keyboard/ergodox_ez/keymaps/algernon/algernon.hex
A keyboard/ergodox_ez/keymaps/algernon/compiled.hex
R keyboard/ergodox_ez/keymaps/algernon/{config_user => config}.h
D keyboard/ergodox_ez/keymaps/andrew_osx/andrew_osx.hex
A keyboard/ergodox_ez/keymaps/andrew_osx/compiled.hex
D keyboard/ergodox_ez/keymaps/bepo/bepo.hex
A keyboard/ergodox_ez/keymaps/bepo/compiled.hex
A keyboard/ergodox_ez/keymaps/coderkun_neo2/Makefile
D keyboard/ergodox_ez/keymaps/coderkun_neo2/coderkun_neo2.hex
A keyboard/ergodox_ez/keymaps/coderkun_neo2/compiled.hex
M keyboard/ergodox_ez/keymaps/coderkun_neo2/keymap.c
D keyboard/ergodox_ez/keymaps/colemak/colemak.hex
A keyboard/ergodox_ez/keymaps/colemak/compiled.hex
D keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/colemak_osx_pc_no.hex
A keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/compiled.hex
A keyboard/ergodox_ez/keymaps/csharp_dev/compiled.hex
D keyboard/ergodox_ez/keymaps/csharp_dev/csharp_dev.hex
A keyboard/ergodox_ez/keymaps/dave/compiled.hex
D keyboard/ergodox_ez/keymaps/dave/dave.hex
A keyboard/ergodox_ez/keymaps/default/compiled.hex
D keyboard/ergodox_ez/keymaps/default/default.hex
A keyboard/ergodox_ez/keymaps/default_osx/compiled.hex
D keyboard/ergodox_ez/keymaps/default_osx/default_osx.hex
A keyboard/ergodox_ez/keymaps/dragon788/compiled.hex
D keyboard/ergodox_ez/keymaps/dragon788/dragon788.hex
A keyboard/ergodox_ez/keymaps/dvorak/compiled.hex
D keyboard/ergodox_ez/keymaps/dvorak/dvorak.hex
A keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/compiled.hex
D keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/dvorak_intl_squisher.hex
A keyboard/ergodox_ez/keymaps/dvorak_spanish/compiled.hex
D keyboard/ergodox_ez/keymaps/dvorak_spanish/dvorak_spanish.hex
A keyboard/ergodox_ez/keymaps/emacs_osx_dk/compiled.hex
D keyboard/ergodox_ez/keymaps/emacs_osx_dk/emacs_osx_dk.hex
A keyboard/ergodox_ez/keymaps/erez_experimental/compiled.hex
D keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex
A keyboard/ergodox_ez/keymaps/german-kinergo/compiled.hex
D keyboard/ergodox_ez/keymaps/german-kinergo/german-kinergo.hex
A keyboard/ergodox_ez/keymaps/german-manuneo/compiled.hex
D keyboard/ergodox_ez/keymaps/german-manuneo/german-manuneo.hex
A keyboard/ergodox_ez/keymaps/german/compiled.hex
D keyboard/ergodox_ez/keymaps/german/german.hex
A keyboard/ergodox_ez/keymaps/j3rn/compiled.hex
D keyboard/ergodox_ez/keymaps/j3rn/j3rn.hex
A keyboard/ergodox_ez/keymaps/jack/compiled.hex
D keyboard/ergodox_ez/keymaps/jack/jack.hex
A keyboard/ergodox_ez/keymaps/jacobono/compiled.hex
D keyboard/ergodox_ez/keymaps/jacobono/jacobono.hex
A keyboard/ergodox_ez/keymaps/jgarr/compiled.hex
D keyboard/ergodox_ez/keymaps/jgarr/jgarr.hex
A keyboard/ergodox_ez/keymaps/kastyle/compiled.hex
D keyboard/ergodox_ez/keymaps/kastyle/kastyle.hex
A keyboard/ergodox_ez/keymaps/kines-ish/compiled.hex
D keyboard/ergodox_ez/keymaps/kines-ish/kines-ish.hex
A keyboard/ergodox_ez/keymaps/mpiechotka/compiled.hex
D keyboard/ergodox_ez/keymaps/mpiechotka/mpiechotka.hex
A keyboard/ergodox_ez/keymaps/msc/compiled.hex
D keyboard/ergodox_ez/keymaps/msc/msc.hex
A keyboard/ergodox_ez/keymaps/naps62/compiled.hex
D keyboard/ergodox_ez/keymaps/naps62/ergodox_ez.hex
M keyboard/ergodox_ez/keymaps/naps62/keymap.c
A keyboard/ergodox_ez/keymaps/ordinary/compiled.hex
D keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex
A keyboard/ergodox_ez/keymaps/osx_de/compiled.hex
D keyboard/ergodox_ez/keymaps/osx_de/osx_de.hex
A keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/compiled.hex
D keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy.hex
A keyboard/ergodox_ez/keymaps/osx_de_experimental/compiled.hex
D keyboard/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental.hex
A keyboard/ergodox_ez/keymaps/osx_fr/compiled.hex
D keyboard/ergodox_ez/keymaps/osx_fr/osx_fr.hex
A keyboard/ergodox_ez/keymaps/osx_kinesis_pnut/compiled.hex
A keyboard/ergodox_ez/keymaps/plover/compiled.hex
D keyboard/ergodox_ez/keymaps/plover/plover.hex
A keyboard/ergodox_ez/keymaps/plums/compiled.hex
D keyboard/ergodox_ez/keymaps/plums/plums.hex
A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/compiled.hex
D keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.hex
A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/compiled.hex
D keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.hex
A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/compiled.hex
D keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.hex
A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/compiled.hex
D keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.hex
A keyboard/ergodox_ez/keymaps/sneako/compiled.hex
D keyboard/ergodox_ez/keymaps/sneako/sneako.hex
A keyboard/ergodox_ez/keymaps/software_neo2/compiled.hex
D keyboard/ergodox_ez/keymaps/software_neo2/software_neo2.hex
A keyboard/ergodox_ez/keymaps/supercoder/compiled.hex
D keyboard/ergodox_ez/keymaps/supercoder/supercoder.hex
A keyboard/ergodox_ez/keymaps/techtomas/compiled.hex
D keyboard/ergodox_ez/keymaps/techtomas/techtomas.hex
A keyboard/ergodox_ez/keymaps/tm2030/compiled.hex
D keyboard/ergodox_ez/keymaps/tm2030/tm2030.hex
A keyboard/ergodox_ez/keymaps/tonyabra_osx/compiled.hex
D keyboard/ergodox_ez/keymaps/tonyabra_osx/tonyabra_osx.hex
A keyboard/ergodox_ez/keymaps/townk_osx/compiled.hex
D keyboard/ergodox_ez/keymaps/townk_osx/townk_osx.hex
A keyboard/ergodox_ez/keymaps/twey/compiled.hex
D keyboard/ergodox_ez/keymaps/twey/twey.hex
A keyboard/ergodox_ez/keymaps/workman_osx_mdw/compiled.hex
D keyboard/ergodox_ez/keymaps/workman_osx_mdw/workman_osx_mdw.hex
A keyboard/ergodox_ez/keymaps/zweihander-osx/compiled.hex
D keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
D keyboard/ergodox_ez/makeallhex.sh
M keyboard/ergodox_ez/readme.md
M keyboard/gh60/Makefile
M keyboard/gh60/README.md
M keyboard/gh60/config.h
R keyboard/{gh60_rev_c => gh60}/gh60.c
R keyboard/{gh60_rev_c => gh60}/gh60.h
R keyboard/{gh60_rev_c => gh60}/gh60revc.jpg
D keyboard/gh60/keymap_common.h
A keyboard/gh60/keymaps/default/compiled.hex
R keyboard/{gh60_rev_c/keymaps/default => gh60/keymaps/default/keymap}.c
D keyboard/gh60/keymaps/hasu.c
D keyboard/gh60/keymaps/hhkb.c
D keyboard/gh60/keymaps/plain.c
D keyboard/gh60/keymaps/poker.c
D keyboard/gh60/keymaps/poker_bit.c
D keyboard/gh60/keymaps/poker_set.c
D keyboard/gh60/keymaps/spacefn.c
D keyboard/gh60/led.c
R keyboard/{gh60_rev_c => gh60}/pinout.txt
D keyboard/gh60_rev_c/README.md
D keyboard/gh60_rev_c/config.h
M keyboard/hhkb/Makefile
R keyboard/hhkb/{hhkb_qmk => hhkb}.c
R keyboard/hhkb/{hhkb_qmk => hhkb}.h
A keyboard/hhkb/keymaps/default/compiled.hex
R keyboard/hhkb/keymaps/{default => default/keymap}.c
A keyboard/hhkb/keymaps/lxol/compiled.hex
R keyboard/hhkb/keymaps/{lxol => lxol/keymap}.c
M keyboard/jd45/Makefile
A keyboard/jd45/keymaps/default/compiled.hex
R keyboard/jd45/keymaps/{default => default/keymap}.c
A keyboard/jd45/keymaps/justin/compiled.hex
R keyboard/jd45/keymaps/{justin => justin/keymap}.c
R keyboard/{gh60_rev_c => kc60}/Makefile
R keyboard/{kc60_v2 => kc60}/README.md
R keyboard/{kc60_v2 => kc60}/config.h
R keyboard/{kc60_v2 => kc60}/kc60.c
R keyboard/{kc60_v2 => kc60}/kc60.h
A keyboard/kc60/keymaps/default/compiled.hex
R keyboard/{kc60_v2/keymaps/default => kc60/keymaps/default/keymap}.c
M keyboard/planck/Makefile
A keyboard/planck/keymaps/alexey/Makefile
A keyboard/planck/keymaps/alexey/compiled.hex
R keyboard/planck/keymaps/alexey/{alexey => keymap}.c
A keyboard/planck/keymaps/angerthosenear/Makefile
A keyboard/planck/keymaps/angerthosenear/compiled.hex
R keyboard/planck/keymaps/angerthosenear/{angerthosenear => keymap}.c
A keyboard/planck/keymaps/austin/Makefile
A keyboard/planck/keymaps/austin/compiled.hex
R keyboard/planck/keymaps/austin/{austin => keymap}.c
A keyboard/planck/keymaps/bone2planck/Makefile
A keyboard/planck/keymaps/bone2planck/compiled.hex
R keyboard/planck/keymaps/bone2planck/{bone2planck => keymap}.c
A keyboard/planck/keymaps/brandon/Makefile
A keyboard/planck/keymaps/brandon/compiled.hex
R keyboard/planck/keymaps/brandon/{brandon => keymap}.c
A keyboard/planck/keymaps/cbbrowne/Makefile
A keyboard/planck/keymaps/cbbrowne/compiled.hex
A keyboard/planck/keymaps/charlie/Makefile
A keyboard/planck/keymaps/charlie/compiled.hex
R keyboard/planck/keymaps/charlie/{charlie => keymap}.c
A keyboard/planck/keymaps/daniel/Makefile
A keyboard/planck/keymaps/daniel/compiled.hex
R keyboard/planck/keymaps/daniel/{daniel => keymap}.c
A keyboard/planck/keymaps/david/Makefile
A keyboard/planck/keymaps/david/compiled.hex
R keyboard/planck/keymaps/david/{david => keymap}.c
A keyboard/planck/keymaps/default/Makefile
A keyboard/planck/keymaps/default/compiled.hex
D keyboard/planck/keymaps/default/makefile.mk
A keyboard/planck/keymaps/dzobert/Makefile
A keyboard/planck/keymaps/dzobert/compiled.hex
R keyboard/planck/keymaps/dzobert/{dzobert => keymap}.c
A keyboard/planck/keymaps/experimental/Makefile
A keyboard/planck/keymaps/experimental/compiled.hex
M keyboard/planck/keymaps/experimental/keymap.c
D keyboard/planck/keymaps/experimental/makefile.mk
A keyboard/planck/keymaps/experimental/planck_experimental.hex
A keyboard/planck/keymaps/gabriel/Makefile
A keyboard/planck/keymaps/gabriel/compiled.hex
R keyboard/planck/keymaps/gabriel/{gabriel => keymap}.c
A keyboard/planck/keymaps/jacob/Makefile
A keyboard/planck/keymaps/jacob/compiled.hex
A keyboard/planck/keymaps/joe/Makefile
A keyboard/planck/keymaps/joe/compiled.hex
R keyboard/planck/keymaps/joe/{joe => keymap}.c
A keyboard/planck/keymaps/kyle/Makefile
A keyboard/planck/keymaps/kyle/compiled.hex
R keyboard/planck/keymaps/kyle/{kyle => keymap}.c
A keyboard/planck/keymaps/leo/Makefile
A keyboard/planck/keymaps/leo/compiled.hex
R keyboard/planck/keymaps/leo/{leo => keymap}.c
D keyboard/planck/keymaps/lock/README.md
D keyboard/planck/keymaps/lock/keymap.c
A keyboard/planck/keymaps/lucas/Makefile
A keyboard/planck/keymaps/lucas/compiled.hex
R keyboard/planck/keymaps/lucas/{lucas => keymap}.c
A keyboard/planck/keymaps/lukas/Makefile
A keyboard/planck/keymaps/lukas/compiled.hex
R keyboard/planck/keymaps/lukas/{lukas => keymap}.c
A keyboard/planck/keymaps/max/Makefile
A keyboard/planck/keymaps/max/compiled.hex
R keyboard/planck/keymaps/max/{max => keymap}.c
A keyboard/planck/keymaps/mollat/Makefile
A keyboard/planck/keymaps/mollat/compiled.hex
R keyboard/planck/keymaps/mollat/{mollat => keymap}.c
D keyboard/planck/keymaps/monkey/monkey.c
A keyboard/planck/keymaps/nico/Makefile
A keyboard/planck/keymaps/nico/compiled.hex
R keyboard/planck/keymaps/nico/{nico => keymap}.c
D keyboard/planck/keymaps/numpad/numpad.c
A keyboard/planck/keymaps/pete/Makefile
A keyboard/planck/keymaps/pete/compiled.hex
M keyboard/planck/keymaps/pete/keymap.c
D keyboard/planck/keymaps/pete/makefile.mk
A keyboard/planck/keymaps/pvc/Makefile
A keyboard/planck/keymaps/pvc/compiled.hex
D keyboard/planck/keymaps/pvc/makefile.mk
A keyboard/planck/keymaps/tak3over/Makefile
A keyboard/planck/keymaps/tak3over/compiled.hex
R keyboard/planck/keymaps/tak3over/{tak3over => keymap}.c
A keyboard/planck/keymaps/unicode/Makefile
A keyboard/planck/keymaps/unicode/compiled.hex
D keyboard/planck/keymaps/unicode/makefile.mk
A keyboard/planck/keymaps/yang/Makefile
A keyboard/planck/keymaps/yang/compiled.hex
M keyboard/preonic/Makefile
A keyboard/preonic/keymaps/default/Makefile
A keyboard/preonic/keymaps/default/compiled.hex
D keyboard/preonic/keymaps/default/makefile.mk
D keyboard/preonic/keymaps/lock/README.md
D keyboard/preonic/keymaps/lock/keymap.c
D keyboard/preonic/keymaps/nerdgasm/README.md
D keyboard/preonic/keymaps/nerdgasm/keymap.c
M keyboard/retro_refit/Makefile
A keyboard/retro_refit/keymaps/default/compiled.hex
R keyboard/retro_refit/keymaps/{default => default/keymap}.c
R keyboard/{kc60_v2 => sixkeyboard}/Makefile
A keyboard/sixkeyboard/README.md
A keyboard/sixkeyboard/config.h
A keyboard/sixkeyboard/keymaps/default/compiled.hex
A keyboard/sixkeyboard/keymaps/default/keymap.c
R keyboard/{gh60 => sixkeyboard}/matrix.c
A keyboard/sixkeyboard/sixkeyboard.c
A keyboard/sixkeyboard/sixkeyboard.h
D quantum/quantum.mk
M quantum/template/Makefile
M quantum/template/README.md
R quantum/template/keymaps/{default => default/keymap}.c
M tmk_core/common.mk
M tmk_core/protocol/lufa.mk
M tmk_core/protocol/lufa/lufa.c
M tmk_core/rules.mk
A util/bootloader.hex
M util/new_project.sh
This diff is too large to display. Try viewing the raw diff instead.