]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
7 years agoMerge branch 'promethium' of github.com:priyadi/qmk_firmware into promethium
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 16:48:52 +0000 (23:48 +0700)]
Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethium

7 years agoremove ifdef on chip type
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:47:03 +0000 (13:47 +0700)]
remove ifdef on chip type

7 years agoprotocols.mk is already included in latest QMK
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:46:05 +0000 (13:46 +0700)]
protocols.mk is already included in latest QMK

7 years agochange init delay to 2000ms
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:44:50 +0000 (13:44 +0700)]
change init delay to 2000ms

7 years agoMy Promethium keyboard firmware
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:11:40 +0000 (13:11 +0700)]
My Promethium keyboard firmware

7 years agoMerge pull request #905 from priyadi/ps2_documentation
Jack Humbert [Sat, 26 Nov 2016 15:46:41 +0000 (10:46 -0500)]
Merge pull request #905 from priyadi/ps2_documentation

A few addition to PS2 documentation.

7 years agoMerge pull request #904 from priyadi/ps2_remove_hardcoded_pins
Jack Humbert [Sat, 26 Nov 2016 15:46:29 +0000 (10:46 -0500)]
Merge pull request #904 from priyadi/ps2_remove_hardcoded_pins

PS2 pins configuration belongs to each keyboards config.h

7 years agoremove define checks. didn't work because of include ordering.
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 08:57:48 +0000 (15:57 +0700)]
remove define checks. didn't work because of include ordering.

7 years agoadd macro error when a required define is missing
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 08:26:02 +0000 (15:26 +0700)]
add macro error when a required define is missing

7 years agoA few addition to PS2 documentation.
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 07:23:55 +0000 (14:23 +0700)]
A few addition to PS2 documentation.

7 years agoFix unterminated ifndef
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 07:02:38 +0000 (14:02 +0700)]
Fix unterminated ifndef

7 years agoPS2 pins configuration belongs to each keyboards config.h
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:55:41 +0000 (13:55 +0700)]
PS2 pins configuration belongs to each keyboards config.h

Each keyboard might have different pin configuration. And keeping this
here will trigger redefinition warning on keyboards that have PS2
defines.

7 years agoremove ifdef on chip type
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:47:03 +0000 (13:47 +0700)]
remove ifdef on chip type

7 years agoprotocols.mk is already included in latest QMK
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:46:05 +0000 (13:46 +0700)]
protocols.mk is already included in latest QMK

7 years agochange init delay to 2000ms
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:44:50 +0000 (13:44 +0700)]
change init delay to 2000ms

7 years agoMerge pull request #903 from priyadi/ps2_init_delay
Jack Humbert [Sat, 26 Nov 2016 06:34:49 +0000 (01:34 -0500)]
Merge pull request #903 from priyadi/ps2_init_delay

Make PS2 init delay configurable.

7 years agoMerge branch 'master' into promethium
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:31:17 +0000 (13:31 +0700)]
Merge branch 'master' into promethium

7 years agoMake PS2 init delay configurable. Some devices are not fully powered up
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:24:53 +0000 (13:24 +0700)]
Make PS2 init delay configurable. Some devices are not fully powered up
after 1s.

7 years agoMy Promethium keyboard firmware
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:11:40 +0000 (13:11 +0700)]
My Promethium keyboard firmware

7 years agoMerge pull request #902 from OferPlesser/feature/ps2-mouse-support
Jack Humbert [Fri, 25 Nov 2016 16:22:44 +0000 (11:22 -0500)]
Merge pull request #902 from OferPlesser/feature/ps2-mouse-support

PS/2 mouse support

7 years agoAdded documentation for PS/2 mouse in readme
ofples [Fri, 25 Nov 2016 10:10:44 +0000 (12:10 +0200)]
Added documentation for PS/2 mouse in readme

7 years agoRemoved comment
ofples [Fri, 25 Nov 2016 07:20:41 +0000 (09:20 +0200)]
Removed comment

