From c1c72df8eb4f6dcc7a2a191487309ec6d15c6879 Mon Sep 17 00:00:00 2001 From: Sam Mohr Date: Fri, 2 Feb 2024 22:36:03 -0800 Subject: [PATCH 1/8] [Keyboard] Add the Clog --- keyboards/clog/info.json | 91 +++++++++++++++++++++++++ keyboards/clog/keymaps/default/config.h | 7 ++ keyboards/clog/keymaps/default/keymap.c | 35 ++++++++++ keyboards/clog/readme.md | 26 +++++++ keyboards/clog/rules.mk | 1 + 5 files changed, 160 insertions(+) create mode 100644 keyboards/clog/info.json create mode 100644 keyboards/clog/keymaps/default/config.h create mode 100644 keyboards/clog/keymaps/default/keymap.c create mode 100644 keyboards/clog/readme.md create mode 100644 keyboards/clog/rules.mk diff --git a/keyboards/clog/info.json b/keyboards/clog/info.json new file mode 100644 index 00000000000..d5ac2555dd3 --- /dev/null +++ b/keyboards/clog/info.json @@ -0,0 +1,91 @@ +{ + "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" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "pin_compatible": "promicro", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "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] + ] + } + }, + "soft_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 00000000000..be257a59195 --- /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 00000000000..1d9abb29f25 --- /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, _______, KC_WH_U, KC_WH_D, _______, QK_BOOT, + _______, KC_F4, KC_F5, KC_F6, KC_F11, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_INS, + _______, KC_F7, KC_F8, KC_F9, KC_F12, _______, KC_BTN1, KC_BTN2, _______, _______, + _______, _______, _______, _______ + ) +}; diff --git a/keyboards/clog/readme.md b/keyboards/clog/readme.md new file mode 100644 index 00000000000..ddf7105669d --- /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 diff --git a/keyboards/clog/rules.mk b/keyboards/clog/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/clog/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 5fffef21bee01906890d2e2e81dc6dfb79ba7ada Mon Sep 17 00:00:00 2001 From: Sam Mohr Date: Sat, 30 Mar 2024 13:18:35 -0700 Subject: [PATCH 2/8] Update keyboards/clog/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/clog/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/clog/info.json b/keyboards/clog/info.json index d5ac2555dd3..3558fe5a158 100644 --- a/keyboards/clog/info.json +++ b/keyboards/clog/info.json @@ -8,8 +8,7 @@ "pid": "0x5051", "device_version": "0.0.1" }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", + "development_board": "elite_c", "pin_compatible": "promicro", "features": { "bootmagic": true, From 28418a6a0f04cd0b408fd0a324d96767f6b3d46f Mon Sep 17 00:00:00 2001 From: Sam Mohr Date: Mon, 29 Jul 2024 06:07:56 -0700 Subject: [PATCH 3/8] Fix review comments --- keyboards/clog/{info.json => keyboard.json} | 0 keyboards/clog/rules.mk | 1 - 2 files changed, 1 deletion(-) rename keyboards/clog/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/clog/rules.mk diff --git a/keyboards/clog/info.json b/keyboards/clog/keyboard.json similarity index 100% rename from keyboards/clog/info.json rename to keyboards/clog/keyboard.json diff --git a/keyboards/clog/rules.mk b/keyboards/clog/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/clog/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank From 5c220e99d6ee9e982391e90431825873dc7c20e6 Mon Sep 17 00:00:00 2001 From: Sam Mohr Date: Mon, 7 Jul 2025 14:57:27 -0700 Subject: [PATCH 4/8] Update keyboards/clog/keymaps/default/keymap.c Co-authored-by: Ryan --- keyboards/clog/keymaps/default/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/clog/keymaps/default/keymap.c b/keyboards/clog/keymaps/default/keymap.c index 1d9abb29f25..98617d7de09 100644 --- a/keyboards/clog/keymaps/default/keymap.c +++ b/keyboards/clog/keymaps/default/keymap.c @@ -27,9 +27,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, KC_DEL, MO(3) ), [3] = LAYOUT_split_3x5_2( - _______, KC_F1, KC_F2, KC_F3, KC_F10, _______, KC_WH_U, KC_WH_D, _______, QK_BOOT, - _______, KC_F4, KC_F5, KC_F6, KC_F11, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_INS, - _______, KC_F7, KC_F8, KC_F9, KC_F12, _______, KC_BTN1, KC_BTN2, _______, _______, + _______, 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, _______, _______, _______, _______, _______, _______ ) }; From 2f3f3d717dc02c2ce3a89555292839dbda33e90f Mon Sep 17 00:00:00 2001 From: Sam Mohr Date: Mon, 7 Jul 2025 14:57:35 -0700 Subject: [PATCH 5/8] Update keyboards/clog/keyboard.json Co-authored-by: Joel Challis --- keyboards/clog/keyboard.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/clog/keyboard.json b/keyboards/clog/keyboard.json index 3558fe5a158..04259c81a24 100644 --- a/keyboards/clog/keyboard.json +++ b/keyboards/clog/keyboard.json @@ -12,8 +12,6 @@ "pin_compatible": "promicro", "features": { "bootmagic": true, - "command": false, - "console": false, "extrakey": true, "mousekey": true, "nkro": false From 5ae39a77b523af39c950d90ab115b1a0f7e211f6 Mon Sep 17 00:00:00 2001 From: Sam Mohr Date: Mon, 7 Jul 2025 14:57:45 -0700 Subject: [PATCH 6/8] Update keyboards/clog/keyboard.json Co-authored-by: Joel Challis --- keyboards/clog/keyboard.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/clog/keyboard.json b/keyboards/clog/keyboard.json index 04259c81a24..331cc4f08bc 100644 --- a/keyboards/clog/keyboard.json +++ b/keyboards/clog/keyboard.json @@ -9,7 +9,7 @@ "device_version": "0.0.1" }, "development_board": "elite_c", - "pin_compatible": "promicro", + "pin_compatible": "elite_c", "features": { "bootmagic": true, "extrakey": true, From 17dde235d7a96b70520c22e0d7a6918f053fc9d8 Mon Sep 17 00:00:00 2001 From: Sam Mohr Date: Mon, 7 Jul 2025 14:58:08 -0700 Subject: [PATCH 7/8] Update keyboards/clog/keyboard.json Co-authored-by: Joel Challis --- keyboards/clog/keyboard.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/clog/keyboard.json b/keyboards/clog/keyboard.json index 331cc4f08bc..b8bb07a9e25 100644 --- a/keyboards/clog/keyboard.json +++ b/keyboards/clog/keyboard.json @@ -39,7 +39,9 @@ ] } }, - "soft_serial_pin": "D2" + "serial": { + "pin": "D2" + } }, "community_layouts": ["split_3x5_2"], "layout_aliases": { From 3b9e926672b94158976bb2e36618f607884e8207 Mon Sep 17 00:00:00 2001 From: Sam Mohr Date: Thu, 10 Jul 2025 10:49:36 -0700 Subject: [PATCH 8/8] Update keyboards/clog/keyboard.json Co-authored-by: Joel Challis --- keyboards/clog/keyboard.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/clog/keyboard.json b/keyboards/clog/keyboard.json index b8bb07a9e25..6197a176e58 100644 --- a/keyboards/clog/keyboard.json +++ b/keyboards/clog/keyboard.json @@ -9,7 +9,6 @@ "device_version": "0.0.1" }, "development_board": "elite_c", - "pin_compatible": "elite_c", "features": { "bootmagic": true, "extrakey": true,