summaryrefslogtreecommitdiffstats
path: root/keyboard
Commit message (Collapse)AuthorAgeFilesLines
* Fix error in Planck makefile commentNoah Andrews2016-03-291-1/+1
| | | [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.
* Merge pull request #216 from msc654/masterErez Zukerman2016-03-286-0/+1334
|\ | | | | Added msc keymap for ergodox_ez
| * Corrected duplicate image issueMatthew Carroll2016-03-281-0/+0
| |
| * Added msc keymap for ergodox_ezMatthew Carroll2016-03-276-0/+1334
| |
* | Merge pull request #214 from cdlm/action-hookJack Humbert2016-03-282-15/+18
|\ \ | | | | | | Add per-event user hook function
| * | Add action-preprocessing kb/user hooks in planckDamien Pollet2016-03-282-15/+18
| |/
* / Magic Key Overrides / Keyboard Lock / Forced NKROIBNobody2016-03-282-13/+57
|/ | | | | | Added Magic Key Overrides / Magic Key Cleanup / Added Keyboard Lock option to template / Added forced NKRO option to template (disabled by default)
* Merge pull request #211 from nrrkeene/masterErez Zukerman2016-03-2710-1147/+1232
|\ | | | | The Ordinary Layout is unremarkably mundane and remarkably useful
| * Merge https://github.com/jackhumbert/qmk_firmwareNicholas Keene2016-03-261-1/+5
| |\
| * | The Ordinary Layout is unremarkably mundane and remarkably usefulNicholas Keene2016-03-2610-1109/+1192
| | |
| * | The Ordinary Layout is familiar to users of common keyboardsNicholas Keene2016-03-241-58/+60
| | |
* | | Merge pull request #196 from naps62/naps62Erez Zukerman2016-03-273-0/+1690
|\ \ \ | |_|/ |/| | Adds naps62's Ergodox EZ layout
| * | Adds naps62's layoutMiguel Palhas2016-03-153-0/+1690
| | |
* | | Merge pull request #207 from romanzolotarev/masterErez Zukerman2016-03-251-1/+5
|\ \ \ | |_|/ |/| | Add important note about brightness on OS X
| * | Add important note about brightness on OS XRoman Zolotarev2016-03-221-1/+5
| | |
* | | Edited to work with jackhumbert/qmk_firmware pull #190Norberto Monarrez2016-03-232-16/+12
| | | | | | | | | | | | Basically changes "* matrix_scan_user(void)" to "matrix_scan_user(void)"
* | | Merge pull request #209 from n0bs/masterJack Humbert2016-03-236-0/+332
|\ \ \ | | | | | | | | Added project folder for Bantam-44
| * | | Added files for Bantam-44Norberto Monarrez2016-03-236-0/+332
| | | |
* | | | Merge pull request #200 from alexives/add_diagram_to_planck_layoutJack Humbert2016-03-231-5/+65
|\ \ \ \ | |/ / / |/| | | Added layout diagrams to the default planck keymap
| * | | Added layout diagrams to the default planck keymapAlex Ives2016-03-161-5/+65
| | | | | | | | | | | | | | | | Signed-off-by: Alex Ives <alex@ives.mn>
* | | | Fixed LED Function CallsIBNobody2016-03-222-24/+12
| | | | | | | | | | | | | | | | | | | | Fixed LED indicator function calls to match how the matrix init function calls are formatted.
* | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-03-2284-41564/+34408
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # quantum/template/template.c # quantum/template/template.h
| * \ \ \ Pull request 190 resolution with 'qmk/master' for mergeyoyoerx2016-03-2113-2577/+4004
| |\ \ \ \
| | * \ \ \ Merge pull request #205 from romanzolotarev/masterErez Zukerman2016-03-214-0/+1309
| | |\ \ \ \ | | | | |/ / | | | |/| | Add Roman's Layout
| | | * | | Update readmeRoman Zolotarev2016-03-191-1/+1
| | | | | |
| | | * | | Update layoutRoman Zolotarev2016-03-1912-192/+67
| | | | | |
| | | * | | Swap volup and voldownRoman Zolotarev2016-03-181-2/+2
| | | | | |
| | | * | | Add Roman's LayoutRoman Zolotarev2016-03-1811-0/+1434
| | | |/ / | | | | | | | | | | | | | | | Four layers BASE (Norman), SYMB, PLVR (optimized for Plover), ARRW.
| | * | | Merge pull request #203 from XenoBits/masterErez Zukerman2016-03-205-1227/+1174
| | |\ \ \ | | | | | | | | | | | | Improved c# dev layout, only 2 layers now
| | | * | | Fixed png imageMaxime Millet2016-03-201-0/+0
| | | | | |
| | | * | | CSharp dev layout V2Maxime Millet2016-03-205-1227/+1174
| | | | | |
| | * | | | Add waits to prevent KVM from hangingMaciej Piechotka2016-03-172-1490/+1492
| | | | | |
| | * | | | Put frequently used keys in shell (-=) under thumbMaciej Piechotka2016-03-172-9/+9
| | | | | |
| | * | | | Add missing breaks in mpiechotka ergodox_ez keyboardMaciej Piechotka2016-03-172-1233/+1237
| | | |/ / | | |/| |
| * | | | PR190hotfix.sh, fresh hexes, makeallhex.sh scriptyoyoerx2016-03-1133-41292/+32894
| | | | |
| * | | | Addressed void* return warning in all keymapsyoyoerx2016-03-1044-149/+128
| | | | |
* | | | | Adding Retro_Refit KeyboardIBNobody2016-03-166-0/+400
| |/ / / |/| | | | | | | | | | | | | | | | | | | Retro_Refit is an example of using a Teensy to replace a keyboard controller on an older keyboard. The original 6x15 keyboard had a non-standard 11x8 matrix.
* | | | Cygwin Based Users Guide v0.6 -fixes to dfu-programmer buildyoyoerx2016-03-141-6/+8
| |_|/ |/| |
* | | First keyboard layoutMitch Lloyd2016-03-101-0/+49
| | |
* | | Merge remote-tracking branch 'qmk/master' into windocsyoyoerx2016-03-101-27/+24
|\ \ \
* | | | Cygwin Based Users Guide v0.5 -further correctionsyoyoerx2016-03-091-347/+353
|/ / /
* / / Cygwin Based Users Guide v0.4 -corrections/dfu buildyoyoerx2016-03-091-18/+128
|/ /
* | Adds a readme with a link to the blog postErez Zukerman2016-03-082-0/+5
| |
* | Merge pull request #185 from nrrkeene/masterErez Zukerman2016-03-073-0/+1312
|\ \ | | | | | | The Ordinary Layout is familiar to users of common keyboards
| * | The Ordinary Layout, designed to be similar to traditional keyboards, by ↵Nicholas Keene2016-03-063-0/+1312
| | | | | | | | | | | | Nicholas Keene, released to the public domain, no rights reserved
* | | Cygwin Based Users Guidev0.2 -formatting revisionsyoyoerx2016-03-041-47/+47
| | |
* | | Cygwin Based Users Guide v0.1yoyoerx2016-03-041-0/+237
|/ /
* | Merge pull request #170 from NoahAndrews/improve-windows-docsJack Humbert2016-03-041-4/+5
|\ \ | | | | | | Add scripts for easy Windows environment setup
| * | Fix link to MHV AVR ToolsNoah Andrews2016-03-021-1/+1
| | |
| * | Added documentation for new Windows scriptsNoah Andrews2016-03-021-17/+5
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 10:09:34 +0000