summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2023-08-12 08:52:45 +0000
committerQMK Bot <hello@qmk.fm>2023-08-12 08:52:45 +0000
commit634989d300d5154eaaf81603f424d3e887694ba3 (patch)
tree39787811145de89c75ba989bb9604a91a4fd5d48 /keyboards
parent6a2c53e91deda221aa5016d00788f9f59991ed25 (diff)
parent3831407da9e63be833098afb96e7147e7b0d6940 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/cxt_studio/info.json4
-rw-r--r--keyboards/cxt_studio/keymaps/via/keymap.c38
-rw-r--r--keyboards/cxt_studio/keymaps/via/rules.mk3
3 files changed, 43 insertions, 2 deletions
diff --git a/keyboards/cxt_studio/info.json b/keyboards/cxt_studio/info.json
index 0367948430..07b5ff17ea 100644
--- a/keyboards/cxt_studio/info.json
+++ b/keyboards/cxt_studio/info.json
@@ -50,8 +50,8 @@
"url": "",
"usb": {
"device_version": "1.0.0",
- "pid": "0x0000",
- "vid": "0xFEED"
+ "pid": "0xC401",
+ "vid": "0x5754"
},
"layouts": {
"LAYOUT": {
diff --git a/keyboards/cxt_studio/keymaps/via/keymap.c b/keyboards/cxt_studio/keymaps/via/keymap.c
new file mode 100644
index 0000000000..1d58a60471
--- /dev/null
+++ b/keyboards/cxt_studio/keymaps/via/keymap.c
@@ -0,0 +1,38 @@
+/* Copyright 2023 Brian McKenna
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ 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, RGB_TOG
+ )
+};
+
+#if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [0] = {
+ ENCODER_CCW_CW(KC_VOLD, KC_VOLU),
+ ENCODER_CCW_CW(RGB_HUD, RGB_HUI),
+ ENCODER_CCW_CW(RGB_VAD, RGB_VAI),
+ ENCODER_CCW_CW(RGB_MODE_REVERSE, RGB_MODE_FORWARD)
+ },
+};
+#endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
diff --git a/keyboards/cxt_studio/keymaps/via/rules.mk b/keyboards/cxt_studio/keymaps/via/rules.mk
new file mode 100644
index 0000000000..70cf4224c0
--- /dev/null
+++ b/keyboards/cxt_studio/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+LTO_ENABLE = yes