]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
8 years agoMerge pull request #215 from nrrkeene/master
Erez Zukerman [Wed, 6 Apr 2016 19:35:17 +0000 (22:35 +0300)]
Merge pull request #215 from nrrkeene/master

Added proper documentation

8 years agoMerge pull request #238 from alexjj/master
Erez Zukerman [Wed, 6 Apr 2016 19:34:46 +0000 (22:34 +0300)]
Merge pull request #238 from alexjj/master

Submitting my ergodox EZ layout

8 years agoUpdated hex
Alex Johnstone [Tue, 5 Apr 2016 14:51:13 +0000 (15:51 +0100)]
Updated hex

8 years ago:pound: typo
Alex Johnstone [Tue, 5 Apr 2016 14:49:35 +0000 (07:49 -0700)]
:pound: typo

8 years ago:pound: typo
Alex Johnstone [Tue, 5 Apr 2016 14:48:13 +0000 (07:48 -0700)]
:pound: typo

8 years agoMerge pull request #5 from jackhumbert/master
Alex Johnstone [Tue, 5 Apr 2016 14:44:37 +0000 (07:44 -0700)]
Merge pull request #5 from jackhumbert/master

Sync with upstream

8 years agoupdates to noise
Jack Humbert [Tue, 5 Apr 2016 13:44:01 +0000 (09:44 -0400)]
updates to noise

