Revert changes to chibiOS-contrib (#4176)

* Revert "Keymap: qwerty_code_friendly: use numpad layout for f-keys (#4170)"

This reverts commit efc88a0b16.

* Fix keymap

docs/_sidebar.md

@@ -3,6 +3,7 @@
   * [Building Your First Firmware](newbs_building_firmware.md)
   * [Flashing Firmware](newbs_flashing.md)
   * [Testing and Debugging](newbs_testing_debugging.md)
+  * [Best Practices](newbs_best_practices.md)
   * [Learning Resources](newbs_learn_more_resources.md)
 
 * [QMK Basics](README.md)

docs/_summary.md

@@ -3,6 +3,8 @@
   * [Building Your First Firmware](newbs_building_firmware.md)
   * [Flashing Firmware](newbs_flashing.md)
   * [Testing and Debugging](newbs_testing_debugging.md)
+  * [Best Practices](newbs_best_practices.md)
+  * [Learning Resources](newbs_learn_more_resources.md)
 
 * [QMK Basics](README.md)
   * [QMK Introduction](getting_started_introduction.md)

docs/newbs.md

@@ -12,6 +12,7 @@ There are 5 main sections to this guide:
 * [Building Your First Firmware](newbs_building_firmware.md)
 * [Flashing Firmware](newbs_flashing.md)
 * [Testing and Debugging](newbs_testing_debugging.md)
+* [Best Practices](newbs_best_practices.md)
 * [Learn More with these Resources](newbs_learn_more_resources.md)
 
 This guide is focused on helping someone who has never compiled software before. It makes choices and recommendations based on that viewpoint. There are alternative methods for many of these procedures, and we support most of those alternatives. If you have any doubt about how to accomplish a task you can [ask us for guidance](getting_started_getting_help.md).

docs/newbs_best_practices.md

@@ -0,0 +1,163 @@
+# Best Practices
+
+## Or, "How I Learned to Stop Worrying and Love Git."
+
+This document aims to instruct novices in the best ways to have a smooth experience in contributing to QMK. We will walk through the process of contributing to QMK, detailing some ways to make this task easier, and then later we'll break some things in order to teach you how to fix them.
+
+This document assumes a few things:
+
+1. You have a GitHub account, and have [forked the qmk_firmware repository](getting_started_github.md) to your account.
+2. You've [set up your build environment](newbs_getting_started.md?id=environment-setup).
+
+
+## Your fork's master: Update Often, Commit Never
+
+It is highly recommended for QMK development, regardless of what is being done or where, to keep your `master` branch updated, but ***never*** commit to it. Instead, do all your changes in a development branch and issue pull requests from your branches when you're developing.
+
+To reduce the chances of merge conflicts — instances where two or more users have edited the same part of a file concurrently — keep your `master` branch relatively up-to-date, and start any new developments by creating a new branch.
+
+### Updating your master branch
+
+To keep your `master` branch updated, it is recommended to add the QMK Firmware repository ("repo") as a remote repository in git. To do this, open your Git command line interface and enter:
+
+```
+git remote add upstream https://github.com/qmk/qmk_firmware.git
+```
+
+To verify that the repository has been added, run `git remote -v`, which should return the following:
+
+```
+$ git remote -v
+origin  https://github.com/<your_username>/qmk_firmware.git (fetch)
+origin  https://github.com/<your_username>/qmk_firmware.git (push)
+upstream        https://github.com/qmk/qmk_firmware.git (fetch)
+upstream        https://github.com/qmk/qmk_firmware.git (push)
+```
+
+Now that this is done, you can check for updates to the repo by running `git fetch upstream`. This retrieves the branches and tags &mdash; collectively referred to as "refs" &mdash; from the QMK repo, which now has the nickname `upstream`. We can now compare the data on our fork `origin` to that held by QMK.
+
+To update your fork's master, run the following, hitting the Enter key after each line:
+
+```
+git checkout master
+git fetch upstream
+git pull upstream master
+git push origin master
+```
+
+This switches you to your `master` branch, retrieves the refs from the QMK repo, downloads the current QMK `master` branch to your computer, and then uploads it to your fork.
+
+### Making Changes
+
+To make changes, create a new branch by entering:
+
+```
+git checkout -b dev_branch
+git push --set-upstream origin dev_branch
+```
+
+This creates a new branch named `dev_branch`, checks it out, and then saves the new branch to your fork. The `--set-upstream` argument tells git to use your fork and the `dev_branch` branch every time you use `git push` or `git pull` from this branch. It only needs to be used on the first push; after that, you can safely use `git push` or `git pull`, without the rest of the arguments.
+
+!> With `git push`, you can use `-u` in place of `--set-upstream` &mdash; `-u` is an alias for `--set-upstream`.
+
+You can name your branch nearly anything you want, though it is recommended to name it something related to the changes you are going to make.
+
+By default `git checkout -b` will base your new branch on the branch that is checked out. You can base your new branch on an existing branch that is not checked out by adding the name of the existing branch to the command:
+
+```
+git checkout -b dev_branch master
+```
+
+Now that you have a development branch, open your text editor and make whatever changes you need to make. It is recommended to make many small commits to your branch; that way, any change that causes issues can be more easily traced and undone if needed. To make your changes, edit and save any files that need to be updated, add them to Git's *staging area*, and then commit them to your branch:
+
+```
+git add path/to/updated_file
+git commit -m "My commit message."
+```
+
+`git add` adds files that have been changed to Git's *staging area*, which is Git's "loading zone." This contains the changes that are going to be *committed* by `git commit`, which saves the changes to the repo. Use descriptive commit messages so you can know what was changed at a glance.
+
+!> If you've changed a lot of files, but all the files are part of the same change, you can use `git add .` to add all the changed files that are in your current directory, rather than having to add each file individually.
+
+### Publishing Your Changes
+
+The last step is to push your changes to your fork. To do this, enter `git push`. Git now publishes the current state of `dev_branch` to your fork.
+
+
+## Resolving Merge Conflicts
+
+Sometimes when your work in a branch takes a long time to complete, changes that have been made by others conflict with changes you have made to your branch when you open a pull request. This is called a *merge conflict*, and is what happens when multiple people edit the same parts of the same files.
+
+### Rebasing Your Changes
+
+A *rebase* is Git's way of taking changes that were applied at one point, reversing them, and then applying the same changes to another point. In the case of a merge conflict, you can rebase your branch to grab the changes that were made between when you created your branch and the present time.
+
+To start, run the following:
+
+```
+git fetch upstream
+git rev-list --left-right --count HEAD...upstream/master
+```
+
+The `git rev-list` command entered here returns the number of commits that differ between the current branch and QMK's master branch. We run `git fetch` first to make sure we have the refs that represent the current state of the upstream repo. The output of the `git rev-list` command entered returns two numbers:
+
+```
+$ git rev-list --left-right --count HEAD...upstream/master
+7       35
+```
+
+The first number represents the number of commits on the current branch since it was created, and the second number is the number of commits made to `upstream/master` since the current branch was created, and thus, the changes that are not recorded in the current branch.
+
+Now that the current states of both the current branch and the upstream repo are known, we can start a rebase operation:
+
+```
+git rebase upstream/master
+```
+
+This tells Git to undo the commits on the current branch, and then reapply them against QMK's master branch.
+
+```
+$ git rebase upstream/master
+First, rewinding head to replay your work on top of it...
+Applying: Commit #1
+Using index info to reconstruct a base tree...
+M       conflicting_file_1.txt
+Falling back to patching base and 3-way merge...
+Auto-merging conflicting_file_1.txt
+CONFLICT (content): Merge conflict in conflicting_file_1.txt
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch' to see the failed patch
+Patch failed at 0001 Commit #1
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+```
+
+This tells us that we have a merge conflict, and gives the name of the file with the conflict. Open the conflicting file in your text editor, and somewhere in the file, you'll find something like this:
+
+```
+<<<<<<< HEAD
+<p>For help with any issues, email us at [email protected].</p>
+=======
+<p>Need help? Email [email protected].</p>
+>>>>>>> Commit #1
+```
+
+The line `<<<<<<< HEAD` marks the beginning of a merge conflict, and the `>>>>>>> Commit #1` line marks the end, with the conflicting sections separated by `=======`. The part on the `HEAD` side is from the QMK master version of the file, and the part marked with the commit message is from the current branch and commit.
+
+Because Git tracks *changes to files* rather than the contents of the files directly, if Git can't find the text that was in the file previous to the commit that was made, it won't know how to edit the file. Re-editing the file will solve the conflict. Make your changes, and then save the file.
+
+```
+<p>Need help? Email [email protected].</p>
+```
+
+Now run:
+
+```
+git add conflicting_file_1.txt
+git rebase --continue
+```
+
+Git logs the changes to the conflicting file, and continues applying the commits from our branch until it reaches the end.

docs/newbs_learn_more_resources.md

@@ -1,13 +1,15 @@
 # Learning Resources
-These resources are aimed at giving new members in the qmk community more understanding to the information provided in the newbs docs.
+
+These resources are aimed at giving new members in the QMK community more understanding to the information provided in the Newbs docs.
 
 Git resources:
 
 * [Great General Tutorial](https://www.codecademy.com/learn/learn-git)
 * [Git Game To Learn From Examples](https://learngitbranching.js.org/)
 * [Git Resources to Learn More About Github](getting_started_github.md)
-* [Git Resources Aimed Specificly toward QMK](contributing.md)
+* [Git Resources Aimed Specifically toward QMK](contributing.md)
 
 
 Command Line resources:
+
 * [Good General Tutorial on Command Line](https://www.codecademy.com/learn/learn-the-command-line)

docs/ref_functions.md

@@ -1,28 +1,79 @@
 # List of Useful Core Functions To Make Your Keyboard Better
 
-There are a lot of hidden functions in QMK that are incredible useful, or may add a bit of functionality that you've been wanting.  Functions that are specific to certain features are not included here, as those will be on their respective feature page. 
+There are a lot of hidden functions in QMK that are incredible useful, or may add a bit of functionality that you've been wanting.  Functions that are specific to certain features are not included here, as those will be on their respective feature page.
 
 ## (OLKB) Tri Layers
 
-There are actually separate functions that you can use there, depending on what you're after. 
+There are actually separate functions that you can use there, depending on what you're after.
 
-The first is the `update_tri_layer(x, y, z)` function.   This function check to see if layers `x` and `y` are both on. If they are both on, then it runs on layer `z`.  Otherwise, if both `x` and `y` are not both on (either only one is, or neither is), then it runs off layer `z`. 
+### `update_tri_layer(x, y, z)`
 
-This function is useful if you want to create specific keys that have this functionality, but other layer keycodes won't do this. 
+The first is the `update_tri_layer(x, y, z)` function.   This function check to see if layers `x` and `y` are both on. If they are both on, then it runs on layer `z`.  Otherwise, if both `x` and `y` are not both on (either only one is, or neither is), then it runs off layer `z`.
 
-The other function is `update_tri_layer_state(state, x, y, z)`.  This function is meant to be called from they [`layer_state_set_*` functions](custom_quantum_functions.md#layer-change-code).  This means that any time that you use a keycode to change the layer, this will be checked.  So you could use `LT(layer, kc)` to change the layer and it will trigger the same layer check. 
+This function is useful if you want to create specific keys that have this functionality, but other layer keycodes won't do this.
 
-The caveat to this method is that you cannot access the `z` layer without having `x` and `y` layers on, since if you try to activate just layer `z`, it will run this code and turn off layer `z` before you could use it. 
+#### Example
+
+```c
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    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;
+    }
+  return true;
+}
+```
+
+### `update_tri_layer_state(state, x, y, z)`
+The other function is `update_tri_layer_state(state, x, y, z)`.  This function is meant to be called from they [`layer_state_set_*` functions](custom_quantum_functions.md#layer-change-code).  This means that any time that you use a keycode to change the layer, this will be checked.  So you could use `LT(layer, kc)` to change the layer and it will trigger the same layer check.
+
+The caveat to this method is that you cannot access the `z` layer without having `x` and `y` layers on, since if you try to activate just layer `z`, it will run this code and turn off layer `z` before you could use it.
+
+#### Example
+
+```c
+uint32_t layer_state_set_user(uint32_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
+```
+
+Alternatively, you don't have to immediately "return" the value.  This is useful if you want to add multiple tri layers, or if you want to add additional effects.
+
+```c
+uint32_t layer_state_set_user(uint32_t state) {
+  state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+  state = update_tri_layer_state(state, _RAISE, _SYMB, _SPECIAL);
+  return state;
+}
+```
 
 ## Setting the Persistent Default Layer
 
-Do you want to set the default layer, so that it's retained even after you unplug the board?  If so, this is the function for you. 
+Do you want to set the default layer, so that it's retained even after you unplug the board?  If so, this is the function for you.
 
-To use this, you would use `set_single_persistent_default_layer(layer)`.  If you have a name defined for your layer, you can use that instead (such as _QWERTY, _DVORAK or _COLEMAK). 
+To use this, you would use `set_single_persistent_default_layer(layer)`.  If you have a name defined for your layer, you can use that instead (such as _QWERTY, _DVORAK or _COLEMAK).
 
-This will set the default layer, update the persistent settings, and play a tune if you have [Audio](feature_audio.md) enabled on your board, and the default layer sounds set. 
+This will set the default layer, update the persistent settings, and play a tune if you have [Audio](feature_audio.md) enabled on your board, and the default layer sounds set.
 
-To configure the default layer sounds, you would want to define this in your `config.h` file, like this: 
+To configure the default layer sounds, you would want to define this in your `config.h` file, like this:
 
 ```c
 #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
@@ -36,13 +87,12 @@ To configure the default layer sounds, you would want to define this in your `co
 
 ## Reseting the keyboard
 
-There is the `RESET` quantum keycode that you can use. But if you want to reset the board as part of a macro, rather than hitting a key separately, you can do that. 
+There is the `RESET` quantum keycode that you can use. But if you want to reset the board as part of a macro, rather than hitting a key separately, you can do that.
 
 And to do so, add `reset_keyboard()` to your function or macro, and this will reset to bootloader.
 
 ## Wiping the EEPROM (Persistent Storage)
 
-If you're having issues with Audio, RGB Underglow, backlighting or keys acting weird, then you can reset the EEPROM (persistent setting storage).  Bootmagic is one way to do this, but if that isn't enabled, then you can use a custom macro to do so. 
+If you're having issues with Audio, RGB Underglow, backlighting or keys acting weird, then you can reset the EEPROM (persistent setting storage).  Bootmagic is one way to do this, but if that isn't enabled, then you can use a custom macro to do so.
-
-To wipe the EEPROM, run `eeconfig_init()` from your function or macro to reset most of the settings to default. 
 
+To wipe the EEPROM, run `eeconfig_init()` from your function or macro to reset most of the settings to default.

keyboards/5x5/5x5.h

@@ -35,7 +35,7 @@
     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, ___, ___, ___, ___, ___}, \
     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, ___, ___, ___, ___, ___}, \
     { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, ___, ___, ___, ___, ___}, \
-    { K30, K31, K32, K33, K34, K35, K35, K37, K38, K39, ___, ___, ___, ___, ___}, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, ___, ___, ___, ___, ___}, \
     { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, ___, ___, ___, ___, ___} \
 }
 
@@ -50,7 +50,7 @@
     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e}, \
     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e}, \
     { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e}, \
-    { K30, K31, K32, K33, K34, K35, K35, K37, K38, K39, K3a, K3b, K3c, K3d, K3e}, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e}, \
     { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b, K4c, K4d, K4e} \
 }
 

keyboards/atreus62/keymaps/194h/config.h

@@ -0,0 +1,6 @@
+#pragma once
+#define ONESHOT_TIMEOUT 3000
+#define TAPPING_TERM 200
+#define FORCE_NKRO
+#define LEADER_TIMEOUT 1000
+#define TAPPING_TOGGLE 3

keyboards/atreus62/keymaps/194h/keymap.c

@@ -0,0 +1,160 @@
+#include QMK_KEYBOARD_H
+
+//The current Nordic and Norwegian layout files are a mess. I'll do it myself:
+//Norwegian
+#define  NO_AE    KC_QUOT     //  Æ
+#define  NO_AO    KC_LBRC     //  Å
+#define  NO_BSLS  KC_EQL      //  Backslash
+#define  NO_LT    KC_NUBS     //  <
+#define  NO_MINS  KC_SLSH     //  -
+#define  NO_OE    KC_SCLN     //  Ø
+#define  NO_PIPE  KC_GRV      //  |
+#define  NO_PLUS  KC_MINS     //  +
+#define  NO_QUOT  KC_NUHS     //  '
+#define  NO_UMLA  KC_RBRC     //  ¨
+//Norwegian - Modifier dependant definitions
+#define  NO_EXLM  LSFT(KC_1)        //  !
+#define  NO_DQT   LSFT(KC_2)        //  "
+#define  NO_AT    RALT(KC_2)        //  @
+#define  NO_HASH  LSFT(KC_3)        //  #
+#define  NO_EUR   LSFT(KC_4)        //  €
+#define  NO_DLR   RALT(KC_4)        //  $
+#define  NO_PERC  LSFT(KC_5)        //  %
+#define  NO_AND   LSFT(KC_6)        //  &
+#define  NO_SLSH  LSFT(KC_7)        //  /
+#define  NO_PO    LSFT(KC_8)        //  (
+#define  NO_PC    LSFT(KC_9)        //  )
+#define  NO_EQL   LSFT(KC_0)        //  =
+#define  NO_LCBR  RALT(KC_7)        //  {
+#define  NO_LBRC  RALT(KC_8)        //  [
+#define  NO_RBRC  RALT(KC_9)        //  ]
+#define  NO_RCBR  RALT(KC_0)        //  }
+#define  NO_COLN  LSFT(KC_DOT)      //  :
+#define  NO_SCLN  LSFT(KC_COMM)     //  ;
+#define  NO_MU    RALT(KC_M)        //  µ
+#define  NO_EURO  RALT(KC_E)        //  €
+#define  NO_SECT  LSFT(KC_GRV)      //  §
+#define  NO_GERC  RALT(KC_COMM)     //  ¸
+#define  NO_QUAR  LSFT(RALT(KC_4))  //  ¼
+//Norwegian layout - dependant on previous definitions
+#define  NO_UNDS  LSFT(NO_MINS)  //  _
+#define  NO_QUES  LSFT(NO_PLUS)  //  ?
+#define  NO_GRAV  LSFT(NO_BSLS)  //  `
+#define  NO_GT    LSFT(NO_LT)    //  >
+#define  NO_HALF  RALT(NO_LT)    //  ½
+#define  NO_HAT   LSFT(NO_UMLA)  //  ^
+#define  NO_ASTR  LSFT(NO_QUOT)  //  *
+#define  NO_TILD  RALT(NO_UMLA)  //  ~
+
+//One Shot Modifier
+#define OSM_LCTL OSM(MOD_LCTL)
+#define OSM_LALT OSM(MOD_LALT)
+#define OSM_LSFT OSM(MOD_LSFT)
+#define OSM_LGUI OSM(MOD_LGUI)
+#define OSM_RCTL OSM(MOD_RCTL)
+#define OSM_RALT OSM(MOD_RALT)
+#define OSM_RSFT OSM(MOD_RSFT)
+#define OSM_RGUI OSM(MOD_RGUI)
+
+//Layers
+#define L1 0
+#define L2 1
+#define L3 2
+#define L4 3
+#define L5 4
+
+// Momentary switch to layer - One Shot Layer
+#define OSL_L3 OSL(L3)
+#define OSL_L4 OSL(L4)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [L1] = LAYOUT(
+	KC_LGUI,       KC_1,         KC_2,         KC_3,         KC_4,         KC_5,                                     KC_6,         KC_7,         KC_8,         KC_9,         KC_0,         KC_RGUI,
+	KC_TAB,        KC_Q,         KC_W,         KC_E,         KC_R,         KC_T,                                     KC_Y,         KC_U,         KC_I,         KC_O,         KC_P,         NO_DQT,
+	KC_BSPC,       KC_A,         KC_S,         KC_D,         KC_F,         KC_G,                                     KC_H,         KC_J,         KC_K,         KC_L,         NO_SCLN,      NO_QUOT,
+	OSM_LSFT,      KC_Z,         KC_X,         KC_C,         KC_V,         KC_B,                                     KC_N,         KC_M,         KC_COMM,      KC_DOT,       NO_MINS,      OSM_RSFT,
+	CTL_T(KC_ESC), MO(L5),       KC_LEAD,      OSM_LALT,     MO(L4),       OSL_L3,       KC_SPC,       KC_ENT,       OSL_L3,       MO(L4),       OSM_RALT,     NO_EQL,       NO_PLUS,      KC_RCTL
+  ),
+  [L2] = LAYOUT(
+	_______,       _______,      _______,      _______,      _______,      _______,                                  _______,      _______,      _______,      _______,      _______,      _______,
+	_______,       _______,      _______,      _______,      _______,      _______,                                  _______,      _______,      _______,      _______,      _______,      NO_AO,
+	_______,       _______,      _______,      _______,      _______,      _______,                                  _______,      _______,      _______,      _______,      NO_OE,        NO_AE,
+	_______,       _______,      _______,      _______,      _______,      _______,                                  _______,      _______,      _______,      _______,      _______,      _______,
+	_______,       _______,      _______,      _______,      _______,      _______,      _______,      _______,      _______,      _______,      _______,      _______,      _______,      _______       
+  ),
+  [L3] = LAYOUT(
+	NO_LBRC,       XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,                                  XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      NO_RBRC,
+	NO_LCBR,       XXXXXXX,      XXXXXXX,      NO_AT,        XXXXXXX,      NO_TILD,                                  NO_QUES,      NO_EXLM,      NO_PIPE,      XXXXXXX,      XXXXXXX,      NO_RCBR,
+	_______,       NO_ASTR,      NO_BSLS,      NO_DLR,       NO_HASH,      XXXXXXX,                                  NO_HAT,       XXXXXXX,      NO_COLN,      NO_SLSH,      NO_SCLN,      NO_QUOT,
+	NO_PO,         KC_0,         NO_SECT,      NO_PERC,      XXXXXXX,      NO_GRAV,                                  NO_AND,       NO_UMLA,      NO_LT,        NO_GT,        NO_UNDS,      NO_PC,
+	XXXXXXX,       _______,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      _______,      _______,      XXXXXXX
+  ),
+  [L4] = LAYOUT(
+	KC_ESC,        KC_F1,        KC_F2,        KC_F3,        KC_F4,        KC_F5,                                    XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,
+	XXXXXXX,       KC_F6,        KC_F7,        KC_F8,        KC_F9,        KC_F10,                                   KC_HOME,      KC_PGDN,      KC_PGUP,      KC_END,       XXXXXXX,      XXXXXXX,
+	_______,       KC_F11,       KC_F12,       KC_F13,       KC_F14,       KC_F15,                                   KC_LEFT,      KC_DOWN,      KC_UP,        KC_RIGHT,     XXXXXXX,      KC_DEL,
+	XXXXXXX,       KC_F16,       KC_F17,       KC_F18,       KC_F19,       KC_F20,                                   XXXXXXX,      KC_APP,       XXXXXXX,      XXXXXXX,      KC_VOLD,      XXXXXXX,
+	OSM_LCTL,      _______,      XXXXXXX,      _______,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      KC_MUTE,      KC_VOLU,      OSM_RCTL
+  ),
+  [L5] = LAYOUT(
+	XXXXXXX,       TO(L1),       TO(L2),       TO(L3),       TO(L4),       XXXXXXX,                                  XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,
+	XXXXXXX,       XXXXXXX,      XXXXXXX,      XXXXXXX,      RESET,        XXXXXXX,                                  XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      NO_AO,  
+	XXXXXXX,       XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,                                  XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      NO_OE,        NO_AE,  
+	XXXXXXX,       XXXXXXX,      XXXXXXX,      KC_CAPS,      XXXXXXX,      XXXXXXX,                                  XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,
+	XXXXXXX,       _______,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX
+  )
+};
+
+
+// Unicode Linux
+void matrix_init_user(void) {
+  set_unicode_input_mode(UC_LNX);
+};
+
+
+#define TAP_ONCE(code)  \
+  register_code (code); \
+  unregister_code (code)
+
+
+LEADER_EXTERNS();
+
+// Runs constantly in the background, in a loop. Only supports basic keycodes.
+void matrix_scan_user(void) {
+  LEADER_DICTIONARY() {
+    leading = false;
+    leader_end();
+
+    //probably useless in practice, but cool
+    SEQ_ONE_KEY (KC_P) {
+      tap_random_base64();
+      tap_random_base64();
+      tap_random_base64();
+      tap_random_base64();
+      tap_random_base64();
+      tap_random_base64();
+      tap_random_base64();
+      tap_random_base64();
+    }
+
+    SEQ_ONE_KEY (KC_G) {
+      SEND_STRING("grep something !");
+      register_code(KC_RALT);
+      TAP_ONCE(KC_4);
+      unregister_code(KC_RALT);
+    }
+    SEQ_ONE_KEY (KC_T) {
+      SEND_STRING("tail "); 
+      TAP_ONCE(KC_SLSH);
+      SEND_STRING("f !");
+      register_code(KC_RALT);
+      TAP_ONCE(KC_4);
+      unregister_code(KC_RALT);
+    }
+    SEQ_ONE_KEY (KC_S) {
+      SEND_STRING("sudo !!");
+      TAP_ONCE(KC_ENT);
+    }
+  }
+}

keyboards/atreus62/keymaps/194h/rules.mk

@@ -0,0 +1,8 @@
+TAP_DANCE_ENABLE = no
+NKRO_ENABLE = true
+MOUSEKEY_ENABLE = no
+EXTRAKEY_ENABLE = yes
+CONSOLE_ENABLE = no
+KEY_LOCK_ENABLE = no 
+AUTO_SHIFT_ENABLE = no
+LEADER_ENABLE = yes

keyboards/bigswitch/bigswitch.c

@@ -26,10 +26,12 @@ void matrix_init_user(void) {
 
 __attribute__ ((weak))
 void matrix_scan_user(void) {
+#if defined(RGBLIGHT_ENABLE)
   if (runonce && timer_elapsed(my_timer) > 1000) {
     runonce = false;
     rgblight_sethsv_noeeprom(0x0, 0xff, 0x80);
     rgblight_mode_noeeprom(9);
     rgblight_enable_noeeprom();
   }
+#endif
 }

keyboards/bigswitch/keymaps/wanleg/config.h

@@ -21,7 +21,6 @@
 #define MATRIX_ROW_PINS { B4 }
 #undef MATRIX_COL_PINS
 #define MATRIX_COL_PINS { B6 }
-//#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
 #undef DIODE_DIRECTION
@@ -32,14 +31,12 @@
 #define BACKLIGHT_LEVELS 3
 #define BREATHING_PERIOD 5
 
-/* for Tap Dance */
-#undef TAPPING_TERM
-#define TAPPING_TERM 700
-
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-//#define DEBOUNCING_DELAY 5
 #undef DEBOUNCING_DELAY
-#define DEBOUNCING_DELAY 2
+#define DEBOUNCING_DELAY 5
 
 // set flashing LED with QMK DFU
 #define QMK_LED B0
+
+// set audio pin
+#define C6_AUDIO

keyboards/bigswitch/keymaps/wanleg/keymap.c

@@ -20,8 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = LAYOUT( /* Base */
 TD(CAD_TD) \
 ),
-};
+[1] = LAYOUT( /*Secondary*/
-
+TD(BSW_TAP_DANCE) \
-void led_set_user(uint8_t usb_led) {
+),
-
+};
-}

keyboards/bigswitch/keymaps/wanleg/rules.mk

@@ -1,7 +1,16 @@
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality on B7 by default
-
 #If using a ProMicro and it has the QMK DFU bootloader instead of Caterina,
 #run "make <keyboard>:<keymap> dfu=qmk" when compiling to ensure it is flagged properly after being flashed
 ifeq ($(strip $(dfu)), qmk)
     BOOTLOADER = qmk-dfu
-endif
+endif
+
+AUDIO_ENABLE = yes           # Audio output on port C6
+BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality on B7 by default
+CONSOLE_ENABLE = no 		# Console for debug(+400)
+COMMAND_ENABLE = no 		# Commands for debug and configuration
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+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
+FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
+HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400)

keyboards/crkbd/keymaps/default/rules.mk

@@ -4,24 +4,25 @@
 #   the appropriate keymap folder that will get included automatically
 #
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
+MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no       # Audio control and System control(+450)
+EXTRAKEY_ENABLE = no        # Audio control and System control(+450)
 CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
+COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # 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
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 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 = yes        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
-SWAP_HANDS_ENABLE = no        # Enable one-hand typing
+SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 
 # 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 you want to change the display of OLED, you need to change here
-SRC +=  ./lib/rgb_state_reader.c \
+SRC +=  ./lib/glcdfont.c \
+        ./lib/rgb_state_reader.c \
         ./lib/layer_state_reader.c \
         ./lib/logo_reader.c \
         ./lib/keylogger.c \

keyboards/crkbd/keymaps/drashna/glcdfont.c

@@ -1,244 +0,0 @@
-// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
-// See gfxfont.h for newer custom bitmap font info.
-
-#ifndef FONT5X7_H
-#define FONT5X7_H
-
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/pgmspace.h>
-#elif defined(ESP8266)
- #include <pgmspace.h>
-#else
- #define PROGMEM
-#endif
-
-// Standard ASCII 5x7 font
-
-static const unsigned char font[] PROGMEM = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
-0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
-0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
-0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
-0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
-0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
-0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
-0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
-0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
-0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
-0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
-0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
-0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
-0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
-0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
-0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
-0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
-0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
-0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
-0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
-0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
-0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
-0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
-0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
-0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
-0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
-0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
-0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
-0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
-0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
-0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
-0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
-0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
-0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
-0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
-0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
-0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
-0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
-0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
-0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
-0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
-0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
-0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
-0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
-0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
-0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
-0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
-0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
-0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
-0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
-0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
-0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
-0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
-0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
-0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
-0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
-0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
-0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
-0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
-0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
-0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
-0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
-0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
-0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
-0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
-0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
-0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
-0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
-0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
-0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
-0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
-0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
-0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
-0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
-0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
-0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
-0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
-0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
-0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
-0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
-0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
-0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
-0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
-0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
-0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
-0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
-0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
-0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
-0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
-0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
-0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
-0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
-0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
-0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
-0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
-0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
-0x18, 0xA4, 0xA4, 0x9C, 0x78, 0x00,
-0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
-0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
-0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
-0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
-0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
-0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
-0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
-0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
-0xFC, 0x18, 0x24, 0x24, 0x18, 0x00,
-0x18, 0x24, 0x24, 0x18, 0xFC, 0x00,
-0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
-0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
-0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
-0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
-0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
-0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
-0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
-0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
-0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
-0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
-0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
-0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
-0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x0E, 0x3F, 0xFF, 0xFF,
-0xFF, 0xFF, 0xFE, 0xE0, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x1E, 0xBE,
-0x7F, 0xFF, 0xFF, 0xFE, 0xFE, 0xF0,
-0xE0, 0xC0, 0x80, 0x00, 0x0E, 0xEF,
-0xDF, 0xDE, 0xBE, 0x3C, 0x38, 0x70,
-0xE0, 0xDD, 0xBB, 0x7B, 0x07, 0x0E,
-0x0E, 0x0C, 0x98, 0xF0, 0xE0, 0xF0,
-0xF0, 0xF8, 0x78, 0x3C, 0x1C, 0x1E,
-0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F,
-0x1F, 0xFE, 0xFE, 0xF8, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
-0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00,
-0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E,
-0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00,
-0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B,
-0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00,
-0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE,
-0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x03,
-0x0F, 0x3F, 0xFF, 0xFF, 0xFF, 0xFE,
-0xF8, 0xF0, 0xE0, 0xC0, 0x80, 0x7F,
-0xFF, 0xFE, 0xFD, 0xFB, 0x1B, 0x07,
-0x07, 0x0F, 0x1F, 0x1F, 0x1E, 0x1D,
-0x0B, 0x07, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0xE0,
-0xF8, 0xFE, 0xFF, 0xFF, 0x1F, 0x07,
-0x01, 0x01, 0x01, 0x03, 0x06, 0x06,
-0x0C, 0x0C, 0x08, 0x0C, 0x0C, 0x0E,
-0x07, 0x83, 0xC1, 0xE0, 0x70, 0x30,
-0x18, 0x1C, 0x7C, 0xCC, 0x8C, 0xDC,
-0xF8, 0xC0, 0xE0, 0xE0, 0x70, 0xB8,
-0xF0, 0x60, 0x00, 0x00, 0x80, 0xC0,
-0xE0, 0xF0, 0x70, 0xF8, 0xFC, 0xFC,
-0x3C, 0x30, 0x38, 0xF8, 0xF8, 0xF8,
-0x78, 0x00, 0x80, 0x80, 0xC0, 0xE0,
-0x70, 0x38, 0x38, 0x9C, 0xDC, 0xFC,
-0x7C, 0x38, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F,
-0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00,
-0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F,
-0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00,
-0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20,
-0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00,
-0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F,
-0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x03, 0x07,
-0x1F, 0x3F, 0x3F, 0x7F, 0x7F, 0x7F,
-0x7E, 0x7D, 0x3B, 0x17, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x07,
-0x0F, 0x1F, 0x3F, 0x3F, 0x7E, 0x7C,
-0x78, 0x70, 0x70, 0x70, 0x70, 0x70,
-0x70, 0x78, 0x38, 0x18, 0x1C, 0x0E,
-0x07, 0x0F, 0x1F, 0x3F, 0x3C, 0x38,
-0x38, 0x18, 0x0C, 0x06, 0x03, 0x01,
-0x01, 0x01, 0x01, 0x0E, 0x1F, 0x1F,
-0x1C, 0x1C, 0x1E, 0x0F, 0x0F, 0x03,
-0x1D, 0x0E, 0x07, 0x03, 0x01, 0x00,
-0x00, 0x0E, 0x1F, 0x1F, 0x1D, 0x1E,
-0x0F, 0x07, 0x03, 0x03, 0x0F, 0x1F,
-0x1F, 0x19, 0x19, 0x19, 0x19, 0x0C,
-0x0C, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-#endif // FONT5X7_H

keyboards/crkbd/keymaps/drashna/rules.mk

@@ -4,24 +4,25 @@
 #   the appropriate keymap folder that will get included automatically
 #
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
+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
+COMMAND_ENABLE = no         # 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
+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
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 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 = yes        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
-SWAP_HANDS_ENABLE = no        # Enable one-hand typing
+SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 
 # 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 you want to change the display of OLED, you need to change here
-SRC +=  ./lib/rgb_state_reader.c \
+SRC +=  ./lib/glcdfont.c \
+        ./lib/rgb_state_reader.c \
         ./lib/layer_state_reader.c \
         ./lib/logo_reader.c \
         ./lib/keylogger.c \

keyboards/crkbd/keymaps/like_jis/glcdfont.c