7 years agoAdded missing endif for ifdef __AVR_ATmega32U4__ and removed the unnecessary one...
ofples [Fri, 25 Nov 2016 07:17:40 +0000 (09:17 +0200)]
Added missing endif for ifdef __AVR_ATmega32U4__ and removed the unnecessary one at the end of the file

7 years agoAdded protocol.mk to build
ofples [Fri, 25 Nov 2016 07:15:12 +0000 (09:15 +0200)]
Added protocol.mk to build

7 years agoMerge pull request #899 from Wilba6582/suspend_fix
Jack Humbert [Fri, 25 Nov 2016 03:20:08 +0000 (22:20 -0500)]
Merge pull request #899 from Wilba6582/suspend_fix

Fixed NO_SUSPEND_POWER_DOWN handling

7 years agoFixed NO_SUSPEND_POWER_DOWN handling
Wilba6582 [Wed, 23 Nov 2016 08:45:50 +0000 (19:45 +1100)]
Fixed NO_SUSPEND_POWER_DOWN handling

7 years agoFixed NO_SUSPEND_POWER_DOWN handling
Wilba6582 [Wed, 23 Nov 2016 05:22:57 +0000 (16:22 +1100)]
Fixed NO_SUSPEND_POWER_DOWN handling

7 years agoMerge pull request #898 from PureSpider/backlight-fix
Jack Humbert [Tue, 22 Nov 2016 23:41:37 +0000 (18:41 -0500)]
Merge pull request #898 from PureSpider/backlight-fix

Set backlight status to on if it's at maximum brightness already and the brightness increase keybind is used

7 years agoMerge pull request #896 from h-youhei/jp106
Jack Humbert [Tue, 22 Nov 2016 23:39:54 +0000 (18:39 -0500)]
Merge pull request #896 from h-youhei/jp106

Add japanese keymap

7 years agoSet backlight status to on if it's at maximum brightness already and the brightness...
PureSpider [Tue, 22 Nov 2016 21:12:57 +0000 (22:12 +0100)]
Set backlight status to on if it's at maximum brightness already and the brightness increase keybind is used

Before it was turned on but the status wasn't set to on, so you had to
push the backlight toggle bind twice to turn it off again

7 years agoAdd japanese keymap
h-youhei [Tue, 22 Nov 2016 11:40:12 +0000 (20:40 +0900)]
Add japanese keymap

7 years agoMerge pull request #894 from dchagniot/ergodoxDvorakEmacs
Jack Humbert [Tue, 22 Nov 2016 01:00:40 +0000 (20:00 -0500)]
Merge pull request #894 from dchagniot/ergodoxDvorakEmacs

Ergodox dvorak emacs

7 years agoMerge pull request #893 from Sihui/sh-hhkb-jp
Jack Humbert [Tue, 22 Nov 2016 01:00:13 +0000 (20:00 -0500)]
Merge pull request #893 from Sihui/sh-hhkb-jp

[HHKB JP with Dvorak]

7 years agoMerge pull request #892 from fredizzimo/disable_ergodox_lcd
Jack Humbert [Tue, 22 Nov 2016 00:59:39 +0000 (19:59 -0500)]
Merge pull request #892 from fredizzimo/disable_ergodox_lcd

Always initialize the Infinity Ergodox backlight

7 years agoMerge pull request #891 from g-sam/galson-keymap
Jack Humbert [Tue, 22 Nov 2016 00:59:17 +0000 (19:59 -0500)]
Merge pull request #891 from g-sam/galson-keymap

adds galson keymap

7 years agoMerge pull request #890 from algernon/f/space-cadet/timeout
Jack Humbert [Tue, 22 Nov 2016 00:58:55 +0000 (19:58 -0500)]
Merge pull request #890 from algernon/f/space-cadet/timeout

Add a timeout to space-cadet shift.

