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

4 files changed, 130 insertions, 0 deletions

diff --git a/keyboards/handwired/tkk/info.json b/keyboards/handwired/tkk/info.json
new file mode 100644
index 0000000000..032b2c10f7
--- /dev/null
+++ b/keyboards/handwired/tkk/info.json
@@ -0,0 +1,42 @@
+{
+    "manufacturer": "Joe Fass",
+    "keyboard_name": "tkk",
+    "maintainer": "jfass",
+    "bootloader": "halfkay",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "direct": [
+		["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "C6"]
+	]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "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 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/tkk/keymaps/default/keymap.c b/keyboards/handwired/tkk/keymaps/default/keymap.c
new file mode 100644
index 0000000000..14367413da
--- /dev/null
+++ b/keyboards/handwired/tkk/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+// Copyright 2022 Joe Fass (@jfass)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * L = left, R = right
+     * T = thumb, I = index, M = middle, R = ring, P = pinky
+     * 
+     *             LP,            LR,              LM,            LI,             LT,            RT,            RI,             RM,             RR,             RP
+     *
+     */
+    [0] = LAYOUT_all(
+          LT(8, KC_A),   LT(7, KC_O),     LT(6, KC_E),   LT(5, KC_U), LT(10,KC_BSPC), LT(9, KC_SPC),   LT(1, KC_H),    LT(2, KC_T),    LT(3, KC_N),    LT(4, KC_S)
+    ),
+    [1] = LAYOUT_all(
+                KC_Q,          KC_K,            KC_J,          KC_I,         KC_ESC,        KC_TAB,         KC_NO,        KC_RGUI,        KC_RGUI,        KC_RGUI
+    ),
+    [2] = LAYOUT_all(
+                 KC_Z,          KC_Y,            KC_X,          KC_P,          KC_NO,         KC_NO,       KC_RCTL,          KC_NO,        KC_RCTL,        KC_RCTL
+    ),
+    [3] = LAYOUT_all(
+              KC_QUOT,       KC_COMM,          KC_DOT,          KC_F,          KC_NO,         KC_NO,       KC_RALT,        KC_RALT,          KC_NO,        KC_RALT
+    ),
+    [4] = LAYOUT_all(
+              KC_SCLN,       KC_LPRN,         KC_RPRN,        KC_GRV,          KC_NO,        MO(11),       KC_RSFT,        KC_RSFT,        KC_RSFT,          KC_NO
+    ),
+    [5] = LAYOUT_all(
+              KC_LGUI,       KC_LGUI,         KC_LGUI,         KC_NO,   LGUI(KC_GRV),  LGUI(KC_TAB),          KC_D,           KC_G,           KC_C,         KC_ENT
+    ),
+    [6] = LAYOUT_all(
+              KC_LCTL,       KC_LCTL,           KC_NO,       KC_LCTL,          KC_NO,         KC_NO,          KC_M,           KC_B,           KC_V,           KC_W
+    ),
+    [7] = LAYOUT_all(
+              KC_LALT,         KC_NO,         KC_LALT,       KC_LALT,          KC_NO,         KC_NO,       KC_SLSH,           KC_L,           KC_R,        KC_BSLS
+    ),
+    [8] = LAYOUT_all(
+                KC_NO,       KC_LSFT,         KC_LSFT,       KC_LSFT,         MO(11),         KC_NO,       KC_MINS,        KC_LBRC,        KC_RBRC,         KC_EQL
+    ),
+    [9] = LAYOUT_all(
+                 KC_1,          KC_2,            KC_3,          KC_4,           KC_5,         KC_NO,       KC_LEFT,        KC_RGHT,          KC_UP,        KC_DOWN
+    ),
+    [10] = LAYOUT_all(
+              KC_PGDN,       KC_PGUP,         KC_HOME,        KC_END,          KC_NO,          KC_6,          KC_7,           KC_8,           KC_9,           KC_0
+    ),
+    [11] = LAYOUT_all(
+              KC_WH_D,       KC_WH_U,         KC_WH_L,       KC_WH_R,        KC_BTN2,       KC_BTN1,       KC_MS_L,        KC_MS_R,        KC_MS_U,        KC_MS_D
+    )
+};
+
+
+
diff --git a/keyboards/handwired/tkk/readme.md b/keyboards/handwired/tkk/readme.md
new file mode 100644
index 0000000000..2693565f84
--- /dev/null
+++ b/keyboards/handwired/tkk/readme.md
@@ -0,0 +1,34 @@
+# tkk
+
+![tkk](https://i.imgur.com/gXAjt3Oh.jpeg)
+
+This is 'tkk', a ten key split keyboard wired as a single "row," ten "column" diode-less numpad. I've been dreaming of my own ten key layout since before discovering [ASETIOP](https://asetniop.com/), and [gboard's Ginny](https://www.gboards.ca/) ... but I'm too new to QMK and too rusty with C to figure out how to modify the Ginny's layout / chording engine. So here we are. The tkk [layout](https://imgur.com/a/eQzhSgw) is built around a vaguely DVORAK-ish letter layout (with some adjustments meant to aid memorization), with "modules" for numbers, movement, modifiers, and even mouse keys.
+
+* Keyboard Maintainer: [Joe Fass](https://github.com/jfass)
+* Hardware Supported: hand-wired, ten switch diode-less keyboard, using a Teensy 2.0
+* Hardware Availability: (forget where I bought the parts, but easy to find)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/tkk:default
+
+Or:
+
+    qmk compile -kb handwired/tkk -km default
+
+In my build environment (Ubuntu), I needed to unset quite a few environment variables like CONDA\_BACKUP\_LDFLAGS that contained hardware options qmk didn't like, before this succeeded.
+
+Flashing example for this keyboard:
+
+    make handwired/tkk: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 `RESET` if it is available
+
diff --git a/keyboards/handwired/tkk/rules.mk b/keyboards/handwired/tkk/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/handwired/tkk/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank