]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
7 years agoMerge branch 'master' into promethium
Priyadi Iman Nurcahyo [Sat, 11 Feb 2017 17:09:25 +0000 (00:09 +0700)]
Merge branch 'master' into promethium

7 years agoRemove assignment warning
Priyadi Iman Nurcahyo [Sat, 11 Feb 2017 17:07:33 +0000 (00:07 +0700)]
Remove assignment warning

7 years agoWorkaround to remove warning
Priyadi Iman Nurcahyo [Sat, 11 Feb 2017 17:02:36 +0000 (00:02 +0700)]
Workaround to remove warning

7 years agoSome space optimization and housekeeping
Priyadi Iman Nurcahyo [Sat, 11 Feb 2017 17:00:01 +0000 (00:00 +0700)]
Some space optimization and housekeeping

7 years agoMerge pull request #1065 from milestogo/master
Jack Humbert [Sat, 11 Feb 2017 16:51:06 +0000 (11:51 -0500)]
Merge pull request #1065 from milestogo/master

Update to kinesis keymaps

7 years agoMerge pull request #1082 from priyadi/right-side-dual-function
Jack Humbert [Sat, 11 Feb 2017 16:50:32 +0000 (11:50 -0500)]
Merge pull request #1082 from priyadi/right-side-dual-function

Implement tap mod dual role for right side mods.

7 years agoMerge pull request #1085 from priyadi/promethium
Jack Humbert [Sat, 11 Feb 2017 16:49:00 +0000 (11:49 -0500)]
Merge pull request #1085 from priyadi/promethium

Promethium keyboard layout update

7 years agoMerge pull request #1087 from mneme/master
Jack Humbert [Sat, 11 Feb 2017 16:48:39 +0000 (11:48 -0500)]
Merge pull request #1087 from mneme/master

Updated keymap for atreus62/mneme

7 years agoMerge pull request #1088 from Mauin/gon_nerd
Jack Humbert [Sat, 11 Feb 2017 16:48:11 +0000 (11:48 -0500)]
Merge pull request #1088 from Mauin/gon_nerd

add GON NerD

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 agoadd GON NerD
Marvin Ramin [Sat, 11 Feb 2017 15:46:13 +0000 (16:46 +0100)]
add GON NerD

7 years agoAdd regular space to B+N on GUI layer for repeating space
Priyadi Iman Nurcahyo [Sat, 11 Feb 2017 15:16:19 +0000 (22:16 +0700)]
Add regular space to B+N on GUI layer for repeating space

7 years agoSwitch to Emoji layer using Punc + greek
Priyadi Iman Nurcahyo [Sat, 11 Feb 2017 15:13:35 +0000 (22:13 +0700)]
Switch to Emoji layer using Punc + greek

7 years agoTurn off capslock when entering num layer
Priyadi Iman Nurcahyo [Sat, 11 Feb 2017 15:07:04 +0000 (22:07 +0700)]
Turn off capslock when entering num layer

7 years agoMove X in number layer away from space
Priyadi Iman Nurcahyo [Sat, 11 Feb 2017 15:03:34 +0000 (22:03 +0700)]
Move X in number layer away from space

7 years agoLSpace + RSpace = switch layer
Priyadi Iman Nurcahyo [Sat, 11 Feb 2017 14:54:10 +0000 (21:54 +0700)]
LSpace + RSpace = switch layer

7 years agocorrect spelling in readme
David Olsson [Sat, 11 Feb 2017 14:09:30 +0000 (15:09 +0100)]
correct spelling in readme

7 years agoImplement Capslock LED
Priyadi Iman Nurcahyo [Sat, 11 Feb 2017 12:03:18 +0000 (19:03 +0700)]
Implement Capslock LED

