guru/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,876 Commits 2 Branches 0 Tags 138 MiB
ebe351a690
Commit Graph

3876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lucwastiaux
ebe351a690 enable brackets using the - key on the right, and cleanups 2016-12-15 07:22:31 +08:00
lucwastiaux
75d7eb9cb5 put home/end on thumb cluster 2016-12-10 13:20:05 +08:00
lucwastiaux
a3c8949627 readme updates 2016-12-10 12:52:59 +08:00
lucwastiaux
9240f27ba9 Merge remote-tracking branch 'upstream/master' 2016-12-10 12:49:47 +08:00
lucwastiaux
dc4c8875ba use thumb cluster key to toggle brackets layer 2016-12-10 12:37:32 +08:00
Jack Humbert
985a091a73 Update readme.md 2016-12-06 09:49:05 -05:00
Erez Zukerman
cd41355069 Merge pull request #936 from jackhumbert/f/shine_default 
Official default factory firmware for ErgoDox EZ Shine
 2016-12-06 07:57:02 -05:00
Erez Zukerman
82922a4937 A new default layout that supports Shine 2016-12-05 20:35:03 -05:00
Erez Zukerman
a05b6a72d9 Adjusts config for better mousekey support 2016-12-05 20:34:24 -05:00
Jack Humbert
c87d039839 Merge pull request #921 from Wilba6582/raw_hid 
Initial version of Raw HID interface
 2016-12-05 00:13:37 -05:00
Jack Humbert
1eec2b7277 Update planck.c 2016-12-04 23:11:22 -05:00
Jack Humbert
b66845ca7f Update rules.mk 2016-12-04 23:10:44 -05:00
Jack Humbert
7e4341e437 Update rules.mk 2016-12-04 23:01:07 -05:00
Jack Humbert
d15d1d3833 Merge pull request #935 from priyadi/promethium 
Promethium handwired keyboard firmware update
 2016-12-04 21:07:26 -05:00
Priyadi Iman Nurcahyo
c7d11fd001 Remove unnecessary build options 2016-12-05 02:15:38 +07:00
Priyadi Iman Nurcahyo
e18a75609d Merge branch 'master' into promethium 2016-12-05 02:01:20 +07:00
Jack Humbert
dd2911151b Merge pull request #932 from climbalima/master 
Added ponoko svg for lets split
 2016-12-04 13:53:25 -05:00
Jack Humbert
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
Priyadi Iman Nurcahyo
236c040859 syntax error fix 2016-12-05 01:38:41 +07:00
Priyadi Iman Nurcahyo
07d29b7d29 syntax error fix 2016-12-05 01:22:40 +07:00
Priyadi Iman Nurcahyo
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
Priyadi Iman Nurcahyo
73073f270b Trackpoint initialization 2016-12-05 01:15:04 +07:00
Priyadi Iman Nurcahyo
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
Priyadi Iman Nurcahyo
fc80aa9974 Merge branch 'master' into promethium 2016-12-04 23:57:47 +07:00
Priyadi Iman Nurcahyo
a8e5f61805 fix emoji LED indicators. 2016-12-04 23:55:06 +07:00
Priyadi Iman Nurcahyo
75b18773bd fix RGB LED order 2016-12-04 14:51:27 +07:00
climbalima
0f71c81df8 having trouble with conflicts 2016-12-03 17:37:41 -05:00
climbalima
45b7718fb1 cleaned up personal projects 2016-12-03 17:30:40 -05:00
climbalima
59c54d651b Merge https://github.com/climbalima/qmk_firmware 2016-12-03 17:15:22 -05:00
climbalima
ae66f0d702 added plate files for lets split 2016-12-03 17:09:11 -05:00
climbalima
2186e5ae85 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-12-03 17:01:26 -05:00
Jack Humbert
f39e1b5dfe cleans-up formatting of readme 2016-12-03 14:36:39 -05:00
Jack Humbert
d0c667c790 Merge pull request #931 from OferPlesser/feature/improve-ps2-mouse 
Improving ps/2 mouse
 2016-12-03 10:13:11 -05:00
Jack Humbert
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
Ofer Plesser
f0768f8be9 Forgot to use define in delay instead of hardcoded number 2016-12-03 13:41:56 +02:00
Ofer Plesser
8e2732edf3 Updated ps2 mouse documentation in readme 2016-12-03 13:11:37 +02:00
Ofer Plesser
9f41544e1d Added back PS2_MOUSE_INIT_DELAY define 2016-12-03 13:09:42 +02:00
ofples
d639e08a31 Refactored and improved ps2 mouse feature 2016-12-03 13:05:02 +02:00
Wez Furlong
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
Jack Humbert
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
Jack Humbert
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
cbbrowne
cee0cf8a6e Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929 2016-12-02 14:12:55 -05:00
Jack Humbert
245c9508bd adds warnings to 4 keymaps 2016-12-02 13:32:50 -05:00
Jack Humbert
e14b0e8e7e Merge pull request #881 from NoahAndrews/patch-1 
Recommend WSL on Windows 10 [Discussion]
 2016-12-02 13:22:03 -05:00
Jack Humbert
78f8fe361f Merge pull request #915 from wez/ble_3 
Add support for Adafruit BLE modules
 2016-12-02 13:14:04 -05:00
Jack Humbert
8f0a8cb7a6 Merge pull request #914 from wez/ble_2 
Add arduino-alike GPIO pin control helpers
 2016-12-02 13:12:56 -05:00
Jack Humbert
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
Jack Humbert
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
Erez Zukerman
555e41d9e5 Annotates nordic 2016-12-02 13:03:51 -05:00
Erez Zukerman
aa70aa3962 Tweaks Kristian's layout again 2016-12-02 13:03:39 -05:00