Commit Graph

4640 Commits (3fdc45b4e9581c823ac09545241241e0c6d3f313)

Author SHA1 Message Date
Priyadi Iman Nurcahyo d0ee5292b6 Merge branch 'layer_state_set_kb' into promethium 2017-02-15 05:25:45 +07:00
Priyadi Iman Nurcahyo bd8d717f1f Fix bug fix attempt 2017-02-15 05:25:08 +07:00
Priyadi Iman Nurcahyo 369b3dc723 Merge branch 'layer_state_set_kb' into promethium 2017-02-15 05:23:25 +07:00
Priyadi Iman Nurcahyo d96175937b Bug fix & added default_layer_state_set_kb 2017-02-15 05:20:15 +07:00
Priyadi Iman Nurcahyo 3c8c3ebe3f Bug fix & added default_layer_state_set_kb 2017-02-15 05:19:31 +07:00
Priyadi Iman Nurcahyo 5e31074633 Merge branch 'layer_state_set_kb' into promethium 2017-02-15 05:11:24 +07:00
Priyadi Iman Nurcahyo d369bfb83a Add layer_state_set_kb hook 2017-02-15 05:02:15 +07:00
Priyadi Iman Nurcahyo df311c7b40 num, func, punc 3state layer done right 2017-02-15 05:01:03 +07:00
lambdalisue 64f9779fe5 Add TAPPING_FORCE_HOLD to regulate behaviour
See #889 for the detail.
2017-02-14 14:12:54 +09:00
Stanley Lai 3272821d32 Added support for XD60v2 with RGB underglow and LED backlight support 2017-02-13 18:09:02 -08:00
Priyadi Iman Nurcahyo 3758cfd95f GUI layer fixes 2017-02-14 04:17:09 +07:00
Priyadi Iman Nurcahyo 6c692fca7d Alt-tab handling in GUI layer 2017-02-14 03:58:12 +07:00
Stanley Lai a8eba1bdda Merge remote-tracking branch 'refs/remotes/qmk/master' 2017-02-13 12:36:22 -08:00
Priyadi Iman Nurcahyo 7ae677dcb7 remove stand alone punc layer switcher for now 2017-02-14 03:18:34 +07:00
Priyadi Iman Nurcahyo 02662e3869 Add explicit punctuation key for greek layers 2017-02-14 00:46:06 +07:00
Priyadi Iman Nurcahyo c2531ff43b Func + Num = Punc 2017-02-14 00:44:02 +07:00
Jack Humbert fd2925efba Merge pull request #1094 from priyadi/faux_clicky
Implement faux-clicky feature
2017-02-13 10:58:50 -05:00
Jack Humbert 21ad0c5bcd Merge pull request #1095 from Mauin/gonnerd/reset_documentation
GON NerD: Add reset button to documentation and default keymap
2017-02-13 10:56:47 -05:00
Priyadi Iman Nurcahyo 15e2dbb2a9 move GRV to ESC position 2017-02-13 22:18:36 +07:00
Priyadi Iman Nurcahyo 903e4d3193 Fix faux clicky toggle key 2017-02-13 20:13:33 +07:00
Marvin Ramin 24a40d63c9 define missing KC_NO macro 2017-02-13 13:44:53 +01:00
Priyadi Iman Nurcahyo 75e57b4bcb Merge branch 'faux_clicky' into promethium 2017-02-13 18:01:57 +07:00
Priyadi Iman Nurcahyo 200488bb31 Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethium 2017-02-13 17:58:42 +07:00
Priyadi Iman Nurcahyo 40ced77606 Update my Planck layout 2017-02-13 17:58:06 +07:00
Priyadi Iman Nurcahyo 97472aabe6 Forgot to add ifdef to optional feature 2017-02-13 17:58:06 +07:00
Priyadi Iman Nurcahyo 68e5c85999 Remove assignment warning 2017-02-13 17:58:06 +07:00
Priyadi Iman Nurcahyo 455568d197 Workaround to remove warning 2017-02-13 17:58:06 +07:00
Priyadi Iman Nurcahyo 5d5f2ff50d Some space optimization and housekeeping 2017-02-13 17:58:06 +07:00
Marvin Ramin b28fb29898 adds documentation for reset button and adds one to the default keymap 2017-02-13 09:03:43 +01:00
Priyadi Iman Nurcahyo 8c93c5d9ab Add keycodes to turn on, turn off and toggle faux clicky 2017-02-13 14:55:35 +07:00
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
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