Commit graph

249 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 #244 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
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 #2 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 #200 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 #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