7 years agoMerge pull request #888 from climbalima/master
Jack Humbert [Tue, 22 Nov 2016 00:58:24 +0000 (19:58 -0500)]
Merge pull request #888 from climbalima/master

Added pro micro to maxipad

7 years agoMerge pull request #887 from profet23/atreus62
Jack Humbert [Tue, 22 Nov 2016 00:58:00 +0000 (19:58 -0500)]
Merge pull request #887 from profet23/atreus62

atreus62 Keyboard Support

7 years agoadd del to new cmd
Sihui Huang [Sun, 20 Nov 2016 22:45:51 +0000 (14:45 -0800)]
add del to new cmd

7 years agoadd space to NewCmd layer
Sihui Huang [Sun, 20 Nov 2016 21:32:25 +0000 (13:32 -0800)]
add space to NewCmd layer

7 years agoadd space to NewCmd layer
Sihui Huang [Sun, 20 Nov 2016 21:31:41 +0000 (13:31 -0800)]
add space to NewCmd layer

7 years agotypo fix
Didier Chagniot [Sun, 20 Nov 2016 19:51:05 +0000 (20:51 +0100)]
typo fix

7 years agoUpdate README.md
Sihui Huang [Sun, 20 Nov 2016 19:18:08 +0000 (11:18 -0800)]
Update README.md

7 years agoUpdate README.md
Sihui Huang [Sun, 20 Nov 2016 19:13:57 +0000 (11:13 -0800)]
Update README.md

7 years agoUpdate README.md
Sihui Huang [Sun, 20 Nov 2016 19:12:48 +0000 (11:12 -0800)]
Update README.md

7 years agoadd sh-hhkb-jp layers
Sihui Huang [Sun, 20 Nov 2016 19:10:26 +0000 (11:10 -0800)]
add sh-hhkb-jp layers

7 years agoAlways initialze the Infinity Ergodox backlight
Fred Sundvik [Sun, 20 Nov 2016 17:28:10 +0000 (19:28 +0200)]
Always initialze the Infinity Ergodox backlight

Otherwise it will stay lit. The set_led functionality is also disabled
since it doesn't work properly for slaves.

7 years agoMerge pull request #878 from sethbc/add_sethbc_gh60_keymap
Jack Humbert [Sat, 19 Nov 2016 18:05:30 +0000 (13:05 -0500)]
Merge pull request #878 from sethbc/add_sethbc_gh60_keymap

add sethbc keymap for gh60 and update macro expansion

7 years agoremove KC expansion from GH60
Seth Chandler [Sat, 19 Nov 2016 17:19:21 +0000 (12:19 -0500)]
remove KC expansion from GH60

7 years agoFix the Space Cadet timeout code
Gergely Nagy [Sat, 19 Nov 2016 17:19:18 +0000 (18:19 +0100)]
Fix the Space Cadet timeout code

Define a default TAPPING_TERM in quantum.c, for keyboards that do not
have it set. Fixes the CI failure.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
7 years agomove KC expansion to separate macros
Seth Chandler [Sat, 19 Nov 2016 16:37:12 +0000 (11:37 -0500)]
move KC expansion to separate macros

7 years agomerge upstream/master
Seth Chandler [Sat, 19 Nov 2016 16:20:41 +0000 (11:20 -0500)]
merge upstream/master

7 years agoadds galson keymap
samgalson@gmail.com [Sat, 19 Nov 2016 14:21:12 +0000 (14:21 +0000)]
adds galson keymap

7 years agoAdd a timeout to space-cadet shift.
Gergely Nagy [Sat, 19 Nov 2016 10:32:09 +0000 (11:32 +0100)]
Add a timeout to space-cadet shift.

When one holds a Space Cadet shift, to have it act as a shift, so that
mouse behaviour changes, when released without any other key pressed, it
still registers a paren. To remedy this, add a hold timeout: if the key
is held longer than TAPPING_TERM, it will not register the parens.

