summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorDamien <Dbroqua@users.noreply.github.com>2017-04-02 23:29:12 +0200
committerGitHub <noreply@github.com>2017-04-02 23:29:12 +0200
commit3e41cde9f99778ca30c03b97470c32780379db43 (patch)
tree18e2376acae06563166b5ea8b8cd6368cb9cddae /keyboards
parente7347ff0de93ff823462b3ff2b4136b44dc576c0 (diff)
parent3448d5d4874a2775f85320a2be69edd241575d46 (diff)
Merge pull request #19 from qmk/master
Merge from qmk
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/atreus/keymaps/default/keymap.c12
-rw-r--r--keyboards/atreus62/atreus62.h38
-rw-r--r--keyboards/clueboard/keymaps/caps_fn/keymap.c5
-rw-r--r--keyboards/clueboard/keymaps/colemak/keymap.c86
-rw-r--r--keyboards/clueboard/keymaps/default/keymap.c5
-rw-r--r--keyboards/clueboard/keymaps/mac_optimized/keymap.c5
-rw-r--r--keyboards/clueboard/keymaps/mouse_keys/keymap.c5
-rw-r--r--keyboards/clueboard/keymaps/shift_fn/keymap.c5
-rw-r--r--keyboards/clueboard/keymaps/skully/keymap.c5
-rw-r--r--keyboards/clueboard/keymaps/unix_optimized/keymap.c5
-rw-r--r--keyboards/clueboard/keymaps/win_optimized/keymap.c5
-rw-r--r--keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-base-layout.pngbin79488 -> 97053 bytes
-rw-r--r--keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-layer-2-media-and-mouse.pngbin62258 -> 65740 bytes
-rw-r--r--keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-layer-3-navigation.pngbin58886 -> 0 bytes
-rw-r--r--keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-layer-3-unicode.pngbin0 -> 73624 bytes
-rw-r--r--keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-layer-4-unicode-2.pngbin0 -> 66132 bytes
-rw-r--r--keyboards/ergodox/keymaps/deadcyclo/keymap.c84
-rw-r--r--keyboards/ergodox/keymaps/deadcyclo/readme.md9
-rw-r--r--keyboards/ergodox/keymaps/german-lukas/README.md12
-rw-r--r--keyboards/ergodox/keymaps/german-lukas/keymap.c236
-rw-r--r--keyboards/ergodox/keymaps/guni/keymap.c177
-rw-r--r--keyboards/ergodox/keymaps/guni/readme.txt133
-rw-r--r--keyboards/ergodox/keymaps/italian/keymap.c223
-rw-r--r--keyboards/ergodox/keymaps/italian/readme.md72
-rw-r--r--keyboards/ergodox/keymaps/neo2_on_qwertz_hardware/keymap.c408
-rw-r--r--keyboards/ergodox/keymaps/neo2_on_qwertz_hardware/keymap.md194
-rw-r--r--keyboards/ergodox/keymaps/reset_eeprom/keymap.c2
-rw-r--r--keyboards/ergodox/readme.md23
-rw-r--r--keyboards/frosty_flake/Makefile (renamed from keyboards/lets_split/rev2fliphalf/Makefile)2
-rw-r--r--keyboards/frosty_flake/config.h147
-rw-r--r--keyboards/frosty_flake/frosty_flake.c63
-rw-r--r--keyboards/frosty_flake/frosty_flake.h50
-rw-r--r--keyboards/frosty_flake/keymaps/default/Makefile21
-rw-r--r--keyboards/frosty_flake/keymaps/default/config.h8
-rw-r--r--keyboards/frosty_flake/keymaps/default/keymap.c11
-rw-r--r--keyboards/frosty_flake/keymaps/default/readme.md1
-rw-r--r--keyboards/frosty_flake/matrix.c135
-rw-r--r--keyboards/frosty_flake/readme.md32
-rw-r--r--keyboards/frosty_flake/rules.mk71
-rw-r--r--keyboards/handwired/MS-sculpt-mobile/MS-sculpt-mobile.c1
-rw-r--r--keyboards/handwired/MS-sculpt-mobile/MS-sculpt-mobile.h48
-rw-r--r--keyboards/handwired/MS-sculpt-mobile/Makefile3
-rw-r--r--keyboards/handwired/MS-sculpt-mobile/babblePaste.c459
-rw-r--r--keyboards/handwired/MS-sculpt-mobile/babblePaste.h238
-rw-r--r--keyboards/handwired/MS-sculpt-mobile/babblePaste.txt123
-rw-r--r--keyboards/handwired/MS-sculpt-mobile/config.h100
-rw-r--r--keyboards/handwired/MS-sculpt-mobile/keymaps/default/Makefile21
-rw-r--r--keyboards/handwired/MS-sculpt-mobile/keymaps/default/config.h8
-rw-r--r--keyboards/handwired/MS-sculpt-mobile/keymaps/default/keymap.c64
-rw-r--r--keyboards/handwired/MS-sculpt-mobile/keymaps/default/readme.md1
-rw-r--r--keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/Makefile21
-rw-r--r--keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/config.h32
-rw-r--r--keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/keymap.c272
-rw-r--r--keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/readme.md1
-rw-r--r--keyboards/handwired/MS-sculpt-mobile/readme.md58
-rw-r--r--keyboards/handwired/MS-sculpt-mobile/rules.mk48
-rw-r--r--keyboards/handwired/atreus50/Makefile3
-rw-r--r--keyboards/handwired/atreus50/atreus50.c10
-rw-r--r--keyboards/handwired/atreus50/atreus50.h36
-rw-r--r--keyboards/handwired/atreus50/config.h163
-rw-r--r--keyboards/handwired/atreus50/keymaps/default/Makefile6
-rw-r--r--keyboards/handwired/atreus50/keymaps/default/keymap.c250
-rw-r--r--keyboards/handwired/atreus50/readme.md16
-rw-r--r--keyboards/handwired/atreus50/rules.mk81
-rw-r--r--keyboards/handwired/magicforce68/Makefile3
-rw-r--r--keyboards/handwired/magicforce68/README.md20
-rw-r--r--keyboards/handwired/magicforce68/config.h162
-rw-r--r--keyboards/handwired/magicforce68/keymaps/default/keymap.c67
-rw-r--r--keyboards/handwired/magicforce68/magicforce68.c8
-rw-r--r--keyboards/handwired/magicforce68/magicforce68.h20
-rw-r--r--keyboards/handwired/magicforce68/rules.mk83
-rw-r--r--keyboards/handwired/magicforce68/wiring-layout.pngbin0 -> 73739 bytes
-rw-r--r--keyboards/handwired/numpad20/Makefile3
-rw-r--r--keyboards/handwired/numpad20/config.h162
-rw-r--r--keyboards/handwired/numpad20/keymaps/default/keymap.c16
-rw-r--r--keyboards/handwired/numpad20/numpad20.c8
-rw-r--r--keyboards/handwired/numpad20/numpad20.h20
-rw-r--r--keyboards/handwired/numpad20/rules.mk83
-rw-r--r--keyboards/handwired/ortho5x13/Makefile3
-rw-r--r--keyboards/handwired/ortho5x13/config.h162
-rw-r--r--keyboards/handwired/ortho5x13/keymaps/default/keymap.c289
-rw-r--r--keyboards/handwired/ortho5x13/ortho5x13.c8
-rw-r--r--keyboards/handwired/ortho5x13/ortho5x13.h36
-rw-r--r--keyboards/handwired/ortho5x13/rules.mk83
-rw-r--r--keyboards/lets_split/common/glcdfont.c276
-rw-r--r--keyboards/lets_split/i2c.h20
-rw-r--r--keyboards/lets_split/keymaps/OLED_sample/Makefile25
-rw-r--r--keyboards/lets_split/keymaps/OLED_sample/config.h45
-rw-r--r--keyboards/lets_split/keymaps/OLED_sample/keymap.c356
-rw-r--r--keyboards/lets_split/keymaps/OLED_sample/readme.md25
-rw-r--r--keyboards/lets_split/keymaps/hexwire/Makefile5
-rw-r--r--keyboards/lets_split/keymaps/hexwire/README.md108
-rw-r--r--keyboards/lets_split/keymaps/hexwire/config.h70
-rw-r--r--keyboards/lets_split/keymaps/hexwire/keymap.c205
-rw-r--r--keyboards/lets_split/keymaps/smt/config.h34
-rw-r--r--keyboards/lets_split/keymaps/smt/keymap.c219
-rw-r--r--keyboards/lets_split/keymaps/smt/readme.md88
-rw-r--r--keyboards/lets_split/matrix.c2
-rw-r--r--keyboards/lets_split/rev1/config.h7
-rw-r--r--keyboards/lets_split/rev2/rev2.c8
-rw-r--r--keyboards/lets_split/rev2/rev2.h59
-rw-r--r--keyboards/lets_split/rev2fliphalf/rev2fliphalf.c32
-rw-r--r--keyboards/lets_split/rev2fliphalf/rev2fliphalf.h28
-rw-r--r--keyboards/lets_split/rev2fliphalf/rules.mk5
-rw-r--r--keyboards/lets_split/rules.mk15
-rw-r--r--keyboards/lets_split/split_util.c5
-rw-r--r--keyboards/lets_split/split_util.h2
-rw-r--r--keyboards/lets_split/ssd1306.c468
-rw-r--r--keyboards/planck/keymaps/callum/keymap.c12
-rw-r--r--keyboards/planck/keymaps/dbroqua/config.h29
-rw-r--r--keyboards/planck/keymaps/default/config.h29
-rw-r--r--keyboards/planck/keymaps/experimental/config.h23
-rw-r--r--keyboards/planck/keymaps/impossible/config.h29
-rw-r--r--keyboards/planck/keymaps/jeebak/config.h29
-rw-r--r--keyboards/planck/keymaps/jhenahan/config.h23
-rw-r--r--keyboards/planck/keymaps/khord/Makefile4
-rw-r--r--keyboards/planck/keymaps/khord/config.h (renamed from keyboards/lets_split/rev2fliphalf/config.h)48
-rw-r--r--keyboards/planck/keymaps/khord/keymap.c336
-rw-r--r--keyboards/planck/keymaps/premek/config.h29
-rw-r--r--keyboards/planck/keymaps/sgoodwin/config.h29
-rw-r--r--keyboards/planck/keymaps/smt/config.h29
-rw-r--r--keyboards/planck/keymaps/smt/keymap.c132
-rw-r--r--keyboards/planck/keymaps/smt/readme.md79
-rw-r--r--keyboards/planck/keymaps/thermal_printer/config.h23
-rw-r--r--keyboards/planck/keymaps/unicode/config.h29
-rw-r--r--keyboards/planck/keymaps/xyverz/config.h29
-rw-r--r--keyboards/planck/keymaps/zach/Makefile29
-rw-r--r--keyboards/planck/keymaps/zach/config.h94
-rw-r--r--keyboards/planck/keymaps/zach/keymap.c48
-rw-r--r--keyboards/planck/keymaps/zach/zach_common_functions.c447
-rw-r--r--keyboards/planck/rules.mk4
-rw-r--r--keyboards/preonic/keymaps/CMD-Preonic/config.h29
-rw-r--r--keyboards/preonic/keymaps/default/config.h29
-rw-r--r--