Christopher Browne
2d59c97ec1
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-07-28 12:42:21 -04:00
Jack Humbert
80667e898a
Merge pull request #572 from algernon/f/tap-dance-debug
...
tap-dance: Add some debugging support
2016-07-28 12:28:30 -04:00
Jack Humbert
e5ac0e8369
Merge pull request #570 from sethbc/fix_bone2planck_build
...
Fix bone2planck build
2016-07-28 12:27:46 -04:00
Jack Humbert
a6d279a343
Merge pull request #569 from sethbc/fix_stanleylai_warnings
...
kill warnings filling up travis buildlog
2016-07-28 12:27:11 -04:00
Jack Humbert
36df9fd3fd
Merge pull request #568 from sethbc/fix-colemak-osx-pc-no
...
update NO_AMP to NO_AMPR
2016-07-28 12:26:43 -04:00
Jack Humbert
f96a2a74ea
Merge pull request #566 from SmackleFunky/master
...
Allow toggling out of plover layer
2016-07-28 12:26:11 -04:00
Jack Humbert
9171ce1d17
Merge pull request #559 from Talljoe/fix-compiler-warning
...
Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled.
2016-07-28 12:24:42 -04:00
Jack Humbert
8d98f37fbb
Merge pull request #564 from mazinbokhari/master
...
Move to keyboards
2016-07-28 12:24:03 -04:00
Callum Oakley
1eeceee355
Added readme.md for custom layout.
2016-07-28 12:15:55 +01:00
Toni
684d869fab
added homerow-ish brackets
2016-07-28 11:58:53 +02:00
Callum Oakley
9822b9f743
Added custom keymap.
...
Added custom keymap.
2016-07-27 21:18:19 +01:00
Toni
6ff8a81520
first try ar adding the parenthesis mess for german iso
2016-07-27 21:11:55 +02:00
Toni
9f21c0aa06
Merge remote-tracking branch 'origin/master' into iso_split_rshift
...
merge with master
2016-07-27 20:35:13 +02:00
Christopher Browne
911d0a040e
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-07-27 12:57:54 -04:00
Gergely Nagy
b21e8b97ac
tap-dance: Add some debugging support
...
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-27 14:49:19 +02:00
Gergely Nagy
dd77054790
tmk_core/rules.mk: Make PRINT_ERROR* stop on error
...
Instead of `&& false`, explicitly `exit 1` to make the rules using these macros
fail. This fixes #571 , and likely breaks Travis badly.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-27 08:53:05 +02:00
Seth Chandler
180a3da44d
remove unnecessary includes
2016-07-27 02:32:15 -04:00
Seth Chandler
95ef3f864e
fix numerous errors in bone2planck keymap
2016-07-27 02:30:17 -04:00
Seth Chandler
368d0bdf68
kill warnings filling up travis buildlog
2016-07-27 02:21:09 -04:00
Seth Chandler
13bb3a7379
update NO_AMP to NO_AMPR
2016-07-27 02:06:19 -04:00
SmackleFunky
fdd07991de
Allow toggling out of plover layer
2016-07-27 04:44:24 +00:00
Mazin Bokhari
3fd1c9d72b
Move to keyboards
2016-07-26 22:43:04 -05:00
Stephen Christie
57952949fe
General table cleanup.
2016-07-26 23:33:21 -04:00
Erez Zukerman
93f366fa7d
Merge pull request #562 from michaelklos/doc
...
Added Tap Dance Example
2016-07-26 21:54:10 -04:00
Erez Zukerman
685c8ba64c
Merge pull request #533 from mazinbokhari/master
...
Add my layout optimized for working in emacs, vim, command line, etc.
2016-07-26 21:52:39 -04:00
Michael Klos
7e69de061a
Added Tap Dance Example
...
Added (simple) Tap Dance example implementation steps.
2016-07-26 18:41:35 -04:00
Stephen Christie
ff8136b883
Modified Plover layer for Impossible's home position.
2016-07-26 17:39:21 -04:00
Stephen Christie
465cf08c63
Removed unused layers (keeping QWERTY for later/reference)
2016-07-26 17:37:56 -04:00
Stephen Christie
fb2a7d787a
Removed unused layers (left QWERTY for later use/reference)
2016-07-26 17:29:19 -04:00
Christopher Browne
2a349e96bb
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-07-26 16:35:44 -04:00
Jordi Orlando
ea2d2f5d58
Simplify HSV->RGB calculation
...
De-dupe repeated code
2016-07-26 15:31:22 -05:00
Jack Humbert
b66131eeb5
disable midi by default
2016-07-26 15:59:26 -04:00
Jordi Orlando
899c88cd8b
Increament -> increment
2016-07-26 14:46:30 -05:00
Jordi Orlando
3a860c4bc2
Clean up rgblight.c
...
Fix formatting issues, clarify comments
2016-07-26 14:43:45 -05:00
Jason Janse van Rensburg
a41a7a9100
include base config.h instead of copying it
2016-07-26 16:19:34 +02:00
Jason Janse van Rensburg
8244fa40cc
added config.h, and missing Ins of filpped navigation layer
2016-07-26 14:58:17 +02:00
Joshua T
5607b716ba
Merge remote-tracking branch 'upstream/master'
2016-07-26 01:49:24 -05:00
Joshua T
876a6bdd4c
Modified Atreus extend and Ergodox.
...
Atreus: Removed home row Shift. It's under the thumb anyway. Also replaced dual modifier keys with macro keys (cut, copy, paste, undo).
Ergodox: Made Colemak the default layer instead of Dvorak. Also began the process of bringing it in line with the Atreus layout I've been working on.
2016-07-26 01:44:57 -05:00
erlo muvman
26510e6de8
Delete default.png
2016-07-25 20:16:11 -05:00
erlo muvman
3779e1988e
Delete default_highres.png
2016-07-25 20:16:07 -05:00
erlo muvman
97efac0f1c
Update readme.md
2016-07-25 20:14:19 -05:00
erlo muvman
6e2d7ebd80
Update readme.md
2016-07-25 20:12:48 -05:00
erlo muvman
048e8b7849
Update readme.md
2016-07-25 20:06:58 -05:00
Jason Janse van Rensburg
27d27b179b
Merged branch master into bone2planck
2016-07-25 22:55:28 +02:00
Jason Janse van Rensburg
3e462fac31
added missing F keys in flipped layer
2016-07-25 20:21:32 +02:00
Christopher Browne
17a7570e08
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-07-25 12:55:46 -04:00
Jack Humbert
f9aadd17e8
Merge pull request #558 from lindhe/master
...
Fix misspelled command in Norwegian helper
2016-07-25 11:16:54 -04:00
Andreas Lindhé
283ebbe142
Change Nordic ampersand code to match the English
...
Changed from "NO_AMP" to "NO_AMPR" since the KC one is "KC_AMPR"
2016-07-25 12:50:56 +02:00
Toni
5e2e8c89e8
Merge remote-tracking branch 'origin/master' into iso_split_rshift
...
whatever
2016-07-25 12:49:38 +02:00
Andreas Lindhé
b6fa762234
Fix misspelled command in Norwegian helper
2016-07-25 11:29:54 +02:00