8 years agoMerge branch 'master' of https://github.com/jackhumbert/tmk_keyboard
Jack Humbert [Tue, 5 Apr 2016 13:21:49 +0000 (09:21 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard

8 years agoadd silent notes
Jack Humbert [Tue, 5 Apr 2016 13:21:44 +0000 (09:21 -0400)]
add silent notes

8 years agoMerge pull request #235 from mbarkhau/master
Erez Zukerman [Mon, 4 Apr 2016 05:04:31 +0000 (08:04 +0300)]
Merge pull request #235 from mbarkhau/master

add indent to generated keymap

8 years agomusic mode file
Jack Humbert [Sun, 3 Apr 2016 20:00:10 +0000 (16:00 -0400)]
music mode file

8 years agoadd indent to generated keymap
Manuel Barkhau [Sun, 3 Apr 2016 19:46:32 +0000 (21:46 +0200)]
add indent to generated keymap

8 years agoMerge pull request #213 from mbarkhau/master
Erez Zukerman [Sun, 3 Apr 2016 05:56:08 +0000 (08:56 +0300)]
Merge pull request #213 from mbarkhau/master

Add manuneo layout

8 years agoMerge pull request #234 from sboesebeck/master
Erez Zukerman [Sun, 3 Apr 2016 05:46:14 +0000 (08:46 +0300)]
Merge pull request #234 from sboesebeck/master

several iterations later

8 years agouse action function for unicode
Manuel Barkhau [Sat, 2 Apr 2016 21:07:58 +0000 (23:07 +0200)]
use action function for unicode

8 years agoMerge branch 'master' of https://github.com/sboesebeck/qmk_firmware
Stephan Bösebeck [Sat, 2 Apr 2016 13:15:21 +0000 (15:15 +0200)]
Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware

8 years agonew keymap
Stephan Bösebeck [Sat, 2 Apr 2016 13:14:14 +0000 (15:14 +0200)]
new keymap

8 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Stephan Bösebeck [Fri, 1 Apr 2016 21:54:16 +0000 (23:54 +0200)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

8 years agominor tweaks at the keymap, new png for documentation
Stephan Bösebeck [Fri, 1 Apr 2016 21:53:09 +0000 (23:53 +0200)]
minor tweaks at the keymap, new png for documentation

8 years agoMerge pull request #233 from tak3over/patch-1
Jack Humbert [Fri, 1 Apr 2016 20:31:18 +0000 (16:31 -0400)]
Merge pull request #233 from tak3over/patch-1

Create tak3over.c

8 years agoCreate tak3over.c
tak3over [Fri, 1 Apr 2016 20:26:09 +0000 (15:26 -0500)]
Create tak3over.c

Custom keymap with an additional function layer for numpad, pgup, pgdn, del, ins, home, end, and additional arrow keys.

8 years agoadding files is always smart
Jack Humbert [Fri, 1 Apr 2016 18:44:08 +0000 (14:44 -0400)]
adding files is always smart

8 years agoMerge pull request #226 from squisher/dvorak_intl_squisher
Erez Zukerman [Fri, 1 Apr 2016 09:11:17 +0000 (12:11 +0300)]
Merge pull request #226 from squisher/dvorak_intl_squisher

Squisher's international dvorak variant for ergodox ez

8 years agofixed de_osx prefix in keymap include to avoid conflicts
Stephan Bösebeck [Thu, 31 Mar 2016 21:15:59 +0000 (23:15 +0200)]
fixed de_osx prefix in keymap include to avoid conflicts

8 years agoMerge pull request #230 from IBNobody/master
Jack Humbert [Thu, 31 Mar 2016 16:09:05 +0000 (12:09 -0400)]
Merge pull request #230 from IBNobody/master

Fixed Setup Script

8 years agoDrastically rewrote the path script to handle Explorer's stubborn grasp of EnvVars...
IBNobody [Wed, 30 Mar 2016 21:31:46 +0000 (16:31 -0500)]
Drastically rewrote the path script to handle Explorer's stubborn grasp of EnvVars. Tested on Win7.

8 years agoAlso add compiled hex file
David Mohr [Wed, 30 Mar 2016 05:56:21 +0000 (23:56 -0600)]
Also add compiled hex file

8 years agoSquisher's international dvorak variant for ergodox ez
David Mohr [Wed, 30 Mar 2016 05:49:34 +0000 (23:49 -0600)]
Squisher's international dvorak variant for ergodox ez

See README.md

8 years agoMerge pull request #229 from NoahAndrews/patch-5
Jack Humbert [Wed, 30 Mar 2016 15:40:22 +0000 (11:40 -0400)]
Merge pull request #229 from NoahAndrews/patch-5

The readme was also wrong about the conflict between audio and RGB

8 years agoUpdate README.md
Noah Andrews [Wed, 30 Mar 2016 15:36:35 +0000 (11:36 -0400)]
Update README.md

8 years agoMerge pull request #227 from NoahAndrews/patch-4
Jack Humbert [Wed, 30 Mar 2016 15:07:00 +0000 (11:07 -0400)]
Merge pull request #227 from NoahAndrews/patch-4

Fixed minor issues with Preonic readme

8 years agoMerge pull request #228 from mrfoto/fix-planck-diagram
Jack Humbert [Wed, 30 Mar 2016 15:06:07 +0000 (11:06 -0400)]
Merge pull request #228 from mrfoto/fix-planck-diagram

Tiny fix of Planck diagrams

8 years agoTiny fix of Planck diagrams
Miha Rekar [Wed, 30 Mar 2016 15:03:03 +0000 (17:03 +0200)]
Tiny fix of Planck diagrams

8 years agoFixed minor issues with Preonic readme
Noah Andrews [Wed, 30 Mar 2016 13:17:06 +0000 (09:17 -0400)]
Fixed minor issues with Preonic readme

8 years agopreonic readme
Jack Humbert [Wed, 30 Mar 2016 04:46:45 +0000 (00:46 -0400)]
preonic readme

8 years agoMerge branch 'master' of https://github.com/jackhumbert/tmk_keyboard
Jack Humbert [Wed, 30 Mar 2016 04:45:48 +0000 (00:45 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard

8 years ago.hex files
Jack Humbert [Wed, 30 Mar 2016 04:45:37 +0000 (00:45 -0400)]
.hex files

8 years agopreonic update
Jack Humbert [Wed, 30 Mar 2016 04:43:07 +0000 (00:43 -0400)]
preonic update

8 years agoMerge pull request #224 from NoahAndrews/make-keymap-names-consistent
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

8 years agoUpdated several keyboard folders to use new keymap naming scheme
Noah Andrews [Wed, 30 Mar 2016 01:53:36 +0000 (21:53 -0400)]
Updated several keyboard folders to use new keymap naming scheme

8 years agoMerge remote-tracking branch 'jackhumbert/master' into make-keymap-names-consistent
Noah Andrews [Wed, 30 Mar 2016 00:03:22 +0000 (20:03 -0400)]
Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-consistent

8 years agoMerge pull request #223 from NoahAndrews/patch-3
Jack Humbert [Tue, 29 Mar 2016 20:38:31 +0000 (16:38 -0400)]
Merge pull request #223 from NoahAndrews/patch-3

Fix #198

8 years agoFix #198
Noah Andrews [Tue, 29 Mar 2016 20:35:06 +0000 (16:35 -0400)]
Fix #198

8 years agoUpdate compile_keymap.py
mbarkhau [Tue, 29 Mar 2016 16:35:47 +0000 (18:35 +0200)]
Update compile_keymap.py

8 years agoMerge pull request #222 from NoahAndrews/patch-2
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

8 years agoFix 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.

8 years agoadded CTL_Shift / Hash macro
Stephan Bösebeck [Tue, 29 Mar 2016 11:02:14 +0000 (13:02 +0200)]
added CTL_Shift / Hash macro

8 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Stephan Bösebeck [Tue, 29 Mar 2016 05:49:54 +0000 (07:49 +0200)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

8 years agoMerge pull request #219 from IBNobody/master
Jack Humbert [Tue, 29 Mar 2016 03:17:16 +0000 (23:17 -0400)]
Merge pull request #219 from IBNobody/master

Master

8 years agoMerge pull request #220 from NoahAndrews/improve-buildguide
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

8 years agoAdded 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

8 years agoMinor Tweaks and Documentation
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

8 years agoMerge remote-tracking branch 'jackhumbert/master' into improve-buildguide
Noah Andrews [Mon, 28 Mar 2016 22:37:39 +0000 (18:37 -0400)]
Merge remote-tracking branch 'jackhumbert/master' into improve-buildguide

8 years agoadd hex file
Manuel Barkhau [Mon, 28 Mar 2016 21:42:55 +0000 (23:42 +0200)]
add hex file

8 years agoMerge remote-tracking branch 'origin/master'
Manuel Barkhau [Mon, 28 Mar 2016 21:36:02 +0000 (21:36 +0000)]
Merge remote-tracking branch 'origin/master'

8 years agoRefactor compiler code
Manuel Barkhau [Mon, 28 Mar 2016 21:32:16 +0000 (21:32 +0000)]
Refactor compiler code

8 years agoAdded command to turn LED indicators off while sleeping
IBNobody [Mon, 28 Mar 2016 21:21:09 +0000 (16:21 -0500)]
Added command to turn LED indicators off while sleeping

8 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Stephan Bösebeck [Mon, 28 Mar 2016 20:29:18 +0000 (22:29 +0200)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

8 years agoMerge pull request #216 from msc654/master
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

8 years agoMerge pull request #214 from cdlm/action-hook
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

8 years agoMerge pull request #217 from IBNobody/master
Jack Humbert [Mon, 28 Mar 2016 15:51:38 +0000 (11:51 -0400)]
Merge pull request #217 from IBNobody/master

Master

8 years agoMerge pull request #218 from awpr/patch-1
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.

8 years agoAdd 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.

8 years agoUpdated hex
Alex Johnstone [Mon, 28 Mar 2016 15:14:25 +0000 (16:14 +0100)]
Updated hex

8 years ago££££
Alex Johnstone [Mon, 28 Mar 2016 15:09:27 +0000 (08:09 -0700)]
££££

8 years agoForgot to change ent/spc
Alex Johnstone [Mon, 28 Mar 2016 14:50:09 +0000 (15:50 +0100)]
Forgot to change ent/spc

8 years agoAdd action-preprocessing kb/user hooks in planck
Damien Pollet [Mon, 28 Mar 2016 14:14:54 +0000 (16:14 +0200)]
Add action-preprocessing kb/user hooks in planck

8 years agoAdd action-preprocessing hook to keyboard template
Damien Pollet [Mon, 28 Mar 2016 14:13:37 +0000 (16:13 +0200)]
Add action-preprocessing hook to keyboard template

8 years agoRename function to be keyboard-specific
Damien Pollet [Mon, 28 Mar 2016 14:12:50 +0000 (16:12 +0200)]
Rename function to be keyboard-specific

8 years agoAdd per-event user hook function to QMK
Damien Pollet [Sun, 27 Mar 2016 15:58:26 +0000 (17:58 +0200)]
Add per-event user hook function to QMK

8 years agoDidn't
Alex Johnstone [Mon, 28 Mar 2016 14:24:51 +0000 (07:24 -0700)]
Didn't

8 years agoCorrected duplicate image issue
Matthew Carroll [Mon, 28 Mar 2016 10:00:05 +0000 (06:00 -0400)]
Corrected duplicate image issue

8 years agoMagic Key Overrides / Keyboard Lock / Forced NKRO
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)

8 years agoAdded msc keymap for ergodox_ez
Matthew Carroll [Mon, 28 Mar 2016 03:51:11 +0000 (23:51 -0400)]
Added msc keymap for ergodox_ez

8 years agoFixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯
Alex Johnstone [Mon, 28 Mar 2016 03:50:49 +0000 (20:50 -0700)]
Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯

8 years agoMerge pull request #4 from jackhumbert/master
Alex Johnstone [Mon, 28 Mar 2016 03:15:02 +0000 (20:15 -0700)]
Merge pull request #4 from jackhumbert/master

upstream

8 years agoFixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯
Alex Johnstone [Mon, 28 Mar 2016 03:14:03 +0000 (20:14 -0700)]
Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯

8 years agoThe Ordinary Layout is unremarkably mundane and remarkably useful
Nicholas Keene [Mon, 28 Mar 2016 02:45:31 +0000 (21:45 -0500)]
The Ordinary Layout is unremarkably mundane and remarkably useful

8 years agoMerge remote-tracking branch 'refs/remotes/jackhumbert/master'
IBNobody [Sun, 27 Mar 2016 21:17:26 +0000 (16:17 -0500)]
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'

8 years agoMerge pull request #188 from DidierLoiseau/issue-156
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

8 years agoMerge pull request #211 from nrrkeene/master
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

8 years agoMerge pull request #196 from naps62/naps62
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

8 years agoAdd manuneo layout
Manuel Barkhau [Sun, 27 Mar 2016 02:22:41 +0000 (02:22 +0000)]
Add manuneo layout

8 years agoMerge https://github.com/jackhumbert/qmk_firmware
Nicholas Keene [Sat, 26 Mar 2016 05:44:20 +0000 (00:44 -0500)]
Merge https://github.com/jackhumbert/qmk_firmware

8 years agoThe Ordinary Layout is unremarkably mundane and remarkably useful
Nicholas Keene [Sat, 26 Mar 2016 05:40:54 +0000 (00:40 -0500)]
The Ordinary Layout is unremarkably mundane and remarkably useful

8 years agoMerge pull request #3 from jackhumbert/master
Alex Johnstone [Fri, 25 Mar 2016 18:16:33 +0000 (11:16 -0700)]
Merge pull request #3 from jackhumbert/master

Pull upstream

8 years agoMerge pull request #207 from romanzolotarev/master
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

8 years agoMerge remote-tracking branch 'refs/remotes/jackhumbert/master'
IBNobody [Fri, 25 Mar 2016 14:51:16 +0000 (09:51 -0500)]
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'

8 years agoThe Ordinary Layout is familiar to users of common keyboards
Nicholas Keene [Thu, 24 Mar 2016 04:33:26 +0000 (23:33 -0500)]
The Ordinary Layout is familiar to users of common keyboards

8 years agominor changes
Stephan Bösebeck [Thu, 24 Mar 2016 09:30:27 +0000 (10:30 +0100)]
minor changes

8 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Stephan Bösebeck [Thu, 24 Mar 2016 07:22:21 +0000 (08:22 +0100)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

8 years agoNew :pound: method
Alex Johnstone [Thu, 24 Mar 2016 04:13:05 +0000 (21:13 -0700)]
New :pound: method

8 years agoNew :pound: method
Alex Johnstone [Thu, 24 Mar 2016 04:12:23 +0000 (21:12 -0700)]
New :pound: method

8 years agoNew :pound: method
Alex Johnstone [Thu, 24 Mar 2016 04:11:05 +0000 (21:11 -0700)]
New :pound: method

8 years agoNew :pound: method
Alex Johnstone [Thu, 24 Mar 2016 04:06:20 +0000 (21:06 -0700)]
New :pound: method

8 years agoNew :pound: method
Alex Johnstone [Thu, 24 Mar 2016 04:04:45 +0000 (21:04 -0700)]
New :pound: method

8 years agoWrong date
Alex Johnstone [Wed, 23 Mar 2016 21:10:55 +0000 (14:10 -0700)]
Wrong date

8 years agoMerge pull request #210 from n0bs/master
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

8 years agoEdited 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)"

8 years agoMerge pull request #209 from n0bs/master
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