Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | use thumb cluster key to toggle brackets layer | lucwastiaux | 2016-12-10 | 2 | -2/+3 | |
| | | | | | | ||||||
| | | * | | | added more shortcut keys | lucwastiaux | 2016-11-05 | 2 | -9/+9 | |
| | | | | | | ||||||
| | | * | | | updated readme | lucwastiaux | 2016-11-05 | 1 | -1/+2 | |
| | | | | | | ||||||
| | | * | | | removed brackets anywhere but in brackets layer, added mouse layer back in, ↵ | lucwastiaux | 2016-11-05 | 3 | -20/+50 | |
| | | | | | | | | | | | | | | | | | | | | | | | | replaced all HYPR with MEH, put semicolon-newline and end-newline on symbol layer | |||||
| | * | | | | Merge pull request #942 from priyadi/cpp11 | Jack Humbert | 2016-12-12 | 1 | -1/+1 | |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | The adafruit BLE C++ code requires -std=c++11 | |||||
| | | * | | | The adafruit BLE C++ code requires -std=c++11 | Priyadi Iman Nurcahyo | 2016-12-10 | 1 | -1/+1 | |
| | |/ / / | ||||||
* | | | | | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware | dbroqua | 2016-12-17 | 191 | -2405/+14432 | |
|\| | | | | ||||||
| * | | | | Merge pull request #13 from jackhumbert/master | Damien | 2016-12-09 | 191 | -2405/+14432 | |
| |\| | | | | | | | | | | | | | Merged from qmk | |||||
| | * | | | Update readme.md | Jack Humbert | 2016-12-06 | 1 | -1560/+2 | |
| | | | | | ||||||
| | * | | | Merge pull request #936 from jackhumbert/f/shine_default | Erez Zukerman | 2016-12-06 | 3 | -30/+63 | |
| | |\ \ \ | | | | | | | | | | | | | Official default factory firmware for ErgoDox EZ Shine | |||||
| | | * | | | 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 #921 from Wilba6582/raw_hid | Jack Humbert | 2016-12-05 | 7 | -10/+222 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | Initial version of Raw HID interface | |||||
| | | * | | | | Update planck.c | Jack Humbert | 2016-12-04 | 1 | -14/+0 | |
| | | | | | | | ||||||
| | | * | | | | Update rules.mk | Jack Humbert | 2016-12-04 | 0 | -0/+0 | |
| | | | | | | | ||||||
| | | * | | | | Update rules.mk | Jack Humbert | 2016-12-04 | 1 | -3/+2 | |
| | | | | | | | ||||||
| | | * | | | | Initial version of Raw HID interface | Wilba6582 | 2016-12-01 | 7 | -10/+237 | |
| | | | | | | | ||||||
| | * | | | | | Merge pull request #935 from priyadi/promethium | Jack Humbert | 2016-12-04 | 5 | -79/+197 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Promethium handwired keyboard firmware update | |||||
| | | * | | | | | Remove unnecessary build options | Priyadi Iman Nurcahyo | 2016-12-05 | 2 | -4/+5 | |
| | | | | | | | | ||||||
| | | * | | | | | Merge branch 'master' into promethium | Priyadi Iman Nurcahyo | 2016-12-05 | 11 | -193/+5851 | |
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | * | | | | | | Merge pull request #932 from climbalima/master | Jack Humbert | 2016-12-04 | 11 | -193/+5851 | |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | Added ponoko svg for lets split | |||||
| | | * | | | | | having trouble with conflicts | climbalima | 2016-12-03 | 3 | -20/+0 | |
| | | | | | | | | ||||||
| | | * | | | | | cleaned up personal projects | climbalima | 2016-12-03 | 21 | -7375/+0 | |
| | | | | | | | | ||||||
| | | * | | | | | Merge https://github.com/climbalima/qmk_firmware | climbalima | 2016-12-03 | 3 | -22/+35 | |
| | | |\ \ \ \ \ | ||||||
| | | * | | | | | | added plate files for lets split | climbalima | 2016-12-03 | 21 | -0/+7375 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | climbalima | 2016-12-03 | 3 | -2/+5835 | |
| | | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | | just saving | climbalima | 2016-11-18 | 10 | -232/+54 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Merge pull request #933 from priyadi/ps2_mouse_init_user2 | Jack Humbert | 2016-12-04 | 2 | -46/+55 | |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Implemented weak ps2_mouse_init_user() | |||||
| | | * | | | | | | | | syntax error fix | Priyadi Iman Nurcahyo | 2016-12-05 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Implemented weak ps2_mouse_init_user() | Priyadi Iman Nurcahyo | 2016-12-05 | 2 | -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 fix | Priyadi Iman Nurcahyo | 2016-12-05 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| | | | | | * | | | | Trackpoint initialization | Priyadi Iman Nurcahyo | 2016-12-05 | 2 | -1/+110 | |
| | | | | | | | | | | ||||||
| | | | | | * | | | | Implemented weak ps2_mouse_init_user() | Priyadi Iman Nurcahyo | 2016-12-05 | 2 | -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 promethium | Priyadi Iman Nurcahyo | 2016-12-04 | 103 | -589/+3822 | |
| | | | | | |\ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | cleans-up formatting of readme | Jack Humbert | 2016-12-03 | 1 | -1/+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 | |||||
| |