e18a75609d
Merge branch 'master' into promethium
2016-12-05 02:01:20 +07:00
dd2911151b
Merge pull request #932 from climbalima/master
...
Added ponoko svg for lets split
2016-12-04 13:53:25 -05:00
082f7ed3d3
Merge pull request #933 from priyadi/ps2_mouse_init_user2
...
Implemented weak ps2_mouse_init_user()
2016-12-04 13:52:17 -05:00
236c040859
syntax error fix
2016-12-05 01:38:41 +07:00
07d29b7d29
syntax error fix
2016-12-05 01:22:40 +07:00
d059624bfb
Implemented weak ps2_mouse_init_user()
...
There are a lot of PS/2 commands, some are vendor/device specific, so we
provide a weak ps2_mouse_init_user() to be implemented in each keyboard
that need it.
2016-12-05 01:21:17 +07:00
73073f270b
Trackpoint initialization
2016-12-05 01:15:04 +07:00
6ef3060b42
Implemented weak ps2_mouse_init_user()
...
There are a lot of PS/2 commands, some are vendor/device specific, so we
provide a weak ps2_mouse_init_user() to be implemented in each keyboard
that need it.
2016-12-05 01:07:12 +07:00
fc80aa9974
Merge branch 'master' into promethium
2016-12-04 23:57:47 +07:00
a8e5f61805
fix emoji LED indicators.
2016-12-04 23:55:06 +07:00
75b18773bd
fix RGB LED order
2016-12-04 14:51:27 +07:00
0f71c81df8
having trouble with conflicts
2016-12-03 17:37:41 -05:00
45b7718fb1
cleaned up personal projects
2016-12-03 17:30:40 -05:00
59c54d651b
Merge https://github.com/climbalima/qmk_firmware
2016-12-03 17:15:22 -05:00
ae66f0d702
added plate files for lets split
2016-12-03 17:09:11 -05:00
2186e5ae85
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-12-03 17:01:26 -05:00
f39e1b5dfe
cleans-up formatting of readme
2016-12-03 14:36:39 -05:00
d0c667c790
Merge pull request #931 from OferPlesser/feature/improve-ps2-mouse
...
Improving ps/2 mouse
2016-12-03 10:13:11 -05:00
464f7d9687
Merge pull request #916 from wez/ble_4
...
Connect the adafruit ble code to the lufa main loop
2016-12-03 10:12:38 -05:00
f0768f8be9
Forgot to use define in delay instead of hardcoded number
2016-12-03 13:41:56 +02:00
8e2732edf3
Updated ps2 mouse documentation in readme
2016-12-03 13:11:37 +02:00
9f41544e1d
Added back PS2_MOUSE_INIT_DELAY define
2016-12-03 13:09:42 +02:00
d639e08a31
Refactored and improved ps2 mouse feature
2016-12-03 13:05:02 +02:00
044fa3ff85
Connect the adafruit ble code to the lufa main loop
...
There are now 3 potential locations to send HID reports:
1. USB
2. The bluefruit easy key
3. Adafruit BLE
Generally speaking, if USB is connected then we should prefer to
send the reports there; it is generally the best channel for this.
The bluefruit module has no feedback about bluetooth connectivity
so the code must speculatively send reports over both USB and bluetooth.
The BLE module has connectivity feedback. In general we want to
prefer to send HID reports over USB while connected there, even
if BLE is connected. Except that it is convenient to force them
over BLE while testing the implementation.
This policy has been extracted out into a where_to_send function
which returns a bitmask of which of the channels should be used.
2016-12-02 22:46:23 -08:00
7f88c9506c
Merge pull request #930 from cbbrowne/master
...
Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929
2016-12-02 15:21:04 -05:00
11d263118a
Merge pull request #929 from jackhumbert/hf/size-warnings
...
Adds warnings to Planck keymaps that exceed 0x7000 bytes in size
2016-12-02 15:20:44 -05:00
cee0cf8a6e
Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929
2016-12-02 14:12:55 -05:00
245c9508bd
adds warnings to 4 keymaps
2016-12-02 13:32:50 -05:00
e14b0e8e7e
Merge pull request #881 from NoahAndrews/patch-1
...
Recommend WSL on Windows 10 [Discussion]
2016-12-02 13:22:03 -05:00
78f8fe361f
Merge pull request #915 from wez/ble_3
...
Add support for Adafruit BLE modules
2016-12-02 13:14:04 -05:00
8f0a8cb7a6
Merge pull request #914 from wez/ble_2
...
Add arduino-alike GPIO pin control helpers
2016-12-02 13:12:56 -05:00
ead68248c5
Merge pull request #913 from wez/ble_1
...
Tidy up atomicity in timer.c and ring_buffer.h
2016-12-02 13:12:19 -05:00
4bcec04c01
Merge pull request #924 from cbbrowne/master
...
Keymapping revs, revisions to documentation on API_SYSEX_ENABLE
2016-12-02 13:06:31 -05:00
555e41d9e5
Annotates nordic
2016-12-02 13:03:51 -05:00
aa70aa3962
Tweaks Kristian's layout again
2016-12-02 13:03:39 -05:00
5d43a2aecf
Kristian's keymap
2016-12-02 12:53:18 -05:00
f6e86cd2c9
I also want page-down/page-up on UPPER layer
2016-12-02 12:35:03 -05:00
570e784140
I want page-down/page-up - put those on LOWER-Left/Right near bottom corner
2016-12-02 12:31:43 -05:00
95a160bf92
Improve docs on memory usage
2016-12-01 16:31:51 -05:00
af4c44deef
Improve docs on SYSEX bit
2016-12-01 16:31:30 -05:00
b787ed9dc6
More notes on .hex size protection
2016-12-01 16:24:03 -05:00
1f290f6213
Make my builds smaller
2016-12-01 16:21:15 -05:00
13eb2f826b
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-12-01 12:54:16 -05:00
66b13a66e9
Better layout
2016-11-30 22:22:57 -05:00
ff1b563e85
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-11-29 12:20:26 -05:00
81ea909467
Merge pull request #919 from jackhumbert/hf/robot_test_layout
...
Test layout for ErgoDox EZ manufacturing robot
2016-11-29 11:22:31 -05:00
4094544d41
Test layout for ErgoDox EZ manufacturing robot
2016-11-29 09:23:16 -05:00
51ae6da99e
Merge pull request #918 from jackhumbert/wu5y7
...
Adds Ergodox EZ RGB lights (both sides using I2C) and implements API base, Midi SysEx API
2016-11-29 08:16:04 -05:00
7b219a7f60
Merge pull request #917 from gid0/master
...
keyboards/ergodox/keymaps/bepo : merge from author
2016-11-29 08:13:49 -05:00
f946d830f9
guess i didnt pull
2016-11-29 00:11:11 -05:00
Priyadi Iman Nurcahyo
Jack Humbert
climbalima
Ofer Plesser
Wez Furlong
cbbrowne
Erez Zukerman
Erez Zukerman