]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
8 years agoMerge pull request #249 from nrrkeene/master
Erez Zukerman [Tue, 12 Apr 2016 06:04:29 +0000 (09:04 +0300)]
Merge pull request #249 from nrrkeene/master

Version 3, Ordinary Perfected

8 years agoMerge pull request #248 from J3RN/master
Erez Zukerman [Tue, 12 Apr 2016 05:55:24 +0000 (08:55 +0300)]
Merge pull request #248 from J3RN/master

Vim-style navigation for j3rn layout

8 years agoThe Ordinary Layout is the layout you are looking for. Come and see.
Nicholas Keene [Tue, 12 Apr 2016 04:34:41 +0000 (23:34 -0500)]
The Ordinary Layout is the layout you are looking for. Come and see.

8 years agoThe Ordinary Layout is the layout you are looking for. Come and see.
Nicholas Keene [Tue, 12 Apr 2016 04:28:16 +0000 (23:28 -0500)]
The Ordinary Layout is the layout you are looking for. Come and see.

8 years agoThe Ordinary Layout is the layout you are looking for. Come and see.
Nicholas Keene [Tue, 12 Apr 2016 03:51:12 +0000 (22:51 -0500)]
The Ordinary Layout is the layout you are looking for. Come and see.

8 years agoMerge pull request #1 from J3RN/vim-navigation
Jonathan Arnett [Mon, 11 Apr 2016 23:22:23 +0000 (19:22 -0400)]
Merge pull request #1 from J3RN/vim-navigation

Added Vim-style navigation

8 years agoAdded README note about Vim-style navigation
Jonathan Arnett [Mon, 11 Apr 2016 23:19:20 +0000 (19:19 -0400)]
Added README note about Vim-style navigation

8 years agoStylistic changes
Jonathan Arnett [Mon, 11 Apr 2016 23:08:24 +0000 (19:08 -0400)]
Stylistic changes

8 years agoMake a also toggle Media layer
Jonathan Arnett [Mon, 11 Apr 2016 23:01:39 +0000 (19:01 -0400)]
Make a also toggle Media layer

8 years agoMerge pull request #246 from romanzolotarev/master
Erez Zukerman [Mon, 11 Apr 2016 20:02:08 +0000 (23:02 +0300)]
Merge pull request #246 from romanzolotarev/master

Add a new layout with arrows in the home row

8 years agoMerge pull request #244 from nicosuave/add_nico_planck_keymap
Jack Humbert [Mon, 11 Apr 2016 18:52:10 +0000 (14:52 -0400)]
Merge pull request #244 from nicosuave/add_nico_planck_keymap

Add nico keymap

8 years agoMerge pull request #236 from tak3over/master
Jack Humbert [Mon, 11 Apr 2016 18:51:37 +0000 (14:51 -0400)]
Merge pull request #236 from tak3over/master

Minor Doc Changes.

8 years agoMerge pull request #247 from NoahAndrews/fix-path-script
Jack Humbert [Mon, 11 Apr 2016 18:50:01 +0000 (14:50 -0400)]
Merge pull request #247 from NoahAndrews/fix-path-script

Fix important bugs in the path script for Windows

8 years agoMerge pull request #232 from IBNobody/master
Jack Humbert [Mon, 11 Apr 2016 18:37:51 +0000 (14:37 -0400)]
Merge pull request #232 from IBNobody/master

Added Error Checking to 2nd Setup Script

8 years agoAdded admin privilege check
NoahAndrews [Mon, 11 Apr 2016 18:30:15 +0000 (14:30 -0400)]
Added admin privilege check

Running this as a non-administrator appears to work at first, but the
changes wouldn't stick on my Win 8.1 system.  It's weird, but this
script needs to run as admin.

8 years agoFixed CD
IBNobody [Mon, 11 Apr 2016 18:20:22 +0000 (13:20 -0500)]
Fixed CD

8 years agoUpdated comment
NoahAndrews [Mon, 11 Apr 2016 18:14:15 +0000 (14:14 -0400)]
Updated comment

8 years agoRemove failing check
NoahAndrews [Mon, 11 Apr 2016 18:09:42 +0000 (14:09 -0400)]
Remove failing check

NEWPATH1 (C:\MinGW\msys\bin) won't actually be created until the second
script is run

8 years agoAdd HJKL layout
Roman Zolotarev [Mon, 11 Apr 2016 13:45:10 +0000 (21:45 +0800)]
Add HJKL layout

8 years agoAdd my keymap
Nico Ritschel [Sat, 9 Apr 2016 18:34:01 +0000 (11:34 -0700)]
Add my keymap

8 years agoanother modification of layers, restored arrow keys and added cut/paste
tak3over [Thu, 7 Apr 2016 15:54:11 +0000 (10:54 -0500)]
another modification of layers, restored arrow keys and added cut/paste

8 years agoMerge pull request #182 from Vifon/modifier-release-fix
Erez Zukerman [Wed, 6 Apr 2016 19:47:31 +0000 (22:47 +0300)]
Merge pull request #182 from Vifon/modifier-release-fix

Fix the layer-dependent modifiers handling

8 years agoMerge pull request #239 from DidierLoiseau/issue-221
Erez Zukerman [Wed, 6 Apr 2016 19:37:02 +0000 (22:37 +0300)]
Merge pull request #239 from DidierLoiseau/issue-221

Fix issue #221: LGUI(KC_LSFT) does not work

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 agoswitched raise and lower layers
tak3over [Wed, 6 Apr 2016 16:12:58 +0000 (11:12 -0500)]
switched raise and lower layers

