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

1048 commits

Author SHA1 Message Date
Jack Humbert 8f4ce501eb Merge pull request #260 from IBNobody/personal_atomic_planck 
Atomic TLC and musical note freqs for audio
 2016-04-16 21:02:17 -04:00
IBNobody bc65f73c64 Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomic_planck 2016-04-16 19:32:29 -05:00
IBNobody 4aea806aa8 Adding Musical Notes 2016-04-16 19:31:32 -05:00
IBNobody b5c22ab5b5 Merging with QMK main to fix audio issues 2016-04-16 19:27:21 -05:00
Jack Humbert c83aa16f1d fixes audio prescaler to emit correct freq 2016-04-16 20:26:02 -04:00
Jack Humbert ab19ebd08a MAGIC functionality, AG swap in default layout 2016-04-16 18:51:58 -04:00
Stephan Bösebeck 38a1d830fa Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-16 22:56:33 +02:00
Jack Humbert 5f648b6c40 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2016-04-16 15:47:20 -04:00
Jack Humbert 86169833c5 updates to preonic default, music mode integrated 2016-04-16 15:47:17 -04:00
Roman Zolotarev fa2eedb7bd
Add Roman's single layer layout based on Norman 2016-04-16 16:57:58 +08:00
Jack Humbert 9eadeb574b Merge pull request #257 from VoodaGod/bone2planck 
Bone2 Layout adptation for Planck
 2016-04-16 01:24:03 -04:00
Jack Humbert d81ef5b7eb new defaults for planck and preonic 2016-04-16 01:19:37 -04:00
IBNobody 9d4bfc1bcf Corrected layer macros 2016-04-15 22:40:07 -05:00
Jack Humbert 0faa18eab9 audio enable stored in eeprom 2016-04-15 23:38:21 -04:00
Jason Janse van Rensburg 549b797ad1 My Attempt at adapting the Bone2 layout with Neo2 navigation cluster & number block to the Planck. 
Very much a WIP, will most likely start tweaking further once my Planck kit has dropped
 2016-04-16 01:36:18 +02:00
IBNobody 2aa51e4416 Tweaking PVC atomic layout 2016-04-15 16:32:44 -05:00
IBNobody 8f85117aa9 Added Audio to my Atomic 2016-04-15 14:42:50 -05:00
IBNobody 39e520c010 Prepping for merge with new_defaults 2016-04-15 13:09:42 -05:00
Jack Humbert ee2ee7f4f0 audio note length fixes 2016-04-15 13:44:07 -04:00
Jack Humbert bb0836c620 the spacessss 2016-04-15 00:26:22 -04:00
Jack Humbert 43a4ffc259 bootmagic somehow not getting enabled, so adding eeconfig to backlight src include cond 2016-04-14 23:53:35 -04:00
Jack Humbert 2597fb7c50 might have broken something 2016-04-14 23:33:46 -04:00
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
IBNobody 3993afbb2e adding new per-keymap makefile 2016-04-14 22:27:28 -05:00
Nicholas Keene 63656ea34f The Ordinary Layout is the layout you are looking for. Come and see. 2016-04-14 22:00:15 -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 f051496f13 Checkin 2016-04-14 18:01:29 -05:00
Stephan Bösebeck 990254edec Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-14 21:47:33 +02: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 19061f2ff1 Update and rename pc_atomic.c to pvc_atomic.c 2016-04-14 08:54:22 -05:00
IBNobody 4b4d3069b4 Update and rename pc_atomic.c to pvc_atomic.c 
Also removed unused FNs
 2016-04-14 08:50:01 -05:00
IBNobody 59e041672c Remapped magic bootloader key to B. 2016-04-14 08:20:55 -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 aa9eaa9773 Corrected spacing. 2016-04-13 21:56:27 -05:00
IBNobody 9ff9317720 Corrected spacing. 2016-04-13 21:55:04 -05:00
IBNobody 3755ef5ddb Compiler Warnings / Atomic TLC 
Corrected compiler warnings for a number of issues.  Gave Atomic some
TLC.
 2016-04-13 20:57:51 -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
skullY 21d4cafb8c Fixup rgb underlight for clueboard1 2016-04-13 14:20:08 -07:00
IBNobody 3a601e76e4 Adding PC Atomic 2016-04-13 14:43:09 -05:00
Stephan Bösebeck a71ab3ebb6 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-12 15:39:18 +02: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
Erez Zukerman a0194d7e5f Merge pull request #249 from nrrkeene/master 
Version 3, Ordinary Perfected
 2016-04-12 09:04:29 +03:00
Nicholas Keene 93de95d0cd The Ordinary Layout is the layout you are looking for. Come and see. 2016-04-11 23:34:41 -05:00
Nicholas Keene 96f75f39c8 The Ordinary Layout is the layout you are looking for. Come and see. 2016-04-11 23:28:16 -05:00
Nicholas Keene efffbe35c8 The Ordinary Layout is the layout you are looking for. Come and see. 2016-04-11 22:51:12 -05:00
Jonathan Arnett 7635958270 Merge pull request #1 from J3RN/vim-navigation 
Added Vim-style navigation
 2016-04-11 19:22:23 -04:00
Jonathan Arnett 9e2c767c45 Added README note about Vim-style navigation 2016-04-11 19:19:20 -04:00
Jonathan Arnett 4b03a0f3d5
Stylistic changes 2016-04-11 19:08:24 -04:00
Jonathan Arnett aaa7af752c Make a also toggle Media layer 2016-04-11 19:01:39 -04:00
Erez Zukerman 511c843829 Merge pull request #246 from romanzolotarev/master 
Add a new layout with arrows in the home row
 2016-04-11 23:02:08 +03:00
Stephan Bösebeck c2e1d69f27 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-11 21:54:55 +02: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
Jack Humbert 472e920c03 Merge pull request #236 from tak3over/master 
Minor Doc Changes.
 2016-04-11 14:51:37 -04:00
Roman Zolotarev f26985ad16
Add HJKL layout 2016-04-11 21:45:10 +08:00
skullY 97f8f37876 Fixup RGBLIGHT support for clueboard2 2016-04-10 21:16:49 -07: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
Stephan Bösebeck 0befb25739 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-06 22:52:49 +02:00
Erez Zukerman d07a1257b3 Merge pull request #215 from nrrkeene/master 
Added proper documentation
 2016-04-06 22:35:17 +03:00
tak3over e89fd63426 switched raise and lower layers 2016-04-06 11:12:58 -05:00
skullY 0da53d3811 Fixup the cluepad code 2016-04-05 20:27:40 -07:00
skullY 34dd96187c Fix the clueboard2 led code 2016-04-05 20:27:24 -07: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
Alex Johnstone 9bd1caed44 Updated hex 2016-04-05 15:51:13 +01:00
Alex Johnstone 50ac511b56 💷 typo 2016-04-05 07:49:35 -07:00
Alex Johnstone 3fd62428a6 💷 typo 2016-04-05 07:48:13 -07:00
Alex Johnstone 1facc53a26 Merge pull request #5 from jackhumbert/master 
Sync with upstream
 2016-04-05 07:44:37 -07:00
Jack Humbert 931b0a79fc updates to noise 2016-04-05 09:44:01 -04:00
tak3over 2a488d1597 Update tak3over.c 2016-04-04 16:51:30 -05:00
Stephan Bösebeck 75c24499f3 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-04 22:35:48 +02: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
Erez Zukerman 0cdf5d292c Merge pull request #235 from mbarkhau/master 
add indent to generated keymap
 2016-04-04 08:04:31 +03:00
Stephan Bösebeck dee6a4338a minor updates - new PNG 2016-04-03 23:48:22 +02:00
Jack Humbert a90d68739a music mode file 2016-04-03 16:00:10 -04:00
Manuel Barkhau 22691de580 add indent to generated keymap 2016-04-03 21:46:32 +02:00
Erez Zukerman 13dcbfdab1 Links to build guide 2016-04-03 12:52:08 +03:00
Erez Zukerman 8d39263d24 Merge pull request #213 from mbarkhau/master 
Add manuneo layout
 2016-04-03 08:56:08 +03:00
Manuel Barkhau 381a9fd553 use action function for unicode 2016-04-02 23:12:38 +02:00
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
skullY 5e822417d7 Fixup clueboard support and add rgb to clueboard1 2016-03-28 22:49:24 -07: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
skullY 073b44924c Adding clueboard/cluepad support to qmk 2016-03-27 16:17:40 -07: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