@@ -1,244 +0,0 @@
-// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
-// See gfxfont.h for newer custom bitmap font info.
-
-#ifndef FONT5X7_H
-#define FONT5X7_H
-
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/pgmspace.h>
-#elif defined(ESP8266)
- #include <pgmspace.h>
-#else
- #define PROGMEM
-#endif
-
-// Standard ASCII 5x7 font
-
-static const unsigned char font[] PROGMEM = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
-0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
-0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
-0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
-0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
-0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
-0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
-0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
-0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
-0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
-0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
-0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
-0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
-0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
-0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
-0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
-0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
-0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
-0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
-0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
-0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
-0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
-0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
-0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
-0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
-0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
-0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
-0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
-0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
-0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
-0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
-0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
-0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
-0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
-0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
-0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
-0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
-0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
-0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
-0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
-0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
-0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
-0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
-0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
-0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
-0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
-0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
-0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
-0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
-0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
-0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
-0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
-0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
-0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
-0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
-0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
-0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
-0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
-0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
-0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
-0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
-0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
-0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
-0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
-0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
-0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
-0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
-0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
-0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
-0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
-0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
-0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
-0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
-0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
-0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
-0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
-0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
-0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
-0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
-0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
-0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
-0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
-0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
-0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
-0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
-0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
-0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
-0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
-0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
-0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
-0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
-0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
-0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
-0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
-0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
-0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
-0x18, 0xA4, 0xA4, 0x9C, 0x78, 0x00,
-0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
-0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
-0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
-0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
-0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
-0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
-0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
-0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
-0xFC, 0x18, 0x24, 0x24, 0x18, 0x00,
-0x18, 0x24, 0x24, 0x18, 0xFC, 0x00,
-0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
-0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
-0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
-0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
-0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
-0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
-0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
-0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
-0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
-0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
-0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
-0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
-0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x0E, 0x3F, 0xFF, 0xFF,
-0xFF, 0xFF, 0xFE, 0xE0, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x1E, 0xBE,
-0x7F, 0xFF, 0xFF, 0xFE, 0xFE, 0xF0,
-0xE0, 0xC0, 0x80, 0x00, 0x0E, 0xEF,
-0xDF, 0xDE, 0xBE, 0x3C, 0x38, 0x70,
-0xE0, 0xDD, 0xBB, 0x7B, 0x07, 0x0E,
-0x0E, 0x0C, 0x98, 0xF0, 0xE0, 0xF0,
-0xF0, 0xF8, 0x78, 0x3C, 0x1C, 0x1E,
-0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F,
-0x1F, 0xFE, 0xFE, 0xF8, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
-0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00,
-0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E,
-0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00,
-0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B,
-0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00,
-0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE,
-0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x03,
-0x0F, 0x3F, 0xFF, 0xFF, 0xFF, 0xFE,
-0xF8, 0xF0, 0xE0, 0xC0, 0x80, 0x7F,
-0xFF, 0xFE, 0xFD, 0xFB, 0x1B, 0x07,
-0x07, 0x0F, 0x1F, 0x1F, 0x1E, 0x1D,
-0x0B, 0x07, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0xE0,
-0xF8, 0xFE, 0xFF, 0xFF, 0x1F, 0x07,
-0x01, 0x01, 0x01, 0x03, 0x06, 0x06,
-0x0C, 0x0C, 0x08, 0x0C, 0x0C, 0x0E,
-0x07, 0x83, 0xC1, 0xE0, 0x70, 0x30,
-0x18, 0x1C, 0x7C, 0xCC, 0x8C, 0xDC,
-0xF8, 0xC0, 0xE0, 0xE0, 0x70, 0xB8,
-0xF0, 0x60, 0x00, 0x00, 0x80, 0xC0,
-0xE0, 0xF0, 0x70, 0xF8, 0xFC, 0xFC,
-0x3C, 0x30, 0x38, 0xF8, 0xF8, 0xF8,
-0x78, 0x00, 0x80, 0x80, 0xC0, 0xE0,
-0x70, 0x38, 0x38, 0x9C, 0xDC, 0xFC,
-0x7C, 0x38, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F,
-0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00,
-0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F,
-0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00,
-0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20,
-0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00,
-0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F,
-0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x03, 0x07,
-0x1F, 0x3F, 0x3F, 0x7F, 0x7F, 0x7F,
-0x7E, 0x7D, 0x3B, 0x17, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x07,
-0x0F, 0x1F, 0x3F, 0x3F, 0x7E, 0x7C,
-0x78, 0x70, 0x70, 0x70, 0x70, 0x70,
-0x70, 0x78, 0x38, 0x18, 0x1C, 0x0E,
-0x07, 0x0F, 0x1F, 0x3F, 0x3C, 0x38,
-0x38, 0x18, 0x0C, 0x06, 0x03, 0x01,
-0x01, 0x01, 0x01, 0x0E, 0x1F, 0x1F,
-0x1C, 0x1C, 0x1E, 0x0F, 0x0F, 0x03,
-0x1D, 0x0E, 0x07, 0x03, 0x01, 0x00,
-0x00, 0x0E, 0x1F, 0x1F, 0x1D, 0x1E,
-0x0F, 0x07, 0x03, 0x03, 0x0F, 0x1F,
-0x1F, 0x19, 0x19, 0x19, 0x19, 0x0C,
-0x0C, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-#endif // FONT5X7_H

keyboards/crkbd/keymaps/like_jis/keymap.c

@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 int RGB_current_mode;
 
 // Setting ADJUST layer RGB back to default
