1
0
Fork 0
Commit graph

8476 commits

Author SHA1 Message Date
Erin Call
050c21d35f Bring dactyl/matrix.c in line with quantum/matrix.c (#2613)
* Use the new debounce algorithm in dactyl/matrix.c [#2065]

This incorporates the fixed/optimized debounce code added to
quantum/matrix.c in:

* 508eddf8ba
* 4c6960835c
* 32f88c0717
* f403028974
* a06115df19

* 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.
2018-04-27 14:47:41 -04:00
MechMerlin
642bf00baf FC660C Configurator Support (#2817)
* Change KEYMAP to LAYOUT

* Add info.json for configurator support
2018-04-26 20:31:05 -07:00
Nick Choi
510510e9db avocado toast change (#2816) 2018-04-26 20:28:54 -07:00
MechMerlin
6b45e8aec1 QMK Configurator Support MF68 (#2815)
* Add QMK Configurator support for MF68

* Add QMK Configurator support for MF68 BLE

* change to QMK_KEYBOARD_H in keymaps
2018-04-26 20:28:22 -07:00
MechMerlin
8d65d69b8d More QMK Configurator Support for Pearl (#2814)
* 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
2018-04-26 17:19:42 -07:00
Yan-Fa Li
535a4d55ae Keymap Fixes for 7U layout, RGB and Audio support (#2779)
- confused KC_COMM, KC_SLSH, KC_DOT order
 - KC_INS -> KC_DEL
 - Document audio on C4 and B7, set default RGB to pin C6
2018-04-26 13:51:19 -07:00
Martin Sandiford
66e40529aa Change handling of adjust layer to make it more LT(...) friendly. (#1625)
* 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.
2018-04-26 16:10:03 -04:00
James
80ccbc7b54 QMK Configurator update for the Pearl 40% (#2810)
* 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
2018-04-26 11:06:59 -07:00
David Wen Riccardi-Zhu
644efe48bf Update piemod keymap (#2786)
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
2018-04-26 07:51:58 -07:00
muffinlynx
10d287d1aa ScrabblePad updates (#2809)
* Update config.h

Matrix pinout updated to current revision.

* Add updated matrix, define RGB pin

Matrix updated to current pinout, pin for WS2812 defined.
2018-04-26 07:30:05 -07:00
Danny
eb89a372ec Add BFO-9000 keyboard (#2807) 2018-04-25 10:47:13 -07:00
MechMerlin
1c6b9323b2 Fix QMK Configurator bug with rendering the Eagle layout (#2806) 2018-04-25 07:44:37 -07:00
Carlos
4ad37331d3 Fix missed key assignment (#2803) 2018-04-24 19:37:05 -07:00
yiancar
4674664c4a Cu75 iso fix (#2801)
* 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
2018-04-24 13:19:34 -07:00
Carlos
32446eeeb6 UT47 layout (#2791)
* 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
2018-04-24 13:19:04 -07:00
nariox
1feb42a108 DZ60: Add Caps Lock LED for default keymap (#2800)
Commit b546da0 added better init handling, but removed Caps Lock LED handling. This re-adds it (in the right place).
2018-04-24 12:43:23 -07:00
Kurth O'Connor
7d08e48c50 Syntax update (#2660)
* 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
2018-04-24 09:49:34 -07:00
MakotoKurauchi
d1481172bc Helix oled rgb compile sw (#2606)
* 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
2018-04-24 09:43:57 -07:00
Jack Humbert
f440bbbc11 Update readme.md (#2687) 2018-04-24 09:37:52 -07:00
Eric
eef75b82bd Edited keymaps for eric/dz60 (#2793)
* added hhkb eric

* dz60 and hhkb

* editted eric hhkb and dz60
2018-04-24 09:27:33 -07:00
Daniel H Klein
6beb9d3ac2 Changes to danielhklein nyquist config (#2783)
* 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
2018-04-24 09:25:20 -07:00
David Rambo
2286cedb70 Update personal colemak Iris layout and deleted redundant folders (#2794)
* 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
2018-04-24 09:03:02 -07:00
MechMerlin
a0a4c9102c Add Generic Keymap for my boards (#2795)
* 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
2018-04-24 09:01:40 -07:00
MechMerlin
fda23af281 Support for new keyboard: Meme (#2797)
* 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
2018-04-24 09:00:22 -07:00
Luciano Malavasi
70101cf611 Formatting changes to Alpha readme.md (#2781)
* 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
2018-04-22 20:09:52 -07:00
Shinichi Ohki
fb5115f6cd Fix command line options prefix. (#2790) 2018-04-22 14:19:45 -07:00
Joe Wasson
7801356bd4 Add layouts to 1up60rgb. (#2789)
* Add layouts to 1up60rgb.

* Fix build break in header file for 1up60rgb.
2018-04-21 23:16:25 -07:00
MechMerlin
5d5b161d80 ALF X2 QMK Configurator Support (#2788)
* Add microswitch information for visiblity in QMK Configurator

* Add info.json with layouts for ALF X2

* Add new LAYOUTs

* remove that extra comma
2018-04-21 17:00:46 -07:00
Drashna Jaelre
7cb3c0e466 Add pretty layout to all ergodox clones (#2686)
* Add pretty layout to all ergodox clones

* Info.json cleanup for EZ

* Add info.json for ergodone

* info.json cleanup
2018-04-21 17:00:43 -04:00
Evan
3c224bffc8 Add personal Tada68 Keymap (#2633)
* 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
2018-04-21 13:37:26 -07:00
Joe Wasson
5ca9aecfb4 Talljoe's layout with common keymap. (#2764)
* 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.
2018-04-21 10:48:30 -07:00
Drashna Jaelre
33fdd1d255 Fix Audio Clicky sub-feature (#2784)
* Fix Audio Clicky feature

* Add to features
2018-04-21 12:30:10 -04:00
Mike Kozlowski
d1c3419d2a Rework layer function docs (#2656)
* Rework layer function docs

* Update per PR feedback
2018-04-21 09:21:46 -07:00
fixed
9a7347e357 Adds config for ALF X2 60% keyboard (#2765)
* 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
2018-04-21 07:32:53 -07:00
bjacques
e36d6bbbe3 Update feature_tap_dance.md (#2643) 2018-04-21 00:43:36 -07:00
MechMerlin
14b2a35571 Use QMK_KEYBOARD_H instead of the mykeyboard.h (#2780) 2018-04-21 00:22:30 -07:00
Drashna Jaelre
1bb77c0875
Update to drashna keymaps and userspace (#2756)
* 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
2018-04-20 17:53:19 -07:00
Drashna Jaelre
4e4101efdf
Fix Merge issue that reverted LS default keymap to KEYMAP (#2778) 2018-04-20 17:32:53 -07:00
Fayek Helmi
46d12d90df changed the ALTFN layer key position and Readme file 2018-04-20 17:20:52 -07:00
Danny
c604cd6fd7 Add Nyquist Rev. 2 (#2414) 2018-04-20 17:02:09 -07:00
Luciano Malavasi
2a63e21279 Firmware for Alpha (28-key keyboard) (#2755)
* 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
2018-04-20 13:06:10 -07:00
Christian Hartlage
503335be25 Added GH60 Satan ISO layout with split right shift and split backspace (#2773)
* 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
2018-04-20 09:43:51 -07:00
Kenneth Aloysius
0912c42f04 Add Staryu macropad support (#2768)
* 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
2018-04-20 09:14:40 -07:00
Thanh Hai Mai
3ea8bcb8ae Add Carpalx keymap for Kinesis (#2771) 2018-04-20 09:13:14 -07:00
Eric
0ce2cc8915 Added dz60/eric and hhkb/eric (#2772)
* added hhkb eric

* dz60 and hhkb
2018-04-20 09:12:15 -07:00
Salt-Peanuts
ded9390944 Updated folder name; overdue updates to keymap and readme files (#2770)
* 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
2018-04-20 08:53:35 -07:00
MechMerlin
3cab04dfa3 QMK Configurator support for alps64 pcb (#2774)
* Change KEYMAP to LAYOUT

* add layouts that match the layouts hasu has defined for alps64

* add layouts in info.json for aek, standard, and infinity

* Add LAYOUT_iso and LAYOUT_all along with respective info.json LAYOUTs
2018-04-20 08:52:56 -07:00
That-Canadian
1de6458921 Launchpad (#2767)
* Line ending stuff again

* Added base launchpad files and a default layout

* Updated KEYMAP to LAYOUT, also editing default keymap a bit and added a readme
2018-04-20 08:51:34 -07:00
Salt-Peanuts
3bb647910a Updated info and fixed minor errors (#2769) 2018-04-19 18:11:07 -07:00
Josh Asplund
5ec3bd9e40 Adds default IC keymap (#2677) 2018-04-19 09:30:45 -07:00