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

keyboards/treasure/type30/hotswap/keyboard.json

@@ -0,0 +1,121 @@
+{
+    "manufacturer": "TREASURE",
+    "keyboard_name": "TYPE30",
+    "maintainer": "TREASURE",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+
+    "matrix_pins": {
+        "cols": ["B5", "B6", "B7", "C7", "C6", "C4", "D4", "D5", "D6", "B0", "B1", "B2"],
+        "rows": ["D2", "C5", "B3"]
+    },
+    "processor": "atmega32u2",
+    "rgb_matrix": {
+        "animations": {
+            "gradient_up_down": true,
+            "gradient_left_right": true
+        },
+        "driver": "ws2812",
+        "default": {
+            "speed": 40,
+            "animation": "gradient_left_right"
+        },
+        "layout": [
+            { "matrix": [0, 0], "x": 0,   "y": 0,  "flags": 4 },
+            { "matrix": [0, 1], "x": 20,  "y": 0,  "flags": 4 },
+            { "matrix": [0, 2], "x": 40,  "y": 0,  "flags": 4 },
+            { "matrix": [0, 3], "x": 60,  "y": 0,  "flags": 4 },
+            { "matrix": [0, 4], "x": 80,  "y": 0,  "flags": 4 },
+            { "matrix": [0, 5], "x": 100, "y": 0,  "flags": 4 },
+            { "matrix": [0, 6], "x": 120, "y": 0,  "flags": 4 },
+            { "matrix": [0, 7], "x": 140, "y": 0,  "flags": 4 },
+            { "matrix": [0, 8], "x": 160, "y": 0,  "flags": 4 },
+            { "matrix": [0, 9], "x": 180, "y": 0,  "flags": 4 },
+            { "matrix": [0,10], "x": 200, "y": 0,  "flags": 4 },
+            { "matrix": [0,11], "x": 220, "y": 0,  "flags": 4 },
+            { "matrix": [1, 0], "x": 0,   "y": 32, "flags": 4 },
+            { "matrix": [1, 1], "x": 20,  "y": 32, "flags": 4 },
+            { "matrix": [1, 2], "x": 40,  "y": 32, "flags": 4 },
+            { "matrix": [1, 3], "x": 60,  "y": 32, "flags": 4 },
+            { "matrix": [1, 4], "x": 80,  "y": 32, "flags": 4 },
+            { "matrix": [1, 5], "x": 100, "y": 32, "flags": 4 },
+            { "matrix": [1, 6], "x": 120, "y": 32, "flags": 4 },
+            { "matrix": [1, 7], "x": 140, "y": 32, "flags": 4 },
+            { "matrix": [1, 8], "x": 160, "y": 32, "flags": 4 },
+            { "matrix": [1, 9], "x": 180, "y": 32, "flags": 4 },
+            { "matrix": [1,10], "x": 200, "y": 32, "flags": 4 },
+            { "matrix": [1,11], "x": 220, "y": 32, "flags": 4 },
+            { "matrix": [2, 0], "x": 0,   "y": 64, "flags": 4 },
+            { "matrix": [2, 1], "x": 20,  "y": 64, "flags": 4 },
+            { "matrix": [2, 2], "x": 40,  "y": 64, "flags": 4 },
+            { "matrix": [2, 3], "x": 60,  "y": 64, "flags": 4 },
+            { "matrix": [2, 4], "x": 80,  "y": 64, "flags": 4 },
+            { "matrix": [2, 5], "x": 100, "y": 64, "flags": 4 },
+            { "matrix": [2, 6], "x": 120, "y": 64, "flags": 4 },
+            { "matrix": [2, 7], "x": 140, "y": 64, "flags": 4 },
+            { "matrix": [2, 8], "x": 160, "y": 64, "flags": 4 },
+            { "matrix": [2, 9], "x": 180, "y": 64, "flags": 4 },
+            { "matrix": [2,10], "x": 200, "y": 64, "flags": 4 },
+            { "matrix": [2,11], "x": 220, "y": 64, "flags": 4 }
+        ],
+        "max_brightness": 180,
+        "sleep": true
+    },
+    "url": "http://treasuretypes.com",
+    "usb": {
+        "device_version": "1.0.1",
+        "pid": "0x3330",
+        "vid": "0x5452"
+    },
+    "ws2812": {
+        "pin": "B4"
+    },
+    "layouts": {
+        "LAYOUT_ortho_3x12": {
+            "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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2}
+            ]
+        }
+    }
+}

keyboards/treasure/type30/hotswap/keymaps/default/keymap.c

@@ -0,0 +1,19 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // Base
+    [0] = LAYOUT_ortho_3x12(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_BSPC,
+        KC_LSFT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,   KC_J,   KC_K,    KC_L,    MO(1),   KC_SPC,
+        KC_LCTL, KC_LALT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,    KC_RGUI, KC_UP,   KC_DOWN
+    ),
+    // Fn
+    [1] = LAYOUT_ortho_3x12(
+        KC_TAB,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_DEL,
+        _______, S(KC_EQL), KC_MINS, KC_SLSH, KC_PAST, KC_LBRC, KC_RBRC, KC_BSLS, KC_SCLN, KC_QUOT, _______, KC_ENT,
+        _______, _______, KC_EQL, RM_TOGG, RM_HUEU, RM_NEXT, KC_GRV, KC_COMM, KC_DOT,  _______, KC_LEFT, KC_RIGHT
+    )
+};

keyboards/treasure/type30/hotswap/readme.md

@@ -0,0 +1,23 @@
+# Treasure TYPE-30
+
+* Keyboard Maintainer: [Treasure](https://www,treasuretypes.com)
+* Hardware Supported: Treasure TYPE-30 Hotswap PCB
+* Hardware Availability: [Treasure Store](http://treasuretypes.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make treasure/type30/hotswap:default
+
+Flashing example for this keyboard:
+
+    make treasure/type30/hotswap: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