megamanmalte/qmk_firmware
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
7774 commits 1 branch 0 tags 275 MiB
Commit graph

486 commits

Author SHA1 Message Date
Johannes Larsson 6d08de5c67 readme, media keys fix 2017-05-24 21:35:31 +02:00
Johannes Larsson e4f1b238b3 revert changes to config.h 2017-05-24 21:24:13 +02:00
Johannes Larsson 690957cdbd media keys and stuff 2017-05-24 19:00:56 +02:00
Johannes Larsson 4f1007952b merge 2017-05-22 15:27:57 +02:00
Johannes Larsson 53b094934f matrix layout 2017-05-22 15:25:53 +02:00
Nikolaus Wittenstein 8ddbf7f59f Fix spelling of "persistent" 
Fixes #1201.
 2017-05-11 15:32:35 -04:00
Daniel Shields eb3f80b924 Add new features to dshields keymap. 
- one shot layers, dynamic macros and tap dance keys
- add a basic readme.md and layout image.
 2017-05-11 09:16:55 +01:00
Daniel Shields cb60fe393f Add new keymap for dshields. 2017-05-05 14:41:13 +01:00
Weiyi Lou c8ac556e63 Update vifon keymap to use DYN_REC_STOP 2017-04-30 19:48:07 +10:00
laelath 196740a0bb Expanded lae3 keymap readme 2017-04-26 13:56:01 -07:00
Justin Frank e2a5dfdba6 Switched Alt and GUI key places 2017-04-23 19:38:40 -07:00
Justin Frank 7f3224b117 Added lae3 keymap 2017-04-22 15:15:17 -07:00
Priyadi Iman Nurcahyo 93b2f23bba Promethium rev2 
* 10 more indicator LEDs
* Piezo buzzer
* Uses HC138 decoder to free up 5 pins
* Trackpoint buttons are now part of matrix
 2017-04-19 01:38:08 +07:00
Fred Sundvik a619b93e38 Fix warnings in planck/lucas keymap 
Register the unshifted version DE_LESS, rather than the shifted DE_MORE
 2017-04-13 16:00:29 +03:00
Johannes Larsson 835adb7848 colemak layout maybe 2017-04-12 23:11:51 +02:00
Dylan Khor a875299d9a Added breathing macros and removed mappings to unused layouts 2017-04-09 02:02:40 -04:00
Xyverz c034b61b1a Merge remote-tracking branch 'upstream/master' 2017-04-02 14:49:39 -07:00
nielsenz d1e66e2e07 Worked around some new Makefile issues. 2017-03-30 20:10:34 -07:00
Callum Oakley b9225a28f2 changed hotkey cluster to accomodate awkward software... again 2017-03-30 19:08:15 -07:00
Callum Oakley 200ae0c519 changed hotkey cluster to accomodate awkward software 2017-03-30 19:08:15 -07:00
Xyverz 571f39da66 Tidied up keymaps, Makefiles that actually work, Clueboard make v1.0 2017-03-29 22:32:39 -07:00
Zay950 2366ebfbbd Merge branch 'master' into to_push 2017-03-29 12:00:38 -07:00
Jack Humbert 7e37daa2ce Merge pull request #1112 from newsboytko/newsboytko/midi-keycodes 
Flesh out MIDI support
 2017-03-28 09:26:54 -04:00
Dylan Khor 0ec07ddc1c Merge branch 'master' of https://github.com/Khord/qmk_firmware 2017-03-20 13:16:19 -04:00
Dylan Khor d7f2bd2964 add pgup, pgdn, home, end 2017-03-20 13:14:48 -04:00
Dylan Khor 561da65606 Missing comma 2017-03-19 00:14:43 +00:00
Dylan Khor ca544ecfb6 Don't feel like tap dancing arrows anymore 2017-03-19 00:07:48 +00:00
Dylan Khor e03ddbe118 tap dance working for esc and arrows 2017-03-16 18:13:53 +00:00
Dylan Khor 4b1d0c5859 remove const 2017-03-16 17:36:31 +00:00
Dylan Khor c7cddfc539 test td changes 2017-03-16 13:27:26 -04:00
Dylan Khor 6ca1c49d38 test fixes for tap dane 2017-03-16 13:07:01 -04:00
Dylan Khor 0c8f71e3c7 test tap dance 2017-03-16 12:44:56 -04:00
Dylan Khor 24d1745951 add config.h for customization 2017-03-16 12:24:31 -04:00
Dylan Khor 0c0a8ee187 test 2017-03-16 03:46:26 +00:00
Dylan Khor 73a70a2c1c Add Makefile 2017-03-15 23:09:17 -04:00
Dylan Khor cf28f7bfda Add custom keycap 2017-03-15 23:07:29 -04:00
Jack Humbert b794719952 Merge pull request #1090 from qmk/backlight_softpwm 
Adds soft PWM backlight for non-timed ports
 2017-03-15 11:17:07 -04:00
Jack Humbert b4a3e5ebea Merge pull request #1145 from smt/smt/lets_split 
Add smt keymap for Let's Split (based on serial)
 2017-03-15 11:00:06 -04:00
Stephen Tudor 8d4bc714e4 Update smt keymap READMEs 2017-03-08 23:16:58 -05:00
Stephen Tudor 88e862e472 Update smt keymaps for consistency 2017-03-08 16:00:23 -05:00
Anand Babu (AB) Periasamy b20106d238 Replace enter with quote and few reorgs 2017-03-08 01:12:12 -08:00
Xyverz 0d9bceb2fe Merge remote-tracking branch 'upstream/master' 2017-03-03 19:28:35 -08:00
Jack Humbert b042428d23 Merge pull request #1126 from folkert4/master 
Various QOL changes to Espynn's keymap
 2017-03-03 10:29:54 -05:00
Callum Oakley 61459ab5ba moar hotkeys 2017-03-02 11:40:25 +00:00
folkert4 71971e818f Various QOL changes: 
Removed some unneeded keys from raise and lower layers
moved the + and = signs, backspace is now more intuitive
moved all the Function keys to CUSTOM layer
added ctrl alt del to CUSTOM layer
simplified the layout picture greatly
 2017-02-28 17:49:42 -05:00
Chris Helming 18ba21aa31 Update default maps for missing keys 2017-02-28 11:40:06 -05:00
Gabriel Young a64ae10662 Update existing keymaps 
Update existing keymaps to enable MIDI_BASIC functionality.  Also added
an option MIDI_ENABLE_STRICT to be strict about keycode use (which also
reduces memory footprint at runtime)
 2017-02-25 20:41:13 -08:00
Callum Oakley b06961c38b updated readme 2017-02-22 12:26:13 +00:00
Callum Oakley 1316ca67af added hotkey cluster 2017-02-21 23:07:22 +00:00
Xyverz bf6f7a623d Merge remote-tracking branch 'upstream/master' 2017-02-20 23:54:09 -08:00
Jack Humbert c2239e6b96 merging 2017-02-19 00:04:14 -05:00
Stephen Tudor 33bc4c070c Update smt Planck keymap 2017-02-16 14:32:46 -05:00
Jack Humbert 49e72632d2 remove more warnings 2017-02-16 13:13:38 -05:00
Priyadi Iman Nurcahyo c2f0207d59 Merge my Planck-like keyboards 2017-02-15 16:36:31 +07:00
Priyadi Iman Nurcahyo 3758cfd95f GUI layer fixes 2017-02-14 04:17:09 +07:00
Priyadi Iman Nurcahyo 6c692fca7d Alt-tab handling in GUI layer 2017-02-14 03:58:12 +07:00
Priyadi Iman Nurcahyo 7ae677dcb7 remove stand alone punc layer switcher for now 2017-02-14 03:18:34 +07:00
Priyadi Iman Nurcahyo 02662e3869 Add explicit punctuation key for greek layers 2017-02-14 00:46:06 +07:00
Priyadi Iman Nurcahyo c2531ff43b Func + Num = Punc 2017-02-14 00:44:02 +07:00
Priyadi Iman Nurcahyo 15e2dbb2a9 move GRV to ESC position 2017-02-13 22:18:36 +07:00
Priyadi Iman Nurcahyo 903e4d3193 Fix faux clicky toggle key 2017-02-13 20:13:33 +07:00
Priyadi Iman Nurcahyo 75e57b4bcb Merge branch 'faux_clicky' into promethium 2017-02-13 18:01:57 +07:00
Priyadi Iman Nurcahyo 40ced77606 Update my Planck layout 2017-02-13 17:58:06 +07:00
Jack Humbert 4010360912 adds planck/rev3 makefile so subproject is found 2017-02-12 23:58:44 -05:00
Priyadi Iman Nurcahyo c68e596f32 Implement faux-clicky feature 2017-02-13 08:03:07 +07:00
Jack Humbert 8d0fdf1008 adds soft pwm for non-timed ports 2017-02-12 11:29:42 -05:00
Xyverz 902d5077cd Merge remote-tracking branch 'upstream/master' 2017-02-10 23:34:27 -08:00
VoodaGod c0cfacda98 fixed readme (i swear) 2017-02-10 09:51:08 +01:00
VoodaGod c330872f47 updated layout & readme 2017-02-09 13:07:59 +01:00
VoodaGod 986b065654 more formatting 2017-02-09 12:17:13 +01:00
VoodaGod 1becbcb013 readme formatting changes 2017-02-09 11:25:50 +01:00
VoodaGod cb590bb37b updated readme 2017-02-09 11:21:52 +01:00
VoodaGod 9a64eb8533 updated bone2planck keymap & readme 2017-02-09 10:01:39 +01:00
Jack Humbert 3c7fa0acc1 Merge pull request #1046 from LukeSilva/master 
Add Tapping Macros to QMK
 2017-02-07 13:18:47 -05:00
