Commit Graph

995 Commits

Author SHA1 Message Date
Jack Humbert
9e8c88dcbd Merge pull request #21 from cr3473/master
Layout changes
2015-06-03 16:55:26 -04:00
cr3473
bec97387a1 added screenlock mapping 2015-06-03 13:33:36 -07:00
cr3473
1a64149375 revert to DEL only on upper layer :) 2015-06-03 13:20:14 -07:00
Jack Humbert
085efb4ff5 Merge pull request #20 from cr3473/master
PCB doc edits and keymap update
2015-06-02 17:10:06 -04:00
cr3473
f33d45f200 Merge branch 'master' of github.com:jackhumbert/tmk_keyboard
Conflicts:
	keyboard/planck/PCB_GUIDE.md
2015-06-02 14:04:05 -07:00
cr3473
bcb04570ea PCB Guide edits and update to joe's keymap 2015-06-02 13:58:45 -07:00
Jack Humbert
6001a9347b Merge pull request #19 from cr3473/master
Makefile - MATRIX selection
2015-06-02 15:42:58 -04:00
angerthosenear
cea51941a4 Create extended_keymap_angerthosenear.c
Adding my keymap to the available keymaps list.
2015-06-02 12:23:34 -07:00
John Lindquist
af4f016b4f Update PCB_GUIDE.md 2015-06-02 12:23:34 -07:00
Jack Humbert
68f48fcc58 guide 2015-06-02 12:23:34 -07:00
Jack Humbert
a53efa4561 Create PCB_GUIDE.md 2015-06-02 12:23:34 -07:00
Jack Humbert
dd3598dce6 daniel 2015-06-02 12:23:34 -07:00
Jack Humbert
caa7727e96 daniel 2015-06-02 12:23:34 -07:00
Jack Humbert
5ca7538578 catching up 2015-06-02 12:23:34 -07:00
cr3473
bb9e23c319 Merge branch 'master' of github.com:jackhumbert/tmk_keyboard 2015-06-02 12:16:50 -07:00
cr3473
59f2001b31 Added ability to set the MATRIX in build/make 2015-06-02 12:12:44 -07:00
Jack Humbert
81c672391a Merge pull request #18 from angerthosenear/master
Create extended_keymap_angerthosenear.c
2015-06-01 18:50:17 -04:00
angerthosenear
44bc2eefa3 Create extended_keymap_angerthosenear.c
Adding my keymap to the available keymaps list.
2015-06-01 17:46:08 -05:00
Jack Humbert
3d303eb6c7 Merge pull request #17 from johnlindquist/patch-1
Update PCB_GUIDE.md
2015-06-01 18:01:34 -04:00
John Lindquist
78e567896b Update PCB_GUIDE.md 2015-06-01 15:55:34 -06:00
Jack Humbert
07d090db8b guide 2015-05-30 15:47:21 -04:00
Jack Humbert
7e67c3ceda Create PCB_GUIDE.md 2015-05-30 13:31:52 -04:00
Jack Humbert
85cc5d890e daniel 2015-05-27 23:15:08 -04:00
Jack Humbert
f2ec0f3a2c Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-05-27 22:43:37 -04:00
Jack Humbert
e7435a4022 daniel 2015-05-27 22:43:34 -04:00
Jack Humbert
ed7607645a Merge pull request #16 from cr3473/master
fixed the macros for hard colemak
2015-05-27 17:09:28 -04:00
cr3473
8c788f70f6 fixed the macros for hard colemak 2015-05-27 14:03:45 -07:00
Jack Humbert
1add9b72e7 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-05-27 12:26:02 -04:00
Jack Humbert
49ba5817c4 catching up 2015-05-27 12:25:38 -04:00
Jack Humbert
c59255879d Merge pull request #15 from cr3473/master
Keymap updates
2015-05-27 12:25:03 -04:00
cr3473
a286c38797 New, improved, extended layout 2015-05-27 08:35:55 -07:00
cr3473
b36d1a87da Merge remote-tracking branch 'upstream/master' 2015-05-27 08:29:48 -07:00
Jack Humbert
d61d1f5ca3 layouts, default 2015-05-21 19:59:39 -04:00
Jack Humbert
cdccebafe1 default w/qwerty 2015-05-19 01:03:54 -04:00
Jack Humbert
b90ee43f57 files 2015-05-18 21:14:21 -04:00
Jack Humbert
0e189b6bdd quark 2015-05-15 21:57:29 -04:00
Jack Humbert
cb3e499cc7 backlight stuff 2015-05-07 15:34:46 -04:00
Jack Humbert
1e0ae2936b quark 2015-05-02 23:00:47 -04:00
Jack Humbert
03963bad85 Merge pull request #14 from rswiernik/master
Fixed quite a few things
2015-04-29 11:02:34 -04:00
Reed Swiernik
15110bf7a0 Corrected makefile common var 2015-04-29 02:55:16 -04:00
Reed Swiernik
85f8506caa Moved keymap file location and fixed bugs in keymap_reed.c 2015-04-29 02:55:00 -04:00
Jack Humbert
61b4d273da Merge pull request #13 from rswiernik/master
Updated Readme and Build info
2015-04-25 12:50:56 -04:00
Reed Swiernik
eadb08b113 Update README.md 2015-04-25 12:18:45 -04:00
Reed Swiernik
79f70b20d9 Update README.md
Switched around more readme stuff
2015-04-25 12:18:34 -04:00
Reed Swiernik
d0391d9ed7 Update README.md
This stupid readme...
2015-04-25 12:18:21 -04:00
Reed Swiernik
835207193a Update README.md
Updated formatting again...
2015-04-25 12:18:11 -04:00
Reed Swiernik
c85f68d9cd Update README.md
Changed formatting mistake
2015-04-25 12:17:54 -04:00
Reed Swiernik
e3ebae521e Updated readme with new build info 2015-04-25 12:17:42 -04:00
Reed Swiernik
b060714efd Changed del key and added docs 2015-04-25 12:17:28 -04:00
Reed Swiernik
0541af4ff9 Updated makefile to properly handle non extended keymaps 2015-04-25 12:17:18 -04:00