summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
2016-12-01Improve docs on SYSEX bitcbbrowne
2016-12-01More notes on .hex size protectioncbbrowne
2016-12-01Make my builds smallercbbrowne
2016-12-01Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-11-30Better layoutErez Zukerman
2016-11-29Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-11-29Merge pull request #919 from jackhumbert/hf/robot_test_layoutJack Humbert
Test layout for ErgoDox EZ manufacturing robot
2016-11-29Test layout for ErgoDox EZ manufacturing robotErez Zukerman
2016-11-29Merge pull request #918 from jackhumbert/wu5y7Erez Zukerman
Adds Ergodox EZ RGB lights (both sides using I2C) and implements API base, Midi SysEx API
2016-11-29Merge pull request #917 from gid0/masterErez Zukerman
keyboards/ergodox/keymaps/bepo : merge from author
2016-11-29guess i didnt pullJack Humbert
2016-11-29Merge branch 'wu5y7' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert
2016-11-29enable rgblight by default for ezJack Humbert
2016-11-29enable api sysex for ezJack Humbert
2016-11-28Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert
2016-11-28Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-11-28Add the AZERTY compatibility layer.Olivier
2016-11-28Change layer names (cosmetic change) and reorder them so that the "shift" ↵Olivier
layer can be accessed from the "alt" layer when in QWERTY compat mode.
2016-11-28Tweaks position of TOG not to conflict with MOErez Zukerman
2016-11-28A little cleanup, add some comments, change others.Olivier
2016-11-28Tweaks EZ MakefileErez Zukerman
2016-11-28Pulls LED config into common config for EZErez Zukerman
2016-11-28Adjust comment.Olivier
2016-11-28Reorganize the numeric keypad layer more like a traditional numeric keypad.Olivier