localhots/qmk_firmware
1
0
Fork 0
Code Releases Activity
8,082 Commits 1 Branch 0 Tags
Commit Graph

8082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Lucas
2877b858d3 Fix erroneous character 
Must have been keeb testing :)
 2016-07-16 20:38:55 -07:00
Jonathan Lucas
f13f48a35e Added CMD60 keymap 2016-07-16 20:24:14 -07:00
Joshua T
0642126720 Merge branch 'master' of https://github.com/replicaJunction/qmk_firmware 2016-07-15 18:02:38 -05:00
Joshua T
243ae75256 Added default layer switch QWERTY to Colemak 2016-07-15 18:02:23 -05:00
Joshua T
c5768a5f32 Added default layer switch QWERTY to Colemak 2016-07-15 17:49:14 -05:00
Joshua T
77377e2784 Fixed a merge conflict 2016-07-15 17:44:39 -05:00
Pavlos Vinieratos
f3b56701ed add an anyway and a reset callback 
when using tap dance, we have the `regular` callback that is called on
the last tap. this commit adds an `anyway` callback that is called on
every tap, and a `reset` callback that is called on reset of the tap
dance taps.
 2016-07-16 00:04:12 +02:00
Pavlos Vinieratos
1a7e954f9f in case its NULL 2016-07-16 00:04:12 +02:00
Erik Dasque
aa2a79bbfa Further simplyfying the docker usage 
We'll be able to change the image user name if we set up the initial repo to trigger Docker images rebuilds on hub.docker.com
 2016-07-15 13:26:34 -04:00
Erik Dasque
0446263935 Adding Docker build system & documentation 2016-07-15 12:55:40 -04:00
Christopher Browne
ba0d81f270 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-15 11:19:52 -04:00
Travis La Marr
d48a4cf1eb Fix OS X Recognizing keyboard as Mouse/Tablet 
Modified the LUFA USB HID Descriptor to change the logical/usage
minimums for System Control from 0x01 (Mouse) to 0x81 (System Power
Down), this fixes OS X recognizing the Planck as having a mouse and
tablet, even with mousekeys off.
 2016-07-15 10:41:32 -04:00
Travis La Marr
0b8c448b30 Make DFU wait for bootloader 
Added a loop for waiting for the keyboard to be put in bootloader mode,
rather than failing out. Makes building keymaps easier.
 2016-07-15 10:28:23 -04:00
Joshua T
42843d9b62 Merge remote-tracking branch 'upstream/master' 2016-07-15 01:01:19 -05:00
Jonathan A. Kollasch
4278d88615 keymap_dvorak.h: add missing shifted keys, fix whitespace 2016-07-14 11:32:43 -05:00
Jonathan A. Kollasch
25938a09a6 extra_keymaps: use RALT() instead of 0x1400 for AltGr 2016-07-14 11:13:35 -05:00
Jonathan A. Kollasch
010dd13084 keymap_extras: add newline at end of files 2016-07-14 11:10:05 -05:00
Jack Humbert
9ecf9073b9 Merge pull request #489 from Skrymir/master 
New ergodox-ez layout
 2016-07-14 10:59:23 -04:00
Jack Humbert
8bbbbcddf9 Merge pull request #515 from pvinis/reset-function 
extract reset keyboard into a function
 2016-07-14 10:53:51 -04:00
Will Wolff-Myren
76469ebbcf Replaced ordinary-media.{png|json} with new media layout 2016-07-14 01:22:15 -07:00
Will Wolff-Myren
1b776f0f33 Replaced ordinary-symbol.{png|json} with new base layout. 2016-07-14 01:03:45 -07:00
Will Wolff-Myren
b587245430 Replaced ordinary-base.{png|json} with new base layout. 2016-07-14 00:39:01 -07:00
Will Wolff-Myren
825aead3bd Replaced readme.md with stub 
(incl. reference to original layout)
 2016-07-14 00:38:00 -07:00
