varl/qmk_firmware
1
0
Fork 0
forked from forks/qmk_firmware
Code Pull requests Activity
2210 commits 2 branches 1545 tags 870 MiB
Commit graph

325 commits

Author SHA1 Message Date
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
Christopher Browne 95a88c09e1 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-28 11:29:54 -04:00
Damien Pollet bcebb3447c Add action-preprocessing kb/user hooks in planck 2016-03-28 16:49:47 +02: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
Christopher Browne a4ff9f2567 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-22 17:29:31 -04:00
yoyoerx baeffd99da Pull request 190 resolution with 'qmk/master' for merge 2016-03-21 17:18:53 -04: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
yoyoerx b8d4af8d4a Cygwin Based Users Guide v0.6 -fixes to dfu-programmer build 2016-03-14 13:19:29 -04: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
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
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
Christopher Browne eb99e515b3 More documentation 2016-02-22 15:31:13 -05: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
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
Christopher Browne 8079dc0682 Eliminate switch statement by using contiguous character ranges 2016-02-08 11:25:55 -05:00
Christopher Browne bbcc1046a6 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-02-08 10:53:50 -05:00
Jack Humbert e6a2c77fde README changes 2016-02-07 10:41:00 -05:00
Jack Humbert 623666888f Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2016-02-07 10:39:01 -05:00
Jack Humbert 5dc0d1dc20 README changes 2016-02-07 10:38:57 -05:00
Christopher Browne fe1519de07 Add in XOR of lowest 8 bits of system timer to encourage more randomness of the digits/letters chosen 2016-02-06 19:42:08 -05:00
Jack Humbert 240e8c6340 Merge pull request #129 from cbbrowne/master 
Example of some "Random Keys"
 2016-02-05 19:12:05 -05:00
Jack Humbert 832575f2e7 Update PCB_GUIDE.md 2016-02-05 19:06:25 -05:00
Christopher Browne 73f14db8ad Remove obsolete comments 2016-02-03 16:54:38 -05:00
Christopher Browne 0d44544491 Comment things more 2016-02-03 16:47:54 -05:00
Christopher Browne 7919839b1a Random characters now working AOK 2016-02-03 16:46:24 -05:00
Christopher Browne 259e5e28e6 Merge branch 'master' of github.com:cbbrowne/qmk_firmware 2016-02-03 13:42:42 -05:00
Christopher Browne 674c62734d More experiments with mapping, notably adding in the random bits 2016-02-03 13:40:45 -05:00
Christopher Browne c39b53bb9a Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-02-03 12:49:55 -05:00
Christopher Browne 1466f5a36e Set up a macro that writes cbbrowne. So that is a nice example of how it works. 
Probably ought to write up some docs on this to improve it.
 2016-02-01 19:13:23 -05:00
Christopher Browne 91c4681656 More samples, some not entirely working yet. 
I am trying to mess around with MACRO(), but it is not there quite yet...
 2016-02-01 18:50:19 -05:00
Jack Humbert 2ce9c19478 Merge pull request #123 from cbbrowne/master 
README notes and cbbrowne layout
 2016-02-01 11:42:45 -05:00
