summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Implemented basic key combination featureOfer Plesser2016-12-105-0/+103
|
* Merge pull request #931 from OferPlesser/feature/improve-ps2-mouseJack Humbert2016-12-033-165/+400
|\ | | | | Improving ps/2 mouse
| * Forgot to use define in delay instead of hardcoded numberOfer Plesser2016-12-031-1/+1
| |
| * Updated ps2 mouse documentation in readmeOfer Plesser2016-12-031-1/+111
| |
| * Added back PS2_MOUSE_INIT_DELAY defineOfer Plesser2016-12-032-1/+4
| |
| * Refactored and improved ps2 mouse featureofples2016-12-032-164/+286
| |
* | Merge pull request #916 from wez/ble_4Jack Humbert2016-12-031-11/+71
|\ \ | |/ |/| Connect the adafruit ble code to the lufa main loop
| * Connect the adafruit ble code to the lufa main loopWez Furlong2016-12-021-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/masterJack Humbert2016-12-0213-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 #929cbbrowne2016-12-0213-9/+47
| |
* | Merge pull request #929 from jackhumbert/hf/size-warningsJack Humbert2016-12-024-4/+12
|\ \ | |/ |/| Adds warnings to Planck keymaps that exceed 0x7000 bytes in size
| * adds warnings to 4 keymapsJack Humbert2016-12-024-4/+12
|/
* Merge pull request #881 from NoahAndrews/patch-1Jack Humbert2016-12-021-9/+9
|\ | | | | Recommend WSL on Windows 10 [Discussion]
| * Recommend WSL on Windows 10Noah Andrews2016-11-141-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_3Jack Humbert2016-12-025-1/+940
|\ \ | | | | | | Add support for Adafruit BLE modules
| * | Add support for Adafruit BLE modulesWez Furlong2016-11-275-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_2Jack Humbert2016-12-021-0/+37
|\| | | | | | | | Add arduino-alike GPIO pin control helpers
| * | Add arduino-alike GPIO pin control helpersWez Furlong2016-11-271-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_1Jack Humbert2016-12-022-34/+28
|\| | | | | | | | Tidy up atomicity in timer.c and ring_buffer.h
| * | Tidy up atomicity in timer.c and ring_buffer.hWez Furlong2016-11-272-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/masterJack Humbert2016-12-024-10/+36
|\ \ \ | | | | | | | | Keymapping revs, revisions to documentation on API_SYSEX_ENABLE
| * | | I also want page-down/page-up on UPPER layercbbrowne2016-12-021-1/+1
| | | |
| * | | I want page-down/page-up - put those on LOWER-Left/Right near bottom cornercbbrowne2016-12-021-1/+2
| | | |
| * | | Improve docs on memory usagecbbrowne2016-12-011-0/+7
| | | |
| * | | Improve docs on SYSEX bitcbbrowne2016-12-011-1/+1
| | | |
| * | | More notes on .hex size protectioncbbrowne2016-12-011-3/+16
| | | |
| * | | Make my builds smallercbbrowne2016-12-012-3/+7
| | | |
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-12-011-50/+71
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-2971-346/+2112
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-2818-82/+1340
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-254-8/+47
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-2354-228/+2439
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-1622-249/+1209
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of github.com:cbbrowne/qmk_firmwarecbbrowne2016-11-110-0/+0
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne2016-11-102-1/+59
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| * | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-112-1/+59
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| / / / / / / / | | |/ / / / / / /
| * | | | | | | | Merge branch 'master' of github.com:cbbrowne/qmk_firmwarecbbrowne2016-11-070-0/+0
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of github.com:cbbrowne/qmk_firmwareChris Browne2016-11-060-0/+0
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne2016-11-0635-599/+1870
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-075-3/+178
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-0114-481/+1135
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-314-67/+122
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-2618-51/+613
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' of github.com:cbbrowne/qmk_firmwareChris Browne2016-10-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-2010-0/+676
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-1823-127/+873
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:cbbrowne/qmk_firmwarecbbrowne2016-10-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-1711-72/+497
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne2016-10-2333-127/+1549
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / | |/| | | | / / / / / / / / / / / / | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne2016-10-1611-72/+497
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 07:20:02 +0000