From c1f78685386d1cc8a62b8e885b7b63a8689b1ec8 Mon Sep 17 00:00:00 2001 From: muge <221161+muge@users.noreply.github.com> Date: Tue, 24 Dec 2024 14:31:42 -0800 Subject: [PATCH 01/16] add 12e3 keyboard, default keymap, readme --- keyboards/cxt_studio/12e3/keyboard.json | 99 +++++++++++++++++++ .../cxt_studio/12e3/keymaps/default/keymap.c | 43 ++++++++ keyboards/cxt_studio/12e3/readme.md | 27 +++++ keyboards/cxt_studio/12e3/rules.mk | 1 + 4 files changed, 170 insertions(+) create mode 100644 keyboards/cxt_studio/12e3/keyboard.json create mode 100644 keyboards/cxt_studio/12e3/keymaps/default/keymap.c create mode 100644 keyboards/cxt_studio/12e3/readme.md create mode 100644 keyboards/cxt_studio/12e3/rules.mk diff --git a/keyboards/cxt_studio/12e3/keyboard.json b/keyboards/cxt_studio/12e3/keyboard.json new file mode 100644 index 000000000000..22818cb29b00 --- /dev/null +++ b/keyboards/cxt_studio/12e3/keyboard.json @@ -0,0 +1,99 @@ +{ + "manufacturer": "cxt_studio", + "keyboard_name": "12e3", + "maintainer": "muge", + "bootloader": "atmel-dfu", + "diode_direction": "ROW2COL", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "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", "resolution": 4}, + {"pin_a": "E6", "pin_b": "F0", "resolution": 4}, + {"pin_a": "B3", "pin_b": "B2", "resolution": 2}, + ] + }, + "processor": "atmega32u4", + "rgb_matrix": { + "animations": { + "solid": true, + "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": [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, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + ] + } + } +} + 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 000000000000..854e5690e117 --- /dev/null +++ b/keyboards/cxt_studio/12e3/keymaps/default/keymap.c @@ -0,0 +1,43 @@ +// 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, + KC_CALC, KC_UNDO, KC_MPLY, KC_MNXT, + MO(1), KC_LGUI, KC_DEL, KC_APP, + //Encoders: Left, Right, Big + _______, RM_TOGG, KC_MUTE + ), + [_RGBL] = LAYOUT( + RM_NEXT, RM_SATU, KC_INS, KC_DEL, + RM_PREV, RM_SATD, KC_PGUP, KC_HOME, + _______, QK_BOOT, KC_PGDN, KC_END, + //Encoders: Left, Right, Big + _______, _______, _______ + ), +}; + +#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/readme.md b/keyboards/cxt_studio/12e3/readme.md new file mode 100644 index 000000000000..d037bc24fd74 --- /dev/null +++ b/keyboards/cxt_studio/12e3/readme.md @@ -0,0 +1,27 @@ +# cxt_studio/12e3 + +![cxt_studio/12e3](https://i.imgur.com/hTvESd7.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/12e3/rules.mk b/keyboards/cxt_studio/12e3/rules.mk new file mode 100644 index 000000000000..ee325681483f --- /dev/null +++ b/keyboards/cxt_studio/12e3/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes From 2cdf372881f072c508270c8b27ef97fbe5969deb Mon Sep 17 00:00:00 2001 From: muge <221161+muge@users.noreply.github.com> Date: Tue, 24 Dec 2024 14:55:33 -0800 Subject: [PATCH 02/16] keyboard name adjustment --- keyboards/cxt_studio/12e3/keyboard.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/cxt_studio/12e3/keyboard.json b/keyboards/cxt_studio/12e3/keyboard.json index 22818cb29b00..caa4831cca5e 100644 --- a/keyboards/cxt_studio/12e3/keyboard.json +++ b/keyboards/cxt_studio/12e3/keyboard.json @@ -1,6 +1,6 @@ { "manufacturer": "cxt_studio", - "keyboard_name": "12e3", + "keyboard_name": "cxt_studio 12E3", "maintainer": "muge", "bootloader": "atmel-dfu", "diode_direction": "ROW2COL", From f5ec3fddc58d4d861bade82a137d2dfeb4f00bb6 Mon Sep 17 00:00:00 2001 From: muge <221161+muge@users.noreply.github.com> Date: Tue, 24 Dec 2024 15:30:29 -0800 Subject: [PATCH 03/16] move rules.mk to default keymap folder --- keyboards/cxt_studio/12e3/keymaps/default/keymap.c | 4 ++-- keyboards/cxt_studio/12e3/{ => keymaps/default}/rules.mk | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename keyboards/cxt_studio/12e3/{ => keymaps/default}/rules.mk (100%) diff --git a/keyboards/cxt_studio/12e3/keymaps/default/keymap.c b/keyboards/cxt_studio/12e3/keymaps/default/keymap.c index 854e5690e117..b8cffc984da1 100644 --- a/keyboards/cxt_studio/12e3/keymaps/default/keymap.c +++ b/keyboards/cxt_studio/12e3/keymaps/default/keymap.c @@ -15,14 +15,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_CALC, KC_UNDO, KC_MPLY, KC_MNXT, MO(1), KC_LGUI, KC_DEL, KC_APP, //Encoders: Left, Right, Big - _______, RM_TOGG, KC_MUTE + _______, RM_TOGG, KC_MUTE, ), [_RGBL] = LAYOUT( RM_NEXT, RM_SATU, KC_INS, KC_DEL, RM_PREV, RM_SATD, KC_PGUP, KC_HOME, _______, QK_BOOT, KC_PGDN, KC_END, //Encoders: Left, Right, Big - _______, _______, _______ + _______, _______, _______, ), }; diff --git a/keyboards/cxt_studio/12e3/rules.mk b/keyboards/cxt_studio/12e3/keymaps/default/rules.mk similarity index 100% rename from keyboards/cxt_studio/12e3/rules.mk rename to keyboards/cxt_studio/12e3/keymaps/default/rules.mk From 7a0bc89ffbc16805e43681138e66a71a2d88a56e Mon Sep 17 00:00:00 2001 From: muge <221161+muge@users.noreply.github.com> Date: Tue, 24 Dec 2024 15:34:06 -0800 Subject: [PATCH 04/16] revert accidental comma insertion in keymap --- keyboards/cxt_studio/12e3/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/cxt_studio/12e3/keymaps/default/keymap.c b/keyboards/cxt_studio/12e3/keymaps/default/keymap.c index b8cffc984da1..854e5690e117 100644 --- a/keyboards/cxt_studio/12e3/keymaps/default/keymap.c +++ b/keyboards/cxt_studio/12e3/keymaps/default/keymap.c @@ -15,14 +15,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_CALC, KC_UNDO, KC_MPLY, KC_MNXT, MO(1), KC_LGUI, KC_DEL, KC_APP, //Encoders: Left, Right, Big - _______, RM_TOGG, KC_MUTE, + _______, RM_TOGG, KC_MUTE ), [_RGBL] = LAYOUT( RM_NEXT, RM_SATU, KC_INS, KC_DEL, RM_PREV, RM_SATD, KC_PGUP, KC_HOME, _______, QK_BOOT, KC_PGDN, KC_END, //Encoders: Left, Right, Big - _______, _______, _______, + _______, _______, _______ ), }; From 91b39492a569806b701fdfe6bab361a7cc4cde4b Mon Sep 17 00:00:00 2001 From: muge <221161+muge@users.noreply.github.com> Date: Tue, 24 Dec 2024 23:35:38 +0000 Subject: [PATCH 05/16] Update keyboards/cxt_studio/12e3/keyboard.json remove redundant encoder resolution Co-authored-by: jack --- keyboards/cxt_studio/12e3/keyboard.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/cxt_studio/12e3/keyboard.json b/keyboards/cxt_studio/12e3/keyboard.json index caa4831cca5e..1d598d144a85 100644 --- a/keyboards/cxt_studio/12e3/keyboard.json +++ b/keyboards/cxt_studio/12e3/keyboard.json @@ -23,8 +23,8 @@ }, "encoder": { "rotary": [ - {"pin_a": "F5", "pin_b": "F6", "resolution": 4}, - {"pin_a": "E6", "pin_b": "F0", "resolution": 4}, + {"pin_a": "F5", "pin_b": "F6"}, + {"pin_a": "E6", "pin_b": "F0"}, {"pin_a": "B3", "pin_b": "B2", "resolution": 2}, ] }, From a2d1e8906b1c8ebe3528681c445653460e823285 Mon Sep 17 00:00:00 2001 From: muge <221161+muge@users.noreply.github.com> Date: Thu, 26 Dec 2024 02:28:05 -0800 Subject: [PATCH 06/16] fix solid -> solid_color typo --- keyboards/cxt_studio/12e3/keyboard.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/cxt_studio/12e3/keyboard.json b/keyboards/cxt_studio/12e3/keyboard.json index 1d598d144a85..826988279f0d 100644 --- a/keyboards/cxt_studio/12e3/keyboard.json +++ b/keyboards/cxt_studio/12e3/keyboard.json @@ -31,7 +31,7 @@ "processor": "atmega32u4", "rgb_matrix": { "animations": { - "solid": true, + "solid_color": true, "breathing": true, "typing_heatmap": true, "digital_rain": true, From 0142e9e2540e9066067eba8eae3cff16bbff1234 Mon Sep 17 00:00:00 2001 From: muge <221161+muge@users.noreply.github.com> Date: Mon, 30 Dec 2024 10:37:54 -0800 Subject: [PATCH 07/16] formatted keyboard.json and default keymap.c --- .../cxt_studio/12e3/keymaps/default/keymap.c | 34 +++++-------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/keyboards/cxt_studio/12e3/keymaps/default/keymap.c b/keyboards/cxt_studio/12e3/keymaps/default/keymap.c index 854e5690e117..d87b62a9234e 100644 --- a/keyboards/cxt_studio/12e3/keymaps/default/keymap.c +++ b/keyboards/cxt_studio/12e3/keymaps/default/keymap.c @@ -10,34 +10,18 @@ enum my_layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT( - KC_PSCR, KC_CUT, KC_COPY, KC_PSTE, - KC_CALC, KC_UNDO, KC_MPLY, KC_MNXT, - MO(1), KC_LGUI, KC_DEL, KC_APP, - //Encoders: Left, Right, Big - _______, RM_TOGG, KC_MUTE - ), - [_RGBL] = LAYOUT( - RM_NEXT, RM_SATU, KC_INS, KC_DEL, - RM_PREV, RM_SATD, KC_PGUP, KC_HOME, - _______, QK_BOOT, KC_PGDN, KC_END, - //Encoders: Left, Right, Big - _______, _______, _______ - ), + [_BASE] = LAYOUT(KC_PSCR, KC_CUT, KC_COPY, KC_PSTE, KC_CALC, KC_UNDO, KC_MPLY, KC_MNXT, MO(1), KC_LGUI, KC_DEL, KC_APP, + // Encoders: Left, Right, Big + _______, RM_TOGG, KC_MUTE), + [_RGBL] = LAYOUT(RM_NEXT, RM_SATU, KC_INS, KC_DEL, RM_PREV, RM_SATD, KC_PGUP, KC_HOME, _______, QK_BOOT, KC_PGDN, KC_END, + // Encoders: Left, Right, Big + _______, _______, _______), }; #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) - }, + // 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 From 37fcf4ce3e290364128863dec86bba1911394501 Mon Sep 17 00:00:00 2001 From: muge <221161+muge@users.noreply.github.com> Date: Mon, 30 Dec 2024 10:48:25 -0800 Subject: [PATCH 08/16] re-reformatted default keymap.c for ease of use --- .../cxt_studio/12e3/keymaps/default/keymap.c | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/keyboards/cxt_studio/12e3/keymaps/default/keymap.c b/keyboards/cxt_studio/12e3/keymaps/default/keymap.c index d87b62a9234e..782911570374 100644 --- a/keyboards/cxt_studio/12e3/keymaps/default/keymap.c +++ b/keyboards/cxt_studio/12e3/keymaps/default/keymap.c @@ -10,18 +10,35 @@ enum my_layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT(KC_PSCR, KC_CUT, KC_COPY, KC_PSTE, KC_CALC, KC_UNDO, KC_MPLY, KC_MNXT, MO(1), KC_LGUI, KC_DEL, KC_APP, - // Encoders: Left, Right, Big - _______, RM_TOGG, KC_MUTE), - [_RGBL] = LAYOUT(RM_NEXT, RM_SATU, KC_INS, KC_DEL, RM_PREV, RM_SATD, KC_PGUP, KC_HOME, _______, QK_BOOT, KC_PGDN, KC_END, - // Encoders: Left, Right, Big - _______, _______, _______), + [_BASE] = LAYOUT( + KC_PSCR, KC_CUT, KC_COPY, KC_PSTE, + KC_CALC, KC_UNDO, KC_MPLY, KC_MNXT, + MO(1), KC_LGUI, KC_DEL, KC_APP, + // Encoders: Left, Right, Big + _______, RM_TOGG, KC_MUTE + ), + + [_RGBL] = LAYOUT( + RM_NEXT, RM_SATU, KC_INS, KC_DEL, + RM_PREV, RM_SATD, KC_PGUP, KC_HOME, + _______, QK_BOOT, KC_PGDN, KC_END, + // Encoders: Left, Right, Big + _______, _______, _______ + ), }; #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)}, + [_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 From 3d48331e87ea6625bea1f6177bb524a6b6500f95 Mon Sep 17 00:00:00 2001 From: muge <221161+muge@users.noreply.github.com> Date: Tue, 31 Dec 2024 03:18:37 -0800 Subject: [PATCH 09/16] Update keyboards/cxt_studio/12e3/keyboard.json Co-authored-by: Joel Challis --- keyboards/cxt_studio/12e3/keyboard.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/cxt_studio/12e3/keyboard.json b/keyboards/cxt_studio/12e3/keyboard.json index 826988279f0d..7bb1a0da29da 100644 --- a/keyboards/cxt_studio/12e3/keyboard.json +++ b/keyboards/cxt_studio/12e3/keyboard.json @@ -6,13 +6,11 @@ "diode_direction": "ROW2COL", "features": { "bootmagic": true, - "command": false, - "console": false, "extrakey": true, "mousekey": true, "nkro": true, "encoder": true, - "rgb_matrix": true, + "rgb_matrix": true }, "ws2812": { "pin": "F7" From 8dfc856f22fb3173d4b7ca68313c16c5576d51fa Mon Sep 17 00:00:00 2001 From: muge <221161+muge@users.noreply.github.com> Date: Tue, 31 Dec 2024 03:18:43 -0800 Subject: [PATCH 10/16] Update keyboards/cxt_studio/12e3/keyboard.json Co-authored-by: Joel Challis --- keyboards/cxt_studio/12e3/keyboard.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/cxt_studio/12e3/keyboard.json b/keyboards/cxt_studio/12e3/keyboard.json index 7bb1a0da29da..4f4767dd664f 100644 --- a/keyboards/cxt_studio/12e3/keyboard.json +++ b/keyboards/cxt_studio/12e3/keyboard.json @@ -23,7 +23,7 @@ "rotary": [ {"pin_a": "F5", "pin_b": "F6"}, {"pin_a": "E6", "pin_b": "F0"}, - {"pin_a": "B3", "pin_b": "B2", "resolution": 2}, + {"pin_a": "B3", "pin_b": "B2", "resolution": 2} ] }, "processor": "atmega32u4", From a752ccb2a52a1f20e5166efe98d1ffc2f219c2e0 Mon Sep 17 00:00:00 2001 From: muge <221161+muge@users.noreply.github.com> Date: Tue, 31 Dec 2024 03:18:50 -0800 Subject: [PATCH 11/16] Update keyboards/cxt_studio/12e3/keyboard.json Co-authored-by: Joel Challis --- keyboards/cxt_studio/12e3/keyboard.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/cxt_studio/12e3/keyboard.json b/keyboards/cxt_studio/12e3/keyboard.json index 4f4767dd664f..807d86e12697 100644 --- a/keyboards/cxt_studio/12e3/keyboard.json +++ b/keyboards/cxt_studio/12e3/keyboard.json @@ -29,7 +29,6 @@ "processor": "atmega32u4", "rgb_matrix": { "animations": { - "solid_color": true, "breathing": true, "typing_heatmap": true, "digital_rain": true, From bc26f0cd9c71966626b98a0481f3304c94bba1d5 Mon Sep 17 00:00:00 2001 From: muge <221161+muge@users.noreply.github.com> Date: Tue, 31 Dec 2024 03:18:56 -0800 Subject: [PATCH 12/16] Update keyboards/cxt_studio/12e3/keyboard.json Co-authored-by: Joel Challis --- keyboards/cxt_studio/12e3/keyboard.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/cxt_studio/12e3/keyboard.json b/keyboards/cxt_studio/12e3/keyboard.json index 807d86e12697..945b1b74205e 100644 --- a/keyboards/cxt_studio/12e3/keyboard.json +++ b/keyboards/cxt_studio/12e3/keyboard.json @@ -17,7 +17,7 @@ }, "matrix_pins": { "cols": ["D4", "D7", "B4", "B5"], - "rows": ["C7", "C6", "D6", "F4"], + "rows": ["C7", "C6", "D6", "F4"] }, "encoder": { "rotary": [ From 288f94ec912a54b604c480edc454828c0d967afc Mon Sep 17 00:00:00 2001 From: muge <221161+muge@users.noreply.github.com> Date: Tue, 31 Dec 2024 03:19:41 -0800 Subject: [PATCH 13/16] Update keyboards/cxt_studio/12e3/keyboard.json rearrange layout matrix Co-authored-by: Joel Challis --- keyboards/cxt_studio/12e3/keyboard.json | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/keyboards/cxt_studio/12e3/keyboard.json b/keyboards/cxt_studio/12e3/keyboard.json index 945b1b74205e..763f6bd5b94d 100644 --- a/keyboards/cxt_studio/12e3/keyboard.json +++ b/keyboards/cxt_studio/12e3/keyboard.json @@ -77,18 +77,21 @@ {"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}, - - {"matrix": [3, 2], "x": 2, "y": 3}, - {"matrix": [3, 3], "x": 3, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [2, 3], "x": 3, "y": 2} ] } } From 4c875a944e14543a41ce01500a151a1a52ab1a71 Mon Sep 17 00:00:00 2001 From: muge <221161+muge@users.noreply.github.com> Date: Tue, 31 Dec 2024 03:27:29 -0800 Subject: [PATCH 14/16] rearrange keymap based on matrix changes, update readme img url --- .../cxt_studio/12e3/keymaps/default/keymap.c | 16 ++++++---------- keyboards/cxt_studio/12e3/readme.md | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/keyboards/cxt_studio/12e3/keymaps/default/keymap.c b/keyboards/cxt_studio/12e3/keymaps/default/keymap.c index 782911570374..78375680d4f2 100644 --- a/keyboards/cxt_studio/12e3/keymaps/default/keymap.c +++ b/keyboards/cxt_studio/12e3/keymaps/default/keymap.c @@ -11,19 +11,15 @@ enum my_layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT( - KC_PSCR, KC_CUT, KC_COPY, KC_PSTE, - KC_CALC, KC_UNDO, KC_MPLY, KC_MNXT, - MO(1), KC_LGUI, KC_DEL, KC_APP, - // Encoders: Left, Right, Big - _______, RM_TOGG, KC_MUTE + 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, - // Encoders: Left, Right, Big - _______, _______, _______ + RM_NEXT, RM_SATU, KC_INS, KC_DEL, _______, _______, + RM_PREV, RM_SATD, KC_PGUP, KC_HOME, _______, + _______, QK_BOOT, KC_PGDN, KC_END ), }; diff --git a/keyboards/cxt_studio/12e3/readme.md b/keyboards/cxt_studio/12e3/readme.md index d037bc24fd74..020b469cab5b 100644 --- a/keyboards/cxt_studio/12e3/readme.md +++ b/keyboards/cxt_studio/12e3/readme.md @@ -1,6 +1,6 @@ # cxt_studio/12e3 -![cxt_studio/12e3](https://i.imgur.com/hTvESd7.png) +![cxt_studio/12e3](https://qmk-12e3.netlify.app/12e3.png) 3x4 ortho layout, with 3 encoders. From fcfae532e315f901549e2f34ac6f6d6c11c4c0cb Mon Sep 17 00:00:00 2001 From: muge <221161+muge@users.noreply.github.com> Date: Tue, 31 Dec 2024 10:49:02 -0800 Subject: [PATCH 15/16] change imgur url in readme --- keyboards/cxt_studio/12e3/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/cxt_studio/12e3/readme.md b/keyboards/cxt_studio/12e3/readme.md index 020b469cab5b..a89c4cdb2ed4 100644 --- a/keyboards/cxt_studio/12e3/readme.md +++ b/keyboards/cxt_studio/12e3/readme.md @@ -1,6 +1,6 @@ # cxt_studio/12e3 -![cxt_studio/12e3](https://qmk-12e3.netlify.app/12e3.png) +![cxt_studio/12e3](https://i.imgur.com/DqMnl6Z.png) 3x4 ortho layout, with 3 encoders. From d9e59b9b0ea319a986b753402ad6d2e5cccbd69d Mon Sep 17 00:00:00 2001 From: muge <221161+muge@users.noreply.github.com> Date: Tue, 14 Jan 2025 11:38:16 -0800 Subject: [PATCH 16/16] change image url to postimg --- keyboards/cxt_studio/12e3/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/cxt_studio/12e3/readme.md b/keyboards/cxt_studio/12e3/readme.md index a89c4cdb2ed4..8ea527f47346 100644 --- a/keyboards/cxt_studio/12e3/readme.md +++ b/keyboards/cxt_studio/12e3/readme.md @@ -1,6 +1,6 @@ # cxt_studio/12e3 -![cxt_studio/12e3](https://i.imgur.com/DqMnl6Z.png) +![cxt_studio/12e3](https://i.postimg.cc/NFK8rY8N/M5rtTSP.png) 3x4 ortho layout, with 3 encoders.