]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
7 years agocorrectly assign bash variable
Jack Humbert [Tue, 7 Feb 2017 07:00:07 +0000 (02:00 -0500)]
correctly assign bash variable

7 years agofix typo
Jack Humbert [Tue, 7 Feb 2017 06:54:58 +0000 (01:54 -0500)]
fix typo

7 years agoadd comma
Jack Humbert [Tue, 7 Feb 2017 06:53:46 +0000 (01:53 -0500)]
add comma

7 years agoMerge pull request #1069 from hot-leaf-juice/master
Jack Humbert [Tue, 7 Feb 2017 06:42:30 +0000 (01:42 -0500)]
Merge pull request #1069 from hot-leaf-juice/master

change cmd-l and cmd-r for actual home and end

7 years agotry building only keyboards needed
Jack Humbert [Tue, 7 Feb 2017 06:35:10 +0000 (01:35 -0500)]
try building only keyboards needed

7 years agoMerge pull request #1041 from folkert4/master
Jack Humbert [Tue, 7 Feb 2017 05:37:23 +0000 (00:37 -0500)]
Merge pull request #1041 from folkert4/master

Added Espynn's keymap

7 years agoMerge pull request #1047 from lordchair/keymap_yale
Jack Humbert [Tue, 7 Feb 2017 05:30:56 +0000 (00:30 -0500)]
Merge pull request #1047 from lordchair/keymap_yale

yale planck layout

7 years agoMerge pull request #1048 from smt/smt/planck
Jack Humbert [Tue, 7 Feb 2017 01:21:42 +0000 (20:21 -0500)]
Merge pull request #1048 from smt/smt/planck

Add smt's keymap for Planck

7 years agoMerge pull request #1059 from qmk/hf/algr_t
Jack Humbert [Tue, 7 Feb 2017 00:33:33 +0000 (19:33 -0500)]
Merge pull request #1059 from qmk/hf/algr_t

Introduces ALGR_T for dual-function AltGr

7 years agoMerge pull request #1036 from nicinabox/lets-split-improvements
Jack Humbert [Tue, 7 Feb 2017 00:33:07 +0000 (19:33 -0500)]
Merge pull request #1036 from nicinabox/lets-split-improvements

Lets Split flashing improvements

7 years agoMerge pull request #960 from ofples/feature/combos
Jack Humbert [Tue, 7 Feb 2017 00:31:45 +0000 (19:31 -0500)]
Merge pull request #960 from ofples/feature/combos

Keyboard combination triggers

7 years agoMerge pull request #1010 from SjB/oneshot_timeout_fix
Jack Humbert [Mon, 6 Feb 2017 23:57:23 +0000 (18:57 -0500)]
Merge pull request #1010 from SjB/oneshot_timeout_fix

oneshot timeout would only timeout after an event.

7 years agoMerge branch 'master' of github.com:jackhumbert/qmk_firmware
Jack Humbert [Mon, 6 Feb 2017 23:28:50 +0000 (18:28 -0500)]
Merge branch 'master' of github.com:jackhumbert/qmk_firmware

7 years ago[skip build] testing travis script
Jack Humbert [Mon, 6 Feb 2017 23:28:37 +0000 (18:28 -0500)]
[skip build] testing travis script

7 years agoMerge pull request #981 from jonasoberschweiber/osx-surrogate-pairs
Jack Humbert [Mon, 6 Feb 2017 23:00:47 +0000 (18:00 -0500)]
Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairs

Add support for Unicode supplementary planes on OS X

7 years ago[skip build] testing travis script
Jack Humbert [Mon, 6 Feb 2017 22:51:20 +0000 (17:51 -0500)]
[skip build] testing travis script

7 years agoMerge pull request #1030 from SjB/refactor_register_code16
Jack Humbert [Mon, 6 Feb 2017 22:06:53 +0000 (17:06 -0500)]
Merge pull request #1030 from SjB/refactor_register_code16

speeding up (un)register_code16

7 years ago[skip build] testing travis script
Jack Humbert [Mon, 6 Feb 2017 22:00:30 +0000 (17:00 -0500)]
[skip build] testing travis script

7 years ago[skip build] testing travis script
Jack Humbert [Mon, 6 Feb 2017 21:56:39 +0000 (16:56 -0500)]
[skip build] testing travis script

