summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1171 from ishtob/masterJack Humbert2017-03-2818-184/+1281
|\ | | | | SSD1306 I2C OLED display support for let's split
| * Update readme.mdishtob2017-03-221-8/+1
| |
| * Update i2c.cishtob2017-03-221-2/+0
| |
| * Update i2c.cishtob2017-03-221-90/+0
| |
| * Update i2c.cishtob2017-03-221-1/+1
| |
| * Update i2c.cishtob2017-03-221-1/+1
| |
| * Update matrix.cishtob2017-03-221-1/+1
| |
| * Update split_util.cishtob2017-03-221-1/+1
| |
| * Update matrix.cishtob2017-03-221-2/+1
| |
| * OLED code cleanupishtob2017-03-221-1/+1
| |
| * Add files via uploadishtob2017-03-221-0/+32
| |
| * OLED code cleanupishtob2017-03-221-46/+6
| |
| * Added OLED SSD1306 support to I2Cishtob2017-03-228-21/+908
| |
| * Merged Fliphalf, now defined in config, added OLEDishtob2017-03-222-8/+59
| | | | | | | | | | | | | | Can now use the following in the keymap config.h to call the flipped matrix ``` #define FLIPHALF ```
| * Delete rules.mkishtob2017-03-221-5/+0
| |
| * Delete rev2fliphalf.hishtob2017-03-221-28/+0
| |
| * Delete rev2fliphalf.cishtob2017-03-221-32/+0
| |
| * Delete config.hishtob2017-03-221-91/+0
| |
| * Delete Makefileishtob2017-03-221-3/+0
| |
| * Add files via uploadishtob2017-03-223-0/+426
| |
* | Merge pull request #1168 from newsboytko/newsboytko/frosty-flakeJack Humbert2017-03-2811-0/+542
|\ \ | | | | | | Support Frosty Flake Controller (CM Storm QFR)
| * | clean up configGabriel Young2017-03-191-26/+4
| | |
| * | clean up docs and provide defaults for keymapGabriel Young2017-03-194-40/+21
| | |
| * | update docsGabriel Young2017-03-191-0/+4
| | |
| * | fix whitespaceGabriel Young2017-03-191-51/+48
| | |
| * | support LEDsGabriel Young2017-03-192-44/+51
| | |
| * | Swap rows and columns to match the schematicGabriel Young2017-03-194-142/+62
| | |
| * | start to define keymap; annoying because rows and columns are swapped from ↵Gabriel Young2017-03-193-5/+84
| | | | | | | | | | | | schematic
| * | successfully read data from the matrixGabriel Young2017-03-194-75/+93
| | |
| * | sketch out frosty flake matrix using custom matrix.c based on kitten pawGabriel Young2017-03-183-11/+187
| | |
| * | boilerplate project created with new_project.shGabriel Young2017-03-1810-0/+382
| | |
| * | Merge branch 'qmk/master'Gabriel Young2017-03-18145-603/+7799
| |\ \
| * \ \ Merge branch 'qmk/master'Gabriel Young2017-02-219-74/+60
| |\ \ \
| * \ \ \ Merge branch 'qmk/master'Gabriel Young2017-02-1949-1536/+1470
| |\ \ \ \
* | \ \ \ \ Merge pull request #1178 from cheesemacfly/masterJack Humbert2017-03-284-0/+80
|\ \ \ \ \ \ | | | | | | | | | | | | | | XD60 different layout
| * | | | | | Create README.mdNicolas Guelpa2017-03-261-0/+13
| | | | | | |
| * | | | | | Add files via uploadNicolas Guelpa2017-03-262-0/+0
| | | | | | |
| * | | | | | fixing layoutNicolas Guelpa2017-03-261-1/+1
| | | | | | |
| * | | | | | Adding different layerNicolas Guelpa2017-03-241-0/+67
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1163 from jprMesh/atreus62_KC_KEYMAPJack Humbert2017-03-281-11/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added KC_KEYMAP macro for old style keymaps in Atreus62
| * | | | | | Added KC_KEYMAP macro for old style keymaps in Atreus62jprmesh2017-03-171-11/+27
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1177 from exiva/bluetooth_refactorJack Humbert2017-03-288-63/+58
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Refactor Bluetooth Handling
| * | | | | Add BLE and EZKey module defines.Travis La Marr2017-03-242-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | Also restored serial init back to original location. Was getting junk data.
| * | | | | Readd bluetooth output direction on standard key input.Travis La Marr2017-03-241-8/+10
| | | | | |
| * | | | | Refactor Bluetooth HandlingTravis La Marr2017-03-248-66/+57
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored Bluetooth support to make adding new Bluetooth modules easier in the future. * Remove `OUT_BLE` key from QMK's keymap. `OUT_BT` is all we need now as there's no difference anymore. * Made BLUETOOTH_ENABLE build option legacy as not to break existing keymaps (Falls back to existing EZ Key support if on) * Removed `ADAFRUIT_BLE_ENABLE` build option * Created new build option `BLUETOOTH` with module option (Currently `AdafruitEZKey` & `AdafruitBLE`) * Moved all LUFA bluetooth key/mouse events under `BLUETOOTH_ENABLE` ifdef with selected modules output.
* | | | | Fix a typoskullY2017-03-211-1/+1
| | | | |
* | | | | Add #1170 to all the clueboard keymapsskullY2017-03-219-10/+34
| | | | |
* | | | | Merge pull request #1170 from tengg/masterskullydazed2017-03-211-1/+4
|\ \ \ \ \ | |/ / / / |/| | | | fixed a bug related to mod + Grave with combined ESC/Grave key
| * | | | typo fixedtengg2017-03-221-2/+2
| | | | |
| * | | | fix typotengg2017-03-221-1/+1
| | | | |