Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #931 from OferPlesser/feature/improve-ps2-mouse | Jack Humbert | 2016-12-03 | 3 | -165/+400 |
|\ | |||||
| * | Forgot to use define in delay instead of hardcoded number | Ofer Plesser | 2016-12-03 | 1 | -1/+1 |
| * | Updated ps2 mouse documentation in readme | Ofer Plesser | 2016-12-03 | 1 | -1/+111 |
| * | Added back PS2_MOUSE_INIT_DELAY define | Ofer Plesser | 2016-12-03 | 2 | -1/+4 |
| * | Refactored and improved ps2 mouse feature | ofples | 2016-12-03 | 2 | -164/+286 |
* | | Merge pull request #916 from wez/ble_4 | Jack Humbert | 2016-12-03 | 1 | -11/+71 |
|\ \ | |/ |/| | |||||
| * | Connect the adafruit ble code to the lufa main loop | Wez Furlong | 2016-12-02 | 1 | -11/+71 |
|/ | |||||
* | Merge pull request #930 from cbbrowne/master | Jack Humbert | 2016-12-02 | 13 | -9/+47 |
|\ | |||||
| * | Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929 | cbbrowne | 2016-12-02 | 13 | -9/+47 |
* | | Merge pull request #929 from jackhumbert/hf/size-warnings | Jack Humbert | 2016-12-02 | 4 | -4/+12 |
|\ \ | |/ |/| | |||||
| * | adds warnings to 4 keymaps | Jack Humbert | 2016-12-02 | 4 | -4/+12 |
|/ | |||||
* | Merge pull request #881 from NoahAndrews/patch-1 | Jack Humbert | 2016-12-02 | 1 | -9/+9 |
|\ | |||||
| * | Recommend WSL on Windows 10 | Noah Andrews | 2016-11-14 | 1 | -9/+9 |
* | | Merge pull request #915 from wez/ble_3 | Jack Humbert | 2016-12-02 | 5 | -1/+940 |
|\ \ | |||||
| * | | Add support for Adafruit BLE modules | Wez Furlong | 2016-11-27 | 5 | -1/+940 |
* | | | Merge pull request #914 from wez/ble_2 | Jack Humbert | 2016-12-02 | 1 | -0/+37 |
|\| | | |||||
| * | | Add arduino-alike GPIO pin control helpers | Wez Furlong | 2016-11-27 | 1 | -0/+37 |
* | | | Merge pull request #913 from wez/ble_1 | Jack Humbert | 2016-12-02 | 2 | -34/+28 |
|\| | | |||||
| * | | Tidy up atomicity in timer.c and ring_buffer.h | Wez Furlong | 2016-11-27 | 2 | -34/+28 |
* | | | Merge pull request #924 from cbbrowne/master | Jack Humbert | 2016-12-02 | 4 | -10/+36 |
|\ \ \ | |||||
| * | | | I also want page-down/page-up on UPPER layer | cbbrowne | 2016-12-02 | 1 | -1/+1 |
| * | | | I want page-down/page-up - put those on LOWER-Left/Right near bottom corner | cbbrowne | 2016-12-02 | 1 | -1/+2 |
| * | | | Improve docs on memory usage | cbbrowne | 2016-12-01 | 1 | -0/+7 |
| * | | | Improve docs on SYSEX bit | cbbrowne | 2016-12-01 | 1 | -1/+1 |
| * | | | More notes on .hex size protection | cbbrowne | 2016-12-01 | 1 | -3/+16 |
| * | | | Make my builds smaller | cbbrowne | 2016-12-01 | 2 | -3/+7 |
| * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-12-01 | 1 | -50/+71 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-29 | 71 | -346/+2112 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-28 | 18 | -82/+1340 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-25 | 4 | -8/+47 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-23 | 54 | -228/+2439 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-16 | 22 | -249/+1209 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | cbbrowne | 2016-11-11 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Chris Browne | 2016-11-10 | 2 | -1/+59 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-11 | 2 | -1/+59 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| / / / / / / / | | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | cbbrowne | 2016-11-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | Chris Browne | 2016-11-06 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Chris Browne | 2016-11-06 | 35 | -599/+1870 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-07 | 5 | -3/+178 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-01 | 14 | -481/+1135 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-31 | 4 | -67/+122 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-26 | 18 | -51/+613 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | Chris Browne | 2016-10-23 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-20 | 10 | -0/+676 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-18 | 23 | -127/+873 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | cbbrowne | 2016-10-17 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-17 | 11 | -72/+497 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Chris Browne | 2016-10-23 | 33 | -127/+1549 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / | |/| | | | / / / / / / / / / / / / | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Chris Browne | 2016-10-16 | 11 | -72/+497 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-13 | 7 | -7/+523 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |