]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
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 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 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

7 years agoAdding SKIP_GIT to speed up compiles.
IBNobody [Tue, 1 Nov 2016 16:52:58 +0000 (11:52 -0500)]
Adding SKIP_GIT to speed up compiles.

7 years agoMerge remote-tracking branch 'refs/remotes/jackhumbert/master'
IBNobody [Tue, 1 Nov 2016 15:56:56 +0000 (10:56 -0500)]
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'

7 years agoImplements dedicated text zoom keys
Erez Zukerman [Tue, 1 Nov 2016 14:03:58 +0000 (10:03 -0400)]
Implements dedicated text zoom keys

7 years agoMerge pull request #851 from J3RN/momentary
Erez Zukerman [Tue, 1 Nov 2016 01:41:19 +0000 (21:41 -0400)]
Merge pull request #851 from J3RN/momentary

Switched to momentary

7 years agoMerge pull request #843 from lucwastiaux/master
Erez Zukerman [Tue, 1 Nov 2016 01:40:58 +0000 (21:40 -0400)]
Merge pull request #843 from lucwastiaux/master

Adding Ergodox Dvorak Programmer layout

7 years agoMerge pull request #836 from 20lives/master
Erez Zukerman [Tue, 1 Nov 2016 01:39:40 +0000 (21:39 -0400)]
Merge pull request #836 from 20lives/master

added new layout

7 years agoMerge pull request #839 from priyadi/planck-priyadi-modification
Jack Humbert [Sun, 30 Oct 2016 16:26:20 +0000 (12:26 -0400)]
Merge pull request #839 from priyadi/planck-priyadi-modification

Update priyadi's keymap for Planck; added readme

7 years agoMerge pull request #854 from slebedev/master
Jack Humbert [Sun, 30 Oct 2016 16:25:52 +0000 (12:25 -0400)]
Merge pull request #854 from slebedev/master

Add link to article about Unicode Hex Input in readme

7 years agoMerge pull request #857 from fredizzimo/fix_makefile_too_long_bash
Jack Humbert [Sun, 30 Oct 2016 16:25:22 +0000 (12:25 -0400)]
Merge pull request #857 from fredizzimo/fix_makefile_too_long_bash

Run each sumbmake in a separate shell

7 years agoRun each sumbmake in a separate shell
Fred Sundvik [Sun, 30 Oct 2016 15:03:01 +0000 (17:03 +0200)]
Run each sumbmake in a separate shell

This will fix the situation where the commandline gets too long when
there are many keyboards and keymaps.

7 years agoadded fixed debounce code
IBNobody [Sat, 29 Oct 2016 21:12:58 +0000 (16:12 -0500)]
added fixed debounce code

7 years agoAdd link to article about Unicode Hex Input in readme
Sergey Lebedev [Sat, 29 Oct 2016 19:08:11 +0000 (22:08 +0300)]
Add link to article about Unicode Hex Input in readme

  For me it wasn't clear what is `Unicode Hex Input`, that article
  clarifies it (at least for me).

7 years agoMerge branch 'master' of https://github.com/IBNobody/qmk_firmware
IBNobody [Sat, 29 Oct 2016 16:13:15 +0000 (11:13 -0500)]
Merge branch 'master' of https://github.com/IBNobody/qmk_firmware

7 years agoMade scanning more efficient
IBNobody [Sat, 29 Oct 2016 15:39:03 +0000 (10:39 -0500)]
Made scanning more efficient

7 years agoRefactoring Matrix scanning
IBNobody [Fri, 28 Oct 2016 21:24:20 +0000 (16:24 -0500)]
Refactoring Matrix scanning

7 years agoFixing Debounce - WIP
IBNobody [Fri, 28 Oct 2016 19:21:38 +0000 (14:21 -0500)]
Fixing Debounce - WIP

7 years agoMerge remote-tracking branch 'refs/remotes/jackhumbert/master'
IBNobody [Fri, 28 Oct 2016 14:28:47 +0000 (09:28 -0500)]
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'

7 years ago- Fixed typo in gh60/dbroqua layout
dbroqua [Wed, 26 Oct 2016 20:24:26 +0000 (22:24 +0200)]
- Fixed typo in gh60/dbroqua layout

7 years agore-introduce brackets layer
lucwastiaux [Wed, 26 Oct 2016 13:00:58 +0000 (21:00 +0800)]
re-introduce brackets layer

7 years agoMerge pull request #10 from jackhumbert/master
Damien [Wed, 26 Oct 2016 05:43:58 +0000 (07:43 +0200)]
Merge pull request #10 from jackhumbert/master

Merge from jackhumbert/qmk_firmware

7 years agoMerge pull request #827 from Dbroqua/master
Jack Humbert [Wed, 26 Oct 2016 05:19:27 +0000 (01:19 -0400)]
Merge pull request #827 from Dbroqua/master

Updated dbroqua layout for HHKB keyboard and added new layout for KC60

7 years agoMerge pull request #849 from hot-leaf-juice/master
Jack Humbert [Wed, 26 Oct 2016 04:52:13 +0000 (00:52 -0400)]
Merge pull request #849 from hot-leaf-juice/master

tiny keymap change

