]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
7 years agodon't try to build the readme
Jack Humbert [Sat, 11 Feb 2017 16:39:57 +0000 (11:39 -0500)]
don't try to build the readme

7 years agoMerge pull request #1083 from VoodaGod/bone2planck
Jack Humbert [Fri, 10 Feb 2017 16:03:43 +0000 (11:03 -0500)]
Merge pull request #1083 from VoodaGod/bone2planck

fixed readme (i swear)

7 years agofixed readme (i swear)
VoodaGod [Fri, 10 Feb 2017 08:51:08 +0000 (09:51 +0100)]
fixed readme (i swear)

7 years agoMerge pull request #1073 from qmk/backlight_changes
Jack Humbert [Fri, 10 Feb 2017 01:14:35 +0000 (20:14 -0500)]
Merge pull request #1073 from qmk/backlight_changes

Open backlight functionality to all ports

7 years agoMerge pull request #1078 from VoodaGod/bone2planck
Jack Humbert [Thu, 9 Feb 2017 15:38:46 +0000 (10:38 -0500)]
Merge pull request #1078 from VoodaGod/bone2planck

updated Bone2Planck Keymap, Readme & fixed Makefile

7 years agoMerge pull request #1079 from r2d2rogers/patch-1
Jack Humbert [Thu, 9 Feb 2017 15:38:09 +0000 (10:38 -0500)]
Merge pull request #1079 from r2d2rogers/patch-1

[Typo] correct link to default keymap in readme.

7 years ago[Typo] correct link to default keymap in readme.
Rob Rogers [Thu, 9 Feb 2017 15:08:50 +0000 (09:08 -0600)]
[Typo] correct link to default keymap in readme.

7 years agoupdated layout & readme
VoodaGod [Thu, 9 Feb 2017 12:07:59 +0000 (13:07 +0100)]
updated layout & readme

7 years agomore formatting
VoodaGod [Thu, 9 Feb 2017 11:17:13 +0000 (12:17 +0100)]
more formatting

7 years agoreadme formatting changes
VoodaGod [Thu, 9 Feb 2017 10:25:50 +0000 (11:25 +0100)]
readme formatting changes

7 years agoupdated readme
VoodaGod [Thu, 9 Feb 2017 10:21:52 +0000 (11:21 +0100)]
updated readme

7 years agoupdated bone2planck keymap & readme
VoodaGod [Thu, 9 Feb 2017 09:01:39 +0000 (10:01 +0100)]
updated bone2planck keymap & readme

7 years agoMerge pull request #1074 from dungdung/kc60_led
Jack Humbert [Wed, 8 Feb 2017 02:25:00 +0000 (21:25 -0500)]
Merge pull request #1074 from dungdung/kc60_led

Moved KC60 capslock LED code to standard led_set_kb…

7 years agoaccept numbers in travis build
Jack Humbert [Wed, 8 Feb 2017 01:51:50 +0000 (20:51 -0500)]
accept numbers in travis build

7 years agoMoved KC60 capslock LED code to standard led_set_kb so it can be overridden by users
dungdung [Wed, 8 Feb 2017 00:55:40 +0000 (16:55 -0800)]
Moved KC60 capslock LED code to standard led_set_kb so it can be overridden by users

7 years agoMerge pull request #1070 from jimmyhchan/fixSplit
Jack Humbert [Tue, 7 Feb 2017 20:46:29 +0000 (15:46 -0500)]
Merge pull request #1070 from jimmyhchan/fixSplit

Lets split readme eeprom master hand fixes

7 years agorename I2C_MASTER_RIGHT to MASTER_RIGHT since this works for serial as well
Jimmy Chan [Mon, 6 Feb 2017 18:03:48 +0000 (10:03 -0800)]
rename I2C_MASTER_RIGHT to MASTER_RIGHT since this works for serial as well

7 years agoudpate readme to reflect QMK and not having the Makefile from ahtn's repo
Jimmy Chan [Mon, 6 Feb 2017 17:53:38 +0000 (09:53 -0800)]
udpate readme to reflect QMK and not having the Makefile from ahtn's repo

7 years agocorrectly put eeprom EE_HANDS at addr 0x0a (decimal 10). default to rev2 project...
Jimmy Chan [Mon, 6 Feb 2017 16:42:38 +0000 (08:42 -0800)]
correctly put eeprom EE_HANDS at addr 0x0a (decimal 10). default to rev2 project. do not default EE_HANDS for the serial keymap

if you compare split_util.h with the original project by ahtn, the
address we look for isLeftHand config went from addr 7 to addr 10
(decimal). The EEP files were not updated.

