]>
git.donarmstrong.com Git - qmk_firmware.git/log
Jack Humbert [Wed, 30 Mar 2016 02:37:20 +0000 (22:37 -0400)]
Merge pull request #224 from NoahAndrews/make-keymap-names-consistent
Make keymap names more consistent
Noah Andrews [Wed, 30 Mar 2016 01:53:36 +0000 (21:53 -0400)]
Updated several keyboard folders to use new keymap naming scheme
Noah Andrews [Wed, 30 Mar 2016 00:03:22 +0000 (20:03 -0400)]
Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-consistent
Jack Humbert [Tue, 29 Mar 2016 20:38:31 +0000 (16:38 -0400)]
Merge pull request #223 from NoahAndrews/patch-3
Fix #198
Noah Andrews [Tue, 29 Mar 2016 20:35:06 +0000 (16:35 -0400)]
Fix #198
Jack Humbert [Tue, 29 Mar 2016 16:30:00 +0000 (12:30 -0400)]
Merge pull request #222 from NoahAndrews/patch-2
Fix error in Planck makefile comment
Noah Andrews [Tue, 29 Mar 2016 16:06:32 +0000 (12:06 -0400)]
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.
Jack Humbert [Tue, 29 Mar 2016 03:17:16 +0000 (23:17 -0400)]
Merge pull request #219 from IBNobody/master
Master
Jack Humbert [Tue, 29 Mar 2016 03:16:36 +0000 (23:16 -0400)]
Merge pull request #220 from NoahAndrews/improve-buildguide
Added clarifying steps to Windows section of build guide
Noah Andrews [Tue, 29 Mar 2016 02:02:52 +0000 (22:02 -0400)]
Added clarifying steps to Windows section of build guide
IBNobody [Tue, 29 Mar 2016 00:45:20 +0000 (19:45 -0500)]
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
Noah Andrews [Mon, 28 Mar 2016 22:37:39 +0000 (18:37 -0400)]
Merge remote-tracking branch 'jackhumbert/master' into improve-buildguide
IBNobody [Mon, 28 Mar 2016 21:21:09 +0000 (16:21 -0500)]
Added command to turn LED indicators off while sleeping
Erez Zukerman [Mon, 28 Mar 2016 19:40:58 +0000 (22:40 +0300)]
Merge pull request #216 from msc654/master
Added msc keymap for ergodox_ez
Jack Humbert [Mon, 28 Mar 2016 15:55:19 +0000 (11:55 -0400)]
Merge pull request #214 from cdlm/action-hook
Add per-event user hook function
Jack Humbert [Mon, 28 Mar 2016 15:51:38 +0000 (11:51 -0400)]
Merge pull request #217 from IBNobody/master
Master
Jack Humbert [Mon, 28 Mar 2016 15:49:03 +0000 (11:49 -0400)]
Merge pull request #218 from awpr/patch-1
Add avr-libc to the Debian build dependencies.
Andrew Pritchard [Mon, 28 Mar 2016 15:39:39 +0000 (08:39 -0700)]
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.
Damien Pollet [Mon, 28 Mar 2016 14:14:54 +0000 (16:14 +0200)]
Add action-preprocessing kb/user hooks in planck
Damien Pollet [Mon, 28 Mar 2016 14:13:37 +0000 (16:13 +0200)]
Add action-preprocessing hook to keyboard template
Damien Pollet [Mon, 28 Mar 2016 14:12:50 +0000 (16:12 +0200)]
Rename function to be keyboard-specific
Damien Pollet [Sun, 27 Mar 2016 15:58:26 +0000 (17:58 +0200)]
Add per-event user hook function to QMK
Matthew Carroll [Mon, 28 Mar 2016 10:00:05 +0000 (06:00 -0400)]
Corrected duplicate image issue
IBNobody [Mon, 28 Mar 2016 05:03:21 +0000 (00:03 -0500)]
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)
Matthew Carroll [Mon, 28 Mar 2016 03:51:11 +0000 (23:51 -0400)]
Added msc keymap for ergodox_ez
IBNobody [Sun, 27 Mar 2016 21:17:26 +0000 (16:17 -0500)]
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
Erez Zukerman [Sun, 27 Mar 2016 18:09:15 +0000 (21:09 +0300)]
Merge pull request #188 from DidierLoiseau/issue-156
Fix #156: clear weak mods on every key press
Erez Zukerman [Sun, 27 Mar 2016 06:10:05 +0000 (09:10 +0300)]
Merge pull request #211 from nrrkeene/master
The Ordinary Layout is unremarkably mundane and remarkably useful
Erez Zukerman [Sun, 27 Mar 2016 06:08:23 +0000 (09:08 +0300)]
Merge pull request #196 from naps62/naps62
Adds naps62's Ergodox EZ layout
Nicholas Keene [Sat, 26 Mar 2016 05:44:20 +0000 (00:44 -0500)]
Merge https://github.com/jackhumbert/qmk_firmware
Nicholas Keene [Sat, 26 Mar 2016 05:40:54 +0000 (00:40 -0500)]
The Ordinary Layout is unremarkably mundane and remarkably useful
Erez Zukerman [Fri, 25 Mar 2016 16:37:42 +0000 (19:37 +0300)]
Merge pull request #207 from romanzolotarev/master
Add important note about brightness on OS X
IBNobody [Fri, 25 Mar 2016 14:51:16 +0000 (09:51 -0500)]
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
Nicholas Keene [Thu, 24 Mar 2016 04:33:26 +0000 (23:33 -0500)]
The Ordinary Layout is familiar to users of common keyboards
Jack Humbert [Wed, 23 Mar 2016 17:46:02 +0000 (13:46 -0400)]
Merge pull request #210 from n0bs/master
Edited Bantam44 to work with jackhumbert/qmk_firmware pull #190
Norberto Monarrez [Wed, 23 Mar 2016 17:42:34 +0000 (13:42 -0400)]
Edited to work with jackhumbert/qmk_firmware pull #190
Basically changes "* matrix_scan_user(void)" to "matrix_scan_user(void)"
Jack Humbert [Wed, 23 Mar 2016 14:45:16 +0000 (10:45 -0400)]
Merge pull request #209 from n0bs/master
Added project folder for Bantam-44
Jack Humbert [Wed, 23 Mar 2016 14:44:31 +0000 (10:44 -0400)]
Merge pull request #200 from alexives/add_diagram_to_planck_layout
Added layout diagrams to the default planck keymap
Norberto Monarrez [Wed, 23 Mar 2016 14:22:43 +0000 (10:22 -0400)]
Added files for Bantam-44
Jack Humbert [Wed, 23 Mar 2016 02:15:18 +0000 (22:15 -0400)]
Merge pull request #199 from IBNobody/master
Added LED Indicator Support to QMK Template
IBNobody [Wed, 23 Mar 2016 02:06:22 +0000 (21:06 -0500)]
Fixed extra semicolons.
Fixed extra semicolons.
IBNobody [Wed, 23 Mar 2016 01:58:44 +0000 (20:58 -0500)]
Fixed LED Function Calls
Fixed LED indicator function calls to match how the matrix init function
calls are formatted.
IBNobody [Wed, 23 Mar 2016 01:39:05 +0000 (20:39 -0500)]
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
# Conflicts:
# quantum/template/template.c
# quantum/template/template.h
Erez Zukerman [Tue, 22 Mar 2016 19:30:25 +0000 (21:30 +0200)]
Merge pull request #190 from yoyoerx/function_pointers
Addressing void* return warning & coding style
Roman Zolotarev [Tue, 22 Mar 2016 14:33:23 +0000 (22:33 +0800)]
Add important note about brightness on OS X
yoyoerx [Mon, 21 Mar 2016 21:18:53 +0000 (17:18 -0400)]
Pull request 190 resolution with 'qmk/master' for merge
Erez Zukerman [Mon, 21 Mar 2016 19:03:25 +0000 (21:03 +0200)]
Merge pull request #205 from romanzolotarev/master
Add Roman's Layout
Erez Zukerman [Sun, 20 Mar 2016 20:50:56 +0000 (22:50 +0200)]
Merge pull request #203 from XenoBits/master
Improved c# dev layout, only 2 layers now
Erez Zukerman [Sun, 20 Mar 2016 20:28:21 +0000 (22:28 +0200)]
Merge pull request #201 from uzytkownik/master
Further improvements to mpiechotka keyboard
Maxime Millet [Sun, 20 Mar 2016 11:54:02 +0000 (12:54 +0100)]
Fixed png image
Maxime Millet [Sun, 20 Mar 2016 11:50:04 +0000 (12:50 +0100)]
CSharp dev layout V2
Roman Zolotarev [Sat, 19 Mar 2016 09:53:58 +0000 (17:53 +0800)]
Update readme
Roman Zolotarev [Sat, 19 Mar 2016 09:43:02 +0000 (17:43 +0800)]
Update layout
Roman Zolotarev [Fri, 18 Mar 2016 09:55:21 +0000 (17:55 +0800)]
Swap volup and voldown
Roman Zolotarev [Tue, 15 Mar 2016 16:43:45 +0000 (00:43 +0800)]
Add Roman's Layout
Four layers BASE (Norman), SYMB, PLVR (optimized for Plover), ARRW.
Maciej Piechotka [Thu, 17 Mar 2016 15:17:00 +0000 (08:17 -0700)]
Add waits to prevent KVM from hanging
Maciej Piechotka [Thu, 17 Mar 2016 15:15:05 +0000 (08:15 -0700)]
Put frequently used keys in shell (-=) under thumb
Maciej Piechotka [Sat, 13 Feb 2016 18:00:48 +0000 (10:00 -0800)]
Add missing breaks in mpiechotka ergodox_ez keyboard
Alex Ives [Thu, 17 Mar 2016 01:06:56 +0000 (20:06 -0500)]
Added layout diagrams to the default planck keymap
Signed-off-by: Alex Ives <alex@ives.mn>
IBNobody [Wed, 16 Mar 2016 15:27:04 +0000 (10:27 -0500)]
Adding Retro_Refit Keyboard
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.
IBNobody [Wed, 16 Mar 2016 14:53:56 +0000 (09:53 -0500)]
Removing Teensy SDK Folder
Fixing Github GUI error "fatal: no submodule mapping found in
.gitmodules for path 'teensy-sdk'"
IBNobody [Wed, 16 Mar 2016 04:52:51 +0000 (23:52 -0500)]
Adding LED function pointers
Miguel Palhas [Sat, 30 Jan 2016 22:30:31 +0000 (22:30 +0000)]
Adds naps62's layout
Jack Humbert [Mon, 14 Mar 2016 17:42:47 +0000 (13:42 -0400)]
Merge pull request #194 from DidierLoiseau/bépo-keymap-header
Keymap header for the BÉPO layout
Jack Humbert [Mon, 14 Mar 2016 17:42:23 +0000 (13:42 -0400)]
Merge pull request #195 from krid78/master
fixes an obvious typo to have DE_LCBR produce {
Jack Humbert [Mon, 14 Mar 2016 17:37:10 +0000 (13:37 -0400)]
Merge pull request #197 from yoyoerx/windocs
Cygwin Based Users Guide v0.6 -fixes to dfu-programmer build
yoyoerx [Mon, 14 Mar 2016 17:19:29 +0000 (13:19 -0400)]
Cygwin Based Users Guide v0.6 -fixes to dfu-programmer build
Daniel Kriesten [Mon, 14 Mar 2016 12:35:34 +0000 (13:35 +0100)]
fixes an obvious typo to have DE_LCBR produce {
Didier Loiseau [Sun, 7 Feb 2016 18:29:49 +0000 (19:29 +0100)]
Keymap header for the BÉPO layout
yoyoerx [Fri, 11 Mar 2016 16:16:19 +0000 (11:16 -0500)]
PR190hotfix.sh, fresh hexes, makeallhex.sh script
Jack Humbert [Fri, 11 Mar 2016 01:43:04 +0000 (20:43 -0500)]
Merge pull request #192 from mitchlloyd/mitch-layout
First keyboard layout
Mitch Lloyd [Wed, 19 Aug 2015 16:53:20 +0000 (09:53 -0700)]
First keyboard layout
yoyoerx [Thu, 10 Mar 2016 16:29:00 +0000 (11:29 -0500)]
Merge branch 'function_pointers' of github.com:yoyoerx/qmk_keyboard into function_pointers
yoyoerx [Thu, 10 Mar 2016 16:28:34 +0000 (11:28 -0500)]
Addressed void* return warning in all keymaps
Jack Humbert [Thu, 10 Mar 2016 16:03:27 +0000 (11:03 -0500)]
Merge pull request #191 from yoyoerx/windocs
Cygwin Based Users Guide v0.5 -further corrections
yoyoerx [Thu, 10 Mar 2016 15:50:17 +0000 (10:50 -0500)]
Merge remote-tracking branch 'qmk/master' into windocs
yoyoerx [Wed, 9 Mar 2016 20:53:37 +0000 (15:53 -0500)]
Cygwin Based Users Guide v0.5 -further corrections
Jack Humbert [Wed, 9 Mar 2016 20:47:25 +0000 (15:47 -0500)]
Merge pull request #187 from yoyoerx/windocs
Cygwin Based Users Guide v0.4 -corrections/dfu build
yoyoerx [Wed, 9 Mar 2016 19:04:14 +0000 (14:04 -0500)]
Addressed void* return warning & coding style
yoyoerx [Wed, 9 Mar 2016 17:16:03 +0000 (12:16 -0500)]
Cygwin Based Users Guide v0.4 -corrections/dfu build
Didier Loiseau [Tue, 8 Mar 2016 22:14:15 +0000 (23:14 +0100)]
Fix #156: clear weak mods on every key press
- new macro_mods bit field for mods applied by macros
- weak_mods now only used for ACT_{L,R}MODS (i.e. LSFT, RSFT, LCTL etc.)
- clear the _weak_ mods on every key *pressed* such that LSFT etc.
can no more interfere with the next key
Erez Zukerman [Tue, 8 Mar 2016 01:50:57 +0000 (03:50 +0200)]
Adds a readme with a link to the blog post
Erez Zukerman [Tue, 8 Mar 2016 01:46:33 +0000 (20:46 -0500)]
Merge pull request #185 from nrrkeene/master
The Ordinary Layout is familiar to users of common keyboards
Jack Humbert [Mon, 7 Mar 2016 15:16:35 +0000 (10:16 -0500)]
Merge pull request #177 from yoyoerx/windocs
Documentation for Cygwin in Windows
Nicholas Keene [Mon, 7 Mar 2016 05:12:29 +0000 (23:12 -0600)]
The Ordinary Layout, designed to be similar to traditional keyboards, by Nicholas Keene, released to the public domain, no rights reserved
Jack Humbert [Sat, 5 Mar 2016 04:34:45 +0000 (23:34 -0500)]
Merge pull request #180 from NoahAndrews/add-build-instructions
Added build instructions to BUILD_GUIDE.md
Noah Andrews [Sat, 5 Mar 2016 04:21:29 +0000 (23:21 -0500)]
Added build instructions to BUILD_GUIDE.md
Jack Humbert [Sat, 5 Mar 2016 02:57:39 +0000 (21:57 -0500)]
Merge pull request #179 from NoahAndrews/add-win-linux-instructions
Added Windows and Linux instructions to BUILD_GUIDE.md
Noah Andrews [Sat, 5 Mar 2016 02:51:09 +0000 (21:51 -0500)]
Added Windows and Linux instructions to BUILD_GUIDE.md
yoyoerx [Fri, 4 Mar 2016 20:04:42 +0000 (15:04 -0500)]
Cygwin Based Users Guidev0.2 -formatting revisions
yoyoerx [Fri, 4 Mar 2016 19:38:38 +0000 (14:38 -0500)]
Cygwin Based Users Guide v0.1
Jack Humbert [Fri, 4 Mar 2016 15:58:36 +0000 (10:58 -0500)]
Merge pull request #176 from NoahAndrews/fix-new-projects
Fix building new projects
Noah Andrews [Fri, 4 Mar 2016 15:53:58 +0000 (10:53 -0500)]
Remove extraneous comma
Jack Humbert [Fri, 4 Mar 2016 15:19:28 +0000 (10:19 -0500)]
Merge pull request #171 from NoahAndrews/restructure-documentation
Restructure documentation
Jack Humbert [Fri, 4 Mar 2016 15:19:00 +0000 (10:19 -0500)]
Merge pull request #170 from NoahAndrews/improve-windows-docs
Add scripts for easy Windows environment setup
Jack Humbert [Fri, 4 Mar 2016 15:17:14 +0000 (10:17 -0500)]
Merge pull request #165 from deepshitgoeshere/deepshitgoeshere-master
added planck keymap and troubleshooting part in the PCB guide
Jack Humbert [Fri, 4 Mar 2016 15:16:07 +0000 (10:16 -0500)]
Merge pull request #175 from NoahAndrews/fix-#174
Fix #174
Noah Andrews [Fri, 4 Mar 2016 15:15:21 +0000 (10:15 -0500)]
Fix #174
Jack Humbert [Fri, 4 Mar 2016 04:35:12 +0000 (23:35 -0500)]
Merge pull request #172 from plgruener/pr1
add missing keys to keymap_neo2.h
plgruener [Fri, 19 Feb 2016 20:04:30 +0000 (21:04 +0100)]
update neo keymap