7 years ago[skip build] testing travis script
Jack Humbert [Mon, 6 Feb 2017 21:54:54 +0000 (16:54 -0500)]
[skip build] testing travis script

7 years ago[skip build] testing travis script
Jack Humbert [Mon, 6 Feb 2017 21:46:44 +0000 (16:46 -0500)]
[skip build] testing travis script

7 years ago[skip build] testing travis script
Jack Humbert [Mon, 6 Feb 2017 21:42:18 +0000 (16:42 -0500)]
[skip build] testing travis script

7 years agofixes qmk.fm linking, tests out auto version incrementing
Jack Humbert [Mon, 6 Feb 2017 21:04:28 +0000 (16:04 -0500)]
fixes qmk.fm linking, tests out auto version incrementing

7 years agochange cmd-l and cmd-r for actual home and end
Callum Oakley [Mon, 6 Feb 2017 12:40:32 +0000 (12:40 +0000)]
change cmd-l and cmd-r for actual home and end

7 years agoMerge pull request #1063 from osamuaoki/master
Erez Zukerman [Thu, 2 Feb 2017 23:33:04 +0000 (18:33 -0500)]
Merge pull request #1063 from osamuaoki/master

Typo fixes

7 years agoMerge pull request #1058 from edasque/master
Erez Zukerman [Thu, 2 Feb 2017 23:31:25 +0000 (18:31 -0500)]
Merge pull request #1058 from edasque/master

Reverted Dockerfile to put the CMD back

7 years agoTypo fixes
Osamu Aoki [Thu, 2 Feb 2017 14:15:08 +0000 (23:15 +0900)]
Typo fixes

7 years agoMerge pull request #1049 from SjB/tap_dance_save_oneshot_mods
Erez Zukerman [Thu, 2 Feb 2017 01:12:44 +0000 (20:12 -0500)]
Merge pull request #1049 from SjB/tap_dance_save_oneshot_mods

race condition between oneshot_mods and tap_dance

7 years agoMerge pull request #1054 from deadcyclo/master
Erez Zukerman [Thu, 2 Feb 2017 01:11:37 +0000 (20:11 -0500)]
Merge pull request #1054 from deadcyclo/master

Adds support for ergodox shine and unicode and emoji support to the deadcyclo layout

7 years agoMerge remote-tracking branch 'upstream/master'
Brendan Johan Lee [Wed, 1 Feb 2017 07:56:35 +0000 (08:56 +0100)]
Merge remote-tracking branch 'upstream/master'

7 years agoIntroduces ALGR_T for dual-function AltGr
Erez Zukerman [Wed, 1 Feb 2017 02:31:05 +0000 (21:31 -0500)]
Introduces ALGR_T for dual-function AltGr

7 years agoReverted Dockerfile to put the CMD back
Erik Dasque [Wed, 1 Feb 2017 00:59:59 +0000 (19:59 -0500)]
Reverted Dockerfile to put the CMD back

7 years agoMerge pull request #1039 from zabereer/albert_ergodox_keymap
Erez Zukerman [Wed, 1 Feb 2017 00:29:19 +0000 (19:29 -0500)]
Merge pull request #1039 from zabereer/albert_ergodox_keymap

albert ergodox keymap

7 years agoMerge pull request #1055 from matzebond/master
Erez Zukerman [Wed, 1 Feb 2017 00:25:46 +0000 (19:25 -0500)]
Merge pull request #1055 from matzebond/master

update my neo2 keymap

7 years agoupdate my neo2 keymap
Matthias Schmitt [Mon, 30 Jan 2017 22:10:28 +0000 (23:10 +0100)]
update my neo2 keymap

7 years ago[deadcyclo layout] Refactoring. Use custom functions and macros
Brendan Johan Lee [Mon, 30 Jan 2017 18:42:27 +0000 (19:42 +0100)]
[deadcyclo layout] Refactoring. Use custom functions and macros

7 years ago[deadcyclo layout] fixed failing tests
Brendan Johan Lee [Mon, 30 Jan 2017 14:45:16 +0000 (15:45 +0100)]
[deadcyclo layout] fixed failing tests