-inline void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
+static inline void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
   if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
     layer_on(layer3);
   } else {
@@ -155,7 +155,7 @@ void matrix_scan_user(void) {
    iota_gfx_task();
 }
 
-inline void matrix_render_user(struct CharacterMatrix *matrix) {
+static inline void matrix_render_user(struct CharacterMatrix *matrix) {
   if (is_master) {
     // If you want to change the display of OLED, you need to change here
     matrix_write_ln(matrix, read_layer_state());
@@ -171,7 +171,7 @@ inline void matrix_render_user(struct CharacterMatrix *matrix) {
   }
 }
 
-inline void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) {
+static inline void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) {
   if (memcmp(dest->display, source->display, sizeof(dest->display))) {
     memcpy(dest->display, source->display, sizeof(dest->display));
     dest->dirty = true;

keyboards/crkbd/keymaps/like_jis/rules.mk

@@ -4,24 +4,25 @@
 #   the appropriate keymap folder that will get included automatically
 #
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
+MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no       # Audio control and System control(+450)
+EXTRAKEY_ENABLE = no        # Audio control and System control(+450)
 CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
+COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # 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
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 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 = yes        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
-SWAP_HANDS_ENABLE = no        # Enable one-hand typing
+SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 
 # 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 you want to change the display of OLED, you need to change here
-SRC +=  ./lib/rgb_state_reader.c \
+SRC +=  ./lib/glcdfont.c \
+        ./lib/rgb_state_reader.c \
         ./lib/layer_state_reader.c \
         ./lib/logo_reader.c \
         ./lib/keylogger.c \

keyboards/crkbd/lib/glcdfont.c

@@ -14,8 +14,7 @@
 #endif
 
 // Standard ASCII 5x7 font
-
+const unsigned char font[] PROGMEM = {
-static const unsigned char font[] PROGMEM = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
@@ -119,7 +118,7 @@ static const unsigned char font[] PROGMEM = {
 0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
 0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
-0x18, 0xA4, 0xA4, 0x9C, 0x78, 0x00,
+0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
@@ -128,8 +127,8 @@ static const unsigned char font[] PROGMEM = {
 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
 0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
-0xFC, 0x18, 0x24, 0x24, 0x18, 0x00,
+0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
-0x18, 0x24, 0x24, 0x18, 0xFC, 0x00,
+0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
 0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
@@ -145,24 +144,24 @@ static const unsigned char font[] PROGMEM = {
 0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x0E, 0x3F, 0xFF, 0xFF,
-0xFF, 0xFF, 0xFE, 0xE0, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x1E, 0xBE,
-0x7F, 0xFF, 0xFF, 0xFE, 0xFE, 0xF0,
-0xE0, 0xC0, 0x80, 0x00, 0x0E, 0xEF,
-0xDF, 0xDE, 0xBE, 0x3C, 0x38, 0x70,
-0xE0, 0xDD, 0xBB, 0x7B, 0x07, 0x0E,
-0x0E, 0x0C, 0x98, 0xF0, 0xE0, 0xF0,
-0xF0, 0xF8, 0x78, 0x3C, 0x1C, 0x1E,
-0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F,
-0x1F, 0xFE, 0xFE, 0xF8, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0xC0, 0xE0,
+0xF0, 0xF8, 0xF8, 0x18, 0x00, 0xC0,
+0xF0, 0xFC, 0xFE, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFF, 0x7E, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x80, 0xC0, 0xE0, 0xE0,
+0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0,
+0xC0, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x80, 0xC0, 0xE0, 0xE0, 0xE0, 0xE0,
+0xE0, 0xE0, 0xE0, 0xE0, 0xC0, 0x80,
+0x00, 0x00, 0x00, 0xE0, 0xE0, 0xC0,
+0xC0, 0xE0, 0xE0, 0xE0, 0xE0, 0x00,
+0x00, 0xE0, 0xE0, 0xC0, 0xC0, 0xE0,
+0xE0, 0xE0, 0xE0, 0xE0, 0xC0, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x80, 0xC0,
+0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0,
+0xE0, 0xE0, 0xC0, 0x80, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
@@ -177,25 +176,25 @@ static const unsigned char font[] PROGMEM = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x03,
+0x00, 0x00, 0x00, 0xF8, 0xFC, 0xFE,
-0x0F, 0x3F, 0xFF, 0xFF, 0xFF, 0xFE,
+0xFF, 0xE0, 0x00, 0xFF, 0xFF, 0xFF,
-0xF8, 0xF0, 0xE0, 0xC0, 0x80, 0x7F,
+0xFF, 0xFF, 0xFF, 0x80, 0xFF, 0xFF,
-0xFF, 0xFE, 0xFD, 0xFB, 0x1B, 0x07,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-0x07, 0x0F, 0x1F, 0x1F, 0x1E, 0x1D,
+0xFF, 0x1F, 0x07, 0x01, 0x00, 0x00,
-0x0B, 0x07, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0xE0,
+0x00, 0xFF, 0xFF, 0xFF, 0x81, 0x00,
-0xF8, 0xFE, 0xFF, 0xFF, 0x1F, 0x07,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x81,
-0x01, 0x01, 0x01, 0x03, 0x06, 0x06,
+0xC3, 0xC3, 0xC3, 0x00, 0x00, 0xFF,
-0x0C, 0x0C, 0x08, 0x0C, 0x0C, 0x0E,
+0xFF, 0xFF, 0x81, 0x00, 0x00, 0x00,
-0x07, 0x83, 0xC1, 0xE0, 0x70, 0x30,
+0x00, 0x00, 0x00, 0x81, 0xFF, 0xFF,
-0x18, 0x1C, 0x7C, 0xCC, 0x8C, 0xDC,
+0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF,
-0xF8, 0xC0, 0xE0, 0xE0, 0x70, 0xB8,
+0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-0xF0, 0x60, 0x00, 0x00, 0x80, 0xC0,
+0x00, 0xFF, 0xFF, 0xFF, 0x01, 0x00,
-0xE0, 0xF0, 0x70, 0xF8, 0xFC, 0xFC,
+0x00, 0x00, 0x00, 0x01, 0xFF, 0xFF,
-0x3C, 0x30, 0x38, 0xF8, 0xF8, 0xF8,
+0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF,
-0x78, 0x00, 0x80, 0x80, 0xC0, 0xE0,
+0x9D, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
-0x70, 0x38, 0x38, 0x9C, 0xDC, 0xFC,
+0x1C, 0x9D, 0xDF, 0xDF, 0xDF, 0x00,
-0x7C, 0x38, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F,
 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00,
@@ -209,26 +208,26 @@ static const unsigned char font[] PROGMEM = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x03, 0x0F, 0x1F,
+0x3F, 0x3F, 0x3F, 0x3F, 0x1F, 0x1F,
+0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x3F,
+0x3F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F,
+0x7F, 0x7C, 0x78, 0x78, 0x38, 0x1C,
+0x0F, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x01, 0x03, 0x07, 0x07,
+0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+0x03, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x03, 0x07, 0x07, 0x07, 0x07,
+0x07, 0x07, 0x07, 0x07, 0x03, 0x01,
+0x00, 0x00, 0x00, 0x07, 0x07, 0x07,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x03, 0x07,
+0x00, 0x07, 0x07, 0x07, 0x00, 0x00,
-0x1F, 0x3F, 0x3F, 0x7F, 0x7F, 0x7F,
+0x00, 0x00, 0x00, 0x00, 0x07, 0x07,
-0x7E, 0x7D, 0x3B, 0x17, 0x00, 0x00,
+0x07, 0x00, 0x00, 0x00, 0x01, 0x03,
+0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+0x07, 0x07, 0x03, 0x01, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x07,
-0x0F, 0x1F, 0x3F, 0x3F, 0x7E, 0x7C,
-0x78, 0x70, 0x70, 0x70, 0x70, 0x70,
-0x70, 0x78, 0x38, 0x18, 0x1C, 0x0E,
-0x07, 0x0F, 0x1F, 0x3F, 0x3C, 0x38,
-0x38, 0x18, 0x0C, 0x06, 0x03, 0x01,
-0x01, 0x01, 0x01, 0x0E, 0x1F, 0x1F,
-0x1C, 0x1C, 0x1E, 0x0F, 0x0F, 0x03,
-0x1D, 0x0E, 0x07, 0x03, 0x01, 0x00,
-0x00, 0x0E, 0x1F, 0x1F, 0x1D, 0x1E,
-0x0F, 0x07, 0x03, 0x03, 0x0F, 0x1F,
-0x1F, 0x19, 0x19, 0x19, 0x19, 0x0C,
-0x0C, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

keyboards/crkbd/ssd1306.c

@@ -4,7 +4,6 @@
 #include "i2c.h"
 #include <string.h>
 #include "print.h"
-#include "glcdfont.c"
 #ifdef ADAFRUIT_BLE_ENABLE
 #include "adafruit_ble.h"
 #endif
@@ -14,6 +13,8 @@
 #include "sendchar.h"
 #include "timer.h"
 
+static const unsigned char font[] PROGMEM;
+
 // Set this to 1 to help diagnose early startup problems
 // when testing power-on with ble.  Turn it off otherwise,
 // as the latency of printing most of the debug info messes

keyboards/dz60/dz60.h

@@ -196,6 +196,20 @@
     { k30,  k31,   k32,   k33,  k34,   k35,   k36,  k37,   k38,   k39,   k3a,  k3b,  KC_NO, k3d,   KC_NO }, \
     { k40,  k41,   KC_NO, k43,  KC_NO, KC_NO, k46,  KC_NO, KC_NO, KC_NO, k4a,  k4b,  KC_NO, k4d,   k4e   }  \
 }
+// iso split
+#define LAYOUT_60_iso_split( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, \
+	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       \
+	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K114, K213, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,       \
+	K400, K401,       K403, K404,       K406,       K408,       K410, K411,       K413, K414  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012, KC_NO,  K014 }, \
+	{ K100, KC_NO,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
+	{ K200, KC_NO,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213, KC_NO }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311, KC_NO,  K313, KC_NO }, \
+	{ K400,  K401, KC_NO,  K403,  K404, KC_NO,  K406, KC_NO,  K408, KC_NO,  K410,  K411, KC_NO,  K413,  K414 }  \
+}
 
 /* LAYOUT_60_iso_5x1u
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐

keyboards/dz60/info.json

@@ -28,6 +28,10 @@
     "LAYOUT_60_iso": {
       "key_count": 62,
       "layout": [{"label":"¬", "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":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"CapsLock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"@", "x":11.75, "y":2}, {"label":"~", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"AltGr", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+    },
+     "LAYOUT_60_iso_split": {
+      "key_count": 64,
+      "layout": [{"label":"¬", "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":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"CapsLock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"@", "x":11.75, "y":2}, {"label":"~", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"label":"FN", "x":6.00, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"label":"AltGr", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
     },
     "LAYOUT_60_hhkb": {
       "key_count": 60,

keyboards/dz60/keymaps/iso_de_andys8/README.md

@@ -0,0 +1,3 @@
+# ISO DE layout
+
+This layout is ISO-DE and similar to a standard 60 ISO layout. There are vim style arrow keys on the function layer. The bottom right is the expected default.

keyboards/dz60/keymaps/iso_de_andys8/keymap.c

@@ -0,0 +1,38 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /* ISO 60 layout by andys8 (ISO German keyboard layout shown)
+   *
+   * This layout starts from a standard ISO 60% layout, and adds a function layer.
+   *
+   * ,-----------------------------------------------------------------------------------------.
+   * | Esc | 1 ! | 2 " | 3 § | 4 $ | 5 % | 6 & | 7 / | 8 ( | 9 ) | 0 = | ß ? | ´ ` | Backspace |
+   * |-----------------------------------------------------------------------------------------|
+   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Z  |  U  |  I  |  O  |  P  |  Ä  | + * | Enter  |
+   * |----------------------------------------------------------------------------------       |
+   * | Layer_1 |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  Ö  |  Ü  | # ' |       |
+   * |-----------------------------------------------------------------------------------------|
+   * | Shift | < > |  Y  |  X  |  C  |  V  |  B  |  N  |  M  | , ; | . : | - _ | Shift         |
+   * |-----------------------------------------------------------------------------------------|
+   * | LCtl  | LGUI  | LAlt  |            Space                  | RAlt  | RGUI  | App  | RCtl |
+   * `-----------------------------------------------------------------------------------------'
+   */
+  LAYOUT_60_iso(
+    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_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,
+    MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, KC_APP,   KC_RCTL
+  ),
+
+
+  LAYOUT_60_iso(
+    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_NO,   KC_NO,   KC_NO,   KC_NO,   RESET,   KC_NO,   KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_PSCR, KC_NO,   KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_END,  KC_DEL,  KC_NO,   KC_NO,
+    KC_LSFT, BL_TOGG, KC_APP,  KC_PAUS, KC_INS,  KC_NO,   KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO,   KC_RSFT,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_BSPC,                                     KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+  ),
+
+};

keyboards/dz60/keymaps/iso_de_andys8/rules.mk

@@ -0,0 +1,15 @@
+# Build Options
+#   comment out to disable the options.
+#
+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
+SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
+NKRO_ENABLE = yes		# USB 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
+AUDIO_ENABLE = no
+RGBLIGHT_ENABLE = no
+AUTO_SHIFT_ENABLE = no # If the time depressed is greater than or equal to the AUTO_SHIFT_TIMEOUT, then a shifted version of the key is emitted. If the time is less than the AUTO_SHIFT_TIMEOUT time, then the normal state is emitted
+TAP_DANCE_ENABLE = no

keyboards/dz60/keymaps/iso_split-spacebar/README.md

@@ -0,0 +1,69 @@
+# iso layout with a split spacebar
+
+i needed to have an ISO layout
+and i wanted to have a split spacebar
+i couldn't find anything ready so i cobbled this together
+
+
+
+---- Layer 0 - BL
+this is basically the standard iso layout with the addition of the split spacebar
+menu key (KC_APP) is used to move to the next layer
+the key in between the two spacebars is the function key
+ *,-----------------------------------------------------------.
+ *| ' | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Backsp |
+ *|-----------------------------------------------------------|
+ *| Tab | q | w | e | r | t | y | u | i | o | p | [ | ] |enter|
+ *|------------------------------------------------------     |
+ *| Caps  | a | s | d | f | g | h | j | k | l | ; | ' | # |   |
+ *|-----------------------------------------------------------|
+ *|Shft| < | z | x | c | v | b | n | m | , | . | / |  Shift   |
+ *|-----------------------------------------------------------|
+ *|Ctrl|Gui |Alt | Space  | FN |  Space  |Alt |Gui | NL |Ctrl |
+ *`-----------------------------------------------------------'
+
+---- Layer 1 - FL
+quite standard function layer
+arrow keys and mouse movement/buttons on the home row 
+ *,-----------------------------------------------------------.
+ *|ESC|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|  DEL  |
+ *|-----------------------------------------------------------|
+ *|     |   |   |   |   |   |   |   |   |   |prt|   |   |     |
+ *|------------------------------------------------------     |
+ *|       |m l|m d|m u|m r|   |   | l | d | u | r |   |   |   |
+ *|-----------------------------------------------------------|
+ *|    |   |   |   |   |mb1|mb2|   |hm |pgd|pgu|end|          |
+ *|-----------------------------------------------------------|
+ *|    |    |    |        |    |         |    |    |    |     |
+ *`-----------------------------------------------------------'
+
+---- Layer 2 - NL
+numbers numbers numbers...
+first key (top left) to return to BL
+menu key (KC_APP) is used to move to the next layer
+ *,-----------------------------------------------------------.
+ *|BL | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 |   |   |       |
+ *|-----------------------------------------------------------|
+ *|     | 4 | 5 | 6 | * | / |   | 4 | 5 | 6 | * | / | ] |     |
+ *|------------------------------------------------------     |
+ *|       | 7 | 8 | 9 | + | - |   | 1 | 2 | 3 | + | - |   |   |
+ *|-----------------------------------------------------------|
+ *|    |   | 0 | , | . | = |   |   | 0 | , | . | = |      |
+ *|-----------------------------------------------------------|
+ *|    |    |    |        |    |         |    |    | RL |     |
+ *`-----------------------------------------------------------'
+ 
+---- Layer 3 - BL
+all the fancy lights
+and useful reset button  (top right)
+ *,-----------------------------------------------------------.
+ *|BL |   |   |   |   |   |   |   |   |   |   |   |   |Reset  |
+ *|-----------------------------------------------------------|
+ *|     |tog|mod|hui|hud|   |   |sai|sad|vai|vad|   |   |     |
+ *|------------------------------------------------------     |
+ *|       |sta|bre|rai|swi|   |   |sna|kni|gra|xms|   |   |   |
+ *|-----------------------------------------------------------|
+ *|    |   |bd |bt |bi |bs |   |   |   |   |   |   |          |
+ *|-----------------------------------------------------------|
+ *|    |    |    |        |    |         |    |    | BL |     |
+ *`-----------------------------------------------------------' 

keyboards/dz60/keymaps/iso_split-spacebar/keymap.c

@@ -0,0 +1,193 @@
+// using as reference
+// https://docs.qmk.fm/#/keymap
+
+// thanks to atlacat, hailbreno, itsaferbie and weeheavy...
+
+// and special thanks to  AGausmann and drashna for the layer-activated RGB underglow
+// https://www.reddit.com/r/olkb/comments/6t1vdu/update_layeractivated_rgb_underglow/ 
+// https://github.com/AGausmann/qmk_firmware/blob/agausmann-v3.x/keyboards/nyquist/keymaps/agausmann/keymap.c
+
+#include QMK_KEYBOARD_H
+
+
+// Helpful defines
+#define _______ KC_TRNS
+#define XXXXXXX KC_NO
+
+/* 
+* Each layer gets a name for readability.
+* 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, and you can also skip them entirely
+* and just use numbers.
+*
+*/
+#define BL 0     // Base Layer
+#define FL 1     // Function Layer
+#define NL 2     // Numpad Layer
+#define RL 3     // RGB Layer
+
+/* 
+* Let's give an easier name to the RGB modes 
+* and assign the ones we want to the different layer
+* these will then be used by the function below
+*
+*/
+#define RGB_STA RGB_M_P   //rgb static
+#define RGB_BRE RGB_M_B   //rgb breathe
+#define RGB_RAI RGB_M_R   //rgb rainbow
+#define RGB_SWI RGB_M_SW  //rgb swirl
+#define RGB_SNA RGB_M_SN  //rgb snake
+#define RGB_KNI RGB_M_K   //rgb knight
+#define RGB_GRA RGB_M_G   //rgb gradient
+#define RGB_XMS RGB_M_X   //rgb christmas
+//
+#define RGB_BL_MODE    rgblight_mode_noeeprom(3)              //rgb mode for BL layer
+#define RGB_BL_LIGHT   rgblight_sethsv_noeeprom_turquoise()   //rgb light for BL layer
+//
+#define RGB_FL_MODE    rgblight_mode_noeeprom(1)             //rgb mode for FL layer
+#define RGB_FL_LIGHT   rgblight_sethsv_noeeprom_orange()      //rgb light for FL layer
+//
+#define RGB_NL_MODE    rgblight_mode_noeeprom(12)             //rgb mode for NL layer
+#define RGB_NL_LIGHT   rgblight_sethsv_noeeprom_turquoise()       //rgb light for NL layer
+//
+#define RGB_RL_MODE    rgblight_mode_noeeprom(22)             //rgb mode for RL layer
+#define RGB_RL_LIGHT   rgblight_sethsv_noeeprom_red()         //rgb light for RL layer
+      
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	
+  /* Keymap BL: Base Layer (Default Layer)
+   *
+   * ,-----------------------------------------------------------.
+   * | ' | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Backsp |
+   * |-----------------------------------------------------------|
+   * | Tab | q | w | e | r | t | y | u | i | o | p | [ | ] |enter|
+   * |------------------------------------------------------     |
+   * | Caps  | a | s | d | f | g | h | j | k | l | ; | ' | # |   |
+   * |-----------------------------------------------------------|
+   * |Shft| < | z | x | c | v | b | n | m | , | . | / |  Shift   |
+   * |-----------------------------------------------------------|
+   * |Ctrl|Gui |Alt | Space  | FN |  Space  |Alt |Gui | NL |Ctrl |
+   * `-----------------------------------------------------------'
+   */
+   [BL] = LAYOUT_60_iso_split(
+	//  1          2          3          4          5          6          7          8          9          10         11         12         13         14
+	    KC_GRV,    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_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_CAPS,   KC_A,      KC_S,      KC_D,      KC_F,      KC_G,      KC_H,      KC_J,      KC_K,      KC_L,      KC_SCLN,   KC_QUOT,   KC_NUHS,   KC_ENT,
+        KC_LSFT,   KC_NUBS,   KC_Z,      KC_X,      KC_C,      KC_V,      KC_B,      KC_N,      KC_M,      KC_COMM,   KC_DOT,    KC_SLSH,   KC_RSFT,
+        KC_LCTL,   KC_LGUI,   KC_LALT,   KC_SPC,    MO(FL),    KC_SPC,    KC_RALT,   KC_RGUI,   TO(NL),    KC_RCTL),
+
+  /* Keymap FL: Function Layer
+   *
+   * ,-----------------------------------------------------------.
+   * |ESC|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|  DEL  |
+   * |-----------------------------------------------------------|
+   * |     |   |   |   |   |   |   |   |   |   |prt|   |   |     |
+   * |------------------------------------------------------     |
+   * |       |m l|m d|m u|m r|   |   | l | d | u | r |   |   |   |
+   * |-----------------------------------------------------------|
+   * |    |   |   |   |   |mb1|mb2|   |hm |pgd|pgu|end|          |
+   * |-----------------------------------------------------------|
+   * |    |    |    |        |    |         |    |    |    |     |
+   * `-----------------------------------------------------------'
+   */
+   [FL] = LAYOUT_60_iso_split(
+	//  1          2          3          4          5          6          7          8          9          10         11         12         13         14
+	    KC_ESC,    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_PSCR,   _______,   _______,
+        _______,   KC_MS_LEFT,KC_MS_DOWN,KC_MS_UP,  KC_MS_RIGHT,_______,  _______,   KC_LEFT,   KC_DOWN,   KC_UP,     KC_RIGHT,  _______,   _______,   _______,
+        _______,   _______,   _______,   _______,   _______,   KC_MS_BTN1,KC_MS_BTN2,_______,   KC_HOME,   KC_PGDOWN, KC_PGUP,   KC_END,    _______,
+        _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______),
+
+  /* Keymap NL: Numpad Layer
+   *
+   * ,-----------------------------------------------------------.
+   * |BL | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 |   |   |       |
+   * |-----------------------------------------------------------|
+   * |     | 4 | 5 | 6 | * | / |   | 4 | 5 | 6 | * | / | ] |     |
+   * |------------------------------------------------------     |
+   * |       | 7 | 8 | 9 | + | - |   | 1 | 2 | 3 | + | - |   |   |
+   * |-----------------------------------------------------------|
+   * |    |   | 0 | , | . | = |   |   | 0 | , | . | = |      |
+   * |-----------------------------------------------------------|
+   * |    |    |    |        |    |         |    |    | RL |     |
+   * `-----------------------------------------------------------'
+   */
+   [NL] = LAYOUT_60_iso_split(
+	//  1          2          3          4          5          6          7          8          9          10         11         12         13         14
+	    TG(NL),    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_4,      KC_5,      KC_6,      KC_PAST,   KC_PSLS,   _______,   KC_4,      KC_5,      KC_6,      KC_PAST,   KC_PSLS,   _______,
+        _______,   KC_7,      KC_8,      KC_9,      KC_PPLS,   KC_PMNS,   _______,   KC_1,      KC_2,      KC_3,      KC_PPLS,   KC_PMNS,   _______,   _______,
+        _______,   KC_0,      KC_COMM,   KC_DOT,    KC_EQL,    _______,   _______,   _______,   KC_0,      KC_COMM,   KC_DOT,    KC_EQL,    _______,
+        _______,   _______,   _______,   _______,   MO(FL),    _______,   _______,   _______,   TG(RL),    _______),
+
+  /* Keymap RL: RGB Layer
+   *
+   * ,-----------------------------------------------------------.
+   * |BL |   |   |   |   |   |   |   |   |   |   |   |   |Reset  |
+   * |-----------------------------------------------------------|
+   * |     |tog|mod|hui|hud|   |   |sai|sad|vai|vad|   |   |     |
+   * |------------------------------------------------------     |
+   * |       |sta|bre|rai|swi|   |   |sna|kni|gra|xms|   |   |   |
+   * |-----------------------------------------------------------|
+   * |    |   |bd |bt |bi |bs |   |   |   |   |   |   |          |
+   * |-----------------------------------------------------------|
+   * |    |    |    |        |    |         |    |    | BL |     |
+   * `-----------------------------------------------------------'
+   */
+   [RL] = LAYOUT_60_iso_split(
+	//  1          2          3          4          5          6          7          8          9          10         11         12         13         14
+	    TG(RL),    _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   RESET,
+        _______,   RGB_TOG,   RGB_MOD,   RGB_HUI,   RGB_HUD,   _______,   _______,   RGB_SAI,   RGB_SAD,   RGB_VAI,   RGB_VAD,   _______,   _______,
+        _______,   RGB_STA,   RGB_BRE,   RGB_RAI,   RGB_SWI,   _______,   _______,   RGB_SNA,   RGB_KNI,   RGB_GRA,   RGB_XMS,   _______,   _______,   _______,
+        _______,   BL_DEC,    BL_TOGG,   BL_INC,    BL_STEP,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
+        _______,   _______,   _______,   _______,   MO(FL),    _______,   _______,   _______,   TO(BL),    _______),
+        
+
+};
+
+
+void persistent_default_layer_set(uint16_t default_layer) {
+  eeconfig_update_default_layer(default_layer);
+  default_layer_set(default_layer);
+}
+
+
+// layer-activated RGB underglow
+
+void matrix_scan_user(void) {
+
+  #ifdef RGBLIGHT_ENABLE
+
+  static uint8_t old_layer = 1;
+  uint8_t new_layer = biton32(layer_state);
+
+  if (old_layer != new_layer) {
+    switch (new_layer) {
+      case BL:
+          RGB_BL_MODE;
+          RGB_BL_LIGHT;        
+        break;
+      case FL:
+          RGB_FL_MODE;
+          RGB_FL_LIGHT;  
+        break;
+      case NL:
+          RGB_NL_MODE; 
+         // RGB_NL_LIGHT; 
+        break;
+      case RL:
+          RGB_RL_MODE; 
+         // RGB_RL_LIGHT;        
+        break;
+    }
+
+    old_layer = new_layer;
+  }
+
+  #endif //RGBLIGHT_ENABLE
+
+}

keyboards/preonic/keymaps/trigotometry/config.h

@@ -0,0 +1,8 @@
+#pragma once
+
+#define STARTUP_SONG SONG(PREONIC_SOUND)
+#define MUSIC_MASK (keycode != KC_NO)
+
+#define FORCE_NKRO 1
+#define PREVENT_STUCK_MODIFIERS
+#define GRAVE_ESC_GUI_OVERRIDE

keyboards/preonic/keymaps/trigotometry/keymap.c

@@ -0,0 +1,165 @@
+#include QMK_KEYBOARD_H
+#ifdef AUDIO_ENABLE
+  #include "audio.h"
+#endif
+
+// Layer declarations
+enum preonic_layers {
+  _QWERTY = 1,
+  _GAMING = 2,
+  _LOWER = 3,
+  _RAISE = 4,
+};
+
+enum preonic_keycodes {
+  QWERTY = SAFE_RANGE,
+  GAMING,
+  LOWER,
+  RAISE,
+};
+
+// QMK predefined macros
+#define SFT_ENT   SFT_T(KC_ENT)   // Tap for Enter, hold for Shift
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* QWERTY
+ * ,-----------------------------------------------------------------------------------.
+ * | GEsc |  1   |  2   |  3   |  4   |  5   |   6  |   7  |   8  |   9  |   0  |  Del |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Tab  |  Q   |  W   |  E   |  R   |  T   |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Shft |  A   |  S   |  D   |  F   |  G   |   H  |   J  |   K  |   L  |   ;  |   "  |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |SFTENT|  Z   |  X   |  C   |  V   |  B   |   N  |   M  |   ,  |   .  |   /  | Entr |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      | Ctrl | Alt  | Supr |Lower |    Space    | Raise| Left | Down |  Up  | Rght |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_preonic_grid(
+  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,  \
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
+  KC_LSFT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
+  SFT_ENT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT, \
+  XXXXXXX, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
+),
+
+/* Gaming
+ * ,-----------------------------------------------------------------------------------.
+ * | Grve |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  Del |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |  Y   |  U   |  I   |  O   |  P   | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Shft |   A  |   S  |   D  |   F  |   G  |  H   |  J   |  K   |  L   |  ;   |  "   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shft |   Z  |   X  |   C  |   V  |   B  |  N   |  M   |  ,   |  .   |  /   | Entr |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Ctrl | Ctrl | Alt  | Alt  |Lower |    Space    | Raise| Left | Down |  Up  | Rght |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_GAMING] = LAYOUT_preonic_grid(
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,  \
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
+  KC_LSFT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,  \
+  KC_LCTL, KC_LCTL, KC_LALT, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
+),
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * | Esc  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |      |   *  |   /  |      |  Del |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      | VolD |  Up  | VolU |      |      |   7  |   8  |   9  |   -  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      | Left | Down | Rght |      |      |   4  |   5  |   6  |   +  |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |      | Prev | Play | Skip |      |      |   1  |   2  |   3  |   =  |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      | Supr |      |             |   0  | Home |PageDn|PageUp|  End |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_preonic_grid(
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   XXXXXXX, KC_PAST, KC_PSLS, XXXXXXX, KC_DEL,  \
+  _______, XXXXXXX, KC_VOLD, KC_UP,   KC_VOLU, XXXXXXX, XXXXXXX, KC_7,    KC_8,    KC_9,    KC_PMNS, KC_BSPC, \
+  _______, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_4,    KC_5,    KC_6,    KC_PPLS, XXXXXXX, \
+  _______, XXXXXXX, KC_MRWD, KC_MPLY, KC_MFFD, XXXXXXX, XXXXXXX, KC_1,    KC_2,    KC_3,    KC_PEQL, KC_ENT,  \
+  _______, _______, _______, KC_LGUI, _______, _______, _______, KC_0,    KC_HOME, KC_PGDN, KC_PGUP, KC_END   \
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |  F12 |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |  \   |      |      |   /  |      |      |      |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |  |   |  [   |  {   |  (   |  <   |   >  |   )  |   }  |   ]  |   |  |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |      |      |      |  +   |  -   |   _  |   =  |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      |Qwerty| Game |      | Reset|
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_preonic_grid(
+  KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11 , \
+  _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSLS, XXXXXXX, XXXXXXX, KC_PSLS, XXXXXXX, XXXXXXX, XXXXXXX, _______, \
+  _______, KC_PIPE, KC_LBRC, KC_LCBR, KC_LPRN, KC_LABK, KC_RABK, KC_RPRN, KC_RCBR, KC_RBRC, KC_PIPE, XXXXXXX, \
+  _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_PPLS, KC_PMNS, KC_UNDS, KC_EQL,  XXXXXXX, XXXXXXX, XXXXXXX, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, QWERTY ,  GAMING, XXXXXXX, RESET    \
+)
+
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+
+        case QWERTY:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_QWERTY);
+          }
+          return false;
+          break;
+
+        case LOWER:
+          if (record->event.pressed) {
+            layer_on(_LOWER);
+          } else {
+            layer_off(_LOWER);
+          }
+          return false;
+          break;
+
+        case RAISE:
+          if (record->event.pressed) {
+            layer_on(_RAISE);
+          } else {
+            layer_off(_RAISE);
+          }
+          return false;
+          break;
+
+        case GAMING:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_GAMING);
+          }
+          return false;
+          break;
+
+      }
+    return true;
+};
+
+// NFI how to bring this inline with current QMK standards yet, or it's redundant and don't use it.
+// #ifdef AUDIO_ENABLE
+// float tone_startup[][2] = {
+//   {NOTE_D5, 8},
+//   {NOTE_E6, 8},
+//   {NOTE_D6, 8},
+//   {NOTE_E5, 8}
+// };
+
+// void startup_user()
+// {
+//     _delay_ms(20); // gets rid of tick
+//     PLAY_SONG(tone_startup);
+// }
+// #endif

keyboards/preonic/keymaps/trigotometry/readme.md

@@ -0,0 +1,75 @@
+# Trigotometry's v1.0
+
+This layout is the confluence of the standard Preonic QWERTY layout and some of my own tweaks to make it's software as logical and straight cut as it's physical presence, at least in my eyes. Some might say there's wasted space, though possibly true, I believe in keeping it minimal and only adding what is really needed. So if, like me, you're also beginning your journey of coding and enjoy some downtime with friends on the battlefield I think you'll find this layout a stellar place to kick off your customisation.
+
+## Qwerty
+	 /* Qwerty
+	 * ,-----------------------------------------------------------------------------------.
+	 * | GEsc |  1   |  2   |  3   |  4   |  5   |   6  |   7  |   8  |   9  |   0  |  Del |
+	 * |------+------+------+------+------+------+------+------+------+------+------+------|
+	 * | Tab  |  Q   |  W   |  E   |  R   |  T   |   Y  |   U  |   I  |   O  |   P  | Bksp |
+	 * |------+------+------+------+------+-------------+------+------+------+------+------|
+	 * | Shft |  A   |  S   |  D   |  F   |  G   |   H  |   J  |   K  |   L  |   ;  |   "  |
+	 * |------+------+------+------+------+------|------+------+------+------+------+------|
+	 * |SFTENT|  Z   |  X   |  C   |  V   |  B   |   N  |   M  |   ,  |   .  |   /  |  ENT |
+	 * |------+------+------+------+------+------+------+------+------+------+------+------|
+	 * |      | Ctrl | Alt  | Supr |Lower |    Space    | Raise| Left | Down |  Up  | Rght |
+	 * `-----------------------------------------------------------------------------------
+	 */
+Take note of the dual Enter keys, located where normally there'd be a pair of Shifts. I did this to ensure the alphas stayed in the same spot when compared to a staggered and standard board. My brain found it easier to switch the mods across keyboard than the relative position in the alphas, however it's easy to reverse the Enters/Shifts and you'll be back an (nearly) square one!
+
+Also, LEnter acts as a Shift if it's held.
+
+
+
+## Gaming
+	/* Gaming
+	 * ,-----------------------------------------------------------------------------------.
+	 * | Grve |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  Del |
+	 * |------+------+------+------+------+------+------+------+------+------+------+------|
+	 * | Tab  |   Q  |   W  |   E  |   R  |   T  |  Y   |  U   |  I   |  O   |  P   | Bksp |
+	 * |------+------+------+------+------+-------------+------+------+------+------+------|
+	 * | Shft |   A  |   S  |   D  |   F  |   G  |  H   |  J   |  K   |  L   |  ;   |  "   |
+	 * |------+------+------+------+------+------|------+------+------+------+------+------|
+	 * | Shft |   Z  |   X  |   C  |   V  |   B  |  N   |  M   |  ,   |  .   |  /   | Entr |
+	 * |------+------+------+------+------+------+------+------+------+------+------+------|
+	 * | Ctrl | Ctrl | Alt  | Alt  |Lower |    Space    | Raise| Left | Down |  Up  | Rght |
+	 * `-----------------------------------------------------------------------------------'
+	 */
+Honestly it's pretty standard, however I've doubled up on the important modifiers and removed the Super. It's still accessable readily by holding Lower and the key to it's left. Neato? I thought so.
+
+
+
+## Raise Layer
+    /* Raise
+     * ,-----------------------------------------------------------------------------------.
+     * |  F12 |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
+     * |------+------+------+------+------+------+------+------+------+------+------+------|
+     * |      |      |      |      |  \   |      |      |   /  |      |      |      |      |
+     * |------+------+------+------+------+-------------+------+------+------+------+------|
+     * |      |  |   |  [   |  {   |  (   |  <   |   >  |   )  |   }  |   ]  |   |  |      |
+     * |------+------+------+------+------+------|------+------+------+------+------+------|
+     * |      |      |      |      |  +   |  -   |   _  |   =  |      |      |      |      |
+     * |------+------+------+------+------+------+------+------+------+------+------+------|
+     * |      |      |      |      |      |             |      |Qwerty| Game |      | Reset|
+     * `-----------------------------------------------------------------------------------'
+     */
+Pretty self explanatory I think.
+
+
+
+## Lower Layer
+	/* Lower
+	 * ,-----------------------------------------------------------------------------------.
+	 * | Esc  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |      |   *  |   /  |      |  Del |
+	 * |------+------+------+------+------+-------------+------+------+------+------+------|
+	 * |      |      | VolD |  Up  | VolU |      |      |   7  |   8  |   9  |   -  | Bksp |
+	 * |------+------+------+------+------+-------------+------+------+------+------+------|
+	 * |      |      | Left | Down | Rght |      |      |   4  |   5  |   6  |   +  |      |
+	 * |------+------+------+------+------+------|------+------+------+------+------+------|
+	 * |      |      | Prev | Play | Skip |      |      |   1  |   2  |   3  |   =  |      |
+	 * |------+------+------+------+------+------+------+------+------+------+------+------|
+	 * |      |      |      | Supr |      |             |   0  | Home |PageDn|PageUp|  End |
+	 * `-----------------------------------------------------------------------------------'
+	 */
+ Music controls and arrows in prime location. F1-F6 there for extra mappings when in the Gaming layer.

keyboards/preonic/keymaps/trigotometry/rules.mk

@@ -0,0 +1,2 @@
+#Build Options
+MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)

