e28334017c
Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-consistent
2016-03-29 20:03:22 -04:00
26513b497b
Merge pull request #223 from NoahAndrews/patch-3
...
Fix #198
2016-03-29 16:38:31 -04:00
8f1ea16ad5
Fix #198
2016-03-29 16:35:06 -04:00
77fa2b0056
Update compile_keymap.py
2016-03-29 18:35:47 +02:00
49bde5b5c1
Merge pull request #222 from NoahAndrews/patch-2
...
Fix error in Planck makefile comment
2016-03-29 12:30:00 -04:00
2ae44470e0
Fix error in Planck makefile comment
...
[This comment](https://www.reddit.com/r/olkb/comments/428umx/rgb_underglow/czaivbc ) states that because both audio output and RGB support require the user of timer 3, they can't be enabled at the same time. That makes sense, I can see where audio.c uses timer 3. But this comment in the code states that the incompatibility is with MIDI support, which doesn't make sense based on what I see in the code. Please enlighten me if I'm mistaken.
2016-03-29 12:06:32 -04:00
ac22d1c185
added CTL_Shift / Hash macro
2016-03-29 13:02:14 +02:00
f7f4f1725e
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-03-29 07:49:54 +02:00
8bbc1dcf4f
Merge pull request #219 from IBNobody/master
...
Master
2016-03-28 23:17:16 -04:00
1f86e8da09
Merge pull request #220 from NoahAndrews/improve-buildguide
...
Added clarifying steps to Windows section of build guide
2016-03-28 23:16:36 -04:00
60570f3e37
Added clarifying steps to Windows section of build guide
2016-03-28 22:02:52 -04:00
1d13aa933b
Minor Tweaks and Documentation
...
Fixed compiler warning by including bootloader.h in keymap_common.c.
Changed FORCE_NKRO to only be applied if NKRO_ENABLE is defined.
Added extra documentation to the template config.h
2016-03-28 19:45:20 -05:00
535daad3cd
Merge remote-tracking branch 'jackhumbert/master' into improve-buildguide
2016-03-28 18:37:39 -04:00
a2d3c0bd93
add hex file
2016-03-28 23:42:55 +02:00
295036d4e3
Merge remote-tracking branch 'origin/master'
2016-03-28 21:36:02 +00:00
32c7832609
Refactor compiler code
2016-03-28 23:35:12 +02:00
a70f439672
Added command to turn LED indicators off while sleeping
2016-03-28 16:21:09 -05:00
37e68596dd
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-03-28 22:29:18 +02:00
4a43c56844
Merge pull request #216 from msc654/master
...
Added msc keymap for ergodox_ez
2016-03-28 22:40:58 +03:00
fd9e5d1510
Merge pull request #214 from cdlm/action-hook
...
Add per-event user hook function
2016-03-28 11:55:19 -04:00
5e2c497d9a
Merge pull request #217 from IBNobody/master
...
Master
2016-03-28 11:51:38 -04:00
6a824df99c
Merge pull request #218 from awpr/patch-1
...
Add avr-libc to the Debian build dependencies.
2016-03-28 11:49:03 -04:00
1fd9dbdbe9
Add avr-libc to the Debian build dependencies.
...
Without avr-libc the build fails trying to #include_next a header from the standard library, which of course doesn't exist.
2016-03-28 08:39:39 -07:00
48899673af
Updated hex
2016-03-28 16:14:25 +01:00
474eaead3c
££££
2016-03-28 08:09:27 -07:00
ad2d3144ed
Forgot to change ent/spc
2016-03-28 15:50:09 +01:00
bcebb3447c
Add action-preprocessing kb/user hooks in planck
2016-03-28 16:49:47 +02:00
2181be029e
Add action-preprocessing hook to keyboard template
2016-03-28 16:49:46 +02:00
acd64aa841
Rename function to be keyboard-specific
2016-03-28 16:30:00 +02:00
ef21a855e6
Add per-event user hook function to QMK
2016-03-28 16:30:00 +02:00
482dbe4c45
Didn't
2016-03-28 07:24:51 -07:00
a1ce133203
Corrected duplicate image issue
2016-03-28 06:00:05 -04:00
1a09e96b95
Update the memory consumption total value in README
2016-03-28 10:05:42 +02:00
577971ab07
Magic Key Overrides / Keyboard Lock / Forced NKRO
...
Added Magic Key Overrides / Magic Key Cleanup / Added Keyboard Lock
option to template / Added forced NKRO option to template (disabled by
default)
2016-03-28 00:03:21 -05:00
beda4e6fd3
Added msc keymap for ergodox_ez
2016-03-27 23:51:11 -04:00
1415e3108f
Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯
2016-03-27 20:50:49 -07:00
97b431162c
Merge pull request #4 from jackhumbert/master
...
upstream
2016-03-27 20:15:02 -07:00
d3e89b8cbd
Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯
2016-03-27 20:14:03 -07:00
2a9eb3d3a3
The Ordinary Layout is unremarkably mundane and remarkably useful
2016-03-27 21:45:31 -05:00
36103edb7d
Update the memory consumption of PREVENT_STUCK_MODIFIERS in README
2016-03-28 00:25:43 +02:00
b4f442dfea
Cut the memory consumption of PREVENT_STUCK_MODIFIERS in half
2016-03-27 23:51:46 +02:00
b7f0110d71
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
2016-03-27 16:17:26 -05:00
80eefb09ac
Merge pull request #188 from DidierLoiseau/issue-156
...
Fix #156 : clear weak mods on every key press
2016-03-27 21:09:15 +03:00
16da54cfa0
Merge pull request #211 from nrrkeene/master
...
The Ordinary Layout is unremarkably mundane and remarkably useful
2016-03-27 09:10:05 +03:00
6a31d92276
Merge pull request #196 from naps62/naps62
...
Adds naps62's Ergodox EZ layout
2016-03-27 09:08:23 +03:00
20a3229faf
Add manuneo layout
2016-03-27 02:24:35 +00:00
e43c0c649d
Merge https://github.com/jackhumbert/qmk_firmware
2016-03-26 00:44:20 -05:00
97c4c790cc
The Ordinary Layout is unremarkably mundane and remarkably useful
2016-03-26 00:40:54 -05:00
2d90374912
Merge pull request #3 from jackhumbert/master
...
Pull upstream
2016-03-25 11:16:33 -07:00
c9aec8bc24
Merge pull request #207 from romanzolotarev/master
...
Add important note about brightness on OS X
2016-03-25 19:37:42 +03:00
Noah Andrews
Jack Humbert
mbarkhau
Stephan Bösebeck
IBNobody
Manuel Barkhau
IBNobody
Stephan Bösebeck
Erez Zukerman
Andrew Pritchard
Alex Johnstone
Damien Pollet
Matthew Carroll
Wojciech Siewierski
Nicholas Keene