7 years agoMerge pull request #848 from andrebeat/fix-dockerfile
Jack Humbert [Wed, 26 Oct 2016 04:51:51 +0000 (00:51 -0400)]
Merge pull request #848 from andrebeat/fix-dockerfile

Add subproject env var to dockerfile

7 years agoMerge pull request #847 from yinshanyang/master
Jack Humbert [Wed, 26 Oct 2016 04:51:39 +0000 (00:51 -0400)]
Merge pull request #847 from yinshanyang/master

added notes on using Arduino Pro Micro 3.3V with Let’s Split

7 years agoMerge pull request #844 from priyadi/unicode_wincompose_input
Jack Humbert [Wed, 26 Oct 2016 04:48:44 +0000 (00:48 -0400)]
Merge pull request #844 from priyadi/unicode_wincompose_input

Unicode WinCompose input method

7 years agoMerge pull request #842 from priyadi/unicode_map_length
Jack Humbert [Wed, 26 Oct 2016 04:48:00 +0000 (00:48 -0400)]
Merge pull request #842 from priyadi/unicode_map_length

UNICODE_MAP: remove 5 char limit; ignore leading zeroes; handle OS limitations

7 years agoMerge pull request #841 from jacwib/master
Jack Humbert [Wed, 26 Oct 2016 04:47:30 +0000 (00:47 -0400)]
Merge pull request #841 from jacwib/master

Update jacwib keymap to version 1.2

7 years agoMerge pull request #831 from kejadlen/master
Jack Humbert [Wed, 26 Oct 2016 04:46:56 +0000 (00:46 -0400)]
Merge pull request #831 from kejadlen/master

add alphadox layouts to atreus and ergodox

7 years agoMerge pull request #834 from kazufukurou/master
Jack Humbert [Wed, 26 Oct 2016 04:45:59 +0000 (00:45 -0400)]
Merge pull request #834 from kazufukurou/master

add programmer dvorak keymap

7 years ago[alphadox] remove tmk reset code
Alpha Chen [Thu, 20 Oct 2016 15:00:36 +0000 (08:00 -0700)]
[alphadox] remove tmk reset code

7 years ago[ergodox][alphadox] undefine tapping_term, ignore_mod_tap_interrupt
Alpha Chen [Wed, 19 Oct 2016 14:45:30 +0000 (07:45 -0700)]
[ergodox][alphadox] undefine tapping_term, ignore_mod_tap_interrupt

7 years agoadd alphadox layouts to atreus and ergodox
Alpha Chen [Tue, 4 Oct 2016 15:19:44 +0000 (08:19 -0700)]
add alphadox layouts to atreus and ergodox

7 years agoreplace lock key with general power key
Callum Oakley [Tue, 25 Oct 2016 10:51:32 +0000 (11:51 +0100)]
replace lock key with general power key

7 years agoswitched to standard volume keys
Callum Oakley [Tue, 25 Oct 2016 10:37:09 +0000 (11:37 +0100)]
switched to standard volume keys

7 years agoadd subproject env var to dockerfile
Andre Silva [Mon, 24 Oct 2016 19:29:34 +0000 (20:29 +0100)]
add subproject env var to dockerfile

7 years agoadded notes on using Arduino Pro Micro 3.3V with Let’s Split
Yin Shanyang [Mon, 24 Oct 2016 07:36:24 +0000 (15:36 +0800)]
added notes on using Arduino Pro Micro 3.3V with Let’s Split

7 years agoFixing Line Terminations
IBNobody [Mon, 24 Oct 2016 04:03:26 +0000 (23:03 -0500)]
Fixing Line Terminations

7 years agoFixed some large keyboard bugs
IBNobody [Mon, 24 Oct 2016 04:00:43 +0000 (23:00 -0500)]
Fixed some large keyboard bugs

Fixed some bugs relating to keyboards with more than 16 columns. Also
added the ability to mask off keyboard matrix bits.

7 years agoMerge remote-tracking branch 'refs/remotes/jackhumbert/master'
IBNobody [Mon, 24 Oct 2016 01:45:20 +0000 (20:45 -0500)]
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'

7 years agomerge upstream
Lior Haim [Sun, 23 Oct 2016 17:22:28 +0000 (20:22 +0300)]
merge upstream

7 years ago1.2 update
jacwib [Sun, 23 Oct 2016 13:57:36 +0000 (15:57 +0200)]
1.2 update

7 years agoUse WinCompose unicode input method instead of HexNumpad
Priyadi Iman Nurcahyo [Sun, 23 Oct 2016 12:35:06 +0000 (19:35 +0700)]
Use WinCompose unicode input method instead of HexNumpad

7 years agoUnicode WinCompose input method
Priyadi Iman Nurcahyo [Sun, 23 Oct 2016 12:15:33 +0000 (19:15 +0700)]
Unicode WinCompose input method

7 years agoadding readme
lucwastiaux [Sun, 23 Oct 2016 03:44:16 +0000 (11:44 +0800)]
adding readme

7 years agoUNICODE_MAP: remove 5 char limit; ignore leading zeroes; handle OS limitations
Priyadi Iman Nurcahyo [Sat, 22 Oct 2016 22:36:26 +0000 (05:36 +0700)]
UNICODE_MAP: remove 5 char limit; ignore leading zeroes; handle OS limitations