aboutsummaryrefslogtreecommitdiff
path: root/keyboards/cxt_studio
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/cxt_studio')
-rw-r--r--keyboards/cxt_studio/12e3/keyboard.json99
-rw-r--r--keyboards/cxt_studio/12e3/keymaps/default/keymap.c40
-rw-r--r--keyboards/cxt_studio/12e3/keymaps/default/rules.mk1
-rw-r--r--keyboards/cxt_studio/12e3/readme.md27
-rw-r--r--keyboards/cxt_studio/12e4/config.h6
-rw-r--r--keyboards/cxt_studio/12e4/cxt_studio.c (renamed from keyboards/cxt_studio/cxt_studio.c)20
-rw-r--r--keyboards/cxt_studio/12e4/keyboard.json (renamed from keyboards/cxt_studio/keyboard.json)2
-rw-r--r--keyboards/cxt_studio/12e4/keymaps/default/keymap.json (renamed from keyboards/cxt_studio/keymaps/default/keymap.json)2
-rw-r--r--keyboards/cxt_studio/12e4/readme.md (renamed from keyboards/cxt_studio/readme.md)10
-rw-r--r--keyboards/cxt_studio/config.h22
10 files changed, 186 insertions, 43 deletions
diff --git a/keyboards/cxt_studio/12e3/keyboard.json b/keyboards/cxt_studio/12e3/keyboard.json
new file mode 100644
index 0000000000..763f6bd5b9
--- /dev/null
+++ b/keyboards/cxt_studio/12e3/keyboard.json
@@ -0,0 +1,99 @@
+{
+ "manufacturer": "cxt_studio",
+ "keyboard_name": "cxt_studio 12E3",
+ "maintainer": "muge",
+ "bootloader": "atmel-dfu",
+ "diode_direction": "ROW2COL",
+ "features": {
+ "bootmagic": 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": "F5", "pin_b": "F6"},
+ {"pin_a": "E6", "pin_b": "F0"},
+ {"pin_a": "B3", "pin_b": "B2", "resolution": 2}
+ ]
+ },
+ "processor": "atmega32u4",
+ "rgb_matrix": {
+ "animations": {
+ "breathing": true,
+ "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": "solid_reactive_simple"
+ },
+ "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": "0x12E3",
+ "vid": "0x0215"
+ },
+ "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": [3, 2], "x": 4, "y": 0},
+ {"matrix": [3, 3], "x": 5, "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": [3, 1], "x": 4, "y": 1, "w": 2, "h": 2},
+
+ {"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}
+ ]
+ }
+ }
+}
+
diff --git a/keyboards/cxt_studio/12e3/keymaps/default/keymap.c b/keyboards/cxt_studio/12e3/keymaps/default/keymap.c
new file mode 100644
index 0000000000..78375680d4
--- /dev/null
+++ b/keyboards/cxt_studio/12e3/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum my_layers {
+ _BASE,
+ _RGBL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [_BASE] = LAYOUT(
+ KC_PSCR, KC_CUT, KC_COPY, KC_PSTE, MS_BTN3, RM_TOGG,
+ KC_CALC, KC_UNDO, KC_MPLY, KC_MNXT, KC_MUTE,
+ MO(1), KC_LGUI, KC_DEL, KC_APP
+ ),
+
+ [_RGBL] = LAYOUT(
+ RM_NEXT, RM_SATU, KC_INS, KC_DEL, _______, _______,
+ RM_PREV, RM_SATD, KC_PGUP, KC_HOME, _______,
+ _______, QK_BOOT, KC_PGDN, KC_END
+ ),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ // Encoders: Left, Right, Big
+ [_BASE] = {
+ ENCODER_CCW_CW(MS_WHLD, MS_WHLU),
+ ENCODER_CCW_CW(KC_PGDN, KC_PGUP),
+ ENCODER_CCW_CW(KC_VOLD, KC_VOLU)
+ },
+ [_RGBL] = {
+ ENCODER_CCW_CW(RM_HUED, RM_HUEU),
+ ENCODER_CCW_CW(RM_SPDD, RM_SPDU),
+ ENCODER_CCW_CW(RM_VALD, RM_VALU)
+ },
+};
+#endif
diff --git a/keyboards/cxt_studio/12e3/keymaps/default/rules.mk b/keyboards/cxt_studio/12e3/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/cxt_studio/12e3/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/cxt_studio/12e3/readme.md b/keyboards/cxt_studio/12e3/readme.md
new file mode 100644
index 0000000000..8ea527f473
--- /dev/null
+++ b/keyboards/cxt_studio/12e3/readme.md
@@ -0,0 +1,27 @@
+# cxt_studio/12e3
+
+![cxt_studio/12e3](https://i.postimg.cc/NFK8rY8N/M5rtTSP.png)
+
+3x4 ortho layout, with 3 encoders.
+
+* Keyboard Maintainer: [muge](https://github.com/muge)
+* Hardware Supported: CXT Studio 12E3
+* Hardware Availability: AliExpress, Taobao
+
+Make example for this keyboard (after setting up your build environment):
+
+ make cxt_studio/12e3:default
+
+Flashing example for this keyboard:
+
+ make cxt_studio/12e3: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, located under the large encoder, on the right side
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. It is included in the default layout
diff --git a/keyboards/cxt_studio/12e4/config.h b/keyboards/cxt_studio/12e4/config.h
new file mode 100644
index 0000000000..de0fbad7ec
--- /dev/null
+++ 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/cxt_studio.c b/keyboards/cxt_studio/12e4/cxt_studio.c
index 2b36905340..03a15e4d48 100644
--- a/keyboards/cxt_studio/cxt_studio.c
+++ b/keyboards/cxt_studio/12e4/cxt_studio.c
@@ -3,8 +3,6 @@
#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)) {
@@ -21,32 +19,26 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
break;
case 1: {
if (clockwise) {
- rgblight_increase_hue();
+ rgb_matrix_increase_hue();
} else {
- rgblight_decrease_hue();
+ rgb_matrix_decrease_hue();
}
}
break;
case 2: {
if (clockwise) {
- rgblight_increase_val();
+ rgb_matrix_increase_val();
} else {
- rgblight_decrease_val();
+ rgb_matrix_decrease_val();
}
}
break;
case 3: {
if (clockwise) {
- anim++;
+ rgb_matrix_step();
} else {
- anim--;
+ rgb_matrix_step_reverse();
}
- if (anim >= RGB_MATRIX_EFFECT_MAX) {
- anim = 0;
- } else if (anim < 0) {
- anim = RGB_MATRIX_EFFECT_MAX - 1;
- }
- rgblight_mode(anim);
}
break;
}
diff --git a/keyboards/cxt_studio/keyboard.json b/keyboards/cxt_studio/12e4/keyboard.json
index 7ee7b52d50..b48e75f4ca 100644
--- a/keyboards/cxt_studio/keyboard.json
+++ b/keyboards/cxt_studio/12e4/keyboard.json
@@ -1,6 +1,6 @@
{
"manufacturer": "CXT",
- "keyboard_name": "cxt_studio",
+ "keyboard_name": "cxt_studio 12E4",
"maintainer": "ColinKinloch",
"bootloader": "atmel-dfu",
"diode_direction": "ROW2COL",
diff --git a/keyboards/cxt_studio/keymaps/default/keymap.json b/keyboards/cxt_studio/12e4/keymaps/default/keymap.json
index 9e31833520..b05d3ba179 100644
--- a/keyboards/cxt_studio/keymaps/default/keymap.json
+++ b/keyboards/cxt_studio/12e4/keymaps/default/keymap.json
@@ -1,5 +1,5 @@
{
- "keyboard": "cxt_studio",
+ "keyboard": "cxt_studio/12e4",
"keymap": "default",
"layout": "LAYOUT",
"layers": [
diff --git a/keyboards/cxt_studio/readme.md b/keyboards/cxt_studio/12e4/readme.md
index 6397a3fdfd..760c3544b4 100644
--- a/keyboards/cxt_studio/readme.md
+++ b/keyboards/cxt_studio/12e4/readme.md
@@ -1,20 +1,20 @@
-# cxt_studio
+# cxt_studio/12e4
-![cxt_studio](https://i.imgur.com/AMCTioSh.jpeg)
+![cxt_studio/12e4](https://i.imgur.com/AMCTioSh.jpeg)
3x4 ortho rgb lighting 4 knobs.
* Keyboard Maintainer: [Colin Kinloch](https://github.com/ColinKinloch)
-* Hardware Supported: CXT-Studio
+* 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:default
+ make cxt_studio/12e4:default
Flashing example for this keyboard:
- make cxt_studio:default:flash
+ 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).
diff --git a/keyboards/cxt_studio/config.h b/keyboards/cxt_studio/config.h
deleted file mode 100644
index e56e07a254..0000000000
--- a/keyboards/cxt_studio/config.h
+++ /dev/null
@@ -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