gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-12-21 00:53:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,760 Commits 64 Branches 1,613 Tags 1.1 GiB
3aa620c1ac
Commit Graph

1887 Commits

Author SHA1 Message Date
Joshua Colbeck
08cba6c09b Fixed minor error in ergodox infinity section. 2017-03-07 09:43:08 -06:00
milestogo
2f677c24a8 working with preprocessor macros for babblepaste 2017-03-06 00:16:44 -08:00
Kenichi Sasaki
fec3b78d78 fix backspace key position. 2017-03-05 21:49:41 +09:00
Xyverz
fbbf618a46 Removed preceeding underscore from MASTER_RIGHT in config.h 2017-03-05 03:48:10 -08:00
skullydazed
615bfc4eca Merge pull request #1107 from qmk/clueboard_cleanup 
Rework the clueboard keymaps
 2017-03-04 10:34:01 -08:00
Kenichi Sasaki
7e518e1d8f fix again 2017-03-04 23:56:58 +09:00
Xyverz
0d9bceb2fe Merge remote-tracking branch 'upstream/master' 2017-03-03 19:28:35 -08:00
Xyverz
68808b22c0 Final tweaks to my Kinesis keymap and readme 2017-03-03 19:27:24 -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
Jack Humbert
4ab88f3a9e Merge pull request #1129 from unxmaal/unxmaal_spacefn 
Layout: Spacebar long-press as fn, for GH60 and GH60 Satan boards
 2017-03-03 10:29:19 -05:00
Callum Oakley
61459ab5ba moar hotkeys 2017-03-02 11:40:25 +00:00
Eric Dodd
d35809a982 gh60 satan spacefn 2017-03-01 21:40:13 -05:00
Eric Dodd
a8a4927622 gh60 spacefn 2017-03-01 21:39:19 -05:00
milestogo
b80c97b712 clean up babblepaste 2017-02-28 23:27:49 -08:00
milestogo
0834c520c0 missed config.h stuck modifiers change 2017-02-28 21:54:35 -08:00
milestogo
748401e5c1 keymap and C6 audio testing 2017-02-28 21:53:42 -08: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
Jack Humbert
4c4cf3ca49 Merge pull request #1124 from jmdaly/roadkit_firmware 
Add initial version of TheVan Keyboards Roadkit Firmware
 2017-02-28 15:48:34 -05:00
Chris Helming
18ba21aa31 Update default maps for missing keys 2017-02-28 11:40:06 -05:00
John M Daly
e12b1a237c Add initial version of TheVan Keyboards Roadkit Firmware 2017-02-28 11:17:18 -05:00
Jack Humbert
4583955914 Merge pull request #1116 from hot-leaf-juice/master 
keymap update
 2017-02-27 22:18:55 -05:00
Jack Humbert
b851b0b2ae Merge pull request #1121 from Leszek111/master 
add layout
 2017-02-27 22:17:36 -05:00
Gunther Gruber
38cf08697b small changes in guni.c keymap to work with new qmk_firmware packet 2017-02-27 09:55:24 +01:00
Xyverz
d91e09f116 Updates to the README.md 2017-02-26 19:49:10 -08:00
Xyverz
871ac5058a Minor changes to the keymap: Moved thumb-cluster ESC to Media and Keypad layers 2017-02-26 19:45:57 -08:00
bbbd49a175 Ammend readme.md 2017-02-27 00:27:57 +01:00
138b89e1a1 Add colemak_programmer 2017-02-27 00:16:55 +01:00
Gabriel Young
976c856966 Update size estimates in the Makefile 
MIDI_ENABLE = no

   text    data     bss     dec     hex filename
      0   17080       0   17080    42b8 satan_midi.hex

MIDI_ENABLE = yes
MIDI_BASIC undefined
MIDI_ADVANCED undefined

   text    data     bss     dec     hex filename
      0   19494       0   19494    4c26 satan_midi.hex

      +2414 bytes (vs. MIDI_ENABLE = no)

MIDI_ENABLE = yes
      0   20846       0   20846    516e satan_midi.hex

      +1352 bytes (vs. MIDI_ENABLE = yes, MIDI_BASIC off, MIDI_ADVANCED
off)

MIDI_ENABLE = yes
#define MIDI_BASIC
#define MIDI_ADVANCED

   text    data     bss     dec     hex filename
      0   21292       0   21292    532c satan_midi.hex

      +1798 bytes (vs. MIDI_ENABLE = yes, MIDI_BASIC off, MIDI_ADVANCED
off)

Conclusion:
    +2400 to 4200, depending on config
 2017-02-25 21:38:35 -08: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
nstickney
b69b214d52 making numbers more familiar 2017-02-25 22:04:21 -06:00
Gabriel Young
ea14ed122f Add basic layer to sample MIDI keycap 2017-02-25 19:37:33 -08:00
Gabriel Young
525be99ee9 Split MIDI functionality into MIDI_BASIC and MIDI_ADVANCED 
MIDI_ENABLE = no

   text	   data	    bss	    dec	    hex	filename
      0	  17080	      0	  17080	   42b8	satan_midi.hex

MIDI_ENABLE = yes
MIDI_BASIC undefined
MIDI_ADVANCED undefined

   text	   data	    bss	    dec	    hex	filename
      0	  19494	      0	  19494	   4c26	satan_midi.hex

MIDI_ENABLE = yes
#define MIDI_BASIC
MIDI_ADVANCED undefined

   text	   data	    bss	    dec	    hex	filename
      0	  19788	      0	  19788	   4d4c	satan_midi.hex

MIDI_ENABLE = yes
MIDI_BASIC undefined
#define MIDI_ADVANCED

   text	   data	    bss	    dec	    hex	filename
      0	  20846	      0	  20846	   516e	satan_midi.hex

MIDI_ENABLE = yes
#define MIDI_BASIC
#define MIDI_ADVANCED

   text	   data	    bss	    dec	    hex	filename
      0	  21140	      0	  21140	   5294	satan_midi.hex
 2017-02-25 15:02:43 -08:00
nstickney
ebc6948e96 first two layers of ErgoDox Familiar completeC 2017-02-24 17:11:19 -06:00
nstickney
474f7ee3fd initial layer of familiar layout) 2017-02-23 22:24:32 -06:00
nstickney
498dfdd02c Merge https://github.com/qmk/qmk_firmware 2017-02-23 21:15:40 -06:00
nstickney
9b40dd796e familiar layout graphics, etc 2017-02-23 21:13:45 -06:00
Priyadi Iman Nurcahyo
b27a8dea1b Merge branch 'master' into promethium 2017-02-23 18:11:59 +07:00
Callum Oakley
b06961c38b updated readme 2017-02-22 12:26:13 +00:00
Jack Humbert
84b2f86f24 Merge pull request #1113 from kesslern/master 
Add dvorak_emacs_software layout for ergodox
 2017-02-21 23:35:09 -05:00
Josh Colbeck
e51001efcc Merge remote-tracking branch 'qmk/master' 2017-02-21 20:31:16 -06:00
Callum Oakley
1316ca67af added hotkey cluster 2017-02-21 23:07:22 +00:00
Priyadi Iman Nurcahyo
3dab8a60fc added pause, prtsc & ins to list of keys to be processed on release 2017-02-21 16:40:38 +07:00
Priyadi Iman Nurcahyo
57623805e8 Move caps to FUN layer; add Pause key 2017-02-21 16:36:35 +07:00
Xyverz
bf6f7a623d Merge remote-tracking branch 'upstream/master' 2017-02-20 23:54:09 -08:00
Nathan Kessler
b9fce16490 Add dvorak_emacs_software layout for ergodox 2017-02-20 22:55:43 -05:00
Priyadi Iman Nurcahyo
b306f83c6b Move del back to fun+backspce 2017-02-21 04:00:05 +07:00
Priyadi Iman Nurcahyo
77f9363675 Only process Fnumber on key release, and only when layer is still active 2017-02-21 03:24:32 +07:00
Jack Humbert
7ff41df32c Merge pull request #1097 from stanleylai/master 
Added support for LED backlight, XD60v2's RGB underglow LED
 2017-02-20 11:10:20 -05:00
Gabriel Young
64eecfc530 fix typos in keymap 2017-02-19 22:23:32 -08:00
nstickney
5abe05147c familiar layout v0.1 from ErgoDox-EZ configurator 2017-02-19 21:25:35 -06:00
Gabriel Young
ed15973a3f Document size added by MIDI_ENABLE (~3800 bytes according to my experiments) 
satan/keymaps/midi

MIDI_ENABLE = no

   text	   data	    bss	    dec	    hex	filename
      0	  17080	      0	  17080	   42b8	satan_midi.hex

MIDI_ENABLE = yes
#define MIDI_TONE_KEYCODE_OCTAVES 3 // default

   text	   data	    bss	    dec	    hex	filename
      0	  20846	      0	  20846	   516e	satan_midi.hex