EE_HANDS should not be enabled by default since it's more confusing for
most users

7 years agoadded functionality for just a port
Jack Humbert [Tue, 7 Feb 2017 20:23:56 +0000 (15:23 -0500)]
added functionality for just a port

7 years agoMerge pull request #1072 from nicinabox/improve-ls-avrdude-target
Jack Humbert [Tue, 7 Feb 2017 18:52:03 +0000 (13:52 -0500)]
Merge pull request #1072 from nicinabox/improve-ls-avrdude-target

Check for Pro Micro serial port automatically

7 years agoMerge pull request #1062 from luizribeiro/fix-win
Jack Humbert [Tue, 7 Feb 2017 18:49:10 +0000 (13:49 -0500)]
Merge pull request #1062 from luizribeiro/fix-win

Fix V-USB bug on Windows 10

7 years agoMerge pull request #1071 from dungdung/rgb_tweaks
Jack Humbert [Tue, 7 Feb 2017 18:32:31 +0000 (13:32 -0500)]
Merge pull request #1071 from dungdung/rgb_tweaks

RGB tweaks

7 years agoMerge pull request #1068 from adzenith/master
Jack Humbert [Tue, 7 Feb 2017 18:27:41 +0000 (13:27 -0500)]
Merge pull request #1068 from adzenith/master

Minor cleanup

7 years agoMerge pull request #1046 from LukeSilva/master
Jack Humbert [Tue, 7 Feb 2017 18:18:47 +0000 (13:18 -0500)]
Merge pull request #1046 from LukeSilva/master

Add Tapping Macros to QMK

7 years agoMerge pull request #1057 from priyadi/selectable_output
Jack Humbert [Tue, 7 Feb 2017 18:12:29 +0000 (13:12 -0500)]
Merge pull request #1057 from priyadi/selectable_output

Implement runtime selectable output (USB or BT)

7 years agopass through travis errors
Jack Humbert [Tue, 7 Feb 2017 17:36:25 +0000 (12:36 -0500)]
pass through travis errors

7 years agoMerge pull request #1056 from upils/master
Jack Humbert [Tue, 7 Feb 2017 17:20:29 +0000 (12:20 -0500)]
Merge pull request #1056 from upils/master

Add reddot handwired keyboard.

7 years agoMerge pull request #1053 from TerryMathews/master
Jack Humbert [Tue, 7 Feb 2017 17:19:45 +0000 (12:19 -0500)]
Merge pull request #1053 from TerryMathews/master

Let's Split: establish rev2fliphalf subproject

7 years agovariable scope fix for travis
Jack Humbert [Tue, 7 Feb 2017 16:53:43 +0000 (11:53 -0500)]
variable scope fix for travis

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 agoCheck for a new serial port every second
Nic Aitch [Tue, 7 Feb 2017 01:57:34 +0000 (19:57 -0600)]
Check for a new serial port every second

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 agoReverse rev2 and rev2fliphalf
TerryMathews [Tue, 7 Feb 2017 00:23:10 +0000 (19:23 -0500)]
Reverse rev2 and rev2fliphalf

Flipped definitions on what constitutes "fliphalf" by popular demand.

7 years agoRevert "Reverse rev2 and rev2fliphalf"
TerryMathews [Tue, 7 Feb 2017 00:21:21 +0000 (19:21 -0500)]
Revert "Reverse rev2 and rev2fliphalf"

This reverts commit 0537977ba1412aa2ba753e152eec445e18858244.

7 years agoReverse rev2 and rev2fliphalf
TerryMathews [Tue, 7 Feb 2017 00:14:57 +0000 (19:14 -0500)]
Reverse rev2 and rev2fliphalf

Flipped definitions on what constitutes "fliphalf" by popular demand.

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 agoAdded non-animated gradient mode
dungdung [Mon, 6 Feb 2017 22:14:56 +0000 (14:14 -0800)]
Added non-animated gradient mode

7 years agoAdded mode reverse step function
dungdung [Mon, 6 Feb 2017 22:09:29 +0000 (14:09 -0800)]
Added mode reverse step function

7 years agoChristmas mode now works with even RGBED_NUM
dungdung [Mon, 6 Feb 2017 22:08:21 +0000 (14:08 -0800)]
Christmas mode now works with even RGBED_NUM
Added Christmas mode steps to reduce red and green colors blending into each other
Added Christmas mode interval
Increased green hue to 120

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 agoMinor cleanup
Nikolaus Wittenstein [Mon, 6 Feb 2017 00:55:08 +0000 (19:55 -0500)]
Minor cleanup

