Move cxt_studio keyboard to own folder (#24748)

qmk · Dec 26, 2024 · 93de533 · 93de533
1 parent fc4d9c6
commit 93de533
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 43 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/cxt_studio.c → keyboards/cxt_studio/12e4/cxt_studio.c b/keyboards/cxt_studio/cxt_studio.c → 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 → keyboards/cxt_studio/12e4/keyboard.json b/keyboards/cxt_studio/keyboard.json → 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/...ds/cxt_studio/keymaps/default/keymap.json → ...t_studio/12e4/keymaps/default/keymap.json b/...ds/cxt_studio/keymaps/default/keymap.json → ...t_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 → keyboards/cxt_studio/12e4/readme.md b/keyboards/cxt_studio/readme.md → 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