Joshua T
92e7291ad7 Corrected merge conflict 2016-07-13 22:41:02 -05:00
Joshua T
f90d89458c Created replicaJunction keymaps. 2016-07-13 22:37:34 -05:00
Will Wolff-Myren
8f3cdea357 Created "teckinesis" keymap folder 
(Based on "ordinary" keymap by Nicholas Keene)
 2016-07-13 13:17:55 -07:00
Pavlos Vinieratos
a28a6e5b79 extract reset keyboard into a function 
that makes it easy to call reset_keyboard() from a function in a keymap
 2016-07-13 16:38:02 +02:00
Josh Colbeck
fb46eb2de1 Added open resource macro 
tap to type, hold for resource
 2016-07-12 23:52:02 -05:00
Joshua Colbeck
68ceffe53e Merge pull request #2 from jackhumbert/master 
Pull from upstream
 2016-07-12 23:14:30 -05:00
Christopher Browne
f4fbfe6e54 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-12 11:57:15 -04:00
Christopher Browne
477ed703c8 I did not like Space Cadet paren; it jumps in in way too many extra cases 2016-07-12 11:57:05 -04:00
Joshua T
32725dae5b Created replicaJunction keymaps. 2016-07-11 17:49:12 -05:00
Jack Humbert
a998a48673 Merge pull request #477 from Smilliam/master 
Canceling Space Cadet state with opposite shift key
 2016-07-11 09:14:43 -04:00
Jack Humbert
076de6fa75 Merge pull request #506 from stanleylai/master 
Added my custom keymap for Satan
 2016-07-11 09:14:11 -04:00
skullydazed
d5102c7715 Merge pull request #507 from ruiqimao/master 
fixed clueboard LED pin assignments and matrix documentation
 2016-07-11 02:01:17 -07:00
Ruiqi Mao
cb0e102adb fixed clueboard LED pin assignments and matrix documentation 2016-07-11 01:18:35 -07:00
Smilliam
5e58e2281a amended extraneous file edits 2016-07-10 19:10:00 -07:00
Smilliam
b12fe6abb2 Made rollover behavior for space cadet optional 2016-07-10 19:04:01 -07:00
Stanley Lai
753cbee5c0 Added my custom keymap for Satan 2016-07-10 12:07:56 -07:00
Jack Humbert
4081fc4d8f Merge pull request #505 from fredizzimo/documentation_fix 
Remove out of place documentation, caused by ChibiOS merge
 2016-07-10 14:02:10 -04:00
Fred Sundvik
c7728780de Remove out of place documentation, caused by ChibiOS merge 2016-07-10 20:00:04 +03:00
Jack Humbert
b0300d8d8f Merge pull request #502 from robotmaxtron/master 
Adding robotmaxtron's GH60 Keymap
 2016-07-09 20:55:58 -04:00
Max Whittingham
df958a2dbc Update keymap.c 2016-07-09 18:58:16 -05:00
Jack Humbert
9dc6dfbf96 Merge pull request #500 from TerryMathews/master 
Establish Poker clone keymap for Satan
 2016-07-09 19:19:05 -04:00
TerryMathews
4decdd2b18 Merge pull request #1 from jackhumbert/master 
Catch up with jack's master
 2016-07-09 16:46:00 -04:00
TerryMathews
979a0d25f0 Establish Poker clone keymap for Satan 
Maps all of the side-print legends on the stock Poker II keycaps that
are feasible (doesn't support repeat rate toggling, Pmode recording).
 2016-07-09 16:42:26 -04:00
Max Whittingham
1ab527a4db Cleaning up repo 2016-07-09 03:20:58 -05:00
Erez Zukerman
c444f4f702 Documents tap dance 2016-07-08 21:40:57 -04:00
Jack Humbert
4139841e9d Merge pull request #498 from fredizzimo/fix_make_dependencies 
Fix make dependencies
 2016-07-08 16:44:18 -04:00
Fred Sundvik
6911ead027 Use order only prerequisites to avoid re-linking 
The prerequisites at the start of the build process are order-only
so that the trget don't link again. Also added as a dependency to
the compilation to force the messages to be printed at the start
 2016-07-08 23:19:48 +03:00