MIDI_ENABLE = yes
#define MIDI_TONE_KEYCODE_OCTAVES 2 // fewer octaves

   text	   data	    bss	    dec	    hex	filename
      0	  20846	      0	  20846	   516e	satan_midi.hex
 2017-02-19 17:45:08 -08:00
Gabriel Young
d1fe24ad9f Allow customization of the number of tone keycodes and add example keymap 2017-02-19 17:18:05 -08:00
Kenichi Sasaki
c61b5d88a8 change bracket key posision 2017-02-19 22:46:54 +09:00
Stanley Lai
76b1f392ab XD60: Added BL_TOGG back to keymap, with 6 backlight steps 2017-02-18 21:47:11 -08:00
Jack Humbert
c2239e6b96 merging 2017-02-19 00:04:14 -05:00
Stanley Lai
d168822477 Updated XD60 readme and photos to reflect v2 PCB 2017-02-18 20:56:17 -08:00
Kenichi Sasaki
ab5d4ae803 fix 2017-02-18 02:19:56 +09:00
Kenichi Sasaki
6d16d282bf remove reset key 2017-02-18 01:27:12 +09:00
Kenichi Sasaki
e9b1958df2 Added JIS keymap symbols 2017-02-18 01:07:04 +09:00
Kenichi Sasaki
62aacd06ed copied and Meta(ESC) 2017-02-18 00:40:15 +09:00
skullY
1d87df5262 Add the mouse_keys layout 2017-02-16 14:04:04 -08:00
Xyverz
ca1ec7b121 Fixed the TODO list. 2017-02-16 13:48:54 -08:00
skullY
cbef63d8fa Rework the clueboard keymaps a bit. 2017-02-16 13:40:45 -08:00
Stephen Tudor
33bc4c070c Update smt Planck keymap 2017-02-16 14:32:46 -05:00
Stephen Tudor
334edc3c7d Add smt keymap for Let's Split (based on serial) 2017-02-16 14:32:24 -05:00
Jack Humbert
49e72632d2 remove more warnings 2017-02-16 13:13:38 -05:00
Priyadi Iman Nurcahyo
e5bd81f0a6 Fix integer overflow 2017-02-16 23:56:47 +07:00
Priyadi Iman Nurcahyo
21f4944426 Merge branch 'master' into promethium 2017-02-16 23:53:47 +07:00
Priyadi Iman Nurcahyo
96a8e2d5f5 reposition ins and del key 2017-02-16 23:53:09 +07:00
Jack Humbert
e34c3936b7 Merge pull request #1105 from nrrkeene/master 
The Ordinary Layout v5
 2017-02-16 09:49:24 -05:00
Xyverz
6fa6e6c4c6 Fixed inaccuracies in keymap comments and the readme. 2017-02-15 23:01:27 -08:00
Xyverz
80d5649f25 More refinements to my Kinesis keymap. Added a readme.md file. 2017-02-15 22:54:52 -08:00
Xyverz
1dabceb197 minor adjustments. 2017-02-15 21:56:48 -08:00
Nicholas Keene
d99f03a1a6 The Ordinary Layout has all the keys in the right places. 2017-02-15 23:11:04 -06:00
Nicholas Keene
7606f784dd This is the best layout, really, come look 2017-02-15 23:02:30 -06:00
Nicholas Keene
af942f2e57 The Ordinary Layout is the best one, the one you are looking for. Really. Check it out. 2017-02-15 22:33:04 -06:00
Xyverz
ea20a064b9 Added my keymap to the Kinesis project. 2017-02-15 20:14:32 -08:00
Priyadi Iman Nurcahyo
ac04fe0301 Added README for my keymap 2017-02-15 19:40:33 +07:00
Priyadi Iman Nurcahyo
3882f97d2e Move keyboard specific stuff to keyboard specific files, and vice versa 2017-02-15 19:22:58 +07:00
Priyadi Iman Nurcahyo
1eac297a2f Added copyright notice 2017-02-15 16:39:19 +07:00
Priyadi Iman Nurcahyo
c2f0207d59 Merge my Planck-like keyboards 2017-02-15 16:36:31 +07:00
Priyadi Iman Nurcahyo
b128617ede Merge branch 'master' into promethium 2017-02-15 15:51:42 +07:00
Nicholas Keene
54785c1976 The Ordinary Layout is boring, normal, typical, expected. 2017-02-14 22:47:11 -06:00
Nicholas Keene
e006b4a600 The Ordinary Layout has a feature for one-handed chorded typing 2017-02-14 22:32:31 -06:00
Nicholas Keene
1e09698146 All my friends us The Ordinary Layout because it doesn't force you to change you typing habits 2017-02-14 22:31:54 -06:00
Nicholas Keene
c055098952 The Ordinary Layout now has more symbols on the Symbols layer! So useful! 2017-02-14 22:30:07 -06:00
Priyadi Iman Nurcahyo
168c912027 Move Alt-Tab position 2017-02-15 05:38:40 +07:00
Priyadi Iman Nurcahyo
df311c7b40 num, func, punc 3state layer done right 2017-02-15 05:01:03 +07:00
Stanley Lai
3272821d32 Added support for XD60v2 with RGB underglow and LED backlight support 2017-02-13 18:09:02 -08: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
Jack Humbert
fd2925efba Merge pull request #1094 from priyadi/faux_clicky 
Implement faux-clicky feature
 2017-02-13 10:58:50 -05: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
Marvin Ramin
24a40d63c9 define missing KC_NO macro 2017-02-13 13:44:53 +01: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
Priyadi Iman Nurcahyo
97472aabe6 Forgot to add ifdef to optional feature 2017-02-13 17:58:06 +07:00
Priyadi Iman Nurcahyo
68e5c85999 Remove assignment warning 2017-02-13 17:58:06 +07:00
Priyadi Iman Nurcahyo
455568d197 Workaround to remove warning 2017-02-13 17:58:06 +07:00
Priyadi Iman Nurcahyo
5d5f2ff50d Some space optimization and housekeeping 2017-02-13 17:58:06 +07:00
Marvin Ramin
b28fb29898 adds documentation for reset button and adds one to the default keymap 2017-02-13 09:03:43 +01: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
luc wastiaux
3bf6c43de7 updated readme 2017-02-13 07:46:07 +08:00
luc wastiaux
352d79e1fb Merge remote-tracking branch 'upstream/master' 2017-02-13 07:44:28 +08:00
Jack Humbert
4505db5d0e Merge pull request #1091 from smt/smt/tv44 
Add smt keymap for tv44 (MiniVan)
 2017-02-12 18:42:44 -05:00
luc wastiaux
5f8535b356 change thumb cluster key to be shift 2017-02-13 07:16:01 +08:00
Stephen Tudor
b6730285b4 Add smt keymap for tv44 (MiniVan) 2017-02-12 12:46:24 -05:00
Jack Humbert
8d0fdf1008 adds soft pwm for non-timed ports 2017-02-12 11:29:42 -05:00
milestogo
274b1c53fb keymap update 2017-02-11 22:10:44 -08:00
Xyverz
719f6f0293 Merge remote-tracking branch 'upstream/master' 2017-02-11 21:57:54 -08:00
Xyverz
4894150094 Changes to the keymap to accommodate the RGB Underglow lighting. 2017-02-11 21:54:58 -08:00
Xyverz
134c354fc5 Adding a config file so that I can get RGB underglow for my Let's Split 2017-02-11 21:54:05 -08:00
Jack Humbert
6d6b3ee9fb Merge pull request #1065 from milestogo/master 
Update to kinesis keymaps
 2017-02-11 11:51:06 -05:00
Jack Humbert
6bb479ea45 Merge pull request #1085 from priyadi/promethium 
Promethium keyboard layout update
 2017-02-11 11:49:00 -05:00
Jack Humbert
5bdddb7821 Merge pull request #1087 from mneme/master 
Updated keymap for atreus62/mneme
 2017-02-11 11:48:39 -05:00
Jack Humbert
199458378b Merge pull request #1088 from Mauin/gon_nerd 
add GON NerD
 2017-02-11 11:48:11 -05:00
