summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fixed conflict in readmeWilliam Chang2019-05-107-21/+268
|\
| * [Docs] RGB Animation documentation on reducing memory footprint (#5813)Yan-Fa Li2019-05-101-20/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Improve Animation docs with example - example to reduce flash footprint of animations using RGBLIGHT_EFFECT_ defines * Re-order the effects list * Update docs/feature_rgblight.md Co-Authored-By: yanfali <yanfali@gmail.com> * Update docs/feature_rgblight.md Co-Authored-By: yanfali <yanfali@gmail.com> * Update docs/feature_rgblight.md Co-Authored-By: yanfali <yanfali@gmail.com> * Introduce line breaks * Add title for animation speed section * Organize Animation Defines Into Groups * Use the RGB EFFECT recommended by mtei in docs - has the most modes, and STATIC_LIGHT can't really be disabled. * Use more accurate titles for effects and animation - accidentally put a toggle in settings
| * [Keyboard] Satisfaction75 i2c fix and VIA layout (#5798)Andrew Kannan2019-05-090-0/+0
| |
| * Norman layout for the minidox keyboard (#5747)Torben Hoffmann2019-05-095-0/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Norman layout with Lower and Raise layers working * Add keymap_extra def for Norman layout * Re-org'ed the modifiers as explained in the Readme * Corrected colour legend for KLE that the Readme links to * Use #pragma once in header file * Use pragma once and move user config to config.h * Move definitions to the right file and correct link in Readme * Move def of NM_COLN to the logical place in header file * Add sendstring_norman.h for when the laptop layout is not QWERTY * Update quantum/keymap_extras/sendstring_norman.h Co-Authored-By: lehoff <torben.lehoff@gmail.com>
| * [Keymap] Updated keymap and readme (#5834)William Chang2019-05-092-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial commit * Modified keymap and updated readme. * fixed numbering in readme * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Made requested changes in PR. * Rename README.md to readme.md * swapped media control keys * updated right alt key to apply shift key for emacs * updated R_Alt to remove shift * Updated readme
* | Merge branch 'qmk-master'William Chang2019-05-09671-11435/+22563
|\ \
| * | resolved conflictsWilliam Chang2019-05-09671-11435/+22563
|/| | | |/
| * [Keyboard] DZTECH: CODE CLEANUP (#5828)moyi46812019-05-0922-3769/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Delete board.c * Delete board.h * Delete board.mk * Delete bootloader_defs.h * Delete chconf.h * Delete halconf.h * Delete mcuconf.h * Update rules.mk * Update config.h * Update config.h * Update config.h * Update config.h * Update config.h * Update rules.mk * Delete bootloader_defs.h * Delete halconf.h * Delete chconf.h * Delete mcuconf.h * Update rules.mk * Update config.h * Update dz40rgb.c * Update dz65rgb.c
| * [Keymap] Fix RGB_MATRIX_ENABLE check in users/konstantin/rules.mk (#5832)Konstantin Đorđević2019-05-091-0/+1
| |
| * fixed matrix (#5831)Hannes Egler2019-05-091-2/+2
| |
| * Add no_caps_lock layout for Satan GH60 (#5829)Danu Widatama2019-05-092-0/+56
| |
| * [Docs] Fix Space Cadet link (#5825)Tobias V. Langhoff2019-05-081-1/+1
| | | | | | Fix broken Space Cadet link in Features list
| * [Keymap] Signum3.0 Generate printable keymap (#5818)Jan Christoph Ebersbach2019-05-082-21/+59
| | | | | | | | | | | | | | | | * Externalize generation of visual text keymap * Generate keymap in Asciidoc format for further processing * Remove artifacts from a2x call
| * [Keymap] Signum 3.0, fix, move and change keys (#5820)Jan Christoph Ebersbach2019-05-082-44/+45
| |
| * [Keyboard] Noxary 220 (#5816)MechMerlin2019-05-079-0/+559
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * initial commit and script error fixes * add matrix and pin definitions along with LAYOUT macro * add an appropriate keymap * add num lock led support * turn on bootmagic lite along with backlight led support * add QMK Configurator support
| * [Keyboard] Add Noxary 260 (#5815)MechMerlin2019-05-079-0/+567
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * initial commit * fix script issues * define pins used and electrical matrix size and an appropriate LAYOUT macro * add an appropriate keymap * turn on bootmagic lite and backlight support * Add QMK Configurator support * add caps lock led support * update readme with group buy links
| * [Keyboard] Add Noxary 280 (#5814)MechMerlin2019-05-079-0/+598
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * initial commit * fixup script issues * define pins used and create an appropriate LAYOUT macro * create an appropriate keymap * turn on backlight and bootmagic lite * add QMK Configurator support * fixup readme * remove doubly defined KC_TRNS from keymap * add support for Caps lock and Scroll lock LEDs
| * RGB Matrix Typing Heatmap (#5786)XScorpion22019-05-075-15/+123
| | | | | | | | | | | | * RGB Matrix Typing Heatmap Effect * Fixing file name and effect init
| * rgb_led struct conversion (aka: Per led (key) type rgb matrix effects - part ↵XScorpion22019-05-0751-1644/+755
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2) (#5783) * Initial conversion of the rgb_led struct * Converting last keyboard & updating effects to take advantage of the new structure * New struct should not be const * Updated docs * Changing define ___ for no led to NO_LED * Missed converting some keymap usages of the old struct layout
| * Add layout description to keymap.c (#5810)Chuck Lauer Vose2019-05-071-6/+17
| |
| * [Split] fix split_common i2c backlight disabling (#3886)Rainer Clasen2019-05-071-3/+2
| | | | | | | | | | | | | | slave backlight was always on - as get_backlight_level() doesn't indicate if the backlight is enabled or not. also updated the corosponding code for serial transport to stop peeking directly at 'internal' backlight_config structure.
| * [Keymap] crkbd/keymaps/rs: add rs keymap to corne keyboard and adapt others ↵Olivier Poitrey2019-05-0726-354/+525
| | | | | | | | | | | | (#5181) Update all my keymaps to work with 40 keys. Refactor code using Userspace.
| * Add remaining RGB light components. (#5785)kaylanm2019-05-071-3/+22
| |
| * Adding bdn9 keymap examples for company event (#5800)Chuck Lauer Vose2019-05-062-0/+229
| | | | | | | | | | | | | | | | | | | | | | * Adding bdn9 keymap examples for company event * Simplify some code w/ tap_code16 [pr feedback] - Also remove backslashes - Remove xxx and ___ layer definitions - Properly name enums - Add newline after slack reaction
| * [Keymap] RGB Changes for Drashna Keyboards (#5803)Drashna Jaelre2019-05-0638-1451/+1421
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Disable a bunch of reactive modes * Enable rgb matrix for Corne Keyboard * Convert CRKBD to rgb matrix * Add Gergo keyboard layout * Make Diablo 3 tap dance better * Add basic support for Planck EZ * Fix RGB Matrix stuff * Fix keycodes for Planck EZ * Update CRKBD OLED stuff * Fix typo for sleep on ergodox glow * Improve my gergo layout * Scrolling OLED key logger! * Change gergo layout * Hnadle unicode keycodes if unicode is disabled * Disable COMMAND/CONSOLE for gergo * Fix right side control * Re-enable LTO for all platforms Since I got updated arm gcc binaries that no longer error out on lto * Update formatting to match newer community standards Poor 2 space * Re-alight startup animation to use new HUE range * Streamline gitlab ci scripts * Disabled Space Cadet * Add support for breathing table * Enable new LTO Option And clean up defines that will now be repeatitive * Remove vscode settings * Additional formatting cleanup of config.h files
| * Add Boardwalk keymap (#5806)Brendan Wrafter2019-05-062-0/+111
| | | | | | | | | | | | * Add Boardwalk keyboard layout * Remove backslashes
| * [Keyboard] Enable RGBLIGHT_ANIMATIONS by default on the Zen rev2 (#5805)XScorpion22019-05-062-2/+3
| | | | | | | | | | | | * Enable RGBLIGHT_ANIMATIONS by default on the Zen rev2 * Also fixing OLED as it is upside down
| * [Keyboard] Sol keyboard conversion to split common (#5773)XScorpion22019-05-0627-1062/+250
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Split common conversion * Updated serial and encoder pins * Fixing default folder until r2 * Fixing oled driver on slave split common * Fixing keymap compile errors * Fixing oled inactivity timer on slave split common * Hoisted oled driver task, init, & activity to keyboard.c * Update keyboards/sol/config.h Co-Authored-By: XScorpion2 <rcalt2vt@gmail.com> * Remove TAPPING_FORCE_HOLD
| * Make python a required build dependency (#5784)skullydazed2019-05-066-4/+18
| | | | | | | | | | | | | | | | * Make python a required build dependency * Add missing color * fixup sabayon linux per @BlitzKraft
| * [Keymap] Update personal userspace and keymaps (now with 4 spaces!) (#5774)Konstantin Đorđević2019-05-0612-405/+408
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add FnLk to Melody96 bottom row * Update conditional in userspace makefile Thanks @drashna * Add F keys to Melody96 Fn layer * Add FN_ESC alias to userspace * Update KBD6X keymap * Fix RGB_MATRIX_ENABLE constant name in #if * Remove trailing \ from LAYOUT macro calls * Set RGB mode on EEPROM reset in KBD6X * Swap right and middle mouse buttons in KBD6X * Rearrange RGB controls in KBD6X * Update keycode aliases, replace CLEAR with DEL_NXT in KBD6X Add Clear to KBD6X as RCtrl+` * Convert code to 4 space indents * Tweak RCTRL layer functionality * Replace NUMPAD custom keycode with layer state logic * Update RGB_MATRIX_ENABLE check Co-Authored-By: vomindoraan <vomindoraan@gmail.com>
| * Re-fix Mousekey Movements (#5740)Drashna Jaelre2019-05-061-0/+4
| | | | | | | | | | | | | | | | | | | | * Re-fix Mousekey Movements After the new movement model was instroduced, it broke diagonal momement, again. Reapplying fix from #3147 to both old and new acceleration method. * Make diagonal mouse report checks more readable Co-Authored-By: drashna <drashna@live.com>
| * [Keyboard] add ut47.2 (#5788)keyhive2019-05-059-0/+335
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * adding ut47.2 adding ut47.2 * Update keyboards/ut472/ut472.c Co-Authored-By: keyhive <42986966+keyhive@users.noreply.github.com> * Update keyboards/ut472/rules.mk Co-Authored-By: keyhive <42986966+keyhive@users.noreply.github.com> * Update keyboards/ut472/ut472.c Co-Authored-By: keyhive <42986966+keyhive@users.noreply.github.com> * Update keyboards/ut472/rules.mk Co-Authored-By: keyhive <42986966+keyhive@users.noreply.github.com> * changed shift enter special keys to KC_SFTENT changed shift enter special keys to KC_SFTENT * Update keyboards/ut472/ut472.h Co-Authored-By: keyhive <42986966+keyhive@users.noreply.github.com> * Update keyboards/ut472/ut472.h Co-Authored-By: keyhive <42986966+keyhive@users.noreply.github.com> * Update keyboards/ut472/ut472.h Co-Authored-By: keyhive <42986966+keyhive@users.noreply.github.com> * Update keyboards/ut472/readme.md Co-Authored-By: keyhive <42986966+keyhive@users.noreply.github.com> * Update keyboards/ut472/readme.md Co-Authored-By: keyhive <42986966+keyhive@users.noreply.github.com> * updated for sourcing updated for sourcing * Update keyboards/ut472/readme.md Co-Authored-By: keyhive <42986966+keyhive@users.noreply.github.com> * changed flash to make changed flash to make
| * [Keymap] MatthewRobo Massdrop CTRL/DZ60RGB Keymaps (#5799)M-AS2019-05-056-0/+859
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added personal CTRL keymap * added personal dz60rgb keymap * enabled new rgb effect * added space cadet shift * media player track buttons now orange * updated keymaps with rgb setting and visual HSV setting preview * fixed source stuff? * added support for underglow toggle (bugged to all hell) * everything now behaves as expected when ti comes to RGB toggles, thank god * removed ifdefs * changed color of MAS_CRM * uh, whitespace
| * [Keyboard] Add ProjectKeyboard Alice PCB to QMK (#5581)Andrew Kannan2019-05-0514-0/+3048
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update instant60 for tsangan version * Add project alice keyboard * remove * Remove commented out code * Update readme * Add newline * Update keyboards/projectkb/alice/readme.md Co-Authored-By: awkannan <andrew.kannan@klaviyo.com> * Update keyboards/projectkb/alice/halconf.h Co-Authored-By: awkannan <andrew.kannan@klaviyo.com> * Update keyboards/projectkb/alice/halconf.h Co-Authored-By: awkannan <andrew.kannan@klaviyo.com> * Fix ifdef and use helper macros * Add reset keycode * udpate keymap * Add RGB Keycodes * Styling things * remove unused enum * fix
| * [Keyboard] Practice65 Keyboard (#5795)Andrew Kannan2019-05-0515-0/+1728
| | | | | | | | | | | | | | | | | | | | * Save p65 changes * Save p65 changes * Add reset * update num leds
| * Space Cadet: Reducing unnecessary reported keypresses (#5781)XScorpion22019-05-054-22/+27
| | | | | | | | | | | | | |