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
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
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
a70f439672
Added command to turn LED indicators off while sleeping
2016-03-28 16:21:09 -05: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
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
a1ce133203
Corrected duplicate image issue
2016-03-28 06:00:05 -04: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
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
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
c9aec8bc24
Merge pull request #207 from romanzolotarev/master
...
Add important note about brightness on OS X
2016-03-25 19:37:42 +03:00
987ee1115e
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
2016-03-25 09:51:16 -05:00
d7a1fc81a0
The Ordinary Layout is familiar to users of common keyboards
2016-03-24 23:10:21 -05:00
ba058f8b81
Merge pull request #210 from n0bs/master
...
Edited Bantam44 to work with jackhumbert/qmk_firmware pull #190
2016-03-23 13:46:02 -04:00
a5a40a0703
Edited to work with jackhumbert/qmk_firmware pull #190
...
Basically changes "* matrix_scan_user(void)" to "matrix_scan_user(void)"
2016-03-23 13:42:34 -04:00
95b0032142
Merge pull request #209 from n0bs/master
...
Added project folder for Bantam-44
2016-03-23 10:45:16 -04:00
02096f78e5
Merge pull request #200 from alexives/add_diagram_to_planck_layout
...
Added layout diagrams to the default planck keymap
2016-03-23 10:44:31 -04:00
d0c894cfae
Added files for Bantam-44
2016-03-23 10:22:43 -04:00
e8951d6e41
Merge pull request #199 from IBNobody/master
...
Added LED Indicator Support to QMK Template
2016-03-22 22:15:18 -04:00
3d56ec052e
Fixed extra semicolons.
...
Fixed extra semicolons.
2016-03-22 21:06:22 -05:00
10491ba21f
Fixed LED Function Calls
...
Fixed LED indicator function calls to match how the matrix init function
calls are formatted.
2016-03-22 20:58:44 -05:00
ec62d9e85c
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
...
# Conflicts:
# quantum/template/template.c
# quantum/template/template.h
2016-03-22 20:39:05 -05:00
403d756ad5
Merge pull request #190 from yoyoerx/function_pointers
...
Addressing void* return warning & coding style
2016-03-22 21:30:25 +02:00
3087808790
Add important note about brightness on OS X
2016-03-22 22:33:23 +08:00
baeffd99da
Pull request 190 resolution with 'qmk/master' for merge
2016-03-21 17:18:53 -04:00
7f0d77e08c
Merge pull request #205 from romanzolotarev/master
...
Add Roman's Layout
2016-03-21 21:03:25 +02:00
e86f09d262
Merge pull request #203 from XenoBits/master
...
Improved c# dev layout, only 2 layers now
2016-03-20 22:50:56 +02:00
ed830f2a13
Merge pull request #201 from uzytkownik/master
...
Further improvements to mpiechotka keyboard
2016-03-20 22:28:21 +02:00
cc0c157287
Fixed png image
2016-03-20 12:54:02 +01:00
895bc327c3
CSharp dev layout V2
2016-03-20 12:50:04 +01:00
a429374b78
Update readme
2016-03-19 17:53:58 +08:00
Noah Andrews
Jack Humbert
IBNobody
IBNobody
Erez Zukerman
Andrew Pritchard
Damien Pollet
Matthew Carroll
Nicholas Keene
Norberto Monarrez
Roman Zolotarev
yoyoerx
Maxime Millet