keyboards/thevankeyboards/minivan/keymaps/lexworth/config.h

@@ -0,0 +1,5 @@
+#pragma once
+
+// place overrides here
+#define BACKLIGHT_PIN B7
+#define BACKLIGHT_LEVELS 5

keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c

@@ -0,0 +1,29 @@
+#include QMK_KEYBOARD_H
+
+// Helpful defines
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT
+	(KC_GESC,   KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,            KC_BSPC, 
+	LT(1,KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, LT(1,KC_QUOT), 
+	KC_LSPO,       KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, 
+	KC_LCTL,  KC_LALT,  KC_LGUI,    KC_ENT,    KC_SPC,    TG(2),    LT(3,KC_APP),      KC_DEL),
+	
+	[1] = LAYOUT
+	(KC_CAPS,  KC_PGUP, KC_UP, KC_PGDN, KC_INS, KC_HOME, KC_UNDS, KC_P7, KC_P8, KC_P9, KC_EQL,       KC_TRNS, 
+	KC_TRNS,    KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_END, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_PPLS,    KC_TRNS, 
+	KC_MUTE,     KC_VOLD, KC_VOLU, KC_MPLY, KC_MPRV, KC_MNXT, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PSLS, KC_NLCK, 
+	KC_TRNS,   KC_TRNS,   KC_MSTP,    KC_PENT,     KC_P0,          KC_PDOT,     KC_APP,              KC_TRNS),
+	
+	[2] = LAYOUT
+	(KC_TRNS,  KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,                   KC_TRNS, 
+	KC_TRNS,    KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,                    KC_TRNS, 
+	KC_TILD,     KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS, 
+	KC_TRNS,   KC_TRNS,   KC_TRNS,     KC_TRNS,         KC_TRNS,     KC_TRNS,        KC_F11,            KC_F12),
+	
+	[3] = LAYOUT
+	(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR,   KC_TRNS, 
+	KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC,  KC_PIPE, 
+	KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LPRN, KC_RPRN, KC_TRNS, 
+	BL_TOGG,  BL_DEC,    BL_INC,    KC_TRNS,            KC_TRNS,        KC_TRNS,             KC_TRNS,       RESET)
+};

keyboards/thevankeyboards/minivan/keymaps/lexworth/readme.md

@@ -0,0 +1,7 @@
+# Minivan
+
+![Layout Image](https://drive.google.com/file/d/1rDbtoOBvw5lxfvUBLYmjTt6MJPoeXngr/view?usp=sharing)
+
+# Custom keymap for the minivan with backlight enabled and 5 backlight levels.
+# Hardware Supported:  Minivan
+# Hardware Availability:  [thevankeyboards.com](https://thevankeyboards.com/)

keyboards/thevankeyboards/minivan/keymaps/lexworth/rules.mk

@@ -0,0 +1,5 @@
+# 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
+
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality

keyboards/whitefox/keymaps/konstantin/config.h

@@ -12,3 +12,6 @@
 #define MOUSEKEY_TIME_TO_MAX 50
 #define MOUSEKEY_WHEEL_MAX_SPEED 1
 #define MOUSEKEY_WHEEL_TIME_TO_MAX 50
+
+#undef  IS_COMMAND
+#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RCTL)))

keyboards/whitefox/keymaps/konstantin/keymap.c

@@ -2,9 +2,12 @@
 
 #define FN      MO(L_FN)
 #define FN_CAPS LT(L_FN, KC_CAPS)
-#define FN_RCTL TD(TD_FN_RCTL) // Unused
+#define FN_RCTL TD(TD_FN_RCTL)    // Unused
-#define RLALT   TD(TD_RLALT)   // Unused
+#define RLALT   TD(TD_RLALT)      // Unused
+#define DESKTOP TD(TD_DESKTOP)
 
+#define DESKT_L LCTL(LGUI(KC_LEFT))
+#define DESKT_R LCTL(LGUI(KC_RGHT))
 #define TOP     LCTL(KC_HOME)
 #define BOTTOM  LCTL(KC_END)
 
@@ -46,8 +49,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record)
       layer_invert(L_NUMPAD);
       bool num_lock = host_keyboard_leds() & 1<<USB_LED_NUM_LOCK;
       if (num_lock != (bool)IS_LAYER_ON(L_NUMPAD)) {
-        register_code(KC_NLCK); // Toggle Num Lock to match layer state.
+        tap_code(KC_NLCK); // Toggle Num Lock to match layer state.
-        unregister_code(KC_NLCK);
       }
     }
     return false;
@@ -60,24 +62,26 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record)
 enum tap_dance {
   TD_FN_RCTL,
   TD_RLALT,
+  TD_DESKTOP,
 };
 
-void td_fn_ctrl_finished(qk_tap_dance_state_t *state, void *user_data)
+void td_fn_rctl_finished(qk_tap_dance_state_t *state, void *user_data)
 {
   // Single tap → Fn, double tap → RCtrl, triple tap → Fn+RCtrl etc.
   if (state->count & 1) { layer_on(L_FN); }
   if (state->count & 2) { register_code(KC_RCTL); }
 }
 
-void td_fn_ctrl_reset(qk_tap_dance_state_t *state, void *user_data)
+void td_fn_rctl_reset(qk_tap_dance_state_t *state, void *user_data)
 {
   if (state->count & 1) { layer_off(L_FN); }
   if (state->count & 2) { unregister_code(KC_RCTL); }
 }
 
 qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_FN_RCTL] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_fn_ctrl_finished, td_fn_ctrl_reset),
+  [TD_FN_RCTL] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_fn_rctl_finished, td_fn_rctl_reset),
   [TD_RLALT]   = ACTION_TAP_DANCE_DOUBLE(KC_RALT, KC_LALT),
+  [TD_DESKTOP] = ACTION_TAP_DANCE_DOUBLE(LCTL(LGUI(KC_D)), LCTL(LGUI(KC_F4))), // Add/close virtual desktop
 };
 
 const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -89,17 +93,17 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |---------------------------------------------------------------|
    * |FnCaps| A | S | D | F | G | H | J | K | L | ; | ' | Enter  |PgU|
    * |---------------------------------------------------------------|
-   * | LShift | Z | X | C | V | B | N | M | , | . | / |  Fn  | ↑ |PgD|
+   * | LShift | Z | X | C | V | B | N | M | , | . | / |RCtrl | ↑ |PgD|
    * |---------------------------------------------------------------|
