rootiest/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,620 Commits 1 Branch 0 Tags
dc451b505bf6c21f3a423a299b112704b3b0092b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Humbert ba058f8b81 Merge pull request #210 from n0bs/master 
Edited Bantam44 to work with jackhumbert/qmk_firmware pull #190
 2016-03-23 13:46:02 -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
Jack Humbert e8951d6e41 Merge pull request #199 from IBNobody/master 
Added LED Indicator Support to QMK Template
 2016-03-22 22:15:18 -04:00
Jack Humbert 35393fa9dc Merge pull request #194 from DidierLoiseau/bépo-keymap-header 
Keymap header for the BÉPO layout
 2016-03-14 13:42:47 -04:00
Jack Humbert 914f1d6f98 Merge pull request #195 from krid78/master 
fixes an obvious typo to have DE_LCBR produce {
 2016-03-14 13:42:23 -04:00
Jack Humbert f2cf3f3028 Merge pull request #197 from yoyoerx/windocs 
Cygwin Based Users Guide v0.6 -fixes to dfu-programmer build
 2016-03-14 13:37:10 -04:00
Jack Humbert 45de75f179 Merge pull request #192 from mitchlloyd/mitch-layout 
First keyboard layout
 2016-03-10 20:43:04 -05:00
Jack Humbert cadd9015dd Merge pull request #191 from yoyoerx/windocs 
Cygwin Based Users Guide v0.5 -further corrections
 2016-03-10 11:03:27 -05:00
Jack Humbert 2a9d8b3f30 Merge pull request #187 from yoyoerx/windocs 
Cygwin Based Users Guide v0.4 -corrections/dfu build
 2016-03-09 15:47:25 -05:00
Jack Humbert 10f45a63b6 Merge pull request #177 from yoyoerx/windocs 
Documentation for Cygwin in Windows
 2016-03-07 10:16:35 -05:00
Jack Humbert 4e4250063e Merge pull request #180 from NoahAndrews/add-build-instructions 
Added build instructions to BUILD_GUIDE.md
 2016-03-04 23:34:45 -05:00
Jack Humbert 4a5a2640b9 Merge pull request #179 from NoahAndrews/add-win-linux-instructions 
Added Windows and Linux instructions to BUILD_GUIDE.md
 2016-03-04 21:57:39 -05:00
Jack Humbert 825626b1f4 Merge pull request #176 from NoahAndrews/fix-new-projects 
Fix building new projects
 2016-03-04 10:58:36 -05:00
Jack Humbert 5f3e99f67b Merge pull request #171 from NoahAndrews/restructure-documentation 
Restructure documentation
 2016-03-04 10:19:28 -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
Jack Humbert cc46f69843 Merge pull request #165 from deepshitgoeshere/deepshitgoeshere-master 
added planck keymap and troubleshooting part in the PCB guide
 2016-03-04 10:17:14 -05:00
Jack Humbert 984c82a0f8 Merge pull request #175 from NoahAndrews/fix-#174 
Fix #174
 2016-03-04 10:16:07 -05:00
Jack Humbert ccf848917b Merge pull request #172 from plgruener/pr1 
add missing keys to keymap_neo2.h
 2016-03-03 23:35:12 -05:00
Jack Humbert 93c9d2bc9f Merge pull request #166 from kletord/fix_french_keymap 
Fix FR_RCBR declaration in keymap_french.h
 2016-02-27 09:31:34 -05:00
Jack Humbert 11c591c30d Merge pull request #158 from DidierLoiseau/eclipse-config 
Add Eclipse settings files to .gitignore
 2016-02-23 11:44:14 -05:00
Jack Humbert af6163f934 Merge pull request #159 from Keller-Laminar/patch-1 
Include Dvorak underscore and plus keys.
 2016-02-22 13:12:19 -05:00
Jack Humbert d33681aa22 Merge pull request #157 from DidierLoiseau/typematrix 
Small fixes and improvements to tm2030 layout
 2016-02-21 13:35:08 -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
Jack Humbert 49cb207def Merge pull request #155 from vincent-pochet/fr_ch_extra_keymap 
Add extra keymap for swiss french keyboard
 2016-02-21 12:35:10 -05:00
Jack Humbert a6414eb257 Merge pull request #145 from gerbercj/feature/atreus_astar 
Add support for Atreus running on A-Star
 2016-02-17 21:18:13 -05:00
Jack Humbert 043ac26c24 Merge pull request #140 from lasko/master 
A slightly different default layout
 2016-02-11 23:58:08 -05:00
Jack Humbert 0206976267 Merge pull request #136 from cbbrowne/master 
Random improvements
 2016-02-08 14:25:22 -05:00
Jack Humbert f575079357 Merge pull request #134 from dragon788/patch-2 
Added note about using avr_setup.sh
 2016-02-07 22:00:45 -05:00
Jack Humbert bc4f20853d advanced macro stuff for README 2016-02-07 16:28:48 -05:00
Jack Humbert 8967c0705b advanced macro stuff for README 2016-02-07 11:15:03 -05:00
Jack Humbert cf2c641557 advanced macro stuff for README 2016-02-07 11:14:47 -05:00
Jack Humbert 3a6e88d6f8 advanced macro stuff for README 2016-02-07 11:13:22 -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
Jack Humbert 8d785de796 Merge pull request #131 from Vifon/patch-1 
Use boolean AND instead of bitwise (possible typo)
 2016-02-07 09:30:39 -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
Jack Humbert 51964eda0c Merge pull request #126 from fernandodeperto/keymap_nordic 
Fix 2 macros in the Nordic keymap
 2016-02-04 20:01:57 -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
Jack Humbert 1ee080701b Merge pull request #116 from tachk/readmeFix 
Fix for broken link in readme.
 2016-01-31 20:40:34 -05:00
Jack Humbert dc06288cb7 Merge pull request #119 from seancaffery/teensynote 
Clarify Atreus support
 2016-01-31 20:40:19 -05:00
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