Jack Humbert f79f38d726 add comma 2017-02-07 01:53:46 -05:00
Jack Humbert 2179a548f4 Merge pull request #1069 from hot-leaf-juice/master 
change cmd-l and cmd-r for actual home and end
 2017-02-07 01:42:30 -05:00
Jack Humbert e5a2306804 Merge pull request #1041 from folkert4/master 
Added Espynn's keymap
 2017-02-07 00:37:23 -05:00
Jack Humbert ab07d71b22 Merge pull request #1047 from lordchair/keymap_yale 
yale planck layout
 2017-02-07 00:30:56 -05:00
Callum Oakley 21015918b4 change cmd-l and cmd-r for actual home and end 2017-02-06 12:40:32 +00:00
johannes f936a3d5c2 stuff 2017-02-03 14:10:19 +01:00
johannes 8a7daf34a2 initial keymap 2017-02-03 10:47:37 +01:00
Yale Thomas 8df30c1c56 added picture of layout 2017-01-28 18:44:14 -08:00
Yale Thomas ad0ce40db0 usability tweaks 2017-01-28 18:44:01 -08:00
Yale Thomas d549002d22 mouse keys added 2017-01-28 18:43:40 -08:00
Yale Thomas 4eafa86564 new 'yale' keymap 2017-01-28 18:43:40 -08:00
Luke Silva 77e54e34e1 Add luke keymap, as an example of the tapping macros 2017-01-29 11:27:38 +11:00
Stephen Tudor 321904b8e3 Improve Planck keymap 
- added escape+shift mod-tap key
- replaced BRITE with backtick
 2017-01-28 01:37:59 -05:00