Marvin Ramin
5daa3a8836 add GON NerD 2017-02-11 17:14:40 +01:00
Priyadi Iman Nurcahyo
4163a3819e Add regular space to B+N on GUI layer for repeating space 2017-02-11 22:16:19 +07:00
Priyadi Iman Nurcahyo
4c05e39a02 Switch to Emoji layer using Punc + greek 2017-02-11 22:13:35 +07:00
Priyadi Iman Nurcahyo
4586b19be3 Turn off capslock when entering num layer 2017-02-11 22:07:04 +07:00
Priyadi Iman Nurcahyo
c6123b2e4a Move X in number layer away from space 2017-02-11 22:03:34 +07:00
Priyadi Iman Nurcahyo
513286cf98 LSpace + RSpace = switch layer 2017-02-11 21:54:10 +07:00
David Olsson
52e2afe673 correct spelling in readme 2017-02-11 15:09:30 +01:00
Priyadi Iman Nurcahyo
79de0cd119 Implement Capslock LED 2017-02-11 19:03:18 +07:00
David Olsson
052f81aaca Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2017-02-11 10:50:37 +01:00
David Olsson
aa69337cf5 update readme 2017-02-11 10:49:53 +01:00
Priyadi Iman Nurcahyo
9fc3afbef4 simplify battery calculation for now 2017-02-11 14:50:43 +07:00
Xyverz
902d5077cd Merge remote-tracking branch 'upstream/master' 2017-02-10 23:34:27 -08:00
Xyverz
4d7105c2cf Added RGB Underglow to my Preonic 2017-02-10 23:30:08 -08:00
Priyadi Iman Nurcahyo
b31ac35441 Fix emoji layer 2017-02-11 01:30:08 +07:00
Priyadi Iman Nurcahyo
fdd06d3fca RShift + LShift = Capslock 2017-02-11 00:21:27 +07:00
Priyadi Iman Nurcahyo
bf31f516e3 Add reset keycode 2017-02-11 00:07:44 +07:00
Priyadi Iman Nurcahyo
909fd4ae64 Generalize layer indicators 2017-02-11 00:07:10 +07:00
Priyadi Iman Nurcahyo
229e38f097 Add ifdefs for keyboard layouts 2017-02-10 22:15:15 +07:00
Priyadi Iman Nurcahyo
5944ab246a Implement battery level indicator 2017-02-10 21:28:46 +07:00
luc wastiaux
420a032e8d made left shift an MO for SHELL_NAV 2017-02-10 21:44:27 +08:00
Priyadi Iman Nurcahyo
07879bf66b Add function to cycle backlight modes 2017-02-10 17:45:12 +07:00
Priyadi Iman Nurcahyo
a5b8db52a0 Activate SYS layer by pressing both Ctrls 2017-02-10 17:11:52 +07:00
VoodaGod
c0cfacda98 fixed readme (i swear) 2017-02-10 09:51:08 +01:00
Priyadi Iman Nurcahyo
4ffbfe8298 Restore GUI layer 2017-02-10 14:43:56 +07:00
Priyadi Iman Nurcahyo
0f92d305e2 Add slash/question mark to punc/num layer 2017-02-10 14:32:24 +07:00
milestogo
b0537f75df Merge branch 'master' into sculpt2 2017-02-09 23:28:39 -08:00
milestogo
41c93575a8 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2017-02-09 23:28:15 -08:00
milestogo
5ac0e6e6ae dumber sculpt build 2017-02-09 23:23:39 -08:00
Priyadi Iman Nurcahyo
a4a57d47ed Reimplement GUI Layer 2017-02-10 13:13:04 +07:00
Priyadi Iman Nurcahyo
27e7eac279 Reorganize punctuation & numbers layer 2017-02-10 06:51:10 +07:00
Priyadi Iman Nurcahyo
dee6a6982c Fix LED indicator 2017-02-10 06:31:29 +07:00
Priyadi Iman Nurcahyo
af97d6b58e Add dvorak & norman layout. Add sys layer. 2017-02-10 06:01:59 +07:00
Priyadi Iman Nurcahyo
92308ed0e5 Remove audio stuff 2017-02-10 02:08:55 +07:00
Jack Humbert
d537120eab Merge pull request #1078 from VoodaGod/bone2planck 
updated Bone2Planck Keymap, Readme & fixed Makefile
 2017-02-09 10:38:46 -05:00
Rob Rogers
2b95f41b91 [Typo] correct link to default keymap in readme. 2017-02-09 09:08:50 -06: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
Priyadi Iman Nurcahyo
4be4ed3397 Add USB-BLE manual output switching and indicator 2017-02-09 01:40:22 +07:00
Priyadi Iman Nurcahyo
3f2c0bfa86 Merge branch 'master' into promethium 2017-02-09 01:01:24 +07:00
Xyverz
060f075fd1 Added another handwired board, the Atreus50. 
Added a layer for WOW to my Atreus62.
 2017-02-07 22:14:56 -08:00
dungdung
304d84cd08 Moved KC60 capslock LED code to standard led_set_kb so it can be overridden by users 2017-02-07 16:55:40 -08:00
Jimmy Chan
56d2198b3d rename I2C_MASTER_RIGHT to MASTER_RIGHT since this works for serial as well 2017-02-07 12:36:52 -08:00
Jimmy Chan
048ef311dc udpate readme to reflect QMK and not having the Makefile from ahtn's repo 2017-02-07 12:33:35 -08:00
Jimmy Chan
9c02e2ab49 correctly put eeprom EE_HANDS at addr 0x0a (decimal 10). default to rev2 project. do not default EE_HANDS for the serial keymap 
if you compare split_util.h with the original project by ahtn, the
address we look for isLeftHand config went from addr 7 to addr 10
(decimal). The EEP files were not updated.

EE_HANDS should not be enabled by default since it's more confusing for
most users
 2017-02-07 12:30:24 -08:00
Jack Humbert
d639bd2021 Merge pull request #1072 from nicinabox/improve-ls-avrdude-target 
Check for Pro Micro serial port automatically
 2017-02-07 13:52:03 -05:00
Jack Humbert
c0c69a1a7c Merge pull request #1068 from adzenith/master 
Minor cleanup
 2017-02-07 13:27:41 -05: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
de659486f5 pass through travis errors 2017-02-07 12:36:25 -05:00
Jack Humbert
c256ad51bd Merge pull request #1056 from upils/master 
Add reddot handwired keyboard.
 2017-02-07 12:20:29 -05:00
Jack Humbert
790dab27b6 Merge pull request #1053 from TerryMathews/master 
Let's Split: establish rev2fliphalf subproject
 2017-02-07 12:19:45 -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
Nic Aitch
3dbdd15304 Check for a new serial port every second 2017-02-06 19:57:34 -06:00
Jack Humbert
d4c88626bd Merge pull request #1048 from smt/smt/planck 
Add smt's keymap for Planck
 2017-02-06 20:21:42 -05:00
Jack Humbert
b5159c964a Merge pull request #1036 from nicinabox/lets-split-improvements 
Lets Split flashing improvements
 2017-02-06 19:33:07 -05:00
TerryMathews
2a2be010d9 Reverse rev2 and rev2fliphalf 
Flipped definitions on what constitutes "fliphalf" by popular demand.
 2017-02-06 19:23:10 -05:00
TerryMathews
5d55a44afa Revert "Reverse rev2 and rev2fliphalf" 
This reverts commit 0537977ba1.
 2017-02-06 19:21:21 -05:00
TerryMathews
0537977ba1 Reverse rev2 and rev2fliphalf 
Flipped definitions on what constitutes "fliphalf" by popular demand.
 2017-02-06 19:14:57 -05:00
Callum Oakley
21015918b4 change cmd-l and cmd-r for actual home and end 2017-02-06 12:40:32 +00:00
Ole Anders
d1fb51976a Added new keymap to the Satan GH60 keyboard. 
Added new keymap `Admiral Strokers` to the Satan keyboard. This is an
ISO based layout with tap for brackets/ curly on shft and ctl keys.
Furthermore, there is added arrows and media/volume/special/f-keys layer
on the TAB button when you hold.
 2017-02-06 11:53:48 +01:00
milestogo
b0dfb037dc Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2017-02-04 20:08:07 -08:00
Nikolaus Wittenstein
101465b6ed Add missing header to ergodox ordinary keymap 2017-02-03 21:09:50 -05:00
Nikolaus Wittenstein
3faf06c880 Fix compile warnings in egodox robot_test_layout 
Fixes the warning "right shift count >= width of type" by adding UL to
the end of constants.
 2017-02-03 21:07:24 -05:00
johannes
f936a3d5c2 stuff 2017-02-03 14:10:19 +01:00
johannes
8a7daf34a2 initial keymap 2017-02-03 10:47:37 +01:00
Brendan Johan Lee
02a95ee08c Merge remote-tracking branch 'upstream/master' 2017-02-01 08:56:35 +01:00
lucwastiaux
467e284178 increase timeout for dual mode caps key 2017-02-01 13:46:00 +08:00
Erez Zukerman
748316fc43 Merge pull request #1039 from zabereer/albert_ergodox_keymap 
albert ergodox keymap
 2017-01-31 19:29:19 -05:00
