1
0
Fork 0
Commit graph

1173 commits

Author SHA1 Message Date
Jason T. Wong
9f8f34119a Compiled Hex File
The keymap file to use without compilation.
2016-04-24 22:14:09 -04:00
IBNobody
f32f80cf32 updating personal atomic keymap (#285) 2016-04-24 22:06:59 -04:00
Erez Zukerman
68532ced24 Merge pull request #280 from Twey/master
Add `quantum/keymap_extras/keymap_plover.h` and a keymap.
2016-04-24 20:33:38 -04:00
James ‘Twey’ Kay
5713083e91 Add Twey's keymap 2016-04-25 01:08:36 +01:00
Jason T. Wong
93da70a43a Update keymap image
Why:

* The transparency made it ugly.

This change addresses the need by:

* Make transparent parts white.
2016-04-23 23:36:41 -04:00
Jack Humbert
def6853532 adds voice iteration to planck default 2016-04-23 23:30:09 -04:00
Jason T. Wong
762065578b Add new keymap
Why:

* I want a custom keymap that suits my needs.

This change addresses the need by:

* Cloned default keymap.
* Customized layout.
* Updated README.
* Add an image created from keyboard layout editor.
2016-04-23 23:21:13 -04:00
IBNobody
082a0f313d fixed compiler warnings (#273) 2016-04-22 01:01:38 -04:00
Eric Tang
620ac4b260 Update functions used to write to EEPROM 2016-04-21 20:07:03 -07:00
Jack Humbert
9828aba2a1 adds multiple voices and the ability to iterate/deiterate between them 2016-04-21 18:14:25 -04:00
Erez Zukerman
a8fd65d86f Merge pull request #265 from sboesebeck/master
ErgodoxLayoutGenerator used
2016-04-21 08:10:39 +03:00
Jack Humbert
7d1a683607 sounds for plover layout 2016-04-20 22:28:47 -04:00
Jack Humbert
157ddccc2c start-up sound working, removes tick with some devices 2016-04-20 20:11:05 -04:00
Jack Humbert
0fd093b400 there is no on 2016-04-20 18:41:10 -04:00
Jack Humbert
b0635e58eb delay isn't the problem here 2016-04-20 18:39:36 -04:00
Jack Humbert
b8c932f9aa makes the plover keymap correct 2016-04-20 18:39:17 -04:00
Stephan Bösebeck
e065ff8cba changed the macro generation of the ELG to use UP, DOWN, TYPE instead of U,D,T - makes it work with custom keycodes 2016-04-20 22:34:02 +02:00
Stephan Bösebeck
17140ec082 added some words about the ELG in the readme 2016-04-20 11:16:29 +02:00
Stephan Bösebeck
13244a259c Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-20 11:15:59 +02:00
Jack Humbert
f489ae1ac0 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2016-04-20 01:08:27 -04:00
Jack Humbert
de4690593c fixed startup audio with a 500ms delay 2016-04-20 01:08:17 -04:00
Erez Zukerman
a9ef1c0a03 Merge pull request #267 from nrrkeene/master
Improved modifier keys, code
2016-04-20 07:48:54 +03:00
Nicholas Keene
5319c2cd6e The Ordinary Layout is the layout you are looking for. Come and see. 2016-04-19 21:56:50 -05:00
Jack Humbert
462601f5e8 breaking changes - restructuring audio.c a little 2016-04-19 21:25:48 -04:00
Stephan Bösebeck
f645f9946c re-created all layouts using ErgodoxLayoutGenerator 2016-04-19 23:27:10 +02:00
Stephan Bösebeck
6ff5e10592 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-19 23:07:11 +02:00
Jack Humbert
a2ee277158 updated comments about plover 2016-04-19 17:03:43 -04:00
Jack Humbert
6ae34f20aa added plover to default layout 2016-04-19 17:01:04 -04:00
Jack Humbert
a2f31c886f getting ready for getters and setters 2016-04-19 12:58:13 -04:00
Stephan Bösebeck
04f36b3681 new overview pic 2016-04-19 15:59:43 +02:00
Stephan Bösebeck
a16a9b30b6 added new macro for toggling and holiding layer 2016-04-19 10:37:37 +02:00
Stephan Bösebeck
0fbc52809e new experimental layout 2016-04-19 07:50:29 +02:00
Jack Humbert
78b3a88154 merging in #262 2016-04-18 21:04:29 -04:00
Jack Humbert
e49712b559 note sliding - on right now 2016-04-18 21:01:48 -04:00
IBNobody
4b3358acc2 Fixed speaker being on during sleep. 2016-04-18 18:58:37 -05:00
IBNobody
4f4b5b8c18 Added CM/DK 2016-04-18 01:58:25 -05:00
Stephan Bösebeck
42fad96be5 added smly layer again 2016-04-18 08:27:58 +02:00
Stephan Bösebeck
9cc39156f7 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-18 08:03:22 +02:00
IBNobody
82ec81660e Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into personal_atomic_planck 2016-04-17 23:16:36 -05:00
IBNobody
ef73ab6628 Notes Bugfix 2016-04-17 22:08:05 -05:00
Jack Humbert
5a15c113d7 Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware 2016-04-17 21:15:50 -04:00
IBNobody
5c98ad5960 Added extra songs, LED indicator notes 2016-04-17 20:14:37 -05:00
Jack Humbert
e0ab1dcf4c merging 2016-04-17 18:15:35 -04:00
Jack Humbert
ce463ef424 audio fixes 2016-04-17 18:14:42 -04:00
Stephan Bösebeck
6732d6cf1a new png 2016-04-17 23:04:43 +02:00
Stephan Bösebeck
a9d8c61dbd new iteration, change of lower row 2016-04-17 23:02:29 +02:00
Stephan Bösebeck
6d40f7c506 added new experimental layout - works with ErgodoxLayoutGenerator 2016-04-17 22:19:47 +02:00
Stephan Bösebeck
7c3345f9b9 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-17 22:17:40 +02:00
IBNobody
23231fa577 Converted goodbye to notes, fixed eighth dotted note macro 2016-04-17 14:16:03 -05:00
Olivier
edb2996299 Use aliases where available. No firmware change. 2016-04-17 20:22:07 +02:00
Olivier
920e0865b6 Commit firmware up-to-date with latest upstream qmk_firmware changes. 2016-04-17 20:00:09 +02:00
IBNobody
3103ea542f Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomic_planck 2016-04-17 12:55:19 -05:00
Olivier
b03a9f7252 Merge https://github.com/jackhumbert/qmk_firmware 2016-04-17 19:54:06 +02:00
Jack Humbert
319fbe344b Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware 2016-04-17 10:56:12 -04:00
Olivier
0715cf46ac Add underscore "_" character in the qwerty compatibility layer. 2016-04-17 12:15:23 +02:00
IBNobody
29e495be2a Added trimble and tempo adjustments! 2016-04-17 02:52:38 -05:00
IBNobody
943b5b7709 Adding folding to #if, etc 2016-04-17 00:24:58 -05:00
Jack Humbert
a67d425f4d planck default layout updates 2016-04-17 01:00:39 -04:00
Jack Humbert
e7b9959819 no need for length of play_notes array with macro 2016-04-16 23:15:40 -04:00
IBNobody
45f10b4c4b Fixed how note arrays are used. 2016-04-16 22:10:18 -05:00
Jack Humbert
720e67e558 Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware 2016-04-16 23:08:12 -04:00
Jack Humbert
8bbd064cf5 changes to play_notes, goodbye 2016-04-16 23:07:50 -04:00
IBNobody
12a9b2b9ae Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomic_planck 2016-04-16 20:37:44 -05:00
IBNobody
a87522033d Merging with QMK main to fix rest issues 2016-04-16 20:37:22 -05:00
Jack Humbert
41cc35425a rests between notes as an argument 2016-04-16 21:31:40 -04:00
Jack Humbert
8f4ce501eb Merge pull request #260 from IBNobody/personal_atomic_planck
Atomic TLC and musical note freqs for audio
2016-04-16 21:02:17 -04:00
IBNobody
bc65f73c64 Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomic_planck 2016-04-16 19:32:29 -05:00
IBNobody
4aea806aa8 Adding Musical Notes 2016-04-16 19:31:32 -05:00
IBNobody
b5c22ab5b5 Merging with QMK main to fix audio issues 2016-04-16 19:27:21 -05:00
Jack Humbert
c83aa16f1d fixes audio prescaler to emit correct freq 2016-04-16 20:26:02 -04:00
Jack Humbert
ab19ebd08a MAGIC functionality, AG swap in default layout 2016-04-16 18:51:58 -04:00
Olivier
5df222d3e0 Even more compatibility with QWERTY systems : added most useful characters needing AltGr on a bepo layout. This compatibility layer is still not perfect, but now usable to type with a bepo-like layout on a qwerty system. 2016-04-16 23:33:18 +02:00
Stephan Bösebeck
38a1d830fa Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-16 22:56:33 +02:00
Olivier
12f13eeef4 More compatibility with QWERTY systems. 2016-04-16 22:48:09 +02:00
Jack Humbert
5f648b6c40 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2016-04-16 15:47:20 -04:00
Jack Humbert
86169833c5 updates to preonic default, music mode integrated 2016-04-16 15:47:17 -04:00
Olivier
536e52a05a Simple layer to allow the keyboard to act like a bepo keyboard when plugged on a qwerty system. Doesn't work with modifiers for now. 2016-04-16 20:01:44 +02:00
Olivier
6b8fdb90bc Add mouse navigation keys on a new layer. 2016-04-16 19:23:39 +02:00
Olivier
0cd070d814 More concise, no functional change. 2016-04-16 18:56:31 +02:00
Olivier
6dc48384f3 Allow the "00" keypad key to act like a repeating 0 when held down. 2016-04-16 18:06:16 +02:00
Olivier
d3bc854ddf Correct a bug with stuck modifier keys when they were used with other layers (like when selecting with shift and navigation keys) and released before the layout switch keys. 2016-04-16 15:13:02 +02:00
Olivier
5b74261aa9 Second try with a (maybe) more practical layout :
- layer modifiers in the thumb clusters, Alt-F1 - Alt-F4 should now be easier to type
- new Alt and Ctrl keys in the bottom row are more easily reachable with thumbs than the little thumb cluster keys, and feel more like traditional keyboards
- thumb backspace wasn't great due to lower precision and repeat rate than index fingers
2016-04-16 14:53:08 +02:00
Olivier
c2c939af4e Layout preview generated on keyboard-layout-editor.com. 2016-04-16 13:51:19 +02:00
Roman Zolotarev
fa2eedb7bd
Add Roman's single layer layout based on Norman 2016-04-16 16:57:58 +08:00
Jack Humbert
9eadeb574b Merge pull request #257 from VoodaGod/bone2planck
Bone2 Layout adptation for Planck
2016-04-16 01:24:03 -04:00
Jack Humbert
d81ef5b7eb new defaults for planck and preonic 2016-04-16 01:19:37 -04:00
IBNobody
9d4bfc1bcf Corrected layer macros 2016-04-15 22:40:07 -05:00
Jack Humbert
0faa18eab9 audio enable stored in eeprom 2016-04-15 23:38:21 -04:00
Jason Janse van Rensburg
549b797ad1 My Attempt at adapting the Bone2 layout with Neo2 navigation cluster & number block to the Planck.
Very much a WIP, will most likely start tweaking further once my Planck kit has dropped
2016-04-16 01:36:18 +02:00
IBNobody
2aa51e4416 Tweaking PVC atomic layout 2016-04-15 16:32:44 -05:00
IBNobody
8f85117aa9 Added Audio to my Atomic 2016-04-15 14:42:50 -05:00
IBNobody
39e520c010 Prepping for merge with new_defaults 2016-04-15 13:09:42 -05:00
Jack Humbert
ee2ee7f4f0 audio note length fixes 2016-04-15 13:44:07 -04:00
Jack Humbert
bb0836c620 the spacessss 2016-04-15 00:26:22 -04:00
Jack Humbert
43a4ffc259 bootmagic somehow not getting enabled, so adding eeconfig to backlight src include cond 2016-04-14 23:53:35 -04:00
Jack Humbert
2597fb7c50 might have broken something 2016-04-14 23:33:46 -04:00
IBNobody
66c1024bd3 fixed merging 2016-04-14 22:33:18 -05:00
IBNobody
d4f90fe882 Merge remote-tracking branch 'remotes/jackhumbert/new_defaults' 2016-04-14 22:29:33 -05:00
IBNobody
3993afbb2e adding new per-keymap makefile 2016-04-14 22:27:28 -05:00
Nicholas Keene
63656ea34f The Ordinary Layout is the layout you are looking for. Come and see. 2016-04-14 22:00:15 -05:00
Jack Humbert
63462bf8c1 changing up the makefile a bit 2016-04-14 20:42:14 -04:00
Jack Humbert
ddbe430778 new defaults 2016-04-14 19:13:24 -04:00
IBNobody
f051496f13 Checkin 2016-04-14 18:01:29 -05:00
Stephan Bösebeck
990254edec Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-14 21:47:33 +02:00
IBNobody
cf17687f29 Adding personal build file settings 2016-04-14 12:59:16 -05:00
IBNobody
3dd20f2b6c Rename pc.c to pvc_planck.c 2016-04-14 11:35:49 -05:00
IBNobody
3d601c1bce Rename pc.c to pvc_planck.c 2016-04-14 08:56:27 -05:00
IBNobody
19061f2ff1 Update and rename pc_atomic.c to pvc_atomic.c 2016-04-14 08:54:22 -05:00
IBNobody
4b4d3069b4 Update and rename pc_atomic.c to pvc_atomic.c
Also removed unused FNs
2016-04-14 08:50:01 -05:00
IBNobody
59e041672c Remapped magic bootloader key to B. 2016-04-14 08:20:55 -05:00
IBNobody
44e4320b2e Nightly 2016-04-14 06:34:56 -05:00
IBNobody
95a44cdf01 Disabled print. 2016-04-13 22:00:36 -05:00
IBNobody
aa9eaa9773 Corrected spacing. 2016-04-13 21:56:27 -05:00
IBNobody
9ff9317720 Corrected spacing. 2016-04-13 21:55:04 -05:00
IBNobody
3755ef5ddb Compiler Warnings / Atomic TLC
Corrected compiler warnings for a number of issues.  Gave Atomic some
TLC.
2016-04-13 20:57:51 -05:00
IBNobody
01f5b35396 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into pc_planck 2016-04-13 19:14:23 -05:00
IBNobody
390fd3107a local files
local files
2016-04-13 18:48:25 -05:00
IBNobody
caf3e48de8 LOCAL COMMIT
LOCAL COMMIT
2016-04-13 17:40:16 -05:00
skullY
21d4cafb8c Fixup rgb underlight for clueboard1 2016-04-13 14:20:08 -07:00
IBNobody
3a601e76e4 Adding PC Atomic 2016-04-13 14:43:09 -05:00
Stephan Bösebeck
a71ab3ebb6 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-12 15:39:18 +02:00
IBNobody
ff06eaf853 Added del 2016-04-12 08:17:02 -05:00
IBNobody
5ef6978cab Adding personal files 2016-04-12 06:55:26 -05:00
Erez Zukerman
a0194d7e5f Merge pull request #249 from nrrkeene/master
Version 3, Ordinary Perfected
2016-04-12 09:04:29 +03:00
Nicholas Keene
93de95d0cd The Ordinary Layout is the layout you are looking for. Come and see. 2016-04-11 23:34:41 -05:00
Nicholas Keene
96f75f39c8 The Ordinary Layout is the layout you are looking for. Come and see. 2016-04-11 23:28:16 -05:00
Nicholas Keene
efffbe35c8 The Ordinary Layout is the layout you are looking for. Come and see. 2016-04-11 22:51:12 -05:00
Jonathan Arnett
7635958270 Merge pull request #1 from J3RN/vim-navigation
Added Vim-style navigation
2016-04-11 19:22:23 -04:00
Jonathan Arnett
9e2c767c45 Added README note about Vim-style navigation 2016-04-11 19:19:20 -04:00
Jonathan Arnett
4b03a0f3d5
Stylistic changes 2016-04-11 19:08:24 -04:00
Jonathan Arnett
aaa7af752c Make a also toggle Media layer 2016-04-11 19:01:39 -04:00
zozo
aeb027ed60 First version of a bepo (french layout based on Dvorak rules) keymap. 2016-04-11 23:27:27 +02:00
Erez Zukerman
511c843829 Merge pull request #246 from romanzolotarev/master
Add a new layout with arrows in the home row
2016-04-11 23:02:08 +03:00
Stephan Bösebeck
c2e1d69f27 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-11 21:54:55 +02:00
Jack Humbert
d342989f25 Merge pull request #244 from nicosuave/add_nico_planck_keymap
Add nico keymap
2016-04-11 14:52:10 -04:00
Jack Humbert
472e920c03 Merge pull request #236 from tak3over/master
Minor Doc Changes.
2016-04-11 14:51:37 -04:00
Roman Zolotarev
f26985ad16
Add HJKL layout 2016-04-11 21:45:10 +08:00
skullY
97f8f37876 Fixup RGBLIGHT support for clueboard2 2016-04-10 21:16:49 -07:00
Nico Ritschel
077aee09a4 Add my keymap 2016-04-09 11:34:01 -07:00
tak3over
9e153b1a5c another modification of layers, restored arrow keys and added cut/paste 2016-04-07 10:54:11 -05:00
Erez Zukerman
9cfc74c35b [Erez & Jack] Makes tri-layer available across Quantum 2016-04-07 15:21:06 +03:00
Stephan Bösebeck
0befb25739 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-06 22:52:49 +02:00
Erez Zukerman
d07a1257b3 Merge pull request #215 from nrrkeene/master
Added proper documentation
2016-04-06 22:35:17 +03:00
tak3over
e89fd63426 switched raise and lower layers 2016-04-06 11:12:58 -05:00
skullY
0da53d3811 Fixup the cluepad code 2016-04-05 20:27:40 -07:00
skullY
34dd96187c Fix the clueboard2 led code 2016-04-05 20:27:24 -07:00
tak3over
4eadc2a977 updated my keymap 2016-04-05 16:39:45 -05:00
tak3over
028dd16fe6 Modified keymap 2016-04-05 16:21:45 -05:00
Alex Johnstone
9bd1caed44 Updated hex 2016-04-05 15:51:13 +01:00
Alex Johnstone
50ac511b56 💷 typo 2016-04-05 07:49:35 -07:00
Alex Johnstone
3fd62428a6 💷 typo 2016-04-05 07:48:13 -07:00
Alex Johnstone
1facc53a26 Merge pull request #5 from jackhumbert/master
Sync with upstream
2016-04-05 07:44:37 -07:00
Jack Humbert
931b0a79fc updates to noise 2016-04-05 09:44:01 -04:00
tak3over
2a488d1597 Update tak3over.c 2016-04-04 16:51:30 -05:00
Stephan Bösebeck
75c24499f3 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-04 22:35:48 +02:00
tak3over
2ba0de8fcd Merge pull request #2 from jackhumbert/master
Update from source
2016-04-04 13:41:37 -05:00
tak3over
9cd0c9d589 Minor documentation error. Raise and Lower.
The Raise and Lower keys were transposed in the comment key map for all layers. Assuming _RS and _LW should be mapped to Raise and Lower respectively.  Probably is the same in the other custom keymaps that copied from this default.
2016-04-04 13:19:19 -05:00
Erez Zukerman
0cdf5d292c Merge pull request #235 from mbarkhau/master
add indent to generated keymap
2016-04-04 08:04:31 +03:00
Stephan Bösebeck
dee6a4338a minor updates - new PNG 2016-04-03 23:48:22 +02:00
Jack Humbert
a90d68739a music mode file 2016-04-03 16:00:10 -04:00
Manuel Barkhau
22691de580 add indent to generated keymap 2016-04-03 21:46:32 +02:00
Erez Zukerman
13dcbfdab1 Links to build guide 2016-04-03 12:52:08 +03:00
Erez Zukerman
8d39263d24 Merge pull request #213 from mbarkhau/master
Add manuneo layout
2016-04-03 08:56:08 +03:00
Manuel Barkhau
381a9fd553 use action function for unicode 2016-04-02 23:12:38 +02:00
Stephan Bösebeck
f0424a0c0f Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware 2016-04-02 15:15:21 +02:00
Stephan Bösebeck
71cdfe1168 new keymap 2016-04-02 15:14:14 +02:00
Stephan Bösebeck
aee8715815 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-01 23:54:16 +02:00
Stephan Bösebeck
c274699085 minor tweaks at the keymap, new png for documentation 2016-04-01 23:53:09 +02:00
tak3over
ad3ec12fb6 Create tak3over.c
Custom keymap with an additional function layer for numpad, pgup, pgdn, del, ins, home, end, and additional arrow keys.
2016-04-01 15:26:09 -05:00
Jack Humbert
54b0a2bf76 adding files is always smart 2016-04-01 14:44:08 -04:00
Stephan Bösebeck
dbd4ab3457 fixed de_osx prefix in keymap include to avoid conflicts 2016-03-31 23:15:59 +02:00
David Mohr
5fae86849a Also add compiled hex file 2016-03-30 09:47:34 -06:00
David Mohr
fe6c3e4f0f Squisher's international dvorak variant for ergodox ez
See README.md
2016-03-30 09:47:34 -06:00
Jack Humbert
6186de5828 Merge pull request #227 from NoahAndrews/patch-4
Fixed minor issues with Preonic readme
2016-03-30 11:07:00 -04:00
Miha Rekar
3b703eff33 Tiny fix of Planck diagrams 2016-03-30 17:03:03 +02:00
Noah Andrews
09d567045c Fixed minor issues with Preonic readme 2016-03-30 09:17:06 -04:00
Jack Humbert
47b537c87f preonic readme 2016-03-30 00:46:45 -04:00
Jack Humbert
e7377dc24b Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2016-03-30 00:45:48 -04:00
Jack Humbert
b8ac509570 .hex files 2016-03-30 00:45:37 -04:00
Jack Humbert
ac0729787f preonic update 2016-03-30 00:43:07 -04:00
Noah Andrews
95fba250ef Updated several keyboard folders to use new keymap naming scheme 2016-03-29 21:53:36 -04:00
mbarkhau
77fa2b0056 Update compile_keymap.py 2016-03-29 18:35:47 +02:00
Noah Andrews
2ae44470e0 Fix error in Planck makefile comment
[This comment](https://www.reddit.com/r/olkb/comments/428umx/rgb_underglow/czaivbc) states that because both audio output and RGB support require the user of timer 3, they can't be enabled at the same time. That makes sense, I can see where audio.c uses timer 3. But this comment in the code states that the incompatibility is with MIDI support, which doesn't make sense based on what I see in the code. Please enlighten me if I'm mistaken.
2016-03-29 12:06:32 -04:00
Stephan Bösebeck
ac22d1c185 added CTL_Shift / Hash macro 2016-03-29 13:02:14 +02:00
skullY
5e822417d7 Fixup clueboard support and add rgb to clueboard1 2016-03-28 22:49:24 -07:00
Manuel Barkhau
a2d3c0bd93 add hex file 2016-03-28 23:42:55 +02:00
Manuel Barkhau
295036d4e3 Merge remote-tracking branch 'origin/master' 2016-03-28 21:36:02 +00:00
Manuel Barkhau
32c7832609 Refactor compiler code 2016-03-28 23:35:12 +02:00
Stephan Bösebeck
37e68596dd Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-28 22:29:18 +02:00
Erez Zukerman
4a43c56844 Merge pull request #216 from msc654/master
Added msc keymap for ergodox_ez
2016-03-28 22:40:58 +03:00
Jack Humbert
fd9e5d1510 Merge pull request #214 from cdlm/action-hook
Add per-event user hook function
2016-03-28 11:55:19 -04:00
Alex Johnstone
48899673af Updated hex 2016-03-28 16:14:25 +01:00
Alex Johnstone
474eaead3c ££££ 2016-03-28 08:09:27 -07:00
Alex Johnstone
ad2d3144ed Forgot to change ent/spc 2016-03-28 15:50:09 +01:00
Damien Pollet
bcebb3447c Add action-preprocessing kb/user hooks in planck 2016-03-28 16:49:47 +02:00
Alex Johnstone
482dbe4c45 Didn't 2016-03-28 07:24:51 -07:00
Matthew Carroll
a1ce133203 Corrected duplicate image issue 2016-03-28 06:00:05 -04:00
IBNobody
577971ab07 Magic Key Overrides / Keyboard Lock / Forced NKRO
Added Magic Key Overrides / Magic Key Cleanup / Added Keyboard Lock
option to template / Added forced NKRO option to template (disabled by
default)
2016-03-28 00:03:21 -05:00
Matthew Carroll
beda4e6fd3 Added msc keymap for ergodox_ez 2016-03-27 23:51:11 -04:00
Alex Johnstone
1415e3108f Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯ 2016-03-27 20:50:49 -07:00