summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-12-06Merge remote-tracking branch 'upstream/master'xyverz
2016-12-06Update readme.mdJack Humbert
2016-12-06Merge pull request #936 from jackhumbert/f/shine_defaultErez Zukerman
Official default factory firmware for ErgoDox EZ Shine
2016-12-05A new default layout that supports ShineErez Zukerman
2016-12-05Adjusts config for better mousekey supportErez Zukerman
2016-12-05Merge pull request #921 from Wilba6582/raw_hidJack Humbert
Initial version of Raw HID interface
2016-12-04Update planck.cJack Humbert
2016-12-04Update rules.mkJack Humbert
2016-12-04Update rules.mkJack Humbert
2016-12-04Merge pull request #935 from priyadi/promethiumJack Humbert
Promethium handwired keyboard firmware update
2016-12-05Remove unnecessary build optionsPriyadi Iman Nurcahyo
2016-12-05Merge branch 'master' into promethiumPriyadi Iman Nurcahyo
2016-12-04Merge pull request #932 from climbalima/masterJack Humbert
Added ponoko svg for lets split
2016-12-04Merge pull request #933 from priyadi/ps2_mouse_init_user2Jack Humbert
Implemented weak ps2_mouse_init_user()
2016-12-05syntax error fixPriyadi Iman Nurcahyo
2016-12-05syntax error fixPriyadi Iman Nurcahyo
2016-12-05Implemented weak ps2_mouse_init_user()Priyadi Iman Nurcahyo
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-05Trackpoint initializationPriyadi Iman Nurcahyo
2016-12-05Implemented weak ps2_mouse_init_user()Priyadi Iman Nurcahyo
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-04Merge branch 'master' into promethiumPriyadi Iman Nurcahyo
2016-12-04fix emoji LED indicators.Priyadi Iman Nurcahyo
2016-12-04fix RGB LED orderPriyadi Iman Nurcahyo
2016-12-03having trouble with conflictsclimbalima
2016-12-03cleaned up personal projectsclimbalima
2016-12-03Merge https://github.com/climbalima/qmk_firmwareclimbalima
2016-12-03added plate files for lets splitclimbalima
2016-12-03Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima
2016-12-03cleans-up formatting of readmeJack Humbert
2016-12-03Merge pull request #931 from OferPlesser/feature/improve-ps2-mouseJack Humbert
Improving ps/2 mouse
2016-12-03Merge pull request #916 from wez/ble_4Jack Humbert
Connect the adafruit ble code to the lufa main loop
2016-12-03Forgot to use define in delay instead of hardcoded numberOfer Plesser
2016-12-03Updated ps2 mouse documentation in readmeOfer Plesser
2016-12-03Added back PS2_MOUSE_INIT_DELAY defineOfer Plesser
2016-12-03Refactored and improved ps2 mouse featureofples
2016-12-02Connect the adafruit ble code to the lufa main loopWez Furlong
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-02Merge pull request #930 from cbbrowne/masterJack Humbert
Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929
2016-12-02Merge pull request #929 from jackhumbert/hf/size-warningsJack Humbert
Adds warnings to Planck keymaps that exceed 0x7000 bytes in size
2016-12-02Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929cbbrowne
2016-12-02adds warnings to 4 keymapsJack Humbert
2016-12-02Merge pull request #881 from NoahAndrews/patch-1Jack Humbert
Recommend WSL on Windows 10 [Discussion]
2016-12-02Merge pull request #915 from wez/ble_3Jack Humbert
Add support for Adafruit BLE modules
2016-12-02Merge pull request #914 from wez/ble_2Jack Humbert
Add arduino-alike GPIO pin control helpers
2016-12-02Merge pull request #913 from wez/ble_1Jack Humbert
Tidy up atomicity in timer.c and ring_buffer.h
2016-12-02Merge pull request #924 from cbbrowne/masterJack Humbert
Keymapping revs, revisions to documentation on API_SYSEX_ENABLE
2016-12-02Annotates nordicErez Zukerman
2016-12-02Tweaks Kristian's layout againErez Zukerman
2016-12-02Kristian's keymapErez Zukerman
2016-12-02I also want page-down/page-up on UPPER layercbbrowne
2016-12-02I want page-down/page-up - put those on LOWER-Left/Right near bottom cornercbbrowne
2016-12-01Improve docs on memory usagecbbrowne