mindfulminun/qmk
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
1,403 Commits 2 Branches 1,455 Tags
d959f23e5e2d4de72bfd20dea69816b0bbb7a57c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Humbert 3985f97d87 Merge pull request #115 from seancaffery/sean/atreus 
Add Teensy2 Atreus support
 2016-01-29 23:47:27 -05:00
Jack Humbert 7d6716bede audio on reset 2016-01-29 23:27:36 -05:00
Jack Humbert 0a71166a2d missing file 2016-01-29 23:11:25 -05:00
Jack Humbert 30db300d94 Merge pull request #110 from mollat/master 
add mollat keymap
 2016-01-26 13:01:35 -05:00
Jack Humbert 3ea6927b70 Merge pull request #109 from petereichinger/master 
Fix flickering when sleeping
 2016-01-25 11:56:00 -05:00
Jack Humbert 99c72d0d9b Merge pull request #106 from yangliu/planck-rgb 
RGB Underglow with WS2812 LEDs
 2016-01-24 21:31:08 -05:00
Jack Humbert fd72a46c13 Makefile back to defaults 2016-01-23 20:52:01 -05:00
Jack Humbert 24f2698fba changes to the template 2016-01-23 20:45:52 -05:00
Jack Humbert 6a55a5fe48 not sure how this got here.. 2016-01-23 20:40:40 -05:00
Jack Humbert 9a1ae948c9 Merge pull request #104 from jackhumbert/smarkefile 
Rework Planck file structure
 2016-01-23 20:37:00 -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 544a49329c Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard into smarkefile 2016-01-23 20:33:35 -05:00
Jack Humbert c753bfcc14 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard into audio 2016-01-23 20:32:51 -05:00
Jack Humbert e5aee62e54 starting the hand-wiring guide 2016-01-23 20:29:54 -05:00
Jack Humbert a18dcc0fb1 Merge pull request #98 from xaocon/fix_tap 
Single tap enable ACTION_LAYER_TAP_TOGGLE layer
 2016-01-22 11:35:04 -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 8b7e86b2c3 Merge pull request #94 from plgruener/german_aliases 
complete keymap_german.h (all alphanumerics)
 2016-01-19 14:09:55 -05:00
Jack Humbert 0c3aed93db Merge pull request #93 from petereichinger/master 
LCAG modifier combo and AutoHotkey international characters
 2016-01-18 16:38:15 -05:00
Jack Humbert 2dcdbb8f67 Merge branch 'smarkefile' of https://github.com/jackhumbert/tmk_keyboard into smarkefile 2016-01-16 01:09:21 -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 547fa6e461 I guess I can reference #90 in the commit message 2016-01-16 01:01:32 -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 8b76d1ba4c Merge pull request #83 from lxol/feature/hhkb-qmk 
migrate hhkb to QMK firmware
 2016-01-13 09:55:58 -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 0f867796de timer 3 2016-01-11 17:52:35 -05:00
Jack Humbert 29de37d5c0 pwm audio 2016-01-11 16:53:33 -05:00
Jack Humbert 11ce694557 Merge pull request #77 from chwilk/master 
Keymap to approximate Kinesis Advantage line of keyboards
 2016-01-08 11:54:40 -05:00
Jack Humbert 1633c5d493 Merge pull request #74 from sethherr/patch-3 
Fix homebrew references
 2016-01-06 12:22:48 -05:00
Jack Humbert 9f4716a4b1 Merge pull request #60 from rothgar/dvorak 
added dvorak keymap and layout picture
 2016-01-06 00:04:59 -05:00
Jack Humbert ff8f171cc1 Merge pull request #70 from sperochon/ergodox_ez_fr 
Ergodox_ez french OS X
 2016-01-06 00:02:27 -05:00
Jack Humbert 670256c943 Merge pull request #71 from andruby/andrew_osx 
Andrew's OSX ergodox ez keymap
 2016-01-06 00:01:56 -05:00
Jack Humbert 0f2c7730d4 Merge pull request #68 from waveform80/daves-comments 
Added comments to LED stuff and included .hex file
 2016-01-02 14:22:43 -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
Jack Humbert 41d4cf05ef Merge pull request #67 from waveform80/daves-keymap 
Dave's custom keymap
 2016-01-02 11:58:27 -05:00
Jack Humbert 9814343336 Merge pull request #56 from sboesebeck/master 
fix number pad for german keys
 2015-12-23 12:01:27 -05:00
Jack Humbert 694fe4e1e2 Merge pull request #55 from sboesebeck/master 
fixed some typos, learned, DE_-keycodes are for Win, not OSX
 2015-12-22 17:51:32 -05:00
Jack Humbert b1fbd4c9ca Merge pull request #53 from sboesebeck/master 
minor updates
 2015-12-21 19:31:31 -05:00
Jack Humbert 40119017f2 Merge pull request #52 from technovangelist/master 
first attempt at a working workman layout for the ergodoxez
 2015-12-21 11:52:11 -05:00
Jack Humbert e70cdb0693 Merge pull request #47 from pnutster/master 
OSX Kinesis-like Mapping
 2015-12-19 23:50:05 -05:00
Jack Humbert 765c1b9f4d Merge pull request #46 from sboesebeck/master 
German layout for osx
 2015-12-19 23:49:26 -05:00
Jack Humbert e0acb8a0ee Merge pull request #45 from matzebond/master 
German keymap + ErgoDox keymaps
 2015-12-19 14:26:14 -05:00
Jack Humbert 0a58ce3881 jack's ergodox layout 2015-12-17 22:44:09 -05:00
Jack Humbert 23846997f6 Merge pull request #39 from gdiegel/master 
New keymap
 2015-12-14 23:30:59 -05:00
Jack Humbert 2e79054ab8 Merge pull request #40 from alexeyzab/keymap-alexey 
Atreus-like keymap
 2015-12-14 23:30:42 -05:00
Jack Humbert 43afb2ebef Merge pull request #38 from alcesleo/patch-2 
Make links work in TMK_README
 2015-11-27 00:31:15 -05:00
Jack Humbert 11d6e66979 atomic hex 2015-11-21 15:01:33 -05:00
Jack Humbert 3d1117db50 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-11-09 14:24:56 -05:00
Jack Humbert 8e9153ce12 Michelle's layout 2015-11-09 14:24:49 -05:00
Jack Humbert d2d75b9759 Merge pull request #36 from justinyhuang/master 
added support for JD45
 2015-11-07 09:52:59 -05:00
Jack Humbert 6485c7d7da nkro info 2015-11-05 12:07:03 -05:00
Jack Humbert 3511a830ac readme 2015-10-30 00:49:47 -04:00
Jack Humbert 5901f5911b atomic files 2015-10-30 00:49:11 -04:00
Jack Humbert eb2795b4d6 atomic up-to-date 2015-10-30 00:48:17 -04: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 ea0e1169e6 README 2015-10-28 13:58:21 -04:00
Jack Humbert e3050bba67 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-10-28 13:54:43 -04:00
Jack Humbert 8643e01286 merging 2015-10-28 13:54:41 -04:00
Jack Humbert 1fb8b4ce3a changes 2015-10-28 00:56:15 -04:00
Jack Humbert b8ebba012b Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-10-27 23:49:55 -04:00
Jack Humbert dee171b425 ht to mt 2015-10-27 23:44:10 -04:00
Jack Humbert 18da1e6801 layer tap, mod tap 2015-10-27 23:06:18 -04:00
Jack Humbert d9f08e6177 toggle and hold-tap action shortcuts 2015-10-27 22:00:52 -04:00
Jack Humbert 909d30553f updated EZ makefile with tmk_core changes 2015-10-27 21:13:10 -04:00
Jack Humbert d311fd8d1a Merge pull request #34 from jackhumbert/tmk-master 
merging from tmk, new_project script and template
 2015-10-27 14:52:18 -04:00
Jack Humbert 6f3141965e new project script 2015-10-27 14:33:18 -04:00
Jack Humbert d35402938f reverting gh60 2015-10-27 12:49:07 -04:00
Jack Humbert 0e93ee235f reverting gh60 2015-10-27 12:47:12 -04:00
Jack Humbert 547da78335 merging tmk 2015-10-27 12:42:30 -04:00
Jack Humbert a766918d5c README changes 2015-10-27 11:54:46 -04:00
Jack Humbert 53f7c6535d Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-10-27 00:48:30 -04:00
Jack Humbert 5a268d97ec READMEs 2015-10-27 00:48:22 -04:00
Jack Humbert 018e7a2e37 Merge pull request #28 from abienz/master 
Added volume down to function layer
 2015-10-26 23:17:37 -04:00
Jack Humbert a6913550c8 fixed MOs 2015-10-26 23:17:19 -04:00
Jack Humbert 7f8643a6a6 Merge pull request #32 from jackhumbert/hf/comments 
[Jack & Erez] Comments + tiny updates and cleanup
 2015-10-26 23:15:06 -04:00
Jack Humbert cc1c32671e fixed makefile, added MO DF shortcuts 2015-10-26 20:02:25 -04:00
Jack Humbert 402122744c ez with leds 2015-10-26 16:57:45 -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 484a9d12f0 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-10-25 12:11:13 -04:00
Jack Humbert e61a5ed806 nordic shortcuts 2015-10-25 12:11:04 -04:00
Jack Humbert abc1c0e31e Update README.md 2015-10-24 21:18:56 -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
Jack Humbert d664234bab Merge pull request #31 from cr3473/master 
Modified numpad/tenkey layout
 2015-10-11 23:35:59 -04: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