7 years agoMerge remote-tracking branch 'upstream/master'
Brendan Johan Lee [Mon, 30 Jan 2017 11:59:17 +0000 (12:59 +0100)]
Merge remote-tracking branch 'upstream/master'

7 years agorace condition between oneshot_mods and tap_dance
SjB [Sun, 29 Jan 2017 18:04:43 +0000 (13:04 -0500)]
race condition between oneshot_mods and tap_dance

since the keycode for a tap dance process gets process only after the
TAPPING_TERM timeout, you really only have ONESHOT_TIMEOUT -
TAPPING_TERM time to tap or double tap on the key. This fix save the
oneshot_mods into the action.state structure and applies the mods with
the keycode when it's registered. It also unregisters the mod when the
the tap dance process gets reset.

7 years agomoved oneshot cancellation code outside of process_record.
SjB [Sun, 29 Jan 2017 17:56:20 +0000 (12:56 -0500)]
moved oneshot cancellation code outside of process_record.

The oneshot cancellation code do not depend on the
action_tapping_process and since process_record get called via the
action_tapping_process logic moved the oneshot cancellation code into
the action_exec function just before the action_tapping_process call

7 years agoregistering a weak_mods when using register_code16
SjB [Sun, 29 Jan 2017 17:06:24 +0000 (12:06 -0500)]
registering a weak_mods when using register_code16

Scenario:
Locking the KC_LSHIFT, and then using a tap dance key that registers a
S(KC_9) will unregister the KC_LSHIFT.

The tap dance or any keycode that is registered should not have the
side effect of cancelling a locked moditifier. We should be using a
similar logic as the TMK codes in tmk_core/comman/action.c:158.

7 years agoadded picture of layout
Yale Thomas [Sun, 29 Jan 2017 02:39:08 +0000 (18:39 -0800)]
added picture of layout

7 years agousability tweaks
Yale Thomas [Sun, 29 Jan 2017 02:35:06 +0000 (18:35 -0800)]
usability tweaks

7 years agomouse keys added
Yale Thomas [Thu, 29 Sep 2016 01:29:54 +0000 (18:29 -0700)]
mouse keys added

7 years agonew 'yale' keymap
Yale Thomas [Tue, 23 Aug 2016 21:43:21 +0000 (14:43 -0700)]
new 'yale' keymap

7 years agos/Bkps/Bksp
Stephen Tudor [Sun, 29 Jan 2017 01:54:34 +0000 (20:54 -0500)]
s/Bkps/Bksp

7 years agoCarry over Planck updates to my Preonic keymap
Stephen Tudor [Sat, 28 Jan 2017 06:38:58 +0000 (01:38 -0500)]
Carry over Planck updates to my Preonic keymap

7 years agoImprove Planck keymap
Stephen Tudor [Sat, 28 Jan 2017 06:37:59 +0000 (01:37 -0500)]
Improve Planck keymap

- added escape+shift mod-tap key
- replaced BRITE with backtick

7 years agoMerge branch 'master' into smt/planck
Stephen Tudor [Sat, 28 Jan 2017 05:51:07 +0000 (00:51 -0500)]
Merge branch 'master' into smt/planck

