Commit graph

957 commits

Author SHA1 Message Date
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
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
Alex Johnstone
97b431162c Merge pull request #4 from jackhumbert/master
upstream
2016-03-27 20:15:02 -07:00
Alex Johnstone
d3e89b8cbd Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯ 2016-03-27 20:14:03 -07:00
Nicholas Keene
2a9eb3d3a3 The Ordinary Layout is unremarkably mundane and remarkably useful 2016-03-27 21:45:31 -05:00
Erez Zukerman
16da54cfa0 Merge pull request #211 from nrrkeene/master
The Ordinary Layout is unremarkably mundane and remarkably useful
2016-03-27 09:10:05 +03:00
Erez Zukerman
6a31d92276 Merge pull request #196 from naps62/naps62
Adds naps62's Ergodox EZ layout
2016-03-27 09:08:23 +03:00
Manuel Barkhau
20a3229faf Add manuneo layout 2016-03-27 02:24:35 +00:00
Nicholas Keene
e43c0c649d Merge https://github.com/jackhumbert/qmk_firmware 2016-03-26 00:44:20 -05:00
Nicholas Keene
97c4c790cc The Ordinary Layout is unremarkably mundane and remarkably useful 2016-03-26 00:40:54 -05:00
Alex Johnstone
2d90374912 Merge pull request #3 from jackhumbert/master
Pull upstream
2016-03-25 11:16:33 -07:00
Erez Zukerman
c9aec8bc24 Merge pull request #207 from romanzolotarev/master
Add important note about brightness on OS X
2016-03-25 19:37:42 +03:00
Nicholas Keene
d7a1fc81a0 The Ordinary Layout is familiar to users of common keyboards 2016-03-24 23:10:21 -05:00
Jonathan Arnett
6f53e17bf5 Building a row of level switch buttons 2016-03-24 18:30:32 -04:00
Jonathan Arnett
f4ba9662f4 A to toggle L2, hjkl to move mouse 2016-03-24 18:30:32 -04:00
Stephan Bösebeck
94e96456b8 minor changes 2016-03-24 10:30:27 +01:00
Stephan Bösebeck
8b883c797f Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-24 08:22:21 +01:00
Alex Johnstone
fb6dc7499f New 💷 method 2016-03-23 21:13:05 -07:00
Alex Johnstone
02e259dc82 New 💷 method 2016-03-23 21:12:23 -07:00
Alex Johnstone
98593e8c0d New 💷 method 2016-03-23 21:11:05 -07:00
Alex Johnstone
2530f45e2b New 💷 method 2016-03-23 21:06:20 -07:00
Alex Johnstone
add089ab1a New 💷 method 2016-03-23 21:04:45 -07:00
Alex Johnstone
da63179962 Wrong date 2016-03-23 14:10:55 -07:00
Norberto Monarrez
a5a40a0703 Edited to work with jackhumbert/qmk_firmware pull #190
Basically changes "* matrix_scan_user(void)" to "matrix_scan_user(void)"
2016-03-23 13:42:34 -04:00
Jack Humbert
95b0032142 Merge pull request #209 from n0bs/master
Added project folder for Bantam-44
2016-03-23 10:45:16 -04:00
Jack Humbert
02096f78e5 Merge pull request #200 from alexives/add_diagram_to_planck_layout
Added layout diagrams to the default planck keymap
2016-03-23 10:44:31 -04:00
Norberto Monarrez
d0c894cfae Added files for Bantam-44 2016-03-23 10:22:43 -04:00
Alex Johnstone
15106471b1 Removed whitespace 2016-03-22 21:52:40 -07:00
Alex Johnstone
c7a9a1ebd0 Revised to version 0.1.0 2016-03-22 21:50:53 -07:00
IBNobody
10491ba21f Fixed LED Function Calls
Fixed LED indicator function calls to match how the matrix init function
calls are formatted.
2016-03-22 20:58:44 -05:00
IBNobody
ec62d9e85c Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
# Conflicts:
#	quantum/template/template.c
#	quantum/template/template.h
2016-03-22 20:39:05 -05:00
Alex Johnstone
5872f80c96 Merge pull request #2 from jackhumbert/master
Update my repo to upstream
2016-03-22 10:38:03 -07:00
Alex Johnstone
4a7e131604 Meh -> Hyper 2016-03-22 07:43:28 -07:00
Alex Johnstone
84647efebb Update readme.md 2016-03-22 07:42:47 -07:00
Alex Johnstone
c1a520fb81 Added photo 2016-03-22 07:36:40 -07:00
Alex Johnstone
d1f446962a Added real life layout 2016-03-22 07:34:07 -07:00
Roman Zolotarev
3087808790 Add important note about brightness on OS X 2016-03-22 22:33:23 +08:00
Stephan Bösebeck
55fa66428c Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-22 15:00:20 +01:00
Alex Johnstone
4687162470 Added Readme 2016-03-21 21:43:59 -07:00
Alex Johnstone
f6e5e2bd45 added .hex 2016-03-21 20:59:06 -07:00
Alex Johnstone
cffd91edbd typos 2016-03-21 20:58:29 -07:00
Alex Johnstone
f744e860ff Update keymap.c 2016-03-21 20:51:05 -07:00
Alex Johnstone
65fde3cc12 More updates 2016-03-21 16:03:25 -07:00
yoyoerx
baeffd99da Pull request 190 resolution with 'qmk/master' for merge 2016-03-21 17:18:53 -04:00
Erez Zukerman
7f0d77e08c Merge pull request #205 from romanzolotarev/master
Add Roman's Layout
2016-03-21 21:03:25 +02:00
Alex Johnstone
af9e9810a0 work in progress 2016-03-20 22:05:08 -07:00
Stephan Bösebeck
1313e0c828 fix number pad, add , 2016-03-20 23:07:38 +01:00
Stephan Bösebeck
7ebc813e82 changing cursor keys, back to "default" cursor key layout, adding ISO-cursor keys to Symb layer. Changed numbers back to symmetric layout again, keeping F-keys in symb though 2016-03-20 23:00:20 +01:00
Stephan Bösebeck
d0c62feb7e tweaking it a bit further, fixing things 2016-03-20 22:53:43 +01:00
Stephan Bösebeck
64495d11ba Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-20 22:07:53 +01:00
Erez Zukerman
e86f09d262 Merge pull request #203 from XenoBits/master
Improved c# dev layout, only 2 layers now
2016-03-20 22:50:56 +02:00
Maxime Millet
cc0c157287 Fixed png image 2016-03-20 12:54:02 +01:00
Maxime Millet
895bc327c3 CSharp dev layout V2 2016-03-20 12:50:04 +01:00
Roman Zolotarev
a429374b78 Update readme 2016-03-19 17:53:58 +08:00
Roman Zolotarev
7138b1e6fc Update layout 2016-03-19 17:43:02 +08:00
Roman Zolotarev
f1c265aace Swap volup and voldown 2016-03-18 17:55:21 +08:00
Roman Zolotarev
bbe553dba3 Add Roman's Layout
Four layers BASE (Norman), SYMB, PLVR (optimized for Plover), ARRW.
2016-03-18 12:14:03 +08:00
Maciej Piechotka
cf986ba504 Add waits to prevent KVM from hanging 2016-03-17 08:18:03 -07:00
Maciej Piechotka
fb3b7f32c0 Put frequently used keys in shell (-=) under thumb 2016-03-17 08:18:03 -07:00
Maciej Piechotka
5d8f4ff957 Add missing breaks in mpiechotka ergodox_ez keyboard 2016-03-17 08:18:03 -07:00
Alex Ives
05b0931cfc Added layout diagrams to the default planck keymap
Signed-off-by: Alex Ives <alex@ives.mn>
2016-03-16 22:58:17 -05:00
IBNobody
8a2457d753 Adding Retro_Refit Keyboard
Retro_Refit is an example of using a Teensy to replace a keyboard
controller on an older keyboard. The original 6x15 keyboard had a
non-standard 11x8 matrix.
2016-03-16 10:27:04 -05:00
Miguel Palhas
8aa559b825 Adds naps62's layout 2016-03-15 11:40:15 +00:00
yoyoerx
b8d4af8d4a Cygwin Based Users Guide v0.6 -fixes to dfu-programmer build 2016-03-14 13:19:29 -04:00
Alex Johnstone
e4b7ce41e3 Started my keymap 2016-03-11 22:27:03 -08:00
yoyoerx
58bbfc5fa6 PR190hotfix.sh, fresh hexes, makeallhex.sh script 2016-03-11 11:16:19 -05:00
Mitch Lloyd
67624d0b61 First keyboard layout 2016-03-10 17:20:08 -08:00
yoyoerx
641859df84 Addressed void* return warning in all keymaps 2016-03-10 11:28:34 -05:00
yoyoerx
191488b96f Merge remote-tracking branch 'qmk/master' into windocs 2016-03-10 10:50:17 -05:00
yoyoerx
79e0d7cbc3 Cygwin Based Users Guide v0.5 -further corrections 2016-03-09 15:53:37 -05:00
yoyoerx
6bfb9d17cf Cygwin Based Users Guide v0.4 -corrections/dfu build 2016-03-09 12:16:03 -05:00
Stephan Bösebeck
3119778e0c Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-08 23:56:50 +01:00
Erez Zukerman
7d3ebd7b40 Adds a readme with a link to the blog post 2016-03-08 03:50:57 +02:00
Erez Zukerman
de8f99bf6e Merge pull request #185 from nrrkeene/master
The Ordinary Layout is familiar to users of common keyboards
2016-03-07 20:46:33 -05:00
Nicholas Keene
9d06063a23 The Ordinary Layout, designed to be similar to traditional keyboards, by Nicholas Keene, released to the public domain, no rights reserved 2016-03-06 23:12:29 -06:00
yoyoerx
2f6f45aa3e Cygwin Based Users Guidev0.2 -formatting revisions 2016-03-04 15:04:42 -05:00
yoyoerx
c9c763e000 Cygwin Based Users Guide v0.1 2016-03-04 14:38:38 -05:00
Jack Humbert
3f7180a73e Merge pull request #170 from NoahAndrews/improve-windows-docs
Add scripts for easy Windows environment setup
2016-03-04 10:19:00 -05:00
Noah Andrews
140a311e65 Fix link to MHV AVR Tools 2016-03-02 13:06:33 -05:00
Noah Andrews
45933e84f1 Added documentation for new Windows scripts 2016-03-02 13:02:13 -05:00
Noah Andrews
06de9628be Removed unneeded lines from setup script 2016-03-02 12:25:21 -05:00
Stephan Bösebeck
46ddbd1fe2 forgot F6 2016-03-02 08:43:21 +01:00
Stephan Bösebeck
fbfb034337 updated version, changed F-Key-Layout, minor change in code layer 2016-03-02 08:40:38 +01:00
Stephan Bösebeck
861429aa44 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-02 08:32:13 +01:00
Lucas Hecht
52b3ddb521 Update PCB_GUIDE.md 2016-02-27 02:56:05 +01:00
Lucas Hecht
bcf847e58a added "Troubleshooting" section to PCB guide 2016-02-27 01:26:54 +01:00
deepshitgoeshere
92adbe416c Delete keymap_eigen.c 2016-02-25 22:27:59 +01:00
deepshitgoeshere
8def502eee Delete dfu-programmer.exe 2016-02-25 22:27:17 +01:00
deepshitgoeshere
e8f17e5136 Delete dfu-programmer.exe 2016-02-25 22:26:44 +01:00
Lucas Hecht
34a7012a33 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into jackhumbert-master 2016-02-25 21:40:16 +01:00
Lucas Hecht
bbfdfdcc5f delete old keymap (keymap_eigen.c) 2016-02-25 21:39:32 +01:00
Lucas Hecht
6280adbb6e Added keymap "lucas.c" 2016-02-24 22:54:39 +01:00
Jack Humbert
d33681aa22 Merge pull request #157 from DidierLoiseau/typematrix
Small fixes and improvements to tm2030 layout
2016-02-21 13:35:08 -05:00
Didier Loiseau
a40273c7d7 Updated tm2030 keymap.hex 2016-02-21 19:10:03 +01:00
Didier Loiseau
e336af79eb Fixed compilation warnings due to missing return statements 2016-02-21 18:56:21 +01:00
Jack Humbert
b694fb3417 Merge pull request #153 from spydon/xmonad_keymap
Keymap optimized for xmonad
2016-02-21 12:35:46 -05:00
Lukas Klingsbo
39ed50f605 Added a keymap optimized for xmonad
The M(1) function changes layer temporarily (so that numbers can be used)
and holds LGUI which makes it possible to easily change virtual screens
and swap windows inbetween them.
2016-02-18 21:27:02 +01:00
Jack Humbert
a6414eb257 Merge pull request #145 from gerbercj/feature/atreus_astar
Add support for Atreus running on A-Star
2016-02-17 21:18:13 -05:00
Chris Gerber
1db3558a92 Change default controller for Atreus from Teensy2 to A-Star 2016-02-17 19:14:25 -05:00
Chris Gerber
47dcec2945 Add support for Atreus running on A-Star 2016-02-15 20:53:56 -05:00
Stephan Bösebeck
f0dfe8ab97 testing moving the 6 to the left, having one key more on the right used for hash now
feels a bit more natural to me. Need to investigate further.
2016-02-15 14:13:29 +01:00
Erez Zukerman
2c29ce3cfe Merge pull request #141 from XenoBits/master
Ergodox EZ new keymap for C# developers
2016-02-12 08:50:01 -05:00
Maxime Millet
9eea6850f9 Another readme.md improvement 2016-02-12 12:01:36 +01:00
Maxime Millet
8f1bafece5 Improved readme 2016-02-12 12:00:13 +01:00
Maxime Millet
8c051f2d05 Added C# developer keymap 2016-02-12 11:54:27 +01:00
Lasko Height
d290e09d7b Added pageup, pagedown, home, and end keys 2016-02-11 20:52:59 -08:00
Lasko Height
006d277ec1 Added a Tenkey layer and moved the del key 2016-02-11 20:46:12 -08:00
Lasko Height
d3488f131c Adding my initial layout 2016-02-11 20:20:09 -08:00
Lasko Height
073a6c206e Adding my initial layout 2016-02-11 20:19:07 -08:00
Erez Zukerman
f4fc7fd4d5 Merge pull request #139 from joarau/norwegian-colemak-ergodox-with-norwegian-definitions
Norwegian Colemak Ergodox and Norwegian key definitions
2016-02-11 20:40:47 -05:00
joar
2f7cda63d0 Norwegian Colemak Ergodox and Norwegian key definitions 2016-02-11 16:28:28 +01:00
Erez Zukerman
9f6966f765 More tweaks to experimental layout 2016-02-11 16:55:10 +02:00
Erez Zukerman
9e075e28be Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2016-02-11 16:39:40 +02:00
Erez Zukerman
ec4428b1c6 Merge pull request #138 from Willyfrog/master
ergodox_ez for emacs + mac + altgr users
2016-02-10 15:40:25 -05:00
Guillermo Vayá
f96186ed9c add image 2016-02-10 19:04:26 +01:00
Guillermo Vayá
3c805548d9 added .hex file 2016-02-10 09:47:11 +01:00
Maciej Piechotka
03f61dcdb4 Add mpiechotka ergodox ez keymap 2016-02-09 23:37:02 -08:00