1
0
Fork 0
Commit graph

709 commits

Author SHA1 Message Date
IBNobody
b30e6c1c9e Created I2C and Serial keymaps for unit testing
Having a dedicated I2C keymap and a dedicated serial keymap will allow
the testing suite to check both conditions.
2016-09-20 21:46:33 -05:00
IBNobody
6631abc1cb Made Serial and I2C not include the Other
This saves 192 bytes
2016-09-20 21:38:59 -05:00
Stephen Christie
86e85438d3 Fixed Qwerty Fn layer to match documented design 2016-09-20 15:45:50 -04:00
Stephen Christie
57a6828a7a Merge branch 'master' of http://github.com/jackhumbert/qmk_firmware 2016-09-19 18:05:58 -04:00
cbbrowne
2c3fcc6c08 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-09-19 11:13:53 -04:00
dbroqua
9a2e24fa98 - Removed HHKB like layout 2016-09-19 13:36:36 +02:00
dbroqua
21b6e4c1f3 Merge remote-tracking branch 'origin/master' 2016-09-19 13:26:18 +02:00
dbroqua
94af0194dd - Updated dbroqua layout for kc60 2016-09-19 13:22:34 +02:00
Jack Humbert
c678676e41 Merge pull request #755 from IBNobody/master
Fix USER PRINT/NO PRINT warning w/ Bootmagic
2016-09-19 01:21:25 -04:00
Jack Humbert
6282fc8dc1 Merge pull request #751 from erlandsona/master
My Atreus Layout
2016-09-19 01:20:04 -04:00
Gergely Nagy
3e128552d9 Update the ergodox/algernon keymap to v1.7
Overall changes
===============

* The number row has been completely rearranged on both the **Base** and
  the **ADORE** layers.
* The number/function key behavior was changed: function keys are now on
  the **Media**.
* The `:`/`;` and `-`/`_` keys were put back to their thumb position on
  the bottom row, on both the **Base** and **ADORE** layers.
