Commit Graph

300 Commits

Author SHA1 Message Date
IBNobody
66c1024bd3 fixed merging 2016-04-14 22:33:18 -05:00
IBNobody
d4f90fe882 Merge remote-tracking branch 'remotes/jackhumbert/new_defaults' 2016-04-14 22:29:33 -05:00
Jack Humbert
63462bf8c1 changing up the makefile a bit 2016-04-14 20:42:14 -04:00
Jack Humbert
ddbe430778 new defaults 2016-04-14 19:13:24 -04:00
IBNobody
cf17687f29 Adding personal build file settings 2016-04-14 12:59:16 -05:00
IBNobody
3dd20f2b6c Rename pc.c to pvc_planck.c 2016-04-14 11:35:49 -05:00
IBNobody
3d601c1bce Rename pc.c to pvc_planck.c 2016-04-14 08:56:27 -05:00
IBNobody
44e4320b2e Nightly 2016-04-14 06:34:56 -05:00
IBNobody
95a44cdf01 Disabled print. 2016-04-13 22:00:36 -05:00
IBNobody
9ff9317720 Corrected spacing. 2016-04-13 21:55:04 -05:00
IBNobody
01f5b35396 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into pc_planck 2016-04-13 19:14:23 -05:00
IBNobody
390fd3107a local files
local files
2016-04-13 18:48:25 -05:00
IBNobody
caf3e48de8 LOCAL COMMIT
LOCAL COMMIT
2016-04-13 17:40:16 -05:00
IBNobody
ff06eaf853 Added del 2016-04-12 08:17:02 -05:00
IBNobody
5ef6978cab Adding personal files 2016-04-12 06:55:26 -05:00
Jack Humbert
d342989f25 Merge pull request from nicosuave/add_nico_planck_keymap
Add nico keymap
2016-04-11 14:52:10 -04:00
Nico Ritschel
077aee09a4 Add my keymap 2016-04-09 11:34:01 -07:00
tak3over
9e153b1a5c another modification of layers, restored arrow keys and added cut/paste 2016-04-07 10:54:11 -05:00
Erez Zukerman
9cfc74c35b [Erez & Jack] Makes tri-layer available across Quantum 2016-04-07 15:21:06 +03:00
tak3over
e89fd63426 switched raise and lower layers 2016-04-06 11:12:58 -05:00
tak3over
4eadc2a977 updated my keymap 2016-04-05 16:39:45 -05:00
tak3over
028dd16fe6 Modified keymap 2016-04-05 16:21:45 -05:00
tak3over
2a488d1597 Update tak3over.c 2016-04-04 16:51:30 -05:00
tak3over
2ba0de8fcd Merge pull request from jackhumbert/master
Update from source
2016-04-04 13:41:37 -05:00
tak3over
9cd0c9d589 Minor documentation error. Raise and Lower.
The Raise and Lower keys were transposed in the comment key map for all layers. Assuming _RS and _LW should be mapped to Raise and Lower respectively.  Probably is the same in the other custom keymaps that copied from this default.
2016-04-04 13:19:19 -05:00
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
Miha Rekar
3b703eff33 Tiny fix of Planck diagrams 2016-03-30 17:03:03 +02:00
Noah Andrews
95fba250ef Updated several keyboard folders to use new keymap naming scheme 2016-03-29 21:53:36 -04: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
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 from alexives/add_diagram_to_planck_layout
Added layout diagrams to the default planck keymap
2016-03-23 10:44: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 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
Jack Humbert
b694fb3417 Merge pull request 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 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 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 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