Update subvendor_ids.md

* Cleanup of keymaps

* Remove Tap Dance from Orthodox keymap

* Cleaned up userspace and keymaps

* Added sample (template)userspace files to my folder

.gitignore

@@ -46,6 +46,7 @@ cmake-build-debug
 *.stackdump
 util/Win_Check_Output.txt
 # Let these ones be user specific, since we have so many different configurations
+.vscode/c_cpp_properties.json
 .vscode/launch.json
 .vscode/tasks.json
 .vscode/last.sql

docs/_summary.md

@@ -42,6 +42,22 @@
   * [Unicode](feature_unicode.md)
   * [Userspace](feature_userspace.md)
 
+* [Keycodes](keycodes.md)
+  * [Backlight](feature_backlight.md#backlight-keycodes)
+  * [Basic](keycodes_basic.md)
+  * [Bluetooth](feature_bluetooth.md#bluetooth-keycodes)
+  * [Bootmagic](feature_bootmagic.md#bootmagic-keycodes)
+  * [Layer Switching](feature_advanced_keycodes.md#switching-and-toggling-layers)
+  * [Mod+Key](feature_advanced_keycodes.md#modifier-keys)
+  * [Mod Tap](feature_advanced_keycodes.md#mod-tap)
+  * [One Shot Keys](feature_advanced_keycodes.md#one-shot-keys)
+  * [Quantum](quantum_keycodes.md)
+  * [RGB Light](feature_rgblight.md#rgblight-keycodes)
+  * [Shifted Keys](feature_advanced_keycodes.md#shifted-keycodes)
+  * [Stenography](feature_stenography.md#keycode-reference)
+  * [Thermal Printer](feature_thermal_printer.md#thermal-printer-keycodes)
+  * [US ANSI Shifted Keys](keycodes_us_ansi_shifted.md)
+
 * Reference
   * [Config Options](config_options.md)
   * [Customizing Functionality](custom_quantum_functions.md)
@@ -49,21 +65,6 @@
   * [Documentation Templates](documentation_templates.md)
   * [Glossary](glossary.md)
   * [Keymap overview](keymap.md)
-  * [Keycodes](keycodes.md)
-    * [Backlight](feature_backlight.md#backlight-keycodes)
-    * [Basic](keycodes_basic.md)
-    * [Bluetooth](feature_bluetooth.md#bluetooth-keycodes)
-    * [Bootmagic](feature_bootmagic.md#bootmagic-keycodes)
-    * [Layer Switching](feature_advanced_keycodes.md#switching-and-toggling-layers)
-    * [Mod+Key](feature_advanced_keycodes.md#modifier-keys)
-    * [Mod Tap](feature_advanced_keycodes.md#mod-tap)
-    * [One Shot Keys](feature_advanced_keycodes.md#one-shot-keys)
-    * [Quantum](quantum_keycodes.md)
-    * [RGB Light](feature_rgblight.md#rgblight-keycodes)
-    * [Shifted Keys](feature_advanced_keycodes.md#shifted-keycodes)
-    * [Stenography](feature_stenography.md#keycode-reference)
-    * [Thermal Printer](feature_thermal_printer.md#thermal-printer-keycodes)
-    * [US ANSI Shifted Keys](keycodes_us_ansi_shifted.md)
   * [Unit Testing](unit_testing.md)
 
 * For Makers and Modders

docs/contributing.md

@@ -104,6 +104,8 @@ Most first-time QMK contributors start with their personal keymaps. We try to ke
 * Write a `readme.md` using [the template](https://docs.qmk.fm/documentation_templates.html#).
 * All Keymap PR's are squashed, so if you care about how your commits are squashed you should do it yourself
 * Do not lump features in with keymap PR's. Submit the feature first and then a second PR for the keymap.
+* Do not include `Makefile`s in your keymap folder (they're no longer used)
+* Update copyrights in file headers (look for `REPLACE_WITH_YOUR_NAME `)
 
 ## Keyboards
 
@@ -114,6 +116,9 @@ We also ask that you follow these guidelines:
 * Write a `readme.md` using [the template](https://docs.qmk.fm/documentation_templates.html#).
 * Keep the number of commits reasonable or we will squash your PR
 * Do not lump core features in with new keyboards. Submit the feature first and then submit a separate PR for the keyboard.
+* Name `.c`/`.h` file after the immediate parent folder, eg `/keyboards/<kb1>/<kb2>/<kb2>.[ch]`
+* Do not include `Makefile`s in your keyboard folder (they're no longer used)
+* Update copyrights in file headers (look for `REPLACE_WITH_YOUR_NAME `)
 
 ## Quantum/TMK Core
 

docs/faq_debug.md

@@ -159,6 +159,7 @@ byte     Teensy(ATMega32u4)              byte     Teensy++(AT90SUB1286)
 And see this discussion for further reference.
 https://github.com/tmk/tmk_keyboard/issues/179
 
+If you are using a TeensyUSB, there is a [known bug](https://github.com/qmk/qmk_firmware/issues/164) in which the hardware reset button prevents the RESET key from working. Unplugging the keyboard and plugging it back in should resolve the problem.
 
 ## Special Extra key doesn't work(System, Audio control keys)
 You need to define `EXTRAKEY_ENABLE` in `rules.mk` to use them in QMK.

docs/feature_advanced_keycodes.md

@@ -49,6 +49,8 @@ Once you have a good feel for how layers work and what you can do, you can get m
 
 Layers stack on top of each other in numerical order. When determining what a keypress does, QMK scans the layers from the top down, stopping when it reaches the first active layer that is not set to `KC_TRNS`. As a result if you activate a layer that is numerically lower than your current layer, and your current layer (or another layer that is active and higher than your target layer) has something other than `KC_TRNS`, that is the key that will be sent, not the key on the layer you just activated. This is the cause of most people's "why doesn't my layer get switched" problem.
 
+Sometimes, you might want to switch between layers in a macro or as part of a tap dance routine. `layer_on` activates a layer, and `layer_off` deactivates it. More layer-related functions can be found in [action_layer.h](../tmk_core/common/action_layer.h).
+
 # Modifier keys
 
 These functions allow you to combine a mod with a keycode. When pressed the keydown for the mod will be sent first, and then *kc* will be sent. When released the keyup for *kc* will be sent and then the mod will be sent.
@@ -145,6 +147,8 @@ You can control the behavior of one shot keys by defining these in `config.h`:
 * `OSM(mod)` - Momentarily hold down *mod*. You must use the `MOD_*` keycodes as shown in [Mod Tap](#mod-tap), not the `KC_*` codes.
 * `OSL(layer)` - momentary switch to *layer*.
 
+Sometimes, you want to activate a one-shot layer as part of a macro or tap dance routine. To do this, you need to call `set_oneshot_layer(LAYER, ONESHOT_START)` on key down, and `set_oneshot_layer(ONESHOT_PRESSED)` on key up. If you want to cancel the oneshot, call `reset_oneshot_layer()`. For more complicated actions, take a look at the oneshot implementation in [`process_record`](../tmk_core/common/action.c#L429).
+
 ## Permissive Hold
 
 As of [PR#1359](https://github.com/qmk/qmk_firmware/pull/1359/), there is a new `config.h` option:

docs/feature_auto_shift.md

@@ -42,7 +42,7 @@ Yes, unfortunately.
 
 Add to your `rules.mk` in the keymap folder:
 
-    AUTO_SHIFT_ENABLE = YES
+    AUTO_SHIFT_ENABLE = yes
 
 If no `rules.mk` exists, you can create one.
 

docs/getting_started_introduction.md

@@ -36,7 +36,7 @@ If the keymap `config.h` exists, that file is included by the build system and t
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H
 
-#include "../../config.h"
+#include "config_common.h"
 ```
 
 If you want to override a setting from the parent `config.h` file, you need to `#undef` and then `#define` the setting again, like this:

docs/getting_started_vagrant.md

@@ -14,7 +14,7 @@ Other than having Vagrant and Virtualbox installed and possibly a restart of you
 
 The "easy" way to flash the firmware is using a tool from your host OS:
 
-* [QMK Flasher](https://github.com/qmk/qmk_flasher)
+* [QMK Toolbox](https://github.com/qmk/qmk_toolbox) (reccommened)
 * [Teensy Loader](https://www.pjrc.com/teensy/loader.html)
 * [Atmel FLIP](http://www.atmel.com/tools/flip.aspx)
 

docs/hardware_keyboard_guidelines.md

@@ -16,6 +16,94 @@ In an effort to keep the repo size down, we're no longer accepting images of any
 
 Any sort of hardware file (plate, case, pcb) can't be stored in qmk_firmware, but we have the [qmk.fm repo](https://github.com/qmk/qmk.fm) where such files (as well as in-depth info) can be stored and viewed on [qmk.fm](http://qmk.fm). Downloadable files are stored in `/<keyboard>/` (name follows the same format as above) which are served at `http://qmk.fm/<keyboard>/`, and pages are generated from `/_pages/<keyboard>/` which are served at the same location (.md files are generated into .html files through Jekyll). Check out the `lets_split` directory for an example.
 
+## Keyboard Metadata
+
+As QMK grows so does the ecosystem surrounding QMK. To make it easier for projects in that ecosystem to tie into QMK as we make changes we are developing a metadata system to expose information about keyboards in QMK.
+
+You can create `info.json` files at every level under `qmk_firmware/keyboards/<name>` to specify this metadata. These files are combined, with more specific files overriding keys in less specific files. This means you do not need to duplicate your metadata information. For example, `qmk_firmware/keyboards/clueboard/info.json` specifies `manufacturer` and `maintainer`, while `qmk_firmware/keyboards/clueboard/66/info.json` specifies more specific information about Clueboard 66%.
+
+### `info.json` Format
+
+The `info.json` file is a JSON formatted dictionary with the following keys available to be set. You do not have to set all of them, merely the keys that apply to your keyboard.
+
+* `keyboard_name`
+  * A free-form text string describing the keyboard.
+  * Example: `Clueboard 66%`
+* `manufacturer`
+  * A free-form text string naming the manufacturer.
+  * Example: `Clueboard`
+* `identifier`
+  * The Vendor, Product, and Revision ID's joined by a :
+  * Example: `c1ed:2370:0001`
+* `url`
+  * A URL to the keyboard's product page, [QMK.fm/keyboards](https://qmk.fm/keyboards) page, or other page describing information about the keyboard.
+* `processor`
+  * The MCU or CPU this keyboard uses.
+  * Example: `atmega32u4` or `stm32f303`
+* `bootloader`
+  * What bootloader this keyboard uses. Available options:
+    * `atmel-dfu`
+    * `kiibohd-dfu-util`
+    * `lufa-dfu`
+    * `qmk-dfu`
+    * `stm32-dfu-util`
+    * (FIXME: This list is incomplete.)
+* `maintainer`
+  * GitHub username of the maintainer, or `qmk` for community maintained boards
+* `width`
+  * Width of the board in Key Units
+* `height`
+  * Height of the board in Key Units
+* `layouts`
+  * Physical Layout representations. See the next section for more detail.
+
+#### Layout Format
+
+Within our `info.json` file the `layouts` portion of the dictionary contains several nested dictionaries. The outer layer consists of QMK layout macros, for example `LAYOUT_ansi` or `LAYOUT_iso`. Within each layout macro are keys for `width`, `height`, and `key_count`, each of which should be self-explanatory.
+
+* `width`
+  * Optional: The width of the layout in Key Units
+* `height`
+  * Optional: The height of the layout in Key Units
+* `key_count`
+  * **Required**: The number of keys in this layout
+* `layout`
+  * A list of Key Dictionaries describing the physical layout. See the next section for more details.
+
+#### Key Dictionary Format
+
+Each Key Dictionary in a layout describes the physical properties of a key. If you are familiar with the Raw Code for <http://keyboard-layout-editor.com> you will find many of the concepts the same. We re-use the same key names and layout choices wherever possible, but unlike keyboard-layout-editor each key is stateless, inheriting no properties from the keys that came before it.
+
+All key positions and rotations are specified in relation to the top-left corner of the keyboard, and the top-left corner of each key.
+
+* `X`
+  * **Required**: The absolute position of the key in the horizontal axis, in Key Units.
+* `Y`
+  * **Required**: The absolute position of the key in the vertical axis, in Key Units.
+* `W`
+  * The width of the key, in Key Units. Ignored if `ks` is provided. Default: `1`
+* `H`
+  * The height of the key, in Key Units. Ignored if `ks` is provided. Default: `1`
+* `R`
+  * How many degrees clockwise to rotate the key.
+* `RX`
+  * The absolute position of the point to rotate the key around in the horizontal axis. Default: `x`
+* `RY`
+  * The absolute position of the point to rotate the key around in the vertical axis. Default: `y`
+* `KS`
+  * Key Shape: define a polygon by providing a list of points, in Key Units. 
+  * **Important**: These are relative to the top-left of the key, not absolute.
+  * Example ISO Enter: `[ [0,0], [1.5,0], [1.5,2], [0.25,2], [0.25,1], [0,1], [0,0] ]`
+
+### How Is The Metadata Exposed?
+
+This metadata is primarily used in two ways:
+
+* To allow web-based configurators to dynamically generate UI
+* To support the new `make keyboard:keymap:qmk` target, which bundles this metadata up with the firmware to allow QMK Toolbox to be smarter.
+
+Configurator authors can see the [QMK Compiler](https://docs.compile.qmk.fm/api_docs.html) docs for more information on using the JSON API.
+
 ## Non-production/handwired projects
 
 We're happy to accept any project that uses QMK, including prototypes and handwired ones, but we have a separate `/keyboards/handwired/` folder for them, so the main `/keyboards/` folder doesn't get overcrowded. If a prototype project becomes a production project at some point in the future, we'd be happy to move it to the main `/keyboards/` folder!

docs/keycodes.md

@@ -115,7 +115,7 @@ When defining a [keymap](keymap.md) each key needs a valid key definition. This
 |`KC_DOWN`||DownArrow|
 |`KC_UP`||UpArrow|
 |`KC_APPLICATION`|`KC_APP`|Application|
-|`KC_POWER`||Power|
+|`KC_POWER`||Old power button scancode. MS has deprecated this in favor of `KC_SYSTEM_POWER`.|
 |`KC_EXECUTE`||Execute|
 |`KC_HELP`||Help|
 |`KC_MENU`||Menu|
@@ -138,7 +138,7 @@ When defining a [keymap](keymap.md) each key needs a valid key definition. This
 |`KC_CLEAR_AGAIN`||Clear/Again|
 |`KC_CRSEL`||CrSel/Props|
 |`KC_EXSEL`||ExSel|
-|`KC_SYSTEM_POWER`|`KC_PWR`|System Power Down|
+|`KC_SYSTEM_POWER`|`KC_PWR`|System Power Down. Recommended over `KC_POWER`.|
 |`KC_SYSTEM_SLEEP`|`KC_SLEP`|System Sleep|
 |`KC_SYSTEM_WAKE`|`KC_WAKE`|System Wake|
 |`KC_MAIL`|`KC_MAIL`||

docs/keymap.md

@@ -28,14 +28,12 @@ Respective layers can be validated simultaneously. Layers are indexed with 0 to
 Sometimes, the action code stored in keymap may be referred as keycode in some documents due to the TMK history.
 
 ### Keymap layer status
-Keymap layer has its state in two 32 bit parameters:
+The state of the Keymap layer is determined by two 32 bit parameters:
 
-* **`default_layer_state`** indicates a base keymap layer(0-31) which is always valid and to be referred.
-* **`layer_state`** () has current on/off status of the layer on its each bit.
+* **`default_layer_state`** indicates a base keymap layer (0-31) which is always valid and to be referred (the default layer).
+* **`layer_state`** has current on/off status of each layer in its bits.
 
-Keymap has its state in two parameter **`default_layer`** indicates a base keymap layer(0-31) which is always valid and to be referred, **`keymap_stat`** is 16bit variable which has current on/off status of layers on its each bit.
-Keymap layer '0' is usually `default_layer` and which is the only valid layer and other layers is initially off after boot up firmware, though, you can configured them in `config.h`.
-To change `default_layer` will be useful when you switch key layout completely, say you want Colmak instead of Qwerty.
+Keymap layer '0' is usually `default_layer`, wither other layers initially off after booting up the firmware, although this can configured differently in `config.h`. It is useful to change `default_layer` when you completely switch a key layout, for example, if you want to switch to Colemak instead of Qwerty.
 
     Initial state of Keymap          Change base layout              
     -----------------------          ------------------              
@@ -52,7 +50,7 @@ To change `default_layer` will be useful when you switch key layout completely,
     `--- default_layer = 0           `--- default_layer = 1
          layer_state   = 0x00000001       layer_state   = 0x00000002
 
-On the other hand, you shall change `layer_state` to overlay base layer with some layers for feature such as navigation keys, function key(F1-F12), media keys or special actions.
+On the other hand, you can change `layer_state` to overlay the base layer with other layers for features such as navigation keys, function keys (F1-F12), media keys, and/or special actions.
 
     Overlay feature layer
     ---------------------      bit|status

docs/subvendor_ids.md

@@ -0,0 +1,17 @@
+# Vendor, Product, Project IDs in QMK
+
+    #define VENDOR_ID  0x03A8
+                         ^ 
+                         + QMK's self-assigned Vendor ID
+    
+    #define PRODUCT_ID 0x0000
+                         ^
+                         + Project IDs
+
+There are many projects using QMK that aren't large enough where it would make sense to obtain a Vendor ID of their own, and [the USB-IF isn't interested in others transferring a VID to communities like ours](http://www.arachnidlabs.com/blog/2013/10/18/usb-if-no-vid-for-open-source/), so QMK uses the unassigned Vendor ID `0x03A8` for all Vendors/Makers/Companies (Projects for clarification) that aren't interested in obtaining their own, and maintains a master list (`project_ids.txt`) in the repo to ensure unique values for each project. 
+
+Project IDs are created from the first 4 digits of a SHA-256 hash of the main project location in QMK (e.g. `olkb/planck`), without the revision folder. If that ID exists in the list, the range is shifted down one digit (e.g. it would now selected digits 2 through 5).
+
+## Using other values
+
+It's not recommended using custom Vendor IDs, but some projects may have obtained their own, and are welcome to use them in QMK, but only with permission of the project's creator (the owner of the Vendor ID).

keyboards/atomic/config.h

@@ -21,11 +21,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
+#define VENDOR_ID       0x03A8
+#define PRODUCT_ID      0x5A61
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    Ortholinear Keyboards
-#define PRODUCT         The Atomic Keyboard
+#define MANUFACTURER    OLKB
+#define PRODUCT         Atomic
 #define DESCRIPTION     A compact ortholinear keyboard
 
 /* key matrix size */

keyboards/atreus/keymaps/dvorak_42_key/keymap.c

@@ -30,24 +30,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 },	
 
 [KEYNAV] = { 
-  {KC_ESC,    MEH(KC_A), RCTL(KC_Z),   RCTL(KC_S), MEH(KC_B), KC_TRNS,    KC_TRNS,       KC_HOME,    KC_UP,           KC_END,     KC_PGUP, },
-  {MEH(KC_C), MEH(KC_D), RSFT(KC_TAB), KC_TAB,     MEH(KC_E), KC_TRNS,    LCTL(KC_LEFT), KC_LEFT,    KC_DOWN,         KC_RIGHT,   LCTL(KC_RIGHT), },
-  {MEH(KC_F), MEH(KC_G), MEH(KC_H),    MEH(KC_I),  MEH(KC_J), KC_TRNS,    KC_TRNS,       RCTL(KC_C), RCTL(KC_X),      RCTL(KC_V), KC_PGDOWN, },
-  {KC_TRNS, KC_TRNS,   KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_ENTER,   KC_SPACE,      KC_BSPC,   RCTL(KC_BSPC),    KC_DELETE,  LCTL(KC_DELETE), }
+  {KC_ESC,      MEH(KC_F9),  RCTL(KC_Z),   RCTL(KC_S), MEH(KC_F10), KC_TRNS,    KC_TRNS,       KC_HOME,    KC_UP,           KC_END,     KC_PGUP, },
+  {MEH(KC_F11), MEH(KC_F12), RSFT(KC_TAB), KC_TAB,     MEH(KC_A),   KC_TRNS,    LCTL(KC_LEFT), KC_LEFT,    KC_DOWN,         KC_RIGHT,   LCTL(KC_RIGHT), },
+  {MEH(KC_B),   MEH(KC_C),   MEH(KC_D),    MEH(KC_E),  MEH(KC_F),   KC_TRNS,    KC_TRNS,       RCTL(KC_C), RCTL(KC_X),      RCTL(KC_V), KC_PGDOWN, },
+  {KC_TRNS,     KC_TRNS,     KC_TRNS,      KC_TRNS,    KC_TRNS,     KC_ENTER,   KC_SPACE,      KC_BSPC,   RCTL(KC_BSPC),    KC_DELETE,  LCTL(KC_DELETE), }
 },	
 
 [KEYSEL] = { 
-  {KC_TRNS, KC_TRNS, RCTL(KC_Z),   RCTL(KC_S), KC_TRNS, KC_TRNS,    KC_TRNS,             RSFT(KC_HOME), RSFT(KC_UP),  RSFT(KC_END), RSFT(KC_PGUP), },
-  {KC_TRNS, KC_TRNS, RSFT(KC_TAB), KC_TAB,     KC_TRNS, KC_TRNS,    RSFT(RCTL(KC_LEFT)), RSFT(KC_LEFT), RSFT(KC_DOWN), RSFT(KC_RIGHT), RSFT(RCTL(KC_RIGHT)), },
-  {KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,    KC_TRNS, KC_TRNS,    KC_TRNS,             RCTL(KC_C),RCTL(KC_X),     RCTL(KC_V), RSFT(KC_PGDN), },
-  {RESET,   KC_TRNS, KC_TRNS,      KC_TRNS,    KC_TRNS, KC_ENTER,   KC_SPACE,            KC_BSPC,   RCTL(KC_BSPC),  KC_DELETE,  LCTL(KC_DELETE), }
+  {MEH(KC_G), MEH(KC_H),MEH(KC_I), MEH(KC_J), MEH(KC_K), KC_TRNS,    KC_TRNS,             RSFT(KC_HOME), RSFT(KC_UP),  RSFT(KC_END), RSFT(KC_PGUP), },
+  {MEH(KC_L), MEH(KC_M),MEH(KC_N), MEH(KC_O), MEH(KC_P), KC_TRNS,    RSFT(RCTL(KC_LEFT)), RSFT(KC_LEFT), RSFT(KC_DOWN), RSFT(KC_RIGHT), RSFT(RCTL(KC_RIGHT)), },
+  {MEH(KC_Q), MEH(KC_R),MEH(KC_S), MEH(KC_T), MEH(KC_U), KC_TRNS,    KC_TRNS,             RCTL(KC_C),RCTL(KC_X),     RCTL(KC_V), RSFT(KC_PGDN), },
+  {RESET,     KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_ENTER,   KC_SPACE,            KC_BSPC,   RCTL(KC_BSPC),  KC_DELETE,  LCTL(KC_DELETE), }
 },	
 
 [COMBINED] = { 
-  {KC_ESC,  KC_LABK, KC_RABK,     KC_DQUO,     KC_GRAVE, KC_TRNS,    KC_PLUS,     KC_7,    KC_8,    KC_9,    KC_ASTR, },
-  {KC_LPRN, KC_RPRN, KC_LBRACKET, KC_RBRACKET, KC_UNDS,  KC_TRNS,    KC_MINS,     KC_4,    KC_5,    KC_6,    KC_SLSH, },
-  {KC_LCBR, KC_RCBR, KC_BSLS,     KC_PIPE,     KC_TILD,  KC_TRNS,    KC_EQUAL,    KC_1,    KC_2,    KC_3,    KC_QUES, },
-  {KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,     KC_TRNS,  KC_TRNS,    KC_TRNS,     KC_0,  KC_DOT,  KC_TRNS, KC_TRNS, }
+  {KC_EXLM, KC_AT,      KC_HASH,     KC_DLR,      KC_PERC, KC_TRNS,    KC_PLUS,   KC_7, KC_8,    KC_9,    KC_ASTR, },
+  {KC_LPRN, KC_RPRN,    KC_LBRACKET, KC_RBRACKET, KC_UNDS,  KC_TRNS,    KC_MINS,  KC_4, KC_5,    KC_6,    KC_SLSH, },
+  {KC_COLN, KC_DQUO,    KC_LCBR,     KC_RCBR,     KC_TRNS,  KC_TRNS,    KC_EQUAL, KC_1, KC_2,    KC_3,    KC_QUES, },
+  {KC_PIPE, KC_BSLS,    KC_CIRC,     KC_AMPR,     KC_TRNS,  KC_TRNS,    KC_TRNS,  KC_0, KC_DOT,  KC_TILD, KC_GRAVE, }
 },	
 
 [MOUSE] = { 

keyboards/clueboard/66/info.json

@@ -4,5 +4,9 @@
   "bootloader": "atmel-dfu",
   "width": 16.5,
   "height": 5,
-  "layouts": {"KEYMAP": [{"x": 0, "y": 0, "w": 1}, {"x": 1, "y": 0, "w": 1}, {"x": 2, "y": 0, "w": 1}, {"x": 3, "y": 0, "w": 1}, {"x": 4, "y": 0, "w": 1}, {"x": 5, "y": 0, "w": 1}, {"x": 6, "y": 0, "w": 1}, {"x": 7, "y": 0, "w": 1}, {"x": 8, "y": 0, "w": 1}, {"x": 9, "y": 0, "w": 1}, {"x": 10, "y": 0, "w": 1}, {"x": 11, "y": 0, "w": 1}, {"x": 12, "y": 0, "w": 1}, {"x": 13, "y": 0, "w": 1}, {"x": 14, "y": 0, "w": 1}, {"x": 15.5, "y": 0, "w": 1}, {"x": 0, "y": 1, "w": 1.5}, {"x": 1.5, "y": 1, "w": 1}, {"x": 2.5, "y": 1, "w": 1}, {"x": 3.5, "y": 1, "w": 1}, {"x": 4.5, "y": 1, "w": 1}, {"x": 5.5, "y": 1, "w": 1}, {"x": 6.5, "y": 1, "w": 1}, {"x": 7.5, "y": 1, "w": 1}, {"x": 8.5, "y": 1, "w": 1}, {"x": 9.5, "y": 1, "w": 1}, {"x": 10.5, "y": 1, "w": 1}, {"x": 11.5, "y": 1, "w": 1}, {"x": 12.5, "y": 1, "w": 1}, {"x": 13.5, "y": 1, "w": 1.5}, {"x": 15.5, "y": 1, "w": 1}, {"x": 0, "y": 2, "w": 1.75}, {"x": 1.75, "y": 2, "w": 1}, {"x": 2.75, "y": 2, "w": 1}, {"x": 3.75, "y": 2, "w": 1}, {"x": 4.75, "y": 2, "w": 1}, {"x": 5.75, "y": 2, "w": 1}, {"x": 6.75, "y": 2, "w": 1}, {"x": 7.75, "y": 2, "w": 1}, {"x": 8.75, "y": 2, "w": 1}, {"x": 9.75, "y": 2, "w": 1}, {"x": 10.75, "y": 2, "w": 1}, {"x": 11.75, "y": 2, "w": 1}, {"x": 12.75, "y": 2, "w": 1}, {"x": 13.75, "y": 2, "w": 1.25}, {"x": 0, "y": 3, "w": 1.25}, {"x": 1.25, "y": 3, "w": 1}, {"x": 2.25, "y": 3, "w": 1}, {"x": 3.25, "y": 3, "w": 1}, {"x": 4.25, "y": 3, "w": 1}, {"x": 5.25, "y": 3, "w": 1}, {"x": 6.25, "y": 3, "w": 1}, {"x": 7.25, "y": 3, "w": 1}, {"x": 8.25, "y": 3, "w": 1}, {"x": 9.25, "y": 3, "w": 1}, {"x": 10.25, "y": 3, "w": 1}, {"x": 11.25, "y": 3, "w": 1}, {"x": 12.25, "y": 3, "w": 1}, {"x": 13.25, "y": 3, "w": 1.25}, {"x": 14.5, "y": 3, "w": 1}, {"x": 0, "y": 4, "w": 1.25}, {"x": 1.25, "y": 4, "w": 1}, {"x": 2.25, "y": 4, "w": 1.25}, {"x": 3.5, "y": 4, "w": 1.25}, {"x": 4.75, "y": 4, "w": 2}, {"x": 6.75, "y": 4, "w": 2}, {"x": 8.75, "y": 4, "w": 1.25}, {"x": 10, "y": 4, "w": 1.25}, {"x": 11.25, "y": 4, "w": 1}, {"x": 12.25, "y": 4, "w": 1.25}, {"x": 13.5, "y": 4, "w": 1}, {"x": 14.5, "y": 4, "w": 1}, {"x": 15.5, "y": 4, "w": 1}]}
+  "layouts": {
+    "KEYMAP": {
+      "layout": [{"x": 0, "y": 0, "w": 1, "label": "GRAVE"}, {"x": 1, "y": 0, "w": 1, "label": "1"}, {"x": 2, "y": 0, "w": 1, "label": "2"}, {"x": 3, "y": 0, "w": 1, "label": "3"}, {"x": 4, "y": 0, "w": 1, "label": "4"}, {"x": 5, "y": 0, "w": 1, "label": "5"}, {"x": 6, "y": 0, "w": 1, "label": "6"}, {"x": 7, "y": 0, "w": 1, "label": "7"}, {"x": 8, "y": 0, "w": 1, "label": "8"}, {"x": 9, "y": 0, "w": 1, "label": "9"}, {"x": 10, "y": 0, "w": 1, "label": "0"}, {"x": 11, "y": 0, "w": 1, "label": "DASH"}, {"x": 12, "y": 0, "w": 1, "label": "EQUALSIGN"}, {"x": 13, "y": 0, "w": 1, "label": "YEN"}, {"x": 14, "y": 0, "w": 1, "label": "BACKSPACE"}, {"x": 15.5, "y": 0, "w": 1, "label": "PAGEUP"}, {"x": 0, "y": 1, "w": 1.5, "label": "TAB"}, {"x": 1.5, "y": 1, "w": 1, "label": "Q"}, {"x": 2.5, "y": 1, "w": 1, "label": "W"}, {"x": 3.5, "y": 1, "w": 1, "label": "E"}, {"x": 4.5, "y": 1, "w": 1, "label": "R"}, {"x": 5.5, "y": 1, "w": 1, "label": "T"}, {"x": 6.5, "y": 1, "w": 1, "label": "Y"}, {"x": 7.5, "y": 1, "w": 1, "label": "U"}, {"x": 8.5, "y": 1, "w": 1, "label": "I"}, {"x": 9.5, "y": 1, "w": 1, "label": "O"}, {"x": 10.5, "y": 1, "w": 1, "label": "P"}, {"x": 11.5, "y": 1, "w": 1, "label": "LBRACKET"}, {"x": 12.5, "y": 1, "w": 1, "label": "RBRACKET"}, {"x": 13.5, "y": 1, "w": 1.5, "label": "BACKSLASH"}, {"x": 15.5, "y": 1, "w": 1, "label": "PAGEDOWN"}, {"x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK"}, {"x": 1.75, "y": 2, "w": 1, "label": "A"}, {"x": 2.75, "y": 2, "w": 1, "label": "S"}, {"x": 3.75, "y": 2, "w": 1, "label": "D"}, {"x": 4.75, "y": 2, "w": 1, "label": "F"}, {"x": 5.75, "y": 2, "w": 1, "label": "G"}, {"x": 6.75, "y": 2, "w": 1, "label": "H"}, {"x": 7.75, "y": 2, "w": 1, "label": "J"}, {"x": 8.75, "y": 2, "w": 1, "label": "K"}, {"x": 9.75, "y": 2, "w": 1, "label": "L"}, {"x": 10.75, "y": 2, "w": 1, "label": "SEMICOLON"}, {"x": 11.75, "y": 2, "w": 1, "label": "QUOTE"}, {"x": 12.75, "y": 2, "w": 1, "label": "ISOHASH"}, {"x": 13.75, "y": 2, "w": 1.25, "label": "ENTER"}, {"x": 0, "y": 3, "w": 1.25, "label": "LSHIFT"}, {"x": 1.25, "y": 3, "w": 1, "label": "ISOBACKSLASH"}, {"x": 2.25, "y": 3, "w": 1, "label": "Z"}, {"x": 3.25, "y": 3, "w": 1, "label": "X"}, {"x": 4.25, "y": 3, "w": 1, "label": "C"}, {"x": 5.25, "y": 3, "w": 1, "label": "V"}, {"x": 6.25, "y": 3, "w": 1, "label": "B"}, {"x": 7.25, "y": 3, "w": 1, "label": "N"}, {"x": 8.25, "y": 3, "w": 1, "label": "M"}, {"x": 9.25, "y": 3, "w": 1, "label": "COMMA"}, {"x": 10.25, "y": 3, "w": 1, "label": "PERIOD"}, {"x": 11.25, "y": 3, "w": 1, "label": "SLASH"}, {"x": 12.25, "y": 3, "w": 1, "label": "JPBACKSLASH"}, {"x": 13.25, "y": 3, "w": 1.25, "label": "RSHIFT"}, {"x": 14.5, "y": 3, "w": 1, "label": "UP"}, {"x": 0, "y": 4, "w": 1.25, "label": "LCTRL"}, {"x": 1.25, "y": 4, "w": 1, "label": "LALT"}, {"x": 2.25, "y": 4, "w": 1.25, "label": "LCMD"}, {"x": 3.5, "y": 4, "w": 1.25, "label": "MUHENKAN"}, {"x": 4.75, "y": 4, "w": 2, "label": "SPACE1"}, {"x": 6.75, "y": 4, "w": 2, "label": "SPACE2"}, {"x": 8.75, "y": 4, "w": 1.25, "label": "HENKAN"}, {"x": 10, "y": 4, "w": 1.25, "label": "RCMD"}, {"x": 11.25, "y": 4, "w": 1, "label": "RCTRL"}, {"x": 12.25, "y": 4, "w": 1.25, "label": "FN"}, {"x": 13.5, "y": 4, "w": 1, "label": "LEFT"}, {"x": 14.5, "y": 4, "w": 1, "label": "DOWN"}, {"x": 15.5, "y": 4, "w": 1, "label": "RIGHT"}]
+    }
+  }
 }

keyboards/converter/ibm_terminal/README.md

@@ -6,7 +6,7 @@ This is a port of TMK's converter/terminal_usb to QMK.
 It supports PS/2 Scan Code Set 3 and runs on USB AVR chips such like PJRC Teensy.
 I tested the converter on ATMega32U4 with 1392595(102keys) and 6110345(122keys).
 
-Source code: https://github.com/tmk/tmk_keyboard
+Source code: https://github.com/qmk/qmk_firmware.git
 Article: http://geekhack.org/index.php?topic=27272.0
 
 
@@ -22,9 +22,9 @@ And VCC and GND, of course. See RESOURCE for keyboard connector pin assign.
 
 BUILD
 -----
-$ git clone https://github.com/tmk/tmk_keyboard.git
-$ cd converter/terminal_usb
-$ make 
+$ git clone https://github.com/qmk/qmk_firmware.git
+$ cd qmk_firmware
+$ make converter/ibm_terminal:default
 
 
 RESOURCE

keyboards/converter/ibm_terminal/ibm_terminal.c

@@ -1,6 +1 @@
 #include "ibm_terminal.h"
-
-// void matrix_init_kb(void) {
-
-//     matrix_init_user();
-// }

keyboards/converter/usb_usb/README.md

@@ -13,13 +13,18 @@ Make example for this keyboard (after setting up your build environment):
 
 See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
 
+Note that you have to choose the right hardware variant as your subproject, otherwise you will probably have issues.
+
 Troubleshooting & Known Issues
 ------------------------------
-The Pro Micro variant runs at 8MHz, hence the following line in `usb_usb/rules.mk`:
-`F_CPU ?= 8000000`
-If the firmware doesn't work, try changing that line to
-`F_CPU ?= 16000000`
-or override the `F_CPU` variable in the `rules.mk` of your keymap.
+If something doesn't work, it's probably because of the CPU clock. 
+Be sure to select the correct subproject (the middle part of the `make` argument) according to your hardware. 
+If you are sure you have this correct, try changeing the default in `usb_usb/rules.mk` or overriding the value in the `rules.mk` of your keymap.
+
+The Pro Micro variant uses a 3.3V Pro Micro and thus runs at 8MHz, hence the following line in `usb_usb/pro_micro/rules.mk`:
+`F_CPU = 8000000`
+The converter sold by Hasu runs at 16MHz and so the corresponding line in `usb_usb/hasu/rules.mk` is:
+`F_CPU = 16000000`
 
 Getting the Hardware
 --------------------

keyboards/converter/usb_usb/ble/ble.c

@@ -0,0 +1 @@
+#include "ble.h"

keyboards/converter/usb_usb/ble/ble.h

@@ -0,0 +1,6 @@
+#ifndef BLE_H
+#define BLE_H
+
+#include QMK_KEYBOARD_H
+
+#endif

keyboards/converter/usb_usb/ble/config.h

@@ -0,0 +1,13 @@
+#ifndef CONFIG_BLE_H
+#define CONFIG_BLE_H
+
+#undef PRODUCT
+#define PRODUCT         QMK BLE Adapter
+#undef DESCRIPTION
+#define DESCRIPTION  
+
+// Turn off the mode leds on the BLE module
+#define ADAFRUIT_BLE_ENABLE_MODE_LEDS 0
+#define ADAFRUIT_BLE_ENABLE_POWER_LED 0
+
+#endif

keyboards/converter/usb_usb/ble/rules.mk

@@ -0,0 +1,4 @@
+BLUETOOTH = AdafruitBLE
+ADAFRUIT_BLE_ENABLE = yes
+OPT_DEFS +=  -DCATERINA_BOOTLOADER
+F_CPU = 8000000

keyboards/converter/usb_usb/config.h

@@ -21,6 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // do not #include "config_common.h" because the pin names conflict with the USB HID code.
 // CUSTOM_MATRIX is defined it that file, though, and we need it, so we define it ourselves.
 // It's a hack, yeah...
+
 #define CUSTOM_MATRIX 2
 
 /* USB Device descriptor parameter */

keyboards/converter/usb_usb/custom_matrix.cpp

@@ -35,6 +35,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "host.h"
 #include "keyboard.h"
 
+extern "C" {
+#include "quantum.h"
+}
 
 /* KEY CODE to Matrix
  *
@@ -62,7 +65,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 // Integrated key state of all keyboards
-static report_keyboard_t keyboard_report;
+static report_keyboard_t local_keyboard_report;
 
 static bool matrix_is_mod = false;
 
@@ -98,13 +101,13 @@ extern "C"
     }
 
     static void or_report(report_keyboard_t report) {
-        // integrate reports into keyboard_report
-        keyboard_report.mods |= report.mods;
+        // integrate reports into local_keyboard_report
+        local_keyboard_report.mods |= report.mods;
         for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
             if (IS_ANY(report.keys[i])) {
                 for (uint8_t j = 0; j < KEYBOARD_REPORT_KEYS; j++) {
-                    if (! keyboard_report.keys[j]) {
-                        keyboard_report.keys[j] = report.keys[i];
+                    if (! local_keyboard_report.keys[j]) {
+                        local_keyboard_report.keys[j] = report.keys[i];
                         break;
                     }
                 }
@@ -130,7 +133,7 @@ extern "C"
             last_time_stamp4 = kbd_parser4.time_stamp;
 
             // clear and integrate all reports
-            keyboard_report = {};
+            local_keyboard_report = {};
             or_report(kbd_parser1.report);
             or_report(kbd_parser2.report);
             or_report(kbd_parser3.report);
@@ -138,9 +141,9 @@ extern "C"
 
             matrix_is_mod = true;
 
-            dprintf("state:  %02X %02X", keyboard_report.mods, keyboard_report.reserved);
+            dprintf("state:  %02X %02X", local_keyboard_report.mods, local_keyboard_report.reserved);
             for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
-                dprintf(" %02X", keyboard_report.keys[i]);
+                dprintf(" %02X", local_keyboard_report.keys[i]);
             }
             dprint("\r\n");
         } else {
@@ -177,12 +180,12 @@ extern "C"
         uint8_t code = CODE(row, col);
 
         if (IS_MOD(code)) {
-            if (keyboard_report.mods & ROW_BITS(code)) {
+            if (local_keyboard_report.mods & ROW_BITS(code)) {
                 return true;
             }
         }
         for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
-            if (keyboard_report.keys[i] == code) {
+            if (local_keyboard_report.keys[i] == code) {
                 return true;
             }
         }
@@ -192,14 +195,14 @@ extern "C"
     matrix_row_t matrix_get_row(uint8_t row) {
         uint16_t row_bits = 0;
 
-        if (IS_MOD(CODE(row, 0)) && keyboard_report.mods) {
-            row_bits |= keyboard_report.mods;
+        if (IS_MOD(CODE(row, 0)) && local_keyboard_report.mods) {
+            row_bits |= local_keyboard_report.mods;
         }
 
         for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
-            if (IS_ANY(keyboard_report.keys[i])) {
-                if (row == ROW(keyboard_report.keys[i])) {
-                    row_bits |= ROW_BITS(keyboard_report.keys[i]);
+            if (IS_ANY(local_keyboard_report.keys[i])) {
+                if (row == ROW(local_keyboard_report.keys[i])) {
+                    row_bits |= ROW_BITS(local_keyboard_report.keys[i]);
                 }
             }
         }
@@ -209,9 +212,9 @@ extern "C"
     uint8_t matrix_key_count(void) {
         uint8_t count = 0;
 
-        count += bitpop(keyboard_report.mods);
+        count += bitpop(local_keyboard_report.mods);
         for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
-            if (IS_ANY(keyboard_report.keys[i])) {
+            if (IS_ANY(local_keyboard_report.keys[i])) {
                 count++;
             }
         }
@@ -233,6 +236,7 @@ extern "C"
         kbd2.SetReport(0, 0, 2, 0, 1, &usb_led);
         kbd3.SetReport(0, 0, 2, 0, 1, &usb_led);
         kbd4.SetReport(0, 0, 2, 0, 1, &usb_led);
+        led_set_kb(usb_led);
     }
 
 };

keyboards/converter/usb_usb/hasu/hasu.c

@@ -0,0 +1 @@
+#include "hasu.h"

keyboards/converter/usb_usb/hasu/hasu.h

@@ -0,0 +1,6 @@
+#ifndef HASU_H
+#define HASU_H
+
+#include QMK_KEYBOARD_H
+
+#endif

keyboards/converter/usb_usb/hasu/rules.mk

@@ -0,0 +1 @@
+F_CPU = 16000000

keyboards/converter/usb_usb/keymaps/ble/config.h

@@ -3,13 +3,4 @@
 
 #include "../../config.h"
 
-#undef PRODUCT
-#define PRODUCT         QMK BLE Adapter
-#undef DESCRIPTION
-#define DESCRIPTION  
-
-// Turn off the mode leds on the BLE module
-#define ADAFRUIT_BLE_ENABLE_MODE_LEDS 0
-#define ADAFRUIT_BLE_ENABLE_POWER_LED 0
-
 #endif

keyboards/converter/usb_usb/keymaps/ble/rules.mk

@@ -1,3 +0,0 @@
-BLUETOOTH = AdafruitBLE
-ADAFRUIT_BLE_ENABLE = yes
-OPT_DEFS +=  -DCATERINA_BOOTLOADER

keyboards/converter/usb_usb/pro_micro/pro_micro.c

@@ -0,0 +1 @@
+#include "pro_micro.h"

keyboards/converter/usb_usb/pro_micro/pro_micro.h

@@ -0,0 +1,6 @@
+#ifndef PRO_MICRO_H
+#define PRO_MICRO_H
+
+#include QMK_KEYBOARD_H
+
+#endif

keyboards/converter/usb_usb/pro_micro/rules.mk

@@ -0,0 +1 @@
+F_CPU = 8000000

keyboards/converter/usb_usb/rules.mk

@@ -13,7 +13,15 @@ MCU = atmega32u4
 #     does not *change* the processor frequency - it should merely be updated to
 #     reflect the processor speed set externally so that the code can use accurate
 #     software delays.
-F_CPU = 8000000
+
+# Since there are different hardware variations of these adapters and since these
+# have different CPU clocks, the clock speed should be set in the rules.mk file of the
+# respective hardware variantion (i.e. subproject). For example, in /pro_micro/rules.mk
+# this is set to 8000000.
+# The value here is only a fallback and is ignored if it is defined in the subproject.
+F_CPU ?= 16000000
+
+DEFAULT_FOLDER = converter/usb_usb/hasu
 
 
 #

keyboards/converter/usb_usb/usb_usb.c

@@ -1 +1 @@
-#include "usb_usb.h"
+#include "usb_usb.h"

keyboards/dz60/dz60.c

@@ -1,9 +1,28 @@
 #include "dz60.h"
+#include "led.h"
+
+void matrix_init_kb(void) {
+  // Keyboard start-up code goes here
+  // Runs once when the firmware starts up
+  matrix_init_user();
+  led_init_ports();
+};
+
+void matrix_scan_kb(void) {
+  // Looping keyboard code goes here
+  // This runs every cycle (a lot)
+  matrix_scan_user();
+};
+
+void led_init_ports(void) {
+  // Set caps lock LED pin as output
+  DDRB |= (1 << 2);
+  // Default to off
+  PORTB |= (1 << 2);
+}
 
 void led_set_kb(uint8_t usb_led) {
-    if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-        DDRB |= (1 << 2); PORTB &= ~(1 << 2);
-    } else {
-        DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
-    }
-}
+  // Code for caps lock LED as reported by the OS
+  // Set this per keymap, instead of globally
+  led_set_user(usb_led);
+}

keyboards/ergodone/rules.mk

@@ -92,4 +92,4 @@ ONEHAND_ENABLE          = no  # Disable Onehand
 RGBLIGHT_ENABLE         = no
 MIDI_ENABLE             = no
 
-LAYOUTS = ergodox ergodox_80
+LAYOUTS = ergodox

keyboards/ergodox_ez/config.h

@@ -87,6 +87,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define USB_MAX_POWER_CONSUMPTION 500
 
+// #define RGBLIGHT_COLOR_LAYER_0 0x00, 0x00, 0xFF
+/* #define RGBLIGHT_COLOR_LAYER_1 0x00, 0x00, 0xFF */
+/* #define RGBLIGHT_COLOR_LAYER_2 0xFF, 0x00, 0x00 */
+/* #define RGBLIGHT_COLOR_LAYER_3 0x00, 0xFF, 0x00 */
+/* #define RGBLIGHT_COLOR_LAYER_4 0xFF, 0xFF, 0x00 */
+/* #define RGBLIGHT_COLOR_LAYER_5 0x00, 0xFF, 0xFF */
+/* #define RGBLIGHT_COLOR_LAYER_6 0xFF, 0x00, 0xFF */
+/* #define RGBLIGHT_COLOR_LAYER_7 0xFF, 0xFF, 0xFF */
+
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.

keyboards/ergodox_ez/keymaps/default/keymap.c

@@ -194,30 +194,82 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 // Runs just one time when the keyboard initializes.
 void matrix_init_user(void) {
-
+#ifdef RGBLIGHT_COLOR_LAYER_0
+  rgblight_setrgb(RGBLIGHT_COLOR_LAYER_0);
+#endif
 };
 
-
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
 
-  uint8_t layer = biton32(layer_state);
+};
 
+// Runs whenever there is a layer state change.
+uint32_t layer_state_set_user(uint32_t state) {
   ergodox_board_led_off();
   ergodox_right_led_1_off();
   ergodox_right_led_2_off();
   ergodox_right_led_3_off();
-  switch (layer) {
-    // TODO: Make this relevant to the ErgoDox EZ.
-    case SYMB:
-      ergodox_right_led_1_on();
-      break;
-    case MDIA:
-      ergodox_right_led_2_on();
-      break;
-    default:
-      // none
-      break;
-  }
 
+  uint8_t layer = biton32(state);
+  switch (layer) {
+      case 0:
+        #ifdef RGBLIGHT_COLOR_LAYER_0
+          rgblight_setrgb(RGBLIGHT_COLOR_LAYER_0);
+        #else
+          rgblight_init();
+        #endif
+        break;
+      case 1:
+        ergodox_right_led_1_on();
+        #ifdef RGBLIGHT_COLOR_LAYER_1
+          rgblight_setrgb(RGBLIGHT_COLOR_LAYER_1);
+        #endif
+        break;
+      case 2:
+        ergodox_right_led_2_on();
+        #ifdef RGBLIGHT_COLOR_LAYER_2
+          rgblight_setrgb(RGBLIGHT_COLOR_LAYER_2);
+        #endif
+        break;
+      case 3:
+        ergodox_right_led_3_on();
+        #ifdef RGBLIGHT_COLOR_LAYER_3
+          rgblight_setrgb(RGBLIGHT_COLOR_LAYER_3);
+        #endif
+        break;
+      case 4:
+        ergodox_right_led_1_on();
+        ergodox_right_led_2_on();
+        #ifdef RGBLIGHT_COLOR_LAYER_4
+          rgblight_setrgb(RGBLIGHT_COLOR_LAYER_4);
+        #endif
+        break;
+      case 5:
+        ergodox_right_led_1_on();
+        ergodox_right_led_3_on();
+        #ifdef RGBLIGHT_COLOR_LAYER_5
+          rgblight_setrgb(RGBLIGHT_COLOR_LAYER_5);
+        #endif
+        break;
+      case 6:
+        ergodox_right_led_2_on();
+        ergodox_right_led_3_on();
+        #ifdef RGBLIGHT_COLOR_LAYER_6
+          rgblight_setrgb(RGBLIGHT_COLOR_LAYER_6);
+        #endif
+        break;
+      case 7:
+        ergodox_right_led_1_on();
+        ergodox_right_led_2_on();
+        ergodox_right_led_3_on();
+        #ifdef RGBLIGHT_COLOR_LAYER_7
+          rgblight_setrgb(RGBLIGHT_COLOR_LAYER_6);
+        #endif
+        break;
+      default:
+        break;
+    }
+
+  return state;
 };

keyboards/ergodox_ez/keymaps/drashna-custom/config.h

@@ -1,16 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#include "../../config.h"
-
-
-#define TAPPING_TERM 200
-
-#ifdef RGBLIGHT_ENABLE
-#undef RGBLIGHT_SAT_STEP 
-#define RGBLIGHT_SAT_STEP 12
-#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 7
-#define RGBLIGHT_EFFECT_SNAKE_LENGTH 7
-#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
-#endif // RGBLIGHT_ENABLE
-
-#endif

keyboards/ergodox_ez/keymaps/drashna-custom/keymap.c

@@ -1,832 +0,0 @@
-/*
-This is the keymap for the keyboard
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2017 Art Ortenburger
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-
-
-#include "keymap_german.h"
-
-#include "keymap_nordic.h"
-
-// Define layer names 
-#define QWERTY 0
-#define COLEMAK 1
-#define DVORAK 2
-#define WORKMAN 3
-#define SYMB 8
-#define OVERWATCH 9
-#define DIABLO 10
-#define MOUS 12
-
-//Leader Key stuff
-#ifdef LEADER_TIMEOUT
-#undef LEADER_TIMEOUT
-#endif
-#define LEADER_TIMEOUT 1500
-
-//define modifiers
-#define MODS_SHIFT_MASK  (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL_MASK  (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTRL))
-#define MODS_ALT_MASK  (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT))
- 
-//define layer change stuff for underglow indicator
-bool skip_leds = false;
-
-#ifdef RGBLIGHT_ENABLE
-#define rgblight_set_blue        rgblight_sethsv (0xFF,  0xFF, 0xFF);
-#define rgblight_set_red         rgblight_sethsv (0x00,  0xFF, 0xFF);
-#define rgblight_set_green       rgblight_sethsv (0x78,  0xFF, 0xFF);
-#define rgblight_set_orange      rgblight_sethsv (0x1E,  0xFF, 0xFF);
-#define rgblight_set_teal        rgblight_sethsv (0xC3,  0xFF, 0xFF);
-#define rgblight_set_magenta     rgblight_sethsv (0x12C, 0xFF, 0xFF);
-#define rgblight_set_yellow      rgblight_sethsv (0x3C,  0xFF, 0xFF);
-#define rgblight_set_purple      rgblight_sethsv (0x10E, 0xFF, 0xFF);
-#endif
-
-//define diablo macro timer variables
-static uint16_t diablo_timer[4];
-static uint8_t diablo_times[] = {0, 1, 3, 5, 10, 30};
-static uint8_t diablo_key_time[4];
-
-bool check_dtimer(uint8_t dtimer) {
-    // has the correct number of seconds elapsed (as defined by diablo_times)
-    return (timer_elapsed(diablo_timer[dtimer]) < ( diablo_key_time[dtimer] * 1000 ) ) ? false : true;
-};
-
-
-enum custom_keycodes {
-    PLACEHOLDER = SAFE_RANGE, // can always be here
-    EPRM,
-    VRSN,
-    RGB_SLD,
-    RGB_0000FF,
-    RGB_008000,
-    RGB_FF0000,
-    RGB_800080,
-    RGB_00FF90,
-    KC_DIABLO_CLEAR,
-    KC_QWERTY,
-    KC_COLEMAK,
-    KC_DVORAK,
-    KC_WORKMAN,
-    KC_MAKEQMK
-};
-
-#ifdef TAP_DANCE_ENABLE
-enum {
-    TD_FLSH = 0,
-    TD_DIABLO_1,
-    TD_DIABLO_2,
-    TD_DIABLO_3,
-    TD_DIABLO_4
-};
-
-
-
-
-// on each tap, light up one led, from right to left
-// on the forth tap, turn them off from right to left
-
-void dance_flsh_each(qk_tap_dance_state_t *state, void *user_data) {
-    if (!skip_leds) {
-        ergodox_board_led_off();
-        ergodox_right_led_1_off();
-        ergodox_right_led_2_off();
-        ergodox_right_led_3_off();
-        skip_leds = true;
-    }
-    switch (state->count) {
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        case 3:
-            ergodox_right_led_3_on();
-            break;
-        case 4:
-            ergodox_right_led_1_off();
-            _delay_ms(50);
-            ergodox_right_led_2_off();
-            _delay_ms(50);
-            ergodox_right_led_3_off();
-
-    }
-}
-
-// on the fourth tap, set the keyboard on flash state
-// and set the underglow to red, because red == bad
-void dance_flsh_finished(qk_tap_dance_state_t *state, void *user_data) {
-    if (state->count >= 4) {
-#ifdef RGBLIGHT_ENABLE
-        rgblight_enable();
-        rgblight_mode(1);
-        rgblight_setrgb(0xff,0x00,0x00);
-#endif
-        reset_tap_dance(state);
-        reset_keyboard();
-    }
-}
-
-// Cycle through the times for the macro, starting at 0, for disabled.
-// Max of six values, so don't exceed
-void diablo_tapdance_master (qk_tap_dance_state_t *state, void *user_data, uint8_t diablo_key) {
-    if (state->count >= 7) {
-        diablo_key_time[diablo_key] = diablo_times[0];
-        reset_tap_dance(state);
-    } else {
-        diablo_key_time[diablo_key] = diablo_times[state->count - 1];
-    }
-}
-
-
-// Would rather have one function for all of this, but no idea how to do that...
-void diablo_tapdance1 (qk_tap_dance_state_t *state, void *user_data) {
-    diablo_tapdance_master (state, user_data, 0);
-}
-
-void diablo_tapdance2 (qk_tap_dance_state_t *state, void *user_data) {
-    diablo_tapdance_master (state, user_data, 1);
-}
-
-void diablo_tapdance3 (qk_tap_dance_state_t *state, void *user_data) {
-    diablo_tapdance_master (state, user_data, 2);
-}
-
-void diablo_tapdance4 (qk_tap_dance_state_t *state, void *user_data) {
-    diablo_tapdance_master (state, user_data, 3);
-}
-
-
-// if the flash state didnt happen, then turn off leds, left to right
-void dance_flsh_reset(qk_tap_dance_state_t *state, void *user_data) {
-    _delay_ms(200);
-    ergodox_right_led_3_off();
-    _delay_ms(200);
-    ergodox_right_led_2_off();
-    _delay_ms(200);
-    ergodox_right_led_1_off();
-    _delay_ms(500);
-    skip_leds = false;
-}
-
-//Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
-    //Once for Blue, Twice for Green, Thrice for Red, and four to flash
-    [TD_FLSH] = ACTION_TAP_DANCE_FN_ADVANCED (dance_flsh_each, dance_flsh_finished, dance_flsh_reset),
-    // tap once to disable, and more to enable timed micros
-    [TD_DIABLO_1] = ACTION_TAP_DANCE_FN(diablo_tapdance1),
-    [TD_DIABLO_2] = ACTION_TAP_DANCE_FN(diablo_tapdance2),
-    [TD_DIABLO_3] = ACTION_TAP_DANCE_FN(diablo_tapdance3),
-    [TD_DIABLO_4] = ACTION_TAP_DANCE_FN(diablo_tapdance4),
-
-};
-#endif
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- * 
- * 
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   = +  |  1 ! | 2 @  | 3 #  | 4 $  | 5 %  | TG(4)|           | TG(4)| 6 ^  | 7 &  |  8 * | 9 (  |  0 ) |  - _   |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |   TAB  |   Q  |   W  |   E  |   R  |   T  | TG(3)|           |TG(3) |   Y  |   U  |   I  |   O  |   P  |  \ |   |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |  Bksp  |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  |  ' "   |
- * |--------+------+------+------+------+------| TG(2)|           | TG(2)|------+------+------+------+------+--------|
- * | Shift  |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |  , < |  . > |  ? / | Shift  |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | `/SYM|  ' " | LGUI |  [ { | ] }  |                                       | LEFT | DOWN |  UP  |RIGHT | SYMB |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,--------------.       ,--------------.
- *                                        |Alt/Ap|  Win  |       | Alt  |Ctl/Esc|
- *                                 ,------|------|-------|       |------+-------+------.
- *                                 |      |      | Home  |       | PgUp |       |      |
- *                                 | Space| Bksp |-------|       |------|  DEL  |Enter |
- *                                 |      |      | End   |       | PgDn |       |      |
- *                                 `---------------------'       `---------------------'
- */
-  [QWERTY] = KEYMAP(
-                KC_EQUAL,       KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       TG(MOUS),
-                KC_TAB,         KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,       TG(DIABLO),
-                KC_BSPACE,      KC_A,       KC_S,       KC_D,       KC_F,       KC_G,
-                KC_LSHIFT,      LCTL_T(KC_Z),KC_X,       KC_C,       KC_V,       KC_B,       TG(OVERWATCH),
-                LT(SYMB,KC_GRAVE),KC_QUOTE, KC_LGUI,    KC_LBRACKET,KC_RBRACKET,
-                
-                                    ALT_T(KC_APPLICATION),  KC_LGUI,
-                                                            KC_HOME,
-                                    KC_SPACE,   KC_BSPACE,  KC_END,
-                                    
-                TG(MOUS),       KC_6,       KC_7,       KC_8,       KC_9,       KC_0,           KC_MINUS,
-                TG(DIABLO),     KC_Y,       KC_U,       KC_I,       KC_O,       KC_P,           KC_BSLASH,
-                                KC_H,       KC_J,       KC_K,       KC_L,       KC_SCOLON,      GUI_T(KC_QUOTE),
-                TG(OVERWATCH),  KC_N,       KC_M,       KC_COMMA,   KC_DOT,     RCTL_T(KC_SLASH),KC_RSHIFT,
-                                            KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,       TT(SYMB),
-                KC_LEAD,    CTL_T(KC_ESCAPE),
-                KC_PGUP,
-                KC_PGDOWN,  KC_DELETE,  KC_ENTER
-            ),
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   =    |   1  |   2  |   3  |   4  |   5  | LEFT |           | RIGHT|   6  |   7  |   8  |   9  |   0  |   -    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Del    |   Q  |   W  |   F  |   P  |   G  |  L1  |           |  L1  |   J  |   L  |   U  |   Y  |   ;  |   \    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | BkSp   |   A  |   R  |   S  |   T  |   D  |------|           |------|   H  |   N  |   E  |   I  |O / L2|   '    |
- * |--------+------+------+------+------+------| OVER |           | Meh  |------+------+------+------+------+--------|
- * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   K  |   M  |   ,  |   .  |//Ctrl| RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |Grv/L1|  '"  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | App  | LGui |       | Alt  |Ctrl/Esc|
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Home |       | PgUp |        |      |
- *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
- *                                 |      |ace   | End  |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[COLEMAK] = KEYMAP(  
-        // left hand
-        KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   TG(MOUS),
-        KC_TAB,         KC_Q,         KC_W,   KC_F,   KC_P,   KC_G,   TG(DIABLO),
-        KC_BSPC,        KC_A,         KC_R,   KC_S,   KC_T,   KC_D,
-        KC_LSFT,        LCTL_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   TG(OVERWATCH),
-        LT(SYMB,KC_GRV),KC_QUOT,      KC_LGUI,    KC_LBRACKET,KC_RBRACKET,
-                                              ALT_T(KC_APP),  KC_LEAD,
-                                                              KC_HOME,
-                                               KC_SPC,KC_BSPC,KC_END,
-        // right hand
-             TG(MOUS),    KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
-             TG(DIABLO),  KC_J,   KC_L,   KC_U,   KC_Y,   KC_SCLN,          KC_BSLS,
-                          KC_H,   KC_N,   KC_E,   KC_I,   KC_O,             GUI_T(KC_QUOTE),
-             TG(OVERWATCH),KC_K,  KC_M,   KC_COMM,KC_DOT, RCTL_T(KC_SLASH), KC_RSHIFT,
-                          KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,       TT(SYMB),
-             KC_LALT,        CTL_T(KC_ESC),
-             KC_PGUP,
-             KC_PGDN,KC_DELETE, KC_ENT
-    ),
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   =    |   1  |   2  |   3  |   4  |   5  | LEFT |           | RIGHT|   6  |   7  |   8  |   9  |   0  |   \    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Del    |   '  |   ,  |   .  |   P  |   Y  |  L1  |           |  L1  |   F  |   G  |   C  |   R  |   L  |   /    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | BkSp   |   A  |   O  |   E  |   U  |   I  |------|           |------|   D  |   H  |   T  |   N  |S / L2|   -    |
- * |--------+------+------+------+------+------| Hyper|           | Meh  |------+------+------+------+------+--------|
- * | LShift |:/Ctrl|   Q  |   J  |   K  |   X  |      |           |      |   B  |   M  |   W  |   V  |Z/Ctrl| RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |Grv/L1|  '"  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | App  | LGui |       | Alt  |Ctrl/Esc|
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Home |       | PgUp |        |      |
- *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
- *                                 |      |ace   | End  |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[DVORAK] = KEYMAP(  
-        // left hand
-        KC_EQL,         KC_1,           KC_2,    KC_3,   KC_4,   KC_5,   TG(MOUS),
-        KC_TAB,        KC_QUOT,        KC_COMM, KC_DOT, KC_P,   KC_Y,   TG(DIABLO),
-        KC_BSPC,        KC_A,           KC_O,    KC_E,   KC_U,   KC_I,
-        KC_LSFT,        LCTL_T(KC_SCLN), KC_Q,    KC_J,   KC_K,   KC_X,   TG(OVERWATCH),
-        LT(SYMB,KC_GRV),KC_QUOT, KC_LGUI, KC_LBRACKET, KC_RBRACKET,
-                                              ALT_T(KC_APP),  KC_LEAD,
-                                                              KC_HOME,
-                                               KC_SPC,KC_BSPC,KC_END,
-        // right hand
-             TG(MOUS),     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,        KC_BSLS,
-             TG(DIABLO),   KC_F,   KC_G,   KC_C,   KC_R,   KC_L,        KC_SLSH,
-                           KC_D,   KC_H,   KC_T,   KC_N,   KC_S,        KC_MINS,
-             TG(OVERWATCH),KC_B,   KC_M,   KC_W,   KC_V,   RCTL_T(KC_Z), KC_RSHIFT,
-                                   KC_LEFT,KC_DOWN,KC_UP,  KC_RIGHT,    TT(SYMB),
-             KC_LALT,        CTL_T(KC_ESC),
-             KC_PGUP,
-             KC_PGDN,KC_DELETE, KC_ENT
-    ),
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   =    |   1  |   2  |   3  |   4  |   5  | LEFT |           | RIGHT|   6  |   7  |   8  |   9  |   0  |   -    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Del    |   Q  |   W  |   F  |   P  |   G  |  L1  |           |  L1  |   J  |   L  |   U  |   Y  |   ;  |   \    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | BkSp   |   A  |   R  |   S  |   T  |   D  |------|           |------|   H  |   N  |   E  |   I  |O / L2|   '    |
- * |--------+------+------+------+------+------| OVER |           | Meh  |------+------+------+------+------+--------|
- * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   K  |   M  |   ,  |   .  |//Ctrl| RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |Grv/L1|  '"  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | App  | LGui |       | Alt  |Ctrl/Esc|
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Home |       | PgUp |        |      |
- *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
- *                                 |      |ace   | End  |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[WORKMAN] = KEYMAP(  
-        // left hand
-        KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   TG(MOUS),
-        KC_TAB,         KC_Q,         KC_D,   KC_R,   KC_W,   KC_B,   TG(DIABLO),
-        KC_BSPC,        KC_A,         KC_S,   KC_H,   KC_T,   KC_G,
-        KC_LSFT,        LCTL_T(KC_Z),  KC_X,   KC_M,   KC_C,   KC_V,   TG(OVERWATCH),
-        LT(SYMB,KC_GRV),KC_QUOT,      KC_LGUI,    KC_LBRACKET,KC_RBRACKET,
-                                              ALT_T(KC_APP),  KC_LEAD,
-                                                              KC_HOME,
-                                               KC_SPC,KC_BSPC,KC_END,
-        // right hand
-             TG(MOUS),    KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
-             TG(DIABLO),  KC_J,   KC_F,   KC_U,   KC_P,   KC_SCLN,          KC_BSLS,
-                          KC_Y,   KC_N,   KC_E,   KC_O,   KC_I,             KC_QUOTE,
-             TG(OVERWATCH),KC_K,  KC_L,   KC_COMM,KC_DOT, RCTL_T(KC_SLASH), KC_RSHIFT,
-                          KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,       TT(SYMB),
-             KC_LALT,        CTL_T(KC_ESC),
-             KC_PGUP,
-             KC_PGDN,KC_DELETE, KC_ENT
-    ),
-
-    /* Keymap 3: Symbol Layer
-*
-* ,--------------------------------------------------.           ,--------------------------------------------------.
-* |   ESC  |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  | F10  |   F11  |
-* |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-* | VERSION|   !  |   @  |  {   |   }  |  |   |      |           |      |  +   |   7  |   8  |   9  |  *   |   F12  |
-* |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-* |  MAKE  |   #  |   $  |  (   |   )  |  `   |------|           |------|  -   |   4  |   5  |   6  |  /   | PrtSc  |
-* |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-* |  RESET |   %  |   ^  |  [   |   ]  |  ~   |      |           |      | NUM  |   1  |   2  |   3  |  =   |  PAUSE |
-* `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-*   |  LT0 |   &  |   *  |  :   |   ;  |                                       |      |   0  | NUM. | ENT  |  ENT |
-*   `----------------------------------'                                       `----------------------------------'
-*                                        ,-------------.       ,-------------.
-*                                        | RGBM | RED  |       | OFF  | SOLID|
-*                                 ,------|------|------|       |------+------+------.
-*                                 |      |      | GREEN|       |      |      |      |
-*                                 | RGB  | RGB  |------|       |------| NUM0 | NUME |
-*                                 | DARK |BRITE | BLUE |       |      |      |      |
-*                                 `--------------------'       `--------------------'
-*/
-  [SYMB] = KEYMAP(
-                KC_ESCAPE,      KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_WORKMAN,
-                VRSN,           KC_EXLM,    KC_AT,      KC_LCBR,    KC_RCBR,    KC_PIPE,    KC_DVORAK,
-                KC_MAKEQMK,     KC_HASH,    KC_DLR,     KC_LPRN,    KC_RPRN,    KC_GRAVE,
-                TD(TD_FLSH),    KC_PERC,    KC_CIRC,    KC_LBRACKET,KC_RBRACKET,KC_TILD,    KC_COLEMAK,
-                KC_TRNS,          KC_AMPR,    KC_ASTR,    KC_COLN,    KC_SCOLON,
-                                                                  KC_TRNS, KC_TRNS,
-                                                                  KC_TRNS,
-                                                                  KC_TRNS, KC_TRNS, KC_TRNS,
-                
-                KC_QWERTY,   KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,         KC_F11,
-                KC_DVORAK,   KC_KP_PLUS, KC_KP_7,    KC_KP_8,    KC_KP_9,    KC_KP_ASTERISK, KC_F12,
-                             KC_KP_MINUS,KC_KP_4,    KC_KP_5,    KC_KP_6,    KC_KP_SLASH,    KC_PSCREEN,
-                KC_COLEMAK,  KC_NUMLOCK, KC_KP_1,    KC_KP_2,    KC_KP_3,    KC_EQUAL,       KC_PAUSE,
-                                         KC_KP_0,    KC_KP_0,    KC_KP_DOT,  KC_KP_ENTER,    KC_TRNS,
-                RGB_TOG,    RGB_SLD,
-                KC_NO,
-                KC_KP_DOT, KC_KP_0, KC_KP_ENTER
-            ),
-
-/* Keymap 4: Customized Overwatch Layout
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   ESC  |      |      |      |      |      |      |           |      |  F9  | F10  | F11  |  F12 |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |   F1   |  K   |  Q   |  W   |  E   |  R   |  T   |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |   TAB  |  G   |  A   |  S   |  D   |  F   |------|           |------|      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |  LCTR  | LSHFT|  Z   |  X   |  C   |  V   |      |           |      |   N  |  M   |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |   J  |  U   |  I   |  Y   |  T   |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |  O   |  P   |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      | LGUI |       |      |      |      |
- *                                 |  V   | SPACE|------        |------|      | Enter|
- *                                 |      |      |  H   |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-  [OVERWATCH] = KEYMAP(
-                KC_ESCAPE,      KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
-                KC_F1,          KC_K,       KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,
-                KC_TAB,         KC_G,       KC_A,       KC_S,       KC_D,       KC_F,
-                KC_LCTL,        KC_LSHIFT,  KC_Z,       KC_X,       KC_C,       KC_V,       KC_TRNS,
-                KC_G,           KC_U,       KC_I,       KC_Y,       KC_T,
-                                            KC_O,   KC_P,
-                                                    KC_LGUI,
-                                KC_V,   KC_SPACE,   KC_H,
-                                    
-                KC_TRNS,        KC_F9,      KC_F10,     KC_F11,     KC_F12,     KC_NO,      KC_NO,
-                KC_NO,          KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
-                                KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
-                TG(OVERWATCH),  KC_N,       KC_M,       KC_NO,      KC_NO,      KC_NO,      KC_NO,
-                                            KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
-                KC_NO,          KC_NO,
-                KC_NO,
-                KC_PGDOWN,      KC_DELETE, KC_ENTER
-            ),
-
-/* Keymap 3:
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   ESC  |  V   |  D   | ALT  |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |   TAB  |  S   |  I   |  F   |  M   |  T   |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |    Q   |  1   |  2   |  3   |  4   |  G   |------|           |------|      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | NUMLOCK| NUM1 | NUM2 | NUM3 | NUM4 |  Z   |      |           |      |      |      |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | LCTL | MAC1 | MAC2 | MAC3 | MAC4 |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |   L  |  J   |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |  G   |       |      |      |      |
- *                                 | SPACE|  Q   |------        |------|      |      |
- *                                 | SHIFT| ALT  | 0MAC |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-  [DIABLO] = KEYMAP(
-                KC_ESCAPE,  KC_V,       KC_D,       KC_LALT,    KC_NO,      KC_NO,      KC_NO,
-                KC_TAB,     KC_S,       KC_F,       KC_I,       KC_M,       KC_T,       KC_TRNS,
-                KC_Q,       KC_1,       KC_2,       KC_3,       KC_4,       KC_G,
-                KC_LCTL, TD(TD_DIABLO_1), TD(TD_DIABLO_2), TD(TD_DIABLO_3), TD(TD_DIABLO_4), KC_Z,       KC_NO,
-                KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
-                                                KC_L,   KC_J,
-                                                        KC_F,
-                    SFT_T(KC_SPACE),    ALT_T(KC_Q),    KC_DIABLO_CLEAR,
-                                    
-                                    
-                                    
-                KC_TRNS,        KC_F9,      KC_F10,     KC_F11,     KC_F12,     KC_NO,      KC_NO,
-                KC_TRNS,        KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
-                                KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
-                KC_NO,          KC_N,       KC_M,       KC_NO,      KC_NO,      KC_NO,      KC_NO,
-                                            KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
-                KC_NO,          KC_NO,
-                KC_NO,
-                KC_PGDOWN,      KC_DELETE, KC_ENTER
-            ),
-
-/* Keymap 4: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      | MsUp |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |MsLeft|MsDown|MsRght|      |      |------|           |------|      |      | Acc0 | Acc1 | Acc2 |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        | Acc0 | Acc1 | Acc2 |      |      |      |           |      |      | Mute |VolDn |VolUp |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       | Play | Stop |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      | MWUp |       |      |      |      |
- *                                 | Lclk | Rclk |------|       |------| MBn4 | MBn5 |
- *                                 |      |      | MWDn |       | Mclk |      |      |
- *                                 `--------------------'       `--------------------'
- */
-  [MOUS] = KEYMAP(
-                KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_TRNS,
-                KC_NO,      KC_NO,      KC_MS_U,    KC_NO,      KC_NO,      KC_NO,      KC_TRNS,
-                KC_NO,      KC_MS_L,    KC_MS_D,    KC_MS_R,    KC_NO,      KC_NO,
-                KC_NO,      KC_ACL0,    KC_ACL1,    KC_ACL2,    KC_NO,      KC_NO,      KC_TRNS,
-                KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
-                                                                            KC_NO,      KC_NO,
-                                                                                        KC_WH_U,
-                                                                KC_BTN1,    KC_BTN2,    KC_WH_D,
-                
-                KC_TRNS,    KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
-                KC_TRNS,    KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
-                            KC_NO,      KC_ACL0,    KC_ACL1,    KC_ACL2,    KC_NO,      KC_NO,
-                KC_TRNS,    KC_NO,      KC_MUTE,    KC_VOLD,    KC_VOLU,    KC_NO,      KC_NO,
-                                        KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
-                KC_NO,KC_NO,
-                KC_NO,
-                KC_MS_BTN3,KC_MS_BTN4,KC_MS_BTN5
-            ),
-
-};
-
-
-void persistent_default_layer_set(uint16_t default_layer) {
-    eeconfig_update_default_layer(default_layer);
-    default_layer_set(default_layer);
-}
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-#ifdef CONSOLE_ENABLE
-    xprintf("KL: row: %u, column: %u, pressed: %u\n", record->event.key.col, record->event.key.row, record->event.pressed);
-#endif
-    switch (keycode) {
-        // dynamically generate these.
-        case EPRM:
-            if (record->event.pressed) {
-                eeconfig_init();
-            }
-            return false;
-            break;
-        case VRSN:
-            if (record->event.pressed) {
-                SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-            }
-            return false;
-            break;
-        case RGB_SLD:
-            if (record->event.pressed) {
-#ifdef RGBLIGHT_ENABLE
-                rgblight_mode(1);
-#endif
-            }
-            return false;
-            break;
-
-        case RGB_0000FF:
-            if (record->event.pressed) {
-                #ifdef RGBLIGHT_ENABLE
-                rgblight_enable();
-                rgblight_mode(1);
-                rgblight_setrgb(0x00,0x00,0xff);
-                #endif
-            }
-            return false;
-            break;
-
-        case RGB_008000:
-            if (record->event.pressed) {
-                #ifdef RGBLIGHT_ENABLE
-                rgblight_enable();
-                rgblight_mode(1);
-                rgblight_setrgb(0x00,0x80,0x00);
-                #endif
-            }
-            return false;
-            break;
-
-        case RGB_FF0000:
-            if (record->event.pressed) {
-                #ifdef RGBLIGHT_ENABLE
-                rgblight_enable();
-                rgblight_mode(1);
-                rgblight_setrgb(0xff,0x00,0x00);
-                #endif
-            }
-            return false;
-            break;
-
-        case RGB_800080:
-            if (record->event.pressed) {
-                #ifdef RGBLIGHT_ENABLE
-                rgblight_enable();
-                rgblight_mode(1);
-                rgblight_setrgb(0x80,0x00,0x80);
-                #endif
-            }
-            return false;
-            break;
-
-        case RGB_00FF90:
-            if (record->event.pressed) {
-                #ifdef RGBLIGHT_ENABLE
-                rgblight_enable();
-                rgblight_mode(1);
-                rgblight_setrgb(0x00,0xff,0x90);
-                #endif
-            }
-            return false;
-            break;
-        case KC_DIABLO_CLEAR:  // reset all Diable timers, disabling them
-            if (record->event.pressed) {
-                uint8_t dtime;
-                
-                for (dtime = 0; dtime < 4; dtime++) {
-                    diablo_key_time[dtime] = diablo_times[0];
-                }
-            }
-            return false;
-            break;
-        case KC_QWERTY:
-            if (record->event.pressed) {
-                persistent_default_layer_set(1UL << QWERTY);
-            }
-            return false;
-            break;
-        case KC_COLEMAK:
-            if (record->event.pressed) {
-                persistent_default_layer_set(1UL << COLEMAK);
-            }
-            return false;
-            break;
-        case KC_DVORAK:
-            if (record->event.pressed) {
-                persistent_default_layer_set(1UL << DVORAK);
-            }
-            return false;
-            break;
-        case KC_WORKMAN:
-            if (record->event.pressed) {
-                persistent_default_layer_set(1UL << WORKMAN);
-            }
-            return false;
-            break;
-        case KC_MAKEQMK:
-            if (!record->event.pressed) {
-                SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP ":teensy"SS_TAP(X_ENTER));
-            }
-            return false;
-            break;
-
-    }
-    return true;
-}
-
-#ifdef TAP_DANCE_ENABLE
-
-// Sends the key press to system, but only if on the Diablo layer
-void send_diablo_keystroke (uint8_t diablo_key) {
-    if (biton32(layer_state) == DIABLO) {
-        switch (diablo_key) {
-            case 0:
-                SEND_STRING("1");
-                break;
-            case 1:
-                SEND_STRING("2");
-                break;
-            case 2:
-                SEND_STRING("3");
-                break;
-            case 3:
-                SEND_STRING("4");
-                break;
-        }
-    }
-}
-
-// Checks each of the 4 timers/keys to see if enough time has elapsed
-// Runs the "send string" command if enough time has passed, and resets the timer.
-void run_diablo_macro_check(void) {
-    uint8_t dtime;
-    
-    for (dtime = 0; dtime < 4; dtime++) {
-        if (check_dtimer(dtime) && diablo_key_time[dtime]) {
-            diablo_timer[dtime] = timer_read();
-            send_diablo_keystroke(dtime);
-        } 
-    }
-    
-}
-
-#endif
-
-
-void matrix_init_user(void) { // Runs boot tasks for keyboard
-#ifdef RGBLIGHT_ENABLE
-    uint8_t default_layer = eeconfig_read_default_layer();
-
-    rgblight_enable();
-    if (default_layer & (1UL << COLEMAK)) {
-        rgblight_set_magenta;
-    }
-    else if (default_layer & (1UL << DVORAK)) {
-        rgblight_set_green;
-    }
-    else if (default_layer & (1UL << WORKMAN)) {
-        rgblight_set_purple;
-    }
-    else {
-        rgblight_set_teal;
-    }
-#endif
-};
-
-LEADER_EXTERNS();
-
-void matrix_scan_user(void) {  // runs frequently to update info
-    uint8_t modifiders = get_mods();
-
-    if (!skip_leds) {
-        ergodox_board_led_off();
-        ergodox_right_led_1_off();
-        ergodox_right_led_2_off();
-        ergodox_right_led_3_off();
-        
-        // Since we're not using the LEDs here for layer indication anymore,
-        // then lets use them for modifier indicators.  Shame we don't have 4...
-        // Also, no "else", since we want to know each, independantly. 
-        if ( modifiders & MODS_SHIFT_MASK) {
-            ergodox_right_led_2_on();
-        }
-        if ( modifiders & MODS_CTRL_MASK) {
-            ergodox_right_led_1_on();
-        }
-        if ( modifiders & MODS_ALT_MASK) {
-            ergodox_right_led_3_on();
-        }
-        
-    }
-
-    // Run Diablo 3 macro checking code.
-#ifdef TAP_DANCE_ENABLE
-    run_diablo_macro_check();
-#endif
-    LEADER_DICTIONARY() {
-        leading = false;
-        leader_end();
-        SEQ_ONE_KEY(KC_C) {
-            SEND_STRING("Covecube");
-        }
-        SEQ_ONE_KEY(KC_D) {
-            SEND_STRING("StableBit CloudDrive");
-        }
-        SEQ_ONE_KEY(KC_L) {
-            register_code(KC_LGUI);
-            register_code(KC_L);
-            unregister_code(KC_L);
-            unregister_code(KC_LGUI);
-        }
-        SEQ_TWO_KEYS(KC_S, KC_D) {
-            SEND_STRING("StableBit DrivePool");
-        }
-        SEQ_TWO_KEYS(KC_S, KC_C) {
-            SEND_STRING("StableBit Scanner");
-        }
-        SEQ_TWO_KEYS(KC_S, KC_T) {
-            SEND_STRING("StableBit Troubleshooter");
-        }
-    }
-};
-
-uint32_t layer_state_set_kb(uint32_t state) {
-#ifdef RGBLIGHT_ENABLE
-    uint8_t default_layer = eeconfig_read_default_layer();
-
-    switch (biton32(state)) {
-        case SYMB:
-            rgblight_set_blue;
-            rgblight_mode(2);
-            break;
-        case OVERWATCH:
-            rgblight_set_orange;
-            rgblight_mode(17);
-            break;
-        case DIABLO:
-            rgblight_set_red;
-            rgblight_mode(5);
-            break;
-        case MOUS:
-            rgblight_set_yellow;
-            rgblight_mode(1);
-            break;
-        default:
-            if (default_layer & (1UL << COLEMAK)) {
-                rgblight_set_green;
-            }
-            else if (default_layer & (1UL << DVORAK)) {
-                rgblight_set_magenta;
-            }
-            else if (default_layer & (1UL << WORKMAN)) {
-                rgblight_set_purple;
-            }
-            else {
-                rgblight_set_teal;
-            }
-            rgblight_mode(1);
-            break;
-    }
-#endif
-   return state;
-}

keyboards/ergodox_ez/keymaps/drashna-custom/rules.mk

@@ -1,13 +0,0 @@
-TAP_DANCE_ENABLE  = yes
-SLEEP_LED_ENABLE  = no  # Breathing sleep LED during USB suspend
-COMMAND_ENABLE    = yes  # Commands for debug and configuration
-RGBLIGHT_ENABLE   = yes
-MIDI_ENABLE       = no
-CONSOLE_ENABLE    = no
-LEADER_KEYS       = no
-
-EXTRAFLAGS        = -flto
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif

keyboards/ergodox_ez/keymaps/drashna/config.h

@@ -1,11 +1,17 @@
-
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
 #include "../../config.h"
 
 
+#define TAPPING_TERM 200
 
-// make this easy to toggle behavior, so that it can be more easily toggled
-#define LAYER_UNDERGLOW_LIGHTING  
+#ifdef RGBLIGHT_ENABLE
+#undef RGBLIGHT_SAT_STEP 
+#define RGBLIGHT_SAT_STEP 12
+#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 7
+#define RGBLIGHT_EFFECT_SNAKE_LENGTH 7
+#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
+#endif // RGBLIGHT_ENABLE
 
-#ifdef LAYER_UNDERGLOW_LIGHTING
-#undef RGBLIGHT_ANIMATIONS
-#endif
+
+#endif

keyboards/ergodox_ez/keymaps/drashna/keymap.c

@@ -1,194 +1,574 @@
+/*
+This is the keymap for the keyboard
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+Copyright 2017 Art Ortenburger
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 #include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
-
+#include "drashna.h"
 
 #include "keymap_german.h"
 
 #include "keymap_nordic.h"
 
-#define VERSION M(0)
 
 
-// Define layer names 
-#define BASE 0
-#define SYMB 1
-#define MOUS 2
 
-#ifdef LAYER_UNDERGLOW_LIGHTING
-#define rgblight_set_teal rgblight_setrgb(0x00, 0xFF, 0xFF)
-#define rgblight_set_red rgblight_setrgb(0xFF, 0x00, 0x00)
-#define rgblight_set_blue rgblight_setrgb(0x00, 0xFF, 0x00);
-#define rgblight_set_green rgblight_setrgb(0x00, 0x00, 0xFF);
-#define rgblight_set_yellow rgblight_setrgb(0xFF, 0xFF, 0x00);
+//define layer change stuff for underglow indicator
+bool skip_leds = false;
 
 
-#define MODS_SHIFT_MASK  (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL_MASK  (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTRL))
-#define MODS_ALT_MASK  (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT))
-#endif  
+#ifdef TAP_DANCE_ENABLE
 
+//define diablo macro timer variables
+static uint16_t diablo_timer[4];
+static uint8_t diablo_times[] = { 0, 1, 3, 5, 10, 30 };
+static uint8_t diablo_key_time[4];
 
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  EPRM,
-  VRSN,
-#ifndef LAYER_UNDERGLOW_LIGHTING
-  RGB_SLD,
-#endif  
+bool check_dtimer(uint8_t dtimer) {
+  // has the correct number of seconds elapsed (as defined by diablo_times)
+  return (timer_elapsed(diablo_timer[dtimer]) < (diablo_key_time[dtimer] * 1000)) ? false : true;
 };
 
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [0] = KEYMAP(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,KC_LEFT,KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,TG(1),KC_BSPACE,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSHIFT,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSHIFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_BSPACE,KC_END,KC_RIGHT,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,TG(1),KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLASH,KC_H,KC_J,KC_K,KC_L,LT(2,KC_SCOLON),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),KC_RSHIFT,KC_UP,KC_DOWN,KC_LBRACKET,KC_RBRACKET,MO(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDOWN,KC_TAB,KC_ENTER),
-
-#ifdef LAYER_UNDERGLOW_LIGHTING
-  [1] = KEYMAP(KC_ESCAPE,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_TRANSPARENT,VERSION,KC_EXLM,KC_AT,KC_LCBR,KC_RCBR,KC_PIPE,KC_TRANSPARENT,VRSN,KC_HASH,KC_DLR,KC_LPRN,KC_RPRN,KC_GRAVE,RESET,KC_PERC,KC_CIRC,KC_LBRACKET,KC_RBRACKET,KC_TILD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_VAD,RGB_VAI,KC_TRANSPARENT,KC_TRANSPARENT,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_UP,KC_7,KC_8,KC_9,KC_ASTR,KC_F12,KC_DOWN,KC_4,KC_5,KC_6,KC_PLUS,KC_TRANSPARENT,KC_TRANSPARENT,KC_AMPR,KC_1,KC_2,KC_3,KC_BSLASH,KC_TRANSPARENT,KC_TRANSPARENT,KC_DOT,KC_0,KC_EQUAL,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT),
-#else
-  [1] = KEYMAP(KC_ESCAPE,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_TRANSPARENT,VERSION,KC_EXLM,KC_AT,KC_LCBR,KC_RCBR,KC_PIPE,KC_TRANSPARENT,VRSN,KC_HASH,KC_DLR,KC_LPRN,KC_RPRN,KC_GRAVE,RESET,KC_PERC,KC_CIRC,KC_LBRACKET,KC_RBRACKET,KC_TILD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_MOD,KC_TRANSPARENT,KC_TRANSPARENT,RGB_VAD,RGB_VAI,KC_TRANSPARENT,KC_TRANSPARENT,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_UP,KC_7,KC_8,KC_9,KC_ASTR,KC_F12,KC_DOWN,KC_4,KC_5,KC_6,KC_PLUS,KC_TRANSPARENT,KC_TRANSPARENT,KC_AMPR,KC_1,KC_2,KC_3,KC_BSLASH,KC_TRANSPARENT,KC_TRANSPARENT,KC_DOT,KC_0,KC_EQUAL,KC_TRANSPARENT,RGB_TOG,RGB_SLD,KC_TRANSPARENT,KC_TRANSPARENT,RGB_HUD,RGB_HUI),
-#endif
-
-  [2] = KEYMAP(KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_UP,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_BTN1,KC_MS_BTN2,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PLAY_PAUSE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PREV_TRACK,KC_MEDIA_NEXT_TRACK,KC_TRANSPARENT,KC_TRANSPARENT,KC_AUDIO_VOL_UP,KC_AUDIO_VOL_DOWN,KC_AUDIO_MUTE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_WWW_BACK),
-
+enum {
+  TD_FLSH = 0,
+  TD_DIABLO_1,
+  TD_DIABLO_2,
+  TD_DIABLO_3,
+  TD_DIABLO_4
 };
 
-const uint16_t PROGMEM fn_actions[] = {
-  [1] = ACTION_LAYER_TAP_TOGGLE(1)
-};
-
-// leaving this in place for compatibilty with old keymaps cloned and re-compiled.
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-      switch(id) {
-        case 0:
-        if (record->event.pressed) {
-          SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-        }
-        break;
-      }
-    return MACRO_NONE;
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // dynamically generate these.
-    case EPRM:
-      if (record->event.pressed) {
-        eeconfig_init();
-      }
-      return false;
-      break;
-    case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-#ifndef LAYER_UNDERGLOW_LIGHTING
-    case RGB_SLD:
-      if (record->event.pressed) {
-        rgblight_mode(1);
-      }
-      return false;
-      break;
-#endif
-     
-  }
-  return true;
-}
-
-void matrix_init_user(void) {
-#ifdef LAYER_UNDERGLOW_LIGHTING
-  rgblight_enable();
-  rgblight_set_teal;
-  rgblight_mode(1);
-#endif
-
-}
-
-void matrix_scan_user(void) {
+// on each tap, light up one led, from right to left
+// on the forth tap, turn them off from right to left
 
+void dance_flsh_each(qk_tap_dance_state_t *state, void *user_data) {
+  if (!skip_leds) {
     ergodox_board_led_off();
     ergodox_right_led_1_off();
     ergodox_right_led_2_off();
     ergodox_right_led_3_off();
-    
-#ifdef LAYER_UNDERGLOW_LIGHTING
-    uint8_t modifiders = get_mods();
-    
-    if ( modifiders & MODS_SHIFT_MASK) {
-            ergodox_right_led_1_on();
-    }
-    if ( modifiders & MODS_CTRL_MASK) {
-            ergodox_right_led_2_on();
-    }
-    if ( modifiders & MODS_ALT_MASK) {
-            ergodox_right_led_3_on();
-    }    
-#else
-    uint8_t layer = biton32(layer_state);
-    switch (layer) {
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        case 3:
-            ergodox_right_led_3_on();
-            break;
-        case 4:
-            ergodox_right_led_1_on();
-            ergodox_right_led_2_on();
-            break;
-        case 5:
-            ergodox_right_led_1_on();
-            ergodox_right_led_3_on();
-            break;
-        case 6:
-            ergodox_right_led_2_on();
-            ergodox_right_led_3_on();
-            break;
-        case 7:
-            ergodox_right_led_1_on();
-            ergodox_right_led_2_on();
-            ergodox_right_led_3_on();
-            break;
-        default:
-            break;
-     }
-#endif 
+    skip_leds = true;
+  }
+  switch (state->count) {
+  case 1:
+    ergodox_right_led_1_on();
+    break;
+  case 2:
+    ergodox_right_led_2_on();
+    break;
+  case 3:
+    ergodox_right_led_3_on();
+    break;
+  case 4:
+    ergodox_right_led_1_off();
+    _delay_ms(50);
+    ergodox_right_led_2_off();
+    _delay_ms(50);
+    ergodox_right_led_3_off();
+
+  }
+}
+
+// on the fourth tap, set the keyboard on flash state
+// and set the underglow to red, because red == bad
+void dance_flsh_finished(qk_tap_dance_state_t *state, void *user_data) {
+  if (state->count >= 4) {
+#ifdef RGBLIGHT_ENABLE
+    rgblight_enable();
+    rgblight_mode(1);
+    rgblight_setrgb(0xff, 0x00, 0x00);
+#endif
+    reset_tap_dance(state);
+    reset_keyboard();
+  }
+}
+
+// Cycle through the times for the macro, starting at 0, for disabled.
+// Max of six values, so don't exceed
+void diablo_tapdance_master(qk_tap_dance_state_t *state, void *user_data, uint8_t diablo_key) {
+  if (state->count >= 7) {
+    diablo_key_time[diablo_key] = diablo_times[0];
+    reset_tap_dance(state);
+  }
+  else {
+    diablo_key_time[diablo_key] = diablo_times[state->count - 1];
+  }
+}
+
+
+// Would rather have one function for all of this, but no idea how to do that...
+void diablo_tapdance1(qk_tap_dance_state_t *state, void *user_data) {
+  diablo_tapdance_master(state, user_data, 0);
+}
+
+void diablo_tapdance2(qk_tap_dance_state_t *state, void *user_data) {
+  diablo_tapdance_master(state, user_data, 1);
+}
+
+void diablo_tapdance3(qk_tap_dance_state_t *state, void *user_data) {
+  diablo_tapdance_master(state, user_data, 2);
+}
+
+void diablo_tapdance4(qk_tap_dance_state_t *state, void *user_data) {
+  diablo_tapdance_master(state, user_data, 3);
+}
+
+
+// if the flash state didnt happen, then turn off leds, left to right
+void dance_flsh_reset(qk_tap_dance_state_t *state, void *user_data) {
+  _delay_ms(200);
+  ergodox_right_led_3_off();
+  _delay_ms(200);
+  ergodox_right_led_2_off();
+  _delay_ms(200);
+  ergodox_right_led_1_off();
+  _delay_ms(500);
+  skip_leds = false;
+}
+
+//Tap Dance Definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+  //Once for Blue, Twice for Green, Thrice for Red, and four to flash
+  [TD_FLSH] = ACTION_TAP_DANCE_FN_ADVANCED(dance_flsh_each, dance_flsh_finished, dance_flsh_reset),
+  // tap once to disable, and more to enable timed micros
+  [TD_DIABLO_1] = ACTION_TAP_DANCE_FN(diablo_tapdance1),
+  [TD_DIABLO_2] = ACTION_TAP_DANCE_FN(diablo_tapdance2),
+  [TD_DIABLO_3] = ACTION_TAP_DANCE_FN(diablo_tapdance3),
+  [TD_DIABLO_4] = ACTION_TAP_DANCE_FN(diablo_tapdance4),
+
+};
+#endif
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Keymap 0: Basic layer
+ * 
+ * 
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |   = +  |  1 ! | 2 @  | 3 #  | 4 $  | 5 %  | TG(4)|           | TG(4)| 6 ^  | 7 &  |  8 * | 9 (  |  0 ) |  - _   |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * |   TAB  |   Q  |   W  |   E  |   R  |   T  | TG(3)|           |TG(3) |   Y  |   U  |   I  |   O  |   P  |  \ |   |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |  Bksp  |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  |  ' "   |
+ * |--------+------+------+------+------+------| TG(2)|           | TG(2)|------+------+------+------+------+--------|
+ * | Shift  |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |  , < |  . > |  ? / | Shift  |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   | `/SYM|  ' " | LGUI |  [ { | ] }  |                                       | LEFT | DOWN |  UP  |RIGHT | SYMB |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,--------------.       ,--------------.
+ *                                        |Alt/Ap|  Win  |       | Alt  |Ctl/Esc|
+ *                                 ,------|------|-------|       |------+-------+------.
+ *                                 |      |      | Home  |       | PgUp |       |      |
+ *                                 | Space| Bksp |-------|       |------|  DEL  |Enter |
+ *                                 |      |      | End   |       | PgDn |       |      |
+ *                                 `---------------------'       `---------------------'
+ */
+  [_QWERTY] = LAYOUT_ergodox(
+                KC_EQUAL,       KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       TG(_MOUS),
+                KC_TAB,         KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,       TG(_DIABLO),
+                KC_BSPACE,      KC_A,       KC_S,       KC_D,       KC_F,       KC_G,
+                KC_LSHIFT,      LCTL_T(KC_Z),KC_X,       KC_C,       KC_V,       KC_B,       TG(_OVERWATCH),
+                LT(_SYMB,KC_GRAVE),KC_QUOTE, KC_LGUI,    KC_LBRACKET,KC_RBRACKET,
+                
+                                    ALT_T(KC_APPLICATION),  KC_LGUI,
+                                                            KC_HOME,
+                                    KC_SPACE,   KC_BSPACE,  KC_END,
+                                    
+                TG(_MOUS),       KC_6,       KC_7,       KC_8,       KC_9,       KC_0,           KC_MINUS,
+                TG(_DIABLO),     KC_Y,       KC_U,       KC_I,       KC_O,       KC_P,           KC_BSLASH,
+                                KC_H,       KC_J,       KC_K,       KC_L,       KC_SCOLON,      GUI_T(KC_QUOTE),
+                TG(_OVERWATCH),  KC_N,       KC_M,       KC_COMMA,   KC_DOT,     RCTL_T(KC_SLASH),KC_RSHIFT,
+                                            KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,       TT(_SYMB),
+                KC_RGUI,    CTL_T(KC_ESCAPE),
+                KC_PGUP,
+                KC_PGDOWN,  KC_DELETE,  KC_ENTER
+            ),
+/* Keymap 0: Basic layer
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |   =    |   1  |   2  |   3  |   4  |   5  | LEFT |           | RIGHT|   6  |   7  |   8  |   9  |   0  |   -    |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * | Del    |   Q  |   W  |   F  |   P  |   G  |  L1  |           |  L1  |   J  |   L  |   U  |   Y  |   ;  |   \    |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * | BkSp   |   A  |   R  |   S  |   T  |   D  |------|           |------|   H  |   N  |   E  |   I  |O / L2|   '    |
+ * |--------+------+------+------+------+------| OVER |           | Meh  |------+------+------+------+------+--------|
+ * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   K  |   M  |   ,  |   .  |//Ctrl| RShift |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   |Grv/L1|  '"  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        | App  | LGui |       | Alt  |Ctrl/Esc|
+ *                                 ,------|------|------|       |------+--------+------.
+ *                                 |      |      | Home |       | PgUp |        |      |
+ *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
+ *                                 |      |ace   | End  |       | PgDn |        |      |
+ *                                 `--------------------'       `----------------------'
+ */
+// If it accepts an argument (i.e, is a function), it doesn't need KC_.
+// Otherwise, it needs KC_*
+[_COLEMAK] = LAYOUT_ergodox(  
+        // left hand
+        KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   TG(_MOUS),
+        KC_TAB,         KC_Q,         KC_W,   KC_F,   KC_P,   KC_G,   TG(_DIABLO),
+        KC_BSPC,        KC_A,         KC_R,   KC_S,   KC_T,   KC_D,
+        KC_LSFT,        LCTL_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   TG(_OVERWATCH),
+        LT(_SYMB,KC_GRV),KC_QUOT,      KC_LGUI,    KC_LBRACKET,KC_RBRACKET,
+                                              ALT_T(KC_APP),  KC_LGUI,
+                                                              KC_HOME,
+                                               KC_SPC,KC_BSPC,KC_END,
+        // right hand
+             TG(_MOUS),    KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
+             TG(_DIABLO),  KC_J,   KC_L,   KC_U,   KC_Y,   KC_SCLN,          KC_BSLS,
+                          KC_H,   KC_N,   KC_E,   KC_I,   KC_O,             GUI_T(KC_QUOTE),
+             TG(_OVERWATCH),KC_K,  KC_M,   KC_COMM,KC_DOT, RCTL_T(KC_SLASH), KC_RSHIFT,
+                          KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,       TT(_SYMB),
+             KC_RGUI,        CTL_T(KC_ESC),
+             KC_PGUP,
+             KC_PGDN,KC_DELETE, KC_ENT
+    ),
+/* Keymap 0: Basic layer
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |   =    |   1  |   2  |   3  |   4  |   5  | LEFT |           | RIGHT|   6  |   7  |   8  |   9  |   0  |   \    |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * | Del    |   '  |   ,  |   .  |   P  |   Y  |  L1  |           |  L1  |   F  |   G  |   C  |   R  |   L  |   /    |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * | BkSp   |   A  |   O  |   E  |   U  |   I  |------|           |------|   D  |   H  |   T  |   N  |S / L2|   -    |
+ * |--------+------+------+------+------+------| Hyper|           | Meh  |------+------+------+------+------+--------|
+ * | LShift |:/Ctrl|   Q  |   J  |   K  |   X  |      |           |      |   B  |   M  |   W  |   V  |Z/Ctrl| RShift |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   |Grv/L1|  '"  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        | App  | LGui |       | Alt  |Ctrl/Esc|
+ *                                 ,------|------|------|       |------+--------+------.
+ *                                 |      |      | Home |       | PgUp |        |      |
+ *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
+ *                                 |      |ace   | End  |       | PgDn |        |      |
+ *                                 `--------------------'       `----------------------'
+ */
+// If it accepts an argument (i.e, is a function), it doesn't need KC_.
+// Otherwise, it needs KC_*
+[_DVORAK] = LAYOUT_ergodox(  
+        // left hand
+        KC_EQL,         KC_1,           KC_2,    KC_3,   KC_4,   KC_5,   TG(_MOUS),
+        KC_TAB,        KC_QUOT,        KC_COMM, KC_DOT, KC_P,   KC_Y,   TG(_DIABLO),
+        KC_BSPC,        KC_A,           KC_O,    KC_E,   KC_U,   KC_I,
+        KC_LSFT,        LCTL_T(KC_SCLN), KC_Q,    KC_J,   KC_K,   KC_X,   TG(_OVERWATCH),
+        LT(_SYMB,KC_GRV),KC_QUOT, KC_LGUI, KC_LBRACKET, KC_RBRACKET,
+                                              ALT_T(KC_APP),  KC_LEAD,
+                                                              KC_HOME,
+                                               KC_SPC,KC_BSPC,KC_END,
+        // right hand
+             TG(_MOUS),     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,        KC_BSLS,
+             TG(_DIABLO),   KC_F,   KC_G,   KC_C,   KC_R,   KC_L,        KC_SLSH,
+                           KC_D,   KC_H,   KC_T,   KC_N,   KC_S,        KC_MINS,
+             TG(_OVERWATCH),KC_B,   KC_M,   KC_W,   KC_V,   RCTL_T(KC_Z), KC_RSHIFT,
+                                   KC_LEFT,KC_DOWN,KC_UP,  KC_RIGHT,    TT(_SYMB),
+             KC_LALT,        CTL_T(KC_ESC),
+             KC_PGUP,
+             KC_PGDN,KC_DELETE, KC_ENT
+    ),
+/* Keymap 0: Basic layer
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |   =    |   1  |   2  |   3  |   4  |   5  | LEFT |           | RIGHT|   6  |   7  |   8  |   9  |   0  |   -    |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * | Del    |   Q  |   W  |   F  |   P  |   G  |  L1  |           |  L1  |   J  |   L  |   U  |   Y  |   ;  |   \    |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * | BkSp   |   A  |   R  |   S  |   T  |   D  |------|           |------|   H  |   N  |   E  |   I  |O / L2|   '    |
+ * |--------+------+------+------+------+------| OVER |           | Meh  |------+------+------+------+------+--------|
+ * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   K  |   M  |   ,  |   .  |//Ctrl| RShift |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   |Grv/L1|  '"  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        | App  | LGui |       | Alt  |Ctrl/Esc|
+ *                                 ,------|------|------|       |------+--------+------.
+ *                                 |      |      | Home |       | PgUp |        |      |
+ *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
+ *                                 |      |ace   | End  |       | PgDn |        |      |
+ *                                 `--------------------'       `----------------------'
+ */
+// If it accepts an argument (i.e, is a function), it doesn't need KC_.
+// Otherwise, it needs KC_*
+[_WORKMAN] = LAYOUT_ergodox(  
+        // left hand
+        KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   TG(_MOUS),
+        KC_TAB,         KC_Q,         KC_D,   KC_R,   KC_W,   KC_B,   TG(_DIABLO),
+        KC_BSPC,        KC_A,         KC_S,   KC_H,   KC_T,   KC_G,
+        KC_LSFT,        LCTL_T(KC_Z),  KC_X,   KC_M,   KC_C,   KC_V,   TG(_OVERWATCH),
+        LT(_SYMB,KC_GRV),KC_QUOT,      KC_LGUI,    KC_LBRACKET,KC_RBRACKET,
+                                              ALT_T(KC_APP),  KC_LEAD,
+                                                              KC_HOME,
+                                               KC_SPC,KC_BSPC,KC_END,
+        // right hand
+             TG(_MOUS),    KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
+             TG(_DIABLO),  KC_J,   KC_F,   KC_U,   KC_P,   KC_SCLN,          KC_BSLS,
+                          KC_Y,   KC_N,   KC_E,   KC_O,   KC_I,             KC_QUOTE,
+             TG(_OVERWATCH),KC_K,  KC_L,   KC_COMM,KC_DOT, RCTL_T(KC_SLASH), KC_RSHIFT,
+                          KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,       TT(_SYMB),
+             KC_LALT,        CTL_T(KC_ESC),
+             KC_PGUP,
+             KC_PGDN,KC_DELETE, KC_ENT
+    ),
+
+    /* Keymap 3: Symbol Layer
+*
+* ,--------------------------------------------------.           ,--------------------------------------------------.
+* |   ESC  |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  | F10  |   F11  |
+* |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+* | VERSION|   !  |   @  |  {   |   }  |  |   |      |           |      |  +   |   7  |   8  |   9  |  *   |   F12  |
+* |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+* |  MAKE  |   #  |   $  |  (   |   )  |  `   |------|           |------|  -   |   4  |   5  |   6  |  /   | PrtSc  |
+* |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+* |  RESET |   %  |   ^  |  [   |   ]  |  ~   |      |           |      | NUM  |   1  |   2  |   3  |  =   |  PAUSE |
+* `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+*   |  LT0 |   &  |   *  |  :   |   ;  |                                       |      |   0  | NUM. | ENT  |  ENT |
+*   `----------------------------------'                                       `----------------------------------'
+*                                        ,-------------.       ,-------------.
+*                                        | RGBM | RED  |       | OFF  | SOLID|
+*                                 ,------|------|------|       |------+------+------.
+*                                 |      |      | GREEN|       |      |      |      |
+*                                 | RGB  | RGB  |------|       |------| NUM0 | NUME |
+*                                 | DARK |BRITE | BLUE |       |      |      |      |
+*                                 `--------------------'       `--------------------'
+*/
+  [_SYMB] = LAYOUT_ergodox(
+                KC_ESCAPE,      KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_WORKMAN,
+                VRSN,           KC_EXLM,    KC_AT,      KC_LCBR,    KC_RCBR,    KC_PIPE,    KC_DVORAK,
+                KC_MAKE,        KC_HASH,    KC_DLR,     KC_LPRN,    KC_RPRN,    KC_GRAVE,
+                KC_RESET,       KC_PERC,    KC_CIRC,    KC_LBRACKET,KC_RBRACKET,KC_TILD,    KC_COLEMAK,
+                KC_TRNS,          KC_AMPR,    KC_ASTR,    KC_COLN,    KC_SCOLON,
+                                                                  KC_TRNS, KC_TRNS,
+                                                                  KC_TRNS,
+                                                                  KC_TRNS, KC_TRNS, KC_TRNS,
+                
+                KC_QWERTY,   KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,         KC_F11,
+                KC_DVORAK,   KC_KP_PLUS, KC_KP_7,    KC_KP_8,    KC_KP_9,    KC_KP_ASTERISK, KC_F12,
+                             KC_KP_MINUS,KC_KP_4,    KC_KP_5,    KC_KP_6,    KC_KP_SLASH,    KC_PSCREEN,
+                KC_COLEMAK,  KC_NUMLOCK, KC_KP_1,    KC_KP_2,    KC_KP_3,    KC_EQUAL,       KC_PAUSE,
+                                         KC_KP_0,    KC_KP_0,    KC_KP_DOT,  KC_KP_ENTER,    KC_TRNS,
+                KC_TRNS,    KC_TRNS,
+                KC_TRNS,
+                KC_KP_DOT, KC_KP_0, KC_KP_ENTER
+            ),
+
+/* Keymap 4: Customized Overwatch Layout
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |   ESC  |      |      |      |      |      |      |           |      |  F9  | F10  | F11  |  F12 |      |        |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * |   F1   |  K   |  Q   |  W   |  E   |  R   |  T   |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |   TAB  |  G   |  A   |  S   |  D   |  F   |------|           |------|      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |  LCTR  | LSHFT|  Z   |  X   |  C   |  V   |      |           |      |   N  |  M   |      |      |      |        |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   |   J  |  U   |  I   |  Y   |  T   |                                       |      |      |      |      |      |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |  O   |  P   |       |      |      |
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      | LGUI |       |      |      |      |
+ *                                 |  V   | SPACE|------        |------|      | Enter|
+ *                                 |      |      |  H   |       |      |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+  [_OVERWATCH] = LAYOUT_ergodox(
+                KC_ESCAPE,      KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
+                KC_F1,          KC_K,       KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,
+                KC_TAB,         KC_G,       KC_A,       KC_S,       KC_D,       KC_F,
+                KC_LCTL,        KC_LSHIFT,  KC_Z,       KC_X,       KC_C,       KC_V,       KC_TRNS,
+                KC_G,           KC_U,       KC_I,       KC_Y,       KC_T,
+                                            KC_O,   KC_P,
+                                                    KC_LGUI,
+                                KC_V,   KC_SPACE,   KC_H,
+                                    
+                KC_TRNS,        KC_F9,      KC_F10,     KC_F11,     KC_F12,     KC_NO,      KC_NO,
+                KC_NO,          KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                                KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                TG(_OVERWATCH), KC_N,       KC_M,       KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                                            KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                KC_NO,          KC_NO,
+                KC_NO,
+                KC_PGDOWN,      KC_DELETE, KC_ENTER
+            ),
+
+/* Keymap 3:
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |   ESC  |  V   |  D   | ALT  |      |      |      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * |   TAB  |  S   |  I   |  F   |  M   |  T   |      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |    Q   |  1   |  2   |  3   |  4   |  G   |------|           |------|      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * | NUMLOCK| NUM1 | NUM2 | NUM3 | NUM4 |  Z   |      |           |      |      |      |      |      |      |        |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   | LCTL | MAC1 | MAC2 | MAC3 | MAC4 |                                       |      |      |      |      |      |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |   L  |  J   |       |      |      |
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      |  G   |       |      |      |      |
+ *                                 | SPACE|  Q   |------        |------|      |      |
+ *                                 | SHIFT| ALT  | 0MAC |       |      |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+  [_DIABLO] = LAYOUT_ergodox(
+                KC_ESCAPE,  KC_V,       KC_D,       KC_LALT,    KC_NO,      KC_NO,      KC_NO,
+                KC_TAB,     KC_S,       KC_F,       KC_I,       KC_M,       KC_T,       KC_TRNS,
+                KC_Q,       KC_1,       KC_2,       KC_3,       KC_4,       KC_G,
+                KC_LCTL, TD(TD_DIABLO_1), TD(TD_DIABLO_2), TD(TD_DIABLO_3), TD(TD_DIABLO_4), KC_Z,       KC_NO,
+                KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                                                KC_L,   KC_J,
+                                                        KC_F,
+                    SFT_T(KC_SPACE),    ALT_T(KC_Q),    KC_DIABLO_CLEAR,
+                                    
+                                    
+                                    
+                KC_TRNS,        KC_F9,      KC_F10,     KC_F11,     KC_F12,     KC_NO,      KC_NO,
+                KC_TRNS,        KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                                KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                KC_NO,          KC_N,       KC_M,       KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                                            KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                KC_NO,          KC_NO,
+                KC_NO,
+                KC_PGDOWN,      KC_DELETE, KC_ENTER
+            ),
+
+/* Keymap 4: Media and mouse keys
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * |        |      | MsUp |      |      |      |      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |MsLeft|MsDown|MsRght|      |      |------|           |------|      |      | Acc0 | Acc1 | Acc2 |        |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        | Acc0 | Acc1 | Acc2 |      |      |      |           |      |      | Mute |VolDn |VolUp |      |        |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   |      |      |      |      |      |                                       | Play | Stop |      |      |      |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |      |      |       |      |      |
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      | MWUp |       |      |      |      |
+ *                                 | Lclk | Rclk |------|       |------| MBn4 | MBn5 |
+ *                                 |      |      | MWDn |       | Mclk |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+  [_MOUS] = LAYOUT_ergodox(
+                KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_TRNS,
+                KC_NO,      KC_NO,      KC_MS_U,    KC_NO,      KC_NO,      KC_NO,      KC_TRNS,
+                KC_NO,      KC_MS_L,    KC_MS_D,    KC_MS_R,    KC_NO,      KC_NO,
+                KC_NO,      KC_ACL0,    KC_ACL1,    KC_ACL2,    KC_NO,      KC_NO,      KC_TRNS,
+                KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                                                                            KC_NO,      KC_NO,
+                                                                                        KC_WH_U,
+                                                                KC_BTN1,    KC_BTN2,    KC_WH_D,
+                
+                KC_TRNS,    KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                KC_TRNS,    KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                            KC_NO,      KC_ACL0,    KC_ACL1,    KC_ACL2,    KC_NO,      KC_NO,
+                KC_TRNS,    KC_NO,      KC_MUTE,    KC_VOLD,    KC_VOLU,    KC_NO,      KC_NO,
+                                        KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                KC_NO,KC_NO,
+                KC_NO,
+                KC_MS_BTN3,KC_MS_BTN4,KC_MS_BTN5
+            ),
+
 };
 
-uint32_t layer_state_set_kb(uint32_t state) {
-#ifdef LAYER_UNDERGLOW_LIGHTING
-    switch (biton32(state)) {
+
+
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+  return true;
+}
+
+#ifdef TAP_DANCE_ENABLE
+
+// Sends the key press to system, but only if on the Diablo layer
+void send_diablo_keystroke(uint8_t diablo_key) {
+  if (biton32(layer_state) == _DIABLO) {
+    switch (diablo_key) {
+    case 0:
+      SEND_STRING("1");
+      break;
     case 1:
-      rgblight_set_red;
+      SEND_STRING("2");
       break;
     case 2:
-      rgblight_set_blue;
+      SEND_STRING("3");
       break;
     case 3:
-      rgblight_set_green;
-      break;
-    case 4:
-      rgblight_set_yellow;
-      break;
-    case 5:
-      rgblight_setrgb(0xFF, 0xFF, 0x00);
-      break;
-    case 6:
-      rgblight_setrgb(0xFF, 0xFF, 0x00);
-      break;
-    case 7:
-      rgblight_setrgb(0xFF, 0xFF, 0xFF);
-      break;
-    default:
-      rgblight_set_teal;
+      SEND_STRING("4");
       break;
     }
-#endif
-    return state;
+  }
 }
+
+// Checks each of the 4 timers/keys to see if enough time has elapsed
+// Runs the "send string" command if enough time has passed, and resets the timer.
+void run_diablo_macro_check(void) {
+  uint8_t dtime;
+
+  for (dtime = 0; dtime < 4; dtime++) {
+    if (check_dtimer(dtime) && diablo_key_time[dtime]) {
+      diablo_timer[dtime] = timer_read();
+      send_diablo_keystroke(dtime);
+    }
+  }
+
+}
+
+#endif
+
+
+void matrix_init_keymap(void) { // Runs boot tasks for keyboard
+};
+
+
+void matrix_scan_keymap(void) {  // runs frequently to update info
+  uint8_t modifiders = get_mods();
+
+  if (!skip_leds) {
+    ergodox_board_led_off();
+    ergodox_right_led_1_off();
+    ergodox_right_led_2_off();
+    ergodox_right_led_3_off();
+
+    // Since we're not using the LEDs here for layer indication anymore,
+    // then lets use them for modifier indicators.  Shame we don't have 4...
+    // Also, no "else", since we want to know each, independantly. 
+    if (modifiders & MODS_SHIFT_MASK) {
+      ergodox_right_led_2_on();
+    }
+    if (modifiders & MODS_CTRL_MASK) {
+      ergodox_right_led_1_on();
+    }
+    if (modifiders & MODS_ALT_MASK) {
+      ergodox_right_led_3_on();
+    }
+
+  }
+
+  // Run Diablo 3 macro checking code.
+#ifdef TAP_DANCE_ENABLE
+  run_diablo_macro_check();
+#endif
+};
+

keyboards/ergodox_ez/keymaps/drashna/readme.md

@@ -1,9 +0,0 @@
-# Drashna's ErgoDox EZ Underglow Mod
-
-This is based on the default Ergodox EZ keymap.
-
-This modifieds the keymay so that it uses the underglow to indicate which layer you're on, rather than the top LEDs.
-
-Default colors are "teal" for base layer, "red" for Symbols, and "green" for mouse/media.  Blue would be the next layer, if you had more.
-
-Additionally, the top LEDs are Shift/Control/Alt indicators instead (in that order). 

keyboards/ergodox_ez/keymaps/drashna/rules.mk

@@ -1,5 +1,10 @@
-RGBLIGHT_ENABLE = yes
-RGBLIGHT_ANIMATION = no
+TAP_DANCE_ENABLE  = yes
+SLEEP_LED_ENABLE  = no  # Breathing sleep LED during USB suspend
+COMMAND_ENABLE    = no  # Commands for debug and configuration
+RGBLIGHT_ENABLE   = yes
+CONSOLE_ENABLE    = no
+
+EXTRAFLAGS        = -flto
 
 ifndef QUANTUM_DIR
 	include ../../../../Makefile

keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c

@@ -14,16 +14,32 @@ enum custom_keycodes {
   EPRM,
   VRSN,
   RGB_SLD,
+  // shell nav macros
+  SHELL_LS,
+  SHELL_LSLTR,
+  SHELL_CDPRE,
+  SHELL_LESS,
+  SHELL_PLESS,
+  SHELL_PGREP,
+  SHELL_TAILF,  
   
+  SHELL_PWD,
+  SHELL_H3,
+  SHELL_AMMCOLO,
+  SHELL_SCREENRD,
+  SHELL_SCREEN_NEW,
+  SHELL_SCREEN_LIST,
+  SHELL_MKE,
 };
 
 
-#define BASE      0 // base dvorak layer
-#define KEYNAV    1 // arrow navigation (right hand)
-#define KEYSEL    2 // arrow navigation + shift (allow text selection)
-#define SHELL_NAV 3 // bash shortcuts
-#define MOUSE     4 // mouse layer (can be locked with lock key)
-#define COMBINED  5 // combined numbers and symbols layer
+#define BASE         0 // base dvorak layer
+#define KEYNAV       1 // arrow navigation (right hand)
+#define KEYSEL       2 // arrow navigation + shift (allow text selection)
+#define SHELL_NAV    3 // bash shortcuts
+#define SHELL_SCREEN 4 // linux screen shortcuts
+#define MOUSE        5 // mouse layer (can be locked with lock key)
+#define COMBINED     6 // combined numbers and symbols layer
 
 // macros
 #define MOUSE_TOGGLE 1
@@ -34,18 +50,38 @@ enum custom_keycodes {
 #define SWITCH_NDS 7
 #define SCREEN_COPY_MODE 8
 #define SCREEN_PASTE 9
-#define SHELL_RECALL_LAST_ARG_REMOVE_FIRST_COMMAND 15
+#define SCREEN_RENAME 10
+#define SCREEN_NUMBER 11
+#define SCREEN_0 12
+#define SCREEN_1 13
+#define SCREEN_2 14
+#define SCREEN_3 15
+#define SCREEN_4 16
+#define SCREEN_5 17
+#define SCREEN_6 18
+#define SCREEN_7 19
+#define SCREEN_8 20
+#define SCREEN_9 21
+#define SCREEN_DETACH 22
+#define SHELL_RECALL_LAST_ARG_REMOVE_FIRST_COMMAND 30
 
 
+#define MACRO_SCREEN_NUM(MACRO_NAME,NUM) \
+        case MACRO_NAME:\
+             if (record->event.pressed) {\
+                return MACRO( D(LCTL), T(A), U(LCTL), T(NUM), END);\
+            }\
+        break;\
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [BASE] = KEYMAP(
 	  // left hand
-	  KC_ESC,         KC_F1,         KC_F2,      KC_F3,        KC_F4,   KC_F5,   KC_F6,
-	  KC_TAB,         KC_QUOTE,      KC_COMMA,   KC_DOT,       KC_P,    KC_Y,    MEH(KC_2),
-	  MO(SHELL_NAV),  KC_A,          KC_O,       KC_E,         KC_U,    KC_I,
-	  MEH(KC_0),      KC_SCOLON,     KC_Q,       KC_J,         KC_K,    KC_X,    MEH(KC_3),
-	  MEH(KC_1),      OSM(MOD_LSFT), OSM(MOD_LCTL), M(MOUSE_TOGGLE), MO(KEYSEL),
+	  KC_ESC,            KC_F1,         KC_F2,      KC_F3,        KC_F4,   KC_F5,   KC_F6,
+	  KC_TAB,            KC_QUOTE,      KC_COMMA,   KC_DOT,       KC_P,    KC_Y,    MEH(KC_2),
+	  OSL(SHELL_NAV),    KC_A,          KC_O,       KC_E,         KC_U,    KC_I,
+	  OSL(SHELL_SCREEN), KC_SCOLON,     KC_Q,       KC_J,         KC_K,    KC_X,    MEH(KC_3),
+	  MEH(KC_1),         OSM(MOD_LSFT), OSM(MOD_LCTL), M(MOUSE_TOGGLE), MO(KEYSEL),
 	  
 	  // left thumb cluster
 	            MEH(KC_4),      MEH(KC_5),
@@ -114,23 +150,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // shell navigation layer
   [SHELL_NAV] = KEYMAP(
        // left hand
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+       KC_TRNS,KC_TRNS,           KC_TRNS,        KC_TRNS,          KC_TRNS,     KC_TRNS,    KC_TRNS,
+       KC_TRNS,KC_TRNS,           SHELL_PGREP,    SHELL_PLESS,      SHELL_LESS,  SHELL_MKE,  SHELL_H3,
+       KC_TRNS,LCTL(KC_A),        SHELL_CDPRE,    SHELL_LSLTR,      SHELL_LS,    SHELL_PWD,
+       KC_TRNS,SHELL_SCREEN_LIST, SHELL_SCREENRD, SHELL_SCREEN_NEW, SHELL_TAILF, KC_TRNS,    SHELL_AMMCOLO,
                // bottom row
                KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
                                        // thumb cluster
                                        KC_TRNS,KC_TRNS,
-                                               LALT(KC_D),
-                               KC_TRNS,RCTL(KC_W),KC_TRNS,
+                                               KC_TRNS,
+                               KC_TRNS,KC_TRNS,KC_TRNS,
        // right hand
-       KC_TRNS,    KC_TRNS,        KC_TRNS,             KC_TRNS,         KC_TRNS,         KC_TRNS,        M(SWITCH_NDS),
-       RCTL(KC_L), RCTL(KC_W),     KC_HOME,             KC_UP,           KC_END,          LALT(KC_D),     RCTL(KC_R),
-                   LALT(KC_B),     KC_LEFT,             KC_DOWN,         KC_RIGHT,        LALT(KC_F),     LALT(KC_DOT),
-       RCTL(KC_C), RCTL(KC_U),     M(SCREEN_COPY_MODE), M(SCREEN_PASTE), MEH(KC_V),      RCTL(KC_K),     M(SHELL_RECALL_LAST_ARG_REMOVE_FIRST_COMMAND),
-                // bottom row
-                 M(SCREEN_TAB_LEFT), M(SCREEN_TAB_RIGHT), M(SCREEN_NEW_TAB),  KC_TRNS,    KC_TRNS,
+       KC_TRNS,    KC_TRNS,    KC_TRNS,             KC_TRNS,         KC_TRNS,    KC_TRNS,    M(SWITCH_NDS),
+       RCTL(KC_L), KC_TRNS,    KC_HOME,             KC_UP,           KC_END,     KC_TRNS,    RCTL(KC_R),
+                   LALT(KC_B), KC_LEFT,             KC_DOWN,         KC_RIGHT,   LALT(KC_F), LALT(KC_DOT),
+       RCTL(KC_C), KC_TRNS,    M(SCREEN_COPY_MODE), M(SCREEN_PASTE), MEH(KC_V),  RCTL(KC_K), M(SHELL_RECALL_LAST_ARG_REMOVE_FIRST_COMMAND),
+                   // bottom row (match functionality of base layer)
+                   KC_TRNS,    RCTL(KC_W),          KC_TRNS,         LALT(KC_D), RCTL(KC_U),
        // thumb cluster
        KC_TRNS, KC_TRNS,
        KC_TRNS,
@@ -138,16 +174,42 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   
 
+    // linux screen layer
+  [SHELL_SCREEN] = KEYMAP(
+       // left hand
+       KC_TRNS,KC_TRNS,    KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,   KC_TRNS,
+       KC_TRNS,KC_TRNS,    KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,   KC_TRNS,
+       KC_TRNS,KC_TRNS,    KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,
+       KC_TRNS,KC_TRNS,    KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,   KC_TRNS,
+               // bottom row
+               KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+                                       // thumb cluster
+                                       KC_TRNS,KC_TRNS,
+                                               KC_TRNS,
+                               KC_TRNS,KC_TRNS,KC_TRNS,
+       // right hand
+       KC_TRNS, KC_TRNS,            KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,             KC_TRNS,
+       KC_TRNS, M(SCREEN_NEW_TAB),  M(SCREEN_7), M(SCREEN_8), M(SCREEN_9), M(SCREEN_RENAME),    KC_TRNS,
+                M(SCREEN_TAB_LEFT), M(SCREEN_4), M(SCREEN_5), M(SCREEN_6), M(SCREEN_TAB_RIGHT), KC_TRNS,
+       KC_TRNS, KC_TRNS,            M(SCREEN_1), M(SCREEN_2), M(SCREEN_3), M(SCREEN_NUMBER),    KC_TRNS,
+                                    // bottom row
+                                    M(SCREEN_0), KC_TRNS,     KC_TRNS,     KC_TRNS,             M(SCREEN_DETACH),
+       // thumb cluster
+       KC_TRNS, KC_TRNS,
+       KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
   
   [COMBINED] = KEYMAP(
   
 	// left hand
 	KC_NO,  KC_TRNS, KC_TRNS,    KC_TRNS,     KC_TRNS,     KC_TRNS,KC_TRNS,
-	KC_TRNS,KC_ESC,  KC_LABK,    KC_RABK,     KC_DQUO,     KC_GRAVE,KC_TRNS,
+	KC_TRNS,KC_EXLM, KC_AT,      KC_HASH,     KC_DLR,      KC_PERC,KC_TRNS,
 	KC_TRNS,KC_LPRN, KC_RPRN,    KC_LBRACKET, KC_RBRACKET, KC_UNDS,
-	KC_TRNS,KC_LCBR, KC_RCBR,    KC_BSLS,     KC_PIPE,     KC_TILD,KC_TRNS,
+	KC_TRNS,KC_COLN, KC_DQUO,    KC_LCBR,     KC_RCBR,     KC_TRNS,KC_TRNS,
 	// bottom row
-	KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+	KC_TRNS,KC_PIPE, KC_BSLS,    KC_CIRC,     KC_AMPR,
 	// thumb cluster
 	KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
 	
@@ -157,7 +219,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	         KC_MINS,     KC_4,    KC_5,    KC_6,    KC_SLSH,     MEH(KC_N),
 	KC_TRNS, KC_EQUAL,    KC_1,    KC_2,    KC_3,    KC_QUES,     MEH(KC_O),
 	// bottom row 
-	                      KC_0,  KC_DOT,  KC_TRNS, KC_TRNS,     MEH(KC_P),
+	                      KC_0,    KC_DOT,  KC_TILD, KC_GRAVE,     MEH(KC_P),
 	// thumb cluster
 	KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS),
   
@@ -230,6 +292,41 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
                 return MACRO( D(LCTL), T(A), U(LCTL), T(C), END);
             }                                
         break;
+        case SCREEN_DETACH:
+             if (record->event.pressed) {
+                return MACRO( D(LCTL), T(A), U(LCTL), T(D), END);
+            }                                
+        break;		
+        case SCREEN_RENAME:
+             if (record->event.pressed) {
+                return MACRO( D(LCTL), T(A), U(LCTL), D(LSFT), T(A), U(LSFT), END);
+            }                                
+        break;		
+        case SCREEN_NUMBER:
+             if (record->event.pressed) {
+                return MACRO( D(LCTL), T(A), U(LCTL), D(LSFT), T(SCOLON), U(LSFT),
+				              T(N),
+							  T(U),
+							  T(M),
+							  T(B),
+							  T(E),
+							  T(R),
+							  T(SPC),
+                         	END);
+            }                                
+        break;		
+
+		MACRO_SCREEN_NUM(SCREEN_0,0);
+		MACRO_SCREEN_NUM(SCREEN_1,1);
+		MACRO_SCREEN_NUM(SCREEN_2,2);
+		MACRO_SCREEN_NUM(SCREEN_3,3);
+		MACRO_SCREEN_NUM(SCREEN_4,4);
+		MACRO_SCREEN_NUM(SCREEN_5,5);
+		MACRO_SCREEN_NUM(SCREEN_6,6);
+		MACRO_SCREEN_NUM(SCREEN_7,7);
+		MACRO_SCREEN_NUM(SCREEN_8,8);
+		MACRO_SCREEN_NUM(SCREEN_9,9);
+		
         case SCREEN_COPY_MODE:
             if (record->event.pressed) {
                 return MACRO( D(LCTL), T(A), U(LCTL), T(ESC), END);
@@ -282,8 +379,70 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       }
       return false;
       break;
-    
   }
+  
+  // shell macros
+  if(record->event.pressed) {
+	switch (keycode) {
+		case SHELL_LS:
+			SEND_STRING("ls\n");
+			return true;
+			break;
+		case SHELL_LSLTR:
+			SEND_STRING("ls -ltr\n");
+			return true;
+			break;
+		case SHELL_CDPRE:
+			SEND_STRING("cd ..\n");
+			return true;
+			break;
+		case SHELL_LESS:
+			SEND_STRING("less ");
+			return true;
+			break;
+		case SHELL_PLESS:
+			SEND_STRING(" | less");
+			return true;
+			break;
+		case SHELL_PGREP:
+			SEND_STRING(" | grep ");
+			return true;
+			break;			
+		case SHELL_TAILF:
+			SEND_STRING("tail -f ");
+			return true;
+			break;
+		case SHELL_PWD:
+			SEND_STRING("echo `pwd`/");
+			return true;
+			break;			
+		case SHELL_H3:
+			SEND_STRING("h3\n");
+			return true;
+			break;			
+		case SHELL_AMMCOLO:
+			SEND_STRING("ammcolo\n");
+			return true;
+			break;			
+		case SHELL_SCREENRD:
+			SEND_STRING("screen -r -d ");
+			return true;
+			break;					
+		case SHELL_SCREEN_NEW:
+			SEND_STRING("screen -S ");
+			return true;
+			break;
+		case SHELL_SCREEN_LIST:
+			SEND_STRING("screen -list\n");
+			return true;
+			break;			
+		case SHELL_MKE:
+			SEND_STRING("mke\n");
+			return true;
+			break;			
+	}
+  }
+  
   return true;
 }
 
@@ -306,6 +465,8 @@ void matrix_scan_user(void) {
 		case COMBINED:
 		    ergodox_right_led_2_on();		
 			break;
+	    case SHELL_NAV:			
+		case SHELL_SCREEN:
 	    case KEYNAV:
 		case KEYSEL:
 		    ergodox_right_led_3_on();

keyboards/ergodox_infinity/rules.mk

@@ -86,4 +86,4 @@ LED_DRIVER = is31fl3731c
 LED_WIDTH = 7 
 LED_HEIGHT = 7
 
-LAYOUTS = ergodox ergodox_80
+LAYOUTS = ergodox

keyboards/gh60/info.json

@@ -0,0 +1,17 @@
+{
+    "keyboard_name": "GH60", 
+    "identifier": "FEED:6060:0001", 
+    "layout": {
+        "LAYOUT_60_ansi": {
+            "layout": [{"x":0, "y":0, "label":"~"}, {"x":1, "y":0, "label":"!"}, {"x":2, "y":0, "label":"@"}, {"x":3, "y":0, "label":"#"}, {"x":4, "y":0, "label":"$"}, {"x":5, "y":0, "label":"%"}, {"x":6, "y":0, "label":"^"}, {"x":7, "y":0, "label":"&"}, {"x":8, "y":0, "label":"*"}, {"x":9, "y":0, "label":"("}, {"x":10, "y":0, "label":")"}, {"x":11, "y":0, "label":"_"}, {"x":12, "y":0, "label":"+"}, {"x":14, "y":0, "label":"Backspace", "w":2}, {"x":0.5, "y":1, "label":"Tab", "w":1.5}, {"x":1.5, "y":1, "label":"Q"}, {"x":2.5, "y":1, "label":"W"}, {"x":3.5, "y":1, "label":"E"}, {"x":4.5, "y":1, "label":"R"}, {"x":5.5, "y":1, "label":"T"}, {"x":6.5, "y":1, "label":"Y"}, {"x":7.5, "y":1, "label":"U"}, {"x":8.5, "y":1, "label":"I"}, {"x":9.5, "y":1, "label":"O"}, {"x":10.5, "y":1, "label":"P"}, {"x":11.5, "y":1, "label":"{"}, {"x":12.5, "y":1, "label":"}"}, {"x":14, "y":1, "label":"|", "w":1.5}, {"x":0.75, "y":2, "label":"Caps Lock", "w":1.75}, {"x":1.75, "y":2, "label":"A"}, {"x":2.75, "y":2, "label":"S"}, {"x":3.75, "y":2, "label":"D"}, {"x":4.75, "y":2, "label":"F"}, {"x":5.75, "y":2, "label":"G"}, {"x":6.75, "y":2, "label":"H"}, {"x":7.75, "y":2, "label":"J"}, {"x":8.75, "y":2, "label":"K"}, {"x":9.75, "y":2, "label":"L"}, {"x":10.75, "y":2, "label":":"}, {"x":11.75, "y":2, "label":"\""}, {"x":14, "y":2, "label":"Enter", "w":2.25}, {"x":1.25, "y":3, "label":"Shift", "w":2.25}, {"x":2.25, "y":3, "label":"Z"}, {"x":3.25, "y":3, "label":"X"}, {"x":4.25, "y":3, "label":"C"}, {"x":5.25, "y":3, "label":"V"}, {"x":6.25, "y":3, "label":"B"}, {"x":7.25, "y":3, "label":"N"}, {"x":8.25, "y":3, "label":"M"}, {"x":9.25, "y":3, "label":"<"}, {"x":10.25, "y":3, "label":">"}, {"x":11.25, "y":3, "label":"?"}, {"x":14, "y":3, "label":"Shift", "w":2.75}, {"x":0.25, "y":4, "label":"Ctrl", "w":1.25}, {"x":1.5, "y":4, "label":"Win", "w":1.25}, {"x":2.75, "y":4, "label":"Alt", "w":1.25}, {"x":9, "y":4, "w":6.25}, {"x":10.25, "y":4, "label":"Alt", "w":1.25}, {"x":11.5, "y":4, "label":"Win", "w":1.25}, {"x":12.75, "y":4, "label":"Menu", "w":1.25}, {"x":14, "y":4, "label":"Ctrl", "w":1.25}]
+        }
+    }, 
+    "maintainer": "qmk", 
+    "keyboard_folder": "gh60", 
+    "width": 15, 
+    "bootloader": "atmel-dfu", 
+    "processor": "atmega32u4", 
+    "height": 5, 
+    "url": "http://qmk.fm/keyboards/gh60", 
+    "manufacturer": "geekhack"
+}

keyboards/handwired/woodpad/keymaps/drashna/config.h

@@ -28,13 +28,13 @@
 
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN D3
-#define RGBLED_NUM 7     // Number of LEDs
+#define RGBLED_NUM 14     // Number of LEDs
 #define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_HUE_STEP 12
 #define RGBLIGHT_SAT_STEP 12
 #define RGBLIGHT_VAL_STEP 12
-#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
-#define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
+#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 4
+#define RGBLIGHT_EFFECT_SNAKE_LENGTH 3
 #define RGBLIGHT_EFFECT_BREATHE_CENTER 1
 #endif // RGBLIGHT_ENABLE
 

keyboards/handwired/woodpad/keymaps/drashna/keymap.c

@@ -14,37 +14,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "woodpad.h"
+#include "drashna.h"
 
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _NUMLOCK 0
-#define _NAV 1
-#define _DIABLO 2
-#define _MACROS 3
-#define _MEDIA 4
+ // Each layer gets a name for readability, which is then used in the keymap matrix below.
+ // The underscores don't mean anything - you can have a layer called STUFF or any other name.
+ // Layer names don't all need to be of the same length, obviously, and you can also skip them
+ // entirely and just use numbers.
 
 // Fillers to make layering more clear
 #define _______ KC_TRNS
 #define XXXXXXX KC_NO
 
-#ifdef RGBLIGHT_ENABLE
-#define rgblight_set_blue        rgblight_sethsv (0xFF,  0xFF, 0xFF);
-#define rgblight_set_red         rgblight_sethsv (0x00,  0xFF, 0xFF);
-#define rgblight_set_green       rgblight_sethsv (0x78,  0xFF, 0xFF);
-#define rgblight_set_orange      rgblight_sethsv (0x1E,  0xFF, 0xFF);
-#define rgblight_set_teal        rgblight_sethsv (0xC3,  0xFF, 0xFF);
-#define rgblight_set_magenta     rgblight_sethsv (0x12C, 0xFF, 0xFF);
-#define rgblight_set_yellow      rgblight_sethsv (0x3C,  0xFF, 0xFF);
-#define rgblight_set_purple      rgblight_sethsv (0x10E, 0xFF, 0xFF);
-#endif
 
 //define layer change stuff for underglow indicator
 bool skip_leds = false;
 
-bool is_overwatch = false;
-
 
 #ifdef TAP_DANCE_ENABLE
 //define diablo macro timer variables
@@ -54,76 +38,61 @@ static uint8_t diablo_key_time[4];
 
 
 bool check_dtimer(uint8_t dtimer) {
-    // has the correct number of seconds elapsed (as defined by diablo_times)
-    return (timer_elapsed(diablo_timer[dtimer]) < (diablo_key_time[dtimer] * 1000)) ? false : true;
+  // has the correct number of seconds elapsed (as defined by diablo_times)
+  return (timer_elapsed(diablo_timer[dtimer]) < (diablo_key_time[dtimer] * 1000)) ? false : true;
 };
 #endif
 
 
-enum custom_keycodes {
-    PLACEHOLDER = SAFE_RANGE, // can always be here
-    KC_DIABLO_CLEAR,
-    KC_OVERWATCH,
-    KC_SALT,
-    KC_MORESALT,
-    KC_SALTHARD,
-    KC_GOODGAME,
-    KC_SYMM,
-    KC_DOOMFIST,
-    KC_JUSTGAME,
-    KC_GLHF,
-    KC_TORB,
-    KC_MAKE
-};
 
 #ifdef TAP_DANCE_ENABLE
 enum {
-    TD_DIABLO_1 = 0,
-    TD_DIABLO_2,
-    TD_DIABLO_3,
-    TD_DIABLO_4
+  TD_D3_1 = 0,
+  TD_D3_2,
+  TD_D3_3,
+  TD_D3_4
 };
 
 
 // Cycle through the times for the macro, starting at 0, for disabled.
 // Max of six values, so don't exceed
 void diablo_tapdance_master(qk_tap_dance_state_t *state, void *user_data, uint8_t diablo_key) {
-    if (state->count >= 7) {
-        diablo_key_time[diablo_key] = diablo_times[0];
-        reset_tap_dance(state);
-    }
-    else {
-        diablo_key_time[diablo_key] = diablo_times[state->count - 1];
-    }
+  if (state->count >= 7) {
+    diablo_key_time[diablo_key] = diablo_times[0];
+    reset_tap_dance(state);
+  }
+  else {
+    diablo_key_time[diablo_key] = diablo_times[state->count - 1];
+  }
 }
 
 
 // Would rather have one function for all of this, but no idea how to do that...
 void diablo_tapdance1(qk_tap_dance_state_t *state, void *user_data) {
-    diablo_tapdance_master(state, user_data, 0);
+  diablo_tapdance_master(state, user_data, 0);
 }
 
 void diablo_tapdance2(qk_tap_dance_state_t *state, void *user_data) {
-    diablo_tapdance_master(state, user_data, 1);
+  diablo_tapdance_master(state, user_data, 1);
 }
 
 void diablo_tapdance3(qk_tap_dance_state_t *state, void *user_data) {
-    diablo_tapdance_master(state, user_data, 2);
+  diablo_tapdance_master(state, user_data, 2);
 }
 
 void diablo_tapdance4(qk_tap_dance_state_t *state, void *user_data) {
-    diablo_tapdance_master(state, user_data, 3);
+  diablo_tapdance_master(state, user_data, 3);
 }
 
 
 
 //Tap Dance Definitions
 qk_tap_dance_action_t tap_dance_actions[] = {
-    // tap once to disable, and more to enable timed micros
-    [TD_DIABLO_1] = ACTION_TAP_DANCE_FN(diablo_tapdance1),
-    [TD_DIABLO_2] = ACTION_TAP_DANCE_FN(diablo_tapdance2),
-    [TD_DIABLO_3] = ACTION_TAP_DANCE_FN(diablo_tapdance3),
-    [TD_DIABLO_4] = ACTION_TAP_DANCE_FN(diablo_tapdance4),
+  // tap once to disable, and more to enable timed micros
+  [TD_D3_1] = ACTION_TAP_DANCE_FN(diablo_tapdance1),
+  [TD_D3_2] = ACTION_TAP_DANCE_FN(diablo_tapdance2),
+  [TD_D3_3] = ACTION_TAP_DANCE_FN(diablo_tapdance3),
+  [TD_D3_4] = ACTION_TAP_DANCE_FN(diablo_tapdance4),
 
 };
 #endif
@@ -148,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC, _______, _______, _______,\
     KC_S, KC_F, KC_I, KC_M,   \
     KC_1, KC_2, KC_3, KC_4, \
-    TD(TD_DIABLO_1), TD(TD_DIABLO_2), TD(TD_DIABLO_3), TD(TD_DIABLO_4), \
+    TD(TD_D3_1), TD(TD_D3_2), TD(TD_D3_3), TD(TD_D3_4), \
     _______, KC_DIABLO_CLEAR, KC_Q, SFT_T(KC_SPACE)  \
 ),
 #else
@@ -166,11 +135,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_OVERWATCH, _______, _______, XXXXXXX,\
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   \
     XXXXXXX, XXXXXXX, XXXXXXX, KC_JUSTGAME,   \
-    KC_SYMM,  KC_DOOMFIST, KC_TORB, KC_GOODGAME,   \
+    KC_SYMM, KC_TORB, XXXXXXX, KC_GOODGAME,   \
     KC_SALT,  KC_MORESALT, KC_SALTHARD, KC_GLHF   \
 ),
 [_MEDIA] = KEYMAP( /* Base */
-    RESET, KC_MUTE, KC_VOLD, KC_VOLU,\
+    KC_RESET, KC_MUTE, KC_VOLD, KC_VOLU,\
     KC_MAKE, _______, RGB_HUI, RGB_HUD,   \
     KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT,   \
     RGB_TOG, RGB_MOD, RGB_SAI, RGB_VAI,   \
@@ -181,249 +150,89 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 void numlock_led_on(void) {
-  PORTF |= (1<<7);
+  PORTF |= (1 << 7);
 }
 
 void numlock_led_off(void) {
-  PORTF &= ~(1<<7);
+  PORTF &= ~(1 << 7);
 }
 
 
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    uint16_t kc;
-    if (is_overwatch) {
-        kc = KC_BSPC;
-    } else {
-        kc = KC_ENTER;
-    }
-    switch (keycode) {
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
 #ifdef TAP_DANCE_ENABLE
-    case KC_DIABLO_CLEAR:  // reset all Diable timers, disabling them
-            if (record->event.pressed) {
-                uint8_t dtime;
+  case KC_DIABLO_CLEAR:  // reset all Diable timers, disabling them
+    if (record->event.pressed) {
+      uint8_t dtime;
 
-                for (dtime = 0; dtime < 4; dtime++) {
-                    diablo_key_time[dtime] = diablo_times[0];
-                }
-            }
-            return false;
-            break;
+      for (dtime = 0; dtime < 4; dtime++) {
+        diablo_key_time[dtime] = diablo_times[0];
+      }
+    }
+    return false;
+    break;
 #endif
-        case KC_OVERWATCH:
-            if (record->event.pressed) {
-                is_overwatch = !is_overwatch;
-            }
-#ifdef RGBLIGHT_ENABLE
-            is_overwatch ? rgblight_mode(17) : rgblight_mode(18);
-#endif
-            return false;
-            break;
-        case KC_SALT:
-            if (!record->event.pressed) {
-                register_code(kc);
-                unregister_code(kc);
-                _delay_ms(50);
-                SEND_STRING("Salt, salt, salt...");
-                register_code(KC_ENTER);
-                unregister_code(KC_ENTER);
-            }
-            return false;
-            break;
-        case KC_MORESALT:
-            if (!record->event.pressed) {
-                register_code(kc);
-                unregister_code(kc);
-                _delay_ms(50);
-                SEND_STRING("Please sir, can I have some more salt?!");
-                register_code(KC_ENTER);
-                unregister_code(KC_ENTER);
-            }
-            return false;
-            break;
-        case KC_SALTHARD:
-            if (!record->event.pressed) {
-                register_code(kc);
-                unregister_code(kc);
-                _delay_ms(50);
-                SEND_STRING("Your salt only makes my penis that much harder, and even more aggressive!");
-                register_code(KC_ENTER);
-                unregister_code(KC_ENTER);
-            }
-            return false;
-            break;
-        case KC_GOODGAME:
-            if (!record->event.pressed) {
-                register_code(kc);
-                unregister_code(kc);
-                _delay_ms(50);
-                SEND_STRING("Good game, everyone!");
-                register_code(KC_ENTER);
-                unregister_code(KC_ENTER);
-            }
-            return false;
-            break;
-        case KC_GLHF:
-            if (!record->event.pressed) {
-                register_code(kc);
-                unregister_code(kc);
-                _delay_ms(50);
-                SEND_STRING("Good luck, have fun!!!");
-                register_code(KC_ENTER);
-                unregister_code(KC_ENTER);
-            }
-            return false;
-            break;
-        case KC_SYMM:
-            if (!record->event.pressed) {
-                register_code(kc);
-                unregister_code(kc);
-                _delay_ms(50);
-                SEND_STRING("Left click to win!");
-                register_code(KC_ENTER);
-                unregister_code(KC_ENTER);
-            }
-            return false;
-            break;
-        case KC_DOOMFIST:
-            if (!record->event.pressed) {
-                register_code(kc);
-                unregister_code(kc);
-                _delay_ms(50);
-                SEND_STRING("Hey, look at me.  I'm Doomfist, and I'm overpowered!  All I do is spam punches all day!   I'm DPS, tank and defense, rolled into one! All I need is team healing to be complete!");
-                register_code(KC_ENTER);
-                unregister_code(KC_ENTER);
-            }
-            return false;
-            break;
-        case KC_JUSTGAME:
-
-            if (!record->event.pressed) {
-                register_code(kc);
-                unregister_code(kc);
-                _delay_ms(50);
-                SEND_STRING("It may be a game, but if you don't want to actually try, please go play AI, so that people that actually want to take the game seriously and \"get good\" have a place to do so without trolls like you throwing games.");
-                register_code(KC_ENTER);
-                unregister_code(KC_ENTER);
-            }
-            return false;
-            break;
-        case KC_TORB:
-
-            if (!record->event.pressed) {
-                register_code(kc);
-                unregister_code(kc);
-                _delay_ms(50);
-                SEND_STRING("That was positively riveting!");
-                register_code(KC_ENTER);
-                unregister_code(KC_ENTER);
-            }
-            return false;
-            break;
-        case KC_MAKE:
-            if (!record->event.pressed) {
-                SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP SS_TAP(X_ENTER));
-            }
-            return false;
-            break;
-
-
   }
   return true;
 }
+
 #ifdef TAP_DANCE_ENABLE
 
 // Sends the key press to system, but only if on the Diablo layer
 void send_diablo_keystroke(uint8_t diablo_key) {
-    if (biton32(layer_state) == _DIABLO) {
-        switch (diablo_key) {
-        case 0:
-            SEND_STRING("1");
-            break;
-        case 1:
-            SEND_STRING("2");
-            break;
-        case 2:
-            SEND_STRING("3");
-            break;
-        case 3:
-            SEND_STRING("4");
-            break;
-        }
+  if (biton32(layer_state) == _DIABLO) {
+    switch (diablo_key) {
+    case 0:
+      SEND_STRING("1");
+      break;
+    case 1:
+      SEND_STRING("2");
+      break;
+    case 2:
+      SEND_STRING("3");
+      break;
+    case 3:
+      SEND_STRING("4");
+      break;
     }
+  }
 }
 
 // Checks each of the 4 timers/keys to see if enough time has elapsed
 // Runs the "send string" command if enough time has passed, and resets the timer.
 void run_diablo_macro_check(void) {
-    uint8_t dtime;
+  uint8_t dtime;
 
-    for (dtime = 0; dtime < 4; dtime++) {
-        if (check_dtimer(dtime) && diablo_key_time[dtime]) {
-            diablo_timer[dtime] = timer_read();
-            send_diablo_keystroke(dtime);
-        }
+  for (dtime = 0; dtime < 4; dtime++) {
+    if (check_dtimer(dtime) && diablo_key_time[dtime]) {
+      diablo_timer[dtime] = timer_read();
+      send_diablo_keystroke(dtime);
     }
+  }
 
 }
 #endif
-void matrix_init_user(void) {
-    // set Numlock LED to output and low
-    DDRF |= (1<<7);
-    PORTF &= ~(1<<7);
+void matrix_init_keymap(void) {
+  // set Numlock LED to output and low
+  DDRF |= (1 << 7);
+  PORTF &= ~(1 << 7);
 
-#ifdef RGBLIGHT_ENABLE
-    rgblight_enable();
-    rgblight_set_teal;
-    rgblight_mode(1);
-#endif
 
-    if (!(host_keyboard_leds() & (1 << USB_LED_NUM_LOCK)) ){
-        register_code(KC_NUMLOCK);
-        unregister_code(KC_NUMLOCK);
-    }
+  if (!(host_keyboard_leds() & (1 << USB_LED_NUM_LOCK))) {
+    register_code(KC_NUMLOCK);
+    unregister_code(KC_NUMLOCK);
+  }
 }
 
-void matrix_scan_user(void) {
-    numlock_led_off();
-    if (is_overwatch && biton32(layer_state) == _MACROS) {
-        numlock_led_on();
-    }
+void matrix_scan_keymap(void) {
+  numlock_led_off();
+  if ((is_overwatch && biton32(layer_state) == _MACROS) || (biton32(layer_state) == _NAV)) {
+    numlock_led_on();
+  }
 
-    // Run Diablo 3 macro checking code.
+  // Run Diablo 3 macro checking code.
 #ifdef TAP_DANCE_ENABLE
-    run_diablo_macro_check();
+  run_diablo_macro_check();
 #endif
 }
 
-uint32_t layer_state_set_kb(uint32_t state) {
-#ifdef RGBLIGHT_ENABLE
-// Check layer, and apply color if its changed since last check
-    switch (biton32(state)) {
-    case _NAV:
-        rgblight_set_blue;
-        rgblight_mode(1);
-        break;
-    case _MACROS:
-        rgblight_set_orange;
-        is_overwatch ? rgblight_mode(17) : rgblight_mode(18);
-        break;
-    case _DIABLO:
-        rgblight_set_red;
-        rgblight_mode(5);
-        break;
-    case _MEDIA:
-        rgblight_set_green;
-        rgblight_mode(22);
-        break;
-    default:
-        rgblight_set_teal;
-        rgblight_mode(1);
-        break;
-    }
-
-#endif
-    return state;
-}
-void led_set_user(uint8_t usb_led) {
-    
-}

keyboards/handwired/woodpad/keymaps/drashna/rules.mk

@@ -4,6 +4,7 @@ COMMAND_ENABLE    = yes  # Commands for debug and configuration
 RGBLIGHT_ENABLE   = yes
 MIDI_ENABLE       = no
 CONSOLE_ENABLE    = no
+NKRO_ENABLE       = yes
 
 EXTRAFLAGS        = -flto
 

keyboards/jj40/config.h

@@ -29,8 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 15
 
-#define RGBLED_NUM 16
-#define RGBLIGHT_ANIMATIONS
+#define TAPPING_TOGGLE 3
 
 #define NO_UART 1
 #define BOOTLOADHID_BOOTLOADER 1

keyboards/jj40/keymaps/default/keymap.c

@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "jj40.h"
 #include "action_layer.h"
-#include "rgblight.h"
 
 #define _QWERTY 0
 #define _LOWER  1

keyboards/jj40/keymaps/oscillope/keymap.c

@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "jj40.h"
 #include "action_layer.h"
-#include "rgblight.h"
 
 #define _QWERTY 0
 #define _LOWER  1
@@ -45,24 +44,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
   KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT, \
   KC_GRV,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT, \
-  KC_LCTL, KC_LGUI, KC_LALT, MO(_LOWER), KC_LSFT, MO(_RAISE),   KC_SPC,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
+  KC_LCTL, KC_LGUI, KC_LALT, TT(_LOWER), KC_LSFT, TT(_RAISE),   KC_SPC,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
 ),
 
 /* Lower
  * ,-----------------------------------------------------------------------------------.
  * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      | Left | Down |  Up  |Right |      |      |
+ * | Ins  |      |      |      |      |      | Left | Down |  Up  |Right |      |      |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      | Back | Fwd  |      |      |      |      |      | Mute | Vol- | Vol+ |      |
+ * |PrScr | Back | Fwd  |      |      |      |      |      | Mute | Vol- | Vol+ |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      | Lock |      |             | Prev | Stop | Play | Next |
  * `-----------------------------------------------------------------------------------'
  */
 [_LOWER] = KEYMAP( \
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
-  KC_DEL,  _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, \
-  _______, KC_WBAK, KC_WFWD, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, \
+  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, \
+  KC_INS,  _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, \
+  KC_PSCR, KC_WBAK, KC_WFWD, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, \
   _______, _______, _______, _______, KC_LOCK, _______, _______, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT \
 ),
 
@@ -70,17 +69,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------------------------------------------------.
  * | Caps |   &  |   *  |   _  |   (  |   )  |   7  |   8  |   9  |   =  | Bksp | Del  |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ins  |   $  |   %  |   ^  |   [  |   ]  |   4  |   5  |   6  |   -  |   +  |  |   |
+ * | Tab  |   $  |   %  |   ^  |   [  |   ]  |   4  |   5  |   6  |   -  |   +  |Enter |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   `  |   !  |   @  |   #  |   {  |   }  |   1  |   2  |   3  |   .  |   \  |  '   |
+ * |   `  |   !  |   @  |   #  |   {  |   }  |   1  |   2  |   3  |   .  |   \  |  |   |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * | Ctrl |  OS  | Alt  |      |Shift |      |      0      | Home | PgDn | PgUp | End  |
  * `-----------------------------------------------------------------------------------'
  */
 [_RAISE] = KEYMAP( \
   KC_CAPS, KC_AMPR, KC_ASTR, KC_UNDS, KC_LPRN, KC_RPRN, KC_7,    KC_8,    KC_9,    KC_EQL,  KC_BSPC, KC_DEL, \
-  KC_INS,  KC_DLR,  KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_4,    KC_5,    KC_6,    KC_MINS, KC_PLUS, KC_PIPE, \
-  _______, KC_EXLM, KC_AT,   KC_HASH, KC_LCBR, KC_RCBR, KC_1,    KC_2,    KC_3,    _______, KC_BSLS, _______, \
+  KC_TAB,  KC_DLR,  KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_4,    KC_5,    KC_6,    KC_MINS, KC_PLUS, _______, \
+  _______, KC_EXLM, KC_AT,   KC_HASH, KC_LCBR, KC_RCBR, KC_1,    KC_2,    KC_3,    _______, KC_BSLS, KC_PIPE, \
   _______, _______, _______, _______, _______, _______, KC_0,    KC_HOME, KC_PGDN, KC_PGUP, KC_END \
 )
 };

keyboards/knops/mini/config.h

@@ -0,0 +1,190 @@
+/*
+Copyright 2017 Pawnerd
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEFD
+#define PRODUCT_ID      0x9460
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Alltrons IT
+#define PRODUCT         Knops Mini
+#define DESCRIPTION     Advanced 3x2 macrokeyboard
+
+/* key matrix size */
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 6
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { D0 }
+#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
+#define DIODE_DIRECTION COL2ROW
+ 
+// #define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+// #define BACKLIGHT_LEVELS 3
+
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCING_DELAY 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* number of backlight levels */
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Magic Key Options
+ *
+ * Magic keys are hotkey commands that allow control over firmware functions of
+ * the keyboard. They are best used in combination with the HID Listen program,
+ * found here: https://www.pjrc.com/teensy/hid_listen.html
+ *
+ * The options below allow the magic key functionality to be changed. This is
+ * useful if your keyboard/keypad is missing keys and you want magic key support.
+ *
+ */
+
+/* key combination for magic key command */
+#define IS_COMMAND() ( \
+    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
+)
+
+/* control how magic key switches layers */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
+
+/* override magic key keymap */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
+//#define MAGIC_KEY_HELP1          H
+//#define MAGIC_KEY_HELP2          SLASH
+//#define MAGIC_KEY_DEBUG          D
+//#define MAGIC_KEY_DEBUG_MATRIX   X
+//#define MAGIC_KEY_DEBUG_KBD      K
+//#define MAGIC_KEY_DEBUG_MOUSE    M
+//#define MAGIC_KEY_VERSION        V
+//#define MAGIC_KEY_STATUS         S
+//#define MAGIC_KEY_CONSOLE        C
+//#define MAGIC_KEY_LAYER0_ALT1    ESC
+//#define MAGIC_KEY_LAYER0_ALT2    GRAVE
+//#define MAGIC_KEY_LAYER0         0
+//#define MAGIC_KEY_LAYER1         1
+//#define MAGIC_KEY_LAYER2         2
+//#define MAGIC_KEY_LAYER3         3
+//#define MAGIC_KEY_LAYER4         4
+//#define MAGIC_KEY_LAYER5         5
+//#define MAGIC_KEY_LAYER6         6
+//#define MAGIC_KEY_LAYER7         7
+//#define MAGIC_KEY_LAYER8         8
+//#define MAGIC_KEY_LAYER9         9
+//#define MAGIC_KEY_BOOTLOADER     PAUSE
+//#define MAGIC_KEY_LOCK           CAPS
+//#define MAGIC_KEY_EEPROM         E
+//#define MAGIC_KEY_NKRO           N
+//#define MAGIC_KEY_SLEEP_LED      Z
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+//#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 1
+
+#endif

keyboards/knops/mini/keymaps/default/config.h

@@ -0,0 +1,24 @@
+/* Copyright 2017 Pawnerd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include "../../config.h"
+
+// place overrides here
+
+#endif

keyboards/knops/mini/keymaps/default/keymap.c

@@ -0,0 +1,361 @@
+#include "mini.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	KEYMAP(
+		LT(3, KC_MSTP), KC_VOLU, KC_MPLY, KC_MPRV, KC_VOLD, KC_MNXT),
+
+	KEYMAP(
+		LT(3, KC_ESC), M(3), M(4), M(5), M(6), M(7)),
+
+	KEYMAP(
+		LT(3, KC_1), KC_2, KC_3, KC_4, M(0), M(1)),
+
+	KEYMAP(
+		KC_TRNS, KC_TRNS, RESET, TO(0), TO(1), TO(2)),
+
+	KEYMAP(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	KEYMAP(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	KEYMAP(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	KEYMAP(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	KEYMAP(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	KEYMAP(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	KEYMAP(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	KEYMAP(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	KEYMAP(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	KEYMAP(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	KEYMAP(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	KEYMAP(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
+	//keyevent_t event = record->event;
+
+	switch (id) {
+		case 0:
+			if (record->event.pressed) {
+				return MACRO( T(T), T(G), T(L), T(H), T(F), T(ENT), END );
+			}
+			break;
+		case 1:
+			if (record->event.pressed) {
+				return MACRO( T(T), T(G), T(G), T(ENT), END );
+			}
+			break;
+		case 2:
+			if (record->event.pressed) {
+				return MACRO( D(NO), T(L), U(NO), END );
+			}
+			break;
+		case 3:
+			if (record->event.pressed) {
+				return MACRO( D(LCTL), T(Z), U(LCTL), END );
+			}
+			break;
+		case 4:
+			if (record->event.pressed) {
+				return MACRO( D(LCTL), D(LSFT), T(Z), U(LSFT), U(LCTL), END );
+			}
+			break;
+		case 5:
+			if (record->event.pressed) {
+				return MACRO( D(LCTL), T(X), U(LCTL), END );
+			}
+			break;
+		case 6:
+			if (record->event.pressed) {
+				return MACRO( D(LCTL), T(C), U(LCTL), END );
+			}
+			break;
+		case 7:
+			if (record->event.pressed) {
+				return MACRO( D(LCTL), T(V), U(LCTL), END );
+			}
+			break;
+	}
+	return MACRO_NONE;
+}
+
+void set_switch_led(int ledId, bool state) {
+	if(state) {
+		switch(ledId) {
+			case 1:
+				PORTD |= (1<<7);
+				break;
+			case 2:
+				PORTC |= (1<<6);
+				break;
+			case 3:
+				PORTD |= (1<<4);
+				break;
+			case 4:
+				PORTE |= (1<<6);
+				break;
+			case 5:
+				PORTB |= (1<<4);
+				break;
+			case 6:
+				PORTD |= (1<<6);
+				break;
+		}
+	} else {
+		switch(ledId) {
+			case 1:
+				PORTD &= ~(1<<7);
+				break;
+			case 2:
+				PORTC &= ~(1<<6);
+				break;
+			case 3:
+				PORTD &= ~(1<<4);
+				break;
+			case 4:
+				PORTE &= ~(1<<6);
+				break;
+			case 5:
+				PORTB &= ~(1<<4);
+				break;
+			case 6:
+				PORTD &= ~(1<<6);
+				break;
+		}
+	}
+}
+
+
+void set_layer_led(int layerId) {
+	PORTD |= (1<<5);
+	PORTB &= ~(1<<6);
+	PORTB |= (1<<0);
+	switch(layerId) {
+		case 0:
+			PORTD &= ~(1<<5);
+			break;
+		case 1:
+			PORTB |= (1<<6);
+			break;
+		case 2:
+			PORTB &= ~(1<<0);
+			break;
+	}
+}
+
+void matrix_init_user(void) {
+	led_init_ports();
+	
+	
+	PORTD |= (1<<7);
+	PORTC |= (1<<6);
+	PORTD |= (1<<4);
+	PORTE |= (1<<6);
+	PORTB |= (1<<4);
+	PORTD |= (1<<6);
+	
+	set_layer_led(0);
+}
+
+void matrix_scan_user(void) {
+}
+
+void led_init_ports() {
+  // led voor switch #1
+	DDRD |= (1<<7);
+	PORTD &= ~(1<<7);
+	
+  // led voor switch #2
+	DDRC |= (1<<6);
+	PORTC &= ~(1<<6);
+	
+  // led voor switch #3
+	DDRD |= (1<<4);
+	PORTD &= ~(1<<4);
+	
+  // led voor switch #4
+	DDRE |= (1<<6);
+	PORTE &= ~(1<<6);
+	
+  // led voor switch #5
+	DDRB |= (1<<4);
+	PORTB &= ~(1<<4);
+	
+  // led voor switch #6
+	DDRD |= (1<<6);
+	PORTD &= ~(1<<6);
+	
+	/*
+	DDRD |= (1<<7);
+	PORTD |= (1<<7);
+	
+	DDRC |= (1<<6);
+	PORTC |= (1<<6);
+	
+	DDRD |= (1<<4);
+	PORTD |= (1<<4);
+	
+	DDRE |= (1<<6);
+	PORTE |= (1<<6);
+	
+	DDRB |= (1<<4);
+	PORTB |= (1<<4);
+	
+	DDRD |= (1<<6);
+	PORTD |= (1<<6);
+	// */	
+
+	DDRD |= (1<<5);
+	DDRB |= (1<<6);
+	DDRB |= (1<<0);
+	//led_set_layer(0);
+}
+
+void led_set_user(uint8_t usb_led) {
+
+	if (usb_led & (1 << USB_LED_NUM_LOCK)) {
+		
+	} else {
+		
+	}
+
+	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+		
+	} else {
+		
+	}
+
+	if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
+		
+	} else {
+		
+	}
+
+	if (usb_led & (1 << USB_LED_COMPOSE)) {
+		
+	} else {
+		
+	}
+
+	if (usb_led & (1 << USB_LED_KANA)) {
+		
+	} else {
+		
+	}
+
+}
+
+
+/*  
+*   NOTE:
+*
+*   In case you don't understand this coding stuff, please
+*   feel free to mail me or post something
+*   at the /r/knops subreddit and I will configure the code as
+*   you wish for your needs to make the LEDs do what you want :-).
+*
+*   Contact me at:    support@knops.io
+*
+*
+*	Knops Mini LED Numbers:
+*	 _____	 _____	 _____
+*	| 	  | | 	  | | 	  |
+*	|  1  | |  2  | |  3  |    <---
+*	|_____| |_____| |_____|       |      These LEDs are called 'Switch LEDs'
+*	 _____	 _____	 _____        |----- To turn on/off these leds, use:
+*	| 	  | | 	  | | 	  |       |	  set_switch_led( [1-6], [true/false]);
+*	|  4  | |  5  | |  6  |    <---
+*	|_____| |_____| |_____|
+*	
+*	 < 0 >   < 1 >   < 2 >     <---      These front-LEDs are called 'Layer LEDs'
+*							             To turn one of them on, use:
+*										 set_layer_led( [0-2] );
+*										 
+*/
+
+/*
+* This function led_set_layer gets called when you switch between layers.
+* It allows you to turn on and off leds for each different layer and do
+* other cool stuff. Currently the GUI does not have LED support. I am working
+* on that, but takes time.
+*/
+void led_set_layer(int layer) {
+	switch(layer) {
+			
+			/**
+			*   Here is an example to turn LEDs on and of. By default:
+			*   - the LEDs are turned on in layer 0
+			*   - the LEDs are turned off in layer 1
+			*   - the LEDs don't change from state for layer 2
+			*/			
+			
+		case 0:
+			set_layer_led(0); // Turn on only the first/left layer indicator
+			set_switch_led(1, true);
+			set_switch_led(2, true);
+			set_switch_led(3, true);
+			set_switch_led(4, true);
+			set_switch_led(5, true);
+			set_switch_led(6, true);
+			break;
+			
+		case 1:
+			set_layer_led(1); // Turn on only the second/middle layer indicator
+			set_switch_led(1, false);
+			set_switch_led(2, false);
+			set_switch_led(3, false);
+			set_switch_led(4, false);
+			set_switch_led(5, false);
+			set_switch_led(6, false);
+			break;
+			
+		case 2:
+			set_layer_led(2); // Turn on only the third/right layer indicator
+			
+			// Keep leds for layer two in their current state, since we don't use set_switch_led(SWITCH_ID, TRUE_OR_FALSE)
+			
+			break;
+	}
+}
+
+bool process_record_user (uint16_t keycode, keyrecord_t *record) {
+  switch(keycode) {
+  case TO(0):
+      if (record->event.pressed) {
+        led_set_layer(0);
+     }
+     break;
+  case TO(1):
+      if (record->event.pressed) {
+        led_set_layer(1);
+     }
+     break;
+  case TO(2):
+      if (record->event.pressed) {
+        led_set_layer(2);
+     }
+     break;
+  }
+  return true;
+}

keyboards/knops/mini/keymaps/default/readme.md

@@ -0,0 +1,7 @@
+# Default Knops Mini Layout
+
+![Knops logo](http://knops.io/img/Knops_logo.jpg)
+
+![Knops Mini Layout Image](https://i.imgur.com/WQBQctm.png)
+
+This is the default layout that comes flashed on every Knops Mini. For your use, you probably want to change this. We suggest you to use [our configurator tool](http://knops.io/configurator.html) for this.

keyboards/knops/mini/mini.c

@@ -0,0 +1,44 @@
+/* Copyright 2017 Kayle Knops
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "mini.h"
+/*
+void matrix_init_kb(void) {
+	// put your keyboard start-up code here
+	// runs once when the firmware starts up
+
+	matrix_init_user();
+}
+
+void matrix_scan_kb(void) {
+	// put your looping keyboard code here
+	// runs every cycle (a lot)
+
+	matrix_scan_user();
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+	// put your per-action keyboard code here
+	// runs for every action, just before processing by the firmware
+
+	return process_record_user(keycode, record);
+}
+
+void led_set_kb(uint8_t usb_led) {
+	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
+
+	led_set_user(usb_led);
+}
+*/

keyboards/knops/mini/mini.h

@@ -0,0 +1,30 @@
+/* Copyright 2017 Pawnerd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "quantum.h"
+
+#ifndef KNOPS_MINI_H
+#define KNOPS_MINI_H
+
+// This a shortcut to help you visually see your layout.
+// The following is an example using the Planck MIT layout
+// The first section contains all of the arguments
+// The second converts the arguments into a two-dimensional array
+#define KEYMAP( \
+	K00, K01, K02, K03, K04, K05  \
+) { \
+	{ K00,   K01,   K02,   K03,   K04,   K05 },  \
+}
+#endif

keyboards/knops/mini/readme.md

@@ -0,0 +1,21 @@
+# Knops Mini
+
+![Knops logo](http://knops.io/img/Knops_logo.jpg)
+
+![Knops mini keyboard](https://i.imgur.com/AMrXVi4.jpg)
+
+A fully customizable 3x2 macropad. An exploded view of the keyboard is [available here](https://i.imgur.com/H83l5H8.gif).
+
+*The best way to change settings on your keyboard*, is by using [our official configurator tool](http://knops.io/configurator.html).
+
+* Keyboard Maintainer: [Pawnerd](https://github.com/pawnerd)
+* Contact / Questions (by e-mail): kayle `at` knops `dot` io
+* Hardware Supported: Knops Mini
+  * rev1 (1.0) (Sold by CMStore EU/USA/CAD from 27th of august, 2017)
+* Hardware Availability: [knops.io](http://knops.io/knopsmini.html), [Direct EU](http://www.cmstore.eu/maker-made/knops-mini-macro-keyboard/), [Direct USA/CAN](http://www.cmstore-usa.com/knops-mini-macro-keyboard/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make knops/mini:default
+
+See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.

keyboards/knops/mini/rules.mk

@@ -0,0 +1,68 @@
+# MCU name
+#MCU = at90usb1286
+MCU = atmega32u4
+
+# Processor frequency.
+#     This will define a symbol, F_CPU, in all source code files equal to the
+#     processor frequency in Hz. You can then use this symbol in your source code to
+#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
+#     automatically to create a 32-bit value in your source code.
+#
+#     This will be an integer division of F_USB below, as it is sourced by
+#     F_USB after it has run through any CPU prescalers. Note that this value
+#     does not *change* the processor frequency - it should merely be updated to
+#     reflect the processor speed set externally so that the code can use accurate
+#     software delays.
+F_CPU = 16000000
+
+
+#
+# LUFA specific
+#
+# Target architecture (see library "Board Types" documentation).
+ARCH = AVR8
+
+# Input clock frequency.
+#     This will define a symbol, F_USB, in all source code files equal to the
+#     input clock frequency (before any prescaling is performed) in Hz. This value may
+#     differ from F_CPU if prescaling is used on the latter, and is required as the
+#     raw input clock is fed directly to the PLL sections of the AVR for high speed
+#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
+#     at the end, this will be done automatically to create a 32-bit value in your
+#     source code.
+#
+#     If no clock division is performed on the input clock inside the AVR (via the
+#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
+F_USB = $(F_CPU)
+
+# Interrupt driven control endpoint task(+60)
+OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+
+
+# Boot Section Size in *bytes*
+#   Teensy halfKay   512
+#   Teensy++ halfKay 1024
+#   Atmel DFU loader 4096
+#   LUFA bootloader  4096
+#   USBaspLoader     2048
+OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE ?= no      # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE ?= yes       # Mouse keys(+4700)
+EXTRAKEY_ENABLE ?= yes       # Audio control and System control(+450)
+CONSOLE_ENABLE ?= yes        # Console for debug(+400)
+COMMAND_ENABLE ?= yes        # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE ?= no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE ?= no            # USB Nkey Rollover
+BACKLIGHT_ENABLE ?= no       # Enable keyboard backlight functionality on B7 by default
+MIDI_ENABLE ?= no            # MIDI support (+2400 to 4200, depending on config)
+UNICODE_ENABLE ?= no         # Unicode
+BLUETOOTH_ENABLE ?= no       # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE ?= no           # Audio output on port C6
+FAUXCLICKY_ENABLE ?= no      # Use buzzer to emulate clicky switches

keyboards/knops/readme.md

@@ -0,0 +1,10 @@
+# Knops
+
+![Knops Mini Logo](http://knops.io/img/Knops_logo.jpg)
+
+[Knops](http://www.knops.io/) makes fully customizable custom keyboards in a variety of formfactors. So far the Knops Mini, a 3x2 macro keypad is the biggest success. Inside this directory you'll find support for the entire line of Knops products.
+
+* Maintainer: [Pawnerd](https://github.com/pawnerd)
+* Hardware Supported:
+  * [`Mini`](mini/): Knops Mini
+* Hardware Availability: [knops.io](https://www.knops.io/)

keyboards/lets_split/lets_split.h

@@ -23,7 +23,6 @@
         KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
     )
 
-#define LAYOUT_ortho_4x12 KEYMAP
 #define KC_LAYOUT_ortho_4x12 KC_KEYMAP
 
-#endif
+#endif

keyboards/lets_split/rev2/rev2.h

@@ -57,4 +57,6 @@
 	}
 #endif
 
+#define LAYOUT_ortho_4x12 KEYMAP
+
 #endif

keyboards/levinson/levinson.h

@@ -23,7 +23,6 @@
         KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
     )
 
-#define LAYOUT_ortho_4x12 KEYMAP
 #define KC_LAYOUT_ortho_4x12 KC_KEYMAP
 
-#endif
+#endif

keyboards/levinson/rev1/rev1.h

@@ -57,4 +57,6 @@
 	}
 #endif
 
+#define LAYOUT_ortho_4x12 KEYMAP
+
 #endif

keyboards/levinson/rev2/rev2.h

@@ -57,4 +57,6 @@
 	}
 #endif
 
+#define LAYOUT_ortho_4x12 KEYMAP
+
 #endif

keyboards/mitosis/keymaps/datagrok/config.h

@@ -0,0 +1,22 @@
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include "../../config.h"
+
+// I use a pro micro clocked at 8Mhz. It can't reach 1M baud, so this is the
+// next fastest possible baud without errors. I don't notice any difference in
+// behavior at this slower speed. (So I think it should maybe be the default,
+// to allow a single codebase to support both available flavors of pro micro.)
+// This requires a corresponding change to the wireless module firmware; see
+// https://github.com/reversebias/mitosis/pull/10
+#undef SERIAL_UART_BAUD // avoids redefinition warning
+#define SERIAL_UART_BAUD 250000
+
+// TODO: figure out which of these I can safely enable to reduce firmware size.
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT // can't; errors
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+#endif

keyboards/mitosis/keymaps/datagrok/keymap.c

@@ -1,34 +1,12 @@
 #include "mitosis.h"
 
-// Arrows in a layer in the home position.
-// Fn+Arrows = PgUp PgDn Home End, which is intuitive for me
-// 
-// Since QWERTY and WORKMAN keep angle brackets together, I wanted to place
-// other enclosing symbols on the same keys. So, 9 and 0 and [ and ] land there
-// in other layers. That informed the numbers placement, which informed the
-// function-key placement.
-//
-// To do:
-// - Improve LED indications (may require modding bluetooth firmware):
-//   - Is any board nonresponsive (which one?)
-//   - Does either board have a low battery?
-// - Use "shifted keys" hack to make programming symbols easier to type
-// - Add "media" keysyms, Insert, PrintScr, Pause/Break
-// - Dynamically toggle QWERTY or other layouts
-// - See if the henkans placement is at all useful for Japanese speakers, or
-//   abuse different keysyms
-// - Overlay a 10key numpad somewhere
-// - Mod a speaker onto my receiver and enable tones
-// - Mod more indicator LEDs onto my receiver
-// - Do something with Num/Caps/Scroll lock?
-// - Improve tri-layer behavior
-
 enum mitosis_layers
 {
-    _WORKMAN,
-    _FUNC,
-    _NUMS,
-    _NMFN
+    _xW, // workman
+    _xQ, // qwerty
+    _xS, // symbols
+    _xN, // numbers
+    _xF  // functions
 };
 
 // Fillers to make layering more clear
@@ -38,67 +16,125 @@ enum mitosis_layers
 #define KC_LMTA KC_LALT // For fun, name the mods like the space cadet keyboard does
 #define KC_RMTA KC_RALT // META
 #define KC_LSUP KC_LGUI // SUPER
-#define KC_RSUP KC_RGUI // 
+#define KC_RSUP KC_RGUI //
 #define KC_RHYP KC_INT4 // HYPER (actually muhenkan 無変換 and henkan 変換)
 #define KC_LHYP KC_INT5 // or NFER/XFER.
 
-// I didn't want to mess about with new keymappings and custom logic etc. to
-// enable tri-state layers like mitosis default does. This layout accomplishes
-// it with a small quirk that triggering both layers then releasing one
-// out-of-order will leave the tri-state triggered. Which doesn't bother me.
+// Momentary tri-state layers. Mitosis default keymap does this too but employs
+// new keymappings and a bunch of conditional code. This simpler keymap
+// accomplishes it, but with a small quirk: triggering both layers then
+// releasing one out-of-order will leave the tri-state triggered until the
+// other is released. Which doesn't bother me.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_WORKMAN] = {
-        {KC_Q,    KC_D,      KC_R,    KC_W,    KC_B,      KC_J,      KC_F,    KC_U,    KC_P,      KC_SCLN},
-        {KC_A,    KC_S,      KC_H,    KC_T,    KC_G,      KC_Y,      KC_N,    KC_E,    KC_O,      KC_I},
-        {KC_Z,    KC_X,      KC_M,    KC_C,    KC_V,      KC_K,      KC_L,    KC_COMM, KC_DOT,    KC_SLSH},
-        {XXXXXXX, MO(_NUMS), KC_LCTL, KC_LSFT, KC_BSPC,   KC_SPC,    KC_RSFT, KC_RCTL, MO(_NUMS), XXXXXXX},
-        {XXXXXXX, KC_LHYP,   KC_LSUP, KC_LMTA, MO(_FUNC), MO(_FUNC), KC_RMTA, KC_RSUP, KC_RHYP,   XXXXXXX}
-    },
-    [_FUNC] = {
-        {KC_ESC,  _______,   KC_UP,   _______, _______, _______, _______, _______, _______,   KC_QUOT},
-        {KC_TAB,  KC_LEFT,   KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______,   KC_GRV},
-        {_______, _______,   _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC,   KC_BSLS},
-        {XXXXXXX, MO(_NMFN), _______, _______, KC_DEL,  KC_ENT,  _______, _______, MO(_NMFN), XXXXXXX},
-        {XXXXXXX, _______,   _______, _______, ___M___, ___M___, _______, _______, _______,   XXXXXXX},
-    },
-    [_NUMS] = {
-        {_______, _______, _______, _______, _______,   _______,   KC_1,    KC_2,    KC_3,    KC_4},
-        {_______, _______, _______, _______, _______,   _______,   KC_5,    KC_6,    KC_7,    KC_8},
-        {_______, _______, _______, _______, _______,   _______,   KC_MINS, KC_9,    KC_0,    KC_EQL},
-        {XXXXXXX, ___M___, _______, _______, _______,   _______,   _______, _______, ___M___, XXXXXXX},
-        {XXXXXXX, _______, _______, _______, MO(_NMFN), MO(_NMFN), _______, _______, _______, XXXXXXX},
-    },
-    [_NMFN] = {
-        {_______, _______, KC_PGUP, _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4},
-        {_______, KC_HOME, KC_PGDN, KC_END,  _______, _______, KC_F5,   KC_F6,   KC_F7,   KC_F8},
-        {_______, _______, _______, _______, _______, _______, KC_F8,   KC_F9,   KC_F10,  KC_F12},
-        {XXXXXXX, ___M___, _______, _______, _______, _______, _______, _______, ___M___, XXXXXXX},
-        {XXXXXXX, _______, _______, _______, ___M___, ___M___, _______, _______, _______, XXXXXXX},
-    },
+  [_xW] = {
+    {KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN},
+    {KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I},
+    {KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_QUOT},
+    {XXXXXXX, KC_LSUP, KC_LCTL, MO(_xN), KC_LSFT, KC_RSFT, MO(_xN), KC_RCTL, KC_RSUP, XXXXXXX},
+    {XXXXXXX, KC_LHYP, KC_LMTA, MO(_xS), KC_BSPC, KC_SPC,  MO(_xS), KC_RMTA, KC_RHYP, XXXXXXX}
+  },
+  [_xQ] = {
+    {KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P},
+    {KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN},
+    {KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_QUOT},
+    {XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX},
+    {XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX}
+  },
+  [_xS] = {
+    {KC_ESC,  _______, KC_UP,   _______, _______, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_TILD},
+    {KC_TAB,  KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_CIRC, KC_AMPR, KC_PIPE, KC_GRV,  KC_UNDS},
+    {KC_BSLS, KC_RPRN, KC_RCBR, KC_RBRC, KC_RABK, KC_LABK, KC_LBRC, KC_LCBR, KC_LPRN, KC_SLSH},
+    {XXXXXXX, _______, _______, MO(_xF), _______, _______, MO(_xF), _______, _______, XXXXXXX},
+    {XXXXXXX, _______, _______, ___M___, KC_DEL,  KC_ENT,  ___M___, _______, _______, XXXXXXX},
+  },
+  [_xN] = {
+    {_______, _______, _______, _______, _______, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_P0},
+    {_______, _______, _______, _______, _______, KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS},
+    {_______, _______, _______, _______, _______, KC_PMNS, KC_P1,   KC_P2,   KC_P3,   KC_PEQL},
+    {XXXXXXX, _______, _______, ___M___, _______, _______, ___M___, _______, _______, XXXXXXX},
+    {XXXXXXX, _______, _______, MO(_xF), _______, KC_PENT, MO(_xF), _______, _______, XXXXXXX},
+  },
+  [_xF] = {
+    {_______, _______, KC_PGUP, _______, KC_VOLU, KC_F13,  KC_F7,   KC_F8,   KC_F9,   KC_F10},
+    {_______, KC_HOME, KC_PGDN, KC_END,  KC_VOLD, KC_F14,  KC_F4,   KC_F5,   KC_F6,   KC_F11},
+    {TG(_xQ), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_F15,  KC_F1,   KC_F2,   KC_F3,   KC_F12},
+    {XXXXXXX, _______, _______, ___M___, _______, _______, ___M___, _______, _______, XXXXXXX},
+    {XXXXXXX, _______, _______, _______, ___M___, ___M___, _______, _______, _______, XXXXXXX},
+  },
 };
 
+// This is a hack to place <question mark> on <shift-comma> and <exclaimation
+// mark> on <shift-period>, when using an operating system configured for a
+// US/qwerty layout.
+bool comm_shifted = false;
+bool ques_shifted = false;
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  uint8_t shifted;
+  uint16_t s_keycode;
+  bool *k_shifted;
+
+  switch (keycode) {
+    case KC_COMM:
+      s_keycode = KC_SLSH;
+      k_shifted = &comm_shifted;
+      break;
+    case KC_DOT:
+      s_keycode = KC_1;
+      k_shifted = &ques_shifted;
+      break;
+    default:
+      return true;
+  }
+
+  shifted = get_mods() & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT));
+
+  // Keydown. If shift is currently pressed, register its alternate keycode.
+  if (record->event.pressed && shifted) {
+    *k_shifted = true;
+    register_code(s_keycode);
+    return false;
+    // Keyup. If shift was pressed back when the key was pressed, unregister
+    // its alternate keycode.
+  } else if (!(record->event.pressed) && *k_shifted) {
+    *k_shifted = false;
+    unregister_code(s_keycode);
+    return false;
+    // Otherwise, behave as normal.
+  } else {
+    return true;
+  }
+}
+
+// Set the bits of A selected by MASK to the corresponding bits of B
+#define setbits(A, B, MASK) A = (A & (B | ~MASK)) | (B & MASK)
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+  //
+  // Bit #            7     6     5     4     3     2     1     0
+  // layer_state: [     |     |     | _xF | _xN | _xS | _xQ | _xW ]
+  // usb_led      [     |     |     |kana |cmps |scrl |caps | num ]
+  // PORTB:       [  NC |  10 |   9 |   8 |  14 |  16 |  15 |rxled]
+  // PORTC:       [  NC |   5 |     |     |     |     |     |     ]
+  // PORTD:       [   6 |  NC |txled|   4 | tx* | rx* | grn | p29 ]
+  // PORTE:       [     |   7 |     |     |     |     |     |     ]
+  // PORTF:       [  a0 |  a1 | red | blu |     |     |  NC |  NC ]
+  //
+  // PD0 is connected to the pairing switch and p29 on the wireless module.
+  // PF0,PF1,PB7,PC7,PD6 are not broken out by the pro micro board. I don't understand why.
+  // PB1-PB6,PD4,PD5,PD6,PF6,PF7 are not connected to the Mitosis receiver
+  // board. Each may be connected to an LED by way of a resistor (4.7k to
+  // match the others) for a total of 14 additional indicators.
 
-    switch (layer) {
-        case _WORKMAN:
-            red_led_off;
-            grn_led_off;
-            break;
-        case _FUNC:
-            red_led_off;
-            grn_led_on;
-            break;
-        case _NUMS:
-            red_led_on;
-            grn_led_off;
-            break;
-        case _NMFN:
-            red_led_on;
-            grn_led_on;
-            break;
-        default:
-            break;
-    }
-};
+  // A simple (but technically inaccurate) model of the momentary layer state:
+  // Fn1 key makes _xS active; indicator = red
+  // Fn2 key makes _xN active; indicator = blue
+  // Both keys make _xF active; indicator = purple
+  // Toggling QWERTY mode makes indicator include green, so (red/blue/purple becomes yellow/cyan/white)
+
+  // negated because for ports 0=LED on.
+  uint32_t portf_bits = ~(layer_state|layer_state<<1|(layer_state&0b100)<<3);
+  setbits(PORTF, portf_bits, 0b00110000);
+  setbits(PORTD, ~layer_state, 0b00000010);
+}
+
+// vim: set sw=2 et:

keyboards/mitosis/keymaps/datagrok/readme.md

@@ -0,0 +1,74 @@
+![mitosis:datagrok layout image](https://i.imgur.com/Lt0t0nq.png)
+
+[Keyboard layout editor source](http://www.keyboard-layout-editor.com/#/gists/e1a6a7a480fd4984c0bed38ee35f6c4f)
+
+# a layout for the Mitosis
+
+- Emphasis on momentary modifiers, all usable from either hand, arranged
+  symmetrically, but distinguishable left/right by the OS. Shift, Fn1
+  ("Lower"), Fn2 ("Raise"), Super ("Windows"), Meta ("Alt"), Hyper.
+
+- Fn1 and Fn2 are used to momentary-enable (like a shift key) one of three layers:
+
+    - Fn1 (Red): Symbols layer
+    - Fn2 (Blue): Numbers layer
+    - Both: Functions layer
+
+- The base layer is a slight variant of [Workman][]. QWERTY may be toggled-on.
+
+- Paired programming symbols (braces, brackets, parentheses) are arranged
+  symmetrically in the symbols layer. `?` and `!` are moved to take the place
+  of `<` and `>`.
+
+- No OS keymap modification required.
+
+## Design notes
+
+- **I use an 8Mhz Pro Micro.** If you want to use this keymap with the standard
+  16Mhz Pro Micro specified in the Mitosis design:
+
+    - Remove the lines in `rules.mk` mentioning `F_CPU` and `F_USB`.
+    - Remove the lines in `config.h` mentioning `SERIAL_UART_BAUD`.
+
+- I'm learning a new key placement, so might as well go all out and use an
+  optimal non-QWERTY layout.
+
+- I like the way Workman feels and some of its advantages over Colemak.
+  Unfortunately, it was designed using a weighting system based on a standard
+  column-staggered keyboard so is probably not as optimal as one could achieve
+  on an ergonomic board like the Mitosis.
+
+- Arrows in the home position (on a layer). Mod+Arrows = PgUp/PgDn/Home/End,
+  which is intuitive for me
+
+### Abandoned ideas
+
+- ~~"Since QWERTY and Workman keep angle brackets together, place other
+  enclosing symbols on the same keys. This informs the numbers placement,
+  which informs the function-key placement."~~
+
+    - I tried this and it was bad. I don't like having to pick the right
+      modifier to get the right flavor of bracket. Instead, now, one modifier
+      activates a symbols layer where all brackets are easily accessible.
+
+- Space/Enter to the left of layer select for Enter doesn't work well; I always
+  trigger space first.
+
+- I used to have Blue layer on ring finger, but that was too hard to use in
+  conjunction with shift.
+
+## To do
+
+- Improve LED indications (may require modding bluetooth firmware):
+    - Is any board nonresponsive (which one?)
+    - Does either board have a low battery?
+- Add Insert, PrintScr, Pause/Break
+- Make QWERTY base layer for people who customize layout in software? Store
+  default base layer in eeprom?
+- See if the henkans placement is at all useful for Japanese speakers, or abuse
+  different keysyms
+- Mod a speaker onto my receiver and enable tones
+- Implement "layer lock" key
+- Improve tri-layer behavior
+
+[Workman]: https://viralintrospection.wordpress.com/2010/09/06/a-different-philosophy-in-designing-keyboard-layouts/

keyboards/mitosis/keymaps/datagrok/rules.mk

@@ -0,0 +1,15 @@
+# I use an 8Mhz Pro Micro
+F_CPU = 8000000
+# Necessary, with above change?
+F_USB = $(F_CPU)
+
+BOOTMAGIC_ENABLE = no	# Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = no	# Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
+CONSOLE_ENABLE = no	# Console for debug(+400)
+COMMAND_ENABLE = no	# Commands for debug and configuration
+UNICODE_ENABLE = no	# Unicode
+BACKLIGHT_ENABLE = no	# Enable keyboard backlight functionality
+BLUETOOTH_ENABLE = no	# Enable Bluetooth with the Adafruit EZ-Key HID
+MIDI_ENABLE = no	# MIDI controls
+# vim: set ts=8 noet:

keyboards/mitosis/mitosis.c

@@ -28,4 +28,15 @@ void matrix_scan_kb(void) {
 
 void led_set_kb(uint8_t usb_led) {
 
-}
+}
+
+#ifdef ONEHAND_ENABLE
+__attribute__ ((weak))
+const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+{{9, 0}, {8, 0}, {7, 0}, {6, 0}, {5, 0}, {4, 0}, {3, 0}, {2, 0}, {1, 0}, {0, 0}},
+{{9, 1}, {8, 1}, {7, 1}, {6, 1}, {5, 1}, {4, 1}, {3, 1}, {2, 1}, {1, 1}, {0, 1}},
+{{9, 2}, {8, 2}, {7, 2}, {6, 2}, {5, 2}, {4, 2}, {3, 2}, {2, 2}, {1, 2}, {0, 2}},
+{{9, 3}, {8, 3}, {7, 3}, {6, 3}, {5, 3}, {4, 3}, {3, 3}, {2, 3}, {1, 3}, {0, 3}},
+{{9, 4}, {8, 4}, {7, 4}, {6, 4}, {5, 4}, {4, 4}, {3, 4}, {2, 4}, {1, 4}, {0, 4}},
+};
+#endif

keyboards/nyquist/keymaps/333fred/README.md

@@ -5,7 +5,7 @@ This nyquist layout is based on my Ergodox Infinity Layout, which is [here](../.
 ## Layers
 
 ### QWERTY
-The shift modifiers on this layer all use OSM to allow for quick single capitalization. Press and hold F to go to the VIM movement layer. Layer is also a one-shot layer toggle, and can be held down to type multiple characters on the Lower layer. Game is a regular toggle layer.
+The shift modifiers on this layer all use OSM to allow for quick single capitalization. LwrVIM acts a combo one-shot toggle and momentary layer toggle. Tap once to make the next key be sent on the Lower. Hold to move to the Lower layer until release. Tap and hold (so press, release, press and hold) to move to the VIM layer until release. Game is a regular toggle layer.
 
 ```
 Qwerty
@@ -14,11 +14,11 @@ Qwerty
 |------+------+------+------+------+------+------+------+------+------+------+------|
 | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  \   |
 |------+------+------+------+------+-------------+------+------+------+------+------|
-| Esc  |   A  |   S  |   D  |LTVIMF|   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+| Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
 |------+------+------+------+------+------|------+------+------+------+------+------|
 | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |/ Ctrl| Shift|
 |------+------+------+------+------+------+------+------+------+------+------+------|
-| Ctrl |  Alt |  F4  | GUI  |Lower | Bksp | Spc  | Ent  | Lock |   =  | Game | Del  |
+| Ctrl |  Alt |  F4  | GUI  |LwrVIM| Bksp | Spc  | Ent  | Lock |   =  | RAlt | Del  |
 `-----------------------------------------------------------------------------------'
 ```
 
@@ -36,7 +36,7 @@ Lower
 |------+------+------+------+------+------|------+------+------+------+------+------|
 | APscr|   %  |   ^  |   [  |   ]  |   ~  |   1  |   2  |   3  |   \  | Vol- | Vol+ |
 |------+------+------+------+------+------+------+------+------+------+------+------|
-| Pscr |      |      |      |      |      |   0  |   .  |   =  | Prev | Next | Play |
+| Pscr |      |      |      |      | GAME |   0  |   .  |   =  | Prev | Next | Play |
 `-----------------------------------------------------------------------------------'
 ```
 

keyboards/nyquist/keymaps/333fred/keymap.c

@@ -1,20 +1,18 @@
 #include "nyquist.h"
 #include "action_layer.h"
+#include "action_util.h"
 #include "eeconfig.h"
+#include "333fred.h"
 
 extern keymap_config_t keymap_config;
 
-#define _QWERTY 0
-#define _LOWER 1
-#define _VIM 2
-#define _GAME 3
-
 enum custom_macros {
     DLEFT,
     DRIGHT,
     PSCREEN_APP
 };
 
+// Tap dance for layer transitions
 // Fillers to make layering more clear
 #define _______ KC_TRNS
 #define XXXXXXX KC_NO
@@ -27,22 +25,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  \   |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |LTVIMF|   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |/ Ctrl| Shift|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  Alt |  F4  | GUI  |Lower | Bksp | Spc  | Ent  |  Alt |   +  | Game | Del  |
+ * | Ctrl |  Alt |  F4  | GUI  |Lwr/VM| Bksp | Spc  | Ent  | Lock |   =  |  Alt | Del  |
  * `-----------------------------------------------------------------------------------'
  */
-[_QWERTY] = KEYMAP( \
+[BASE] = KEYMAP( \
     KC_GRV,        KC_1,         KC_2,  KC_3,    KC_4,           KC_5,    KC_6,    KC_7,    KC_8,    KC_9,   KC_0,            KC_MINUS, \
     KC_TAB,        KC_Q,         KC_W,  KC_E,    KC_R,           KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,            KC_BSLASH, \
-    KC_ESC,        KC_A,         KC_S,  KC_D,    LT(_VIM, KC_F), KC_G,    KC_H,    KC_J,    KC_K,    KC_L,   KC_SCLN,         KC_QUOT, \
+    KC_ESC,        KC_A,         KC_S,  KC_D,    KC_F,           KC_G,    KC_H,    KC_J,    KC_K,    KC_L,   KC_SCLN,         KC_QUOT, \
     OSM(MOD_LSFT), LCTL_T(KC_Z), KC_X,  KC_C,    KC_V,           KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT, RCTL_T(KC_SLSH), OSM(MOD_RSFT), \
-    KC_LCTL,       KC_LALT,      KC_F4, KC_LGUI, OSL(_LOWER),    KC_BSPC, KC_SPC,  KC_ENT,  KC_LOCK, KC_EQL, TG(_GAME),       KC_DEL \
+    KC_LCTL,       KC_LALT,      KC_F4, KC_LGUI, TD(TD_SYM_VIM), KC_BSPC, KC_SPC,  KC_ENT,  KC_LOCK, KC_EQL, KC_RALT,         KC_DEL \
 ),
 
-/* Lower
+/* Symbols
  * ,-----------------------------------------------------------------------------------.
  * | Caps |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
@@ -52,36 +50,36 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * | APscr|   %  |   ^  |   [  |   ]  |   ~  |   1  |   2  |   3  |   \  | Vol- | Vol+ |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Pscr |      |      |      |      |      |   0  |   .  |   =  | Prev | Next | Play |
+ * | Pscr |      |      |      |      | GAME |   0  |   .  |   =  | Prev | Next | Play |
  * `-----------------------------------------------------------------------------------'
  */
-[_LOWER] = KEYMAP( \
-    KC_CAPS,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11, \
-    _______,        KC_EXLM, KC_AT,   KC_LPRN, KC_RPRN, KC_PIPE, KC_7,  KC_8,   KC_9,   KC_ASTR, KC_RPRN, KC_F12, \
-    _______,        KC_HASH, KC_DLR,  KC_LCBR, KC_RCBR, KC_GRV,  KC_4,  KC_5,   KC_6,   KC_PLUS, KC_RCBR, KC_PIPE, \
-    M(PSCREEN_APP), KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_1,  KC_2,   KC_3,   KC_BSLS, KC_VOLD, KC_VOLU, \
-    KC_PSCR,        _______, _______, _______, _______, _______, KC_0,  KC_DOT, KC_EQL, KC_MPRV, KC_MNXT, KC_MPLY \
+[SYMB] = KEYMAP( \
+    KC_CAPS,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    KC_F6, KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11, \
+    _______,        KC_EXLM, KC_AT,   KC_LPRN, KC_RPRN, KC_PIPE,  KC_7,  KC_8,   KC_9,   KC_ASTR, KC_RPRN, KC_F12, \
+    _______,        KC_HASH, KC_DLR,  KC_LCBR, KC_RCBR, KC_GRV,   KC_4,  KC_5,   KC_6,   KC_PLUS, KC_RCBR, KC_PIPE, \
+    M(PSCREEN_APP), KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD,  KC_1,  KC_2,   KC_3,   KC_BSLS, KC_VOLD, KC_VOLU, \
+    KC_PSCR,        _______, _______, _______, _______, TG(GAME), KC_0,  KC_DOT, KC_EQL, KC_MPRV, KC_MNXT, KC_MPLY \
 ),
 
 /* Vim Movement (Hold down F)
  * ,-----------------------------------------------------------------------------------.
  * |      |      |      |      |      |      |      |      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |      |      |      | LSHFT|      |      |      |      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | DLeft|DRight| LCTRL|      |      | Left | Down |  Up  | Right|      |      |
+ * |      | DLeft|DRight| LCTRL| LGUI |      | Left | Down |  Up  | Right|      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |      |      |      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      | LShft|      |      |      |      |      |      |      |
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
-[_VIM] =  KEYMAP( \
+[VIM] =  KEYMAP( \
     _______, _______,  _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______,  _______,   KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, M(DLEFT), M(DRIGHT), KC_LCTL, KC_LGUI, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, \
     _______, _______,  _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-    _______, M(DLEFT), M(DRIGHT), KC_LCTL, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, \
-    _______, _______,  _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-    _______, _______,  _______,   _______, KC_LSFT, _______, _______, _______, _______, _______, _______, _______ \
+    _______, _______,  _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______ \
 ),
 
 /* Gaming mode (Raise)
@@ -98,12 +96,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | Enter|      | Lock | Bksp |  Alt |  Spc | Lower| Left |  Up  | Down | Right|QWERTY|
  * `-----------------------------------------------------------------------------------'
  */
-[_GAME] =  KEYMAP( \
+[GAME] =  KEYMAP( \
     KC_ESC,  _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______,    \
     _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______,    \
     KC_LCTL, _______, _______, _______, KC_F,    _______, _______,     _______, _______, _______, _______, _______,    \
     KC_LSFT, KC_Z,    _______, _______, _______, _______, _______,     _______, _______, _______, _______, KC_LGUI,    \
-    KC_ENT,  _______, KC_LOCK, KC_BSPC, KC_LALT, KC_SPC,  OSL(_LOWER), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(_QWERTY) \
+    KC_ENT,  _______, KC_LOCK, KC_BSPC, KC_LALT, KC_SPC,  OSL(SYMB), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(BASE) \
 )
 
 };
@@ -133,3 +131,8 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
     }
     return MACRO_NONE;
 }
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    tap_dance_process_record(keycode);
+    return true;
+}

keyboards/nyquist/keymaps/333fred/rules.mk

@@ -1,6 +1,7 @@
 KEY_LOCK_ENABLE = yes
 NKRO_ENABLE = yes
-CONSOLE_ENABLE = yes
+CONSOLE_ENABLE = no
+TAP_DANCE_ENABLE = yes
 
 ifndef QUANTUM_DIR
 	include ../../../../Makefile

keyboards/nyquist/nyquist.h

@@ -23,6 +23,4 @@
         KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45 \
     )
 
-#define LAYOUT_ortho_5x12 KEYMAP
-
-#endif
+#endif

keyboards/nyquist/rev1/rev1.h

@@ -63,4 +63,6 @@
 	}
 #endif
 
+#define LAYOUT_ortho_5x12 KEYMAP
+
 #endif

keyboards/orthodox/keymaps/drashna/config.h

@@ -61,5 +61,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_BREATHE_CENTER 1
 #endif // RGBLIGHT_ENABLE
 
+#ifdef AUDIO_ENABLE
+#define C6_AUDIO
+#endif
 
 #endif

keyboards/orthodox/keymaps/drashna/keymap.c

@@ -20,94 +20,31 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "orthodox.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include "drashna.h"
 
-extern keymap_config_t keymap_config;
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _WORKMAN 3
-#define _LOWER 8
-#define _RAISE 9
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  WORKMAN,
-  LOWER,
-  RAISE,
-  ADJUST,
-  KC_MAKE
-};
 
 // Fillers to make layering more clear
 #define _______ KC_TRNS
 #define XXXXXXX KC_NO
 
-#ifdef RGBLIGHT_ENABLE
-#define rgblight_set_blue        rgblight_sethsv (0xFF,  0xFF, 0xFF);
-#define rgblight_set_red         rgblight_sethsv (0x00,  0xFF, 0xFF);
-#define rgblight_set_green       rgblight_sethsv (0x78,  0xFF, 0xFF);
-#define rgblight_set_orange      rgblight_sethsv (0x1E,  0xFF, 0xFF);
-#define rgblight_set_teal        rgblight_sethsv (0xC3,  0xFF, 0xFF);
-#define rgblight_set_magenta     rgblight_sethsv (0x12C, 0xFF, 0xFF);
-#define rgblight_set_yellow      rgblight_sethsv (0x3C,  0xFF, 0xFF);
-#define rgblight_set_purple      rgblight_sethsv (0x10E, 0xFF, 0xFF);
-#endif
-
-
-#ifdef TAP_DANCE_ENABLE
-enum {
-    TD_FLSH = 0,
-};
-
-
-
-
-
-// on the fourth tap, set the keyboard on flash state
-// and set the underglow to red, because red == bad
-void dance_flsh_finished(qk_tap_dance_state_t *state, void *user_data) {
-    if (state->count >= 4) {
-#ifdef RGBLIGHT_ENABLE
-        rgblight_mode(1);
-        rgblight_setrgb(0xff, 0x00, 0x00);
-#endif
-        reset_tap_dance(state);
-        reset_keyboard();
-    }
-}
-
-
-
-//Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
-    //Once for Blue, Twice for Green, Thrice for Red, and four to flash
-    [TD_FLSH] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_flsh_finished, NULL),
-
-};
-#endif
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[_QWERTY] = KEYMAP( \
+[_QWERTY] = KEYMAP(\
   KC_ESC,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                                                   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
   KC_TAB,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,      KC_UP, XXXXXXX,  KC_DOWN,        KC_LEFT, XXXXXXX, KC_RIGHT, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
   KC_LSFT,    CTL_T(KC_Z), KC_X, KC_C,   KC_V,    KC_B,      LOWER, KC_SPACE, KC_BSPC,        KC_DEL,  KC_ENT,  RAISE,    KC_N,    KC_M,    KC_COMM, KC_DOT, CTL_T(KC_SLASH), KC_LGUI \
 ),
 
 [_COLEMAK] = KEYMAP(\
-  KC_ESC,   KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                                                                   KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC, \
-  KC_TAB,   KC_A,    KC_R,    KC_S,    KC_T,    KC_D,      KC_UP, XXXXXXX,  KC_DOWN,        KC_LEFT, XXXXXXX, KC_RIGHT, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, \
-  KC_LSFT,  CTL_T(KC_Z), KC_X, KC_C,   KC_V,    KC_B,      LOWER, KC_SPACE, KC_BSPC,        KC_DEL,  KC_ENT,  RAISE,    KC_K,    KC_M,    KC_COMM, KC_DOT,  CTL_T(KC_SLASH), KC_LGUI \
+  KC_ESC,     KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                                                                   KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC, \
+  KC_TAB,     KC_A,    KC_R,    KC_S,    KC_T,    KC_D,      KC_UP, XXXXXXX,  KC_DOWN,        KC_LEFT, XXXXXXX, KC_RIGHT, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, \
+  KC_LSFT,    CTL_T(KC_Z), KC_X, KC_C,   KC_V,    KC_B,      LOWER, KC_SPACE, KC_BSPC,        KC_DEL,  KC_ENT,  RAISE,    KC_K,    KC_M,    KC_COMM, KC_DOT,  CTL_T(KC_SLASH), KC_LGUI \
 ),
 
 [_DVORAK] = KEYMAP(\
@@ -121,189 +58,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LSFT, CTL_T(KC_SCLN), KC_Q, KC_J, KC_K,    KC_X,      LOWER, KC_SPACE, KC_BSPC,        KC_DEL,  KC_ENT,  RAISE,    KC_B,    KC_M,    KC_W,    KC_V,    CTL_T(KC_Z), KC_LGUI \
 ),
 
-[_LOWER] = KEYMAP( \
+[_LOWER] = KEYMAP(\
   KC_TILD,    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                                                                KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC, \
-  KC_DEL,     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,   XXXXXXX, KC_F12,          _______, XXXXXXX, KC_RCTL, KC_F11,  KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE, \
-  TD(TD_FLSH),KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______,          _______, _______, _______, KC_F12,  KC_HOME,    KC_COMM,    KC_DOT,  KC_END,  _______ \
+  KC_DEL,     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,   XXXXXXX, KC_F12,          _______, XXXXXXX, KC_RCTL, XXXXXXX, KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE, \
+  TD(TD_FLSH),KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______,          _______, _______, _______, XXXXXXX, KC_HOME,    KC_COMM,    KC_DOT,  KC_END,  _______ \
 ),
 
-[_RAISE] = KEYMAP( \
+[_RAISE] = KEYMAP(\
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                                   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,  XXXXXXX, KC_F12,           _______, XXXXXXX, _______, KC_F11,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
-  _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______,          _______, _______, _______, KC_F12,  KC_PGUP, KC_COMM, KC_DOT,  KC_PGDN, _______ \
+  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,  XXXXXXX, KC_F12,           _______, XXXXXXX, _______, XXXXXXX, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
+  _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______,          _______, _______, _______, XXXXXXX, KC_PGUP, KC_COMM, KC_DOT,  KC_PGDN, _______ \
 ),
 
-[_ADJUST] =  KEYMAP( \
-  KC_MAKE, RESET,   TD(TD_FLSH), _______, _______, _______,                                                                _______, _______, _______, _______, _______, _______,  \
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, _______, XXXXXXX, _______,          _______, XXXXXXX, _______, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  WORKMAN, _______, \
+[_ADJUST] = KEYMAP(\
+  KC_MAKE,KC_RESET, _______, _______, _______, _______,                                                                _______, _______, _______, _______, _______, _______,  \
+  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, _______, XXXXXXX, _______,          _______, XXXXXXX, _______, AG_SWAP, KC_QWERTY, KC_COLEMAK, KC_DVORAK, KC_WORKMAN, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, MAGIC_TOGGLE_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY  \
 )
 
 
 };
 
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-float tone_workman[][2]    = SONG(PLOVER_SONG);
-#endif
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-        if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-            PLAY_SONG(tone_qwerty);
-        #endif
-            persistent_default_layer_set(1UL<<_QWERTY);
-        }
-        return false;
-        break;
-    case COLEMAK:
-        if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-            PLAY_SONG(tone_colemak);
-        #endif
-            persistent_default_layer_set(1UL<<_COLEMAK);
-        }
-        return false;
-        break;
-    case DVORAK:
-        if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-            PLAY_SONG(tone_dvorak);
-        #endif
-            persistent_default_layer_set(1UL << _DVORAK);
-        }
-        return false;
-        break;
-    case WORKMAN:
-        if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-            PLAY_SONG(tone_workman);
-        #endif
-            persistent_default_layer_set(1UL << _WORKMAN);
-        }
-        return false;
-        break;
-    case LOWER:
-        if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        }
-        return false;
-        break;
-    case RAISE:
-        if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        }
-        return false;
-        break;
-    case ADJUST:
-        if (record->event.pressed) {
-            layer_on(_ADJUST);
-        } else {
-            layer_off(_ADJUST);
-        }
-        return false;
-        break;
-    case KC_MAKE:
-        if (!record->event.pressed) {
-#ifdef RGBLIGHT_ENABLE
-            SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP SS_TAP(X_ENTER));
-#else
-            SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP " RGBLIGHT_ENABLE=no"SS_TAP(X_ENTER));
-#endif
-        }
-        return false;
-        break;
-
-  }
-  return true;
-}
-
-void matrix_init_user(void) { // Runs boot tasks for keyboard
-#ifdef RGBLIGHT_ENABLE
-    uint8_t default_layer = eeconfig_read_default_layer();
-
-    rgblight_enable();
-    if (default_layer & (1UL << _COLEMAK)) {
-        rgblight_set_magenta;
-}
-    else if (default_layer & (1UL << _DVORAK)) {
-        rgblight_set_green;
-    }
-    else if (default_layer & (1UL << _WORKMAN)) {
-        rgblight_set_purple;
-    }
-    else {
-        rgblight_set_teal;
-    }
-#endif
-
-};
-
-void matrix_scan_user(void) {  // runs frequently to update info
-
-};
-
-uint32_t layer_state_set_kb(uint32_t state) { // runs on layer switch
-#ifdef RGBLIGHT_ENABLE
-    uint8_t default_layer = eeconfig_read_default_layer();
-
-    switch (biton32(state)) {
-    case _COLEMAK:
-        rgblight_set_magenta;
-        rgblight_mode(1);
-        break;
-    case _DVORAK:
-        rgblight_set_green;
-        rgblight_mode(1);
-        break;
-    case _RAISE:
-        rgblight_set_yellow;
-        rgblight_mode(5);
-        break;
-    case _LOWER:
-        rgblight_set_orange;
-        rgblight_mode(5);
-        break;
-    case _ADJUST:
-        rgblight_set_red;
-        rgblight_mode(23);
-        break;
-    case 6:
-        rgblight_set_blue;
-        break;
-    case _QWERTY:
-        if (default_layer & (1UL << _COLEMAK)) {
-            rgblight_set_magenta;
-        }
-        else if (default_layer & (1UL << _DVORAK)) {
-            rgblight_set_green;
-        }
-        else if (default_layer & (1UL << _WORKMAN)) {
-            rgblight_set_purple;
-        }
-        else {
-            rgblight_set_teal;
-        }
-        rgblight_mode(1);
-        break;
-    }
-#endif
-    return state;
-}
+#ifdef FAUXCLICKY_ENABLE
+float fauxclicky_pressed_note[2] = MUSICAL_NOTE(_A4, 0.0625);  // (_D4, 0.25);
+float fauxclicky_released_note[2] = MUSICAL_NOTE(_A4, 0.0625); // (_C4, 0.125);
+float fauxclicky_beep_note[2] = MUSICAL_NOTE(_C6, 0.25);       // (_C4, 0.25);
+#endif 

keyboards/orthodox/keymaps/drashna/rules.mk

@@ -4,8 +4,7 @@ RGBLIGHT_ENABLE   = yes
 AUDIO_ENABLE      = no
 MOUSEKEY_ENABLE   = no
 NKRO_ENABLE       = yes
-FAUXCLICKY_ENABLE = no
-EXTRAFLAGS        = -flto
+FAUXCLICKY_ENABLE = yes
 
 ifndef QUANTUM_DIR
 	include ../../../../Makefile

keyboards/planck/config.h

@@ -21,10 +21,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
+#define VENDOR_ID       0x03A8
+#define PRODUCT_ID      0x5A60
 #define MANUFACTURER    OLKB
-#define PRODUCT         The Planck Keyboard
+#define PRODUCT         Planck
 #define DESCRIPTION     A compact ortholinear keyboard
 
 /* key matrix size */

keyboards/planck/info.json

@@ -2,7 +2,7 @@
   "keyboard_name": "Planck",
   "keyboard_folder": "planck",
   "manufacturer": "OLKB",
-  "identifier": "FEED:6060:0001",
+  "identifier": "03A8:5A60:0001",
   "url": "https://olkb.com/planck",
   "maintainer": "jackhumbert",
   "processor": "atmega32u4",
@@ -54,7 +54,7 @@
         { "w": 1, "x": 2, "y": 3 }, 
         { "w": 1, "x": 3, "y": 3 }, 
         { "w": 1, "x": 4, "y": 3 }, 
-        { "w": 2, "x": 5.5, "y": 3 }, 
+        { "w": 2, "x": 5, "y": 3 }, 
         { "w": 1, "x": 7, "y": 3 }, 
         { "w": 1, "x": 8, "y": 3 }, 
         { "w": 1, "x": 9, "y": 3 }, 

keyboards/preonic/config.h

@@ -21,11 +21,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6061
+#define VENDOR_ID       0x03A8
+#define PRODUCT_ID      0x5A62
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    Ortholinear Keyboards
-#define PRODUCT         The Preonic Keyboard
+#define MANUFACTURER    OLKB
+#define PRODUCT         Preonic
 #define DESCRIPTION     A compact ortholinear keyboard
 
 /* key matrix size */

keyboards/preonic/info.json

@@ -0,0 +1,141 @@
+{
+  "keyboard_name": "Preonic",
+  "keyboard_folder": "preonic",
+  "manufacturer": "OLKB",
+  "identifier": "03A8:5A60:0001",
+  "url": "https://olkb.com/preonic",
+  "maintainer": "jackhumbert",
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "width": 12,
+  "height": 5,
+  "layouts": {
+    "LAYOUT_preonic_mit": {
+      "key_count": 59,
+      "layout": [ 
+        { "w": 1, "x": 0, "y": 0 }, 
+        { "w": 1, "x": 1, "y": 0 }, 
+        { "w": 1, "x": 2, "y": 0 }, 
+        { "w": 1, "x": 3, "y": 0 }, 
+        { "w": 1, "x": 4, "y": 0 }, 
+        { "w": 1, "x": 5, "y": 0 }, 
+        { "w": 1, "x": 6, "y": 0 }, 
+        { "w": 1, "x": 7, "y": 0 }, 
+        { "w": 1, "x": 8, "y": 0 }, 
+        { "w": 1, "x": 9, "y": 0 }, 
+        { "w": 1, "x": 10, "y": 0 }, 
+        { "w": 1, "x": 11, "y": 0 }, 
+        { "w": 1, "x": 0, "y": 1 }, 
+        { "w": 1, "x": 1, "y": 1 }, 
+        { "w": 1, "x": 2, "y": 1 }, 
+        { "w": 1, "x": 3, "y": 1 }, 
+        { "w": 1, "x": 4, "y": 1 }, 
+        { "w": 1, "x": 5, "y": 1 }, 
+        { "w": 1, "x": 6, "y": 1 }, 
+        { "w": 1, "x": 7, "y": 1 }, 
+        { "w": 1, "x": 8, "y": 1 }, 
+        { "w": 1, "x": 9, "y": 1 }, 
+        { "w": 1, "x": 10, "y": 1 }, 
+        { "w": 1, "x": 11, "y": 1 }, 
+        { "w": 1, "x": 0, "y": 2 }, 
+        { "w": 1, "x": 1, "y": 2 }, 
+        { "w": 1, "x": 2, "y": 2 }, 
+        { "w": 1, "x": 3, "y": 2 }, 
+        { "w": 1, "x": 4, "y": 2 }, 
+        { "w": 1, "x": 5, "y": 2 }, 
+        { "w": 1, "x": 6, "y": 2 }, 
+        { "w": 1, "x": 7, "y": 2 }, 
+        { "w": 1, "x": 8, "y": 2 }, 
+        { "w": 1, "x": 9, "y": 2 }, 
+        { "w": 1, "x": 10, "y": 2 }, 
+        { "w": 1, "x": 11, "y": 2 }, 
+        { "w": 1, "x": 0, "y": 3 }, 
+        { "w": 1, "x": 1, "y": 3 }, 
+        { "w": 1, "x": 2, "y": 3 }, 
+        { "w": 1, "x": 3, "y": 3 }, 
+        { "w": 1, "x": 4, "y": 3 }, 
+        { "w": 1, "x": 5, "y": 3 }, 
+        { "w": 1, "x": 6, "y": 3 }, 
+        { "w": 1, "x": 7, "y": 3 }, 
+        { "w": 1, "x": 8, "y": 3 }, 
+        { "w": 1, "x": 9, "y": 3 }, 
+        { "w": 1, "x": 10, "y": 3 }, 
+        { "w": 1, "x": 11, "y": 3 }, 
+        { "w": 1, "x": 0, "y": 4 }, 
+        { "w": 1, "x": 1, "y": 4 }, 
+        { "w": 1, "x": 2, "y": 4 }, 
+        { "w": 1, "x": 3, "y": 4 }, 
+        { "w": 1, "x": 4, "y": 4 }, 
+        { "w": 2, "x": 5, "y": 4 }, 
+        { "w": 1, "x": 7, "y": 4 }, 
+        { "w": 1, "x": 8, "y": 4 }, 
+        { "w": 1, "x": 9, "y": 4 }, 
+        { "w": 1, "x": 10, "y": 4 }, 
+        { "w": 1, "x": 11, "y": 4 } ]
+    },
+    "LAYOUT_preonic_grid": {
+      "key_count": 60,
+      "layout": [ 
+        { "w": 1, "x": 0, "y": 0 }, 
+        { "w": 1, "x": 1, "y": 0 }, 
+        { "w": 1, "x": 2, "y": 0 }, 
+        { "w": 1, "x": 3, "y": 0 }, 
+        { "w": 1, "x": 4, "y": 0 }, 
+        { "w": 1, "x": 5, "y": 0 }, 
+        { "w": 1, "x": 6, "y": 0 }, 
+        { "w": 1, "x": 7, "y": 0 }, 
+        { "w": 1, "x": 8, "y": 0 }, 
+        { "w": 1, "x": 9, "y": 0 }, 
+        { "w": 1, "x": 10, "y": 0 }, 
+        { "w": 1, "x": 11, "y": 0 }, 
+        { "w": 1, "x": 0, "y": 1 }, 
+        { "w": 1, "x": 1, "y": 1 }, 
+        { "w": 1, "x": 2, "y": 1 }, 
+        { "w": 1, "x": 3, "y": 1 }, 
+        { "w": 1, "x": 4, "y": 1 }, 
+        { "w": 1, "x": 5, "y": 1 }, 
+        { "w": 1, "x": 6, "y": 1 }, 
+        { "w": 1, "x": 7, "y": 1 }, 
+        { "w": 1, "x": 8, "y": 1 }, 
+        { "w": 1, "x": 9, "y": 1 }, 
+        { "w": 1, "x": 10, "y": 1 }, 
+        { "w": 1, "x": 11, "y": 1 }, 
+        { "w": 1, "x": 0, "y": 2 }, 
+        { "w": 1, "x": 1, "y": 2 }, 
+        { "w": 1, "x": 2, "y": 2 }, 
+        { "w": 1, "x": 3, "y": 2 }, 
+        { "w": 1, "x": 4, "y": 2 }, 
+        { "w": 1, "x": 5, "y": 2 }, 
+        { "w": 1, "x": 6, "y": 2 }, 
+        { "w": 1, "x": 7, "y": 2 }, 
+        { "w": 1, "x": 8, "y": 2 }, 
+        { "w": 1, "x": 9, "y": 2 }, 
+        { "w": 1, "x": 10, "y": 2 }, 
+        { "w": 1, "x": 11, "y": 2 }, 
+        { "w": 1, "x": 0, "y": 3 }, 
+        { "w": 1, "x": 1, "y": 3 }, 
+        { "w": 1, "x": 2, "y": 3 }, 
+        { "w": 1, "x": 3, "y": 3 }, 
+        { "w": 1, "x": 4, "y": 3 }, 
+        { "w": 1, "x": 5, "y": 3 }, 
+        { "w": 1, "x": 6, "y": 3 }, 
+        { "w": 1, "x": 7, "y": 3 }, 
+        { "w": 1, "x": 8, "y": 3 }, 
+        { "w": 1, "x": 9, "y": 3 }, 
+        { "w": 1, "x": 10, "y": 3 }, 
+        { "w": 1, "x": 11, "y": 3 },
+        { "w": 1, "x": 0, "y": 4 }, 
+        { "w": 1, "x": 1, "y": 4 }, 
+        { "w": 1, "x": 2, "y": 4 }, 
+        { "w": 1, "x": 3, "y": 4 }, 
+        { "w": 1, "x": 4, "y": 4 }, 
+        { "w": 1, "x": 5, "y": 4 }, 
+        { "w": 1, "x": 6, "y": 4 }, 
+        { "w": 1, "x": 7, "y": 4 }, 
+        { "w": 1, "x": 8, "y": 4 }, 
+        { "w": 1, "x": 9, "y": 4 }, 
+        { "w": 1, "x": 10, "y": 4 }, 
+        { "w": 1, "x": 11, "y": 4 } ]
+    }
+  }
+}

keyboards/preonic/preonic.h

@@ -3,7 +3,7 @@
 
 #include "quantum.h"
 
-#define PREONIC_MIT( \
+#define LAYOUT_preonic_mit( \
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
 	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
@@ -18,7 +18,7 @@
 	{ k40, k41, k42, k43, k44, k45, k45, k47, k48, k49, k4a, k4b } \
 }
 
-#define PREONIC_GRID( \
+#define LAYOUT_preonic_grid( \
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
 	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
@@ -33,7 +33,7 @@
 	{ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b } \
 }
 
-#define KEYMAP PREONIC_MIT
-#define LAYOUT_ortho_5x12 PREONIC_GRID
+#define KEYMAP LAYOUT_preonic_mit
+#define LAYOUT_ortho_5x12 LAYOUT_preonic_grid
 
 #endif

keyboards/preonic/readme.md

@@ -5,8 +5,8 @@ Preonic
 
 A compact 50% (12x5) ortholinear keyboard kit made and sold by OLKB and Massdrop. [More info on qmk.fm](http://qmk.fm/preonic/)
 
-Keyboard Maintainer: [Jack Humbert](https://github.com/jackhumbert)
-Hardware Supported: Preonic PCB rev1, Teensy 2.0
+Keyboard Maintainer: [Jack Humbert](https://github.com/jackhumbert)  
+Hardware Supported: Preonic PCB rev1, Teensy 2.0  
 Hardware Availability: [OLKB.com](https://olkb.com/preonic/), [Massdrop](https://www.massdrop.com/buy/preonic-mechanical-keyboard?mode=guest_open)
 
 Make example for this keyboard (after setting up your build environment):

keyboards/roadkit/keymaps/khord/keymap.c

@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | L1  | L2  |     |     | Layer hold
  */
   [_NP] = /* Numpad */
-    SINGLES_KEYMAP(KC_P7,        KC_P8,         KC_P9,   KC_BSPC, \
+    LAYOUT_ortho_4x4(KC_P7,        KC_P8,         KC_P9,   KC_BSPC, \
                    KC_P4,        KC_P5,         KC_P6,   KC_TAB, \
                    KC_P1,        KC_P2,         KC_P3,   KC_PENT, \
                    LT(1, KC_P0), LT(2, KC_SPC), KC_PDOT, KC_PSLS),
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----`-----`-----`-----'
  */
   [_L1] = /* LAYER 1 */
-    SINGLES_KEYMAP(RESET,   XXXXXXX, XXXXXXX, KC_DEL, \
+    LAYOUT_ortho_4x4(RESET,   XXXXXXX, XXXXXXX, KC_DEL, \
                    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, \
                    STR192,  STR255,  XXXXXXX, XXXXXXX, \
                    _______, BL_STEP, _______, XXXXXXX),
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----`-----`-----`-----'
  */
   [_L2] = /* LAYER 2 */
-    SINGLES_KEYMAP(XXXXXXX, XXXXXXX, ADMIN,   SMSPC1, \
+    LAYOUT_ortho_4x4(XXXXXXX, XXXXXXX, ADMIN,   SMSPC1, \
                    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
                    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
                    XXXXXXX, _______, XXXXXXX, XXXXXXX)

keyboards/roadkit/keymaps/singles/keymap.c

@@ -23,12 +23,12 @@ extern keymap_config_t keymap_config;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_NP] = /* Numpad */
-    SINGLES_KEYMAP(KC_KP_7, KC_KP_8,   KC_KP_9, KC_KP_PLUS,  \
+    LAYOUT_ortho_4x4(KC_KP_7, KC_KP_8,   KC_KP_9, KC_KP_PLUS,  \
                    KC_KP_4, KC_KP_5,   KC_KP_6, KC_KP_MINUS, \
                    KC_KP_1, KC_KP_2,   KC_KP_3, KC_KP_ENTER, \
                    KC_KP_0, KC_KP_DOT, TG(_L1), KC_BSPC),
   [_L1] = /* LAYER 1 */
-    SINGLES_KEYMAP(KC_NUMLOCK, KC_TRNS, KC_TRNS,  KC_VOLU, \
+    LAYOUT_ortho_4x4(KC_NUMLOCK, KC_TRNS, KC_TRNS,  KC_VOLU, \
                    KC_TRNS,    KC_UP,   KC_TRNS,  KC_VOLD, \
                    KC_LEFT,    KC_DOWN, KC_RIGHT, KC_TRNS, \
                    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS)

keyboards/roadkit/keymaps/singlesBrent/keymap.c

@@ -147,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----`-----`-----`-----'
  */
   [_NP] = /* Numpad */
-    SINGLES_KEYMAP(KC_7,        KC_8,          KC_9,              KC_SLASH,  \
+    LAYOUT_ortho_4x4(KC_7,        KC_8,          KC_9,              KC_SLASH,  \
                    KC_4,        KC_5,          KC_6,              KC_KP_ASTERISK, \
                    KC_1,        KC_2,          KC_3,              KC_MINUS, \
                    TD(TD_0_L3), TD(TD_DOT_L2), TD(TD_KP_PLUS_L1), TD(TD_EQUAL_NP)),
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----`-----`-----`-----'
  */
   [_L1] = /* LAYER 1 */
-    SINGLES_KEYMAP(KC_ESCAPE, KC_BSPACE, KC_HOME,  KC_PGUP, \
+    LAYOUT_ortho_4x4(KC_ESCAPE, KC_BSPACE, KC_HOME,  KC_PGUP, \
                    KC_TAB,    KC_UP,     KC_END,   KC_PGDOWN, \
                    KC_LEFT,   KC_DOWN,   KC_RIGHT, KC_KP_ENTER, \
                    KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS),
@@ -181,7 +181,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----`-----`-----`-----'
  */				   
   [_L2] = /* LAYER 2 */
-    SINGLES_KEYMAP(KC_SYSTEM_SLEEP,     KC_MS_BTN1,          KC_MS_BTN2,          KC_AUDIO_VOL_UP, \
+    LAYOUT_ortho_4x4(KC_SYSTEM_SLEEP,     KC_MS_BTN1,          KC_MS_BTN2,          KC_AUDIO_VOL_UP, \
                    LALT(KC_F4),         KC_F11,              LGUI(KC_TAB),        KC_AUDIO_VOL_DOWN, \
                    KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE, \
                    KC_TRNS,             KC_TRNS,             KC_TRNS,             KC_TRNS),
@@ -199,7 +199,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----`-----`-----`-----'
  */	
   [_L3] = /* LAYER 3 */
-    SINGLES_KEYMAP(KC_WWW_BACK,   KC_WWW_HOME, KC_WWW_FORWARD, KC_F5, \
+    LAYOUT_ortho_4x4(KC_WWW_BACK,   KC_WWW_HOME, KC_WWW_FORWARD, KC_F5, \
                    KC_CALCULATOR, LCTL(KC_Z),  LCTL(KC_Y),     KC_WWW_SEARCH, \
                    LCTL(KC_X),    LCTL(KC_C),  LCTL(KC_V),     LCTL(KC_F), \
                    KC_TRNS,       KC_TRNS,     KC_TRNS,        KC_TRNS),

keyboards/roadkit/roadkit.h

@@ -17,7 +17,7 @@
     { K30, KC_NO, K32, KC_NO }  \
 }
 
-#define SINGLES_KEYMAP( \
+#define LAYOUT_ortho_4x4( \
     K00, K01, K02, K03, \
     K10, K11, K12, K13, \
     K20, K21, K22, K23, \
@@ -30,6 +30,4 @@
     { K30,   K31,   K32,   K33 }  \
 }
 
-#define LAYOUT_ortho_4x4 SINGLES_KEYMAP
-
 #endif

keyboards/satan/keymaps/dkrieger/config.h

@@ -0,0 +1,26 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#include "../../config.h"
+
+/* Tap Dance */
+#define TAPPING_TERM 200
+
+#endif

keyboards/satan/keymaps/dkrieger/keymap.c

@@ -0,0 +1,167 @@
+#include "satan.h"
+#include "action_layer.h"
+
+#define _DEFAULT 0
+#define _FN 1
+#define _MOUSE 2
+#define _MOUSESHIFT 3
+#define _UTIL 4
+
+// Fillers to make layering more clear
+#define ______ KC_TRNS
+
+enum {
+  SUPER_FN = 0,
+  SINGLE_HOLD = 1,
+  DOUBLE_HOLD = 2,
+  TRIPLE_HOLD = 3
+};
+
+typedef struct {
+  bool is_press_action;
+  int state;
+} tap;
+
+int cur_dance (qk_tap_dance_state_t *state) {
+  if (state->interrupted == false || state->pressed) {
+    if (state->count < 2) return SINGLE_HOLD;
+    if (state->count < 3) return DOUBLE_HOLD;
+    else return TRIPLE_HOLD;
+  }
+  else return 9;
+}
+
+//instantiate an instance of 'tap' for the 'fn' tap dance.
+static tap fn_tap_state = {
+  .is_press_action  = true,
+  .state = 0
+};
+
+void fn_finished (qk_tap_dance_state_t *state, void *user_data) {
+  fn_tap_state.state = cur_dance(state);
+  switch (fn_tap_state.state) {
+    /* case SINGLE_HOLD: register_code(MO(_FN)); break; */
+    case SINGLE_HOLD: layer_on(_FN); break;
+    case DOUBLE_HOLD: layer_on(_MOUSE); break;
+    case TRIPLE_HOLD: layer_on(_UTIL);
+  }
+}
+
+void fn_reset (qk_tap_dance_state_t *state, void *user_data) {
+  switch (fn_tap_state.state) {
+    case SINGLE_HOLD: layer_off(_FN); break;
+    case DOUBLE_HOLD: layer_off(_MOUSE); layer_off(_MOUSESHIFT); break;
+    case TRIPLE_HOLD: layer_off(_UTIL);
+  }
+}
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+  [SUPER_FN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, fn_finished, fn_reset)
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Qwerty gui/alt/space/alt/gui
+ * ,-----------------------------------------------------------------------------------------.
+ * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  `  |
+ * |-----------------------------------------------------------------------------------------+
+ * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bksp  |
+ * |-----------------------------------------------------------------------------------------+
+ * | Ctrl    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
+ * |-----------------------------------------------------------------------------------------+
+ * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RShift    | FN  |
+ * |-----------------------------------------------------------------------------------------+
+ *         |LGUI | LAlt  |               Space                | RAlt   |RGUI |
+ *         `-----------------------------------------------------------------'
+ */
+  [_DEFAULT] = KEYMAP_HHKB( /* Basic QWERTY */
+      KC_ESC,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,       KC_MINS,    KC_EQL, KC_BSLS,    KC_GRV, \
+      KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,       KC_LBRC,    KC_RBRC,KC_BSPC,  \
+      KC_LCTL,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,   KC_SCLN,    KC_QUOT,    KC_ENT,   \
+      KC_LSFT,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,    TD(SUPER_FN), \
+      ______,   KC_LGUI,KC_LALT,                KC_SPC,                          KC_RALT,KC_RGUI,    ______,     ______ \
+      ),
+
+/* FN Layer
+ * ,-----------------------------------------------------------------------------------------.
+ * |     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Ins | Del |
+ * |-----------------------------------------------------------------------------------------+
+ * |  CAPS  | BL- | BL+ | BL  |     |     |     |     | Psc | Slck| Paus| Up  |     |        |
+ * |-----------------------------------------------------------------------------------------+
+ * |         | Vol-| Vol+| Mute|     |     | *   | /   | Home| PgUp| Left|Right|             |
+ * |-----------------------------------------------------------------------------------------+
+ * |           | Prev| Play| Next|     |     | +   | -   | End  |PgDn| Down|           |     |
+ * |-----------------------------------------------------------------------------------------+
+ *         |       |       |                                 | Stop  |       |
+ *         `-----------------------------------------------------------------'
+ */
+  [_FN] = KEYMAP_HHKB( /* Layer 1 */
+      ______, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_INS,  KC_DEL, \
+      KC_CAPS,  ______, ______, ______, ______, ______, ______, ______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   ______, ______,  \
+      ______,   KC_VOLD,KC_VOLU,KC_MUTE,______, ______, KC_PAST,KC_PSLS,KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, ______,   \
+      ______,   KC_MPRV,KC_MPLY,KC_MNXT,______, ______, KC_PPLS,KC_PMNS,KC_END,  KC_PGDN, KC_DOWN, ______,  ______,  \
+      ______,   ______, ______,                 ______,                 KC_MSTP, ______,  ______,  ______ \
+      ),
+
+/* MOUSE Layer
+ * ,-----------------------------------------------------------------------------------------.
+ * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |RESET|
+ * |----------------------------------------------------------------------------------------- 
+ * |        |     |     |     |     |     |     |     |     |     |     |UCurs|     |        |
+ * |----------------------------------------------------------------------------------------- 
+ * |         |     |     |     |     |     |     |     |     |     |LCurs|RCurs|             |
+ * |----------------------------------------------------------------------------------------- 
+ * | ScrollHold|     |     |     |     |     |     |     |      |    |DCurs| ScrollHold|     |
+ * |-----------------------------------------------------------------------------------------+
+ *         |       |       |                          LClick | MClick| RClick|
+ *         `-----------------------------------------------------------------'
+ */
+  [_MOUSE] = KEYMAP_HHKB(
+      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  RESET, \
+      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_MS_UP, ______, ______,  \
+      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_MS_LEFT, KC_MS_RIGHT, ______,   \
+      MO(_MOUSESHIFT), ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_MS_DOWN, MO(_MOUSESHIFT), ______,  \
+      ______,   ______, ______,                 KC_MS_BTN1,                 KC_MS_BTN3, KC_MS_BTN2, ______, ______ \
+      ),
+
+/* MOUSESHIFT Layer
+ * ,-----------------------------------------------------------------------------------------.
+ * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
+ * |----------------------------------------------------------------------------------------- 
+ * |        |     |     |     |     |     |     |     |     |     |     |UScrl|     |        |
+ * |----------------------------------------------------------------------------------------- 
+ * |         |     |     |     |     |     |     |     |     |     |LScrl|RScrl|             |
+ * |----------------------------------------------------------------------------------------- 
+ * |           |     |     |     |     |     |     |     |      |    |DScrl|           |     |
+ * |-----------------------------------------------------------------------------------------+
+ *         |       |       |                                 |       |       |
+ *         `-----------------------------------------------------------------'
+ */
+  [_MOUSESHIFT] = KEYMAP_HHKB(
+      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \
+      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_MS_WH_UP, ______, ______,  \
+      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_MS_WH_LEFT, KC_MS_WH_RIGHT, ______,   \
+      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_MS_WH_DOWN, ______, ______,  \
+      ______,   ______, ______,                 ______,                 ______, ______, ______, ______ \
+      ),
+
+/* UTIL Layer
+ * ,-----------------------------------------------------------------------------------------.
+ * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |RESET|
+ * |----------------------------------------------------------------------------------------- 
+ * |        |     |     |     |     |     |     |     |     |     |     |     |     |        |
+ * |----------------------------------------------------------------------------------------- 
+ * |         |     |     |     |     |     |     |     |     |     |     |     |             |
+ * |----------------------------------------------------------------------------------------- 
+ * |           |     |     |     |     |     |     |     |      |    |     |           |     |
+ * |-----------------------------------------------------------------------------------------+
+ *         |       |       |                                 |       |       |
+ *         `-----------------------------------------------------------------'
+ */
+  [_UTIL] = KEYMAP_HHKB(
+      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, RESET, \
+      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  \
+      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,   \
+      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  \
+      ______,   ______, ______,                 ______,                 ______, ______, ______, ______ \
+      )
+};

keyboards/satan/keymaps/dkrieger/readme.md

@@ -0,0 +1,23 @@
+# dkrieger HHKB like Layout
+
+Base derived from dbroqua (special thanks)
+
+Based on HHKB with the following [dip switches][1] engaged:
+
+- SW3: delete key -> backspace
+- SW5: swap alt and meta keys
+- SW2: Mac Mode (partial implementation, includes media keys
+    - Note: this was copied from dbroqua, there seem to have been some
+      modifications from stock Mac Mode
+
+Additionally, this layout includes a mouse layer engaged by tapping Fn 3 times,
+holding on the third time. The arrow keys move the mouse, scrolling when shift
+is held (either left or right). Right alt is left click, right meta is right
+click.
+
+# Programming Instructions:
+Enter into programming mode and run the following command.
+```
+$ sudo KEYMAP=dkrieger_hhkb make dfu
+```
+[1]: http://www.elitekeyboards.com/products.php?sub=pfu_keyboards,hhkbpro2&pid=pdkb400b

keyboards/satan/keymaps/dkrieger/rules.mk

@@ -1,36 +1,21 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# QMK Build Options
+# Build Options
 #   change to "no" to disable the options, or define them in the Makefile in 
 #   the appropriate keymap folder that will get included automatically
 #
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
+CONSOLE_ENABLE = yes         # Console for debug(+400)
 COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
+MIDI_ENABLE = no            # MIDI controls
 AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+TAP_DANCE_ENABLE = yes
 
 ifndef QUANTUM_DIR
 	include ../../../../Makefile

keyboards/viterbi/keymaps/drashna/keymap.c

@@ -1,6 +1,7 @@
 #include "viterbi.h"
 #include "action_layer.h"
 #include "eeconfig.h"
+#include "drashna.h"
 
 extern keymap_config_t keymap_config;
 
@@ -8,55 +9,21 @@ extern keymap_config_t keymap_config;
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.
-#define _NUMNAV   0
-#define _DIABLO   1
-#define _GAMEPAD  2
-#define _MACROS   3
-#define _MEDIA    4
-#define _COVECUBE 5
 
 
-enum custom_keycodes {
-    KC_DIABLO_CLEAR = SAFE_RANGE,
-    KC_P00,
-    KC_MAKE,
-    KC_OVERWATCH,
-    KC_SALT,
-    KC_MORESALT,
-    KC_SALTHARD,
-    KC_GOODGAME,
-    KC_SYMM,
-    KC_DOOMFIST,
-    KC_JUSTGAME,
-    KC_GLHF,
-    KC_TORB,
-    KC_AIM
-};
-
 // Fillers to make layering more clear
 #define _______ KC_TRNS
 #define XXXXXXX KC_NO
-#define MACROS   TG(_MACROS)
+
+#define LMACRO   TG(_MACROS)
 #define DIABLO   TG(_DIABLO)
-#define GAMEPAD  TG(_GAMEPAD)
+#define GAMEPAD  TG(_OVERWATCH)
 #define MEDIA    TG(_MEDIA)
 #define COVECUBE TG(_COVECUBE)
 
 
-bool is_overwatch = false;
 
 
-#ifdef RGBLIGHT_ENABLE
-#define rgblight_set_blue        rgblight_sethsv (0xFF,  0xFF, 0xFF);
-#define rgblight_set_red         rgblight_sethsv (0x00,  0xFF, 0xFF);
-#define rgblight_set_green       rgblight_sethsv (0x78,  0xFF, 0xFF);
-#define rgblight_set_orange      rgblight_sethsv (0x1E,  0xFF, 0xFF);
-#define rgblight_set_teal        rgblight_sethsv (0xC3,  0xFF, 0xFF);
-#define rgblight_set_magenta     rgblight_sethsv (0x12C, 0xFF, 0xFF);
-#define rgblight_set_yellow      rgblight_sethsv (0x3C,  0xFF, 0xFF);
-#define rgblight_set_purple      rgblight_sethsv (0x10E, 0xFF, 0xFF);
-#endif
-
 #ifdef TAP_DANCE_ENABLE
 //define diablo macro timer variables
 static uint16_t diablo_timer[4];
@@ -65,58 +32,58 @@ static uint8_t diablo_key_time[4];
 
 
 bool check_dtimer(uint8_t dtimer) {
-    // has the correct number of seconds elapsed (as defined by diablo_times)
-    return (timer_elapsed(diablo_timer[dtimer]) < (diablo_key_time[dtimer] * 1000)) ? false : true;
+  // has the correct number of seconds elapsed (as defined by diablo_times)
+  return (timer_elapsed(diablo_timer[dtimer]) < (diablo_key_time[dtimer] * 1000)) ? false : true;
 };
 
 
 enum {
-    TD_DIABLO_1 = 0,
-    TD_DIABLO_2,
-    TD_DIABLO_3,
-    TD_DIABLO_4
+  TD_D3_1 = 0,
+  TD_D3_2,
+  TD_D3_3,
+  TD_D3_4
 };
 
 
 // Cycle through the times for the macro, starting at 0, for disabled.
 // Max of six values, so don't exceed
 void diablo_tapdance_master(qk_tap_dance_state_t *state, void *user_data, uint8_t diablo_key) {
-    if (state->count >= 7) {
-        diablo_key_time[diablo_key] = diablo_times[0];
-        reset_tap_dance(state);
-    }
-    else {
-        diablo_key_time[diablo_key] = diablo_times[state->count - 1];
-    }
+  if (state->count >= 7) {
+    diablo_key_time[diablo_key] = diablo_times[0];
+    reset_tap_dance(state);
+  }
+  else {
+    diablo_key_time[diablo_key] = diablo_times[state->count - 1];
+  }
 }
 
 
 // Would rather have one function for all of this, but no idea how to do that...
 void diablo_tapdance1(qk_tap_dance_state_t *state, void *user_data) {
-    diablo_tapdance_master(state, user_data, 0);
+  diablo_tapdance_master(state, user_data, 0);
 }
 
 void diablo_tapdance2(qk_tap_dance_state_t *state, void *user_data) {
-    diablo_tapdance_master(state, user_data, 1);
+  diablo_tapdance_master(state, user_data, 1);
 }
 
 void diablo_tapdance3(qk_tap_dance_state_t *state, void *user_data) {
-    diablo_tapdance_master(state, user_data, 2);
+  diablo_tapdance_master(state, user_data, 2);
 }
 
 void diablo_tapdance4(qk_tap_dance_state_t *state, void *user_data) {
-    diablo_tapdance_master(state, user_data, 3);
+  diablo_tapdance_master(state, user_data, 3);
 }
 
 
 
 //Tap Dance Definitions
 qk_tap_dance_action_t tap_dance_actions[] = {
-    // tap once to disable, and more to enable timed micros
-    [TD_DIABLO_1] = ACTION_TAP_DANCE_FN(diablo_tapdance1),
-    [TD_DIABLO_2] = ACTION_TAP_DANCE_FN(diablo_tapdance2),
-    [TD_DIABLO_3] = ACTION_TAP_DANCE_FN(diablo_tapdance3),
-    [TD_DIABLO_4] = ACTION_TAP_DANCE_FN(diablo_tapdance4),
+  // tap once to disable, and more to enable timed micros
+  [TD_D3_1] = ACTION_TAP_DANCE_FN(diablo_tapdance1),
+  [TD_D3_2] = ACTION_TAP_DANCE_FN(diablo_tapdance2),
+  [TD_D3_3] = ACTION_TAP_DANCE_FN(diablo_tapdance3),
+  [TD_D3_4] = ACTION_TAP_DANCE_FN(diablo_tapdance4),
 
 };
 #endif
@@ -124,34 +91,34 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [_NUMNAV] = KEYMAP(
-      MACROS,  DIABLO,  GAMEPAD, KC_NLCK, KC_SLCK, KC_COLN, KC_PSLS,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-      MEDIA,   KC_CALC, COVECUBE,KC_P7,   KC_P8,   KC_P9,   KC_PAST,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-      KC_HOME, KC_DEL,  KC_PGUP, KC_P4,   KC_P5,   KC_P6,   KC_PMNS,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-      KC_END,  KC_UP,   KC_PGDN, KC_P1,   KC_P2,   KC_P3,   KC_PPLS,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-      KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_P00,  KC_PDOT, KC_PENT,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \
+  [_NUMLOCK] = KEYMAP(
+      LMACRO,      DIABLO,      GAMEPAD,     KC_NLCK, KC_SLCK, KC_COLN, KC_PSLS,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+      MEDIA,       KC_CALC,     COVECUBE,    KC_P7,   KC_P8,   KC_P9,   KC_PAST,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+      KC_HOME,     KC_DEL,      KC_PGUP,     KC_P4,   KC_P5,   KC_P6,   KC_PMNS,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+      KC_END,      KC_UP,       KC_PGDN,     KC_P1,       KC_P2,   KC_P3,   KC_PPLS,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+      KC_LEFT,     KC_DOWN, K   C_RGHT,      KC_P0,       KC_KP_00,KC_PDOT, KC_PENT,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \
   ),
 
   [_DIABLO] = KEYMAP(
-      KC_ESC,  DIABLO,  KC_V,    KC_D,    XXXXXXX, XXXXXXX, KC_L,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-      KC_TAB,  KC_S,    KC_F,    KC_I,    KC_M,    KC_T,    KC_J,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-      KC_Q,    KC_1,    KC_2,    KC_3,    KC_4,    KC_G,    KC_F,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-      KC_LCTL, (TD_DIABLO_1), TD(TD_DIABLO_2), TD(TD_DIABLO_3), TD(TD_DIABLO_4), KC_Z, KC_DIABLO_CLEAR,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-      KC_LALT, KC_F4,   KC_F5,   KC_F8,   KC_F9,   KC_F10,  SFT_T(KC_SPACE),          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \
+      KC_ESC,      DIABLO,      KC_V,        KC_D,        XXXXXXX,     XXXXXXX,     KC_L,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+      KC_TAB,      KC_S,        KC_F,        KC_I,        KC_M,        KC_T,        KC_J,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+      KC_Q,        KC_1,        KC_2,        KC_3,        KC_4,        KC_G,        KC_F,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+      KC_LCTL,     TD(TD_D3_1), TD(TD_D3_2), TD(TD_D3_3), TD(TD_D3_4), KC_Z,        KC_DIABLO_CLEAR,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+      KC_LALT,     KC_F4,       KC_F5,       KC_F8,       KC_F9,       KC_F10,      SFT_T(KC_SPACE),          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \
   ),
- 
-  [_GAMEPAD] = KEYMAP(  // Game pad layout designed primarily for Overwatch
-      MACROS,  KC_ESC,  GAMEPAD, KC_1,    KC_2,    KC_3,    KC_4,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-      MEDIA,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-      KC_Z,    KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-      KC_Y,    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-      KC_F1,   KC_U,    KC_I,    KC_Y,    KC_V,    KC_SPC,  KC_V,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \
+
+  [_OVERWATCH] = KEYMAP(  // Game pad layout designed primarily for Overwatch
+      LMACRO,      KC_ESC,      GAMEPAD,     KC_1,        KC_2,        KC_3,        KC_4,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+      MEDIA,       KC_TAB,      KC_Q,        KC_W,        KC_E,        KC_R,        KC_T,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+      KC_Z,        KC_LCTL,     KC_A,        KC_S,        KC_D,        KC_F,        KC_G,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+      KC_Y,        KC_LSFT,     KC_Z,        KC_X,        KC_C,        KC_V,        KC_B,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+      KC_F1,       KC_U,        KC_I,        KC_Y,        KC_V,        KC_SPC,      KC_V,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \
   ),
 
   [_MACROS] = KEYMAP(
-      MACROS,      XXXXXXX,     GAMEPAD,     XXXXXXX,     XXXXXXX,     XXXXXXX,     XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+      LMACRO,      XXXXXXX,     GAMEPAD,     XXXXXXX,     XXXXXXX,     XXXXXXX,     XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
       XXXXXXX,     XXXXXXX,     XXXXXXX,     XXXXXXX,     XXXXXXX,     XXXXXXX,     XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-      KC_SYMM,     KC_TORB,     KC_DOOMFIST, XXXXXXX,     XXXXXXX,     XXXXXXX,     XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+      KC_SYMM,     KC_TORB,     XXXXXXX,     XXXXXXX,     XXXXXXX,     XXXXXXX,     XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
       KC_GLHF,     KC_GOODGAME, XXXXXXX,     XXXXXXX,     XXXXXXX,     XXXXXXX,     XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
       KC_SALT,     KC_MORESALT, KC_SALTHARD, KC_JUSTGAME, KC_AIM,      XXXXXXX,     XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \
   ),
@@ -165,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_MEDIA] = KEYMAP(
-      RESET,   KC_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+      KC_RESET,KC_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
       MEDIA,   XXXXXXX, RGB_SAI, RGB_VAI, RGB_M_P, RGB_M_B, RGB_M_R,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
       RGB_TOG, RGB_MOD, RGB_SAD, RGB_VAD, RGB_M_SW,RGB_M_SN,RGB_M_K,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
       KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, RGB_M_K, RGB_M_X, RGB_M_G,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
@@ -177,230 +144,67 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    uint16_t kc;
-    if (is_overwatch) { 
-        kc = KC_BSPC;  
-    }
-    else {
-        kc = KC_ENTER;
-    }
-    // Once a delay command is added to "SEND_STRING", 
-    // replace these with X_BSPC and X_ENTER instead. 
-    // and add "SS_TAP(kc) SS_DELAY(50)" to all of the
-    // SEND_STRING commands, to compress things. 
-    switch (keycode) {
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
 #ifdef TAP_DANCE_ENABLE
-    case KC_DIABLO_CLEAR:  // reset all Diable timers, disabling them
-        if (record->event.pressed) {
-            uint8_t dtime;
-
-            for (dtime = 0; dtime < 4; dtime++) {
-                diablo_key_time[dtime] = diablo_times[0];
-            }
-        }
-        return false;
-        break;
-#endif
-    case KC_P00:
-        if (!record->event.pressed) {
-            register_code(KC_P0);
-            unregister_code(KC_P0);
-            register_code(KC_P0);
-            unregister_code(KC_P0);
-        }
-        return false;
-        break;
-    case KC_MAKE:
-        if (!record->event.pressed) {
-            SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP SS_TAP(X_ENTER));
-        }
-        return false;
-        break;
-    case KC_OVERWATCH:  // reset all Diable timers, disabling them
-        if (record->event.pressed) {
-            is_overwatch = !is_overwatch;
-        }
-#ifdef RGBLIGHT_ENABLE
-        is_overwatch ? rgblight_mode(17) : rgblight_mode(18);
-#endif
-        return false;
-        break;
-    case KC_SALT:
-        if (!record->event.pressed) {
-            register_code(kc);
-            unregister_code(kc);
-            _delay_ms(50);
-            SEND_STRING("Salt, salt, salt..." SS_TAP(X_ENTER));
-        }
-        return false;
-        break;
-    case KC_MORESALT:
-        if (!record->event.pressed) {
-            register_code(kc);
-            unregister_code(kc);
-            _delay_ms(50);
-            SEND_STRING("Please sir, can I have some more salt?!" SS_TAP(X_ENTER));
-        }
-        return false;
-        break;
-    case KC_SALTHARD:
-        if (!record->event.pressed) {
-            register_code(kc);
-            unregister_code(kc);
-            _delay_ms(50);
-            SEND_STRING("Your salt only makes my penis that much harder, and even more aggressive!" SS_TAP(X_ENTER));
-        }
-        return false;
-        break;
-    case KC_GOODGAME:
-        if (!record->event.pressed) {
-            register_code(kc);
-            unregister_code(kc);
-            _delay_ms(50);
-            SEND_STRING("Good game, everyone!" SS_TAP(X_ENTER));
-        }
-        return false;
-        break;
-    case KC_GLHF:
-        if (!record->event.pressed) {
-            register_code(kc);
-            unregister_code(kc);
-            _delay_ms(50);
-            SEND_STRING("Good luck, have fun!!!" SS_TAP(X_ENTER));
-        }
-        return false;
-        break;
-    case KC_SYMM:
-        if (!record->event.pressed) {
-            register_code(kc);
-            unregister_code(kc);
-            _delay_ms(50);
-            SEND_STRING("Left click to win!" SS_TAP(X_ENTER));
-        }
-        return false;
-        break;
-    case KC_JUSTGAME:
-
-        if (!record->event.pressed) {
-            register_code(kc);
-            unregister_code(kc);
-            _delay_ms(50);
-            SEND_STRING("It may be a game, but if you don't want to actually try, please go play AI, so that people that actually want to take the game seriously and \"get good\" have a place to do so without trolls like you throwing games." SS_TAP(X_ENTER));
-        }
-        return false;
-        break;
-    case KC_TORB:
-
-        if (!record->event.pressed) {
-            register_code(kc);
-            unregister_code(kc);
-            _delay_ms(50);
-            SEND_STRING("That was positively riveting! SS_TAP(X_ENTER)");
-        }
-        return false;
-        break;
-    case KC_AIM:
-
-        if (!record->event.pressed) {
-            register_code(kc);
-            unregister_code(kc);
-            _delay_ms(50);
-            SEND_STRING("That aim is absolutely amazing. It's almost like you're a machine!" SS_TAP(X_ENTER));
-            _delay_ms(50);
-            SEND_STRING("Wait! That aim is TOO good!  You're clearly using an aim hack! CHEATER!" SS_TAP(X_ENTER));
-        }
-        return false;
-        break;
-
+  case KC_DIABLO_CLEAR:  // reset all Diable timers, disabling them
+    if (record->event.pressed) {
+      uint8_t dtime;
 
+      for (dtime = 0; dtime < 4; dtime++) {
+        diablo_key_time[dtime] = diablo_times[0];
+      }
     }
-    return true;
+    return false;
+    break;
+#endif
+  }
+  return true;
 }
 
 #ifdef TAP_DANCE_ENABLE
 
 // Sends the key press to system, but only if on the Diablo layer
 void send_diablo_keystroke(uint8_t diablo_key) {
-    if (biton32(layer_state) == _DIABLO) {
-        switch (diablo_key) {
-        case 0:
-            SEND_STRING("1");
-            break;
-        case 1:
-            SEND_STRING("2");
-            break;
-        case 2:
-            SEND_STRING("3");
-            break;
-        case 3:
-            SEND_STRING("4");
-            break;
-        }
+  if (biton32(layer_state) == _DIABLO) {
+    switch (diablo_key) {
+    case 0:
+      SEND_STRING("1");
+      break;
+    case 1:
+      SEND_STRING("2");
+      break;
+    case 2:
+      SEND_STRING("3");
+      break;
+    case 3:
+      SEND_STRING("4");
+      break;
     }
+  }
 }
 
 // Checks each of the 4 timers/keys to see if enough time has elapsed
 // Runs the "send string" command if enough time has passed, and resets the timer.
 void run_diablo_macro_check(void) {
-    uint8_t dtime;
+  uint8_t dtime;
 
-    for (dtime = 0; dtime < 4; dtime++) {
-        if (check_dtimer(dtime) && diablo_key_time[dtime]) {
-            diablo_timer[dtime] = timer_read();
-            send_diablo_keystroke(dtime);
-        }
+  for (dtime = 0; dtime < 4; dtime++) {
+    if (check_dtimer(dtime) && diablo_key_time[dtime]) {
+      diablo_timer[dtime] = timer_read();
+      send_diablo_keystroke(dtime);
     }
+  }
 
 }
 #endif
 
 
-void matrix_init_user(void) { // Runs boot tasks for keyboard
-#ifdef RGBLIGHT_ENABLE
-    rgblight_enable();
-    rgblight_set_teal;
-    rgblight_mode(1);
-#endif
-};
 
-
-void matrix_scan_user(void) {  // runs frequently to update info
+void matrix_scan_keymap(void) {  // runs frequently to update info
 #ifdef TAP_DANCE_ENABLE
     // Run Diablo 3 macro checking code.
-    run_diablo_macro_check();
+  run_diablo_macro_check();
 #endif
 };
 
-
-uint32_t layer_state_set_kb(uint32_t state) {
-#ifdef RGBLIGHT_ENABLE
-    rgblight_enable();
-    switch (biton32(state)) {
-    case _NUMNAV:
-        rgblight_set_teal;
-        rgblight_mode(2);
-        break;
-    case _MACROS:
-        rgblight_set_orange;
-        is_overwatch ? rgblight_mode(17) : rgblight_mode(18);
-        break;
-    case _DIABLO:
-        rgblight_set_red;
-        rgblight_mode(5);
-        break;
-    case _GAMEPAD:
-        rgblight_set_yellow;
-        rgblight_mode(1);
-        break;
-    case _MEDIA:
-        rgblight_set_blue;
-        rgblight_mode(1);
-        break;
-    case _COVECUBE:
-        rgblight_set_green;
-        rgblight_mode(2);
-    }
-#endif
-    return state;
-}

keyboards/xd60/keymaps/petesmom/README.md

@@ -0,0 +1,26 @@
+# pete's mom Layout
+
+Customized xd60 keymap based on yuuki's but a step sideways with Mac support. For Pete on his 40th
+
+## Programming Instructions
+
+Change the layout in `keymap.c` then run `make xd60-petesmom`. The compiled file will be located in `.build/xd60_petesmom.hex` relative to the project root. To flash it onto your keyboard, use whatever program works on your OS. I personally use `dfu-programmer`, and run:
+
+* `sudo dfu-programmer atmega32u4 erase`
+* `sudo dfu-programmer atmega32u4 flash .build/xd60-petesmom.hex`
+* `sudo dfu-programmer atmega32u4 start`
+
+## Layout
+
+See `keymap.c` for the details, but here are the important features:
+
+| Key                        | Function                           |
+| -------------------------- | ---------------------------------- |
+| ESC | ESC when pressed alone but acts as ~ when pressed with Shift or LGUI down |
+| FN + ESC | Grave |
+| Right Shift | When tapped generates / |
+| FN + HJKL | Arrow Keys |
+| FN + C | ^ |
+| FN + V | & |
+| FN + , . RShift | Mac Vol - + Mute |
+| FN + P [ ] \ | Mac Play/Pause, Prev Track, Next Track, Stop |

keyboards/xd60/keymaps/petesmom/keymap.c

@@ -0,0 +1,28 @@
+#include "xd60.h"
+#include "action_layer.h"
+
+#define BASE 0
+#define FN 1
+
+#define CTL_SLSH CTL_T(KC_SLSH)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  // 0: Base Layer
+  [BASE] = KEYMAP(
+      KC_GESC,   KC_1,    KC_2,     KC_3,     KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,   \
+      KC_TAB,    KC_Q,    KC_W,     KC_E,     KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC,            KC_BSLS,   \
+      KC_CAPS,   KC_A,    KC_S,     KC_D,     KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN,  KC_QUOT,  KC_NO,              KC_ENT,    \
+      KC_LSFT,   KC_NO,   KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_NO,    RSFT_T(KC_SLASH),  KC_UP,    KC_RCTL,    \
+      CTL_SLSH,  KC_LALT, KC_LGUI,                              KC_SPC,                              KC_RGUI,  MO(FN),  KC_LEFT,  KC_DOWN,  KC_RIGHT
+      ),
+  // 1: Function Layer
+  [FN] = KEYMAP(
+      KC_GRV,    KC_F1,   KC_F2,    KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_DEL,    \
+      KC_TRNS,   RGB_MOD, RGB_VAI,  KC_TRNS,  KC_TRNS, KC_HOME, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_MPLY,  KC_MRWD,  KC_MFFD,            KC_MSTP, \
+      KC_TRNS,   RGB_TOG, RGB_VAD,  KC_MUTE,  KC_VOLU, KC_VOLD, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_NO,              KC_ENT,    \
+      KC_TRNS,   KC_NO,   KC_TRNS,  KC_TRNS,  KC_CIRC, KC_AMPR, KC_TRNS, KC_TRNS, KC_TRNS,KC__VOLDOWN,KC__VOLUP,KC_NO,   KC__MUTE,KC_PGUP,  RESET,   \
+      KC_TRNS,   KC_TRNS, KC_TRNS,                              KC_SPC,                              KC_TRNS,  KC_TRNS,  KC_HOME,  KC_PGDOWN,KC_END
+      ),
+
+};

keyboards/xd60/keymaps/yuuki/README.md

@@ -6,13 +6,18 @@ Customized xd60 keymap with inspirations from HHKB and the layout I used on my V
 
 Change the layout in `keymap.c` then run `make xd60:yuuki`. The compiled file will be located in `.build/xd60_yuuki.hex` relative to the project root. To flash it onto your keyboard, use whatever program works on your OS. I personally use `dfu-programmer`, and run:
 
+* reset keyboard by pressing the reset button on the back of the PCB
 * `sudo dfu-programmer atmega32u4 erase`
-* `sudo dfu-programmer atmega32u4 flash .build/xd60-yuuki.hex`
+* `sudo dfu-programmer atmega32u4 flash .build/xd60_yuuki.hex`
 * `sudo dfu-programmer atmega32u4 start`
 
 ## Layout
 
-See `keymap.c` for the details, but here are the important features:
+![Keyboard Layout](https://github.com/cideM/cidem.github.io/blob/master/keyboard-layout.png "Layout")
+
+Upper row is default layer, bottom row is function layer. I Didn't include the symbols, such as @,# or $, as their placement is just as you'd expect it.
+
+## Summary of Changes
 
 | Key                        | Function                           |
 | -------------------------- | ---------------------------------- |
@@ -23,4 +28,4 @@ See `keymap.c` for the details, but here are the important features:
 | FN + HJKL | Arrow Keys |
 | Rightmost key in second row from bottom | Temporarily activate function layer |
 | FN + C | ^ |
-| FN + V | & (both for convenience as I use these keys a lot with VIM navigation and I find them hard reach) |
+| FN + V | & (both for convenience as I use these keys a lot with VIM navigation and I find them hard reach) |