* The bottom large keys on the inner side of each half now function as
  [tmux](http://tmux.github.io/) keys: the left to send the prefix, the
  right to send the `display-panes` key. The left also doubles as a GNU
  screen prefix key, and sends `C-a` when double tapped.
* A number of functions, such as the **AppSel** layer, now require the
  `hid-commands` tool to be running, with the output of `hid_listen`
  being piped to it.

ADORE
=====

* `Y` and `X` have been swapped again.

Media/Navigation layer
======================

* The function keys are now on this layer.
* Mouse keys have been removed.
* Media start/stop/prev/next have been removed.
* `Print screen` has been removed.
* There is only one screen lock key now.

Heatmap
=======

* Fixed a few issues in the finger-stats calculation.
* The tool now also timestamps and saves all input lines to a logfile,
  which it loads on start, allowing one to continue the collection after
  upgrading the tool.
* The heatmap tool will now colorize the stats by default.
* The periodic stats are now printed in a more compact format.

Tools
=====

* Added a new tool, `tools/layer-notify` that listens to layer change
  events on the HID console, and pops up a notification on layer
  changes.
* Another new tool, `tools/text-to-log.py` has been added that converts
  arbitrary text to a keylogger output, which can be fed to the heatmap
  generator.
* A number of features have been moved to the `tools/hid-commands`
  utility. These generally are OS dependent, and are easier to implement
  on the software side.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-09-18 11:48:47 +02:00
dbroqua
602b058b9e - Added capslock led for KC60 keyboard (based on gitbug.com/jpec/kc60 works) 2016-09-17 19:40:56 +02:00
cbbrowne
cc7604d116 Add breathing, as initial implementation with the RAISE/LOWER keys. And throw in extra macros to shorten keymaps 2016-09-16 17:15:33 -04:00
Austin Erlandson
ac6125cbea Revert because the IGNORE_MOD_TAP_INTERRUPT flag didn't feel right. 2016-09-15 11:19:54 -05:00
Austin Erlandson
e50f15e360 Add IGNORE_MOD_TAP_INTERRUPT to fix overloaded mod keys sending mod on diads... 2016-09-15 10:58:28 -05:00
cbbrowne
24e8d01dc9 Move ALT... 2016-09-15 11:28:12 -04:00
cbbrowne
0db06def9b Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-09-15 11:27:37 -04:00
IBNobody
edb5e72605 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-09-15 07:52:10 -05:00
Erez Zukerman
a258358b6c Merge pull request #758 from absenth/development
Absenth Ergodox Keymap Improvements
2016-09-14 22:51:41 -04:00
Lars R. Noldan
8a01bbc422 Adding Space Cadet, And Correcting Ascii Keymap 2016-09-14 11:54:13 -05:00
Austin Erlandson
c8e7cca6ed Copy config overrides to my keymap directory... 2016-09-14 09:39:57 -05:00
IBNobody
9c574b493c Changed Docs, Moved RetroRefit to Handwired 2016-09-13 22:05:10 -05:00
cbbrowne
5d643bb7ee Got Right SHIFT + Right CTRL 2016-09-13 16:29:01 -04:00
cbbrowne
5be2795ca1 C macros for my favorite complex keystrokes 2016-09-13 16:17:51 -04:00
cbbrowne
fdeaf1d9f8 Give layers longer names 2016-09-13 15:49:46 -04:00
cbbrowne
344929e067 Give layers longer names 2016-09-13 15:48:50 -04:00
Austin Erlandson
3668b29520 Shorten TAPPING_TERM for better responsiveness of overloaded keys... 2016-09-13 11:20:59 -05:00
Austin Erlandson
6098704145 Small update 2016-09-13 10:35:59 -05:00
IBNobody
cb1ac2a3ed Fixed NO_PRINT / USER_PRINT conflict warning. 2016-09-12 20:20:31 -05:00
IBNobody
e9a093451e Clean up atomic keymap (#9)
* Added keyboard help macros

* Fixing Atomic PVC keymap / adding print help
2016-09-12 19:54:52 -05:00
Austin Erlandson
cf17eb0f43 Get rid of sleep button... 2016-09-12 18:36:41 -05:00
Austin Erlandson
0c3aede09e Latest making use of overloaded modifiers... 2016-09-12 18:23:24 -05:00
Austin Erlandson
af4c25c475 My Atreus Layout 2016-09-12 15:20:51 -05:00
cbbrowne
103ba24df2 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-09-12 13:24:31 -04:00
cbbrowne
6a7ef59629 Ongoing experiment; have a special layer for RESET 2016-09-12 13:24:22 -04:00
Erez Zukerman
23faf9ec81 Merge pull request #734 from adiabatic/master
Ergodox EZ: Zweihander keyboard layout updates
2016-09-11 20:28:09 -04:00
Erez Zukerman
862d93e0cb Merge pull request #740 from absenth/development
Absenth's Layout- QWERTY with additional Media Layer Functions.
2016-09-11 20:27:12 -04:00
Erez Zukerman
fe4b379287 Merge pull request #746 from DidierLoiseau/bépo
Bépo with firmware remapping for software CSA layout
2016-09-11 20:26:23 -04:00
Jack Humbert
ffa12f9235 Merge pull request #743 from shelaf/patch-2
Fix compiler warnings for HHKB
2016-09-11 19:24:59 -04:00
Didier Loiseau
21747cc310 Added readme.md for bepo_csa 2016-09-11 22:30:05 +02:00
Didier Loiseau
1aeb59335f Fixed compilation issues after the merge 2016-09-11 02:19:55 +02:00
shela
2a8536f00f Variables in Makefile are ignored in rules.mk 2016-09-11 02:46:06 +09:00
Daniel Bordak
475d0b23f6 Add PCBDOWN 2016-09-10 13:35:53 -04:00
Daniel Bordak
054108d1d1 Update to new default keymap 2016-09-10 13:35:53 -04:00
shela
70b4fc808d fix variable value of rules.mk 2016-09-11 02:29:32 +09:00
Daniel Bordak
a9e56186e0 Fix typo 2016-09-10 12:16:38 -04:00
Jack Humbert
5010df3d8b Merge pull request #715 from profet23/master
Support for Ergodoxes with 80 keys.
2016-09-09 10:50:39 -04:00
Lars
52121cee7a Updated Image Header 2016-09-08 23:32:11 -05:00
Lars
9c2015ea7f first commit of Absenth's Ergodox Firmware 2016-09-08 23:20:17 -05:00
profet23
b83f76e1b0 Changing keymap name to "profet_80" 2016-09-08 23:34:55 -04:00
Jack Humbert
4caddd1c5b Merge pull request #736 from tong92/master
add tong92 keymap
2016-09-08 17:50:11 -04:00
Jack Humbert
02ff748132 Merge pull request #735 from romanzolotarev/patch-1
Fix typo
2016-09-08 17:49:51 -04:00
Jack Humbert
94ef7f99b8 Merge pull request #733 from cbbrowne/master
Various recent enhancements to my keyboard map
2016-09-08 17:49:35 -04:00
Jack Humbert
4a54ece468 Merge pull request #730 from IBNobody/master
Change NKRO Report Size = 32, User Print
2016-09-08 17:48:54 -04:00
tong92
98e43f995d add tong92 keymap 2016-09-08 23:37:13 +09:00
Roman Zolotarev
740b4bbe46 Fix typo 2016-09-08 21:12:34 +08:00
IBNobody
fe2aed0d1c Added User Print - A "light" console out option (#8)
User print disables the normal print messages in the body of QMK/TMK
code and is meant as a lightweight alternative to NOPRINT. Use it when
you only want to do a spot of debugging but lack flash resources for
allowing all of the codebase to print (and store their wasteful
strings).
2016-09-07 23:50:58 -05:00
Nathan Sharfi
273a6cc688 - Make thumb-accessible ⌥ and ⌃ into right-⌥ and right-⌃
- remove media-space and media-shift-space; put a play/pause key at media-m instead
- add print screen, scroll lock, and pause/break to the media layer

And in the readme:

- don't say we don't have any Windows-specific keys
- add mnemonics for thumb-alt and thumb-ctrl positioning
2016-09-07 20:28:31 -07:00
Nathan Sharfi
e5396ca9e5 zweihander: rename to Makefile 2016-09-07 18:23:01 -07:00
cbbrowne
54214b3abc Borrowed joint Shift/Enter idea from sgoodwin mapping 2016-09-07 13:29:29 -04:00
cbbrowne
73fdd8a769 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-09-07 13:09:14 -04:00
IBNobody
558f3ec1eb Use keyboard config for nkro (#7)
* removing nkro references - wip

* changed NKRO to be defined by keymap_config
2016-09-06 23:19:01 -05:00
profet23
1406118c71 Removing separate ergodox80 project.
Created KEYMAP_80 in ez.h to support 80 key ergodoxes.
Creating default_80 keymap as ez keymap.
2016-09-06 21:59:47 -04:00
Erez Zukerman
0f111182a6 Merge pull request #732 from romanzolotarev/master
Change CTL_T(KC_ESC) to KC_LCTRL and update readme
2016-09-06 21:35:15 -04:00
Roman Zolotarev
da16733e7a
Change CTL_T(KC_ESC) to KC_LCTRL and update readme 2016-09-07 08:03:19 +08:00
joar
a3e7042084 norwegian programmer-friendly layout 2016-09-06 16:00:08 +02:00
Erez Zukerman
8b0769fe5a Merge pull request #728 from fitzsim/yoruian
Add new ErgoDox EZ keymap, YORUIAN
2016-09-06 07:07:25 -04:00
Thomas Fitzsimmons
ce53c0643d Fix ergodox_yoruian XKB naming 2016-09-06 00:09:14 -04:00
Thomas Fitzsimmons
e9ce4960c1 Add new ErgoDox EZ keymap, YORUIAN 2016-09-05 20:53:35 -04:00
Erez Zukerman
5bb29136b1 Merge pull request #686 from coderkun/coderkun_neo2
Merge Ergodox keymap “coderkun_neo2”
2016-09-05 20:33:09 -04:00
Erez Zukerman
45d68486a2 Merge pull request #678 from algernon/ergodox-ez/algernon
ergodox: Update algernon's keymap to v1.6
2016-09-05 20:32:46 -04:00
Jack Humbert
0468093b12 Merge pull request #724 from sgoodwin/master
Add my keymap.
2016-09-05 13:21:24 -04:00
Jack Humbert
4769b85130 Merge pull request #719 from IBNobody/master
Updated docs to show more info on backlight breathing.
2016-09-05 13:20:48 -04:00
Jack Humbert
fcc2d43943 Merge pull request #716 from MajorKoos/master
Add support for JD40 MKII PCB
2016-09-05 13:19:58 -04:00
Samuel Ryan Goodwin
bf5941b335 Add my keymap. 2016-09-05 15:53:52 +02:00
IBNobody
f6cb08a5bd Added diagonal mice macros, breathing ala Atomic 2016-09-04 01:07:36 -05:00
Major Koos
11224a00fe Add rules.mk file 2016-09-02 16:42:40 -07:00
Major Koos
295ef0d964 Add support for JD40 MKII PCB
RGB Included.
2016-09-02 16:14:40 -07:00
profet23
36e16b46e3 Removing/editing non applicable readme 2016-09-02 17:18:39 -04:00
profet23
a485e13afe Adding 80 Key Ergodox Support 2016-09-02 16:24:05 -04:00
Callum Oakley
e4167c8c53 fixed incorrect key combination for locking screen on macOS 2016-09-02 09:03:39 +01:00
Callum Oakley
4c67ccc81e changed some of the wording in the readme 2016-09-01 18:30:49 +01:00
Callum Oakley
8b2a235c8d changed order of modifiers after experimentation, updated readme 2016-09-01 18:14:39 +01:00
Callum Oakley
9c3193f225 Merge remote-tracking branch 'upstream/master' 2016-09-01 17:55:00 +01:00
Jason Janse van Rensburg
fc2ca62a3b Merge branch 'master'
Conflicts:
	keyboards/planck/keymaps/bone2planck/keymap.c
2016-08-30 14:54:00 +02:00
cbbrowne
fba509780e Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-29 12:32:03 -04:00
Jack Henahan
6d7637ae3e Update README 2016-08-29 11:43:06 -04:00
Jack Henahan
42f1ce08dc jhenahan layout 2016-08-29 11:35:07 -04:00
Jack Humbert
25502277e8 Merge pull request #696 from fredizzimo/community_boards
Update list of community keyboards
2016-08-27 18:56:42 -04:00
Fred Sundvik
3bdebd2270 Update list of community keyboards 2016-08-28 00:54:26 +03:00
Jack Humbert
326de65439 Merge pull request #689 from jeebak/tv44-jeebak
Port jeebak's Planck/JD45 keymap to TV44
2016-08-27 17:30:39 -04:00
Jack Humbert
2ac90ed704 Merge pull request #684 from tomb0y/kc60_workman_dead
Correct typo in kc60 workman-dead keymap
2016-08-27 17:30:05 -04:00
Fred Sundvik
8ab9c5c55a Rename infinity_chibios to infinity60, and add readme 2016-08-27 23:55:33 +03:00
Fred Sundvik
cff26bc484 Merge branch 'master' into fix_line_endings 2016-08-27 21:01:46 +03:00
Fred Sundvik
a5b1af4999 Normalize line endings 2016-08-27 18:40:50 +03:00
JeeBak Kim
5fe883e74b [tv44] Port jeebak's planck keymap to tv44 2016-08-26 22:18:40 -07:00
JeeBak Kim
ff0e0ee459 [tv44] Add "jeebak" keymap folder as a copy of the "default" folder 2016-08-26 14:48:03 -07:00
Fred Sundvik
d1e4f2eb08 Merge remote-tracking branch 'upstream/master' into makefile_overhaul 2016-08-26 21:57:17 +03:00
cbbrowne
a732003bfd Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-26 12:13:50 -04:00
Erez Zukerman
2c8f6557e6 Merge pull request #664 from linsomniac/infinity_readme
Adding nicer Infinity build instructions.
2016-08-26 07:32:24 -04:00
coderkun
137eb118e3 Add box-drawing Unicode characters to keymap “coderkun_neo2” 2016-08-26 13:27:56 +02:00
coderkun
c78b44fb18 Set Unicode input mode and override unicode_input_start() method to keymap “coderkun_neo2” 2016-08-26 13:27:56 +02:00
coderkun
5b58d7d145 Disable debugging for Ergodox keymap “coderkun_neo2” 2016-08-26 13:27:56 +02:00
zs
3f0e1b3a8e Correct typo in kc60 workman-dead keymap
and rename README.md to readme.md
2016-08-26 10:42:36 +02:00
Fred Sundvik
6cfdd077b5 Fix bad merge
Led should have been added to KC60, not GH60
2016-08-26 00:05:58 +03:00
Fred Sundvik
fb8365a378 Split vision_division into Makefile/rules.mk 2016-08-25 23:28:10 +03:00
Fred Sundvik
523dff3005 Merge branch 'master' into makefile_overhaul 2016-08-25 23:26:02 +03:00
Jack Humbert
4321f0af7d Merge pull request #659 from Dbroqua/master
- Updated dbroqua layout for planck keyboard
2016-08-25 15:49:50 -04:00
dbroqua
8d0aed39d1 - Added capslock led for KC60 keyboard (based on gitbug.com/jpec/kc60 works) 2016-08-25 20:39:55 +02:00
Jack Humbert
f0cb5e9e50 Merge pull request #683 from ickerwx/master
LEDs work now, fixed Kitten Paw default keymap, added my own keymap as a better example
2016-08-25 12:22:28 -04:00
Jack Humbert
8ebe9c446c Merge pull request #681 from IBNobody/vision_division_dev
Added Port A Pin Mapping / Added Vision Division (WIP)
2016-08-25 11:40:51 -04:00
Jack Humbert
6f6f745385 Merge pull request #682 from jeebak/jd45-jeebak
Port jeebak's Planck keymap to JD45
2016-08-25 11:33:14 -04:00
IBNobody
34eeea787c Fixed naming of Analog pins to differentiate them from DIO pins used by Quantum Matrix 2016-08-25 08:16:18 -05:00
René Werner
22ef0bbac5 Merge remote-tracking branch 'upstream/master' into kitten_paw 2016-08-25 12:27:29 +02:00
René Werner
1bbd3c1eea fixed defaulf keymap, added my own keymap
now the LEDs are working like they should
2016-08-25 12:25:57 +02:00
JeeBak Kim
94597a27c5 Make the "extra" key in the top row another backspace 2016-08-25 03:06:42 -07:00
dbroqua
c34399c592 - Updated kc60/readme
- Added layout examples for kc60
2016-08-25 08:29:30 +02:00
JeeBak Kim
9c0c8c307d [jd45] Port jeebak's planck keymap to jd45 2016-08-24 22:34:03 -07:00
JeeBak Kim
601feed87e [jd45] Add "jeebak" keymap folder as a copy of the "default" folder 2016-08-24 22:23:24 -07:00
IBNobody
936a26d04f Added pin support for A0-A7
Vision Division - It works!
2016-08-25 00:15:41 -05:00
Joshua T
a72d46d1ec Added replicaJunction keymap 2016-08-24 23:58:59 -05:00
cbbrowne
7c2a24b315 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-24 17:47:09 -04:00
cbbrowne
9778349c4b More notes 2016-08-24 17:47:01 -04:00
Gergely Nagy
f512179e66 ergodox: Update algernon's keymap to v1.6
Major changes include:

Base layer changes
------------------

* The parentheses & bracket keys have been merged: tapping them results
  in `[` or `{` (if it was shifted), double tapping leads to `(`.
* The `:;` and `-_` keys are now available on the base layer, on
  their **ADORE** location, too, just below `[{(`/`]})`.
* The `Apps` key has been replaced by `F12`.
* The `-`/`_` is no longer a tap-dance key.

ADORE layer changes
-------------------

* Adjustments were made to the **ADORE** layer, to separate some
  inconvenient combinations.

Miscellaneous changes
---------------------

* `LEAD u` now starts the symbolic unicode input system, instead of the
  OS-one.
* The mouse acceleration keys on the **Navigation and Media* layer have
  been turned into toggles: tap them once to turn them on, until tapped
  again. Tapping an accelerator button will turn all the others off.
* When the **ARROW** layer is on, the *red* and *blue* LEDs light up
  now.

Heatmap
-------

* The built-in keylogger has been greatly enhanced, it now outputs the
  pressed state, and the layer (Dvorak or ADORE). As such, the
  `ADORE_AUTOLOG` option has been removed, instead there is
  `AUTOLOG_ENABLE` now, which when enabled, makes the keylogger start
  when the keyboard boots. It defaults to off.
* The heatmap generator received a lot of updates.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-24 23:22:57 +02:00
dbroqua
e6dcb8de8c - Fixed layout for kc60 2016-08-24 22:22:14 +02:00
dbroqua
5979051de3 - Updated kc60.h for 2x 1u backspace (K49)
- Added dbroqua layout
2016-08-24 21:53:49 +02:00
Sean Reifschneider
0dfd1712bb Making the existing firmware link better 2016-08-24 09:30:29 -06:00
Sean Reifschneider
7debe7cd77 Changes based on @fredizzimo review, flashing Infinity details 2016-08-24 09:26:41 -06:00
dbroqua
235d47e747 - Updated readme by adding link on kle for each layer 2016-08-24 12:57:32 +02:00
Fred Sundvik
2e3834edea Merge remote-tracking branch 'upstream/master' into makefile_overhaul 2016-08-24 10:37:02 +03:00
IBNobody
a902206735 Nightly
Prep for Vision build
2016-08-23 23:05:35 -05:00
IBNobody
5d685efa49 Merge remote-tracking branch 'refs/remotes/origin/master' into vision_division_dev 2016-08-23 20:53:21 -05:00
dbroqua
d19c0d46d9 Merge remote-tracking branch 'upstream/master' 2016-08-23 20:39:01 +02:00
Jack Humbert
a920548471 Merge pull request #677 from SmackleFunky/master
Virtual Serial Port - and a Layout that uses that virtual serial port for Plover
2016-08-23 11:05:26 -04:00
dbroqua
e65252d591 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	keyboards/planck/keymaps/dbroqua/keymap.c
2016-08-23 13:39:49 +02:00
René Werner
6a61c89477 added my personal keymap
I ported my keymap from tmk to QMK.
2016-08-23 13:20:59 +02:00
René Werner
d28942f5d7 Merge branch 'kitten_paw' 2016-08-23 12:17:39 +02:00
René Werner
06c82a063b Fixed wrong keycode in default keymap
Where I used KC_MENU I should have used KC_APP instead.
2016-08-23 12:15:29 +02:00
Jason Green
7009112752 move to ergodox-ez only 2016-08-23 07:04:55 +00:00
Fred Sundvik
feebc58d32 Split kitten_paw into Makefile/rules.mk 2016-08-23 09:42:11 +03:00
Fred Sundvik
8f2af3c6bc Merge branch 'master' into makefile_overhaul 2016-08-23 09:38:05 +03:00
Jason Green
104ca8a5e1 Remove unneeded include 2016-08-23 04:49:05 +00:00
Jason Green
ec62cbe384 add missing #include 2016-08-23 04:32:40 +00:00
Jack Humbert
fb4452c2f5 Merge pull request #671 from Talljoe/one-hand
Add native one-handed support
2016-08-23 00:29:46 -04:00
Jack Humbert
3824fa0014 Merge pull request #675 from Xyverz/master
Added missing item K3A to KEYMAP() variable in tv44.h
2016-08-23 00:27:23 -04:00
Jack Humbert
9ca4c9f57f Merge pull request #676 from ickerwx/kitten_paw
Added support for the Kitten Paw controller
2016-08-23 00:26:59 -04:00
Jason Green
86656690f1 TxBolt (Steno) Serial protocol for Ergodox Ez 2016-08-23 04:17:34 +00:00
dbroqua
92fe78a5ea - Added PrintScreen key on multimedia layer 2016-08-22 21:19:03 +02:00
René Werner
a26ee57eb8 Added support for the Kitten Paw controller
This adds support for the 2016 revision of the Kitten Paw [1] replacement
controller by Bathroom Epiphanies.

[1] http://bathroomepiphanies.com/controllers/
2016-08-22 20:34:29 +02:00
cbbrowne
90abe70586 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-22 13:16:49 -04:00