Stephen Tudor fa72689145 Merge branch 'master' into smt/planck 
* master:
  Clarify license on abnt2 keymap (#1038)
  replace jackhumbert with qmk
  Add gitter image, start update to qmk org
  Remove COLEMAK from preonic_keycodes enum
  layer defines to enum
  Update readme for smt Preonic keymap
  Add smt keymap for Preonic
  updated all the other keymaps to support the new changes.
  fix: infinity60 keyboard was not using quantum features.
  Compare Makefile with itself instead of using `--help`
 2017-01-28 00:51:07 -05:00
folkert4 8c794d73fa Added Espynn's keymap 2017-01-27 13:51:39 -05:00
Stephen Tudor 63e406eca4 Add smt keymap for Planck 2017-01-26 00:24:51 -05:00
Jack Humbert 938422ce99 layer defines to enum 2017-01-25 10:02:01 -05:00
Jack Humbert 0026f4ec09 Merge pull request #1018 from hot-leaf-juice/master 
simplified my keymap
 2017-01-22 19:01:34 -05:00
Christopher Browne 89461e743e More keyboard map tweaking (#1019) 
* Add HOME/END keys as upper/lower on arrow-up/down

* Reduce .hex file size by turning off unneeded options

* Put digit keypad onto left hand upon RAISE; this will sometimes be preferable to double-hits of right hand
 2017-01-22 19:01:07 -05:00
Callum Oakley dc3937d485 simplify 2017-01-20 21:22:18 +00:00
Xyverz b8b2a55973 Merge remote-tracking branch 'upstream/master' 2017-01-19 06:54:18 -08:00
Mitch Lloyd 0815c7ae17 Update mitch layout for new keymaps 2017-01-17 13:01:07 -08:00
Wojciech Siewierski c6299a7859 Update the vifon keymap 2017-01-13 18:52:13 +01:00
xyverz 99521a4482 Merge remote-tracking branch 'upstream/master' 2017-01-08 21:47:08 -08:00
Priyadi Iman Nurcahyo 02055406e8 Greek alphabet layer 2017-01-09 02:50:13 +07:00
Priyadi Iman Nurcahyo 58b2536bf1 om telolet om 2017-01-08 23:45:16 +07:00
Jeremy Cowgar 5fca9ff4d5 Added Jeremy’s developers keymap for the Planck 2017-01-04 10:51:00 -05:00
Fred Sundvik 52430ef0d6 Remove extra file that has been commited by mistake 2016-12-29 12:26:41 +02:00
Jack Humbert 438a5d685b limit voices by default, add some drums 2016-12-20 19:38:22 -05:00
Jack Humbert dd114e648e planck preonic update 2016-12-19 21:01:23 -05:00
Priyadi Iman Nurcahyo c641e46567 QWERTZ style dot & comma, move QUOT to SCLN position 2016-12-16 01:16:55 +07:00
Samuel Ryan Goodwin 826c929c49
Make keymap compile again. 2016-12-15 09:52:57 +01:00
xyverz 0523657923 Merge remote-tracking branch 'upstream/master' 2016-12-13 18:06:49 -08:00
xyverz 592b90dd22 Changes 2016-12-13 18:05:45 -08:00
Jack Humbert 0edfe55bfe re-enable audio and extrakeys 2016-12-12 15:39:07 -05:00
Priyadi Iman Nurcahyo a6db20e518 Remove unneeded options to reduce firmware size 2016-12-10 21:08:22 +07:00
xyverz 9216bc7377 Merge remote-tracking branch 'upstream/master' 2016-12-06 17:36:19 -08:00
Jack Humbert c87d039839 Merge pull request #921 from Wilba6582/raw_hid 
Initial version of Raw HID interface
 2016-12-05 00:13:37 -05:00
Jack Humbert 1eec2b7277 Update planck.c 2016-12-04 23:11:22 -05:00
Jack Humbert 7e4341e437 Update rules.mk 2016-12-04 23:01:07 -05:00
Jack Humbert 7f88c9506c Merge pull request #930 from cbbrowne/master 
Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929
 2016-12-02 15:21:04 -05:00
cbbrowne cee0cf8a6e Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929 2016-12-02 14:12:55 -05:00
Jack Humbert 245c9508bd adds warnings to 4 keymaps 2016-12-02 13:32:50 -05:00
cbbrowne f6e86cd2c9 I also want page-down/page-up on UPPER layer 2016-12-02 12:35:03 -05:00
cbbrowne 570e784140 I want page-down/page-up - put those on LOWER-Left/Right near bottom corner 2016-12-02 12:31:43 -05:00
cbbrowne af4c44deef Improve docs on SYSEX bit 2016-12-01 16:31:30 -05:00
cbbrowne 1f290f6213 Make my builds smaller 2016-12-01 16:21:15 -05:00
Wilba6582 fe001d46fd Initial version of Raw HID interface 2016-12-01 00:44:54 +11:00
cbbrowne ff1b563e85 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-11-29 12:20:26 -05:00
Jack Humbert 7edac212c8 separated into api files/folder 2016-11-26 15:38:44 -05:00
Jack Humbert c1037b1dc0 working with helper, qmk_helper_windows@05b0105 2016-11-21 18:05:06 -05:00
Jack Humbert 3774a7fcda rgb light through midi 2016-11-17 17:42:14 -05:00
xyverz b493f6a4ed Merge remote-tracking branch 'upstream/master' 2016-11-16 22:36:36 -08:00
Jack Humbert 33e62c080c merging 2016-11-12 20:54:37 -05:00
Zach Nielsen 80c5ada339 Missed removing a function 2016-11-10 13:47:07 -08:00
nielsenz f388bb5bda Removed some common functions from my keymap 2016-11-10 13:39:46 -08:00
Zach Nielsen 4c0aa02b2e Missed some stuff. Added a song (stole it from reddit). 2016-11-10 12:59:55 -08:00
Zach Nielsen c07ef5c6ab Adding my (zach) keymaps for planck and preonic 2016-11-10 12:26:56 -08:00
cbbrowne b90366285f Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-10-31 11:45:54 -04:00
Jack Humbert 964b8574ee Merge pull request #839 from priyadi/planck-priyadi-modification 
Update priyadi's keymap for Planck; added readme
 2016-10-30 12:26:20 -04:00
cbbrowne 2a2920d92c Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-10-26 10:55:41 -04:00
Callum Oakley 6bbb0b030e replace lock key with general power key 2016-10-25 11:51:32 +01:00
Callum Oakley c0a9fa8eea switched to standard volume keys 2016-10-25 11:37:09 +01:00
Chris Browne ed8efcf86d Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-10-23 10:28:02 -04:00
Priyadi Iman Nurcahyo c6f6172fd5 Use WinCompose unicode input method instead of HexNumpad 2016-10-23 19:35:06 +07:00
Priyadi Iman Nurcahyo 5fa44c594f Update priyadi's keymap for Planck; added readme 2016-10-22 18:47:51 +07:00
Jack Humbert 18b5c3dccf removes planck/rev3 temporarily 2016-10-18 13:57:56 -04:00
Chris Browne 62e6789ab2 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-10-16 20:59:52 -04:00
Jack Humbert a889b899e2 working with power limit 2016-10-16 16:03:56 -04:00
Jack Humbert 52d7f7d277 Merge pull request #815 from priyadi/unicode_map 
Allow unicode up to 0xFFFFF using separate mapping table
 2016-10-16 15:49:45 -04:00
cbbrowne 99ca59baf8 I keep mis-using UPPER|LOWER/SLASH, and getting RESET. 
With RESET shifted to the UPPER+LOWER layer, it is now time to change that key to Alt-Slash, which, in Emacs, does automatic word completion
 2016-10-12 12:03:54 -04:00
Priyadi Iman Nurcahyo 932705706e Add example keymap 2016-10-10 01:35:41 +07:00
Wojciech Siewierski 26759e126e New Planck keymap: vifon 2016-10-09 13:34:17 +02:00
Callum Oakley 387b94a6cf updated readme 2016-10-06 07:24:26 +01:00
Callum Oakley 059990e05a added lock screen button and fixed error in diagram 2016-10-06 07:23:12 +01:00
Callum Oakley 633da3bdb6 Made some simplifications leveraging the LALT(), LGUI(), and S() functions. 2016-10-01 13:03:46 +01:00
xyverz e69e4c1ef2 Merge remote-tracking branch 'jackhumbert/master' 2016-09-30 23:16:50 -07:00
Xyverz a03d72f597 Updates to my Planck keymap - standardizing the bottom row. 2016-09-30 13:05:21 -07:00
Callum Oakley 2f07ad8e8a added en-dash and gbp keys and updated readme 2016-09-29 07:49:27 +01:00
Callum Oakley c762ea975a big restructure now I only have to consider macOS, also added mouse, more function keys, and some neat macros 2016-09-29 07:49:27 +01:00
Callum Oakley fa2724360b removed windows layer and updated brightness keys for macOS Sierra 2016-09-29 07:49:27 +01:00
Callum Oakley 02635e5924 changed RALT to LALT on Windows 2016-09-29 07:49:27 +01:00
Callum Oakley b2ecd296ae fixed comments 2016-09-29 07:49:27 +01:00
Callum Oakley c593564aca Update readme.md 2016-09-29 07:49:27 +01:00
Callum Oakley ff09695897 Update readme.md 2016-09-29 07:49:27 +01:00
Callum Oakley 6ad8a06c73 updated readme 2016-09-29 07:49:27 +01:00
Callum Oakley b51f51c614 added close key for alt-f4 macro 2016-09-29 07:49:27 +01:00
Callum Oakley 41227856f4 added a toggle between Mac and Windows base layers (with swapped cmd and ctrl) 2016-09-29 07:49:27 +01:00
cbbrowne 7a183b4e8b Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-09-22 16:32:29 -04:00
UnderSampled 9e6a493172 Fixed Impossible Layout readme tables (again) 2016-09-21 18:55:14 +00:00
Stephen Christie 073a1f21bb Corrected Impossible Layout readme tables 2016-09-21 14:45:05 +00:00
Stephen Christie 9d629719cb Filled Impossible Layout documentation 2016-09-21 14:41:37 +00: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
xyverz d1c35b1255 removed a couple of mod_tap keys since they had some unintended conseqeunces across various platforms. 2016-09-16 22:02:33 -07: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
cbbrowne 24e8d01dc9 Move ALT... 2016-09-15 11:28:12 -04: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
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
cbbrowne 6a7ef59629 Ongoing experiment; have a special layer for RESET 2016-09-12 13:24:22 -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 94ef7f99b8 Merge pull request #733 from cbbrowne/master 
Various recent enhancements to my keyboard map
 2016-09-08 17:49:35 -04:00
tong92 98e43f995d add tong92 keymap 2016-09-08 23:37:13 +09: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
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
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
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
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
cbbrowne a732003bfd Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-26 12:13:50 -04: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