Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | A new default layout that supports Shine | Erez Zukerman | 2016-12-05 | 2 | -27/+59 |
| | |||||
* | Adjusts config for better mousekey support | Erez Zukerman | 2016-12-05 | 1 | -3/+4 |
| | |||||
* | Merge pull request #931 from OferPlesser/feature/improve-ps2-mouse | Jack Humbert | 2016-12-03 | 3 | -165/+400 |
|\ | | | | | Improving ps/2 mouse | ||||
| * | 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 | ||||
| * | Connect the adafruit ble code to the lufa main loop | Wez Furlong | 2016-12-02 | 1 | -11/+71 |
|/ | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | 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 | ||||
| * | 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 Planck keymaps that exceed 0x7000 bytes in size | ||||
| * | 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 [Discussion] | ||||
| * | Recommend WSL on Windows 10 | Noah Andrews | 2016-11-14 | 1 | -9/+9 |
| | | | | | | | | | | At this point, I consider the batch scripts @IBNobody and I worked on to mostly be a failure. They've proven to be unreliable, too dependent on the environment they're being run in, and I've seen far too many examples of people having frustrating issues with them that I haven't been able to help them with. They can also produce misleading and confusing error messages. I've been pointing people to use the WSL for a while now. Eventually, I think we should make a proper replacement for the batch scripts, possibly with an environment in msys2. For now, the WSL method in Windows 10 is far more reliable, and is easy to set up. I also cleaned up some things in the WSL instructions themselves. | ||||
* | | Merge pull request #915 from wez/ble_3 | Jack Humbert | 2016-12-02 | 5 | -1/+940 |
|\ \ | | | | | | | Add support for Adafruit BLE modules | ||||
| * | | Add support for Adafruit BLE modules | Wez Furlong | 2016-11-27 | 5 | -1/+940 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements some helper functions that allow sending key reports to an SPI based Bluetooth Low Energy module, such as the Adafruit Feather 32u4 Bluefruit LE. There is some plumbing required in lufa.c to enable this; that is in a follow-on commit. | ||||
* | | | Merge pull request #914 from wez/ble_2 | Jack Humbert | 2016-12-02 | 1 | -0/+37 |
|\| | | | | | | | | Add arduino-alike GPIO pin control helpers | ||||
| * | | Add arduino-alike GPIO pin control helpers | Wez Furlong | 2016-11-27 | 1 | -0/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike the arduino functions, these don't take abstract pin numbers, they take pin labels like `B0`. Also, rather than taking very generic parameter names, these take slightly more descriptive enum values. These improve the clarity of code that would otherwise be inscrutable bit manipulation in tersely named port register names. | ||||
* | | | 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 | ||||
| * | | Tidy up atomicity in timer.c and ring_buffer.h | Wez Furlong | 2016-11-27 | 2 | -34/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | Adopt the macros for saving/restoring the interrupt state that are provided by the avr gcc environment. Removing intialization of the timer value; this shaves off a few bytes because globals are default initialized to zero. | ||||
* | | | Merge pull request #924 from cbbrowne/master | Jack Humbert | 2016-12-02 | 4 | -10/+36 |
|\ \ \ | | | | | | | | | Keymapping revs, revisions to documentation on API_SYSEX_ENABLE | ||||
| * | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / | |/| | | | / / / / / / / / / / / / | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |