Merge branch 'master' into taamastaamas

7 files changed, 255 insertions, 0 deletions

diff --git a/keyboards/zicodia/tklfrlnrlmlao/config.h b/keyboards/zicodia/tklfrlnrlmlao/config.h
new file mode 100644
index 0000000000..58f2df252b
--- /dev/null
+++ b/keyboards/zicodia/tklfrlnrlmlao/config.h
@@ -0,0 +1,20 @@
+// Copyright 2022 Zicodia (@Zicodia)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
diff --git a/keyboards/zicodia/tklfrlnrlmlao/info.json b/keyboards/zicodia/tklfrlnrlmlao/info.json
new file mode 100644
index 0000000000..fcecd42620
--- /dev/null
+++ b/keyboards/zicodia/tklfrlnrlmlao/info.json
@@ -0,0 +1,36 @@
+{
+    "manufacturer": "Zicodia",
+    "keyboard_name": "TKLFRLNRLMLAO",
+    "maintainer": "Zicodia",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F0", "F5", "C7", "F6", "F7", "B6", "D6", "D4"],
+        "rows": ["D5", "B5", "B4", "D7"]
+    },
+    "usb": {
+        "vid": "0x4A4C",
+        "pid": "0x0000",
+        "device_version": "1.0.0"
+    },
+    "processor": "atmega32u4",
+    "url": "https://github.com/Zicodia",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0               }, { "matrix": [0, 1], "x": 1.25, "y": 0 }, { "matrix": [0, 2], "x": 2.25, "y": 0 }, { "matrix": [0, 3], "x": 3.25, "y": 0         }, { "matrix": [0, 4], "x": 4.5, "y": 0  }, { "matrix": [0, 5], "x": 5.5, "y": 0  }, { "matrix": [0, 6], "x": 6.5, "y": 0            }, { "matrix": [0, 7], "x": 7.75, "y": 0    }, { "matrix": [0, 8], "x": 8.75, "y": 0    }, { "matrix": [0, 9], "x": 9.75, "y": 0 }, 
+                { "matrix": [1, 0], "x": 0, "y": 1.25            }, { "matrix": [1, 1], "x": 1, "y": 1.25 }, { "matrix": [1, 2], "x": 2, "y": 1.25 }, { "matrix": [1, 3], "x": 3, "y": 1.25         }, { "matrix": [1, 4], "x": 0, "y": 1.25 }, { "matrix": [1, 5], "x": 0, "y": 1.25 }, { "matrix": [1, 6], "x": 0, "y": 1.25, "w": 1.5 }, { "matrix": [1, 7], "x": 7.75, "y": 1    }, { "matrix": [1, 8], "x": 8.75, "y": 1    }, { "matrix": [1, 9], "x": 9.75, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5  }, { "matrix": [2, 1], "x": 1, "y": 2.25 }, { "matrix": [2, 2], "x": 2, "y": 2.25 }, { "matrix": [2, 3], "x": 3, "y": 2.25         }, { "matrix": [2, 4], "x": 0, "y": 2.25 }, { "matrix": [2, 5], "x": 0, "y": 2.25 }, { "matrix": [2, 6], "x": 0, "y": 2.25           },                                             { "matrix": [2, 8], "x": 8.75, "y": 2.25 },
+                { "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25 }, { "matrix": [3, 1], "x": 1, "y": 3.25 },                                          { "matrix": [3, 3], "x": 3, "y": 3.25, "w": 3 },                                          { "matrix": [3, 5], "x": 0, "y": 3.25 }, { "matrix": [3, 6], "x": 0, "y": 3.25, "w":1.25 }, { "matrix": [3, 7], "x": 0, "y": 3.25    }, { "matrix": [3, 8], "x": 7.75, "y": 3.25 }, { "matrix": [3, 9], "x": 8.75, "y": 3.25 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/zicodia/tklfrlnrlmlao/keymaps/default/keymap.c b/keyboards/zicodia/tklfrlnrlmlao/keymaps/default/keymap.c
new file mode 100644
index 0000000000..12edec5bdb
--- /dev/null
+++ b/keyboards/zicodia/tklfrlnrlmlao/keymaps/default/keymap.c
@@ -0,0 +1,79 @@
+// Copyright 2022 Zicodia (@Zicodia)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐┌───┬───┬───┐┌───┬───┬───┐ ┌───┬───┬───┐
+     * │ Q │| W │ E │ R │| T │ Y │ U │ | I │ O │ P │
+     * └───┘└───┴───┴───┘└───┴───┴───┘ ├───┼───┼───┤
+     * ┌───┬───┬───┬───┬───┬───┬─────┐ | K │ L │ENT│
+     * │ A │ S │ D │ F | G │ H │ J   │ └───┴───┴───┘
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤     ┌───┐
+     * │Z(SF)│ X │ C │ V │ B │ N │ M │     │UP │
+     * ├────┬┴──┬┴───┴───┴──┬┴──┬┴───┤ ┌───┼───┼───┐
+     * │CTRL│ALT│ SPACE     │WIN│MO1 │ |LFT│DWN│RT │
+     * └────┴───┴───────────┴───┴────┘ └───┴───┴───┘
+     */
+    [0] = LAYOUT_all(
+		KC_Q,        KC_W,      KC_E,       KC_R,       KC_T,       KC_Y,       KC_U,       KC_I,       KC_O,       KC_P, 
+		KC_A,        KC_S,      KC_D,       KC_F,       KC_G,       KC_H,       KC_J,       KC_K,       KC_L,       KC_ENT, 
+		SFT_T(KC_Z), KC_X,      KC_C,       KC_V,       KC_B,       KC_N,       KC_M,                   KC_UP, 
+		KC_LCTL,     KC_LALT,               KC_SPC,                 KC_RGUI,    MO(1),      KC_LEFT,    KC_DOWN,    KC_RGHT
+    )
+    /*
+     * ┌───┐┌───┬───┬───┐┌───┬───┬───┐ ┌───┬───┬───┐
+     * │ 1 │| 2 │ 3 │ 4 │| 5 │ 6 │ 7 │ | 8 │ 9 │ 0 │
+     * └───┘└───┴───┴───┘└───┴───┴───┘ ├───┼───┼───┤
+     * ┌───┬───┬───┬───┬───┬───┬─────┐ | [ │ ] │ \ │
+     * │TAB│   │   │   | - │ = │BSPC │ └───┴───┴───┘
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤     ┌───┐
+     * │     │   │   │   │   │ ; │ ' │     │SFT│
+     * ├────┬┴──┬┴───┴───┴──┬┴──┬┴───┤ ┌───┼───┼───┐
+     * │    │   │           │MO2│    │ | , │ . │ / │
+     * └────┴───┴───────────┴───┴────┘ └───┴───┴───┘
+     */
+    [1] = LAYOUT_all(
+		KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       KC_6,       KC_7,       KC_8,       KC_9,       KC_0, 
+		KC_TAB,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_MINS,    KC_EQL,     KC_BSPC,    KC_LBRC,    KC_RBRC,    KC_BSLS, 
+		KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_SCLN,    KC_QUOT,                KC_RSFT, 
+		KC_TRNS,    KC_TRNS,                KC_TRNS,                MO(2),      KC_TRNS,    KC_COMM,    KC_DOT,     KC_SLSH
+    )
+    /*
+     * ┌───┐┌───┬───┬───┐┌───┬───┬───┐ ┌───┬───┬───┐
+     * │ESC│|F1 │F2 │F3 │|F4 │F5 │F6 │ |F7 │F8 │F9 │
+     * └───┘└───┴───┴───┘└───┴───┴───┘ ├───┼───┼───┤
+     * ┌───┬───┬───┬───┬───┬───┬─────┐ |F10│F11│F12│
+     * │   │   │   │   |   │   │     │ └───┴───┴───┘
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤     ┌───┐
+     * │     │   │   │   │   │   │   │     │   │
+     * ├────┬┴──┬┴───┴───┴──┬┴──┬┴───┤ ┌───┼───┼───┐
+     * │    │   │           │   │    │ |   │   │   │
+     * └────┴───┴───────────┴───┴────┘ └───┴───┴───┘
+     */
+    [2] = LAYOUT_all(
+		KC_ESC,     KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9, 
+		KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_F10,     KC_F11,     KC_F12, 
+		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
+    )
+    /*
+     * ┌───┐┌───┬───┬───┐┌───┬───┬───┐ ┌───┬───┬───┐
+     * │   │|   │   │   │|   │   │   │ |   │   │   │
+     * └───┘└───┴───┴───┘└───┴───┴───┘ ├───┼───┼───┤
+     * ┌───┬───┬───┬───┬───┬───┬─────┐ |   │   │   │
+     * │   │   │   │   |   │   │     │ └───┴───┴───┘
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤     ┌───┐
+     * │     │   │   │   │   │   │   │     │   │
+     * ├────┬┴──┬┴───┴───┴──┬┴──┬┴───┤ ┌───┼───┼───┐
+     * │    │   │           │   │    │ |   │   │   │
+     * └────┴───┴───────────┴───┴────┘ └───┴───┴───┘
+     */
+    [4] = LAYOUT_all(
+		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
+    )
+};
diff --git a/keyboards/zicodia/tklfrlnrlmlao/keymaps/via/keymap.c b/keyboards/zicodia/tklfrlnrlmlao/keymaps/via/keymap.c
new file mode 100644
index 0000000000..a0e27e9208
--- /dev/null
+++ b/keyboards/zicodia/tklfrlnrlmlao/keymaps/via/keymap.c
@@ -0,0 +1,80 @@
+// Copyright 2022 Zicodia (@Zicodia)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  
+    /* ANSI style
+     * ┌───┐┌───┬───┬───┐┌───┬───┬───┐ ┌───┬───┬───┐
+     * │ Q │| W │ E │ R │| T │ Y │ U │ | I │ O │ P │
+     * └───┘└───┴───┴───┘└───┴───┴───┘ ├───┼───┼───┤
+     * ┌───┬───┬───┬───┬───┬───┬─────┐ | K │ L │ENT│
+     * │ A │ S │ D │ F | G │ H │ J   │ └───┴───┴───┘
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤     ┌───┐
+     * │Z(SF)│ X │ C │ V │ B │ N │ M │     │UP │
+     * ├────┬┴──┬┴───┴───┴──┬┴──┬┴───┤ ┌───┼───┼───┐
+     * │CTRL│ALT│ SPACE     │WIN│MO1 │ |LFT│DWN│RT │
+     * └────┴───┴───────────┴───┴────┘ └───┴───┴───┘
+     */
+    [0] = LAYOUT_all(
+		KC_Q,        KC_W,      KC_E,       KC_R,       KC_T,       KC_Y,       KC_U,       KC_I,       KC_O,       KC_P, 
+		KC_A,        KC_S,      KC_D,       KC_F,       KC_G,       KC_H,       KC_J,       KC_K,       KC_L,       KC_ENT, 
+		SFT_T(KC_Z), KC_X,      KC_C,       KC_V,       KC_B,       KC_N,       KC_M,                   KC_UP, 
+		KC_LCTL,     KC_LALT,               KC_SPC,                 KC_RGUI,    MO(1),      KC_LEFT,    KC_DOWN,    KC_RGHT
+    ),
+    /*
+     * ┌───┐┌───┬───┬───┐┌───┬───┬───┐ ┌───┬───┬───┐
+     * │ 1 │| 2 │ 3 │ 4 │| 5 │ 6 │ 7 │ | 8 │ 9 │ 0 │
+     * └───┘└───┴───┴───┘└───┴───┴───┘ ├───┼───┼───┤
+     * ┌───┬───┬───┬───┬───┬───┬─────┐ | [ │ ] │ \ │
+     * │TAB│   │   │   | - │ = │BSPC │ └───┴───┴───┘
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤     ┌───┐
+     * │     │   │   │   │   │ ; │ ' │     │SFT│
+     * ├────┬┴──┬┴───┴───┴──┬┴──┬┴───┤ ┌───┼───┼───┐
+     * │    │   │           │MO2│    │ | , │ . │ / │
+     * └────┴───┴───────────┴───┴────┘ └───┴───┴───┘
+     */
+    [1] = LAYOUT_all(
+		KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       KC_6,       KC_7,       KC_8,       KC_9,       KC_0, 
+		KC_TAB,     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_MINS,    KC_EQL,     KC_BSPC,    KC_LBRC,    KC_RBRC,    KC_BSLS, 
+		KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_SCLN,    KC_QUOT,                KC_RSFT, 
+		KC_TRNS,    KC_TRNS,                KC_TRNS,                MO(2),      KC_TRNS,    KC_COMM,    KC_DOT,     KC_SLSH
+    ),
+    /*
+     * ┌───┐┌───┬───┬───┐┌───┬───┬───┐ ┌───┬───┬───┐
+     * │ESC│|F1 │F2 │F3 │|F4 │F5 │F6 │ |F7 │F8 │F9 │
+     * └───┘└───┴───┴───┘└───┴───┴───┘ ├───┼───┼───┤
+     * ┌───┬───┬───┬───┬───┬───┬─────┐ |F10│F11│F12│
+     * │   │   │   │   |   │   │     │ └───┴───┴───┘
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤     ┌───┐
+     * │     │   │   │   │   │   │   │     │   │
+     * ├────┬┴──┬┴───┴───┴──┬┴──┬┴───┤ ┌───┼───┼───┐
+     * │    │   │           │   │    │ |   │   │   │
+     * └────┴───┴───────────┴───┴────┘ └───┴───┴───┘
+     */
+    [2] = LAYOUT_all(
+		KC_ESC,     KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9, 
+		KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_F10,     KC_F11,     KC_F12, 
+		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
+    ),
+    /*
+     * ┌───┐┌───┬───┬───┐┌───┬───┬───┐ ┌───┬───┬───┐
+     * │   │|   │   │   │|   │   │   │ |   │   │   │
+     * └───┘└───┴───┴───┘└───┴───┴───┘ ├───┼───┼───┤
+     * ┌───┬───┬───┬───┬───┬───┬─────┐ |   │   │   │
+     * │   │   │   │   |   │   │     │ └───┴───┴───┘
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤     ┌───┐
+     * │     │   │   │   │   │   │   │     │   │
+     * ├────┬┴──┬┴───┴───┴──┬┴──┬┴───┤ ┌───┼───┼───┐
+     * │    │   │           │   │    │ |   │   │   │
+     * └────┴───┴───────────┴───┴────┘ └───┴───┴───┘
+     */
+    [3] = LAYOUT_all(
+		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
+    )
+};
diff --git a/keyboards/zicodia/tklfrlnrlmlao/keymaps/via/rules.mk b/keyboards/zicodia/tklfrlnrlmlao/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/zicodia/tklfrlnrlmlao/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/zicodia/tklfrlnrlmlao/readme.md b/keyboards/zicodia/tklfrlnrlmlao/readme.md
new file mode 100644
index 0000000000..393503c550
--- /dev/null
+++ b/keyboards/zicodia/tklfrlnrlmlao/readme.md
@@ -0,0 +1,38 @@
+# TKLFRLNRLMLAO "LMAO"
+
+![TKLFRLNRLMLAO "LMAO"](https://i.imgur.com/rmHpYEyh.jpeg)
+
+A "totally normal" TKL.
+
+This keyboard is a unique 40% keyboard, designed with form in mind over function. Purely designed to immitate the TKL layout in a small form factor.
+
+What the name means:
+- TKL = Ten-Key-Less
+- FRL = Function-Row-Less
+- NRL = Number-Row-Less
+- ML = Modifier-less
+- AO = Alpha-Only
+
+Additionally, a WKL (Windows-Key-Less) option is available, which results in the variation WKLTKLFRLNRLMLAO "WLMAO"
+
+* Keyboard Maintainer: [Zicodia](https://github.com/Zicodia)
+* Hardware Supported: TKLFRLNRLMLAO PCB
+* Hardware Availability: TBA
+
+Make example for this keyboard (after setting up your build environment):
+
+    make zicodia/tklfrlnrlmlao:default
+
+Flashing example for this keyboard:
+
+    make zicodia/tklfrlnrlmlao:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/zicodia/tklfrlnrlmlao/rules.mk b/keyboards/zicodia/tklfrlnrlmlao/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/zicodia/tklfrlnrlmlao/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank