CannonKeys Adelie Layout Macro Additions (#20546)

* add matrix_diagram.md

* info.json: apply friendly formatting

* add LAYOUT_rwkl with reference keymap

* add LAYOUT_wkl with reference keymap

4 files changed, 393 insertions, 62 deletions

diff --git a/keyboards/cannonkeys/adelie/info.json b/keyboards/cannonkeys/adelie/info.json
index c03b44bb41..e952fd83b0 100644
--- a/keyboards/cannonkeys/adelie/info.json
+++ b/keyboards/cannonkeys/adelie/info.json
@@ -21,68 +21,187 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-
-                {"matrix": [0, 14], "x": 14.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1},
-                {"matrix": [1, 3], "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "x": 6.25, "y": 1},
-                {"matrix": [1, 7], "x": 7.25, "y": 1},
-                {"matrix": [1, 8], "x": 8.25, "y": 1},
-                {"matrix": [1, 9], "x": 9.25, "y": 1},
-                {"matrix": [1, 10], "x": 10.25, "y": 1},
-                {"matrix": [1, 11], "x": 11.25, "y": 1},
-                {"matrix": [1, 13], "x": 12.25, "y": 1, "w": 1.75},
-
-                {"matrix": [1, 14], "x": 14.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"matrix": [2, 12], "x": 11.75, "y": 2, "w": 1.25},
-
-                {"matrix": [2, 13], "x": 13.25, "y": 2.25},
-
-                {"matrix": [2, 14], "x": 14.5, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.75},
-                {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 8], "x": 8.5, "y": 3, "w": 1.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25},
-
-                {"matrix": [3, 12], "x": 12.25, "y": 3.25},
-                {"matrix": [3, 13], "x": 13.25, "y": 3.25},
-                {"matrix": [3, 14], "x": 14.25, "y": 3.25}
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "W", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "E", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "R", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "T", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "Y", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "U", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "I", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "O", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "P", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "[", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "]", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+
+                {"label": "Page Up", "matrix": [0, 14], "x": 14.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"label": "A", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "S", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "D", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "F", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "G", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "H", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "J", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "K", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "L", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": ";", "matrix": [1, 10], "x": 10.25, "y": 1},
+                {"label": "'", "matrix": [1, 11], "x": 11.25, "y": 1},
+                {"label": "Enter", "matrix": [1, 13], "x": 12.25, "y": 1, "w": 1.75},
+
+                {"label": "Page Down", "matrix": [1, 14], "x": 14.5, "y": 1},
+
+                {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "X", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "C", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "V", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "B", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "N", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "M", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": ",", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": ".", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "/", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "Shift", "matrix": [2, 12], "x": 11.75, "y": 2, "w": 1.25},
+
+                {"label": "\u2191", "matrix": [2, 13], "x": 13.25, "y": 2.25},
+
+                {"label": "TG(3)", "matrix": [2, 14], "x": 14.5, "y": 2},
+
+                {"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "GUI", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Alt", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"label": "Fn", "matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.75},
+                {"label": "Space", "matrix": [3, 6], "x": 6.25, "y": 3, "w": 2.25},
+                {"label": "Alt", "matrix": [3, 8], "x": 8.5, "y": 3, "w": 1.25},
+                {"label": "GUI", "matrix": [3, 9], "x": 9.75, "y": 3},
+                {"label": "Fn2", "matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [3, 12], "x": 12.25, "y": 3.25},
+                {"label": "\u2193", "matrix": [3, 13], "x": 13.25, "y": 3.25},
+                {"label": "\u2192", "matrix": [3, 14], "x": 14.25, "y": 3.25}
+            ]
+        },
+
+        "LAYOUT_rwkl": {
+            "layout": [
+                { "label": "Esc/~", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "Q", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "W", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "E", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "R", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "T", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "Y", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "U", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "I", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "O", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "P", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "[{", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "]}", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "Page Up", "matrix": [0, 14], "x": 14.5, "y": 0 },
+
+                { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25 },
+                { "label": "A", "matrix": [1, 1], "x": 1.25, "y": 1 },
+                { "label": "S", "matrix": [1, 2], "x": 2.25, "y": 1 },
+                { "label": "D", "matrix": [1, 3], "x": 3.25, "y": 1 },
+                { "label": "F", "matrix": [1, 4], "x": 4.25, "y": 1 },
+                { "label": "G", "matrix": [1, 5], "x": 5.25, "y": 1 },
+                { "label": "H", "matrix": [1, 6], "x": 6.25, "y": 1 },
+                { "label": "J", "matrix": [1, 7], "x": 7.25, "y": 1 },
+                { "label": "K", "matrix": [1, 8], "x": 8.25, "y": 1 },
+                { "label": "L", "matrix": [1, 9], "x": 9.25, "y": 1 },
+                { "label": ";:", "matrix": [1, 10], "x": 10.25, "y": 1 },
+                { "label": "'\"", "matrix": [1, 11], "x": 11.25, "y": 1 },
+                { "label": "Enter", "matrix": [1, 13], "x": 12.25, "y": 1, "w": 1.75 },
+                { "label": "Page Down", "matrix": [1, 14], "x": 14.5, "y": 1 },
+
+                { "label": "Shift", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
+                { "label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "X", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "C", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "V", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "B", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "N", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "M", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": ",<", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": ".>", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": "/?", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "Shift", "matrix": [2, 12], "x": 11.75, "y": 2, "w": 1.25 },
+                { "label": "Up", "matrix": [2, 13], "x": 13.25, "y": 2.25 },
+                { "label": "TG(3)", "matrix": [2, 14], "x": 14.5, "y": 2 },
+
+                { "label": "Control", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25 },
+                { "label": "Win", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25 },
+                { "label": "Alt", "matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25 },
+                { "label": "Space", "matrix": [3, 7], "x": 3.75, "y": 3, "w": 6.25 },
+                { "label": "MO(1)", "matrix": [3, 9], "x": 10, "y": 3 },
+                { "label": "MO(2)", "matrix": [3, 11], "x": 11, "y": 3 },
+                { "label": "Left", "matrix": [3, 12], "x": 12.25, "y": 3.25 },
+                { "label": "Down", "matrix": [3, 13], "x": 13.25, "y": 3.25 },
+                { "label": "Right", "matrix": [3, 14], "x": 14.25, "y": 3.25 }
+            ]
+        },
+
+        "LAYOUT_wkl": {
+            "layout": [
+                { "label": "Esc/~", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "Q", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "W", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "E", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "R", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "T", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "Y", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "U", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "I", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "O", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "P", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "[{", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "]}", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "Page Up", "matrix": [0, 14], "x": 14.5, "y": 0 },
+
+                { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25 },
+                { "label": "A", "matrix": [1, 1], "x": 1.25, "y": 1 },
+                { "label": "S", "matrix": [1, 2], "x": 2.25, "y": 1 },
+                { "label": "D", "matrix": [1, 3], "x": 3.25, "y": 1 },
+                { "label": "F", "matrix": [1, 4], "x": 4.25, "y": 1 },
+                { "label": "G", "matrix": [1, 5], "x": 5.25, "y": 1 },
+                { "label": "H", "matrix": [1, 6], "x": 6.25, "y": 1 },
+                { "label": "J", "matrix": [1, 7], "x": 7.25, "y": 1 },
+                { "label": "K", "matrix": [1, 8], "x": 8.25, "y": 1 },
+                { "label": "L", "matrix": [1, 9], "x": 9.25, "y": 1 },
+                { "label": ";:", "matrix": [1, 10], "x": 10.25, "y": 1 },
+                { "label": "'\"", "matrix": [1, 11], "x": 11.25, "y": 1 },
+                { "label": "Enter", "matrix": [1, 13], "x": 12.25, "y": 1, "w": 1.75 },
+                { "label": "Page Down", "matrix": [1, 14], "x": 14.5, "y": 1 },
+
+                { "label": "Shift", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
+                { "label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "X", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "C", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "V", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "B", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "N", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "M", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": ",<", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": ".>", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": "/?", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "Shift", "matrix": [2, 12], "x": 11.75, "y": 2, "w": 1.25 },
+                { "label": "Up", "matrix": [2, 13], "x": 13.25, "y": 2.25 },
+                { "label": "TG(3)", "matrix": [2, 14], "x": 14.5, "y": 2 },
+
+                { "label": "Control", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.5 },
+                { "label": "Win", "matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.5 },
+                { "label": "Space", "matrix": [3, 7], "x": 3, "y": 3, "w": 6 },
+                { "label": "Win", "matrix": [3, 8], "x": 9, "y": 3, "w": 1.5 },
+                { "label": "MO(2)", "matrix": [3, 11], "x": 10.5, "y": 3, "w": 1.5 },
+                { "label": "Left", "matrix": [3, 12], "x": 12.25, "y": 3.25 },
+                { "label": "Down", "matrix": [3, 13], "x": 13.25, "y": 3.25 },
+                { "label": "Right", "matrix": [3, 14], "x": 14.25, "y": 3.25 }
             ]
         }
     }
diff --git a/keyboards/cannonkeys/adelie/keymaps/default_rwkl/keymap.c b/keyboards/cannonkeys/adelie/keymaps/default_rwkl/keymap.c
new file mode 100644
index 0000000000..5089c8daf3
--- /dev/null
+++ b/keyboards/cannonkeys/adelie/keymaps/default_rwkl/keymap.c
@@ -0,0 +1,96 @@
+/* Copyright 2020 Andrew Kannan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_rwkl(
+        QK_GESC, 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_PGUP,
+        KC_TAB,  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_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   TG(_FN3),
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    MO(_FN1),MO(_FN2),         KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_FN1] = LAYOUT_rwkl(
+        KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_TRNS, KC_TRNS, KC_LPRN, KC_RPRN, KC_TRNS, KC_HOME,
+        RGB_TOG, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,          KC_TRNS, KC_END,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT,  KC_TRNS, KC_TRNS, KC_MINS, KC_PLUS, KC_ASTR, KC_TRNS, KC_EQL,  KC_INS,  KC_PSCR,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [_FN2] = LAYOUT_rwkl(
+        KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT, KC_DEL,  KC_VOLU,
+        KC_SLEP, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_VOLD,
+        KC_WAKE,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_MUTE,
+        QK_BOOT, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [_FN3] = LAYOUT_rwkl(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, MO(_FN1),         KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+};
+
+const rgblight_segment_t PROGMEM my_layer0_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 3, HSV_RED}
+);
+const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 3, HSV_CYAN}
+);
+const rgblight_segment_t PROGMEM my_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 3, HSV_PURPLE}
+);
+const rgblight_segment_t PROGMEM my_layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 3, HSV_GREEN}
+);
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_layer0_layer,
+    my_layer1_layer,
+    my_layer2_layer,
+    my_layer3_layer
+);
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(0, layer_state_cmp(state, _BASE));
+    return state;
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(1, layer_state_cmp(state, _FN1));
+    rgblight_set_layer_state(2, layer_state_cmp(state, _FN2));
+    rgblight_set_layer_state(3, layer_state_cmp(state, _FN3));
+    return state;
+}
diff --git a/keyboards/cannonkeys/adelie/keymaps/default_wkl/keymap.c b/keyboards/cannonkeys/adelie/keymaps/default_wkl/keymap.c
new file mode 100644
index 0000000000..7263066a4c
--- /dev/null
+++ b/keyboards/cannonkeys/adelie/keymaps/default_wkl/keymap.c
@@ -0,0 +1,96 @@
+/* Copyright 2020 Andrew Kannan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_wkl(
+        QK_GESC, 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_PGUP,
+        KC_TAB,  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_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   TG(_FN3),
+        KC_LCTL, KC_LALT,                            KC_SPC,                             MO(_FN1),MO(_FN2),         KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_FN1] = LAYOUT_wkl(
+        KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_TRNS, KC_TRNS, KC_LPRN, KC_RPRN, KC_TRNS, KC_HOME,
+        RGB_TOG, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,          KC_TRNS, KC_END,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT,  KC_TRNS, KC_TRNS, KC_MINS, KC_PLUS, KC_ASTR, KC_TRNS, KC_EQL,  KC_INS,  KC_PSCR,
+        KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [_FN2] = LAYOUT_wkl(
+        KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT, KC_DEL,  KC_VOLU,
+        KC_SLEP, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_VOLD,
+        KC_WAKE,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_MUTE,
+        QK_BOOT, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [_FN3] = LAYOUT_wkl(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, MO(_FN1),         KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+};
+
+const rgblight_segment_t PROGMEM my_layer0_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 3, HSV_RED}
+);
+const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 3, HSV_CYAN}
+);
+const rgblight_segment_t PROGMEM my_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 3, HSV_PURPLE}
+);
+const rgblight_segment_t PROGMEM my_layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 3, HSV_GREEN}
+);
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_layer0_layer,
+    my_layer1_layer,
+    my_layer2_layer,
+    my_layer3_layer
+);
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(0, layer_state_cmp(state, _BASE));
+    return state;
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(1, layer_state_cmp(state, _FN1));
+    rgblight_set_layer_state(2, layer_state_cmp(state, _FN2));
+    rgblight_set_layer_state(3, layer_state_cmp(state, _FN3));
+    return state;
+}
diff --git a/keyboards/cannonkeys/adelie/matrix_diagram.md b/keyboards/cannonkeys/adelie/matrix_diagram.md
new file mode 100644
index 0000000000..6e0555bd78
--- /dev/null
+++ b/keyboards/cannonkeys/adelie/matrix_diagram.md
@@ -0,0 +1,20 @@
+# Matrix Diagram for Cannonkeys Adelie
+
+```
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │ │0E │
+├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ ├───┤
+│10  │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1D    │ │1E │
+├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┘ ├───┤
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2B │2C  │┌───┐│2E │
+├────┬─┴─┬─┴──┬┴───┴───┴─┬─┴───┴──┬┴───┼───┼───┴┬───┘│2D │└───┘
+│30  │31 │32  │33        │36      │38  │39 │3B  │┌───┼───┼───┐
+└────┴───┴────┴──────────┴────────┴────┴───┴────┘│3C │3D │3E │
+                                                 └───┴───┴───┘
+┌────┬────┬────┬────────────────────────┬───┬───┐
+│30  │31  │32  │36                      │39 │3B │ RWKL
+└────┴────┴────┴────────────────────────┴───┴───┘
+┌─────┬─────┬───────────────────────┬─────┬─────┐
+│30   │31   │36                     │38   │3B   │ WKL
+└─────┴─────┴───────────────────────┴─────┴─────┘
+```