summaryrefslogtreecommitdiffstats
path: root/keyboard
diff options
context:
space:
mode:
authorWojciech Siewierski <wojciech.siewierski@onet.pl>2016-04-03 11:14:08 +0200
committerWojciech Siewierski <wojciech.siewierski@onet.pl>2016-04-03 11:23:00 +0200
commit47dd29513eeec7b7f639bef6df441a905ce8bacb (patch)
tree29170847273e786384bd3d7c7781e67dc4335bbb /keyboard
parent8ef14d09b8451b3f2a77e6f019922eae0ac43642 (diff)
parent8d39263d2444f0273327902684c802b218efb7b6 (diff)
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into modifier-release-fix
Diffstat (limited to 'keyboard')
-rw-r--r--keyboard/Bantam44/Bantam44.c25
-rw-r--r--keyboard/Bantam44/Bantam44.h29
-rw-r--r--keyboard/Bantam44/Makefile139
-rw-r--r--keyboard/Bantam44/README.md24
-rw-r--r--keyboard/Bantam44/config.h81
-rw-r--r--keyboard/Bantam44/keymaps/default.c30
-rw-r--r--keyboard/alps64/Makefile4
-rw-r--r--keyboard/alps64/keymaps/default.c (renamed from keyboard/alps64/keymap_plain.c)0
-rw-r--r--keyboard/alps64/keymaps/hasu.c (renamed from keyboard/alps64/keymap_hasu.c)0
-rw-r--r--keyboard/atomic/Makefile4
-rw-r--r--keyboard/atomic/README.md4
-rw-r--r--keyboard/atomic/atomic.c24
-rw-r--r--keyboard/atomic/atomic.h4
-rw-r--r--keyboard/atomic/keymaps/abienz.c (renamed from keyboard/atomic/keymaps/keymap_abienz.c)0
-rw-r--r--keyboard/atomic/keymaps/default.c (renamed from keyboard/atomic/keymaps/keymap_default.c)0
-rw-r--r--keyboard/atomic/keymaps/michelle.c (renamed from keyboard/atomic/keymaps/keymap_michelle.c)0
-rw-r--r--keyboard/atreus/Makefile4
-rw-r--r--keyboard/atreus/README.md4
-rw-r--r--keyboard/atreus/atreus.c8
-rw-r--r--keyboard/atreus/atreus.h4
-rw-r--r--keyboard/atreus/keymaps/default.c (renamed from keyboard/atreus/keymaps/keymap_default.c)0
-rw-r--r--keyboard/atreus/keymaps/gerb.c (renamed from keyboard/atreus/keymaps/keymap_gerb.c)0
-rwxr-xr-xkeyboard/ergodox_ez/190hotfix.sh19
-rw-r--r--keyboard/ergodox_ez/ergodox_ez.c33
-rw-r--r--keyboard/ergodox_ez/ergodox_ez.h4
-rw-r--r--keyboard/ergodox_ez/keymaps/andrew_osx/andrew_osx.hex2528
-rw-r--r--keyboard/ergodox_ez/keymaps/andrew_osx/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/coderkun_neo2/coderkun_neo2.hex2543
-rw-r--r--keyboard/ergodox_ez/keymaps/coderkun_neo2/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/colemak/colemak.hex2528
-rw-r--r--keyboard/ergodox_ez/keymaps/colemak/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/colemak_osx_pc_no.hex2102
-rw-r--r--keyboard/ergodox_ez/keymaps/csharp_dev/csharp_dev.hex2308
-rw-r--r--keyboard/ergodox_ez/keymaps/csharp_dev/csharp_dev.pngbin558660 -> 97642 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/csharp_dev/csharp_dev_legend.pngbin576661 -> 387797 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/csharp_dev/keymap.c101
-rw-r--r--keyboard/ergodox_ez/keymaps/csharp_dev/readme.md3
-rw-r--r--keyboard/ergodox_ez/keymaps/dave/dave.hex2547
-rw-r--r--keyboard/ergodox_ez/keymaps/dave/keymap.c8
-rw-r--r--keyboard/ergodox_ez/keymaps/default/default.hex2115
-rw-r--r--keyboard/ergodox_ez/keymaps/default/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/default_osx/default_osx.hex2524
-rw-r--r--keyboard/ergodox_ez/keymaps/default_osx/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/dragon788/dragon788.hex2528
-rw-r--r--keyboard/ergodox_ez/keymaps/dragon788/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/dvorak/dvorak.hex2529
-rw-r--r--keyboard/ergodox_ez/keymaps/dvorak/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/README.md29
-rw-r--r--keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/dvorak_intl_squisher.hex1127
-rw-r--r--keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout0.pngbin0 -> 73585 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout1.pngbin0 -> 59122 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout2.pngbin0 -> 53319 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/keymap.c185
-rw-r--r--keyboard/ergodox_ez/keymaps/emacs_osx_dk/emacs_osx_dk.hex2529
-rw-r--r--keyboard/ergodox_ez/keymaps/emacs_osx_dk/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex2115
-rw-r--r--keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/german-kinergo/german-kinergo.hex2532
-rw-r--r--keyboard/ergodox_ez/keymaps/german-kinergo/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/german-manuneo/compile_keymap.py679
-rw-r--r--keyboard/ergodox_ez/keymaps/german-manuneo/german-manuneo.hex1240
-rw-r--r--keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c783
-rw-r--r--keyboard/ergodox_ez/keymaps/german-manuneo/keymap.md188
-rw-r--r--keyboard/ergodox_ez/keymaps/german/german.hex2529
-rw-r--r--keyboard/ergodox_ez/keymaps/german/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/j3rn/j3rn.hex2529
-rw-r--r--keyboard/ergodox_ez/keymaps/j3rn/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/jack/jack.hex2529
-rw-r--r--keyboard/ergodox_ez/keymaps/jack/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/jacobono/jacobono.hex2086
-rw-r--r--keyboard/ergodox_ez/keymaps/jacobono/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/jgarr/jgarr.hex2529
-rw-r--r--keyboard/ergodox_ez/keymaps/jgarr/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/kastyle/kastyle.hex2529
-rw-r--r--keyboard/ergodox_ez/keymaps/kastyle/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/kines-ish/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/kines-ish/kines-ish.hex2529
-rw-r--r--keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c31
-rw-r--r--keyboard/ergodox_ez/keymaps/mpiechotka/mpiechotka.hex2625
-rw-r--r--keyboard/ergodox_ez/keymaps/msc/img/code_layer.pngbin0 -> 71266 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/msc/img/main_layer.pngbin0 -> 90624 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/msc/img/media_layer.pngbin0 -> 75750 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/msc/keymap.c184
-rw-r--r--keyboard/ergodox_ez/keymaps/msc/msc.hex1118
-rw-r--r--keyboard/ergodox_ez/keymaps/msc/readme.md32
-rw-r--r--keyboard/ergodox_ez/keymaps/naps62/README.md29
-rw-r--r--keyboard/ergodox_ez/keymaps/naps62/ergodox_ez.hex1474
-rw-r--r--keyboard/ergodox_ez/keymaps/naps62/keymap.c187
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/keymap.c192
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.pngbin0 -> 95077 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt27
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.pngbin0 -> 108774 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt27
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.pngbin0 -> 93001 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt27
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex1119
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/readme.md9
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_de/keymap.c131
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_de/osx_de.hex2704
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_de/osx_de_highres.pngbin749565 -> 684862 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy.hex2573
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_fr/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_fr/osx_fr.hex2592
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/plover/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/plover/plover.hex2528
-rw-r--r--keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c134
-rw-r--r--keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md47
-rw-r--r--keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.hex1132
-rw-r--r--keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.pngbin0 -> 130464 bytes
-rw-r--r--keyboard/ergodox_ez/keymaps/software_neo2/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/software_neo2/software_neo2.hex2527
-rw-r--r--keyboard/ergodox_ez/keymaps/tm2030/keymap.c8
-rw-r--r--keyboard/ergodox_ez/keymaps/tm2030/keymap.hex1538
-rw-r--r--keyboard/ergodox_ez/keymaps/tm2030/tm2030.hex1187
-rw-r--r--keyboard/ergodox_ez/keymaps/tonyabra_osx/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/tonyabra_osx/tonyabra_osx.hex2528
-rw-r--r--keyboard/ergodox_ez/keymaps/workman_osx_mdw/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/workman_osx_mdw/workman_osx_mdw.hex2624
-rwxr-xr-xkeyboard/ergodox_ez/makeallhex.sh9
-rw-r--r--keyboard/ergodox_ez/matrix.c16
-rw-r--r--keyboard/gh60/Makefile4
-rw-r--r--keyboard/gh60/Makefile.pjrc4
-rw-r--r--keyboard/gh60/README.md14
-rw-r--r--keyboard/gh60/keymaps/hasu.c (renamed from keyboard/gh60/keymap_hasu.c)0
-rw-r--r--keyboard/gh60/keymaps/hhkb.c (renamed from keyboard/gh60/keymap_hhkb.c)0
-rw-r--r--keyboard/gh60/keymaps/plain.c (renamed from keyboard/gh60/keymap_plain.c)0
-rw-r--r--keyboard/gh60/keymaps/poker.c (renamed from keyboard/gh60/keymap_poker.c)0
-rw-r--r--keyboard/gh60/keymaps/poker_bit.c (renamed from keyboard/gh60/keymap_poker_bit.c)0
-rw-r--r--keyboard/gh60/keymaps/poker_set.c (renamed from keyboard/gh60/keymap_poker_set.c)0
-rw-r--r--keyboard/gh60/keymaps/spacefn.c (renamed from keyboard/gh60/keymap_spacefn.c)0
-rw-r--r--keyboard/hhkb/Makefile8
-rw-r--r--keyboard/hhkb/Makefile.pjrc4
-rw-r--r--