commit: 93de5335803242f1df93600602ef5725d4df3a4c
parent fc4d9c63fb6f5974b7aa86c520d1e74178e501b3
Author: muge <221161+muge@users.noreply.github.com>
Date: Thu, 26 Dec 2024 08:58:26 +0000
Move cxt_studio keyboard to own folder (#24748)
Diffstat:
11 files changed, 194 insertions(+), 215 deletions(-)
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
@@ -140,6 +140,9 @@
"custommk/genesis": {
"target": "custommk/genesis/rev1"
},
+ "cxt_studio":{
+ "target":"cxt_studio/12e4"
+ },
"daisy": {
"target": "ktec/daisy"
},
diff --git a/keyboards/cxt_studio/12e4/config.h b/keyboards/cxt_studio/12e4/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 Colin Kinloch (@ColinKinloch)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RGB_MATRIX_TYPING_HEATMAP_SPREAD 9
diff --git a/keyboards/cxt_studio/12e4/cxt_studio.c b/keyboards/cxt_studio/12e4/cxt_studio.c
@@ -0,0 +1,47 @@
+// Copyright 2023 Colin Kinloch (@ColinKinloch)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+ if (!encoder_update_user(index, clockwise)) {
+ return false;
+ }
+ switch (index) {
+ case 0: {
+ if (clockwise) {
+ tap_code_delay(KC_VOLU, 10);
+ } else {
+ tap_code_delay(KC_VOLD, 10);
+ }
+ }
+ break;
+ case 1: {
+ if (clockwise) {
+ rgb_matrix_increase_hue();
+ } else {
+ rgb_matrix_decrease_hue();
+ }
+ }
+ break;
+ case 2: {
+ if (clockwise) {
+ rgb_matrix_increase_val();
+ } else {
+ rgb_matrix_decrease_val();
+ }
+ }
+ break;
+ case 3: {
+ if (clockwise) {
+ rgb_matrix_step();
+ } else {
+ rgb_matrix_step_reverse();
+ }
+ }
+ break;
+ }
+ return true;
+}
+#endif
diff --git a/keyboards/cxt_studio/12e4/keyboard.json b/keyboards/cxt_studio/12e4/keyboard.json
@@ -0,0 +1,98 @@
+{
+ "manufacturer": "CXT",
+ "keyboard_name": "cxt_studio 12E4",
+ "maintainer": "ColinKinloch",
+ "bootloader": "atmel-dfu",
+ "diode_direction": "ROW2COL",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "encoder": true,
+ "rgb_matrix": true
+ },
+ "ws2812": {
+ "pin": "F7"
+ },
+ "matrix_pins": {
+ "cols": ["D4", "D7", "B4", "B5"],
+ "rows": ["C7", "C6", "D6", "F4"]
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D5", "pin_b": "D3"},
+ {"pin_a": "B2", "pin_b": "B3"},
+ {"pin_a": "F5", "pin_b": "F6"},
+ {"pin_a": "E6", "pin_b": "F0"}
+ ]
+ },
+ "processor": "atmega32u4",
+ "rgb_matrix": {
+ "animations": {
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "default": {
+ "animation": "typing_heatmap"
+ },
+ "driver": "ws2812",
+ "layout": [
+ {"flags": 4, "matrix": [0, 3], "x": 3, "y": 0},
+ {"flags": 4, "matrix": [0, 2], "x": 2, "y": 0},
+ {"flags": 4, "matrix": [0, 1], "x": 1, "y": 0},
+ {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
+ {"flags": 4, "matrix": [1, 0], "x": 0, "y": 1},
+ {"flags": 4, "matrix": [1, 1], "x": 1, "y": 1},
+ {"flags": 4, "matrix": [1, 2], "x": 2, "y": 1},
+ {"flags": 4, "matrix": [1, 3], "x": 3, "y": 1},
+ {"flags": 4, "matrix": [2, 3], "x": 3, "y": 2},
+ {"flags": 4, "matrix": [2, 2], "x": 2, "y": 2},
+ {"flags": 4, "matrix": [2, 1], "x": 1, "y": 2},
+ {"flags": 4, "matrix": [2, 0], "x": 0, "y": 2}
+ ]
+ },
+ "url": "",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0xC401",
+ "vid": "0x5754"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "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": [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": [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": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/cxt_studio/12e4/keymaps/default/keymap.json b/keyboards/cxt_studio/12e4/keymaps/default/keymap.json
@@ -0,0 +1,13 @@
+{
+ "keyboard": "cxt_studio/12e4",
+ "keymap": "default",
+ "layout": "LAYOUT",
+ "layers": [
+ [
+ "KC_ESC", "KC_F11", "KC_NO", "KC_MSTP",
+ "KC_NO", "KC_NO", "KC_MRWD", "KC_MFFD",
+ "KC_NO", "KC_MPLY", "KC_MPLY", "KC_MNXT",
+ "KC_MUTE", "KC_NO", "KC_NO", "RM_TOGG"
+ ]
+ ]
+}
diff --git a/keyboards/cxt_studio/12e4/readme.md b/keyboards/cxt_studio/12e4/readme.md
@@ -0,0 +1,27 @@
+# cxt_studio/12e4
+
+
+
+3x4 ortho rgb lighting 4 knobs.
+
+* Keyboard Maintainer: [Colin Kinloch](https://github.com/ColinKinloch)
+* Hardware Supported: CXT-Studio/12E4
+* Hardware Availability: AliExpress. I think the manufacturer is on Taobao.
+
+Make example for this keyboard (after setting up your build environment):
+
+ make cxt_studio/12e4:default
+
+Flashing example for this keyboard:
+
+ make cxt_studio/12e4: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/cxt_studio/config.h b/keyboards/cxt_studio/config.h
@@ -1,22 +0,0 @@
-// Copyright 2023 Colin Kinloch (@ColinKinloch)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define RGB_MATRIX_TYPING_HEATMAP_SPREAD 9
-
-/*
- * 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/cxt_studio/cxt_studio.c b/keyboards/cxt_studio/cxt_studio.c
@@ -1,55 +0,0 @@
-// Copyright 2023 Colin Kinloch (@ColinKinloch)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "quantum.h"
-
-static uint8_t anim = 0;
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) {
- return false;
- }
- switch (index) {
- case 0: {
- if (clockwise) {
- tap_code_delay(KC_VOLU, 10);
- } else {
- tap_code_delay(KC_VOLD, 10);
- }
- }
- break;
- case 1: {
- if (clockwise) {
- rgblight_increase_hue();
- } else {
- rgblight_decrease_hue();
- }
- }
- break;
- case 2: {
- if (clockwise) {
- rgblight_increase_val();
- } else {
- rgblight_decrease_val();
- }
- }
- break;
- case 3: {
- if (clockwise) {
- anim++;
- } else {
- anim--;
- }
- if (anim >= RGB_MATRIX_EFFECT_MAX) {
- anim = 0;
- } else if (anim < 0) {
- anim = RGB_MATRIX_EFFECT_MAX - 1;
- }
- rgblight_mode(anim);
- }
- break;
- }
- return true;
-}
-#endif
diff --git a/keyboards/cxt_studio/keyboard.json b/keyboards/cxt_studio/keyboard.json
@@ -1,98 +0,0 @@
-{
- "manufacturer": "CXT",
- "keyboard_name": "cxt_studio",
- "maintainer": "ColinKinloch",
- "bootloader": "atmel-dfu",
- "diode_direction": "ROW2COL",
- "features": {
- "bootmagic": true,
- "command": false,
- "console": true,
- "extrakey": true,
- "mousekey": true,
- "nkro": true,
- "encoder": true,
- "rgb_matrix": true
- },
- "ws2812": {
- "pin": "F7"
- },
- "matrix_pins": {
- "cols": ["D4", "D7", "B4", "B5"],
- "rows": ["C7", "C6", "D6", "F4"]
- },
- "encoder": {
- "rotary": [
- {"pin_a": "D5", "pin_b": "D3"},
- {"pin_a": "B2", "pin_b": "B3"},
- {"pin_a": "F5", "pin_b": "F6"},
- {"pin_a": "E6", "pin_b": "F0"}
- ]
- },
- "processor": "atmega32u4",
- "rgb_matrix": {
- "animations": {
- "typing_heatmap": true,
- "digital_rain": true,
- "solid_reactive_simple": true,
- "solid_reactive": true,
- "solid_reactive_wide": true,
- "solid_reactive_multiwide": true,
- "solid_reactive_cross": true,
- "solid_reactive_multicross": true,
- "solid_reactive_nexus": true,
- "solid_reactive_multinexus": true,
- "splash": true,
- "multisplash": true,
- "solid_splash": true,
- "solid_multisplash": true
- },
- "default": {
- "animation": "typing_heatmap"
- },
- "driver": "ws2812",
- "layout": [
- {"flags": 4, "matrix": [0, 3], "x": 3, "y": 0},
- {"flags": 4, "matrix": [0, 2], "x": 2, "y": 0},
- {"flags": 4, "matrix": [0, 1], "x": 1, "y": 0},
- {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
- {"flags": 4, "matrix": [1, 0], "x": 0, "y": 1},
- {"flags": 4, "matrix": [1, 1], "x": 1, "y": 1},
- {"flags": 4, "matrix": [1, 2], "x": 2, "y": 1},
- {"flags": 4, "matrix": [1, 3], "x": 3, "y": 1},
- {"flags": 4, "matrix": [2, 3], "x": 3, "y": 2},
- {"flags": 4, "matrix": [2, 2], "x": 2, "y": 2},
- {"flags": 4, "matrix": [2, 1], "x": 1, "y": 2},
- {"flags": 4, "matrix": [2, 0], "x": 0, "y": 2}
- ]
- },
- "url": "",
- "usb": {
- "device_version": "1.0.0",
- "pid": "0xC401",
- "vid": "0x5754"
- },
- "layouts": {
- "LAYOUT": {
- "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": [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": [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": [3, 0], "x": 0, "y": 3},
- {"matrix": [3, 1], "x": 1, "y": 3},
- {"matrix": [3, 2], "x": 2, "y": 3},
- {"matrix": [3, 3], "x": 3, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/cxt_studio/keymaps/default/keymap.json b/keyboards/cxt_studio/keymaps/default/keymap.json
@@ -1,13 +0,0 @@
-{
- "keyboard": "cxt_studio",
- "keymap": "default",
- "layout": "LAYOUT",
- "layers": [
- [
- "KC_ESC", "KC_F11", "KC_NO", "KC_MSTP",
- "KC_NO", "KC_NO", "KC_MRWD", "KC_MFFD",
- "KC_NO", "KC_MPLY", "KC_MPLY", "KC_MNXT",
- "KC_MUTE", "KC_NO", "KC_NO", "RM_TOGG"
- ]
- ]
-}
diff --git a/keyboards/cxt_studio/readme.md b/keyboards/cxt_studio/readme.md
@@ -1,27 +0,0 @@
-# cxt_studio
-
-
-
-3x4 ortho rgb lighting 4 knobs.
-
-* Keyboard Maintainer: [Colin Kinloch](https://github.com/ColinKinloch)
-* Hardware Supported: CXT-Studio
-* Hardware Availability: AliExpress. I think the manufacturer is on Taobao.
-
-Make example for this keyboard (after setting up your build environment):
-
- make cxt_studio:default
-
-Flashing example for this keyboard:
-
- make cxt_studio: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