-   * |LCtl|LGui|LAlt|         Space          |RAlt|RCtl| | ← | ↓ | → |
+   * |LCtl|LGui|LAlt|         Space          |RAlt| Fn | | ← | ↓ | → |
    * `---------------------------------------------------------------'
    */
   [L_BASE] = LAYOUT_truefox( \
     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_PSCR, \
     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_DEL,  \
     FN_CAPS,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_PGUP, \
-    KC_LSFT,        KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,FN,             KC_UP,  KC_PGDN, \
+    KC_LSFT,        KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RCTL,        KC_UP,  KC_PGDN, \
-    KC_LCTL,KC_LGUI,KC_LALT,                        KC_SPC,                 KC_RALT,KC_RCTL,                KC_LEFT,KC_DOWN,KC_RGHT  \
+    KC_LCTL,KC_LGUI,KC_LALT,                        KC_SPC,                 KC_RALT,FN,                     KC_LEFT,KC_DOWN,KC_RGHT  \
   ),
 
   /* Function layer
@@ -110,17 +114,17 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |---------------------------------------------------------------|
    * |      |M← |M↓ |M→ |MW↑|   |   |   |   |   |   |   |        |Top|
    * |---------------------------------------------------------------|
-   * |        |MA0|MA2|MW←|MW→|   |   |   |VoD|VoU|Mut|      |PgU|Btm|
+   * |        |MA0|MA2|MW←|MW→|   |   |   |VoD|VoU|Mut| App  |PgU|Btm|
    * |---------------------------------------------------------------|
-   * |    |    |    |          MW↓           |    |Menu| |Hom|PgD|End|
+   * |    |Dstp|Dst←|          MW↓           |Dst→|    | |Hom|PgD|End|
    * `---------------------------------------------------------------'
    */
   [L_FN] = LAYOUT_truefox( \
     _______,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, NUMPAD, KC_SLCK,KC_PAUS, \
     KC_BTN4,KC_BTN2,KC_MS_U,KC_BTN1,KC_BTN3,KC_BTN5,_______,_______,_______,KC_MSTP,KC_MPLY,KC_MPRV,KC_MNXT,CLEAR,          KC_INS,  \
     _______,KC_MS_L,KC_MS_D,KC_MS_R,KC_WH_U,_______,_______,_______,_______,_______,_______,_______,        _______,        TOP,     \
-    _______,        KC_ACL0,KC_ACL2,KC_WH_L,KC_WH_R,_______,_______,_______,KC_VOLD,KC_VOLU,KC_MUTE,_______,        KC_PGUP,BOTTOM,  \
+    _______,        KC_ACL0,KC_ACL2,KC_WH_L,KC_WH_R,_______,_______,_______,KC_VOLD,KC_VOLU,KC_MUTE,KC_APP,         KC_PGUP,BOTTOM,  \
-    _______,_______,_______,                        KC_WH_D,                _______,KC_APP,                 KC_HOME,KC_PGDN,KC_END   \
+    _______,DESKTOP,DESKT_L,                        KC_WH_D,                DESKT_R,_______,                KC_HOME,KC_PGDN,KC_END   \
   ),
 
   /* Numpad layer

layouts/community/ergodox/qwerty_code_friendly/keymap.c

@@ -403,16 +403,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS, K80(L1K2), K80(L1K3),
   KC_TRNS, KC_TRNS, KC_TRNS
 ),
-/* Keymap 2: Numbers, media and mouse keys
+/* Keymap 2: FKeys, media & mouse keys
  *
  * .--------------------------------------------------.  .--------------------------------------------------.
- * |        |   1  |   2  |   3  |   4  |   5  |      |  | Mute |   6  |   7  |   8  |   9  |   0  |        |
+ * |        |      |      |      |      |      |      |  | Mute |      |  F10 |  F11 |  F12 |      |        |
  * |--------+------+------+------+------+------+------|  |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |MWhlUp|  |VolUp |      |      |      |      |      |        |
+ * |        |      |      | MsUp |      |      |MWhlUp|  |VolUp |      |  F7  |  F8  |  F9  |      |        |
  * |--------+------+------+------+------+------|      |  |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|  |------| Left | Down | Up   |Right |      |        |
+ * |        |      |MsLeft|MsDown|MsRght|      |------|  |------|      |  F4  |  F5  |  F6  |      |        |
  * |--------+------+------+------+------+------|MWhlDn|  |VolDn |------+------+------+------+------+--------|
- * |        |      | Rclk | Mclk | Lclk |      |      |  |      |      |      |      |      |      |        |
+ * |        |      | Rclk | Mclk | Lclk |      |      |  |      |      |  F1  |  F2  |  F3  |      |        |
  * '--------+------+------+------+------+-------------'  '-------------+------+------+------+------+--------'
  *   |      |      |      |      |      |                              |      |      |      |      |      |
  *   '----------------------------------'                              '----------------------------------'
@@ -427,7 +427,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* MEDIA, MOUSE & NUMBERS */
 [LAYER_MDIA] = LAYOUT_ergodox_76_or_80(
   /* left hand */
-  KC_TRNS, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_WH_U,
   KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
   KC_TRNS, KC_TRNS, KC_BTN2, KC_BTN3, KC_BTN1, KC_TRNS, KC_WH_D,
@@ -436,10 +436,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                            K80(L2K0), K80(L2K1), KC_TRNS,
                            KC_TRNS,   KC_TRNS,   KC_TRNS,
   /* right hand */
-  KC_MUTE,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_TRNS,
+  KC_MUTE,  KC_TRNS, KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
-  KC_VOLU,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_VOLU,  KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_TRNS, KC_TRNS,
-            KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_TRNS, KC_TRNS,
+            KC_TRNS, KC_F4,   KC_F5,   KC_F6,   KC_TRNS, KC_TRNS,
-  KC_VOLD,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_VOLD,  KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_TRNS, KC_TRNS,
                      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
   KC_MRWD, KC_MFFD,
   KC_MPRV, K80(L2K2), K80(L2K3),
@@ -448,7 +448,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 3: Entire Words (one for each key)
  *
  * .--------------------------------------------------.  .--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |  F11 |  | F12  |  F6  |  F7  |  F8  |  F9  |  F10 |        |
+ * |        |   1  |   2  |   3  |   4  |   5  |      |  |      |   6  |   7  |   8  |   9  |   0  |        |
  * |--------+------+------+------+------+------+------|  |------+------+------+------+------+------+--------|
  * |        |   Q  |   W  |   E  |   R  |   T  |      |  |      |   Y  |   U  |   I  |   O  |   P  |        |
  * |--------+------+------+------+------+------|      |  |      |------+------+------+------+------+--------|
@@ -470,7 +470,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* FKEY & WORDS */
 [LAYER_FKEY] = LAYOUT_ergodox_76_or_80(
   /* left hand */
-  KC_TRNS, KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F11,
+  KC_TRNS, KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_TRNS,
   KC_TRNS, M_WORD_Q, M_WORD_W, M_WORD_E, M_WORD_R, M_WORD_T, KC_TRNS,
   KC_TRNS, M_WORD_A, M_WORD_S, M_WORD_D, M_WORD_F, M_WORD_G,
   KC_TRNS, M_WORD_Z, M_WORD_X, M_WORD_C, M_WORD_V, M_WORD_B, KC_TRNS,
@@ -479,7 +479,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                          K80(L3K0), K80(L3K1), KC_TRNS,
                                          KC_TRNS,   KC_TRNS,   KC_TRNS,
   /* right hand */
-  KC_F12,  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_TRNS,
+  KC_TRNS, KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_TRNS,
   KC_TRNS, M_WORD_Y, M_WORD_U, M_WORD_I, M_WORD_O, M_WORD_P, KC_TRNS,
            M_WORD_H, M_WORD_J, M_WORD_K, M_WORD_L, KC_TRNS,  KC_TRNS,
   KC_TRNS, M_WORD_N, M_WORD_M, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,

layouts/community/ergodox/qwerty_code_friendly/readme.md

@@ -131,13 +131,13 @@ Notes:
 
 ```
 .--------------------------------------------------.  .--------------------------------------------------.
-|        |   1  |   2  |   3  |   4  |   5  |      |  | Mute |   6  |   7  |   8  |   9  |   0  |        |
+|        |      |      |      |      |      |      |  | Mute |      |  F10 |  F11 |  F12 |      |        |
 |--------+------+------+------+------+------+------|  |------+------+------+------+------+------+--------|
-|        |      |      | MsUp |      |      |MWhlUp|  |VolUp |      |      |      |      |      |        |
+|        |      |      | MsUp |      |      |MWhlUp|  |VolUp |      |  F7  |  F8  |  F9  |      |        |
 |--------+------+------+------+------+------|      |  |      |------+------+------+------+------+--------|
-|        |      |MsLeft|MsDown|MsRght|      |------|  |------| Left | Down | Up   |Right |      |        |
+|        |      |MsLeft|MsDown|MsRght|      |------|  |------|      |  F4  |  F5  |  F6  |      |        |
 |--------+------+------+------+------+------|MWhlDn|  |VolDn |------+------+------+------+------+--------|
-|        |      | Rclk | Mclk | Lclk |      |      |  |      |      |      |      |      |      |        |
+|        |      | Rclk | Mclk | Lclk |      |      |  |      |      |  F1  |  F2  |  F3  |      |        |
 '--------+------+------+------+------+-------------'  '-------------+------+------+------+------+--------'
   |      |      |      |      |      |                              |      |      |      |      |      |
   '----------------------------------'                              '----------------------------------'
@@ -158,7 +158,7 @@ eg: `-DCFQ_WORD_E=\"[email protected]\"`
 
 ```
 .--------------------------------------------------.  .--------------------------------------------------.
-|        |  F1  |  F2  |  F3  |  F4  |  F5  |  F11 |  | F12  |  F6  |  F7  |  F8  |  F9  |  F10 |        |
+|        |   1  |   2  |   3  |   4  |   5  |      |  |      |   6  |   7  |   8  |   9  |   0  |        |
 |--------+------+------+------+------+------+------|  |------+------+------+------+------+------+--------|
 |        |   Q  |   W  |   E  |   R  |   T  |      |  |      |   Y  |   U  |   I  |   O  |   P  |        |
 |--------+------+------+------+------+------|      |  |      |------+------+------+------+------+--------|
@@ -179,6 +179,9 @@ eg: `-DCFQ_WORD_E=\"[email protected]\"`
 
 ## Changelog
 
+- 2018/10/19
+  Move F-Keys to numpad like layout.
+
 - 2018/05/29
   Add number keys for cases when keypad numbers are handled differently.
 

layouts/community/ortho_3x10/wanleg/readme.md

@@ -1,13 +1,10 @@
 ![Gherkin Wanleg Layout Image](https://i.imgur.com/nCPog2W.png)  
 # Gherkin Wanleg Layout
 This is the layout I came up with to preserve a standard QWERTY 104 key ANSI layout as much as possible, in as few layers as possible for a 30 key board.  
-I originally set up a few Tap Dance keys, but dropped half of them in favor of chorded versions since in actual use, they tended to impede typing speed more than their current two-key versions.  
+Here are the two Tap Dance keys I've set up for this board:
-I've left them in my `keymap.c` ready for use if anyone wants to try them out:
 
-Legend Name | Single Tap | Double Tap | Hold
+Legend Name | Single Tap | Double Tap | Hold  
---- | --- | --- | ---
+--- | --- | --- | ---  
-*null* | space | enter | shift
-*null* | backspace | delete | control
 Sft//Cp | shift | caps lock | *null*
 Q//Esc | KC_Q | escape | *null*
 

layouts/community/ortho_5x10/wanleg/config.h

@@ -1,9 +0,0 @@
-#pragma once
-
-//QMK DFU settings (ProMicro boards)
-// set top left key as bootloader mode escape key on Gherkin
-#if defined(KEYBOARD_5x5)
-#define QMK_LED B0
-#define QMK_ESC_OUTPUT D7 // usually COL
-#define QMK_ESC_INPUT B2 // usually ROW
-#endif

layouts/community/ortho_5x10/wanleg/keymap.c

@@ -1,38 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "wanleg.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[gGK] = LAYOUT_ortho_5x10_wrapper(
-  _______________Gherkin_NUM_0_______________,
-  _______________Gherkin_Row_0_______________,
-  _______________Gherkin_Row_1_______________,
-  _______________Gherkin_Row_2_______________,
-  _______, _______, _______, gNUMBER, gETCETERA, KC_SPC,gDIRECTION, KC_RGUI, _______, _______
-),
-
-
-[gNUM] = LAYOUT_ortho_5x10_wrapper(
-  _______________Gherkin_NUM_0_______________,
-  _______________Gherkin_NUM_0_______________,
-  _______________Gherkin_NUM_1_______________,
-  _______________Gherkin_NUM_2_______________,
-  _______, _______, _______, _______, _______, KC_ENT, KC_RSFT, KC_RGUI, _______, _______
-),
-
-[gDIR] = LAYOUT_ortho_5x10_wrapper(
-  _______________Gherkin_NUM_0_______________,
-  _______________Gherkin_DIR_0_______________,
-  _______________Gherkin_DIR_1_______________,
-  _______________Gherkin_DIR_2_______________,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-[gETC] = LAYOUT_ortho_5x10_wrapper(
-  _______________Gherkin_NUM_0_______________,
-  _______________Gherkin_ETC_0_______________,
-  _______________Gherkin_ETC_1_______________,
-  _______________Gherkin_ETC_2_______________,
-  _______, _______, _______, _______, _______, LALT(LCTL(KC_DEL)), _______, _______, _______, _______
-),
-
-};

layouts/community/ortho_5x10/wanleg/rules.mk

@@ -1,3 +0,0 @@
-SWAP_HANDS_ENABLE = no
-
-BOOTLOADER = qmk-dfu

layouts/community/ortho_5x15/wanleg/config.h

@@ -1,3 +1,8 @@
-#ifndef CONFIG_USER_H
+#pragma once
-#define CONFIG_USER_H
+
-#endif
+// set top left key as bootloader mode escape key on 5x5 75key layout
+#if defined(KEYBOARD_5x5) && !defined(PRO_MICRO)
+#define QMK_LED B0
+#define QMK_ESC_OUTPUT D7 // usually COL
+#define QMK_ESC_INPUT B2 // usually ROW
+#endif

layouts/community/ortho_5x15/wanleg/keymap.c

@@ -2,30 +2,36 @@
 #include "wanleg.h"
 
 #define _________________BLANK_75__________________ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+#define _________________BLANK_50__________________ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 #define _________________Num_Row_75________________ KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NLCK
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- /* QWERTY 75
+#if defined(KEYBOARD_5x5)
- * .--------------------------------------------------------------------------------------------------------------------------------------.
+[GK75] = LAYOUT_ortho_5x15_wrapper(
- * | ESC    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | NUMLOCK| gherkin|        | FN     |
+  _________________Num_Row_75________________, QWERTY75, XXXXXXX, FUNCTION75,
- * |-----------------------------------------------------------------------------------------------------------+--------+--------+--------|
+  _______________GherkinLike_0_______________, KC_KP_7, KC_KP_8, KC_KP_9,
- * |                                                                                                           |   7    |   8    |   9    |
+  _______________GherkinLike_1_______________, KC_KP_4, KC_KP_5, KC_KP_6,
- * |                                                                                                           |--------+--------+--------|
+  TD(TD_SFT_CAPS), SFT_T(KC_Z), KC_X, KC_C, LT(NUM75, KC_V), LT(ETC75, KC_B), KC_N, LT(DIR75, KC_M), GUI_T(KC_COMM), ALT_T(KC_DOT), CTL_T(KC_BSPC), SFT_T(KC_ENT), KC_KP_1, KC_KP_2, KC_KP_3,
- * |                                             4x12 QWERTY LAYOUT                                            |   4    |   5    |   6    |
+  TD(RST_TAP_DANCE), GHERKIN50, KC_LALT, NUMPAD, NUMBER75, ETCETERA75, KC_SPC,DIRECTION75, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL, KC_KP_0, KC_KP_0, KC_KP_DOT
- * |                                                                                                           |--------+--------+--------|
- * |                                                                                                           |   1    |   2    |   3    |
- * |                                                                                                           |--------+--------+--------|
- * |                                                                                                           |   0    |   0    |   .    |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-[QW75] = LAYOUT_ortho_5x15_wrapper(
-  _________________Num_Row_75________________, GHERKIN75, XXXXXXX, FUNCTION75,
-  _______________Qwerty_Row__0_______________, KC_KP_7, KC_KP_8, KC_KP_9,
-  _______________Qwerty_Row__1_______________, KC_KP_4, KC_KP_5, KC_KP_6,
-  _______________Qwerty_Row__2_______________, KC_KP_1, KC_KP_2, KC_KP_3,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_LALT, SUBTER75, KC_LSFT, KC_SPC, SUPRA75, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL, KC_KP_0, KC_KP_0, KC_KP_DOT
 ),
 
+[PAD] = LAYOUT_ortho_5x5_wrapper(
+  _______, _______, _______, _______, _______,
+  _______________NUMPAD_Row__0_______________, _______,
+  _______________NUMPAD_Row__1_______________, _______,
+  _______________NUMPAD_Row__2_______________, _______,
+  KC_KP_0, TD(LYR50_TAP_DANCE), KC_KP_DOT, KC_PMNS, _______
+),
+
+[GK50] = LAYOUT_ortho_5x10_wrapper(
+  KC_ESC,    _______, _______, _______, _______, _______, _______, _______, _______,    KC_BSPC,
+  _______________Gherkin_Row_0_______________,
+  _______________Gherkin_Row_1_______________,
+  _______________Gherkin_Row_2_______________,
+  TD(RST_TAP_DANCE), GHERKIN75, NUMPAD, gNUMBER, gETCETERA, KC_SPC,gDIRECTION, KC_RGUI, KC_RALT, KC_RGUI
+),
+
+#else
  /* Gherkin 75
  * .--------------------------------------------------------------------------------------------------------------------------------------.
  * | ESC    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | NUMLOCK| qwerty |        | FN     |
@@ -46,6 +52,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   TD(TD_SFT_CAPS), SFT_T(KC_Z), KC_X, KC_C, LT(NUM75, KC_V), LT(ETC75, KC_B), KC_N, LT(DIR75, KC_M), GUI_T(KC_COMM), ALT_T(KC_DOT), CTL_T(KC_BSPC), SFT_T(KC_ENT), KC_KP_1, KC_KP_2, KC_KP_3,
   KC_LCTL, KC_LGUI, KC_LALT, KC_LALT, NUMBER75, ETCETERA75, KC_SPC,DIRECTION75, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL, KC_KP_0, KC_KP_0, KC_KP_DOT
 ),
+#endif
+ /* QWERTY 75
+ * .--------------------------------------------------------------------------------------------------------------------------------------.
+ * | ESC    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | NUMLOCK| gherkin|        | FN     |
+ * |-----------------------------------------------------------------------------------------------------------+--------+--------+--------|
+ * |                                                                                                           |   7    |   8    |   9    |
+ * |                                                                                                           |--------+--------+--------|
+ * |                                             4x12 QWERTY LAYOUT                                            |   4    |   5    |   6    |
+ * |                                                                                                           |--------+--------+--------|
+ * |                                                                                                           |   1    |   2    |   3    |
+ * |                                                                                                           |--------+--------+--------|
+ * |                                                                                                           |   0    |   0    |   .    |
+ * '--------------------------------------------------------------------------------------------------------------------------------------'
+ */
+[QW75] = LAYOUT_ortho_5x15_wrapper(
+  _________________Num_Row_75________________, GHERKIN75, XXXXXXX, FUNCTION75,
+  _______________Qwerty_Row__0_______________, KC_KP_7, KC_KP_8, KC_KP_9,
+  _______________Qwerty_Row__1_______________, KC_KP_4, KC_KP_5, KC_KP_6,
+  _______________Qwerty_Row__2_______________, KC_KP_1, KC_KP_2, KC_KP_3,
+  KC_LCTL, KC_LGUI, KC_LALT, KC_LALT, SUBTER75, KC_LSFT, KC_SPC, SUPRA75, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL, KC_KP_0, KC_KP_0, KC_KP_DOT
+),
 
  /* SUBTER75
  * .--------------------------------------------------------------------------------------------------------------------------------------.
@@ -173,4 +200,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,  _______, _______, KC_MS_U, KC_WH_D,
   _______, _______, _______, _______, _______, _______, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
 ),
+
+[gNUM] = LAYOUT_ortho_5x10_wrapper(
+  _________________BLANK_50__________________,
+  _______________Gherkin_NUM_0_______________,
+  _______________Gherkin_NUM_1_______________,
+  _______________Gherkin_NUM_2_______________,
+  _______, _______, _______, _______, _______, KC_ENT, KC_RSFT, KC_RGUI, _______, _______
+),
+
+[gDIR] = LAYOUT_ortho_5x10_wrapper(
+  _________________BLANK_50__________________,
+  _______________Gherkin_DIR_0_______________,
+  _______________Gherkin_DIR_1_______________,
+  _______________Gherkin_DIR_2_______________,
+  _________________BLANK_50__________________
+),
+
+[gETC] = LAYOUT_ortho_5x10_wrapper(
+  _________________BLANK_50__________________,
+  _______________Gherkin_ETC_0_______________,
+  _______________Gherkin_ETC_1_______________,
+  _______________Gherkin_ETC_2_______________,
+  _______, KC_CAPS, _______, _______, _______, LALT(LCTL(KC_DEL)), _______, _______, _______, _______
+),
 };

layouts/community/ortho_5x5/layout.json

@@ -0,0 +1 @@
+["","","","",""],["","","","",""],["","","","",""],["","","","",""],["","","","",""]

layouts/community/ortho_5x5/readme.md

@@ -0,0 +1,3 @@
+# ortho_5x5
+
+    LAYOUT_ortho_5x5

quantum/process_keycode/process_ucis.c

@@ -93,7 +93,7 @@ void register_ucis(const char *hex) {
 }
 
 bool process_ucis (uint16_t keycode, keyrecord_t *record) {
-  uint8_t i;
+  unicode_input_mode_init();
 
   if (!qk_ucis_state.in_progress)
     return true;
@@ -122,7 +122,7 @@ bool process_ucis (uint16_t keycode, keyrecord_t *record) {
   if (keycode == KC_ENT || keycode == KC_SPC || keycode == KC_ESC) {
     bool symbol_found = false;
 
-    for (i = qk_ucis_state.count; i > 0; i--) {
+    for (uint8_t i = qk_ucis_state.count; i > 0; i--) {
       register_code (KC_BSPC);
       unregister_code (KC_BSPC);
       wait_ms(UNICODE_TYPE_DELAY);
@@ -134,7 +134,7 @@ bool process_ucis (uint16_t keycode, keyrecord_t *record) {
     }
 
     unicode_input_start();
-    for (i = 0; ucis_symbol_table[i].symbol; i++) {
+    for (uint8_t i = 0; ucis_symbol_table[i].symbol; i++) {
       if (is_uni_seq (ucis_symbol_table[i].symbol)) {
         symbol_found = true;
         register_ucis(ucis_symbol_table[i].code + 2);

quantum/process_keycode/process_unicode.c

@@ -17,15 +17,10 @@
 #include "action_util.h"
 #include "eeprom.h"
 
-static uint8_t first_flag = 0;
-
 bool process_unicode(uint16_t keycode, keyrecord_t *record) {
   if (keycode > QK_UNICODE && record->event.pressed) {
-    if (first_flag == 0) {
-      set_unicode_input_mode(eeprom_read_byte(EECONFIG_UNICODEMODE));
-      first_flag = 1;
-    }
     uint16_t unicode = keycode & 0x7FFF;
+    unicode_input_mode_init();
     unicode_input_start();
     register_hex(unicode);
     unicode_input_finish();

quantum/process_keycode/process_unicode_common.c

@@ -22,8 +22,7 @@
 static uint8_t input_mode;
 uint8_t mods;
 
-void set_unicode_input_mode(uint8_t os_target)
+void set_unicode_input_mode(uint8_t os_target) {
-{
   input_mode = os_target;
   eeprom_update_byte(EECONFIG_UNICODEMODE, os_target);
 }
@@ -32,6 +31,14 @@ uint8_t get_unicode_input_mode(void) {
   return input_mode;
 }
 
+void unicode_input_mode_init(void) {
+  static bool first_flag = false;
+  if (!first_flag) {
+    input_mode = eeprom_read_byte(EECONFIG_UNICODEMODE);
+    first_flag = true;
+  }
+}
+
 __attribute__((weak))
 void unicode_input_start (void) {
   // save current mods
@@ -104,8 +111,7 @@ void unicode_input_finish (void) {
 }
 
 __attribute__((weak))
-uint16_t hex_to_keycode(uint8_t hex)
+uint16_t hex_to_keycode(uint8_t hex) {
-{
   if (hex == 0x0) {
     return KC_0;
   } else if (hex < 0xA) {
@@ -123,8 +129,7 @@ void register_hex(uint16_t hex) {
   }
 }
 
-void send_unicode_hex_string(const char *str)
+void send_unicode_hex_string(const char *str) {
-{
   if (!str) { return; } // Safety net
 
   while (*str) {

quantum/process_keycode/process_unicode_common.h

@@ -28,6 +28,7 @@ static uint8_t input_mode;
 
 void set_unicode_input_mode(uint8_t os_target);
 uint8_t get_unicode_input_mode(void);
+void unicode_input_mode_init(void);
 void unicode_input_start(void);
 void unicode_input_finish(void);
 void register_hex(uint16_t hex);

quantum/process_keycode/process_unicodemap.c

@@ -45,6 +45,7 @@ __attribute__((weak))
 void unicode_map_input_error() {}
 
 bool process_unicode_map(uint16_t keycode, keyrecord_t *record) {
+  unicode_input_mode_init();
   uint8_t input_mode = get_unicode_input_mode();
   if ((keycode & QK_UNICODE_MAP) == QK_UNICODE_MAP && record->event.pressed) {
     const uint32_t* map = unicode_map;

tmk_core/common.mk

@@ -34,6 +34,13 @@ ifeq ($(PLATFORM),CHIBIOS)
   ifeq ($(MCU_SERIES), STM32F3xx)
     TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom_stm32.c
     TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/flash_stm32.c
+    TMK_COMMON_DEFS += -DEEPROM_EMU_STM32F303xC
+    TMK_COMMON_DEFS += -DSTM32_EEPROM_ENABLE
+  else ifeq ($(MCU_SERIES), STM32F1xx)
+    TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom_stm32.c
+    TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/flash_stm32.c
+    TMK_COMMON_DEFS += -DEEPROM_EMU_STM32F103xB
+    TMK_COMMON_DEFS += -DSTM32_EEPROM_ENABLE
   else
     TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom_teensy.c
 endif

tmk_core/common/chibios/eeprom_stm32.c

@@ -10,7 +10,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * This files are free to use from https://github.com/rogerclarkmelbourne/Arduino_STM32 and 
+ * This files are free to use from https://github.com/rogerclarkmelbourne/Arduino_STM32 and
  * https://github.com/leaflabs/libmaple
  *
  * Modifications for QMK and STM32F303 by Yiancar
@@ -274,7 +274,7 @@ uint16_t EE_VerifyPageFullWriteVariable(uint16_t Address, uint16_t Data)
 
     // Check each active page address starting from begining
     for (idx = pageBase + 4; idx < pageEnd; idx += 4)
-        if ((*(__IO uint32_t*)idx) == 0xFFFFFFFF)               // Verify if element 
+        if ((*(__IO uint32_t*)idx) == 0xFFFFFFFF)               // Verify if element
         {                                                   //  contents are 0xFFFFFFFF
             FlashStatus = FLASH_ProgramHalfWord(idx, Data); // Set variable data
             if (FlashStatus != FLASH_COMPLETE)
@@ -517,7 +517,7 @@ uint16_t EEPROM_read(uint16_t Address, uint16_t *Data)
 
     // Get the valid Page end Address
     pageEnd = pageBase + ((uint32_t)(PageSize - 2));
-    
+
     // Check each active page address starting from end
     for (pageBase += 6; pageEnd >= pageBase; pageEnd -= 4)
         if ((*(__IO uint16_t*)pageEnd) == Address)      // Compare the read address with the virtual address
@@ -574,7 +574,7 @@ uint16_t EEPROM_update(uint16_t Address, uint16_t Data)
 {
     uint16_t temp;
     EEPROM_read(Address, &temp);
-    if (Address == Data)
+    if (temp == Data)
         return EEPROM_SAME_VALUE;
     else
         return EEPROM_write(Address, Data);

tmk_core/common/chibios/eeprom_stm32.h

@@ -10,7 +10,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * This files are free to use from https://github.com/rogerclarkmelbourne/Arduino_STM32 and 
+ * This files are free to use from https://github.com/rogerclarkmelbourne/Arduino_STM32 and
  * https://github.com/leaflabs/libmaple
  *
  * Modifications for QMK and STM32F303 by Yiancar
@@ -27,8 +27,14 @@
 #include "flash_stm32.h"
 
 // HACK ALERT. This definition may not match your processor
-// To Do. Work out correct value for EEPROM_PAGE_SIZE on the STM32F103CT6 etc 
+// To Do. Work out correct value for EEPROM_PAGE_SIZE on the STM32F103CT6 etc
-#define MCU_STM32F303CC
+#if defined(EEPROM_EMU_STM32F303xC)
+  #define MCU_STM32F303CC
+#elif defined(EEPROM_EMU_STM32F103xB)
+  #define MCU_STM32F103RB
+#else
+  #error "not implemented."
+#endif
 
 #ifndef EEPROM_PAGE_SIZE
     #if defined (MCU_STM32F103RB)

tmk_core/common/chibios/flash_stm32.c

@@ -10,19 +10,27 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * This files are free to use from https://github.com/rogerclarkmelbourne/Arduino_STM32 and 
+ * This files are free to use from https://github.com/rogerclarkmelbourne/Arduino_STM32 and
  * https://github.com/leaflabs/libmaple
  *
  * Modifications for QMK and STM32F303 by Yiancar
  */
 
-#define STM32F303xC
+#if defined(EEPROM_EMU_STM32F303xC)
+    #define STM32F303xC
+    #include "stm32f3xx.h"
+#elif defined(EEPROM_EMU_STM32F103xB)
+    #define STM32F103xB
+    #include "stm32f1xx.h"
+#else
+    #error "not implemented."
+#endif
 
-#include "stm32f3xx.h"
 #include "flash_stm32.h"
 
-#define FLASH_KEY1          ((uint32_t)0x45670123)
+#if defined(EEPROM_EMU_STM32F103xB)
-#define FLASH_KEY2          ((uint32_t)0xCDEF89AB)
+    #define FLASH_SR_WRPERR FLASH_SR_WRPRTERR
+#endif
 
 /* Delay definition */
 #define EraseTimeout        ((uint32_t)0x00000FFF)
@@ -71,7 +79,7 @@ FLASH_Status FLASH_GetStatus(void)
   *   FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.
   */
 FLASH_Status FLASH_WaitForLastOperation(uint32_t Timeout)
-{ 
+{
     FLASH_Status status;
 
     /* Check for the Flash Status */
@@ -102,7 +110,7 @@ FLASH_Status FLASH_ErasePage(uint32_t Page_Address)
     ASSERT(IS_FLASH_ADDRESS(Page_Address));
     /* Wait for last operation to be completed */
     status = FLASH_WaitForLastOperation(EraseTimeout);
-  
+
     if(status == FLASH_COMPLETE)
     {
         /* if the previous operation is completed, proceed to erase the page */
@@ -128,7 +136,7 @@ FLASH_Status FLASH_ErasePage(uint32_t Page_Address)
   * @param  Address: specifies the address to be programmed.
   * @param  Data: specifies the data to be programmed.
   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,
-  *   FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT. 
+  *   FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.
   */
 FLASH_Status FLASH_ProgramHalfWord(uint32_t Address, uint16_t Data)
 {

tmk_core/common/eeconfig.c

@@ -3,7 +3,7 @@
 #include "eeprom.h"
 #include "eeconfig.h"
 
-#ifdef STM32F303xC
+#ifdef STM32_EEPROM_ENABLE
 #include "hal.h"
 #include "eeprom_stm32.h"
 #endif
@@ -32,7 +32,7 @@ void eeconfig_init_kb(void) {
  * FIXME: needs doc
  */
 void eeconfig_init_quantum(void) {
-#ifdef STM32F303xC
+#ifdef STM32_EEPROM_ENABLE
     EEPROM_format();
 #endif
   eeprom_update_word(EECONFIG_MAGIC,          EECONFIG_MAGIC_NUMBER);
@@ -73,7 +73,7 @@ void eeconfig_enable(void)
  */
 void eeconfig_disable(void)
 {
-#ifdef STM32F303xC
+#ifdef STM32_EEPROM_ENABLE
     EEPROM_format();
 #endif
     eeprom_update_word(EECONFIG_MAGIC, EECONFIG_MAGIC_NUMBER_OFF);

tmk_core/common/eeconfig.h

@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EECONFIG_MAGIC_NUMBER_OFF                   (uint16_t)0xFFFF
 
 /* eeprom parameteter address */
-#if !defined(STM32F303xC)
+#if !defined(STM32_EEPROM_ENABLE)
 #define EECONFIG_MAGIC                              (uint16_t *)0
 #define EECONFIG_DEBUG                               (uint8_t *)2
 #define EECONFIG_DEFAULT_LAYER                       (uint8_t *)3

tmk_core/protocol/chibios/main.c

@@ -44,7 +44,7 @@
 #ifdef MIDI_ENABLE
 #include "qmk_midi.h"
 #endif
-#ifdef STM32F303xC
+#ifdef STM32_EEPROM_ENABLE
 #include "eeprom_stm32.h"
 #endif
 #include "suspend.h"
@@ -112,7 +112,7 @@ int main(void) {
   halInit();
   chSysInit();
 
-#ifdef STM32F303xC
+#ifdef STM32_EEPROM_ENABLE
   EEPROM_init();
 #endif
 

users/wanleg/config.h

@@ -2,8 +2,17 @@
 #define USERSPACE_CONFIG_H
 
 //TAPPING_TERM
-#ifdef TAP_DANCE_ENABLE
+//tapping term short (<100): on multi-purpose keys, slow taps may not register, but "holds" register easier. multi-tap keys may be difficult to activate.
-#define TAPPING_TERM 200
+//tapping term long (>200): holds don't register as easily - noticeable when typing quickly (e.g. shift doesn't want to engage.)
+#if defined(TAP_DANCE_ENABLE) && defined(KEYBOARD_lets_split_rev2)
+//Kailh Coppers activate quickly and don't need a long tapping term
+#define TAPPING_TERM 100
+
+#elif defined(TAP_DANCE_ENABLE) && defined(KEYBOARD_bigswitch)
+#define TAPPING_TERM 700
+
+#else
+#define TAPPING_TERM 145
 #endif
 
 //Mousekey Settings
@@ -27,4 +36,9 @@
 #define NO_ACTION_FUNCTION
 #define NO_ACTION_ONESHOT
 
+// Disable mod tap interrrupt
+#ifndef IGNORE_MOD_TAP_INTERRUPT
+#define IGNORE_MOD_TAP_INTERRUPT
+#endif // !mod tap interrrupt
+
 #endif // !USERSPACE_CONFIG_H

users/wanleg/rules.mk

@@ -9,8 +9,8 @@ ifeq ($(strip $(dfu)), qmk)
     BOOTLOADER = qmk-dfu
 endif
 
-#use alternate settings for 4x4 board using ProMicro instead of Micro
+#use alternate settings for boards using ProMicro instead of Micro
-#usage: make 4x4:wanleg PM=yes
+#example usage: make 4x4:wanleg PM=yes
 ifeq ($(strip $(PM)), yes)
 	OPT_DEFS += -DPRO_MICRO
 endif

users/wanleg/tapdances.c

@@ -1,6 +1,12 @@
 //Tap Dance Settings
 #include "wanleg.h"
 
+//audio settings for one of the tap dances below
+#ifdef AUDIO_ENABLE
+  float lyrup_song[][2]     = SONG(MUSIC_ON_SOUND);
+  float lyrdown_song[][2]  = SONG(MUSIC_OFF_SOUND);
+#endif
+
 ///// QUAD FUNCTION TAP DANCE GENERAL SETUP SECTION START /////
 ///// (no need to edit this section) /////
 //Enums used to clearly convey the state of the tap dance
@@ -9,7 +15,10 @@ enum {
   SINGLE_HOLD = 2,
   DOUBLE_TAP = 3,
   DOUBLE_HOLD = 4,
-  DOUBLE_SINGLE_TAP = 5 //send SINGLE_TAP twice - NOT DOUBLE_TAP
+  DOUBLE_SINGLE_TAP = 5, //send SINGLE_TAP twice - NOT DOUBLE_TAP
+  TRIPLE_TAP = 6,
+  TRIPLE_HOLD = 7,
+  TRIPLE_SINGLE_TAP = 8
   // Add more enums here if you want for triple, quadruple, etc.
 };
 
@@ -32,69 +41,18 @@ int cur_dance (qk_tap_dance_state_t *state) {
     else if (state->pressed) return DOUBLE_HOLD;
     else return DOUBLE_TAP;
   }
-  else return 6; //magic number. At some point this method will expand to work for more presses
+
+  //If count = 3, and it has been interrupted - assume that user is trying to type the letter associated
+  //with double tap.
+  else if (state->count == 3) {
+    if (state->interrupted) return TRIPLE_SINGLE_TAP;
+    else if (state->pressed) return TRIPLE_HOLD;
+    else return TRIPLE_TAP;
+  }
+  else return 9; //magic number. At some point this method will expand to work for more presses
 }
 ///// QUAD FUNCTION TAP DANCE GENERAL SETUP SECTION END /////
 ///// QUAD FUNCTION TAP DANCE PERSONALIZATION SECTION START /////
-//instantiate 'tap' for the 'ENT' tap dance.
-static tap ENTtap_state = {
-  .is_press_action = true,
-  .state = 0
-};
-
-void ENT_finished (qk_tap_dance_state_t *state, void *user_data) {
-  ENTtap_state.state = cur_dance(state);
-  switch (ENTtap_state.state) {
-    case SINGLE_TAP: register_code(KC_SPC); break;
-    case SINGLE_HOLD: register_code(KC_LSFT); break;
-    case DOUBLE_TAP: register_code(KC_ENT); break;
-    case DOUBLE_HOLD: register_code(KC_NO); break; // setting double hold to do nothing (change this if you want)
-    case DOUBLE_SINGLE_TAP: register_code(KC_SPC); unregister_code(KC_SPC); register_code(KC_SPC);
-    //Last case is for fast typing. Assuming your key is `f`:
-    //For example, when typing the word `buffer`, and you want to make sure that you send `ff` and not `Esc`.
-    //In order to type `ff` when typing fast, the next character will have to be hit within the `TAPPING_TERM`, which by default is 200ms.
-  }
-}
-
-void ENT_reset (qk_tap_dance_state_t *state, void *user_data) {
-  switch (ENTtap_state.state) {
-    case SINGLE_TAP: unregister_code(KC_SPC); break;
-    case SINGLE_HOLD: unregister_code(KC_LSFT); break;
-    case DOUBLE_TAP: unregister_code(KC_ENT); break;
-    case DOUBLE_HOLD: unregister_code(KC_NO);
-    case DOUBLE_SINGLE_TAP: unregister_code(KC_SPC);
-  }
-  ENTtap_state.state = 0;
-}
-
-//instantiate 'tap' for the 'DEL' tap dance.
-static tap DELtap_state = {
-  .is_press_action = true,
-  .state = 0
-};
-
-void DEL_finished (qk_tap_dance_state_t *state, void *user_data) {
-  DELtap_state.state = cur_dance(state);
-  switch (DELtap_state.state) {
-    case SINGLE_TAP: register_code(KC_BSPC); break;
-    case SINGLE_HOLD: register_code(KC_LCTL); break;
-    case DOUBLE_TAP: register_code(KC_DEL); break;
-    case DOUBLE_HOLD: register_code(KC_NO); break;
-    case DOUBLE_SINGLE_TAP: register_code(KC_BSPC); unregister_code(KC_BSPC); register_code(KC_BSPC);
-  }
-}
-
-void DEL_reset (qk_tap_dance_state_t *state, void *user_data) {
-  switch (DELtap_state.state) {
-    case SINGLE_TAP: unregister_code(KC_BSPC); break;
-    case SINGLE_HOLD: unregister_code(KC_LCTL); break;
-    case DOUBLE_TAP: unregister_code(KC_DEL); break;
-    case DOUBLE_HOLD: unregister_code(KC_NO);
-    case DOUBLE_SINGLE_TAP: unregister_code(KC_BSPC);
-  }
-  DELtap_state.state = 0;
-}
-
 //instantiate 'tap' for the 'CAD' tap dance.
 static tap CADtap_state = {
   .is_press_action = true,
@@ -104,14 +62,14 @@ static tap CADtap_state = {
 void CAD_finished (qk_tap_dance_state_t *state, void *user_data) {
   CADtap_state.state = cur_dance(state);
   switch (CADtap_state.state) {
-    case SINGLE_TAP: 
+    case SINGLE_TAP:
-		//register_code(KC_SPC); 
+		//register_code(KC_SPC);
 		SEND_STRING(SS_LGUI("l"));
 		#ifdef BACKLIGHT_ENABLE
-		backlight_set(3);
+    backlight_level(3);
 		#endif
 		break;
-    case SINGLE_HOLD: 
+    case SINGLE_HOLD:
 		//register_code(KC_NO);
 		//take a screenshot of a single window, open Paint and paste
 		SEND_STRING(SS_LALT(SS_TAP(X_PSCREEN)) SS_LGUI("r"));
@@ -120,47 +78,37 @@ void CAD_finished (qk_tap_dance_state_t *state, void *user_data) {
         _delay_ms(700);
         SEND_STRING(SS_LCTRL("v"));
 		break; //register this keycode when button is held
-    case DOUBLE_TAP: 
+    case DOUBLE_TAP:
-		//register_code(KC_ENT); 
+		//register_code(KC_ENT);
 		SEND_STRING(SS_LCTRL(SS_LALT(SS_TAP(X_DELETE))));
 		#ifdef BACKLIGHT_ENABLE
-		backlight_set(0);
+    backlight_level(0);
 		#endif
 		break;
     //case DOUBLE_HOLD: register_code(KC_NO); break; //register this keycode when button is tapped and then held
-	case DOUBLE_HOLD: 
+	case DOUBLE_HOLD:
-		reset_keyboard(); 
+		reset_keyboard();
 		break; //register this keycode when button is tapped and then held
-    case DOUBLE_SINGLE_TAP: register_code(KC_NO); unregister_code(KC_NO); register_code(KC_NO);
+	case TRIPLE_TAP:
+		SEND_STRING("[email protected]");
+		break;
+	case TRIPLE_HOLD:
+  set_single_persistent_default_layer(1);
+  #ifdef AUDIO_ENABLE
+    stop_all_notes();
+    PLAY_SONG(lyrup_song);
+  #endif
+  break;
   }
 }
 
 void CAD_reset (qk_tap_dance_state_t *state, void *user_data) {
   switch (CADtap_state.state) {
-    case SINGLE_TAP: 
+//nothing to do
-		//unregister_code(KC_SPC); 
-		SEND_STRING(SS_LGUI("l"));
-		#ifdef BACKLIGHT_ENABLE
-		backlight_set(3);
-		#endif
-		break;
-    case SINGLE_HOLD: 
-		register_code(KC_NO); //(un)register this keycode when button is held and then released
-		//SEND_STRING(SS_LCTRL("v"));
-		break; 
-    case DOUBLE_TAP: 
-		//register_code(KC_ENT); 
-		SEND_STRING(SS_LCTRL(SS_LALT(SS_TAP(X_DELETE))));
-		#ifdef BACKLIGHT_ENABLE
-		backlight_set(0);
-		#endif
-		break;
-    case DOUBLE_HOLD: register_code(KC_NO); //(un)register this keycode when button is tapped and then held, and then released
-    case DOUBLE_SINGLE_TAP: unregister_code(KC_NO);
   }
   CADtap_state.state = 0;
-}  
+}
-  
+
 //instantiate 'tap' for the 'RST' tap dance.
 static tap RSTtap_state = {
   .is_press_action = true,
@@ -173,21 +121,18 @@ void RST_finished (qk_tap_dance_state_t *state, void *user_data) {
 	case SINGLE_TAP: register_code(KC_LCTL); break;
 	case SINGLE_HOLD: register_code(KC_LCTL); break;
 	case DOUBLE_TAP: reset_keyboard(); break;
-	case DOUBLE_HOLD: register_code(KC_NO); break;
+	case DOUBLE_SINGLE_TAP: register_code(KC_LCTL); unregister_code(KC_LCTL); register_code(KC_LCTL); break;
-	case DOUBLE_SINGLE_TAP: register_code(KC_LCTL); unregister_code(KC_LCTL); register_code(KC_LCTL);
   }
-}		
+}
 
 void RST_reset (qk_tap_dance_state_t *state, void *user_data) {
   switch (RSTtap_state.state) {
 	case SINGLE_TAP: unregister_code(KC_LCTL); break;
 	case SINGLE_HOLD: unregister_code(KC_LCTL); break;
-	case DOUBLE_TAP: unregister_code(KC_NO); break;
+    case DOUBLE_SINGLE_TAP: unregister_code(KC_LCTL); break;
-	case DOUBLE_HOLD: unregister_code(KC_NO);
-    case DOUBLE_SINGLE_TAP: unregister_code(KC_LCTL);
   }
   RSTtap_state.state = 0;
-}	
+}
 
 //instantiate 'tap' for the 'LYR' tap dance.
 static tap LYRtap_state = {
@@ -199,23 +144,106 @@ void LYR_finished (qk_tap_dance_state_t *state, void *user_data) {
   LYRtap_state.state = cur_dance(state);
   switch (LYRtap_state.state) {
 	case SINGLE_TAP: register_code(KC_PSLS); break;
-	case SINGLE_HOLD: register_code(KC_NO); break;
 	case DOUBLE_TAP: set_single_persistent_default_layer(_GK); break;
-	case DOUBLE_HOLD: register_code(KC_NO); break;
     case DOUBLE_SINGLE_TAP: register_code(KC_PSLS); unregister_code(KC_PSLS); register_code(KC_PSLS);
   }
-}		
+}
 
 void LYR_reset (qk_tap_dance_state_t *state, void *user_data) {
   switch (LYRtap_state.state) {
     case SINGLE_TAP: unregister_code(KC_PSLS); break;
-    case SINGLE_HOLD: unregister_code(KC_NO); break;
     case DOUBLE_TAP: set_single_persistent_default_layer(_GK); break;
-    case DOUBLE_HOLD: unregister_code(KC_NO);
     case DOUBLE_SINGLE_TAP: unregister_code(KC_PSLS);
   }
   LYRtap_state.state = 0;
-}	
+}
+
+//instantiate 'tap' for the 'LYR75' tap dance.
+static tap LYR75tap_state = {
+  .is_press_action = true,
+  .state = 0
+};
+
+void LYR75_finished (qk_tap_dance_state_t *state, void *user_data) {
+  LYR75tap_state.state = cur_dance(state);
+  switch (LYR75tap_state.state) {
+	case SINGLE_TAP: register_code(KC_PSLS); break;
+	case DOUBLE_TAP: set_single_persistent_default_layer(GK75); break;
+    case DOUBLE_SINGLE_TAP: register_code(KC_PSLS); unregister_code(KC_PSLS); register_code(KC_PSLS);
+  }
+}
+
+void LYR75_reset (qk_tap_dance_state_t *state, void *user_data) {
+  switch (LYR75tap_state.state) {
+    case SINGLE_TAP: unregister_code(KC_PSLS); break;
+    case DOUBLE_TAP: set_single_persistent_default_layer(GK75); break;
+    case DOUBLE_SINGLE_TAP: unregister_code(KC_PSLS);
+  }
+  LYR75tap_state.state = 0;
+}
+
+//instantiate 'tap' for the 'LYR50' tap dance.
+static tap LYR50tap_state = {
+  .is_press_action = true,
+  .state = 0
+};
+
+void LYR50_finished (qk_tap_dance_state_t *state, void *user_data) {
+  LYR50tap_state.state = cur_dance(state);
+  switch (LYR75tap_state.state) {
+	case SINGLE_TAP: register_code(KC_PSLS); break;
+	case DOUBLE_TAP: set_single_persistent_default_layer(GK50); break;
+    case DOUBLE_SINGLE_TAP: register_code(KC_PSLS); unregister_code(KC_PSLS); register_code(KC_PSLS);
+  }
+}
+
+void LYR50_reset (qk_tap_dance_state_t *state, void *user_data) {
+  switch (LYR50tap_state.state) {
+    case SINGLE_TAP: unregister_code(KC_PSLS); break;
+    case DOUBLE_TAP: set_single_persistent_default_layer(GK50); break;
+    case DOUBLE_SINGLE_TAP: unregister_code(KC_PSLS);
+  }
+  LYR50tap_state.state = 0;
+}
+
+//instantiate 'tap' for the 'BSW' tap dance.
+static tap BSWtap_state = {
+  .is_press_action = true,
+  .state = 0
+};
+
+void BSW_finished (qk_tap_dance_state_t *state, void *user_data) {
+  BSWtap_state.state = cur_dance(state);
+  switch (BSWtap_state.state) {
+    case SINGLE_TAP: register_code(KC_ENTER); break;
+    case SINGLE_HOLD:
+      set_single_persistent_default_layer(0);
+      #ifdef AUDIO_ENABLE
+        stop_all_notes();
+        PLAY_SONG(lyrdown_song);
+      #endif
+      break;
+    case DOUBLE_TAP:
+	  register_code(KC_LCTRL);
+      register_code(KC_C);
+	  break;
+	case DOUBLE_HOLD:
+	  reset_keyboard();
+	  break; //register this keycode when button is tapped and then held
+  }
+}
+
+void BSW_reset (qk_tap_dance_state_t *state, void *user_data) {
+  switch (BSWtap_state.state) {
+    case SINGLE_TAP: unregister_code(KC_ENTER); break;
+    case DOUBLE_TAP:
+	  unregister_code(KC_LCTRL);
+	  unregister_code(KC_C);
+	  break;
+  }
+  BSWtap_state.state = 0;
+}
+
 ///// QUAD FUNCTION TAP DANCE PERSONALIZATION SECTION END /////
 
 //Tap Dance Definitions
@@ -224,12 +252,12 @@ qk_tap_dance_action_t tap_dance_actions[] = {
   [TD_SFT_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS)
 // Other declarations would go here, separated by commas, if you have them
  ,[TD_Q_ESC]  = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC)
- ,[ENT_TAP_DANCE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ENT_finished, ENT_reset)
- ,[DEL_TAP_DANCE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, DEL_finished, DEL_reset)
  ,[RST_TAP_DANCE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, RST_finished, RST_reset)
  ,[CAD_TD] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, CAD_finished, CAD_reset)
  ,[LYR_TAP_DANCE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, LYR_finished, LYR_reset)
-
+ ,[LYR75_TAP_DANCE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, LYR75_finished, LYR75_reset)
+ ,[LYR50_TAP_DANCE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, LYR50_finished, LYR50_reset)
+ ,[BSW_TAP_DANCE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, BSW_finished, BSW_reset)
 };
 
 //In Layer declaration, add tap dance item in place of a key code

users/wanleg/wanleg.c

@@ -47,6 +47,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       }
       return false;
       break;
+    case GHERKIN50:
+    if (record->event.pressed) {
+      set_single_persistent_default_layer(GK50);
+      }
+      return false;
+      break;
     case SUBTER:
       if (record->event.pressed) {
         layer_on(SUB);

users/wanleg/wanleg.h

@@ -27,10 +27,12 @@ enum userspace_layers {
   ETC75,
   FN75,
   PAD,
+  GK50,
 };
 #elif KEYBOARD_xd75
 enum userspace_layers {
   GK75 = 0,
+  PAD,
   QW75,
   SUB75,
   SUP75,
@@ -50,7 +52,32 @@ enum userspace_layers {
   gNUM,
   gDIR,
   gETC,
+  GK50,
+};
+#elif KEYBOARD_5x5
+enum userspace_layers {
+  GK50 = 0,
+  gNUM,
+  gDIR,
+  gETC,
+  GK75,
+  QW75,
+  SUB75,
+  SUP75,
+  NUM75,
+  DIR75,
+  ETC75,
+  FN75,
   PAD,
+  gGK,
+  _GK,
+  _QW,
+  ONE,
+  SUB,
+  SUP,
+  NUM,
+  DIR,
+  ETC,
 };
 #else
   enum userspace_layers {
@@ -75,6 +102,7 @@ enum userspace_layers {
   DIR75,
   ETC75,
   FN75,
+  GK50,
 };
 #endif
 
@@ -100,6 +128,7 @@ enum userspace_custom_keycodes {
   ETCETERA75,
   FUNCTION75,
   NUMPAD,
+  GHERKIN50,
 
 };
 
@@ -108,11 +137,12 @@ enum userspace_custom_keycodes {
 enum {
   TD_SFT_CAPS = 0
   ,TD_Q_ESC
-  ,ENT_TAP_DANCE
-  ,DEL_TAP_DANCE
   ,CAD_TD
   ,RST_TAP_DANCE
   ,LYR_TAP_DANCE
+  ,LYR50_TAP_DANCE
+  ,LYR75_TAP_DANCE
+  ,BSW_TAP_DANCE
 };
 #endif
 
@@ -130,6 +160,7 @@ enum {
 #define LAYOUT_ortho_4x12_wrapper(...)       LAYOUT_ortho_4x12(__VA_ARGS__)
 #define LAYOUT_ortho_5x15_wrapper(...)       LAYOUT_ortho_5x15(__VA_ARGS__)
 #define LAYOUT_ortho_4x4_wrapper(...)        LAYOUT_ortho_4x4(__VA_ARGS__)
+#define LAYOUT_ortho_5x5_wrapper(...)        LAYOUT_ortho_5x5(__VA_ARGS__)
 
 // Blocks for each of the major keyboard layouts
 // Organized so we can quickly adapt and modify all of them
@@ -189,12 +220,12 @@ enum {
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * | mLeft  | mDown  | mRight |        | SHIFT  | mBtn3  | mBtn1  | mBtn2  |  ;     |  '     |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Sft//Cp|        |        |        |        | C-A-D  | mScrL  | mScrR  | ALT    |  DEL   |
+ * | Sft//Cp| CAPS   |        |        |        | C-A-D  | mScrL  | mScrR  | ALT    |  DEL   |
  * '-----------------------------------------------------------------------------------------'
  */
 #define _______________Gherkin_ETC_0_______________			KC_GRV, 		KC_MS_U, _______,_______, RESET,   KC_RSFT, 			KC_WH_U, KC_WH_D, _______, KC_BSLS
 #define _______________Gherkin_ETC_1_______________			KC_MS_L, 		KC_MS_D, KC_MS_R,_______, KC_LSFT, KC_BTN3, 			KC_BTN1, KC_BTN2, KC_SCLN, KC_QUOT
-#define _______________Gherkin_ETC_2_______________			TD(TD_SFT_CAPS),_______, _______,_______, _______, LALT(LCTL(KC_DEL)),	KC_WH_L, KC_WH_R, KC_LALT, KC_DEL
+#define _______________Gherkin_ETC_2_______________			TD(TD_SFT_CAPS),KC_CAPS, _______,_______, _______, LALT(LCTL(KC_DEL)),	KC_WH_L, KC_WH_R, KC_LALT, KC_DEL
 
 /* Gherkin-Like
  * .-----------------------------------------------------------------------------------------------------------.