upils
f36fc1d2e5 Add reddot handwired keyboard. 2017-01-31 22:37:03 +01:00
milestogo
e8ba4838d3 fixing kinesis reboot 2017-01-30 19:39:23 -08:00
Matthias Schmitt
4c3630dc17 update my neo2 keymap 2017-01-30 23:10:28 +01:00
Brendan Johan Lee
f70758622b [deadcyclo layout] Refactoring. Use custom functions and macros 2017-01-30 19:42:27 +01:00
Brendan Johan Lee
f400ac1d7d [deadcyclo layout] fixed failing tests 2017-01-30 15:45:16 +01:00
Xyverz
4f163b006e First revision of the XK-66 keyboard. 2017-01-30 00:00:09 -08:00
TerryMathews
ef9e544a7e Let's Split: establish rev2fliphalf subproject 
Subproject to accomodate second half pad built in opposite orientation
(places TRRS jacks on opposing edges for shorter cable runs)
 2017-01-29 22:22:32 -05:00
Priyadi Iman Nurcahyo
011811af68 minimize LEDs 2017-01-29 18:37:49 +07:00
Priyadi Iman Nurcahyo
306f43e5ee fix greek layers 2017-01-29 18:37:49 +07:00
Priyadi Iman Nurcahyo
c5ab0b2b61 Implement greek layers on my Promethium layout 2017-01-29 18:37:49 +07: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
Stephen Tudor
1d9e0b0120 s/Bkps/Bksp 2017-01-28 20:54:34 -05:00
Luke Silva
77e54e34e1 Add luke keymap, as an example of the tapping macros 2017-01-29 11:27:38 +11:00
Stephen Tudor
7c24ecf580 Carry over Planck updates to my Preonic keymap 2017-01-28 01:38:58 -05: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
lucwastiaux
f6feee8167 eliminate references to shell_layer 2017-01-28 09:45:13 +08:00
lucwastiaux
a1c53d0f93 documented dual mode capslock 2017-01-28 09:42:55 +08:00
milestogo
cb2d4fb80b split kinesis layout into ergodox and planck style symbol layers 2017-01-27 16:45:18 -08:00
folkert4
8c794d73fa Added Espynn's keymap 2017-01-27 13:51:39 -05:00
lucwastiaux
93c1bfa646 dual capslock functionality, activating shell nav or brackets 2017-01-27 23:55:33 +08:00
Brendan Johan Lee
d7aa4724fb Merge remote-tracking branch 'upstream/master' 2017-01-27 15:24:08 +01:00
Brendan Johan Lee
13fa63b192 [deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keys 2017-01-27 13:53:02 +01:00
Albert Pretorius
fffe76a7b7 albert ergodox keymap 2017-01-26 20:07:47 +00:00
Nic Aitch
890ecf6a2a Update readme 2017-01-26 09:31:40 -06:00
Nic Aitch
3131d65563 Add avrdude target 2017-01-26 09:31:27 -06:00
Brendan Johan Lee
8a645aa9ad Merge remote-tracking branch 'upstream/master' 2017-01-26 11:56:32 +01:00
Jack Humbert
c9ca368008 replace jackhumbert with qmk 2017-01-26 01:52:43 -05:00
Jack Humbert
aac7c0aa4d Merge pull request #1029 from SjB/qmk_infinity60 
fix: infinity60 keyboard was not using quantum features.
 2017-01-26 01:28:44 -05:00
Jack Humbert
0212a30aa6 Merge pull request #1033 from smt/smt/preonic 
Add smt's keymap for Preonic
 2017-01-26 01:27:51 -05:00
Stephen Tudor
63e406eca4 Add smt keymap for Planck 2017-01-26 00:24:51 -05:00
Stephen Tudor
6546dddddb Remove COLEMAK from preonic_keycodes enum 2017-01-25 10:57:42 -05:00
Jack Humbert
938422ce99 layer defines to enum 2017-01-25 10:02:01 -05:00
Brendan Johan Lee
8af48194f2 [deadcyclo layout] Added lotsof new emojis and some new unicode keys 2017-01-25 15:16:38 +01:00
Stephen Tudor
51fe4f0d34 Update readme for smt Preonic keymap 2017-01-25 01:08:51 -05:00
Stephen Tudor
b3cf96ec2e Add smt keymap for Preonic 2017-01-25 00:47:45 -05:00
Brendan Johan Lee
d0db044164 Merge remote-tracking branch 'upstream/master' 2017-01-24 21:56:18 +01:00
Brendan Johan Lee
37ed3d13a4 [deadcyclo layout] Added unicode layer 2017-01-24 21:54:34 +01:00
Brendan Johan Lee
3c32e38036 [deadcyclo layout] Added support for ergodox ez shine 2017-01-24 19:10:35 +01:00
Rovanion Luckey
18cc05e2f7 Added instructions for how to build and flash the firmware with teensy_cli. 2017-01-24 10:02:56 +01:00
SjB
9111cc00f5 updated all the other keymaps to support the new changes. 
qmk firmware requires the matrix_init_user and matrix_scan_user
function to be implementated. Added these function to all the existing
keymaps.
 2017-01-24 00:24:01 -05:00
SjB
a777495683 fix: infinity60 keyboard was not using quantum features. 
the quantum matrix codes where not being initialized or/and called
so no feature of the quantum firmware could be used. These codes have
been added and now we can enjoy the quantum firmware goodness.
 2017-01-23 23:15:31 -05:00
Jack Humbert
841d7e6a1d turn off rgb_midi in ez 2017-01-23 13:55:24 -05:00
Jack Humbert
6d377bcc9c Merge pull request #1026 from TerryMathews/master 
Let's Split: More code cleanup
 2017-01-23 00:33:29 -05:00
TerryMathews
372af5e3f6 More code cleanup 
Missed a few commented out vestigal defines in revx/config.h that had
been moved to keymap/serial and i2c.
 2017-01-22 22:06:53 -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
Jack Humbert
79a823d802 Merge pull request #1020 from remigius42/master 
Swiss German layout for Ergodox EZ & Infinity
 2017-01-22 18:59:57 -05:00
Jack Humbert
a8a1fbbac8 Merge pull request #1022 from lucwastiaux/master 
Improvements to Dvorak Programmer Ergodox keymap
 2017-01-22 18:59:12 -05:00
Jack Humbert
a54944ac33 Merge pull request #1021 from luizribeiro/ps2avrGB 
Support for ps2avrGB / winkeyless.kr boards
 2017-01-22 18:58:46 -05:00
Jack Humbert
405b2ae267 Merge pull request #1023 from TerryMathews/master 
Corrects Let's Split code
 2017-01-22 18:57:44 -05:00
TerryMathews
99d548c4fb Missed commenting out notes at end of line 2017-01-22 15:57:30 -05:00
TerryMathews
a00957abca Fixed keymap matrix on rev2 
* Fixed keymap matrix in rev2 so that left half and right half match
when in same orientation.
 2017-01-22 15:50:08 -05:00
TerryMathews
efa526f570 Created lines to uncomment keyboards built upside down 
* Reverses column order to fix left-to-right key order that occurs if
PCB assembled upside down.
 2017-01-22 15:46:43 -05:00
TerryMathews
9d24943ec1 Refactor code to eliminate duplicate defines 
* Moved duplicated defines out of inappropriate source files (matrix
pins in keymap subdirectory)
* Eliminated default keymap directory
* Hardcoded serial keymap to use serial defines and EE_CONFIG
* Hardcoded i2c keymap to use i2c defines
 2017-01-22 15:37:48 -05:00
Andreas Schmidt
08c192caea SG Ergodox layout: Updated layout documentation 
- Swiss German Ergodox layout:
    Updated layout documentation based on previous
    layout changes.
 2017-01-22 12:57:58 +01:00
Andreas Schmidt
afd2c2ee9e SG Ergodox layout: Fixed ENTER key mapping 
- Swiss German Ergodox layout:
    Additional ENTER key was mapped to wrong layer
    and keyboard half.
 2017-01-22 12:43:46 +01:00
Andreas Schmidt
c2c8a12022 SG Ergodox layout: Minor code formatting changes 
- Swiss German Ergodox layout:
    Removed unnecessary spaces.
 2017-01-22 12:35:24 +01:00
Andreas Schmidt
5c4a73d788 SG Ergodox layout: Add ENTER to left keyboard 
- Swiss German Ergodox layout:
    Added ENTER key to left keyboard half on media layer
    such that the enter key is available on both halves to
    be able to flash both halves without an additional keyboard.
 2017-01-22 12:32:40 +01:00
Andreas Schmidt
3fd9aa3660 SG Ergodox layout: Add <br/> macro to media layer 
- Added <br/> macro to media layer of Swiss German layout
    for Ergodox
 2017-01-22 12:30:18 +01:00
lucwastiaux
803a861b4e document BRACKETS and SHELL_LAYER 2017-01-22 10:32:17 +08:00
Luiz Ribeiro
642d0acef5 Added a copyright header to the default keymap... ¯\_(ツ)_/¯ 2017-01-21 18:23:44 -05:00
Luiz Ribeiro
bfbab75292 Slightly saner default keymap for ps2avrGB and removed some unused code 2017-01-21 18:15:39 -05:00
Luiz Ribeiro
9ce38cbccf Simplified and polished a bit the code changes on tmk_core 2017-01-21 17:18:05 -05:00
Andreas Schmidt
eb6abb6305 Renamed JSON source of Ergodox Swiss German 
- Renamed the JSON source files for the layout description of
    the Ergodox Swiss German keymap
 2017-01-21 20:58:28 +01:00
Andreas Schmidt
6b5cd656fd Correct layout description of ergodox swissgerman 
- Added missing HTML macros to media layer.
 2017-01-21 20:55:18 +01:00
Andreas Schmidt
250628de04 Removed Ergodox EZ & Infinity specific keymaps 
- Removed the keymaps for Swiss German spefic for Ergodox EZ
    and Infinity after previously merging them.
 2017-01-21 20:22:24 +01:00
Andreas Schmidt
c26c81c7f3 Merged keymap for Ergodox EZ & Infinity 
- Merged keymap for Ergodox EZ & Infinity into one single
    keymap using pre-processor macros.
 2017-01-21 20:20:47 +01:00
Luiz Ribeiro
461dfd4462 Simplification and code polish on ps2avrGB directory 2017-01-21 13:52:23 -05:00
Luiz Ribeiro
f7462aaa61 Got ps2avrGB to work with the V-USB protocol 2017-01-21 12:55:19 -05:00
lucwastiaux
4cf0f7dd16 make shell layer more compatible with default layer 2017-01-21 23:42:23 +08:00
Andreas Schmidt
bf0b355bc8 Add Swiss German layout for Ergodox Infinity 
- Add Swiss German layout for Ergodox Infinity based on default
    layout for Ergodox EZ.
- Minor changes in the event loop to prevent flashing display
    background lights.
 2017-01-21 16:24:41 +01:00
Andreas Schmidt
cbb1927d6f Add Swiss German layout for Ergodox EZ 
- Add Swiss German layout for Ergodox EZ based on default
    layout for Ergodox EZ.
- Minor changes in the event loop to prevent flashing of leds.
 2017-01-21 16:22:40 +01:00
lucwastiaux
01e750a372 couple of changes to the shell layer 2017-01-21 23:15:37 +08: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
Xyverz
80bc598585 Added Let's Split 2017-01-19 06:51:24 -08:00
Xyverz
c8a0ab1867 Changes to Atreus62 keymap, adding Let's Split keymap. 2017-01-19 06:49:59 -08:00
lucwastiaux
072237bce8 introduce shell_layer 2017-01-19 22:45:30 +08:00
Arthur Nogueira Neves
489d0ab581 this is the atreus doc 2017-01-18 21:12:02 -05:00
David Olsson
f35adb4f37 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2017-01-18 22:58:49 +01:00
Mitch Lloyd
0815c7ae17 Update mitch layout for new keymaps 2017-01-17 13:01:07 -08:00
David Olsson
d910b94a3c Don't change ralt to lalt, it's really not the same thing on windows. 2017-01-17 19:33:09 +01:00
lucwastiaux
1ac15e6b3a put shell nav under tab, introduce an OSL for the brackets layer 2017-01-17 20:34:05 +08:00
David Olsson
53382d9564 whitespace fixes 2017-01-16 21:31:44 +01:00
David Olsson
a37e924e36 vi style arrow keys. Live unicode switch support 2017-01-16 21:10:25 +01:00
Jack Humbert
6f44885615 Merge pull request #987 from belak/belak/whitefox-initial-support 
Initial whitefox support
 2017-01-15 01:14:02 -05:00
Jack Humbert
81b89f8b2b Merge pull request #996 from milestogo/master 
kinesis keyboard with subdirectories for different hardware - matches pull #911
 2017-01-15 01:13:15 -05:00
Jack Humbert
99d0b54e5e Merge pull request #999 from deadcyclo/master 
Adds layer images to the deadcyclo layout readme
 2017-01-15 01:12:21 -05:00
Jack Humbert
b2dcac9655 Merge pull request #1003 from mneme/master 
Layout "Mneme" for Atreus62
 2017-01-15 01:12:04 -05:00
Jack Humbert
ff76ee8377 Merge pull request #1005 from kd0kkv/patch-1 
Update keymap.c
 2017-01-15 01:11:38 -05:00
Jack Humbert
5036112d39 Merge pull request #1006 from Vifon/master 
Update the vifon keymap
 2017-01-15 01:11:04 -05:00
Jack Humbert
a896b300ec Merge pull request #1007 from bryan4887/bryan 
Added Bryan's keymap
 2017-01-15 01:10:39 -05:00
Bryan Hernandez
aa0939b5ef Added Bryan's keymap 2017-01-13 21:51:55 -06:00
Wojciech Siewierski
c6299a7859 Update the vifon keymap 2017-01-13 18:52:13 +01:00
kd0kkv
c660d5f814 Update keymap.c 
Fixed the default querty layout to have a B button and just one F
 2017-01-13 08:30:46 -06:00
Xyverz
1074642c36 initial commit of my Atreus62 keymap 2017-01-13 01:51:52 -08:00
David Olsson
236a0b0b60 Update makefile. 
Readme.
 2017-01-12 16:00:09 +01:00
David Olsson
b2419b31d3 - Change docs to match keymap. 
- Switched around modifiers on the function layer to match muscle memory.
- Added support for application switching.
 2017-01-12 15:36:14 +01:00
David Olsson
ed975f2454 Remove comments and change to correct KN_PLUS instead of KC_PLUS. 2017-01-12 00:14:42 +01:00
David Olsson
1bef7bf45a Link fix in readme. 2017-01-11 23:43:13 +01:00
David Olsson
e491f5a4d0 Readme + minor change to make it match reality. 2017-01-11 23:41:07 +01:00
David Olsson
3a453a03ed Atreus62 first semi-final draft 2017-01-11 23:00:34 +01:00
Brendan Johan Lee
c4fca8b6bc Fixed incorrect layer image in deadcyclo readme 2017-01-10 19:23:59 +01:00
Brendan Johan Lee
1121753746 Merge remote-tracking branch 'upstream/master' 2017-01-10 19:21:33 +01:00
Brendan Johan Lee
db1aec159d Added layer images to deadcyclo layout readme 2017-01-10 19:20:25 +01:00
Kaleb Elwert
a55c5e3ea3 Wait for two ticks rather than 1 2017-01-10 03:00:36 -08:00
Xyverz
7a9a5d0e62 Add files via upload 
tidying up the keymap
 2017-01-09 19:08:46 -08:00
Kaleb Elwert
0b38204e62 Fix mismatched indentation 2017-01-09 11:57:44 -08:00
Kaleb Elwert
49a00a535f Update clock frequencies to match the infinity ergodox 2017-01-09 11:15:10 -08:00
Kaleb Elwert
a702f4631e Increase tick frequency for responsiveness 
Based off of PR #866 which did the same thing for the infinity60
 2017-01-09 10:54:36 -08:00
Kaleb Elwert
ef2ebeb3ca Remove KC_ prefix from KEYMAP macro to match other keyboards 2017-01-09 10:45:34 -08:00
milestogo
9d4cc2f3f1 removing old programmer layout, in favor of milestogo 2017-01-08 22:25:41 -08:00
milestogo
62f1c13c3a trying to clean up duplicate docs 2017-01-08 22:17:47 -08:00
milestogo
f74ff86f9c kinesis remap 2017-01-08 22:02:01 -08:00
xyverz
99521a4482 Merge remote-tracking branch 'upstream/master' 2017-01-08 21:47:08 -08:00
xyverz
79343f1c6c Usaility changes to keymap, tidying up a bit. 2017-01-08 21:44:31 -08:00
Jack Humbert
18d013b25b Merge pull request #993 from priyadi/greek_layer 
Greek alphabet layer
 2017-01-08 21:11:32 -05: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
Joshua T
8f8d104759 Merged from upstream 2017-01-07 14:01:21 -06:00
Joshua T
b7b44dc481 Updated README and images to reflect latest keymap 2017-01-07 13:57:51 -06:00
Joshua T
677ae86bde Added another Shift on Extend layer. 
This moves the GUI key to the pinkie, but honestly, I never use that function anyway.
 2017-01-07 13:07:55 -06:00
Joshua T
fe51724544 Updated Atreus layout to 0.4 
Removed Alt on base layer, replaced with Function layer.

Moved function keys to left hand.  Added mouse keys to right hand on the function layer.

Moved middle click on gaming layer to be consistent with mouse layer.

Added macro _USER. Macro contents are not implemented yet.
 2017-01-06 19:56:57 -06:00
Joshua T
5ce7ec9ea5 Increased TAPPING_TERM to 200 2017-01-06 17:08:14 -06:00
Joshua T
6fba925f41 Fixed key not matching its diagram 2017-01-06 17:07:58 -06:00
ishigoya
402e6c13a1 new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.png 
new file:   keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-jpL.png
	new file:   keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-numL.png
	modified:   keyboards/ergodox/keymaps/ishigoya-jp/keymap.c
	new file:   keyboards/ergodox/keymaps/ishigoya-jp/readme.md
 2017-01-06 17:53:04 +09:00
ishigoya
0bd03d698c new file: keyboards/ergodox/keymaps/ishigoya-jp/keymap.c 2017-01-06 16:41:14 +09:00
Kaleb Elwert
ca9a3dcb71 Fix unrelated spelling error 2017-01-04 21:20:06 -08:00
Kaleb Elwert
ccde1d8b5e Add white fox to keyboards readme 2017-01-04 21:19:32 -08:00
Jack Humbert
e5c7b5d8fc Merge pull request #983 from common-nighthawk/master 
adds personal keymap for ergodox optimized for macOS with Vim
 2017-01-04 23:41:56 -05:00
Jack Humbert
6a59dfb4c6 Merge pull request #984 from deadcyclo/master 
Added the deadcyclo layout
 2017-01-04 23:41:29 -05:00
Jeremy Cowgar
5fca9ff4d5 Added Jeremy’s developers keymap for the Planck 2017-01-04 10:51:00 -05:00
Kaleb Elwert
262d31c389 Add whitefox readme 2017-01-04 00:29:58 -08:00
Kaleb Elwert
300c71a023 Remove unneeded define 2017-01-04 00:05:18 -08:00
Kaleb Elwert
8377d5fdc5 Initial whitefox support 2017-01-03 23:41:52 -08:00
Brendan Johan Lee
a85aefd27a fix version macro making layer 3 sticky on deadcyclo layout 2017-01-03 15:09:25 +01:00
Brendan Johan Lee
b23a963bec Added the deadcyclo layout 2017-01-02 19:12:06 +01:00
Jack Humbert
ffc1d97672 Update config.h 2017-01-02 09:57:39 -05:00
Daniel
0de3a5d0b2 reverts change outside of personal keymap. 2017-01-01 21:02:43 -07:00
Daniel
acffbb480f adds dedicated double-quote key. 2017-01-01 20:09:30 -07:00
TerryMathews
925ed44405 Establish support for AMJPAD 2016-12-31 13:19:05 -05:00
Jack Humbert
6dbcc50f56 Merge pull request #975 from fredizzimo/remove_temp_files 
Remove extra file that has been commited by mistake
 2016-12-30 11:12:47 -05:00
Fred Sundvik
52430ef0d6 Remove extra file that has been commited by mistake 2016-12-29 12:26:41 +02:00
coderkun
b0ade6dc98 Fix return value of hex_to_keycode() function in keymap “coderkun_neo2” 2016-12-28 20:08:45 +01:00
Gergely Nagy
eb588d630c ergodox: Update algernon's keymap to v1.10 
Miscellaneous
=============

* `µ` can now be entered with UCIS.
* `™` can now be entered with UCIS.

Tools
=====

* `tools/hid-commands` can now find Banshee, and prefers it over Kodi.
* `tools/hid-commands` can now find Chrome too, not juts Chromium.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
 2016-12-28 19:27:48 +01:00
Jack Humbert
d3ec88cd07 Merge pull request #966 from Dbroqua/master 
Some updates for GH60 and Satan keyboard
 2016-12-28 13:04:08 -05:00
dbroqua
db48b28eeb - Updated dbroqua layout for Satan keyboard 2016-12-24 14:53:15 +01:00
dbroqua
033f0b92c4 - Added RGB layer on dbroqua GH60 layout 2016-12-24 14:43:07 +01:00
dbroqua
6be061c6d4 - Fixed bug in dbroqua layout for Satan keyboard 2016-12-22 19:08:17 +01:00
dbroqua
46ff5f3b90 - Fixed bad typo in dbroqua layout for gh60 
- Removed unused function in dbroqua layout for gh60
 2016-12-22 08:26:55 +01:00
Erez Zukerman
9675e1357f Update readme.md 2016-12-21 21:09:20 -05:00
Erez Zukerman
a81279158b Update readme.md 2016-12-21 21:08:55 -05:00
Erez Zukerman
4e4f365c87 updates readme 2016-12-21 21:05:58 -05:00
Erez Zukerman
10864def46 New default firmware graphic 2016-12-21 21:03:53 -05:00
dbroqua
5ee136a36f - Renamed dbroqua_hhkb as dbroqua for gh60 layout 2016-12-21 23:12:33 +01:00
dbroqua
d6c545f471 - Rewrote dbroqua layout for Satan keyboard and adding RGB light 2016-12-21 23:08:30 +01:00
Jack Humbert
2fa36e38cf initial subatomic keymap (text) 2016-12-21 00:22:32 -05:00
Jack Humbert
438a5d685b limit voices by default, add some drums 2016-12-20 19:38:22 -05:00
dbroqua
b7696fb3b0 - Updated gh60 files 2016-12-20 18:43:06 +01:00
Jack Humbert
53ea854462 Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2016-12-19 21:01:27 -05:00
Jack Humbert
dd114e648e planck preonic update 2016-12-19 21:01:23 -05:00
Jack Humbert
29c527f0f0 Merge pull request #964 from climbalima/master 
added case stl
 2016-12-19 14:06:39 -05:00
climbalima
281aa1dad0 added case stl from se7en9057 2016-12-19 14:01:40 -05:00
Jack Humbert
101416eb82 Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2016-12-19 11:18:22 -05:00
Jack Humbert
06c64bbff3 rgb clean-up, api clean-up 2016-12-19 11:18:18 -05:00
Erez Zukerman
29731588b7 Flips off MIDI and API_SYSEX 2016-12-19 08:27:05 -05:00
Jack Humbert
8e28bf39d8 Merge pull request #958 from pvinis/master 
make a sysctl MO button so i can quickly use the arrows
 2016-12-18 20:56:20 -05:00
Jack Humbert
96cc053799 Merge pull request #961 from Dbroqua/master 
Updated kc60 layout for dbroqua_hhkb
 2016-12-18 20:55:52 -05:00
Stanley Lai
5834d4b262 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-12-18 15:35:59 -08:00
Stanley Lai
91913146db Added XD60 support 2016-12-18 15:35:03 -08:00
dbroqua
e9f69ff46e - Revert local fail o_O 2016-12-17 22:33:45 +01:00
dbroqua
c3469b8d21 Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware 2016-12-17 22:28:56 +01:00
Damien
c9803f78b2 Merge pull request #14 from jackhumbert/master 
Merged from jackhumbert/qmk_firmware
 2016-12-17 22:28:45 +01:00
dbroqua
df50bee5a8 Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware 2016-12-17 22:25:21 +01:00
dbroqua
46b93f02d5 - Added capslock key 2016-12-17 22:25:08 +01:00
Erez Zukerman
8a65c640ec Adds a troubleshooting layout for resetting the EEPROM 2016-12-16 20:53:42 -05:00
Erez Zukerman
df32d5b769 Removes alt/j dual function 2016-12-16 20:13:40 -05:00
Pavlos Vinieratos
34d6f07d2c make a sysctl MO button so i can quickly use the arrows 2016-12-16 09:46:03 +01: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
Jack Humbert
36dddd45fb Merge pull request #949 from priyadi/promethium 
Promethium firmware update
 2016-12-15 00:03:18 -05:00
Jack Humbert
803040d4ee Merge pull request #952 from pvinis/master 
update my keymap a bit
 2016-12-15 00:03:02 -05:00
Jack Humbert
97f9b05efb Merge pull request #953 from priyadi/ibm_terminal 
IBM Terminal M-122 converter support
 2016-12-15 00:02:45 -05:00
Kyle Smith
83e613ad23 Allow power consumption to be set per-keyboard. 2016-12-14 23:29:33 -05:00
climbalima
16483409cf better switch spacing in svg 2016-12-14 23:11:04 -05:00
lucwastiaux
ebe351a690 enable brackets using the - key on the right, and cleanups 2016-12-15 07:22:31 +08:00
Priyadi Iman Nurcahyo
e58304c094 My layout for M-122 terminal keyboard 2016-12-14 22:34:23 +07:00
Priyadi Iman Nurcahyo
dc49231391 Update KEYMAP macro to be consistent with the rest of QMK 2016-12-14 22:33:56 +07:00
Priyadi Iman Nurcahyo
bd5f323bec IBM Terminal M-122 converter support 
Code ported from TMK to QMK.
 2016-12-14 16:21:01 +07: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
Priyadi Iman Nurcahyo
e5b165c255 fine tune trackpoint initialization 2016-12-14 07:10:28 +07:00
Priyadi Iman Nurcahyo
32e952bda9 disable remote mode 2016-12-14 06:03:27 +07:00
Priyadi Iman Nurcahyo
0b54b32361 Enable Adafruit BLE support 2016-12-14 06:03:27 +07:00
Priyadi Iman Nurcahyo
9838ddcead Pretend to be Thinkpad USB Keyboard 2016-12-14 06:03:27 +07:00
Priyadi Iman Nurcahyo
a747343b61 Enable PS2 remote mode 2016-12-14 06:03:27 +07:00
Jack Humbert
20892bf706 Merge pull request #948 from climbalima/master 
svg bug fix and added pilcrow to hand wire
 2016-12-12 23:32:14 -05:00
climbalima
5dce74d0ff svg bug fix and added pilcrow to hand wire 2016-12-12 22:36:16 -05:00
Jack Humbert
0edfe55bfe re-enable audio and extrakeys 2016-12-12 15:39:07 -05:00
Jack Humbert
0213acbdbe Merge pull request #946 from climbalima/master 
Changed lets split svg to support boston meetup pcb
 2016-12-12 00:47:48 -05:00
Jack Humbert
6cd55d89e6 Merge pull request #945 from priyadi/planck_priyadi 
Remove unneeded options to reduce firmware size
 2016-12-12 00:47:29 -05:00
climbalima
7bc1caa21c changed svg after merge 2016-12-10 23:18:46 -05:00
climbalima
73d6018296 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-12-10 23:15:47 -05:00
climbalima
56515ba503 changed svg to support proto pcb 2016-12-10 23:13:36 -05:00
Priyadi Iman Nurcahyo
a6db20e518 Remove unneeded options to reduce firmware size 2016-12-10 21:08:22 +07:00
lucwastiaux
75d7eb9cb5 put home/end on thumb cluster 2016-12-10 13:20:05 +08:00
lucwastiaux
a3c8949627 readme updates 2016-12-10 12:52:59 +08:00
lucwastiaux
9240f27ba9 Merge remote-tracking branch 'upstream/master' 2016-12-10 12:49:47 +08:00
lucwastiaux
dc4c8875ba use thumb cluster key to toggle brackets layer 2016-12-10 12:37:32 +08:00
Damien
13c4080a1d Merge pull request #13 from jackhumbert/master 
Merged from qmk
 2016-12-09 19:44:03 +01:00
Pavlos Vinieratos
9a59fee667 tap dance for some layers. one tap sysctl, two taps mouse. 2016-12-09 16:01:11 +01:00
Pavlos Vinieratos
063ade6bb5 add light for some layers 2016-12-09 16:00:46 +01:00
Pavlos Vinieratos
be2863e56d separate sysctl and mouse layers 2016-12-09 16:00:10 +01:00
Pavlos Vinieratos
d5914a4dfe add alt key 2016-12-09 14:37:22 +01:00
Pavlos Vinieratos
5d241479f5 media keys 2016-12-09 14:37:07 +01:00
xyverz
9216bc7377 Merge remote-tracking branch 'upstream/master' 2016-12-06 17:36:19 -08:00
Daniel
1f52dbcac0 removes double-tab brackets and adds back quot to left cmd. 2016-12-06 14:15:23 -06:00
Erez Zukerman
cd41355069 Merge pull request #936 from jackhumbert/f/shine_default 
Official default factory firmware for ErgoDox EZ Shine
 2016-12-06 07:57:02 -05:00
Erez Zukerman
82922a4937 A new default layout that supports Shine 2016-12-05 20:35:03 -05:00
Erez Zukerman
a05b6a72d9 Adjusts config for better mousekey support 2016-12-05 20:34:24 -05: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
Priyadi Iman Nurcahyo
c7d11fd001 Remove unnecessary build options 2016-12-05 02:15:38 +07:00
Priyadi Iman Nurcahyo
e18a75609d Merge branch 'master' into promethium 2016-12-05 02:01:20 +07:00
Jack Humbert
dd2911151b Merge pull request #932 from climbalima/master 
Added ponoko svg for lets split
 2016-12-04 13:53:25 -05:00
Priyadi Iman Nurcahyo
73073f270b Trackpoint initialization 2016-12-05 01:15:04 +07:00
Priyadi Iman Nurcahyo
fc80aa9974 Merge branch 'master' into promethium 2016-12-04 23:57:47 +07:00
Priyadi Iman Nurcahyo
a8e5f61805 fix emoji LED indicators. 2016-12-04 23:55:06 +07:00
Priyadi Iman Nurcahyo
75b18773bd fix RGB LED order 2016-12-04 14:51:27 +07:00
climbalima
0f71c81df8 having trouble with conflicts 2016-12-03 17:37:41 -05:00
climbalima
45b7718fb1 cleaned up personal projects 2016-12-03 17:30:40 -05:00
climbalima
59c54d651b Merge https://github.com/climbalima/qmk_firmware 2016-12-03 17:15:22 -05:00
climbalima
ae66f0d702 added plate files for lets split 2016-12-03 17:09:11 -05:00
climbalima
2186e5ae85 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-12-03 17:01:26 -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
Jack Humbert
4bcec04c01 Merge pull request #924 from cbbrowne/master 
Keymapping revs, revisions to documentation on API_SYSEX_ENABLE
 2016-12-02 13:06:31 -05:00
Erez Zukerman
aa70aa3962 Tweaks Kristian's layout again 2016-12-02 13:03:39 -05:00
Erez Zukerman
5d43a2aecf Kristian's keymap 2016-12-02 12:53:18 -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
cbbrowne
13eb2f826b Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-12-01 12:54:16 -05:00
Erez Zukerman
66b13a66e9 Better layout 2016-11-30 22:22:57 -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
Erez Zukerman
4094544d41 Test layout for ErgoDox EZ manufacturing robot 2016-11-29 09:23:16 -05:00
Erez Zukerman
51ae6da99e Merge pull request #918 from jackhumbert/wu5y7 
Adds Ergodox EZ RGB lights (both sides using I2C) and implements API base, Midi SysEx API
 2016-11-29 08:16:04 -05:00
Jack Humbert
f946d830f9 guess i didnt pull 2016-11-29 00:11:11 -05:00
Jack Humbert
efbc205efd Merge branch 'wu5y7' of github.com:jackhumbert/qmk_firmware into wu5y7 2016-11-29 00:10:06 -05:00
Jack Humbert
d0cefef946 enable rgblight by default for ez 2016-11-29 00:09:56 -05:00
Jack Humbert
06f18e95d4 enable api sysex for ez 2016-11-29 00:06:12 -05:00
Jack Humbert
6e0f994950 Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7 2016-11-28 23:51:07 -05:00
cbbrowne
5776f39667 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-11-28 12:27:42 -05:00
Olivier
5a2501d90f Add the AZERTY compatibility layer. 2016-11-28 16:38:03 +01:00
Olivier
f02eccbb29 Change layer names (cosmetic change) and reorder them so that the "shift" layer can be accessed from the "alt" layer when in QWERTY compat mode. 2016-11-28 14:16:42 +01:00
Erez Zukerman
84735836e3 Tweaks position of TOG not to conflict with MO 2016-11-28 08:13:32 -05:00
Olivier
d2b6438e39 A little cleanup, add some comments, change others. 2016-11-28 14:10:31 +01:00
Erez Zukerman
9caf866618 Tweaks EZ Makefile 2016-11-28 07:59:01 -05:00
Erez Zukerman
2d0ada0190 Pulls LED config into common config for EZ 2016-11-28 07:55:02 -05:00
Olivier
3f1fca2eb8 Adjust comment. 2016-11-28 11:21:23 +01:00
Olivier
e26a80508f Reorganize the numeric keypad layer more like a traditional numeric keypad. 2016-11-28 11:20:00 +01:00
Olivier
d6d0b7eada Merge https://github.com/jackhumbert/qmk_firmware 2016-11-27 23:23:21 +01:00
Daniel
a94eb16bd7 removes the double actions from the metakeys. 2016-11-27 16:12:32 -06:00
dbroqua
a849bdc581 - Merged 2016-11-27 11:44:30 +01:00
Jack Humbert
7edac212c8 separated into api files/folder 2016-11-26 15:38:44 -05:00
Priyadi Iman Nurcahyo
12c1314b02 update docs 2016-11-27 00:40:31 +07:00
Priyadi Iman Nurcahyo
0f39ab5219 remove ifdef on chip type 2016-11-26 23:48:11 +07:00
Priyadi Iman Nurcahyo
7f3c9c6a39 protocols.mk is already included in latest QMK 2016-11-26 23:48:11 +07:00
Priyadi Iman Nurcahyo
b5019bef05 change init delay to 2000ms 2016-11-26 23:48:11 +07:00
Priyadi Iman Nurcahyo
8ee389c9b6 My Promethium keyboard firmware 2016-11-26 23:48:11 +07:00
Jack Humbert
f25596b8dc rgblight fixes 2016-11-23 21:28:12 -05:00
Jack Humbert
cefa8468fb travis pls 2016-11-23 20:16:38 -05:00
cbbrowne
c05cbaf534 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-11-23 17:47:16 -05:00
Jack Humbert
450a8fb5b6 Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7 2016-11-21 20:17:45 -05:00
Jack Humbert
06a2677b7e fix infinity 2016-11-21 20:17:32 -05:00
Jack Humbert
af119baf71 Merge pull request #894 from dchagniot/ergodoxDvorakEmacs 
Ergodox dvorak emacs
 2016-11-21 20:00:40 -05:00
Jack Humbert
4bb0eaef26 Merge pull request #893 from Sihui/sh-hhkb-jp 
[HHKB JP with Dvorak]
 2016-11-21 20:00:13 -05:00
Jack Humbert
be265decae Merge pull request #892 from fredizzimo/disable_ergodox_lcd 
Always initialize the Infinity Ergodox backlight
 2016-11-21 19:59:39 -05:00
Jack Humbert
377583d9f3 Merge pull request #891 from g-sam/galson-keymap 
adds galson keymap
 2016-11-21 19:59:17 -05:00
Jack Humbert
e0fc186c28 Merge pull request #888 from climbalima/master 
Added pro micro to maxipad
 2016-11-21 19:58:24 -05:00
Jack Humbert
ea472fb018 Merge pull request #887 from profet23/atreus62 
atreus62 Keyboard Support
 2016-11-21 19:58:00 -05:00
Jack Humbert
27ebacb15d merging lets_split 2016-11-21 19:18:47 -05:00
Jack Humbert
c1037b1dc0 working with helper, qmk_helper_windows@05b0105 2016-11-21 18:05:06 -05:00
Sihui Huang
b75538c0bf add del to new cmd 2016-11-20 14:45:51 -08:00
Sihui Huang
390a1bda8b add space to NewCmd layer 2016-11-20 13:32:25 -08:00
Sihui Huang
ccc34851f2 add space to NewCmd layer 2016-11-20 13:31:41 -08:00
Didier Chagniot
6f24344be7 typo fix 2016-11-20 20:51:05 +01:00
Sihui Huang
23f63ed1b9 Update README.md 2016-11-20 11:18:08 -08:00
Sihui Huang
34aa59c6d5 Update README.md 2016-11-20 11:13:57 -08:00
Sihui Huang
11f17e3b23 Update README.md 2016-11-20 11:12:48 -08:00
Sihui Huang
a8b1c47f0f add sh-hhkb-jp layers 2016-11-20 11:10:26 -08:00
Fred Sundvik
c86bbf474e 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.
 2016-11-20 19:28:10 +02:00
Seth Chandler
df8724ce08 remove KC expansion from GH60 2016-11-19 12:19:21 -05:00
Seth Chandler
620e4f74d3 move KC expansion to separate macros 2016-11-19 11:37:12 -05:00
Seth Chandler
ac7d202d4f merge upstream/master 2016-11-19 11:20:41 -05:00
samgalson@gmail.com
7f5e71d79f adds galson keymap 2016-11-19 14:21:12 +00:00
climbalima
102a830bbd changed readme 2016-11-19 00:49:20 -05:00
climbalima
e356de2220 added the pinout for pro micro into maxipad 2016-11-19 00:44:52 -05:00
climbalima
01736a502e just saving 2016-11-18 23:40:34 -05:00
Jack Humbert
ab6557c1a0 wqMerge branch 'wu5y7' of https://github.com/jackhumbert/qmk_firmware into wu5y7 2016-11-18 22:22:29 -05:00
Jack Humbert
161bd5596b midi back and forth 2016-11-18 22:22:24 -05:00
Daniel
abee809298 moves brackets to top row. 2016-11-18 11:11:08 -06:00
Erez Zukerman
285c5a91f2 Groundwork for dedicated color keycodes 2016-11-17 20:56:36 -05:00
Erez Zukerman
9bbc9a7ce0 Initial Erez Experimental keymap tweaks 2016-11-17 19:47:08 -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
Benjamin Grabkowitz
6c5fce5c1a Adding readme placeholder 2016-11-16 23:59:42 -05:00
Benjamin Grabkowitz
00d88b74ad Adding Support for atreus62 keyboard. https://github.com/profet23/atreus62 2016-11-16 23:52:36 -05:00
climbalima
b085a34506 fixed readme conflicts 2016-11-16 20:44:49 -05:00
climbalima
21b6b4e6c4 should have fixed conflixed 2016-11-16 19:49:38 -05:00
climbalima
668c739702 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-11-16 19:28:30 -05:00
climbalima
5cac51a773 Merge https://github.com/climbalima/qmk_firmware 2016-11-16 19:26:38 -05:00
climbalima
1dd6ceb45d Updated my repo to current qmk 2016-11-16 19:18:54 -05:00
cbbrowne
5b88e7ab9a Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-11-16 17:05:11 -05:00
Seebs
4da698fda3 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>
 2016-11-16 15:44:26 -06:00
Jack Humbert
9f1b27c5ba Merge pull request #880 from psyill/master 
Added keymap "videck", an ErgoDox keymap for Vi(m) users.
 2016-11-16 14:54:18 -05:00
Jack Humbert
e025a94bc2 Merge pull request #879 from sethbc/update_sethbc_ergodox_keymap 
update sethbc ergodox keymap
 2016-11-16 14:53:52 -05:00
Jack Humbert
d85f6deb9b Merge pull request #877 from sethbc/update_sethbc_satan_keymap 
update sethbc keymap
 2016-11-16 14:51:18 -05:00
Jack Humbert
6dde65c2a9 Merge pull request #876 from Dbroqua/master 
Updated kc60/dbroqua layout and added satan/dbroqua_hhkb
 2016-11-16 14:49:55 -05:00
Jack Humbert
17e1a4f825 Merge pull request #866 from fredizzimo/infinity60_clockfixes 
Increase the infinity60 system tick frequency
 2016-11-16 14:42:53 -05:00
climbalima
bce6e52391 fixed conflict 2016-11-14 23:08:10 -05:00
climbalima
dd22c787b8 fixed extra paste 2016-11-14 23:05:37 -05:00
Jack Humbert
e9f7487518 mostly working 2016-11-13 23:02:38 -05:00
Hans Ellegård
162f603b1c Added keymap "videck", an ErgoDox keymap for Vi(m) users. 2016-11-13 22:44:41 +01:00
Seth Chandler
aa76425395 oops, fixed inverted if statement 2016-11-13 01:04:10 -05:00
Seth Chandler
34bf8558cd update sethbc ergodox keymap 2016-11-13 00:56:46 -05:00
Seth Chandler
b2bc215934 add sethbc keymap for gh60 and update macro expansion in connection with same 2016-11-13 00:42:07 -05:00
Seth Chandler
28249498bc update sethbc keymap 2016-11-12 23:56:57 -05:00
Jack Humbert
33e62c080c merging 2016-11-12 20:54:37 -05:00
Damien
0a99cf300c Merge pull request #12 from jackhumbert/master 
Merged from qmk
 2016-11-12 19:33:07 +01:00
dbroqua
3bc51065a4 Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware 2016-11-12 19:27:03 +01:00
dbroqua
19ebf6161f - Added dbroqua_hhkb layout for Satan PCB 2016-11-12 19:23:38 +01:00
climbalima
ec0db2933c Merge branch 'master' of https://github.com/climbalima/qmk_firmware 
second try
 2016-11-10 20:06:54 -05:00
climbalima
b5cecb4cc9 Added both revisions into one folder 2016-11-10 20:03:24 -05:00
climbalima
79f82d3d80 returned to o 2016-11-10 18:43:31 -05:00
climbalima
6e27f6fbde 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
 2016-11-10 18:19:13 -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
IBNobody
1803dbc6d5 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-11-08 21:11:24 -06:00
cbbrowne
cdad01b57a Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-11-07 12:48:34 -05:00
Jonathan Arnett
1d766c596e
Removed the control action when holding z or / 2016-11-06 13:48:20 -05:00
Fred Sundvik
c06e2486ab Increase the infinity60 system tick frequency 2016-11-05 22:45:21 +02:00
lucwastiaux
b8e204322a added more shortcut keys 2016-11-05 12:07:33 +08:00
lucwastiaux
78a1dc84dd updated readme 2016-11-05 11:58:23 +08:00
lucwastiaux
ff8b4a1d89 removed brackets anywhere but in brackets layer, added mouse layer back in, replaced all HYPR with MEH, put semicolon-newline and end-newline on symbol layer 2016-11-05 11:56:59 +08:00
Damien
7697f23538 Merge pull request #11 from jackhumbert/master 
Merged from jackhumbert
 2016-11-03 21:50:31 +01:00