Commit Graph

1640 Commits (e28334017c94c6928dd7e82436cec171f0243747)
 

Author SHA1 Message Date
Noah Andrews e28334017c Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-consistent 9 years ago
Jack Humbert 26513b497b Merge pull request #223 from NoahAndrews/patch-3
Fix #198
9 years ago
Noah Andrews 8f1ea16ad5 Fix #198 9 years ago
Jack Humbert 49bde5b5c1 Merge pull request #222 from NoahAndrews/patch-2
Fix error in Planck makefile comment
9 years ago
Noah Andrews 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.
9 years ago
Jack Humbert 8bbc1dcf4f Merge pull request #219 from IBNobody/master
Master
9 years ago
Jack Humbert 1f86e8da09 Merge pull request #220 from NoahAndrews/improve-buildguide
Added clarifying steps to Windows section of build guide
9 years ago
Noah Andrews 60570f3e37 Added clarifying steps to Windows section of build guide 9 years ago
IBNobody 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
9 years ago
Noah Andrews 535daad3cd Merge remote-tracking branch 'jackhumbert/master' into improve-buildguide 9 years ago
IBNobody a70f439672 Added command to turn LED indicators off while sleeping 9 years ago
Erez Zukerman 4a43c56844 Merge pull request #216 from msc654/master
Added msc keymap for ergodox_ez
9 years ago
Jack Humbert fd9e5d1510 Merge pull request #214 from cdlm/action-hook
Add per-event user hook function
9 years ago
Jack Humbert 5e2c497d9a Merge pull request #217 from IBNobody/master
Master
9 years ago
Jack Humbert 6a824df99c Merge pull request #218 from awpr/patch-1
Add avr-libc to the Debian build dependencies.
9 years ago
Andrew Pritchard 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.
9 years ago
Damien Pollet bcebb3447c Add action-preprocessing kb/user hooks in planck 9 years ago
Damien Pollet 2181be029e Add action-preprocessing hook to keyboard template 9 years ago
Damien Pollet acd64aa841 Rename function to be keyboard-specific 9 years ago
Damien Pollet ef21a855e6 Add per-event user hook function to QMK 9 years ago
Matthew Carroll a1ce133203 Corrected duplicate image issue 9 years ago
IBNobody 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)
9 years ago
Matthew Carroll beda4e6fd3 Added msc keymap for ergodox_ez 9 years ago
IBNobody b7f0110d71 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 9 years ago
Erez Zukerman 80eefb09ac Merge pull request #188 from DidierLoiseau/issue-156
Fix #156: clear weak mods on every key press
9 years ago
Erez Zukerman 16da54cfa0 Merge pull request #211 from nrrkeene/master
The Ordinary Layout is unremarkably mundane and remarkably useful
9 years ago
Erez Zukerman 6a31d92276 Merge pull request #196 from naps62/naps62
Adds naps62's Ergodox EZ layout
9 years ago
Nicholas Keene e43c0c649d Merge https://github.com/jackhumbert/qmk_firmware 9 years ago
Nicholas Keene 97c4c790cc The Ordinary Layout is unremarkably mundane and remarkably useful 9 years ago
Erez Zukerman c9aec8bc24 Merge pull request #207 from romanzolotarev/master
Add important note about brightness on OS X
9 years ago
IBNobody 987ee1115e Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 9 years ago
Nicholas Keene d7a1fc81a0 The Ordinary Layout is familiar to users of common keyboards 9 years ago
Jack Humbert ba058f8b81 Merge pull request #210 from n0bs/master
Edited Bantam44 to work with jackhumbert/qmk_firmware pull #190
9 years ago
Norberto Monarrez a5a40a0703 Edited to work with jackhumbert/qmk_firmware pull #190
Basically changes "* matrix_scan_user(void)" to "matrix_scan_user(void)"
9 years ago
Jack Humbert 95b0032142 Merge pull request #209 from n0bs/master
Added project folder for Bantam-44
9 years ago
Jack Humbert 02096f78e5 Merge pull request #200 from alexives/add_diagram_to_planck_layout
Added layout diagrams to the default planck keymap
9 years ago
Norberto Monarrez d0c894cfae Added files for Bantam-44 9 years ago
Jack Humbert e8951d6e41 Merge pull request #199 from IBNobody/master
Added LED Indicator Support to QMK Template
9 years ago
IBNobody 3d56ec052e Fixed extra semicolons.
Fixed extra semicolons.
9 years ago
IBNobody 10491ba21f Fixed LED Function Calls
Fixed LED indicator function calls to match how the matrix init function
calls are formatted.
9 years ago
IBNobody ec62d9e85c Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
# Conflicts:
#	quantum/template/template.c
#	quantum/template/template.h
9 years ago
Erez Zukerman 403d756ad5 Merge pull request #190 from yoyoerx/function_pointers
Addressing void* return warning & coding style
9 years ago
Roman Zolotarev 3087808790 Add important note about brightness on OS X 9 years ago
yoyoerx baeffd99da Pull request 190 resolution with 'qmk/master' for merge 9 years ago
Erez Zukerman 7f0d77e08c Merge pull request #205 from romanzolotarev/master
Add Roman's Layout
9 years ago
Erez Zukerman e86f09d262 Merge pull request #203 from XenoBits/master
Improved c# dev layout, only 2 layers now
9 years ago
Erez Zukerman ed830f2a13 Merge pull request #201 from uzytkownik/master
Further improvements to mpiechotka keyboard
9 years ago
Maxime Millet cc0c157287 Fixed png image 9 years ago
Maxime Millet 895bc327c3 CSharp dev layout V2 9 years ago
Roman Zolotarev a429374b78 Update readme 9 years ago