ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1653 commits 55 branches 1460 tags 329 MiB
Commit graph

1653 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Mohr
fe6c3e4f0f Squisher's international dvorak variant for ergodox ez 
See README.md
 2016-03-30 09:47:34 -06:00
Jack Humbert
ae47275bf3 Merge pull request #229 from NoahAndrews/patch-5 
The readme was also wrong about the conflict between audio and RGB
 2016-03-30 11:40:22 -04:00
Noah Andrews
ac3f3a85d5 Update README.md 2016-03-30 11:36:35 -04:00
Jack Humbert
6186de5828 Merge pull request #227 from NoahAndrews/patch-4 
Fixed minor issues with Preonic readme
 2016-03-30 11:07:00 -04:00
Jack Humbert
c3c4012417 Merge pull request #228 from mrfoto/fix-planck-diagram 
Tiny fix of Planck diagrams
 2016-03-30 11:06:07 -04:00
Miha Rekar
3b703eff33 Tiny fix of Planck diagrams 2016-03-30 17:03:03 +02:00
Noah Andrews
09d567045c Fixed minor issues with Preonic readme 2016-03-30 09:17:06 -04:00
Jack Humbert
47b537c87f preonic readme 2016-03-30 00:46:45 -04:00
Jack Humbert
e7377dc24b Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2016-03-30 00:45:48 -04:00
Jack Humbert
b8ac509570 .hex files 2016-03-30 00:45:37 -04:00
Jack Humbert
ac0729787f preonic update 2016-03-30 00:43:07 -04:00
Jack Humbert
4a676746a6 Merge pull request #224 from NoahAndrews/make-keymap-names-consistent 
Make keymap names more consistent
 2016-03-29 22:37:20 -04:00
Noah Andrews
95fba250ef Updated several keyboard folders to use new keymap naming scheme 2016-03-29 21:53:36 -04:00
Noah Andrews
e28334017c Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-consistent 2016-03-29 20:03:22 -04:00
Jack Humbert
26513b497b Merge pull request #223 from NoahAndrews/patch-3 
Fix #198
 2016-03-29 16:38:31 -04:00
Noah Andrews
8f1ea16ad5 Fix #198 2016-03-29 16:35:06 -04:00
Jack Humbert
49bde5b5c1 Merge pull request #222 from NoahAndrews/patch-2 
Fix error in Planck makefile comment
 2016-03-29 12:30:00 -04:00
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.
 2016-03-29 12:06:32 -04:00
Jack Humbert
8bbc1dcf4f Merge pull request #219 from IBNobody/master 
Master
 2016-03-28 23:17:16 -04:00
Jack Humbert
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
Noah Andrews
60570f3e37 Added clarifying steps to Windows section of build guide 2016-03-28 22:02:52 -04:00
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
 2016-03-28 19:45:20 -05:00
Noah Andrews
535daad3cd Merge remote-tracking branch 'jackhumbert/master' into improve-buildguide 2016-03-28 18:37:39 -04:00
IBNobody
a70f439672 Added command to turn LED indicators off while sleeping 2016-03-28 16:21:09 -05:00
Erez Zukerman
4a43c56844 Merge pull request #216 from msc654/master 
Added msc keymap for ergodox_ez
 2016-03-28 22:40:58 +03:00
Jack Humbert
fd9e5d1510 Merge pull request #214 from cdlm/action-hook 
Add per-event user hook function
 2016-03-28 11:55:19 -04:00
Jack Humbert
5e2c497d9a Merge pull request #217 from IBNobody/master 
Master
 2016-03-28 11:51:38 -04:00
Jack Humbert
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
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.
 2016-03-28 08:39:39 -07:00
Damien Pollet
bcebb3447c Add action-preprocessing kb/user hooks in planck 2016-03-28 16:49:47 +02:00
Damien Pollet
2181be029e Add action-preprocessing hook to keyboard template 2016-03-28 16:49:46 +02:00
Damien Pollet
acd64aa841 Rename function to be keyboard-specific 2016-03-28 16:30:00 +02:00
Damien Pollet
ef21a855e6 Add per-event user hook function to QMK 2016-03-28 16:30:00 +02:00
Matthew Carroll
a1ce133203 Corrected duplicate image issue 2016-03-28 06:00:05 -04:00
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)
 2016-03-28 00:03:21 -05:00
Matthew Carroll
beda4e6fd3 Added msc keymap for ergodox_ez 2016-03-27 23:51:11 -04:00
IBNobody
b7f0110d71 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-03-27 16:17:26 -05:00
Erez Zukerman
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
Erez Zukerman
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
Erez Zukerman
6a31d92276 Merge pull request #196 from naps62/naps62 
Adds naps62's Ergodox EZ layout
 2016-03-27 09:08:23 +03:00
Nicholas Keene
e43c0c649d Merge https://github.com/jackhumbert/qmk_firmware 2016-03-26 00:44:20 -05:00
Nicholas Keene
97c4c790cc The Ordinary Layout is unremarkably mundane and remarkably useful 2016-03-26 00:40:54 -05:00
Erez Zukerman
c9aec8bc24 Merge pull request #207 from romanzolotarev/master 
Add important note about brightness on OS X
 2016-03-25 19:37:42 +03:00
IBNobody
987ee1115e Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-03-25 09:51:16 -05:00
Nicholas Keene
d7a1fc81a0 The Ordinary Layout is familiar to users of common keyboards 2016-03-24 23:10:21 -05:00
Jack Humbert
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
Norberto Monarrez
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
Jack Humbert
95b0032142 Merge pull request #209 from n0bs/master 
Added project folder for Bantam-44
 2016-03-23 10:45:16 -04:00
Jack Humbert
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
Norberto Monarrez
d0c894cfae Added files for Bantam-44 2016-03-23 10:22:43 -04:00