Christopher Browne 41c17baccf Add notes on what sorts of actions are risky 2016-02-01 11:37:17 -05:00
Christopher Browne 5273c73bef Many of the changes I wanted 2016-02-01 11:11:21 -05:00
Kacey A d97c77447f Fix for broken link in readme. 2016-01-30 02:56:37 -08:00
Christopher Browne 55ccf839c1 More notes 2016-01-29 15:49:48 -05:00
Christopher Browne 580c3e1d55 On Linux, run dfu-programmer as root 2016-01-29 15:35:51 -05:00
Christopher Browne 05d43b0687 Notes on what's done, and plans to change my key mapping 2016-01-29 13:01:28 -05:00
Christopher Browne 9aca1c70b7 Notes on what's done, and plans to change my key mapping 2016-01-29 12:57:52 -05:00
Christopher Browne 5e64f710dc Bunch of reformatting, improvements to comments 2016-01-29 12:49:43 -05:00
Christopher Browne 753ffa4eed Latest version of cbbrowne key maps 2016-01-29 12:21:10 -05:00
Christopher Browne 71bd4818cb Added in a keypad layer that replaces Dvorak 2016-01-28 18:01:40 -05:00
AM 1946c7ce9a add mollat keymap 2016-01-26 18:46:06 +01:00
Yang Liu f277079dfa no message 2016-01-24 18:16:40 -08:00
Yang Liu 2d29795de8 add one more photo 2016-01-24 17:56:43 -08:00
Yang Liu 84657a9e4b Add a photo for the demonstration of RGB underflow 2016-01-24 17:54:35 -08:00
Yang Liu ba9ac457b2 Integrate WS2812 code into quantum core 2016-01-24 17:05:47 -08:00
Yang Liu 0a40654b82 Add support for WS2812 LEDs 2016-01-24 13:14:50 -08:00
Jack Humbert fd72a46c13 Makefile back to defaults 2016-01-23 20:52:01 -05:00
Jack Humbert ae620fe856 rename file 2016-01-23 20:35:13 -05:00
Jack Humbert 5143c59bdf Merge branch 'audio' of https://github.com/jackhumbert/tmk_keyboard into smarkefile 2016-01-23 20:34:05 -05:00
Jack Humbert a820533ab7 keymap.c changes, disable grep stuff 2016-01-20 00:15:29 -05:00
Jack Humbert eb61700912 better integrations 2016-01-20 00:06:52 -05:00
Jack Humbert f66a251e5d I guess I can reference #90 in the commit message 2016-01-16 01:08:50 -05:00
Jack Humbert c9a096dc99 added error for keymap file not existing 2016-01-16 00:57:35 -05:00
Jack Humbert dfe7004bc5 new keymap folder structure and makefile magic 2016-01-16 00:52:31 -05:00
Jack Humbert 4faddd3449 working 2016-01-16 00:06:51 -05:00
Jack Humbert 6e3c36360e sounds 2016-01-15 23:10:30 -05:00
Jack Humbert 4c100dbbef note seq, start-up beeps, function beeps 2016-01-13 00:25:31 -05:00
Jack Humbert 263344d42f beeps on lock keymap 2016-01-11 18:00:07 -05:00
Jack Humbert 29de37d5c0 pwm audio 2016-01-11 16:53:33 -05:00
Jack Humbert 5259f36d03 Merge pull request #66 from gdiegel/master 
Fix for faulty fn layer
 2016-01-02 11:58:40 -05:00
Gabriel Diegel 1cdcbc9865 Fix incorrect number of rows on fn layer. Add additional navigation keys 
to fn layer
 2016-01-02 10:31:47 +01:00
Gabriel Diegel d7d092de5f Use planck-style arrow keys 2015-12-20 23:05:15 +01:00
Gabriel Diegel daa8a008db Fix typos and add comments, swap plus with equals, swap pipe with 
backslash, move slash, change cursor keys to make the classic shape
 2015-12-15 21:36:01 +01:00
Jack Humbert 23846997f6 Merge pull request #39 from gdiegel/master 
New keymap
 2015-12-14 23:30:59 -05:00
Alexey Zabelin 0c89fea71f Add new keymap 
The goal of this keymap is to simulate the Atreus layout. Since I've
been using it for quite a while I figured this might help me transition
to Planck.
 2015-12-14 21:22:50 -05:00
Gabriel Diegel 3018fa4dc6 Remove redundant definitions 2015-12-13 16:02:01 +01:00
Gabriel Diegel 5d9ff9b61a Rename keymap 2015-12-13 15:40:44 +01:00
Gabriel Diegel 2deadfc7ff Fix keymaps, add documentation 2015-12-13 15:39:27 +01:00
Gabriel Diegel d00b4238e3 Add gdl keymap 2015-12-13 15:32:44 +01:00
Jack Humbert 6485c7d7da nkro info 2015-11-05 12:07:03 -05:00
Jack Humbert 93812e52b5 readmes\! 2015-10-29 18:37:29 -04:00
Jack Humbert 39915b1748 homebrew instructions 2015-10-29 15:12:51 -04:00
Jack Humbert 6f3141965e new project script 2015-10-27 14:33:18 -04:00
Jack Humbert 547da78335 merging tmk 2015-10-27 12:42:30 -04:00
Jack Humbert 5a268d97ec READMEs 2015-10-27 00:48:22 -04:00
Jack Humbert a6913550c8 fixed MOs 2015-10-26 23:17:19 -04:00
Erez Zukerman 0c47e8b008 [Jack & Erez] Comments + tiny updates and cleanup 2015-10-27 00:54:46 +02:00
Jack Humbert cc1c32671e fixed makefile, added MO DF shortcuts 2015-10-26 20:02:25 -04:00
Jack Humbert 35a81f5b8b added ergodox 2015-10-26 16:32:37 -04:00
Jack Humbert 46e7fb2d3c quantum separated 2015-10-26 14:49:46 -04:00
Jack Humbert ff8d8a50df fixes for bluetooth without usb 2015-10-25 21:40:56 -04:00
Jack Humbert 61fea81a24 spanish layout 2015-10-25 14:02:26 -04:00
Jack Humbert 31dd8ea34a french keycodes 2015-10-25 12:50:46 -04:00
Jack Humbert e61a5ed806 nordic shortcuts 2015-10-25 12:11:04 -04:00
Jack Humbert 71a8fd8b12 bluetooth working with usb 2015-10-23 20:12:04 -04:00
Jack Humbert bbb21f60e9 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-10-22 13:37:56 -04:00
Jack Humbert c966e7982c bluetooth 2015-10-22 13:37:45 -04:00
cr3473 1b8ef914ff Modified numpad/tenkey layout 
improved ease of use
 2015-10-11 20:31:49 -07:00
