summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'xyverz2016-12-06159-2209/+12520
|\
| * Update readme.mdJack Humbert2016-12-061-1560/+2
| |
| * Merge pull request #936 from jackhumbert/f/shine_defaultErez Zukerman2016-12-063-30/+63
| |\ | | | | | | Official default factory firmware for ErgoDox EZ Shine
| | * A new default layout that supports ShineErez Zukerman2016-12-052-27/+59
| | |
| | * Adjusts config for better mousekey supportErez Zukerman2016-12-051-3/+4
| | |
| * | Merge pull request #921 from Wilba6582/raw_hidJack Humbert2016-12-057-10/+222
| |\ \ | | | | | | | | Initial version of Raw HID interface
| | * | Update planck.cJack Humbert2016-12-041-14/+0
| | | |
| | * | Update rules.mkJack Humbert2016-12-040-0/+0
| | | |
| | * | Update rules.mkJack Humbert2016-12-041-3/+2
| | | |
| | * | Initial version of Raw HID interfaceWilba65822016-12-017-10/+237
| | | |
| * | | Merge pull request #935 from priyadi/promethiumJack Humbert2016-12-045-79/+197
| |\ \ \ | | | | | | | | | | Promethium handwired keyboard firmware update
| | * | | Remove unnecessary build optionsPriyadi Iman Nurcahyo2016-12-052-4/+5
| | | | |
| | * | | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2016-12-0511-193/+5851
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #932 from climbalima/masterJack Humbert2016-12-0411-193/+5851
| |\ \ \ \ | | | | | | | | | | | | Added ponoko svg for lets split
| | * | | | having trouble with conflictsclimbalima2016-12-033-20/+0
| | | | | |
| | * | | | cleaned up personal projectsclimbalima2016-12-0321-7375/+0
| | | | | |
| | * | | | Merge https://github.com/climbalima/qmk_firmwareclimbalima2016-12-033-22/+35
| | |\ \ \ \
| | * | | | | added plate files for lets splitclimbalima2016-12-0321-0/+7375
| | | | | | |
| | * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima2016-12-033-2/+5835
| | |\ \ \ \ \
| | * | | | | | just savingclimbalima2016-11-1810-232/+54
| | | | | | | |
| * | | | | | | Merge pull request #933 from priyadi/ps2_mouse_init_user2Jack Humbert2016-12-042-46/+55
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Implemented weak ps2_mouse_init_user()
| | * | | | | | | syntax error fixPriyadi Iman Nurcahyo2016-12-051-1/+1
| | | | | | | | |
| | * | | | | | | Implemented weak ps2_mouse_init_user()Priyadi Iman Nurcahyo2016-12-052-47/+56
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | | * | | syntax error fixPriyadi Iman Nurcahyo2016-12-051-1/+1
| | | | | | | |
| | | | | * | | Trackpoint initializationPriyadi Iman Nurcahyo2016-12-052-1/+110
| | | | | | | |
| | | | | * | | Implemented weak ps2_mouse_init_user()Priyadi Iman Nurcahyo2016-12-052-47/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | | * | | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2016-12-04103-589/+3822
| | | | | |\ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | cleans-up formatting of readmeJack Humbert2016-12-031-1/+4
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | 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
| |\| | | | | | | | | | | | | | |