summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* revert some attempts, update i2cJack Humbert2018-06-124-15/+14
|
* Merge branch 'master' of github.com:qmk/qmk_firmware into hf/shinydoxJack Humbert2018-06-12771-5089/+35710
|\
| * Added a multiple layout keymap for DZ60 (#3159)Breno Reis2018-06-107-0/+572
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added files for my new layout. * Added layout template * Qwerty layout done * Qwerty layout done * Test commit * Qwerty, colemak e dvorak layouts done. * Added templates for extra layers * Added templates for extra layers * Small adjustments on function layer * Minor updates * Minor updates * daily update * added my dz60 layout * added my niu mini layout * made the suggested corrections
| * Fortitude60: Refactor and Configurator support (#3161)noroadsleft2018-06-102-22/+32
| | | | | | | | | | | | * Removed LAYOUT_ortho_5x12 alias * Configurator support
| * Felix: Refactor, Rules, and Configurator Support (#3160)noroadsleft2018-06-104-11/+27
| | | | | | | | | | | | | | | | * Refactor * Configurator support * Add LAYOUTS = ortho_5x4 to rules.mk
| * Add Tetris keyboard to QMK (#3158)YouCanFly2018-06-096-0/+1005
| | | | | | | | | | | | | | | | * Add Tetris keyboard to QMK * fix * disable the music mode to save size
| * Add TKC keymap (#3157)Yan-Fa Li2018-06-092-0/+174
| | | | | | | | | | - disable i2c to avoid hid spam - set capslock -> lctl_t(kc_esc) - OSX mode - reverse GUI and ALT
| * Fixsingakeymaps (#3156)Jason2018-06-091-4/+4
| | | | | | | | | | | | | | | | * Tweak info.json * fix default for info.json * typo
| * Adding Singa Repo w/ Config Support (#3155)Jason2018-06-0922-0/+1184
| | | | | | | | | | | | | | | | | | | | | | | | * Adding Singa Repo w/ Config Support * Used Tilde instead of GRV * PR Fixes * oops, forgot to change the keymaps * splitbs -> split_bs
| * Additional default layouts: Fullsize ANSI, Fullsize ISO, TKL ISO (#3154)noroadsleft2018-06-099-0/+63
| | | | | | | | | | | | | | | | * Add Fullsize ANSI layout * Add Fullsize ISO layout * Add TKL ISO layout
| * Fix KC_P00 macro for ortho_5x4 layout (#3152)noroadsleft2018-06-091-1/+1
| |
| * Add corne keyboard (#3119)Kosuke Adachi2018-06-0829-0/+2710
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fork from helix * Move rev2 to rev1 * Remove unused settings * Move split_util to outof rev * Setup KEYMAP for crkbd * Remove old image * Move keymaps directory and glcdfont.c * Remove AUDIO in keymap * Show keylog * Show keylogs * Show time log * Remove EISU/KANA * Use KEYMAP_kc * Remove iota_gfx_record_user wrapping * Remove unused settings for layer * Add keylogger.c * Fix uppercase letters to lower * Add timelogger.c * Default RGBLED_NUM = 27 * Remove unused setting * Add mode icon reader * Add matrix_write_ln * Add layer_state_reader * Move to lib directory * Rename functions * Add host_led_state_reader * Add logo_reader * Cleaning of iota_gfx_task * Fix bugs and add key defines * Remove unnecessary comments * Update crkbd readme * Move libs to lib directories * Rename KEYMAP to LAYOUT
| * citadel: new keymap for pegasushoof (#3146)Daniel Rose2018-06-084-0/+239
| | | | | | | | | | [citadel] Markdown syntax: Added double spaces for line breaking [citadel] Added line breaks for keyboard layout, fixed headings.
| * Ergo42: Refactor and Configurator support (#3150)noroadsleft2018-06-088-409/+399
| | | | | | | | | | | | | | | | * Refactor * Configurator support * Switch macro names around
| * DZ60: Add LAYOUT_directional_625_space (#3148)noroadsleft2018-06-082-28/+44
| |
| * Keyboard that works on Qwerty or Bepo OS keyboards. (#3149)Eric Gebhart2018-06-089-0/+1675
| | | | | | | | | | | | | | | | * New layout. * new dvorak bepo layout. * first commit of new ergodox_ez dvorak keyboard for qwerty and bepo.
| * Add DCompact Layout for Chimera Ortho and Planck Keyboards (#3145)Dan2018-06-078-0/+465
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Clone default chimera-o layout * Make changes for base layer * Enable mouse suppport flag * Implement majority of DAD layout * Add mouse movement keys * Fine tune mouse control and fix tap toggle * Fix mouse button locations * Set adpater LED colors for layers * Increase responsiveness of key taps * Update layout for thumb comfort * Rename layout and add README * Add comments to keymap * Implement DCompact layout for Planck * Copy over DCompact README to planck * Fix up odds and ends for Planck
| * Eco: Refactor, Configurator support and Readme changes (#3143)noroadsleft2018-06-079-297/+302
| | | | | | | | | | | | | | | | * Readme changes * Refactor matrices; add QMK_KEYBOARD_H * Configurator Support
| * DK60: Refactor, Configurator and Readme updates (#3142)noroadsleft2018-06-074-32/+44
| | | | | | | | | | | | | | | | | | | | | | | | * Readme cleanup * Refactor KEYMAP to LAYOUT * Configurator support * Readme cleanup Didn't spot that the modified lines were formatted as a list the first time.
| * Normacos update (#3141)Jorge Porras2018-06-072-23/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Cheers let's split keymap * fixed typo on norman layer of cheers keymap for let's split * fixed right handed mappings for home row * cheers keymap for let's split redefinition * updated Cheers keymap for let's split * cheers keymap for let's split updated with some terminal macros * renamed cheers let's split keymap to a more appropriate normacos * updated normacos keymap doc / removed non functional keys * reset let's split rules to default values * added more spotlight search macros * normalized keymap comments * Moved numpad on lower layer * updated normacos layout and fixed some readme typos * removed leftover merge diff * added waits to macros that make use of SEND_STRING * fixed wrong waits on macros that use SEND_STRING * normalized macro comments after adding waits
| * Gherkin: Refactor and Configurator support [resolved] (#3140)noroadsleft2018-06-0712-363/+287
| | | | | | | | | | | | | | | | | | | | * Refactor KEYMAP to LAYOUT_ortho_3x10 * Configurator support * Renamed @Talljoe's keymap folder * Renamed matrix_init_user to matrix_init_keymap
| * Add premade layouts for Numpad 4x4, Numpad 5x4, Ortho 5x4, and Planck MIT ↵noroadsleft2018-06-0712-0/+113
| | | | | | | | | | | | | | (#3139) Fix EOF on Planck MIT layout.json Cleanup ortho_5x4 layout.json
| * Bootloader make issue (#2975)yiancar2018-06-061-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added Modular keyboards L,R and NUM Created code modules for the 3 modules of the modular keyboard. Original idea by MechboardsUK. Uses i2c implementation similar to lets split * Remove modular from master This is to fix incorrect branching * fixed bootloader makefile - Echo -e does not behave coorectly on mac - Replaced with equivilant printf statements * quick typo fix
| * Dilly: Refactor and Configurator support (#3134)noroadsleft2018-06-069-86/+76
| | | | | | | | | | | | | | | | | | | | * Refactor * Configurator support * Add LAYOUT_ortho_3x10 to default QMK layouts * Refactor Dilly to use LAYOUT_ortho_3x10
| * Added jwlawrence keymap for zen keyboard (#3137)Joshua Lawrence2018-06-063-0/+150
| | | | | | * Created jwlawrence keymap
| * Sweeping Visualizer for Ergodox Inifinity (#3136)Oryhara2018-06-063-218/+389
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * started work on halfkeyboard * update to keymap * halfkey layouts complete for dvorak and qwerty * added plover layout to halfkeyboard mapping * fixed error in dvorak layout right hand * fixed error in dvorak layout right hand, comments updated * thing * added minus and equals to normal layouts * added minus and equals to normal layouts * adde visualizer matching halfkeyboard mappings * adde visualizer matching halfkeyboard mappings * updated keymaps for mirror handedness functionality for all layers. Also added visualizer code for distinct color for each layer, and LCD text displaying the current layer. * had a KC_TILD where should have had KC_GRAV * its spelled KC_GRAVE * mouskeys and some visualizer work. * added LED backlight visuals * trying to get visualizer working * Move lufa descriptor to protocol/usb_descriptor * Try to compile usb_descriptor on ChibiOS * Add lufa_utils for ChibiOS Lufa USB descriptors for ChibiOS * More lufa_util compatibility fixes * First compiling version of shared USB descriptor * Send the usb descriptors * Fix the CONSOLE output on ChibiOS * Add errors for unsupported interfaces * Enable support for vitual serial port USB descriptors * Implement virtual serial port for ChibiOS * Cleanup the lufa_utils Use the default lufa header files * Add raw hid support for ChibiOS This is completely untested * Enable midi compilation on ChibiOS * Move midi functionality out of lufa.c * Don't register sysex callback when not needed * ChibiOS compilation fixes * Update ChibiOS submodule * Fix the Midi USB descriptor It didn't work properly when both Midi and Virtual serial port was enabled. * Add MIDI support for ChibiOS * Fix USB descriptor strings on ChibiOS * Use serial usb driver for raw hid * Generalize the ChibiOS stream like drivers This makes the initialization much more simple and eliminates a lot of the code duplication. * Convert console output to chibios stream driver * Fixes for ChibiOS update * Update the ChibiOS contrib submodule To include the usb data toggle synchronization fixes * Fix duplicate reset enumeration on ChibiOS * Add missing include * Add number of endpoints check for ChibiOS * Enable serial USB driver on all keyboards * Add missing includes when API is enabled withot midi * Add another missing inlcude * consolidated my custom animations into visualizer.c in my keymap directory * LED backlight keys animation KITT scanner * moved my custom rules.mk to my keymap folder * undoing changes i shouldn't have done * more fixes * updated comments on the visulizer code * steno keys added to plover layout * updated halfkeyboard rules to allow steno mode * adding my stuff back after hard reset * added a plover layout back in for androud steno app * fixed layer toggle typo * merged again * visualizer decided to have a conflict again. fixed. * keymap change to add mouse keys and put layer switching on shortcuts layer * made the ergodox LEDs scan left to right and back again * visualizer work * KITTSCANNER finally * fixed right hand shortcuts layer and removed handedness switching for base layer so jump in gaming works corrrectly * added another sweep that goes full on over both boards then full off in both directions * added function key layer and cleaned up some layer switching
| * Diverge3: Readme Clean-up, Refactor and Configurator support (#3135)noroadsleft2018-06-064-45/+45
| | | | | | | | | | | | | | | | * Readme cleanup * Refactor * Configurator support
| * Dichotemy: Refactor and Configurator update (#3133)noroadsleft2018-06-063-43/+55
| | | | | | | | | | | | * Refactor KEYMAP to LAYOUT * Configurator support
| * Refactor for DeltaSplit75 (#3132)noroadsleft2018-06-065-83/+91
| |
| * remove trailing comma to fix parsing issue (#3130)Jason2018-06-061-5/+5
| | | | | | | | | | | | * remove trailing comma to fix parsing issue * ctrl shift i is gud
| * Add ErgoDash keyboard (#3128)omkbd2018-06-0619-0/+1578
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * create ergodash * Revert "create ergodash" This reverts commit b261c808c30fee95cb656629f7e9b44b01e79363. * add ergodash * keymap→layout * use set_single_persistent_default_layer
| * Adding SX60 work by amnobis and configurator settings (#3122)Jason2018-06-0521-14/+1131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add SX60 * Add config maps and layouts as well as readmes. * cleanup and fixes * correct readme * add missing closing commenty tag * Changing includes to QMK_KEYBOARD_H * Update settings.json Remove config change that was added automatically by vscode. * Update readme.md fix readme formatting
| * Gherkin wanleg (#3127)wanleg2018-06-052-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |