Commit Graph

1762 Commits (d532b04dc15928fcd00d1aed2e44d8dd107cd815)
 

Author SHA1 Message Date
Jack Humbert ae47275bf3 Merge pull request #229 from NoahAndrews/patch-5
The readme was also wrong about the conflict between audio and RGB
9 years ago
Noah Andrews ac3f3a85d5 Update README.md 9 years ago
Jack Humbert 6186de5828 Merge pull request #227 from NoahAndrews/patch-4
Fixed minor issues with Preonic readme
9 years ago
Jack Humbert c3c4012417 Merge pull request #228 from mrfoto/fix-planck-diagram
Tiny fix of Planck diagrams
9 years ago
Miha Rekar 3b703eff33 Tiny fix of Planck diagrams 9 years ago
Noah Andrews 09d567045c Fixed minor issues with Preonic readme 9 years ago
Jack Humbert 47b537c87f preonic readme 9 years ago
Jack Humbert e7377dc24b Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 9 years ago
Jack Humbert b8ac509570 .hex files 9 years ago
Jack Humbert ac0729787f preonic update 9 years ago
Jack Humbert 4a676746a6 Merge pull request #224 from NoahAndrews/make-keymap-names-consistent
Make keymap names more consistent
9 years ago
Noah Andrews 95fba250ef Updated several keyboard folders to use new keymap naming scheme 9 years ago
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
mbarkhau 77fa2b0056 Update compile_keymap.py 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
Stephan Bösebeck ac22d1c185 added CTL_Shift / Hash macro 9 years ago
Stephan Bösebeck f7f4f1725e Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 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
Manuel Barkhau a2d3c0bd93 add hex file 9 years ago
Manuel Barkhau 295036d4e3 Merge remote-tracking branch 'origin/master' 9 years ago
Manuel Barkhau 32c7832609 Refactor compiler code 9 years ago
IBNobody a70f439672 Added command to turn LED indicators off while sleeping 9 years ago
Stephan Bösebeck 37e68596dd Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 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
Alex Johnstone 48899673af Updated hex 9 years ago
Alex Johnstone 474eaead3c ££££ 9 years ago
Alex Johnstone ad2d3144ed Forgot to change ent/spc 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
Alex Johnstone 482dbe4c45 Didn't 9 years ago
Matthew Carroll a1ce133203 Corrected duplicate image issue 9 years ago
Wojciech Siewierski 1a09e96b95 Update the memory consumption total value in README 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
Alex Johnstone 1415e3108f Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯ 9 years ago
Alex Johnstone 97b431162c Merge pull request #4 from jackhumbert/master
upstream
9 years ago
Alex Johnstone d3e89b8cbd Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯ 9 years ago