summaryrefslogtreecommitdiffstats
path: root/keyboard
diff options
context:
space:
mode:
authorChristopher Browne <cbbrowne@ca.afilias.info>2016-05-24 12:34:08 -0400
committerChristopher Browne <cbbrowne@ca.afilias.info>2016-05-24 12:34:08 -0400
commit48871b9b6b99201abc381ee27cfd94e211ca131a (patch)
treeed5fe45f9f38e364b53a1bac35084782ec6aaf2c /keyboard
parentc2a3df31239249b2fb65e2552376daac0e49ae61 (diff)
parent287eb7ad148abc8fe3fb014218d71e205fd9131d (diff)
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboard')
-rw-r--r--keyboard/Bantam44/config.h7
-rw-r--r--keyboard/atomic/Makefile4
-rw-r--r--keyboard/atomic/atomic.c300
-rw-r--r--keyboard/atomic/atomic.h23
-rw-r--r--keyboard/atomic/backlight.c63
-rw-r--r--keyboard/atomic/config.h17
-rw-r--r--keyboard/atomic/keymaps/pvc/config.h13
-rw-r--r--keyboard/atomic/keymaps/pvc/keymap.c405
-rw-r--r--keyboard/atomic/keymaps/pvc/makefile.mk2
-rw-r--r--keyboard/atreus/config.h12
-rw-r--r--keyboard/clueboard1/Makefile11
-rw-r--r--keyboard/clueboard1/config.h25
-rw-r--r--keyboard/clueboard2/Makefile13
-rw-r--r--keyboard/clueboard2/config.h19
-rw-r--r--keyboard/cluepad/Makefile6
-rw-r--r--keyboard/cluepad/config.h19
-rw-r--r--keyboard/ergodox_ez/Makefile16
-rw-r--r--keyboard/ergodox_ez/keymaps/ab/ab.hex1146
-rw-r--r--keyboard/ergodox_ez/keymaps/ab/keyboard-layout.json385
-rw-r--r--keyboard/ergodox_ez/keymaps/ab/keyboard-layout.pngbin0 -> 79440 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/ab/keymap.c140
-rw-r--r--keyboard/ergodox_ez/keymaps/ab/readme.md21
-rw-r--r--keyboard/ergodox_ez/keymaps/adnw/k_o_y/k_o_y.hex1152
-rw-r--r--keyboard/ergodox_ez/keymaps/adnw/k_o_y/keymap.c185
-rw-r--r--keyboard/ergodox_ez/keymaps/adnw/k_o_y/readme.md7
-rw-r--r--keyboard/ergodox_ez/keymaps/default_osx/keymap.c6
-rw-r--r--keyboard/ergodox_ez/keymaps/erez_experimental/config_user.h8
-rw-r--r--keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex2243
-rw-r--r--keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c125
-rw-r--r--keyboard/ergodox_ez/keymaps/erez_experimental/makefile.mk5
-rw-r--r--keyboard/ergodox_ez/keymaps/erez_experimental/readme.md17
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/keymap.c706
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.pngbin99031 -> 99605 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt4
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.pngbin121014 -> 124144 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt20
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.pngbin0 -> 63065 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.txt27
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.pngbin103401 -> 103735 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt8
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex2380
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/readme.md37
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c239
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental.hex1247
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental_highres.pngbin289029 -> 303904 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_de_experimental/readme.md22
-rw-r--r--keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/keymap.c45
-rw-r--r--keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/readme.md28
-rw-r--r--keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.hex1092
-rw-r--r--keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.pngbin0 -> 96954 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c73
-rw-r--r--keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/readme.md34
-rw-r--r--keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.hex1139
-rw-r--r--keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.pngbin0 -> 100627 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/sneako/README.md6
-rw-r--r--keyboard/ergodox_ez/keymaps/sneako/keymap.c187
-rw-r--r--keyboard/ergodox_ez/keymaps/sneako/sneako.hex1152
-rw-r--r--keyboard/ergodox_ez/keymaps/techtomas/keymap.c231
-rw-r--r--keyboard/ergodox_ez/keymaps/techtomas/readme.md36
-rw-r--r--keyboard/ergodox_ez/keymaps/techtomas/techtomas.hex1166
-rw-r--r--keyboard/ergodox_ez/keymaps/townk_osx/config.h92
-rw-r--r--keyboard/ergodox_ez/keymaps/townk_osx/keymap.c285
-rw-r--r--keyboard/ergodox_ez/keymaps/townk_osx/makefile.mk4
-rw-r--r--keyboard/ergodox_ez/keymaps/townk_osx/readme.md77
-rw-r--r--keyboard/ergodox_ez/keymaps/townk_osx/townk_osx.hex1166
-rw-r--r--keyboard/ergodox_ez/keymaps/townk_osx/townk_osx_base.pngbin0 -> 785859 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/townk_osx/townk_osx_fn.pngbin0 -> 390041 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/townk_osx/townk_osx_keypad.pngbin0 -> 424425 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/twey/keymap.c140
-rw-r--r--keyboard/ergodox_ez/keymaps/twey/readme.md12
-rw-r--r--keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c187
-rw-r--r--keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown45
-rw-r--r--keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex1152
-rw-r--r--keyboard/ergodox_ez/readme.md2
-rw-r--r--keyboard/gh60_rev_c/config.h17
-rw-r--r--keyboard/gh60_rev_c/gh60.c7
-rw-r--r--keyboard/gh60_rev_c/gh60.h2
-rw-r--r--keyboard/jd45/config.h9
-rw-r--r--keyboard/planck/Makefile4
-rw-r--r--keyboard/planck/backlight.c61
-rw-r--r--keyboard/planck/config.h7
-rw-r--r--keyboard/planck/keymaps/alexey/alexey.c (renamed from keyboard/planck/keymaps/alexey.c)0
-rw-r--r--keyboard/planck/keymaps/angerthosenear/angerthosenear.c (renamed from keyboard/planck/keymaps/angerthosenear.c)0
-rw-r--r--keyboard/planck/keymaps/austin/austin.c (renamed from keyboard/planck/keymaps/austin.c)0
-rw-r--r--keyboard/planck/keymaps/bone2planck/bone2planck.c (renamed from keyboard/planck/keymaps/bone2planck.c)0
-rw-r--r--keyboard/planck/keymaps/brandon/brandon.c (renamed from keyboard/planck/keymaps/brandon.c)0
-rw-r--r--keyboard/planck/keymaps/charlie/charlie.c (renamed from keyboard/planck/keymaps/charlie.c)0
-rw-r--r--keyboard/planck/keymaps/daniel/daniel.c (renamed from keyboard/planck/keymaps/daniel.c)0
-rw-r--r--keyboard/planck/keymaps/david/david.c (renamed from keyboard/planck/keymaps/david.c)0
-rw-r--r--keyboard/planck/keymaps/default/keymap.c143
-rw-r--r--keyboard/planck/keymaps/dzobert/dzobert.c (renamed from keyboard/planck/keymaps/dzobert.c)0
-rw-r--r--keyboard/planck/keymaps/experimental/README.md2
-rw-r--r--keyboard/planck/keymaps/experimental/keymap.c333
-rw-r--r--keyboard/planck/keymaps/experimental/makefile.mk5
-rw-r--r--keyboard/planck/keymaps/gabriel/gabriel.c (renamed from keyboard/planck/keymaps/gabriel.c)0
-rw-r--r--keyboard/planck/keymaps/jacob/Keyboard Layout.PNGbin0 -> 17292 bytes
-rw-r--r--keyboard/planck/keymaps/jacob/keymap.c56
-rw-r--r--keyboard/planck/keymaps/jacob/readme.md1
-rw-r--r--keyboard/planck/keymaps/joe/joe.c (renamed from keyboard/planck/keymaps/joe.c)0
-rw-r--r--keyboard/planck/keymaps/kyle/kyle.c (renamed from keyboard/planck/keymaps/kyle.c)0
-rw-r--r--keyboard/planck/keymaps/leo/leo.c (renamed from keyboard/planck/keymaps/leo.c)0
-rw-r--r--keyboard/planck/keymaps/lucas/lucas.c (renamed from keyboard/planck/keymaps/lucas.c)0
-rw-r--r--keyboard/planck/keymaps/lukas/lukas.c (renamed from keyboard/planck/keymaps/lukas.c)0
-rw-r--r--keyboard/planck/keymaps/max/max.c (renamed from keyboard/planck/keymaps/max.c)0
-rw-r--r--keyboard/planck/keymaps/mollat/mollat.c (renamed from keyboard/planck/keymaps/mollat.c)0
-rw-r--r--keyboard/planck/keymaps/monkey/monkey.c (renamed from keyboard/planck/keymaps/monkey.c)0
-rw-r--r--keyboard/planck/keymaps/nico/nico.c (renamed from keyboard/planck/keymaps/nico.c)0
-rw-r--r--keyboard/planck/keymaps/numpad/numpad.c (renamed from keyboard/planck/keymaps/numpad.c)0
-rw-r--r--keyboard/planck/keymaps/pete/README.md14
-rw-r--r--keyboard/planck/keymaps/pete/keymap.c223
-rw-r--r--keyboard/planck/keymaps/pete/makefile.mk2
-rw-r--r--keyboard/planck/keymaps/pvc/config.h7
-rw-r--r--keyboard/planck/keymaps/pvc/keymap.c304
-rw-r--r--keyboard/planck/keymaps/pvc/makefile.mk7
-rw-r--r--keyboard/planck/keymaps/tak3over/tak3over.c (renamed from keyboard/planck/keymaps/tak3over.c)0
-rw-r--r--keyboard/planck/keymaps/unicode/keymap.c326
-rw-r--r--keyboard/planck/keymaps/unicode/makefile.mk1
-rw-r--r--keyboard/planck/planck.c278
-rw-r--r--keyboard/planck/planck.h33
-rw-r--r--keyboard/planck/planck_pcb_r4.hex3159
-rw-r--r--keyboard/planck/planck_pcb_r4_w_bootloader.hex3159
-rw-r--r--keyboard/preonic/Makefile5
-rw-r--r--keyboard/preonic/backlight.c61
-rw-r--r--keyboard/preonic/config.h7
-rw-r--r--keyboard/preonic/keymaps/default/keymap.c93
-rw-r--r--keyboard/preonic/preonic.c71
-rw-r--r--keyboard/preonic/preonic.h15
-rw-r--r--keyboard/preonic/preonic_pcb_r1.hex3328
-rw-r--r--keyboard/preonic/preonic_pcb_r1_w_bootloader.hex3071
-rw-r--r--keyboard/retro_refit/config.h9
130 files changed, 24150 insertions, 10106 deletions
diff --git a/keyboard/Bantam44/config.h b/keyboard/Bantam