7 years agoAdd new DIODE_DIRECTION option
Nikolaus Wittenstein [Mon, 6 Feb 2017 00:42:00 +0000 (19:42 -0500)]
Add new DIODE_DIRECTION option

The previous two options were COL2ROW, ROW2COL; this adds CUSTOM_MATRIX
to disable the built-in matrix scanning code.

Most notably, this obviates the need to set MATRIX_ROW_PINS or
MATRIX_COL_PINS.

7 years agoRemove unused matrix_raw variable in matrix.c
Nikolaus Wittenstein [Mon, 6 Feb 2017 00:41:08 +0000 (19:41 -0500)]
Remove unused matrix_raw variable in matrix.c

7 years agoAdd missing header to ergodox ordinary keymap
Nikolaus Wittenstein [Sat, 4 Feb 2017 02:09:50 +0000 (21:09 -0500)]
Add missing header to ergodox ordinary keymap

7 years agoFix compile warnings in egodox robot_test_layout
Nikolaus Wittenstein [Sat, 4 Feb 2017 02:06:43 +0000 (21:06 -0500)]
Fix compile warnings in egodox robot_test_layout

Fixes the warning "right shift count >= width of type" by adding UL to
the end of constants.

7 years agoFix compile warnings in light_ws2812.c
Nikolaus Wittenstein [Sat, 4 Feb 2017 02:00:10 +0000 (21:00 -0500)]
Fix compile warnings in light_ws2812.c

Fixes the warning "function declaration isn't a prototype" by explicitly
making the parameter list void.

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 agoFix V-USB bug on Windows 10
Luiz Ribeiro [Thu, 2 Feb 2017 02:57:44 +0000 (21:57 -0500)]
Fix V-USB bug on Windows 10

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 agoRestrict outputselect to LUFA only for now
Priyadi Iman Nurcahyo [Wed, 1 Feb 2017 15:30:06 +0000 (22:30 +0700)]
Restrict outputselect to LUFA only for now

7 years agoFix wrong include
Priyadi Iman Nurcahyo [Wed, 1 Feb 2017 13:18:52 +0000 (20:18 +0700)]
Fix wrong include

7 years agoLimit outputselect to AVR only for now
Priyadi Iman Nurcahyo [Wed, 1 Feb 2017 12:37:52 +0000 (19:37 +0700)]
Limit outputselect to AVR only for now

7 years agoMove outputselect to parent dir to satisfy non LUFA keyboards
Priyadi Iman Nurcahyo [Wed, 1 Feb 2017 10:55:13 +0000 (17:55 +0700)]
Move outputselect to parent dir to satisfy non LUFA keyboards

7 years agoAdd layer switcher keycodes: OUT_AUTO, OUT_USB, OUT_BT, OUT_BLE
Priyadi Iman Nurcahyo [Wed, 1 Feb 2017 08:35:21 +0000 (15:35 +0700)]
Add layer switcher keycodes: OUT_AUTO, OUT_USB, OUT_BT, OUT_BLE

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 agoImplement runtime selectable output (USB or BT)
Priyadi Iman Nurcahyo [Tue, 31 Jan 2017 22:07:05 +0000 (05:07 +0700)]
Implement runtime selectable output (USB or BT)

7 years agoAdd reddot handwired keyboard.
upils [Tue, 31 Jan 2017 21:37:03 +0000 (22:37 +0100)]
Add reddot handwired keyboard.

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 agoLet's Split: establish rev2fliphalf subproject
TerryMathews [Mon, 30 Jan 2017 03:22:32 +0000 (22:22 -0500)]
Let's Split: establish rev2fliphalf subproject

Subproject to accomodate second half pad built in opposite orientation
(places TRRS jacks on opposing edges for shorter cable runs)

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 agoAdd luke keymap, as an example of the tapping macros
Luke Silva [Sat, 28 Jan 2017 07:43:41 +0000 (18:43 +1100)]
Add luke keymap, as an example of the tapping macros

7 years agoAdd support for various tapping macros
Luke Silva [Sat, 28 Jan 2017 07:42:35 +0000 (18:42 +1100)]
Add support for various tapping macros

A macro key can now be easily set to act as a modifier on hold, and
press a shifted key when tapped. Or to switch layers when held, and
again press a shifted key when tapped.

Various other helper defines have been created which send macros when
the key is pressed, released and tapped, cleaning up the
action_get_macro function inside keymap definitions.

The layer switching macros require a GCC extension - 'compound
statements enclosed within parentheses'. The use of this extension is
already present within the macro subsystem of this project, so its use
in this commit should not cause any additional issues.

MACRO_NONE had to be cast to a (macro_t*) to suppress compiler
warnings within some tapping macros.