summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QMK Configurator Support for HHKB and Staryu (#2823)Eric2018-04-272-0/+28
| | | | | | | | | | | | | | | | | | | | * added hhkb eric * dz60 and hhkb * editted eric hhkb and dz60 * Added HHKB Config * Removed HHKB Config * Added HHKB Config * Changed the legends on HHKB info.json * Added Tada68 ISO Config and Staryu * Removed Tada68 ISO Config
* Fix UT47 matrix (#2824)Drashna Jaelre2018-04-271-4/+4
| | | | | | * Fix UT47 matrix * Use both spots in the matrix for the space bar
* Updated tri-layer block in keymap file. (#2827)Salt-Peanuts2018-04-272-20/+6
| | | | | | | | | | | | | | | | | | * Updated info and fixed minor errors * Updated folder name; overdue updates to keymap and readme files Updated folder name; overdue updates to keymap and readme files * Updated tri-layer feature * Revert "Updated tri-layer feature" This reverts commit 59b8b85761740e24f671e10fceea869f06a33ade. * Updated tri-layer on keymap * Fixed typos
* Add missing 7U and 4U layouts to 2x1800 (#2829)Yan-Fa Li2018-04-271-8/+1924
| | | This prevents the layouts from loading in configurator
* New Numpad Support: naKey from ckeys.org (#2828)MechMerlin2018-04-278-0/+462
| | | | | | | | | | | | | | * Add naKey on behalf of ckeys * Update James's code to more modern QMK standards * Add info.json for QMK Configurator support * Fix that build breakage * Rename naKey.c to nakey.c * Rename naKey.h to nakey.h
* Bring dactyl/matrix.c in line with quantum/matrix.c (#2613)Erin Call2018-04-274-321/+401
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use the new debounce algorithm in dactyl/matrix.c [#2065] This incorporates the fixed/optimized debounce code added to quantum/matrix.c in: * 508eddf8ba8548d3f71e1c09a404839beb49f45c * 4c6960835c0a6e29670dabdc27117d7d3c7f99f5 * 32f88c07173b795c6981c779057dceba00aeb1cb * f4030289744fc6dc82dd85c955070c0845813cc5 * a06115df19a74d39b08758472b221e630c3680d3 * Fix the row/column swap in dactyl [#2065] With a column-driven keyboard, reading from the mcp23081 returns a column-state, which takes some extra work to translate into the row-state used in the actual matrix. The ergodox_ez code sidestepped that problem by calling rows "columns" and columns "rows." With this change, the dactyl now calls rows "rows" and columns "columns." * Cleanup: variable names, documentation [#2065] * Support MATRIX_MASKED in dactyl/matrix.c [#2065] * Only unselect one col in unselect_col [#2065] Bonus: saves one i2c transaction per matrix_scan! * Implement COL2ROW in dactyl/matrix.c [#2065] * Fix a typo in dactyl/matrix.c This entirely doesn't matter. The PORT values are set during init_keyboard and never change. They're repeatedly set to the same thing. These PORT lines shouldn't even exist, but since they do, they should at least look right. * Implement COL_PINS/ROW_PINS for dactyl [#2065] * Rename "mcp23018" to "expander" [#2065] I honestly don't know whether/how well this code works with other I/O expanders, but at least in theory, it should be generic enough to work with others. Given that, the variable names shouldn't refer to a specific model of expander. * Remove matrix_power_up from dactyl/matrix.c [#2065] It's commented out in quantum/matrix.c, and the dactyl has no power up/down behavior beyond being unplugged (which goes to matrix_init), so there's no sense keeping it around. * Only initialize expander_input_mask once [#2065] ...and rename input_mask to expander_input_mask, since now that it isn't scoped to init_expander it isn't clear that it's only for the expander.
* FC660C Configurator Support (#2817)MechMerlin2018-04-263-4/+16
| | | | | | * Change KEYMAP to LAYOUT * Add info.json for configurator support
* avocado toast change (#2816)Nick Choi2018-04-261-6/+8
|
* QMK Configurator Support MF68 (#2815)MechMerlin2018-04-266-13/+37
| | | | | | | | * Add QMK Configurator support for MF68 * Add QMK Configurator support for MF68 BLE * change to QMK_KEYBOARD_H in keymaps
* More QMK Configurator Support for Pearl (#2814)MechMerlin2018-04-266-27/+61
| | | | | | | | * Rename LAYOUT to LAYOUT_all Add additional layouts for the pearl with all splits and the pearl with splits but a 6.25u spacebar. * add new layouts to info.json
* Keymap Fixes for 7U layout, RGB and Audio support (#2779)Yan-Fa Li2018-04-263-3/+32
| | | | | - confused KC_COMM, KC_SLSH, KC_DOT order - KC_INS -> KC_DEL - Document audio on C4 and B7, set default RGB to pin C6
* Change handling of adjust layer to make it more LT(...) friendly. (#1625)Martin Sandiford2018-04-263-27/+15
| | | | | | | | * Change handling of adjust layer to make it more LT(...) friendly. * Update based on feedback from drashna. * Change handling of adjust layer to make it more LT(...) friendly. This reworks handling to make it a little more friendly to include in keymaps.
* QMK Configurator update for the Pearl 40% (#2810)James2018-04-266-22/+35
| | | | | | | | | | | | | | | | | | | * QMK Configurator updates for the Pearl 40% Attempt to get the physical layout as displayed in the Configurator more true-to-life. * Bugfixes per mechmerlin "By changing KEYMAP to LAYOUT in the .h file, all the keymaps who rely on KEYMAP are now broken. You need to go into the keymap directory and fix all the keymaps affected by this change. Should just be an issue of renaming KEYMAP to LAYOUT." * Merge pull request #2 from noroadsleft/noroadsleft-patch-20180425 Bugfixes per mechmerlin * keymap.c updates for Pearl -#include "pearl.h" +#QMK_KEYBOARD_H
* Update piemod keymap (#2786)David Wen Riccardi-Zhu2018-04-263-34/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add RGB control, fix keymap to work with latest QMK. Squashed commit of the following: commit 3c5d95e4809d446fe5304aab9274d527182835e6 Author: dwrz <dwrz@dwrz.net> Date: Sat Apr 21 18:26:58 2018 +0000 Make rules.mk for Let's Split piemod commit 0cc5fc135220f0eb48509d2b027e4cad033d74a5 Author: dwrz <dwrz@dwrz.net> Date: Sat Apr 21 18:26:25 2018 +0000 Add RGB control keys to function layer commit d1b6bfa5f34123658534f99c97471b779b971ffb Author: dwrz <dwrz@dwrz.net> Date: Sat Apr 21 18:26:03 2018 +0000 Refactor MACROS to COMBOS MACROS was conflicting with existing code. commit ce2f47b13fb3bfab9d63292ddba466879d300051 Author: dwrz <dwrz@dwrz.net> Date: Sat Apr 21 18:25:26 2018 +0000 Add typing options to config.h commit cb0aa62b81a17aaaee1f9843138495b9ca14b6d4 Author: dwrz <dwrz@dwrz.net> Date: Sat Apr 21 18:25:10 2018 +0000 Add RGB options to config.h
* ScrabblePad updates (#2809)muffinlynx2018-04-261-2/+10
| | | | | | | | | | * Update config.h Matrix pinout updated to current revision. * Add updated matrix, define RGB pin Matrix updated to current pinout, pin for WS2812 defined.
* Add BFO-9000 keyboard (#2807)Danny2018-04-2514-0/+1176
|
* Fix QMK Configurator bug with rendering the Eagle layout (#2806)MechMerlin2018-04-251-2/+2
|
* Fix missed key assignment (#2803)Carlos2018-04-241-2/+2
|
* Cu75 iso fix (#2801)yiancar2018-04-241-2/+2
| | | | | | | | | | | | | | | | * 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 * CU75 keymap fix Incorrect keymap now fixed
* UT47 layout (#2791)Carlos2018-04-2411-0/+1095
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add new project files for UT47 * Copy over keymap and related files * Add LED_controls.ino * Add README instructions * Attempt sending press byte data * Disable mousekeys * Enable sending serial data to LED controller * Update LED mode names * Remove extra file * Add LED enable flag * Update READMEs with more info * Credit original author * Update copyrights * Update docs * Changed based on review * Move layout screenshot to Imgur * Append to src * Enable mousekeys to fix bad keycodes * Additional changes based on feedback * Fix fn layer keys
* DZ60: Add Caps Lock LED for default keymap (#2800)nariox2018-04-241-0/+8
| | | Commit b546da0 added better init handling, but removed Caps Lock LED handling. This re-adds it (in the right place).
* Syntax update (#2660)Kurth O'Connor2018-04-241-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * initial commit * init qmk keymap * update docs * update documentation consolidate readme files; update `make` instructions revise ascii keymap representation * update documentation * edit and update `make` syntax - `make` syntax update - fix typo - add link to teensy video (already linked from online configurator) * permissions restored * remove superfluous files from branch * reset idiosyncratic execute permissions * reset idiosyncratic execute permission
* Helix oled rgb compile sw (#2606)MakotoKurauchi2018-04-245-24/+304
| | | | | | | | | | | | | | | | | | | | | | | | * Helix keyboard OLED, RGBLIGHT enable/disable control integrate into rules.mk rules.mk: add 4 Variables for compile control. # Helix keyboard customize # you can edit follows 4 Variables # jp: 以下の4つの変数を必要に応じて編集します。 OLED_ENABLE = no # OLED_ENABLE LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.) LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) LED_ANIMATIONS = yes # LED animations config.h: auto set RGBLED_NUM by HELIX_ROWS and rules.mk's define * HELIX_ROWS define move from config.h to rules.mk * add readme.md * rename readme.md to readme_jp.md * add readme.md and modify readme_jp.md
* Update readme.md (#2687)Jack Humbert2018-04-241-5/+7
|
* Edited keymaps for eric/dz60 (#2793)Eric2018-04-242-43/+48
| | | | | | | | * added hhkb eric * dz60 and hhkb * editted eric hhkb and dz60
* Changes to danielhklein nyquist config (#2783)Daniel H Klein2018-04-245-34/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | * nyquist * danielhklein nyquist setup * shift left controls * remove readme * cleanup before pr * ready for pr * updated bootmagic, arrows, and special chars * allow gui on arrows * replace arrows with right modifiers * documentation re-added * updated personal repo * fixes to layers
* Update personal colemak Iris layout and deleted redundant folders (#2794)David Rambo2018-04-2413-530/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * DRambo Planck keymap in Colemak * DRambo Planck keymap in Colemak * Satan GH60 keymap for Bri QWERTY layout with Navigation layer toggled with "Caps Lock" key. * xd75 keymap in Colemak for Mac and Win * DRambo Planck keymap in Colemak * Satan GH60 keymap for Bri QWERTY layout with Navigation layer toggled with "Caps Lock" key. * xd75 keymap in Colemak for Mac and Win * Added Iris Colemak layout for Mac, Windows, and Gaming. * changed comment text * DRambo Planck keymap in Colemak * Satan GH60 keymap for Bri QWERTY layout with Navigation layer toggled with "Caps Lock" key. * xd75 keymap in Colemak for Mac and Win * Added Iris Colemak layout for Mac, Windows, and Gaming. * changed comment text * Added Iris keymap from DavidRambo * Added planck keymap from DavidRambo * Added xd75 keymap from DavidRambo * Added readme * Deleted redundant repos in Iris, Planck, and XD75 keymaps. * Tweaked XD75 keymap * DRambo Planck keymap in Colemak * Tweaked XD75 keymap * Merge branch 'master' of https://github.com/DavidRambo/qmk_firmware Removed redundant repos with "Rambo" title. * changed iris nav layers * changed nav layers for xd75 * Updated Iris, tweaked nav on xd75
* Add Generic Keymap for my boards (#2795)MechMerlin2018-04-2414-23/+115
| | | | | | | | | | | | | | | | | | | | | | | | * add mechmerlin 60 ansi layout * put meaningful #defines * missed the backslash * add merlin split layout * rename to have a -ansi * Add appropriate readme files * rename KEYMAP to LAYOUT * support for default layout * support for the community keymaps * make sure I don't break the configurator * Don't break the configurator Merlin
* Support for new keyboard: Meme (#2797)MechMerlin2018-04-249-0/+494
| | | | | | | | | | | | | | | | | | * initial commit for meme keyboard * Fix that row by column * Fix those dimensions * work in progress commit * got that switch matrix to work * add all supported layouts * add info.json for QMK configurator support * let my name be known
* Formatting changes to Alpha readme.md (#2781)Luciano Malavasi2018-04-221-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | * alpha with firmware added to list of keyboards, ready to push * revised according to drashna's fixes * keymap -> layout? * fixed macro and improved layout issuesOC * Update rules.mk * Update alpha.h * Update and rename keyboards/alpha/layouts/default/28_alpha/keymap.c to keyboards/alpha/keymaps/default/keymap.c * alpha/readme.md added according to qmk templateOC * resolved a careless merge conflict * bugfix * Fixed /keyboards/alpha/readme.md formatting issues
* Fix command line options prefix. (#2790)Shinichi Ohki2018-04-221-1/+1
|
* Add layouts to 1up60rgb. (#2789)Joe Wasson2018-04-212-6/+18
| | | | | | * Add layouts to 1up60rgb. * Fix build break in header file for 1up60rgb.
* ALF X2 QMK Configurator Support (#2788)MechMerlin2018-04-213-0/+106
| | | | | | | | | | * Add microswitch information for visiblity in QMK Configurator * Add info.json with layouts for ALF X2 * Add new LAYOUTs * remove that extra comma
* Add pretty layout to all ergodox clones (#2686)Drashna Jaelre2018-04-216-9/+86
| | | | | | | | | | * Add pretty layout to all ergodox clones * Info.json cleanup for EZ * Add info.json for ergodone * info.json cleanup
* Add personal Tada68 Keymap (#2633)Evan2018-04-213-0/+153
| | | | | | | | | | | | | | | | * Add personal Tada68 keymaps * remove uneccessary tada68 folder * recommit with temp name * remove bad folder name * fix bullet list format * rename to fezzant * remove unnecessary config.h file
* Talljoe's layout with common keymap. (#2764)Joe Wasson2018-04-2118-117/+536
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add userspace to talljoe layout. * Move more authority to userspace and create Bananasplit layout. * Move more things into userspace. * Common Core example * More work on common layout. * Num layer. * talljoe-ansi layout * Updates for Zeal60 * Add Zeal60 to 60_ansi_split_bs_rshift * Swap Escape and Grave * Num-layer tweaks * More tweaks. * Add 1up60rgb to world of layouts. * Rename ansi_split_bs_rshift layout to hhkb. * Control RGB Backlight. * change capslock led * Remove obsolete line from rules.mk. * Add user-friendly userspace override. * Fix enter for 1uprgb60 * Revert "Rename ansi_split_bs_rshift layout to hhkb." This reverts commit 53133719db25c7cb6a199108bbf5d980481a45f4.
* Fix Audio Clicky sub-feature (#2784)Drashna Jaelre2018-04-216-66/+87
| | | | | | * Fix Audio Clicky feature * Add to features
* Rework layer function docs (#2656)Mike Kozlowski2018-04-211-9/+10
| | | | | | * Rework layer function docs * Update per PR feedback
* Adds config for ALF X2 60% keyboard (#2765)fixed2018-04-217-0/+232
| | | | | | | | | | * Adds initial keyboard config and layouts for ALF X2 60% * Cleans up empty if/else blocks * Renames KEYMAP to LAYOUT across the alf_x2 config files. * Replaces include in alf_x2 keymaps with QMK_KEYBOARD_H macro
* Update feature_tap_dance.md (#2643)bjacques2018-04-211-1/+1
|
* Use QMK_KEYBOARD_H instead of the mykeyboard.h (#2780)MechMerlin2018-04-211-1/+1
|
* Update to drashna keymaps and userspace (#2756)Drashna Jaelre2018-04-209-67/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Re-add NO_SECRETS option * Add Thumb Clusters defines for default layout * Minor tweaks * More Minor tweaks * Revert Orthodox layers and move function keys around * Fix keymap so it will compile under the Infinity Since I haven't added 'pretty' layouts to it yet * Cleanup of userspace * Cleanup keymaps * OMG fix Workman * Move mods layer key around * Reduce debounce in Ergodox EZ * Fix Infinity layers * Add list of pins used by Ergdox EZ for easy reference * Revert "Reduce debounce in Ergodox EZ" This reverts commit 8a3db2673b419ef8032c40a6d29156cef632f9cd. * Add Clicky toggle to Orthodox * Fix Audio Clicky keycode * Enable Faux Clicky by default * Add Unicode stuff
* Fix Merge issue that reverted LS default keymap to KEYMAP (#2778)Drashna Jaelre2018-04-201-1/+1
|
* changed the ALTFN layer key position and Readme fileFayek Helmi2018-04-202-16/+31
|
* Add Nyquist Rev. 2 (#2414)Danny2018-04-207-3/+181
|
* Firmware for Alpha (28-key keyboard) (#2755)Luciano Malavasi2018-04-206-0/+221
| | | | | | | | | | | | | | | | | | | | | | * alpha with firmware added to list of keyboards, ready to push * revised according to drashna's fixes * keymap -> layout? * fixed macro and improved layout issuesOC * Update rules.mk * Update alpha.h * Update and rename keyboards/alpha/layouts/default/28_alpha/keymap.c to keyboards/alpha/keymaps/default/keymap.c * alpha/readme.md added according to qmk templateOC * resolved a careless merge conflict * bugfix
* Added GH60 Satan ISO layout with split right shift and split backspace (#2773)Christian Hartlage2018-04-204-0/+193
| | | | | | | | | | * added an iso layout that supports split backspace and split rshift * added a keymap which uses the iso layout with split backspace and split rshift * added a #define LAYOUT_ for the KEYMAP_ * fixed missing newline
* Add Staryu macropad support (#2768)Kenneth Aloysius2018-04-2016-9/+546
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add M6-A keymap * Update XD60 keymap * Update XD60 keymap readme * Update JJ40 and Let's Split keymaps * Add readme for M6-A * Fix typo, update JJ40 README * Update jj40 readme * Cleanup jj40 keymap * Revert Let's Split QWERTY layer to default before #2010 * Update numpad layers * Fix: Let's Split keymap getting stuck mods due to having keycodes assigned on the Raise layer * Keep ASCII art consistent with keymap * Staryu: initial port * Add personal keymap * Added and updated READMEs * Fix: default keymap for staryu * Rudimentary backlight support. * Enabled mousekeys for default keymap * use QMK_KEYBOARD_H and LAYOUT * Update readme.md for NIU mini: flash using avrdude * Fix missing linebreaks for Staryu README * Update readme.md
* Add Carpalx keymap for Kinesis (#2771)Thanh Hai Mai2018-04-204-0/+315
|
* Added dz60/eric and hhkb/eric (#2772)Eric2018-04-202-0/+163