Fixes #884, with the side-effect of not being able to have parens
trigger the OS-side repeat anymore.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
7 years agochanged readme
climbalima [Sat, 19 Nov 2016 05:49:20 +0000 (00:49 -0500)]
changed readme

7 years agoadded the pinout for pro micro into maxipad
climbalima [Sat, 19 Nov 2016 05:44:52 +0000 (00:44 -0500)]
added the pinout for pro micro into maxipad

7 years agodon't always detect a matrix change (fixes debounce)
Jack Humbert [Sat, 19 Nov 2016 04:20:07 +0000 (23:20 -0500)]
don't always detect a matrix change (fixes debounce)

7 years agoAdding readme placeholder
Benjamin Grabkowitz [Thu, 17 Nov 2016 04:59:42 +0000 (23:59 -0500)]
Adding readme placeholder

7 years agoAdding Support for atreus62 keyboard. https://github.com/profet23/atreus62
Benjamin Grabkowitz [Thu, 17 Nov 2016 04:52:36 +0000 (23:52 -0500)]
Adding Support for atreus62 keyboard. https://github.com/profet23/atreus62

7 years agoMerge pull request #883 from climbalima/master
Jack Humbert [Thu, 17 Nov 2016 02:17:51 +0000 (21:17 -0500)]
Merge pull request #883 from climbalima/master

added rev2 lets split after merging with qmk

7 years agofixed readme conflicts
climbalima [Thu, 17 Nov 2016 01:44:49 +0000 (20:44 -0500)]
fixed readme conflicts

7 years agoshould have fixed conflixed
climbalima [Thu, 17 Nov 2016 00:49:38 +0000 (19:49 -0500)]
should have fixed conflixed