Jack Humbert 40148c430e BL 2015-09-26 00:58:17 -04:00
Jack Humbert a230aba402 pcb hex 2015-09-26 00:39:48 -04:00
Jack Humbert 266ff2344e backlight 2015-09-25 23:50:17 -04:00
Jack Humbert 1da07810c7 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-09-21 02:13:25 -04:00
Jack Humbert f512923456 new default layout 2015-09-21 02:13:15 -04:00
cr3473 7ed793b292 rearranged dedicated cursor keys 
now in standart TLK style cluster
VIM style still available in upper layer
 2015-09-19 23:52:42 -07:00
Jack Humbert c8d58a9f19 unicode working, i think 2015-09-15 00:33:57 -04:00
Jack Humbert febd7886a1 unicode working, i think 2015-09-15 00:31:41 -04:00
Jack Humbert f610c65f10 unicode working, i think 2015-09-14 23:55:26 -04:00
Jack Humbert 6ec03b2218 unicode working, i think 2015-09-14 23:54:49 -04:00
Keith Miyake 6a4ee574bc use preprocessor conditional on backlight initialization 2015-09-14 15:10:12 -04:00
Jack Humbert 5bb7ef0012 rows to col option, maybe 2015-09-13 22:10:01 -04:00
Jack Humbert 44625de59a beeps in an if 2015-09-06 18:57:23 -04:00
Jack Humbert ed384bd437 beeps update 2015-08-31 12:39:53 -04:00
Jack Humbert 91176d854b speaker working, midi out 2015-08-29 11:54:38 -04:00
Jack Humbert 9b46f4021e midi on planck 2015-08-25 17:06:38 -04:00
Jack Humbert cda23c754e midi working 2015-08-24 19:31:12 -04:00
Jack Humbert fd7a465d0d adding default hex 2015-08-22 11:11:48 -04:00
Jack Humbert 5d2baede8a making the extended keymap the default - no more 'common' 2015-08-22 11:10:57 -04:00
Jack Humbert 04885a3b44 preonic 2015-08-21 10:46:53 -04:00
Jack Humbert fb4fe52c0a midi 2015-08-20 00:42:28 -04:00
Jack Humbert e528087ee5 midi 2015-08-20 00:42:08 -04:00
Jack Humbert 2d76b5c3d4 lock 2015-08-18 15:03:13 -04:00
Jack Humbert 1e598743b0 matrix 2015-08-16 22:29:53 -04:00
Jack Humbert c9cbff446f merging 2015-08-16 17:56:15 -04:00
Jack Humbert c5a8287dea ok 2015-08-16 17:52:49 -04:00
Jack Humbert 88704200a5 ok 2015-08-16 17:52:21 -04:00
Jack Humbert f7bca5c41a ok 2015-08-16 17:52:03 -04:00
Jack Humbert b3f638f491 ok 2015-08-16 17:51:53 -04:00
Jack Humbert e12c0de608 Update PCB_GUIDE.md 2015-08-03 14:19:24 -04:00
Ante Vukorepa 1f52d60ef1 Fixed brightness control; Reduced number of brightness levels to 4. 2015-07-25 17:11:31 +02:00
Jack Humbert b8c8ecbcd6 Merge pull request #24 from cr3473/master 
added 1337 layer :)
 2015-07-20 16:57:35 -04:00
cr3473 16af7f259b added 1337 layer :) 2015-07-20 13:53:02 -07:00
Wilba6582 138156d4a0 Update for Atomic PCB Rev 0 2015-06-30 17:35:18 +10:00
Sean Hunter 77a7b180df Current smh keymap 2015-06-09 10:12:57 +01:00
Jack Humbert ae2e7fdf26 Update PCB_GUIDE.md 2015-06-07 13:40:11 -04:00
cr3473 3bc50429a7 added mouse scroll keymapping 
rearranged mouse button layout
 2015-06-04 15:04:12 -07: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
cr3473 bcb04570ea PCB Guide edits and update to joe's keymap 2015-06-02 13:58:45 -07:00
angerthosenear cea51941a4 Create extended_keymap_angerthosenear.c 
Adding my keymap to the available keymaps list.
 2015-06-02 12:23:34 -07:00