* master:
  Clarify license on abnt2 keymap (#1038)
  replace jackhumbert with qmk
  Add gitter image, start update to qmk org
  Remove COLEMAK from preonic_keycodes enum
  layer defines to enum
  Update readme for smt Preonic keymap
  Add smt keymap for Preonic
  updated all the other keymaps to support the new changes.
  fix: infinity60 keyboard was not using quantum features.
  Compare Makefile with itself instead of using `--help`

7 years agoMerge pull request #1043 from potz/patch-1
skullydazed [Sat, 28 Jan 2017 02:40:59 +0000 (18:40 -0800)]
Merge pull request #1043 from potz/patch-1

Clarify license on abnt2 keymap (#1038)

7 years agoClarify license on abnt2 keymap (#1038)
Potiguar Faga [Fri, 27 Jan 2017 20:22:44 +0000 (18:22 -0200)]
Clarify license on abnt2 keymap (#1038)

7 years agoAdded Espynn's keymap
folkert4 [Fri, 27 Jan 2017 18:51:39 +0000 (13:51 -0500)]
Added Espynn's keymap

7 years agoMerge pull request #869 from dylanjgscott/master
Jack Humbert [Fri, 27 Jan 2017 16:23:02 +0000 (11:23 -0500)]
Merge pull request #869 from dylanjgscott/master

Use `type cmp` to test for cmp in Makefile

7 years agoMerge remote-tracking branch 'upstream/master'
Brendan Johan Lee [Fri, 27 Jan 2017 14:24:08 +0000 (15:24 +0100)]
Merge remote-tracking branch 'upstream/master'

7 years ago[deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keys
Brendan Johan Lee [Fri, 27 Jan 2017 12:53:02 +0000 (13:53 +0100)]
[deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keys

7 years agoMerge pull request #1035 from qmk/qmk_org_changes
Jack Humbert [Fri, 27 Jan 2017 05:28:46 +0000 (00:28 -0500)]
Merge pull request #1035 from qmk/qmk_org_changes

Updated urls due to transfer to qmk org

7 years agoalbert ergodox keymap
Albert Pretorius [Thu, 26 Jan 2017 20:07:47 +0000 (20:07 +0000)]
albert ergodox keymap

7 years agoUpdate readme
Nic Aitch [Thu, 26 Jan 2017 15:31:40 +0000 (09:31 -0600)]
Update readme

7 years agoAdd avrdude target
Nic Aitch [Thu, 26 Jan 2017 15:31:27 +0000 (09:31 -0600)]
Add avrdude target

7 years agoMerge remote-tracking branch 'upstream/master'
Brendan Johan Lee [Thu, 26 Jan 2017 10:56:32 +0000 (11:56 +0100)]
Merge remote-tracking branch 'upstream/master'

7 years agoreplace jackhumbert with qmk
Jack Humbert [Thu, 26 Jan 2017 06:52:43 +0000 (01:52 -0500)]
replace jackhumbert with qmk

7 years agoMerge pull request #1029 from SjB/qmk_infinity60
Jack Humbert [Thu, 26 Jan 2017 06:28:44 +0000 (01:28 -0500)]
Merge pull request #1029 from SjB/qmk_infinity60

fix: infinity60 keyboard was not using quantum features.

7 years agoMerge pull request #1033 from smt/smt/preonic
Jack Humbert [Thu, 26 Jan 2017 06:27:51 +0000 (01:27 -0500)]
Merge pull request #1033 from smt/smt/preonic

Add smt's keymap for Preonic

7 years agoAdd gitter image, start update to qmk org
Jack Humbert [Thu, 26 Jan 2017 06:26:17 +0000 (01:26 -0500)]
Add gitter image, start update to qmk org

7 years agoAdd smt keymap for Planck
Stephen Tudor [Thu, 26 Jan 2017 05:24:51 +0000 (00:24 -0500)]
Add smt keymap for Planck

7 years agoRemove COLEMAK from preonic_keycodes enum
Stephen Tudor [Wed, 25 Jan 2017 15:57:42 +0000 (10:57 -0500)]
Remove COLEMAK from preonic_keycodes enum

7 years agoMerge branch 'master' of github.com:jackhumbert/qmk_firmware
Jack Humbert [Wed, 25 Jan 2017 15:02:06 +0000 (10:02 -0500)]
Merge branch 'master' of github.com:jackhumbert/qmk_firmware

7 years agolayer defines to enum
Jack Humbert [Wed, 25 Jan 2017 15:02:01 +0000 (10:02 -0500)]
layer defines to enum

7 years ago[deadcyclo layout] Added lotsof new emojis and some new unicode keys
Brendan Johan Lee [Wed, 25 Jan 2017 14:16:38 +0000 (15:16 +0100)]
[deadcyclo layout] Added lotsof new emojis and some new unicode keys

7 years agoUpdate readme for smt Preonic keymap
Stephen Tudor [Wed, 25 Jan 2017 05:55:40 +0000 (00:55 -0500)]
Update readme for smt Preonic keymap

7 years agoAdd smt keymap for Preonic
Stephen Tudor [Wed, 25 Jan 2017 05:25:17 +0000 (00:25 -0500)]
Add smt keymap for Preonic

7 years agoMerge remote-tracking branch 'upstream/master'
Brendan Johan Lee [Tue, 24 Jan 2017 20:56:18 +0000 (21:56 +0100)]
Merge remote-tracking branch 'upstream/master'

7 years ago[deadcyclo layout] Added unicode layer
Brendan Johan Lee [Tue, 24 Jan 2017 20:54:34 +0000 (21:54 +0100)]
[deadcyclo layout] Added unicode layer

7 years ago[deadcyclo layout] Added support for ergodox ez shine
Brendan Johan Lee [Tue, 24 Jan 2017 18:10:35 +0000 (19:10 +0100)]
[deadcyclo layout] Added support for ergodox ez shine

7 years agoMerge pull request #1014 from SjB/lcd_mods_status
Jack Humbert [Tue, 24 Jan 2017 05:34:55 +0000 (00:34 -0500)]
Merge pull request #1014 from SjB/lcd_mods_status

added mods status bit to visualizer.

7 years agoupdated all the other keymaps to support the new changes.
SjB [Tue, 24 Jan 2017 05:24:01 +0000 (00:24 -0500)]
updated all the other keymaps to support the new changes.

qmk firmware requires the matrix_init_user and matrix_scan_user
function to be implementated. Added these function to all the existing
keymaps.

7 years agospeeding up (un)register_code16
SjB [Sat, 21 Jan 2017 07:01:55 +0000 (02:01 -0500)]
speeding up (un)register_code16

In register_code16 and unregister_code16 we call register_code and
unregister_code twice, once for the mods and once for the keycode.
The (un)register_code have many check to see that keycode we have sent
however because we know that we are sending it a mods key, why not
just skip all of it and call (un)register_mods instead. This will skip
alot of checks and should speedup the loop a little.

7 years agofix: infinity60 keyboard was not using quantum features.
SjB [Tue, 24 Jan 2017 03:01:33 +0000 (22:01 -0500)]
fix: infinity60 keyboard was not using quantum features.

the quantum matrix codes where not being initialized or/and called
so no feature of the quantum firmware could be used. These codes have
been added and now we can enjoy the quantum firmware goodness.

7 years agoCompare Makefile with itself instead of using `--help`
Dylan Scott [Tue, 8 Nov 2016 20:45:20 +0000 (07:45 +1100)]
Compare Makefile with itself instead of using `--help`

7 years agoturn off rgb_midi in ez
Jack Humbert [Mon, 23 Jan 2017 18:55:24 +0000 (13:55 -0500)]
turn off rgb_midi in ez

7 years agoMerge pull request #1026 from TerryMathews/master
Jack Humbert [Mon, 23 Jan 2017 05:33:29 +0000 (00:33 -0500)]
Merge pull request #1026 from TerryMathews/master

Let's Split: More code cleanup

7 years agoMore code cleanup
TerryMathews [Mon, 23 Jan 2017 03:06:53 +0000 (22:06 -0500)]
More code cleanup

Missed a few commented out vestigal defines in revx/config.h that had
been moved to keymap/serial and i2c.

7 years agoMerge pull request #1018 from hot-leaf-juice/master
Jack Humbert [Mon, 23 Jan 2017 00:01:34 +0000 (19:01 -0500)]
Merge pull request #1018 from hot-leaf-juice/master

simplified my keymap

7 years agoMore keyboard map tweaking (#1019)
Christopher Browne [Mon, 23 Jan 2017 00:01:07 +0000 (19:01 -0500)]
More keyboard map tweaking (#1019)

* Add HOME/END keys as upper/lower on arrow-up/down

* Reduce .hex file size by turning off unneeded options

* Put digit keypad onto left hand upon RAISE; this will sometimes be preferable to double-hits of right hand

7 years agoMerge pull request #1020 from remigius42/master
Jack Humbert [Sun, 22 Jan 2017 23:59:57 +0000 (18:59 -0500)]
Merge pull request #1020 from remigius42/master

Swiss German layout for Ergodox EZ & Infinity

7 years agoMerge pull request #1022 from lucwastiaux/master
Jack Humbert [Sun, 22 Jan 2017 23:59:12 +0000 (18:59 -0500)]
Merge pull request #1022 from lucwastiaux/master

Improvements to Dvorak Programmer Ergodox keymap

7 years agoMerge pull request #1021 from luizribeiro/ps2avrGB
Jack Humbert [Sun, 22 Jan 2017 23:58:46 +0000 (18:58 -0500)]
Merge pull request #1021 from luizribeiro/ps2avrGB

Support for ps2avrGB / winkeyless.kr boards

7 years agoMerge pull request #1023 from TerryMathews/master
Jack Humbert [Sun, 22 Jan 2017 23:57:44 +0000 (18:57 -0500)]
Merge pull request #1023 from TerryMathews/master

Corrects Let's Split code

7 years agoMissed commenting out notes at end of line
TerryMathews [Sun, 22 Jan 2017 20:57:30 +0000 (15:57 -0500)]
Missed commenting out notes at end of line

7 years agoFixed keymap matrix on rev2
TerryMathews [Sun, 22 Jan 2017 20:50:08 +0000 (15:50 -0500)]
Fixed keymap matrix on rev2

* Fixed keymap matrix in rev2 so that left half and right half match
when in same orientation.

7 years agoCreated lines to uncomment keyboards built upside down
TerryMathews [Sun, 22 Jan 2017 20:46:43 +0000 (15:46 -0500)]
Created lines to uncomment keyboards built upside down

* Reverses column order to fix left-to-right key order that occurs if
PCB assembled upside down.

7 years agoRefactor code to eliminate duplicate defines
TerryMathews [Sun, 22 Jan 2017 20:37:48 +0000 (15:37 -0500)]
Refactor code to eliminate duplicate defines

* Moved duplicated defines out of inappropriate source files (matrix
pins in keymap subdirectory)
* Eliminated default keymap directory
* Hardcoded serial keymap to use serial defines and EE_CONFIG
* Hardcoded i2c keymap to use i2c defines

7 years agoUpgrade AVR 8-bit Toolchain to 3.5.4 on Travis
Luiz Ribeiro [Sun, 22 Jan 2017 17:06:14 +0000 (12:06 -0500)]
Upgrade AVR 8-bit Toolchain to 3.5.4 on Travis

7 years agoSG Ergodox layout: Updated layout documentation
Andreas Schmidt [Sun, 22 Jan 2017 11:57:58 +0000 (12:57 +0100)]
SG Ergodox layout: Updated layout documentation

- Swiss German Ergodox layout:
    Updated layout documentation based on previous
    layout changes.

7 years agoSG Ergodox layout: Fixed ENTER key mapping
Andreas Schmidt [Sun, 22 Jan 2017 11:43:46 +0000 (12:43 +0100)]
SG Ergodox layout: Fixed ENTER key mapping

- Swiss German Ergodox layout:
    Additional ENTER key was mapped to wrong layer
    and keyboard half.

7 years agoSG Ergodox layout: Minor code formatting changes
Andreas Schmidt [Sun, 22 Jan 2017 11:35:24 +0000 (12:35 +0100)]
SG Ergodox layout: Minor code formatting changes

- Swiss German Ergodox layout:
    Removed unnecessary spaces.

7 years agoSG Ergodox layout: Add ENTER to left keyboard
Andreas Schmidt [Sun, 22 Jan 2017 11:32:40 +0000 (12:32 +0100)]
SG Ergodox layout: Add ENTER to left keyboard

- Swiss German Ergodox layout:
    Added ENTER key to left keyboard half on media layer
    such that the enter key is available on both halves to
    be able to flash both halves without an additional keyboard.

7 years agoSG Ergodox layout: Add <br/> macro to media layer
Andreas Schmidt [Sun, 22 Jan 2017 11:30:18 +0000 (12:30 +0100)]
SG Ergodox layout: Add <br/> macro to media layer

- Added <br/> macro to media layer of Swiss German layout
    for Ergodox

7 years agodocument BRACKETS and SHELL_LAYER
lucwastiaux [Sun, 22 Jan 2017 02:32:17 +0000 (10:32 +0800)]
document BRACKETS and SHELL_LAYER

7 years agoAdded a copyright header to the default keymap... ¯\_(ツ)_/¯
Luiz Ribeiro [Sat, 21 Jan 2017 23:23:44 +0000 (18:23 -0500)]
Added a copyright header to the default keymap... ¯\_(ツ)_/¯