8 years agoFix issue #221: LGUI(KC_LSFT) does not work
Didier Loiseau [Tue, 5 Apr 2016 22:19:12 +0000 (00:19 +0200)]
Fix issue #221: LGUI(KC_LSFT) does not work

on mod keys, register LGUI, LSFT etc. as normal mods
 instead of weak mods:
 - they won't be cleared when pressing another key (#188)
 - they won't be cleared by layer switching
 - LSFT(KC_LGUI) will now have the same behavior as LGUI(KC_LSFT)

8 years agoupdated my keymap
tak3over [Tue, 5 Apr 2016 21:39:45 +0000 (16:39 -0500)]
updated my keymap

8 years agoModified keymap
tak3over [Tue, 5 Apr 2016 21:21:45 +0000 (16:21 -0500)]
Modified keymap

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 agoRefactor the source layer cache encoding
Wojciech Siewierski [Tue, 5 Apr 2016 08:54:47 +0000 (10:54 +0200)]
Refactor the source layer cache encoding

8 years agoUpdate tak3over.c
tak3over [Mon, 4 Apr 2016 21:51:30 +0000 (16:51 -0500)]
Update tak3over.c

8 years agoMerge pull request #2 from jackhumbert/master
tak3over [Mon, 4 Apr 2016 18:41:37 +0000 (13:41 -0500)]
Merge pull request #2 from jackhumbert/master

Update from source

8 years agoMerge pull request #1 from tak3over/tak3over-patch-1
tak3over [Mon, 4 Apr 2016 18:23:53 +0000 (13:23 -0500)]
Merge pull request #1 from tak3over/tak3over-patch-1

Minor documentation error.  Raise and Lower.

8 years agoMinor documentation error. Raise and Lower.
tak3over [Mon, 4 Apr 2016 18:19:19 +0000 (13:19 -0500)]
Minor documentation error.  Raise and Lower.

The Raise and Lower keys were transposed in the comment key map for all layers. Assuming _RS and _LW should be mapped to Raise and Lower respectively.  Probably is the same in the other custom keymaps that copied from this default.

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 agoLinks to build guide
Erez Zukerman [Sun, 3 Apr 2016 09:52:08 +0000 (12:52 +0300)]
Links to build guide

8 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware into modifier...
Wojciech Siewierski [Sun, 3 Apr 2016 09:14:08 +0000 (11:14 +0200)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into modifier-release-fix

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 agoUpdate PREVENT_STUCK_MODIFIERS documentation in README
Wojciech Siewierski [Sat, 2 Apr 2016 17:45:02 +0000 (19:45 +0200)]
Update PREVENT_STUCK_MODIFIERS documentation in README

8 years agoCleanup after merge
Wojciech Siewierski [Sat, 2 Apr 2016 16:00:28 +0000 (18:00 +0200)]
Cleanup after merge

- remove a superfluous parenthesis
- wrap lines longer than 80 characters
- add const specifiers where appropriate
- remove unnecessary casts

8 years agoMerge branch 'modifier-release-fix' of https://github.com/eltang/qmk_firmware into...
Wojciech Siewierski [Sat, 2 Apr 2016 17:25:10 +0000 (19:25 +0200)]
Merge branch 'modifier-release-fix' of https://github.com/eltang/qmk_firmware into modifier-release-fix

8 years agoUpdate action.c
eltang [Sat, 2 Apr 2016 17:00:31 +0000 (10:00 -0700)]
Update action.c

8 years agoUpdate action.c
eltang [Sat, 2 Apr 2016 16:59:53 +0000 (09:59 -0700)]
Update action.c

8 years agoUpdate action.c
eltang [Sat, 2 Apr 2016 16:34:01 +0000 (09:34 -0700)]
Update action.c

8 years agoUpdate action.c
eltang [Sat, 2 Apr 2016 16:29:32 +0000 (09:29 -0700)]
Update action.c

8 years agoUpdate action.c
eltang [Sat, 2 Apr 2016 16:13:13 +0000 (09:13 -0700)]
Update action.c

8 years agoUpdate action.c
eltang [Sat, 2 Apr 2016 13:48:44 +0000 (06:48 -0700)]
Update action.c

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 agoUpdate action.c
Eric-L-T [Sat, 2 Apr 2016 03:04:13 +0000 (20:04 -0700)]
Update action.c

8 years agoUpdate action.c
Eric-L-T [Sat, 2 Apr 2016 02:54:02 +0000 (19:54 -0700)]
Update action.c

8 years agoUpdate action.c
Eric-L-T [Sat, 2 Apr 2016 01:26:43 +0000 (18:26 -0700)]
Update action.c

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 agoUpdate action.c
Eric-L-T [Fri, 1 Apr 2016 20:49:03 +0000 (13:49 -0700)]
Update action.c

8 years agoUpdate action.h
Eric-L-T [Fri, 1 Apr 2016 20:45:01 +0000 (13:45 -0700)]
Update action.h

8 years agoUpdate action.c
Eric-L-T [Fri, 1 Apr 2016 20:43:49 +0000 (13:43 -0700)]
Update action.c

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 agoMerge remote-tracking branch 'refs/remotes/jackhumbert/master'
IBNobody [Fri, 1 Apr 2016 05:10:47 +0000 (00:10 -0500)]
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'

8 years agoAdded Error Checking to Setup.bat #2
IBNobody [Fri, 1 Apr 2016 05:10:21 +0000 (00:10 -0500)]
Added Error Checking to Setup.bat #2

Added check for the MinGW directory. Fixed a bug with script exiting out
of a CMD window. Fixed a bug with script dropping user into MinGW
directory. Fixed a bug with RD not deleting temp. Fixed a bug with
PNPUtil.exe not being present in the path.

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