7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
climbalima [Thu, 17 Nov 2016 00:28:30 +0000 (19:28 -0500)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agoMerge https://github.com/climbalima/qmk_firmware
climbalima [Thu, 17 Nov 2016 00:26:38 +0000 (19:26 -0500)]
Merge https://github.com/climbalima/qmk_firmware

7 years agoUpdated my repo to current qmk
climbalima [Thu, 17 Nov 2016 00:18:54 +0000 (19:18 -0500)]
Updated my repo to current qmk

7 years agoMerge pull request #882 from seebs/master
Jack Humbert [Wed, 16 Nov 2016 22:15:58 +0000 (17:15 -0500)]
Merge pull request #882 from seebs/master

dvorak/plover keyboard layout

7 years agodvorak/plover keyboard layout
Seebs [Wed, 16 Nov 2016 21:44:26 +0000 (15:44 -0600)]
dvorak/plover keyboard layout

Plover's steno support likes quasi-qwerty, and gaming likes qwerty,
and I like dvorak, so... what if I could have it all?

Signed-off-by: seebs <seebs@seebs.net>
7 years agoMerge pull request #880 from psyill/master
Jack Humbert [Wed, 16 Nov 2016 19:54:18 +0000 (14:54 -0500)]
Merge pull request #880 from psyill/master

Added keymap "videck", an ErgoDox keymap for Vi(m) users.

7 years agoMerge pull request #879 from sethbc/update_sethbc_ergodox_keymap
Jack Humbert [Wed, 16 Nov 2016 19:53:52 +0000 (14:53 -0500)]
Merge pull request #879 from sethbc/update_sethbc_ergodox_keymap

update sethbc ergodox keymap

7 years agoMerge pull request #877 from sethbc/update_sethbc_satan_keymap
Jack Humbert [Wed, 16 Nov 2016 19:51:18 +0000 (14:51 -0500)]
Merge pull request #877 from sethbc/update_sethbc_satan_keymap

update sethbc keymap

7 years agoMerge pull request #876 from Dbroqua/master
Jack Humbert [Wed, 16 Nov 2016 19:49:55 +0000 (14:49 -0500)]
Merge pull request #876 from Dbroqua/master

Updated kc60/dbroqua layout and added satan/dbroqua_hhkb

7 years agoMerge pull request #866 from fredizzimo/infinity60_clockfixes
Jack Humbert [Wed, 16 Nov 2016 19:42:53 +0000 (14:42 -0500)]
Merge pull request #866 from fredizzimo/infinity60_clockfixes

Increase the infinity60 system tick frequency

7 years agoMerge pull request #860 from IBNobody/master
Jack Humbert [Wed, 16 Nov 2016 19:41:10 +0000 (14:41 -0500)]
Merge pull request #860 from IBNobody/master

Improved Quantum Matrix

7 years agofixed conflict
climbalima [Tue, 15 Nov 2016 04:08:10 +0000 (23:08 -0500)]
fixed conflict

7 years agofixed extra paste
climbalima [Tue, 15 Nov 2016 04:05:37 +0000 (23:05 -0500)]
fixed extra paste

7 years agoAdded keymap "videck", an ErgoDox keymap for Vi(m) users.
Hans Ellegård [Sat, 29 Oct 2016 18:31:12 +0000 (20:31 +0200)]
Added keymap "videck", an ErgoDox keymap for Vi(m) users.

7 years agooops, fixed inverted if statement
Seth Chandler [Sun, 13 Nov 2016 06:04:10 +0000 (01:04 -0500)]
oops, fixed inverted if statement

7 years agoupdate sethbc ergodox keymap
Seth Chandler [Sun, 13 Nov 2016 05:56:46 +0000 (00:56 -0500)]
update sethbc ergodox keymap

7 years agoadd sethbc keymap for gh60 and update macro expansion in connection with same
Seth Chandler [Sun, 13 Nov 2016 05:42:07 +0000 (00:42 -0500)]
add sethbc keymap for gh60 and update macro expansion in connection with same

7 years agoupdate sethbc keymap
Seth Chandler [Sun, 13 Nov 2016 04:56:57 +0000 (23:56 -0500)]
update sethbc keymap

7 years agoMerge pull request #12 from jackhumbert/master
Damien [Sat, 12 Nov 2016 18:33:07 +0000 (19:33 +0100)]
Merge pull request #12 from jackhumbert/master

Merged from qmk

7 years agoMerge branch 'master' of https://github.com/Dbroqua/qmk_firmware
dbroqua [Sat, 12 Nov 2016 18:27:03 +0000 (19:27 +0100)]
Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware

7 years ago- Added dbroqua_hhkb layout for Satan PCB
dbroqua [Sat, 12 Nov 2016 18:23:38 +0000 (19:23 +0100)]
- Added dbroqua_hhkb layout for Satan PCB

7 years agoMerge branch 'master' of https://github.com/climbalima/qmk_firmware
climbalima [Fri, 11 Nov 2016 01:06:54 +0000 (20:06 -0500)]
Merge branch 'master' of https://github.com/climbalima/qmk_firmware

second try

7 years agoAdded both revisions into one folder
climbalima [Fri, 11 Nov 2016 01:03:24 +0000 (20:03 -0500)]
Added both revisions into one folder

7 years agoMerge pull request #868 from potz/master
Jack Humbert [Thu, 10 Nov 2016 23:45:09 +0000 (18:45 -0500)]
Merge pull request #868 from potz/master

Add brazilian ABNT2 keymap

7 years agoreturned to o
climbalima [Thu, 10 Nov 2016 23:43:31 +0000 (18:43 -0500)]
returned to o

7 years ago Changes to be committed:
climbalima [Thu, 10 Nov 2016 23:19:13 +0000 (18:19 -0500)]
  Changes to be committed:
new file:   keyboards/lets_splitv2/Makefile
new file:   keyboards/lets_splitv2/config.h
new file:   keyboards/lets_splitv2/i2c.c
new file:   keyboards/lets_splitv2/i2c.h
new file:   keyboards/lets_splitv2/imgs/split-keyboard-i2c-schematic.png
new file:   keyboards/lets_splitv2/imgs/split-keyboard-serial-schematic.png
new file:   keyboards/lets_splitv2/keymaps/default/keymap.c
new file:   keyboards/lets_splitv2/lets_split.c
new file:   keyboards/lets_splitv2/lets_split.h
new file:   keyboards/lets_splitv2/matrix.c
new file:   keyboards/lets_splitv2/pro_micro.h
new file:   keyboards/lets_splitv2/readme.md
new file:   keyboards/lets_splitv2/serial.c
new file:   keyboards/lets_splitv2/serial.h
new file:   keyboards/lets_splitv2/split_util.c
new file:   keyboards/lets_splitv2/split_util.h
new file:   keyboards/maxipad/Makefile
new file:   keyboards/maxipad/config.h
new file:   keyboards/maxipad/keymaps/default/Makefile
new file:   keyboards/maxipad/keymaps/default/config.h
new file:   keyboards/maxipad/keymaps/default/keymap.c
new file:   keyboards/maxipad/keymaps/default/readme.md
new file:   keyboards/maxipad/maxipad.c
new file:   keyboards/maxipad/maxipad.h
new file:   keyboards/maxipad/readme.md

7 years agoMerge pull request #870 from NoahAndrews/patch-1
Erez Zukerman [Thu, 10 Nov 2016 14:43:39 +0000 (09:43 -0500)]
Merge pull request #870 from NoahAndrews/patch-1

Add proper shortcode for KC_DELETE to keycode.txt

7 years agoMerge remote-tracking branch 'refs/remotes/jackhumbert/master'
IBNobody [Wed, 9 Nov 2016 03:11:24 +0000 (21:11 -0600)]
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'

7 years agoAdd proper shortcode for KC_DELETE to keycode.txt
Noah Andrews [Wed, 9 Nov 2016 03:05:24 +0000 (22:05 -0500)]
Add proper shortcode for KC_DELETE to keycode.txt

7 years agoAdd brazilian ABNT2 keymap
Potiguar Faga [Tue, 8 Nov 2016 15:32:04 +0000 (13:32 -0200)]
Add brazilian ABNT2 keymap

7 years agoMerge pull request #867 from fredizzimo/variable_trace
Jack Humbert [Mon, 7 Nov 2016 15:55:05 +0000 (10:55 -0500)]
Merge pull request #867 from fredizzimo/variable_trace

Variable trace

7 years agoMerge pull request #852 from J3RN/remove-z-slash-controls
Jack Humbert [Mon, 7 Nov 2016 15:47:32 +0000 (10:47 -0500)]
Merge pull request #852 from J3RN/remove-z-slash-controls

Removed the control action when holding z or /

7 years agoAdd documentation for the variable tracing
Fred Sundvik [Sun, 6 Nov 2016 20:44:43 +0000 (22:44 +0200)]
Add documentation for the variable tracing

7 years agoAdd possibility to control variable trace from make
Fred Sundvik [Sun, 6 Nov 2016 20:11:24 +0000 (22:11 +0200)]
Add possibility to control variable trace from make

7 years agoAdd variable trace
Fred Sundvik [Sun, 6 Nov 2016 19:57:26 +0000 (21:57 +0200)]
Add variable trace

For debugging changes to variables, either normally or as a result
of a memory corruption.

7 years agoRemoved the control action when holding z or /
Jonathan Arnett [Sun, 6 Nov 2016 18:48:20 +0000 (13:48 -0500)]
Removed the control action when holding z or /

7 years agoIncrease the infinity60 system tick frequency
Fred Sundvik [Sat, 5 Nov 2016 20:45:21 +0000 (22:45 +0200)]
Increase the infinity60 system tick frequency

7 years agoMerge pull request #11 from jackhumbert/master
Damien [Thu, 3 Nov 2016 20:50:31 +0000 (21:50 +0100)]
Merge pull request #11 from jackhumbert/master

Merged from jackhumbert