Commit graph

4802 commits

Author SHA1 Message Date
milestogo 1622d7147b :
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2017-02-12 21:24:55 -08:00
Jack Humbert 4010360912 adds planck/rev3 makefile so subproject is found 2017-02-12 23:58:44 -05:00
Priyadi Iman Nurcahyo c68e596f32 Implement faux-clicky feature 2017-02-13 08:03:07 +07:00
Jack Humbert 1e97f77278 update travis badge 2017-02-12 20:01:04 -05:00
Jack Humbert 68970679e7 Merge pull request #1092 from lucwastiaux/master
updated ergodox/dvorak_programmer keymap
2017-02-12 19:38:59 -05:00
luc wastiaux 3bf6c43de7 updated readme 2017-02-13 07:46:07 +08:00
luc wastiaux 352d79e1fb Merge remote-tracking branch 'upstream/master' 2017-02-13 07:44:28 +08:00
Jack Humbert 4505db5d0e Merge pull request #1091 from smt/smt/tv44
Add smt keymap for tv44 (MiniVan)
2017-02-12 18:42:44 -05:00
luc wastiaux 5f8535b356 change thumb cluster key to be shift 2017-02-13 07:16:01 +08:00
Stephen Tudor b6730285b4 Add smt keymap for tv44 (MiniVan) 2017-02-12 12:46:24 -05:00
Jack Humbert a773124537 send travis stuff to gitter 2017-02-12 12:23:03 -05:00
Jack Humbert 8d0fdf1008 adds soft pwm for non-timed ports 2017-02-12 11:29:42 -05:00
Priyadi Iman Nurcahyo 97e6bb5a4e Merge branch 'master' into promethium 2017-02-12 17:52:09 +07:00
milestogo 2d655b1830 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2017-02-11 22:11:06 -08:00
milestogo 274b1c53fb keymap update 2017-02-11 22:10:44 -08:00
Xyverz 719f6f0293 Merge remote-tracking branch 'upstream/master' 2017-02-11 21:57:54 -08:00
Xyverz 4894150094 Changes to the keymap to accommodate the RGB Underglow lighting. 2017-02-11 21:54:58 -08:00
Xyverz 134c354fc5 Adding a config file so that I can get RGB underglow for my Let's Split 2017-02-11 21:54:05 -08:00
Priyadi Iman Nurcahyo bc1308c112 Update my Planck layout 2017-02-12 05:04:14 +07:00
Jack Humbert a0c2305bd1 Merge pull request #1089 from priyadi/fix_ps2_mouse_warning
Suppress warnings from ps2_mouse.h
2017-02-11 13:18:42 -05:00
Priyadi Iman Nurcahyo 1b7439bfb1 Forgot to add ifdef to optional feature 2017-02-12 00:20:47 +07:00
Priyadi Iman Nurcahyo aaa58a8d79 Supress warnings from ps2_mouse.h 2017-02-12 00:13:36 +07:00
Priyadi Iman Nurcahyo e52d793c79 Merge branch 'master' into promethium 2017-02-12 00:09:25 +07:00
Priyadi Iman Nurcahyo ce6b68f85b Remove assignment warning 2017-02-12 00:07:33 +07:00
Priyadi Iman Nurcahyo 2c1ef84b22 Workaround to remove warning 2017-02-12 00:02:36 +07:00
Priyadi Iman Nurcahyo 89d3ff8f18 Some space optimization and housekeeping 2017-02-12 00:00:01 +07:00
Jack Humbert 6d6b3ee9fb Merge pull request #1065 from milestogo/master
Update to kinesis keymaps
2017-02-11 11:51:06 -05:00
Jack Humbert 3f0b491fc0 Merge pull request #1082 from priyadi/right-side-dual-function
Implement tap mod dual role for right side mods.
2017-02-11 11:50:32 -05:00
Jack Humbert 6bb479ea45 Merge pull request #1085 from priyadi/promethium
Promethium keyboard layout update
2017-02-11 11:49:00 -05:00
Jack Humbert 5bdddb7821 Merge pull request #1087 from mneme/master
Updated keymap for atreus62/mneme
2017-02-11 11:48:39 -05:00
Jack Humbert 199458378b Merge pull request #1088 from Mauin/gon_nerd
add GON NerD
2017-02-11 11:48:11 -05:00
Jack Humbert bfc33a56d7 don't try to build the readme 2017-02-11 11:39:57 -05:00
Marvin Ramin 5daa3a8836 add GON NerD 2017-02-11 17:14:40 +01:00
Priyadi Iman Nurcahyo 4163a3819e Add regular space to B+N on GUI layer for repeating space 2017-02-11 22:16:19 +07:00
Priyadi Iman Nurcahyo 4c05e39a02 Switch to Emoji layer using Punc + greek 2017-02-11 22:13:35 +07:00
Priyadi Iman Nurcahyo 4586b19be3 Turn off capslock when entering num layer 2017-02-11 22:07:04 +07:00
Priyadi Iman Nurcahyo c6123b2e4a Move X in number layer away from space 2017-02-11 22:03:34 +07:00
Priyadi Iman Nurcahyo 513286cf98 LSpace + RSpace = switch layer 2017-02-11 21:54:10 +07:00
David Olsson 52e2afe673 correct spelling in readme 2017-02-11 15:09:30 +01:00
Priyadi Iman Nurcahyo 79de0cd119 Implement Capslock LED 2017-02-11 19:03:18 +07:00
David Olsson 052f81aaca Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2017-02-11 10:50:37 +01:00
David Olsson aa69337cf5 update readme 2017-02-11 10:49:53 +01:00
Priyadi Iman Nurcahyo 9fc3afbef4 simplify battery calculation for now 2017-02-11 14:50:43 +07:00
Xyverz 902d5077cd Merge remote-tracking branch 'upstream/master' 2017-02-10 23:34:27 -08:00
Xyverz 4d7105c2cf Added RGB Underglow to my Preonic 2017-02-10 23:30:08 -08:00
Priyadi Iman Nurcahyo b31ac35441 Fix emoji layer 2017-02-11 01:30:08 +07:00
Priyadi Iman Nurcahyo b92515f139 Make room for 'loose keycodes' by halving UNICODE_MAP range 2017-02-11 00:36:08 +07:00
Priyadi Iman Nurcahyo fdd06d3fca RShift + LShift = Capslock 2017-02-11 00:21:27 +07:00
Priyadi Iman Nurcahyo bf31f516e3 Add reset keycode 2017-02-11 00:07:44 +07:00
Priyadi Iman Nurcahyo 909fd4ae64 Generalize layer indicators 2017-02-11 00:07:10 +07:00