Merge remote-tracking branch 'origin/master' into develop

4 files changed, 157 insertions, 0 deletions

diff --git a/keyboards/clog/keyboard.json b/keyboards/clog/keyboard.json
new file mode 100644
index 0000000000..6197a176e5
--- /dev/null
+++ b/keyboards/clog/keyboard.json
@@ -0,0 +1,89 @@
+{
+    "keyboard_name": "The Clog",
+    "manufacturer": "S'mores",
+    "url": "https://github.com/smores56/clog",
+    "maintainer": "@smores56",
+    "usb": {
+      "vid": "0xBEEF",
+      "pid": "0x5051",
+      "device_version": "0.0.1"
+    },
+    "development_board": "elite_c",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "direct": [
+            ["B2", "F7", "F6", "F5", "F4"],
+            ["B6", "B3", "B1", "D3", "D1"],
+            ["D0", "D4", "C6", "D7", "E6"],
+            ["B4", "B5", null, null, null]
+        ]
+    },
+    "split": {
+        "bootmagic": {
+            "matrix": [4, 4]
+        },
+        "enabled": true,
+        "matrix_pins": {
+            "right": {
+                "direct": [
+                    ["F4", "F5", "F6", "F7", "B2"],
+                    ["D1", "D3", "B1", "B3", "B6"],
+                    ["E6", "D7", "C6", "D4", "D0"],
+                    ["B5", "B4", null, null, null]
+                ]
+            }
+        },
+        "serial": {
+            "pin": "D2"
+        }
+    },
+    "community_layouts": ["split_3x5_2"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_2"
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_2": {
+            "layout": [
+                {"label": "L01", "matrix": [0, 0], "x": 0, "y": 2.27},
+                {"label": "L02", "matrix": [0, 1], "x": 2, "y": 0.31},
+                {"label": "L03", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "L04", "matrix": [0, 3], "x": 4, "y": 0.28},
+                {"label": "L05", "matrix": [0, 4], "x": 5, "y": 0.42},
+                {"label": "R01", "matrix": [4, 0], "x": 9, "y": 0.42},
+                {"label": "R02", "matrix": [4, 1], "x": 10, "y": 0.28},
+                {"label": "R03", "matrix": [4, 2], "x": 11, "y": 0},
+                {"label": "R04", "matrix": [4, 3], "x": 12, "y": 0.31},
+                {"label": "R05", "matrix": [4, 4], "x": 14, "y": 2.27},
+                {"label": "L06", "matrix": [1, 0], "x": 0, "y": 2.27},
+                {"label": "L07", "matrix": [1, 1], "x": 2, "y": 1.31},
+                {"label": "L08", "matrix": [1, 2], "x": 3, "y": 1},
+                {"label": "L09", "matrix": [1, 3], "x": 4, "y": 1.28},
+                {"label": "L10", "matrix": [1, 4], "x": 5, "y": 1.42},
+                {"label": "R06", "matrix": [5, 0], "x": 9, "y": 1.42},
+                {"label": "R07", "matrix": [5, 1], "x": 10, "y": 1.28},
+                {"label": "R08", "matrix": [5, 2], "x": 11, "y": 1},
+                {"label": "R09", "matrix": [5, 3], "x": 12, "y": 1.31},
+                {"label": "R10", "matrix": [5, 4], "x": 14, "y": 2.27},
+                {"label": "L11", "matrix": [2, 0], "x": 0, "y": 3.27},
+                {"label": "L12", "matrix": [2, 1], "x": 2, "y": 2.31},
+                {"label": "L13", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "L14", "matrix": [2, 3], "x": 4, "y": 2.28},
+                {"label": "L15", "matrix": [2, 4], "x": 5, "y": 2.42},
+                {"label": "R11", "matrix": [6, 0], "x": 9, "y": 2.42},
+                {"label": "R12", "matrix": [6, 1], "x": 10, "y": 2.28},
+                {"label": "R13", "matrix": [6, 2], "x": 11, "y": 2},
+                {"label": "R14", "matrix": [6, 3], "x": 12, "y": 2.31},
+                {"label": "R15", "matrix": [6, 4], "x": 14, "y": 3.27},
+                {"label": "L16", "matrix": [3, 0], "x": 5, "y": 3.9},
+                {"label": "L17", "matrix": [3, 1], "x": 6, "y": 3.7},
+                {"label": "R16", "matrix": [7, 0], "x": 8, "y": 3.7},
+                {"label": "R17", "matrix": [7, 1], "x": 9, "y": 3.9}
+            ]
+        }
+    }
+}
diff --git a/keyboards/clog/keymaps/default/config.h b/keyboards/clog/keymaps/default/config.h
new file mode 100644
index 0000000000..be257a5919
--- /dev/null
+++ b/keyboards/clog/keymaps/default/config.h
@@ -0,0 +1,7 @@
+// Copyright 2024 Sam Mohr (@smores56)
+// SPDX-License-Identifier: GPL-2.0+
+
+#pragma once
+
+// Defaults for usable home row mods
+#define TAPPING_TERM 250
diff --git a/keyboards/clog/keymaps/default/keymap.c b/keyboards/clog/keymaps/default/keymap.c
new file mode 100644
index 0000000000..98617d7de0
--- /dev/null
+++ b/keyboards/clog/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+// Copyright 2024 Sam Mohr (@smores56)
+// SPDX-License-Identifier: GPL-2.0+
+
+#include QMK_KEYBOARD_H
+
+/* Base layer 0 layout uses home row mods. See the following guide for details:
+ * https://precondition.github.io/home-row-mods
+ */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_split_3x5_2(
+    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+    CTL_T(KC_A),ALT_T(KC_S),GUI_T(KC_D),SFT_T(KC_F), KC_G,    KC_H, SFT_T(KC_J),GUI_T(KC_K),ALT_T(KC_L),CTL_T(KC_SCLN),
+    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
+                          LT(2,KC_TAB), KC_ENT,      KC_SPC,  LT(1,KC_BSPC)
+    ),
+    [1] = LAYOUT_split_3x5_2(
+    KC_INS,  KC_1,    KC_2,    KC_3,    KC_VOLU,     KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_DQUO,
+    KC_DEL,  KC_4,    KC_5,    KC_6,    KC_VOLD,     KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_QUOT,
+    KC_CAPS, KC_7,    KC_8,    KC_9,    KC_0,        _______, _______, _______, _______, _______,
+                               MO(3),   QK_GESC,     _______, _______
+    ),
+    [2] = LAYOUT_split_3x5_2(
+    _______, KC_LBRC, KC_LCBR, KC_RCBR, _______,     KC_CIRC, KC_LPRN, KC_RPRN, KC_RBRC, KC_TILD,
+    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,     KC_AMPR, KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
+    _______, _______, _______, _______, _______,     KC_ASTR, KC_UNDS, KC_PLUS, KC_PIPE, _______,
+                               _______, _______,     KC_DEL,  MO(3)
+    ),
+    [3] = LAYOUT_split_3x5_2(
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F10,      _______, MS_WHLU, MS_WHLD, _______, QK_BOOT,
+    _______, KC_F4,   KC_F5,   KC_F6,   KC_F11,      MS_LEFT, MS_DOWN, MS_UP,   MS_RGHT, KC_INS,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F12,      _______, MS_BTN1, MS_BTN2, _______, _______,
+                               _______, _______,     _______, _______
+    )
+};
diff --git a/keyboards/clog/readme.md b/keyboards/clog/readme.md
new file mode 100644
index 0000000000..ddf7105669
--- /dev/null
+++ b/keyboards/clog/readme.md
@@ -0,0 +1,26 @@
+# The Clog
+
+This is the official firmware for a family of boards designed by [smores56](https://github.com/smores56),
+the first of which was [the Clog](https://github.com/smores56/clog). This firmware works for the following boards:
+
+- [The Clog](https://github.com/smores56/clog)
+- [The Clog V3](https://github.com/smores56/clog-v3)
+- [The Steel Toe](https://github.com/smores56/steel-toe)
+- [The Sephirette](https://github.com/smores56/sephirette)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make clog:default
+
+Flashing example for this keyboard:
+
+    make clog: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 2 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
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available