Priyadi Iman Nurcahyo
b5511b9a8a
Merge branch 'master' into promethium
2016-11-26 13:31:17 +07:00
Priyadi Iman Nurcahyo
9a071f051c
Make PS2 init delay configurable. Some devices are not fully powered up
...
after 1s.
2016-11-26 13:24:53 +07:00
Priyadi Iman Nurcahyo
4b0d16cd7b
My Promethium keyboard firmware
2016-11-26 13:11:40 +07:00
cbbrowne
e3c735e400
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-11-25 12:06:35 -05:00
Jack Humbert
bf23ac96f6
Merge pull request #902 from OferPlesser/feature/ps2-mouse-support
...
PS/2 mouse support
2016-11-25 11:22:44 -05:00
ofples
97e7486d4c
Added documentation for PS/2 mouse in readme
2016-11-25 12:10:44 +02:00
ofples
0c9d66eb59
Removed comment
2016-11-25 09:20:41 +02:00
ofples
03d6e165bb
Added missing endif for ifdef __AVR_ATmega32U4__ and removed the unnecessary one at the end of the file
2016-11-25 09:17:40 +02:00
ofples
3be13d1ffb
Added protocol.mk to build
2016-11-25 09:15:12 +02:00
Jack Humbert
98d7ad6f49
Merge pull request #899 from Wilba6582/suspend_fix
...
Fixed NO_SUSPEND_POWER_DOWN handling
2016-11-24 22:20:08 -05:00
Jack Humbert
f25596b8dc
rgblight fixes
2016-11-23 21:28:12 -05:00
Jack Humbert
cefa8468fb
travis pls
2016-11-23 20:16:38 -05:00
Jack Humbert
2e23689b8e
converted to new format
2016-11-23 18:52:02 -05:00
cbbrowne
c05cbaf534
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-11-23 17:47:16 -05:00
Wilba6582
cf3926a8e1
Fixed NO_SUSPEND_POWER_DOWN handling
2016-11-23 19:45:50 +11:00
Jack Humbert
3d7aaa31e4
converted to 8bit messages
2016-11-23 00:30:06 -05:00
Wilba6582
5893f0fa1f
Fixed NO_SUSPEND_POWER_DOWN handling
2016-11-23 16:22:57 +11:00
Jack Humbert
2b3a3ca678
Merge pull request #898 from PureSpider/backlight-fix
...
Set backlight status to on if it's at maximum brightness already and the brightness increase keybind is used
2016-11-22 18:41:37 -05:00
Jack Humbert
e131de3df6
Merge pull request #896 from h-youhei/jp106
...
Add japanese keymap
2016-11-22 18:39:54 -05:00
PureSpider
d37becc0a9
Set backlight status to on if it's at maximum brightness already and the brightness increase keybind is used
...
Before it was turned on but the status wasn't set to on, so you had to
push the backlight toggle bind twice to turn it off again
2016-11-22 22:12:57 +01:00
h-youhei
2febf9b9f7
Add japanese keymap
2016-11-22 20:40:12 +09:00
Jack Humbert
450a8fb5b6
Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7
2016-11-21 20:17:45 -05:00
Jack Humbert
06a2677b7e
fix infinity
2016-11-21 20:17:32 -05:00
Jack Humbert
6390033e86
cleaning up midid
2016-11-21 20:14:16 -05:00
Jack Humbert
af119baf71
Merge pull request #894 from dchagniot/ergodoxDvorakEmacs
...
Ergodox dvorak emacs
2016-11-21 20:00:40 -05:00
Jack Humbert
4bb0eaef26
Merge pull request #893 from Sihui/sh-hhkb-jp
...
[HHKB JP with Dvorak]
2016-11-21 20:00:13 -05:00
Jack Humbert
be265decae
Merge pull request #892 from fredizzimo/disable_ergodox_lcd
...
Always initialize the Infinity Ergodox backlight
2016-11-21 19:59:39 -05:00
Jack Humbert
377583d9f3
Merge pull request #891 from g-sam/galson-keymap
...
adds galson keymap
2016-11-21 19:59:17 -05:00
Jack Humbert
132c079534
Merge pull request #890 from algernon/f/space-cadet/timeout
...
Add a timeout to space-cadet shift.
2016-11-21 19:58:55 -05:00
Jack Humbert
e0fc186c28
Merge pull request #888 from climbalima/master
...
Added pro micro to maxipad
2016-11-21 19:58:24 -05:00
Jack Humbert
ea472fb018
Merge pull request #887 from profet23/atreus62
...
atreus62 Keyboard Support
2016-11-21 19:58:00 -05:00
Jack Humbert
664c0a036b
cleaning up new code
2016-11-21 19:50:55 -05:00
Jack Humbert
27ebacb15d
merging lets_split
2016-11-21 19:18:47 -05:00
Jack Humbert
c1037b1dc0
working with helper, qmk_helper_windows@05b0105
2016-11-21 18:05:06 -05:00
Jack Humbert
b57cf3c0c8
more structure to the package
2016-11-21 12:54:06 -05:00
Sihui Huang
b75538c0bf
add del to new cmd
2016-11-20 14:45:51 -08:00
Sihui Huang
390a1bda8b
add space to NewCmd layer
2016-11-20 13:32:25 -08:00
Sihui Huang
ccc34851f2
add space to NewCmd layer
2016-11-20 13:31:41 -08:00
Didier Chagniot
6f24344be7
typo fix
2016-11-20 20:51:05 +01:00
Sihui Huang
23f63ed1b9
Update README.md
2016-11-20 11:18:08 -08:00
Sihui Huang
34aa59c6d5
Update README.md
2016-11-20 11:13:57 -08:00
Sihui Huang
11f17e3b23
Update README.md
2016-11-20 11:12:48 -08:00
Sihui Huang
a8b1c47f0f
add sh-hhkb-jp layers
2016-11-20 11:10:26 -08:00
Fred Sundvik
c86bbf474e
Always initialze the Infinity Ergodox backlight
...
Otherwise it will stay lit. The set_led functionality is also disabled
since it doesn't work properly for slaves.
2016-11-20 19:28:10 +02:00
Jack Humbert
3b990c08dc
Merge pull request #878 from sethbc/add_sethbc_gh60_keymap
...
add sethbc keymap for gh60 and update macro expansion
2016-11-19 13:05:30 -05:00
xyverz
f9cf4f75ae
Merge remote-tracking branch 'upstream/master'
2016-11-19 09:31:34 -08:00
Seth Chandler
df8724ce08
remove KC expansion from GH60
2016-11-19 12:19:21 -05:00
Gergely Nagy
74a1f00713
Fix the Space Cadet timeout code
...
Define a default TAPPING_TERM in quantum.c, for keyboards that do not
have it set. Fixes the CI failure.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-11-19 18:19:18 +01:00
Seth Chandler
620e4f74d3
move KC expansion to separate macros
2016-11-19 11:37:12 -05:00
Seth Chandler
ac7d202d4f
merge upstream/master
2016-11-19 11:20:41 -05:00