7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
David Olsson [Sat, 11 Feb 2017 09:50:37 +0000 (10:50 +0100)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agoupdate readme
David Olsson [Sat, 11 Feb 2017 09:49:53 +0000 (10:49 +0100)]
update readme

7 years agosimplify battery calculation for now
Priyadi Iman Nurcahyo [Sat, 11 Feb 2017 07:50:43 +0000 (14:50 +0700)]
simplify battery calculation for now

7 years agoFix emoji layer
Priyadi Iman Nurcahyo [Fri, 10 Feb 2017 18:30:08 +0000 (01:30 +0700)]
Fix emoji layer

7 years agoMake room for 'loose keycodes' by halving UNICODE_MAP range
Priyadi Iman Nurcahyo [Fri, 10 Feb 2017 17:36:08 +0000 (00:36 +0700)]
Make room for 'loose keycodes' by halving UNICODE_MAP range

7 years agoRShift + LShift = Capslock
Priyadi Iman Nurcahyo [Fri, 10 Feb 2017 17:21:27 +0000 (00:21 +0700)]
RShift + LShift = Capslock

7 years agoAdd reset keycode
Priyadi Iman Nurcahyo [Fri, 10 Feb 2017 17:07:44 +0000 (00:07 +0700)]
Add reset keycode

7 years agoGeneralize layer indicators
Priyadi Iman Nurcahyo [Fri, 10 Feb 2017 17:07:10 +0000 (00:07 +0700)]
Generalize layer indicators

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 agoAdd ifdefs for keyboard layouts
Priyadi Iman Nurcahyo [Fri, 10 Feb 2017 15:15:15 +0000 (22:15 +0700)]
Add ifdefs for keyboard layouts

7 years agoImplement battery level indicator
Priyadi Iman Nurcahyo [Fri, 10 Feb 2017 14:28:46 +0000 (21:28 +0700)]
Implement battery level indicator

7 years agoAdd function to cycle backlight modes
Priyadi Iman Nurcahyo [Fri, 10 Feb 2017 10:45:12 +0000 (17:45 +0700)]
Add function to cycle backlight modes

7 years agoActivate SYS layer by pressing both Ctrls
Priyadi Iman Nurcahyo [Fri, 10 Feb 2017 10:11:52 +0000 (17:11 +0700)]
Activate SYS layer by pressing both Ctrls

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

7 years agoRestore GUI layer
Priyadi Iman Nurcahyo [Fri, 10 Feb 2017 07:43:56 +0000 (14:43 +0700)]
Restore GUI layer

7 years agoAdd slash/question mark to punc/num layer
Priyadi Iman Nurcahyo [Fri, 10 Feb 2017 07:32:24 +0000 (14:32 +0700)]
Add slash/question mark to punc/num layer

7 years agoReimplement GUI Layer
Priyadi Iman Nurcahyo [Fri, 10 Feb 2017 06:13:04 +0000 (13:13 +0700)]
Reimplement GUI Layer

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 agoReorganize punctuation & numbers layer
Priyadi Iman Nurcahyo [Thu, 9 Feb 2017 23:51:10 +0000 (06:51 +0700)]
Reorganize punctuation & numbers layer

7 years agoFix LED indicator
Priyadi Iman Nurcahyo [Thu, 9 Feb 2017 23:31:29 +0000 (06:31 +0700)]
Fix LED indicator

7 years agoImplement tap mod dual role for right side mods.
Priyadi Iman Nurcahyo [Thu, 9 Feb 2017 23:06:59 +0000 (06:06 +0700)]
Implement tap mod dual role for right side mods.

7 years agoAdd dvorak & norman layout. Add sys layer.
Priyadi Iman Nurcahyo [Thu, 9 Feb 2017 23:01:59 +0000 (06:01 +0700)]
Add dvorak & norman layout. Add sys layer.

7 years agoRemove audio stuff
Priyadi Iman Nurcahyo [Thu, 9 Feb 2017 19:08:55 +0000 (02:08 +0700)]
Remove audio stuff

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 agoAdd USB-BLE manual output switching and indicator
Priyadi Iman Nurcahyo [Wed, 8 Feb 2017 18:40:22 +0000 (01:40 +0700)]
Add USB-BLE manual output switching and indicator

7 years agoMerge branch 'master' into promethium
Priyadi Iman Nurcahyo [Wed, 8 Feb 2017 18:01:24 +0000 (01:01 +0700)]
Merge branch 'master' into promethium

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