summaryrefslogtreecommitdiff
path: root/keyboards/yandrstudio
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/yandrstudio')
-rw-r--r--keyboards/yandrstudio/buff67v3/config.h9
-rw-r--r--keyboards/yandrstudio/buff67v3/info.json9
-rw-r--r--keyboards/yandrstudio/buff67v3/rules.mk1
-rw-r--r--keyboards/yandrstudio/eau87/config.h22
-rw-r--r--keyboards/yandrstudio/eau87/eau87.c16
-rw-r--r--keyboards/yandrstudio/eau87/info.json5
-rw-r--r--keyboards/yandrstudio/eau_r2/config.h7
-rw-r--r--keyboards/yandrstudio/eau_r2/info.json8
-rw-r--r--keyboards/yandrstudio/nightstar75/config.h7
-rw-r--r--keyboards/yandrstudio/nightstar75/info.json9
-rw-r--r--keyboards/yandrstudio/nightstar75/rules.mk1
-rw-r--r--keyboards/yandrstudio/nz64/config.h9
-rw-r--r--keyboards/yandrstudio/nz64/info.json9
-rw-r--r--keyboards/yandrstudio/nz64/rules.mk1
-rw-r--r--keyboards/yandrstudio/nz67v2/config.h9
-rw-r--r--keyboards/yandrstudio/nz67v2/info.json423
-rw-r--r--keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c12
-rw-r--r--keyboards/yandrstudio/nz67v2/nz67v2.h63
-rw-r--r--keyboards/yandrstudio/nz67v2/rules.mk1
-rw-r--r--keyboards/yandrstudio/tg67/config.h8
-rw-r--r--keyboards/yandrstudio/tg67/info.json9
-rw-r--r--keyboards/yandrstudio/tg67/rules.mk1
-rw-r--r--keyboards/yandrstudio/wave75/wave75.c16
-rw-r--r--keyboards/yandrstudio/yr6095/config.h8
-rw-r--r--keyboards/yandrstudio/yr6095/info.json9
-rw-r--r--keyboards/yandrstudio/yr6095/rules.mk1
-rw-r--r--keyboards/yandrstudio/yr80/config.h1
-rw-r--r--keyboards/yandrstudio/yr80/info.json4
-rw-r--r--keyboards/yandrstudio/yr80/rules.mk1
-rw-r--r--keyboards/yandrstudio/zhou65/config.h8
-rw-r--r--keyboards/yandrstudio/zhou65/info.json5
-rw-r--r--keyboards/yandrstudio/zhou65/zhou65.c17
32 files changed, 289 insertions, 420 deletions
diff --git a/keyboards/yandrstudio/buff67v3/config.h b/keyboards/yandrstudio/buff67v3/config.h
index fe7045efad..677e41a00d 100644
--- a/keyboards/yandrstudio/buff67v3/config.h
+++ b/keyboards/yandrstudio/buff67v3/config.h
@@ -15,17 +15,8 @@
*/
#pragma once
-
-/* key matrix pins */
-#define MATRIX_COL_PINS { B5, B6, B7, B8, B9, C13, C14, B0, B1, B2, B10, B11, B12, A15, B3 }
-#define MATRIX_ROW_PINS { A3, A4, A5, A7, C15 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#ifdef RGBLIGHT_ENABLE
-# define RGB_DI_PIN B4
# define RGBLED_NUM 1
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/yandrstudio/buff67v3/info.json b/keyboards/yandrstudio/buff67v3/info.json
index 07f7dbbe30..34702641a8 100644
--- a/keyboards/yandrstudio/buff67v3/info.json
+++ b/keyboards/yandrstudio/buff67v3/info.json
@@ -6,6 +6,15 @@
"pid": "0xAA88",
"device_version": "1.0.0"
},
+ "ws2812": {
+ "pin": "B4",
+ "driver": "pwm"
+ },
+ "matrix_pins": {
+ "cols": ["B5", "B6", "B7", "B8", "B9", "C13", "C14", "B0", "B1", "B2", "B10", "B11", "B12", "A15", "B3"],
+ "rows": ["A3", "A4", "A5", "A7", "C15"]
+ },
+ "diode_direction": "COL2ROW",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/yandrstudio/buff67v3/rules.mk b/keyboards/yandrstudio/buff67v3/rules.mk
index 35a243a65d..663aac2420 100644
--- a/keyboards/yandrstudio/buff67v3/rules.mk
+++ b/keyboards/yandrstudio/buff67v3/rules.mk
@@ -13,5 +13,4 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
RGBLIGHT_DRIVER = WS2812 # RGB driver support
-WS2812_DRIVER = pwm # WS2812 RGB Driver
AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/yandrstudio/eau87/config.h b/keyboards/yandrstudio/eau87/config.h
deleted file mode 100644
index 328e3e3852..0000000000
--- a/keyboards/yandrstudio/eau87/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2022 JasonRen(biu)
- *
- * 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/>.
- */
-#pragma once
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B11, B10, B2, B1, B0, A7, A6, A5, A3, A15, B3 }
-#define MATRIX_ROW_PINS { B12, B5, B4, A4, B7, B6 }
diff --git a/keyboards/yandrstudio/eau87/eau87.c b/keyboards/yandrstudio/eau87/eau87.c
deleted file mode 100644
index 6ab9edb788..0000000000
--- a/keyboards/yandrstudio/eau87/eau87.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 JasonRen(biu)
- *
- * 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 "eau87.h"
diff --git a/keyboards/yandrstudio/eau87/info.json b/keyboards/yandrstudio/eau87/info.json
index f09f55c76b..9477067805 100644
--- a/keyboards/yandrstudio/eau87/info.json
+++ b/keyboards/yandrstudio/eau87/info.json
@@ -6,6 +6,11 @@
"pid": "0xAAEB",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A3", "A15", "B3"],
+ "rows": ["B12", "B5", "B4", "A4", "B7", "B6"]
+ },
+ "diode_direction": "COL2ROW",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h
index d1405b2bbf..110f0d096c 100644
--- a/keyboards/yandrstudio/eau_r2/config.h
+++ b/keyboards/yandrstudio/eau_r2/config.h
@@ -15,15 +15,8 @@
*/
#pragma once
-#define MATRIX_COL_PINS { B7, A6, B6, B5, B4, B3, A5, A10, B1, B0, A7, A9, B11, B10, B2, A15, B15 }
-#define MATRIX_ROW_PINS { A3, B9, B8, A4, C14, C13 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#ifdef RGBLIGHT_ENABLE
-# define RGB_DI_PIN A8
# define RGBLED_NUM 12
# define RGBLIGHT_SLEEP
# define RGBLIGHT_VAL_STEP 5
diff --git a/keyboards/yandrstudio/eau_r2/info.json b/keyboards/yandrstudio/eau_r2/info.json
index 74f5dd6e86..bdf9be5f1e 100644
--- a/keyboards/yandrstudio/eau_r2/info.json
+++ b/keyboards/yandrstudio/eau_r2/info.json
@@ -6,6 +6,14 @@
"pid": "0xAACD",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["B7", "A6", "B6", "B5", "B4", "B3", "A5", "A10", "B1", "B0", "A7", "A9", "B11", "B10", "B2", "A15", "B15"],
+ "rows": ["A3", "B9", "B8", "A4", "C14", "C13"]
+ },
+ "diode_direction": "COL2ROW",
+ "ws2812": {
+ "pin": "A8"
+ },
"debounce": 8,
"layouts": {
"LAYOUT": {
diff --git a/keyboards/yandrstudio/nightstar75/config.h b/keyboards/yandrstudio/nightstar75/config.h
index 79f37b9bde..573fa12151 100644
--- a/keyboards/yandrstudio/nightstar75/config.h
+++ b/keyboards/yandrstudio/nightstar75/config.h
@@ -15,15 +15,8 @@
*/
#pragma once
-#define MATRIX_COL_PINS { C13, C14, C15, A3, A4, A5, A6, B12, B13, B14, B15, A8, A9, A10, B8 }
-#define MATRIX_ROW_PINS { B0, B1, B2, B10, B11, B9 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
#ifdef RGBLIGHT_ENABLE
-# define RGB_DI_PIN A7
# define RGBLED_NUM 4
# define RGBLIGHT_LIMIT_VAL 180
diff --git a/keyboards/yandrstudio/nightstar75/info.json b/keyboards/yandrstudio/nightstar75/info.json
index 4f8105fae8..899e4a7576 100644
--- a/keyboards/yandrstudio/nightstar75/info.json
+++ b/keyboards/yandrstudio/nightstar75/info.json
@@ -6,6 +6,15 @@
"pid": "0xAA87",
"device_version": "1.0.0"
},
+ "ws2812": {
+ "pin": "A7",
+ "driver": "pwm"
+ },
+ "matrix_pins": {
+ "cols": ["C13", "C14", "C15", "A3", "A4", "A5", "A6", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "B8"],
+ "rows": ["B0", "B1", "B2", "B10", "B11", "B9"]
+ },
+ "diode_direction": "ROW2COL",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/yandrstudio/nightstar75/rules.mk b/keyboards/yandrstudio/nightstar75/rules.mk
index 54e3f61af5..421ae9fce1 100644
--- a/keyboards/yandrstudio/nightstar75/rules.mk
+++ b/keyboards/yandrstudio/nightstar75/rules.mk
@@ -12,5 +12,4 @@ COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-WS2812_DRIVER = pwm # WS2812 RGB Driver
AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/yandrstudio/nz64/config.h b/keyboards/yandrstudio/nz64/config.h
index 06de2f5680..5e4cdaaea0 100644
--- a/keyboards/yandrstudio/nz64/config.h
+++ b/keyboards/yandrstudio/nz64/config.h
@@ -15,19 +15,11 @@
*/
#pragma once
-
-#define MATRIX_COL_PINS { A15, B3, B4, B6, B7, B5, C13, A5, A4, B14, B15, A8, A9, A10 }
-#define MATRIX_ROW_PINS { C14, B13, B12, C15, A3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Fix VIA RGB_light */
#define VIA_HAS_BROKEN_KEYCODES
/* RGB Matrix */
#ifdef RGB_MATRIX_ENABLE
-# define RGB_DI_PIN A7
# define RGBLED_NUM 82
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
@@ -95,7 +87,6 @@
#ifdef RGBLIGHT_ENABLE
-# define RGB_DI_PIN A7
# define RGBLED_NUM 82
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
diff --git a/keyboards/yandrstudio/nz64/info.json b/keyboards/yandrstudio/nz64/info.json
index 5aa0c2ae68..9ae46559d5 100644
--- a/keyboards/yandrstudio/nz64/info.json
+++ b/keyboards/yandrstudio/nz64/info.json
@@ -4,6 +4,15 @@
"pid": "0xAAAF",
"device_version": "1.0.0"
},
+ "ws2812": {
+ "pin": "A7",
+ "driver": "pwm"
+ },
+ "matrix_pins": {
+ "cols": ["A15", "B3", "B4", "B6", "B7", "B5", "C13", "A5", "A4", "B14", "B15", "A8", "A9", "A10"],
+ "rows": ["C14", "B13", "B12", "C15", "A3"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F401",
"bootloader": "stm32-dfu",
"layouts": {
diff --git a/keyboards/yandrstudio/nz64/rules.mk b/keyboards/yandrstudio/nz64/rules.mk
index 302cf375a3..3041064afc 100644
--- a/keyboards/yandrstudio/nz64/rules.mk
+++ b/keyboards/yandrstudio/nz64/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support
-WS2812_DRIVER = pwm # Driver for RGB
diff --git a/keyboards/yandrstudio/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h
index a3d9bb74c5..860ee45381 100644
--- a/keyboards/yandrstudio/nz67v2/config.h
+++ b/keyboards/yandrstudio/nz67v2/config.h
@@ -16,20 +16,11 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_COL_PINS { B9, A3, A4, A5, A6, A7, B0, B2, B10, B11, B12, B13, B14, B15, A8 }
-#define MATRIX_ROW_PINS { B3, B4, B6, B7, B8 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define TAP_CODE_DELAY 15
/* RGB Matrix */
#ifdef RGB_MATRIX_ENABLE
-# define RGB_DI_PIN B5
# define RGBLED_NUM 86
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
diff --git a/keyboards/yandrstudio/nz67v2/info.json b/keyboards/yandrstudio/nz67v2/info.json
index ed06374976..b9355552d6 100644
--- a/keyboards/yandrstudio/nz67v2/info.json
+++ b/keyboards/yandrstudio/nz67v2/info.json
@@ -6,6 +6,15 @@
"pid": "0xAA83",
"device_version": "1.0.0"
},
+ "ws2812": {
+ "pin": "B5",
+ "driver": "pwm"
+ },
+ "matrix_pins": {
+ "cols": ["B9", "A3", "A4", "A5", "A6", "A7", "B0", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"],
+ "rows": ["B3", "B4", "B6", "B7", "B8"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "A9", "pin_b": "A10"}
@@ -14,233 +23,233 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"~", "x":0, "y":0.5},
- {"label":"!", "x":1, "y":0.5},
- {"label":"@", "x":2, "y":0.5},
- {"label":"#", "x":3, "y":0.5},
- {"label":"$", "x":4, "y":0.5},
- {"label":"%", "x":5, "y":0.5},
- {"label":"^", "x":6, "y":0.5},
- {"label":"&", "x":7, "y":0.5},
- {"label":"*", "x":8, "y":0.5},
- {"label":"(", "x":9, "y":0.5},
- {"label":")", "x":10, "y":0.5},
- {"label":"_", "x":11, "y":0.5},
- {"label":"+", "x":12, "y":0.5},
- {"label":"Backspace", "x":13, "y":0.5, "w":2},
- {"label":"EC CCW", "x":16, "y":0},
- {"label":"Insert", "x":15, "y":0.5},
- {"label":"EC CW", "x":16, "y":1},
+ {"matrix": [0, 0], "x": 0, "y": 0.5},
+ {"matrix": [0, 1], "x": 1, "y": 0.5},
+ {"matrix": [0, 2], "x": 2, "y": 0.5},
+ {"matrix": [0, 3], "x": 3, "y": 0.5},
+ {"matrix": [0, 4], "x": 4, "y": 0.5},
+ {"matrix": [0, 5], "x": 5, "y": 0.5},
+ {"matrix": [0, 6], "x": 6, "y": 0.5},
+ {"matrix": [0, 7], "x": 7, "y": 0.5},
+ {"matrix": [0, 8], "x": 8, "y": 0.5},
+ {"matrix": [0, 9], "x": 9, "y": 0.5},
+ {"matrix": [0, 10], "x": 10, "y": 0.5},
+ {"matrix": [0, 11], "x": 11, "y": 0.5},
+ {"matrix": [0, 12], "x": 12, "y": 0.5},
+ {"matrix": [0, 13], "x": 13, "y": 0.5, "w": 2},
+ {"matrix": [4, 4], "x": 16, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0.5},
- {"label":"Tab", "x":0, "y":1.5, "w":1.5},
- {"label":"Q", "x":1.5, "y":1.5},
- {"label":"W", "x":2.5, "y":1.5},
- {"label":"E", "x":3.5, "y":1.5},
- {"label":"R", "x":4.5, "y":1.5},
- {"label":"T", "x":5.5, "y":1.5},
- {"label":"Y", "x":6.5, "y":1.5},
- {"label":"U", "x":7.5, "y":1.5},
- {"label":"I", "x":8.5, "y":1.5},
- {"label":"O", "x":9.5, "y":1.5},
- {"label":"P", "x":10.5, "y":1.5},
- {"label":"{", "x":11.5, "y":1.5},
- {"label":"}", "x":12.5, "y":1.5},
- {"label":"|", "x":13.5, "y":1.5, "w":1.5},
- {"label":"PgUp", "x":15, "y":1.5},
+ {"matrix": [4, 6], "x": 16, "y": 1},
+ {"matrix": [1, 0], "x": 0, "y": 1.5, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+ {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+ {"matrix": [1, 13], "x": 13.5, "y": 1.5, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1.5},
- {"label":"Caps Lock", "x":0, "y":2.5, "w":1.75},
- {"label":"A", "x":1.75, "y":2.5},
- {"label":"S", "x":2.75, "y":2.5},
- {"label":"D", "x":3.75, "y":2.5},
- {"label":"F", "x":4.75, "y":2.5},
- {"label":"G", "x":5.75, "y":2.5},
- {"label":"H", "x":6.75, "y":2.5},
- {"label":"J", "x":7.75, "y":2.5},
- {"label":"K", "x":8.75, "y":2.5},
- {"label":"L", "x":9.75, "y":2.5},
- {"label":":", "x":10.75, "y":2.5},
- {"label":"\"", "x":11.75, "y":2.5},
- {"label":"Enter", "x":12.75, "y":2.5, "w":2.25},
- {"label":"PgDn", "x":15, "y":2.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.75, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.75, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.75, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.75, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.75, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.75, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.75, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.75, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.75, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.75, "y": 2.5},
+ {"matrix": [2, 13], "x": 12.75, "y": 2.5, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2.5},
- {"label":"Shift", "x":0, "y":3.5, "w":2.25},
- {"label":"Z", "x":2.25, "y":3.5},
- {"label":"X", "x":3.25, "y":3.5},
- {"label":"C", "x":4.25, "y":3.5},
- {"label":"V", "x":5.25, "y":3.5},
- {"label":"B", "x":6.25, "y":3.5},
- {"label":"N", "x":7.25, "y":3.5},
- {"label":"M", "x":8.25, "y":3.5},
- {"label":"<", "x":9.25, "y":3.5},
- {"label":">", "x":10.25, "y":3.5},
- {"label":"?", "x":11.25, "y":3.5},
- {"label":"Shift", "x":12.25, "y":3.5, "w":1.75},
- {"label":"\u2191", "x":14, "y":3.5},
- {"label":"Delete", "x":15, "y":3.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3.5},
+ {"matrix": [3, 2], "x": 3.25, "y": 3.5},
+ {"matrix": [3, 3], "x": 4.25, "y": 3.5},
+ {"matrix": [3, 4], "x": 5.25, "y": 3.5},
+ {"matrix": [3, 5], "x": 6.25, "y": 3.5},
+ {"matrix": [3, 6], "x": 7.25, "y": 3.5},
+ {"matrix": [3, 7], "x": 8.25, "y": 3.5},
+ {"matrix": [3, 8], "x": 9.25, "y": 3.5},
+ {"matrix": [3, 9], "x": 10.25, "y": 3.5},
+ {"matrix": [3, 10], "x": 11.25, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.25, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3.5},
+ {"matrix": [3, 14], "x": 15, "y": 3.5},
- {"label":"Ctrl", "x":0, "y":4.5, "w":1.25},
- {"label":"Win", "x":1.25, "y":4.5, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4.5, "w":1.25},
- {"label":"Space", "x":3.75, "y":4.5, "w":2.25},
- {"label":"Space", "x":6, "y":4.5, "w":1.75},
- {"label":"Space", "x":7.75, "y":4.5, "w":2.25},
- {"label":"Alt", "x":10, "y":4.5, "w":1.25},
- {"label":"Fn", "x":11.25, "y":4.5, "w":1.25},
- {"label":"\u2190", "x":13, "y":4.5},
- {"label":"\u2193", "x":14, "y":4.5},
- {"label":"\u2192", "x":15, "y":4.5}
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 5], "x": 6, "y": 4.5, "w": 1.75},
+ {"matrix": [4, 7], "x": 7.75, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 9], "x": 10, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4.5},
+ {"matrix": [4, 13], "x": 14, "y": 4.5},
+ {"matrix": [4, 14], "x": 15, "y": 4.5}
]
},
"LAYOUT_65_ansi_blocker": {
"layout": [
- {"label":"~", "x":0, "y":0},
- {"label":"!", "x":1, "y":0},
- {"label":"@", "x":2, "y":0},
- {"label":"#", "x":3, "y":0},
- {"label":"$", "x":4, "y":0},
- {"label":"%", "x":5, "y":0},
- {"label":"^", "x":6, "y":0},
- {"label":"&", "x":7, "y":0},
- {"label":"*", "x":8, "y":0},
- {"label":"(", "x":9, "y":0},
- {"label":")", "x":10, "y":0},
- {"label":"_", "x":11, "y":0},
- {"label":"+", "x":12, "y":0},
- {"label":"Backspace", "x":13, "y":0, "w":2},
- {"label":"Insert", "x":15, "y":0},
+ {"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": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":"{", "x":11.5, "y":1},
- {"label":"}", "x":12.5, "y":1},
- {"label":"|", "x":13.5, "y":1, "w":1.5},
- {"label":"PgUp", "x":15, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
- {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":6.75, "y":2},
- {"label":"J", "x":7.75, "y":2},
- {"label":"K", "x":8.75, "y":2},
- {"label":"L", "x":9.75, "y":2},
- {"label":":", "x":10.75, "y":2},
- {"label":"\"", "x":11.75, "y":2},
- {"label":"Enter", "x":12.75, "y":2, "w":2.25},
- {"label":"PgDn", "x":15, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":"<", "x":9.25, "y":3},
- {"label":">", "x":10.25, "y":3},
- {"label":"?", "x":11.25, "y":3},
- {"label":"Shift", "x":12.25, "y":3, "w":1.75},
- {"label":"\u2191", "x":14, "y":3},
- {"label":"Delete", "x":15, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
- {"label":"Ctrl", "x":0, "y":4, "w":1.25},
- {"label":"Win", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4, "w":1.25},
- {"label":"Space", "x":3.75, "y":4, "w":6.25},
- {"label":"Alt", "x":10, "y":4, "w":1.25},
- {"label":"Fn", "x":11.25, "y":4, "w":1.25},
- {"label":"\u2190", "x":13, "y":4},
- {"label":"\u2193", "x":14, "y":4},
- {"label":"\u2192", "x":15, "y":4}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
},
"LAYOUT_65_ansi_blocker_split_space": {
"layout": [
- {"label":"~", "x":0, "y":0},
- {"label":"!", "x":1, "y":0},
- {"label":"@", "x":2, "y":0},
- {"label":"#", "x":3, "y":0},
- {"label":"$", "x":4, "y":0},
- {"label":"%", "x":5, "y":0},
- {"label":"^", "x":6, "y":0},
- {"label":"&", "x":7, "y":0},
- {"label":"*", "x":8, "y":0},
- {"label":"(", "x":9, "y":0},
- {"label":")", "x":10, "y":0},
- {"label":"_", "x":11, "y":0},
- {"label":"+", "x":12, "y":0},
- {"label":"Backspace", "x":13, "y":0, "w":2},
- {"label":"Insert", "x":15, "y":0},
+ {"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": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":"{", "x":11.5, "y":1},
- {"label":"}", "x":12.5, "y":1},
- {"label":"|", "x":13.5, "y":1, "w":1.5},
- {"label":"PgUp", "x":15, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
- {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":6.75, "y":2},
- {"label":"J", "x":7.75, "y":2},
- {"label":"K", "x":8.75, "y":2},
- {"label":"L", "x":9.75, "y":2},
- {"label":":", "x":10.75, "y":2},
- {"label":"\"", "x":11.75, "y":2},
- {"label":"Enter", "x":12.75, "y":2, "w":2.25},
- {"label":"PgDn", "x":15, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":"<", "x":9.25, "y":3},
- {"label":">", "x":10.25, "y":3},
- {"label":"?", "x":11.25, "y":3},
- {"label":"Shift", "x":12.25, "y":3, "w":1.75},
- {"label":"\u2191", "x":14, "y":3},
- {"label":"Delete", "x":15, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
- {"label":"Ctrl", "x":0, "y":4, "w":1.25},
- {"label":"Win", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4, "w":1.25},
- {"label":"Space", "x":3.75, "y":4, "w":2.25},
- {"label":"Space", "x":6, "y":4, "w":1.75},
- {"label":"Space", "x":7.75, "y":4, "w":2.25},
- {"label":"Alt", "x":10, "y":4, "w":1.25},
- {"label":"Fn", "x":11.25, "y":4, "w":1.25},
- {"label":"\u2190", "x":13, "y":4},
- {"label":"\u2193", "x":14, "y":4},
- {"label":"\u2192", "x":15, "y":4}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.75},
+ {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
}
}
diff --git a/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c b/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c
index 3da37b5315..ed5075636a 100644
--- a/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c
+++ b/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c
@@ -43,20 +43,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
};
#ifdef ENCODER_ENABLE
-keyevent_t encoder1_ccw = {.key = (keypos_t){.row = 4, .col = 4}, .pressed = false};
+keyevent_t encoder1_ccw = {.key = (keypos_t){.row = 4, .col = 4}, .pressed = false, .type = KEY_EVENT};
-keyevent_t encoder1_cw = {.key = (keypos_t){.row = 4, .col = 6}, .pressed = false};
+keyevent_t encoder1_cw = {.key = (keypos_t){.row = 4, .col = 6}, .pressed = false, .type = KEY_EVENT};
void matrix_scan_user(void) {
if (IS_PRESSED(encoder1_ccw)) {
encoder1_ccw.pressed = false;
- encoder1_ccw.time = (timer_read() | 1);
+ encoder1_ccw.time = timer_read();
action_exec(encoder1_ccw);
}
if (IS_PRESSED(encoder1_cw)) {
encoder1_cw.pressed = false;
- encoder1_cw.time = (timer_read() | 1);
+ encoder1_cw.time = timer_read();
action_exec(encoder1_cw);
}
}
@@ -64,11 +64,11 @@ void matrix_scan_user(void) {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (clockwise) {
encoder1_cw.pressed = true;
- encoder1_cw.time = (timer_read() | 1);
+ encoder1_cw.time = timer_read();
action_exec(encoder1_cw);
} else {
encoder1_ccw.pressed = true;
- encoder1_ccw.time = (timer_read() | 1);
+ encoder1_ccw.time = timer_read();
action_exec(encoder1_ccw);
}
return true;
diff --git a/keyboards/yandrstudio/nz67v2/nz67v2.h b/keyboards/yandrstudio/nz67v2/nz67v2.h
index f538c624d9..eddb7ec88a 100644
--- a/keyboards/yandrstudio/nz67v2/nz67v2.h
+++ b/keyboards/yandrstudio/nz67v2/nz67v2.h
@@ -17,69 +17,6 @@
#include "quantum.h"
-#define ____ KC_NO
-
-/*
- * optional encoder (404│406)
- * \ /
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
- * │000│001│002│003│004│005│006│007│008│009│010│011│012│013 │014│
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │100 │101│102│103│104│105│106│107│108│109│110│111│112│113 │114│
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │200 │201│202│203│204│205│206│207│208│209│210│211│213 │214│
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │300 │301│302│303│304│305│306│307│308│309│310│312 │313│314│
- * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┴─┬─┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │400 │401 │402 │403 │405 │407 │409 │410 │ │412│413│414│
- * └────┴────┴────┴────────┴──────┴────────┴────┴────┘ └───┴───┴───┘
- * ┌────┬────┬────┬────────────────────────┬────┬────┐
- * │400 │401 │402 │405 │409 │410 │ Standard
- * └────┴────┴────┴────────────────────────┴────┴────┘
- */
-
-#define LAYOUT_all( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K404, K014, K406, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314, \
- K400, K401, K402, K403, K405, K407, K409, K410, K412, K413, K414 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, ____, K213, K214 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, ____, K312, K313, K314 }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, ____, K409, K410, ____, K412, K413, K414 } \
-}
-
-#define LAYOUT_65_ansi_blocker( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314, \
- K400, K401, K402, K405, K409, K410, K412, K413, K414 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, ____, K213, K214 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, ____, K312, K313, K314 }, \
- { K400, K401, K402, ____, ____, K405, ____, ____, ____, K409, K410, ____, K412, K413, K414 } \
-}
-
-#define LAYOUT_65_ansi_blocker_split_space( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314, \
- K400, K401, K402, K403, K405, K407, K409, K410, K412, K413, K414 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, ____, K213, K214 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, ____, K312, K313, K314 }, \
- { K400, K401, K402, K403, ____, K405, ____, K407, ____, K409, K410, ____, K412, K413, K414 } \
-}
-
#ifdef RGB_MATRIX_ENABLE
# define URGB_K KC_F24
#else
diff --git a/keyboards/yandrstudio/nz67v2/rules.mk b/keyboards/yandrstudio/nz67v2/rules.mk
index a5923514e3..46d3952083 100644
--- a/keyboards/yandrstudio/nz67v2/rules.mk
+++ b/keyboards/yandrstudio/nz67v2/rules.mk
@@ -15,5 +15,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support
-WS2812_DRIVER = pwm # WS2812 RGB Driver
ENCODER_ENABLE = yes # Rotary encoder support
diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h
index d52452e0a2..373b5bcbf9 100644
--- a/keyboards/yandrstudio/tg67/config.h
+++ b/keyboards/yandrstudio/tg67/config.h
@@ -15,17 +15,9 @@
*/
#pragma once
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_COL_PINS { B2, B10, B11, A8, A9, A10, B5, A15, B3, A2, A3, B4, A4, A5, A6 }
-#define MATRIX_ROW_PINS { B0, B6, B1, B7, A1 }
-
/* RGB Matrix */
#ifdef RGB_MATRIX_ENABLE
-# define RGB_DI_PIN A7
# define RGBLED_NUM 69
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
diff --git a/keyboards/yandrstudio/tg67/info.json b/keyboards/yandrstudio/tg67/info.json
index d48809128f..677746d82e 100644
--- a/keyboards/yandrstudio/tg67/info.json
+++ b/keyboards/yandrstudio/tg67/info.json
@@ -6,6 +6,15 @@
"pid": "0xAA8D",
"device_version": "1.0.0"
},
+ "ws2812": {
+ "pin": "A7",
+ "driver": "pwm"
+ },
+ "matrix_pins": {
+ "cols": ["B2", "B10", "B11", "A8", "A9", "A10", "B5", "A15", "B3", "A2", "A3", "B4", "A4", "A5", "A6"],
+ "rows": ["B0", "B6", "B1", "B7", "A1"]
+ },
+ "diode_direction": "COL2ROW",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/yandrstudio/tg67/rules.mk b/keyboards/yandrstudio/tg67/rules.mk
index 4f60885efd..2de6c8af43 100644
--- a/keyboards/yandrstudio/tg67/rules.mk
+++ b/keyboards/yandrstudio/tg67/rules.mk
@@ -15,4 +15,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB Matrix
RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support
-WS2812_DRIVER = pwm # WS2812 RGB Driver
diff --git a/keyboards/yandrstudio/wave75/wave75.c b/keyboards/yandrstudio/wave75/wave75.c
deleted file mode 100644
index 56ffa33ade..0000000000
--- a/keyboards/yandrstudio/wave75/wave75.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 JasonRen(biu)
- *
- * 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 "wave75.h"
diff --git a/keyboards/yandrstudio/yr6095/config.h b/keyboards/yandrstudio/yr6095/config.h
index ec02b66c19..74c8f4adce 100644
--- a/keyboards/yandrstudio/yr6095/config.h
+++ b/keyboards/yandrstudio/yr6095/config.h
@@ -15,16 +15,8 @@
*/
#pragma once
-
-#define MATRIX_COL_PINS { B6, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4 }
-#define MATRIX_ROW_PINS { A1, A3, A8, A9, A10 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#ifdef RGBLIGHT_ENABLE
-# define RGB_DI_PIN B5
# define RGBLED_NUM 1
# define RGBLIGHT_LAYERS
diff --git a/keyboards/yandrstudio/yr6095/info.json b/keyboards/yandrstudio/yr6095/info.json
index 20a1e86cf4..023f71fc14 100644
--- a/keyboards/yandrstudio/yr6095/info.json
+++ b/keyboards/yandrstudio/yr6095/info.json
@@ -6,6 +6,15 @@
"pid": "0xAA0C",
"device_version": "1.0.0"
},
+ "ws2812": {
+ "pin": "B5",
+ "driver": "pwm"
+ },
+ "matrix_pins": {
+ "cols": ["B6", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4"],
+ "rows": ["A1", "A3", "A8", "A9", "A10"]
+ },
+ "diode_direction": "COL2ROW",
"layouts": {
"LAYOUT_60_tsangan_split_rshift": {
"layout": [
diff --git a/keyboards/yandrstudio/yr6095/rules.mk b/keyboards/yandrstudio/yr6095/rules.mk
index 43a4366a1f..421ae9fce1 100644
--- a/keyboards/yandrstudio/yr6095/rules.mk
+++ b/keyboards/yandrstudio/yr6095/rules.mk
@@ -13,4 +13,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-WS2812_DRIVER = pwm # WS2812 RGB Driver
diff --git a/keyboards/yandrstudio/yr80/config.h b/keyboards/yandrstudio/yr80/config.h
index b5f122fdc8..0e8602dee9 100644
--- a/keyboards/yandrstudio/yr80/config.h
+++ b/keyboards/yandrstudio/yr80/config.h
@@ -18,7 +18,6 @@
#ifdef RGBLIGHT_ENABLE
-# define RGB_DI_PIN A7
# define RGBLED_NUM 1
# define DRIVER_LED_TOTAL RGBLED_NUM
diff --git a/keyboards/yandrstudio/yr80/info.json b/keyboards/yandrstudio/yr80/info.json
index a393cb7aaf..6d15acd3be 100644
--- a/keyboards/yandrstudio/yr80/info.json
+++ b/keyboards/yandrstudio/yr80/info.json
@@ -6,6 +6,10 @@
"pid": "0xAA0D",
"device_version": "1.0.0"
},
+ "ws2812": {
+ "pin": "A7",
+ "driver": "pwm"
+ },
"diode_direction": "COL2ROW",
"matrix_pins": {
"cols": ["B12", "B13", "B14", "A15", "B3", "B4", "B5", "B0", "A5", "A4", "A3", "A1", "A2", "B11", "B1", "B2", "B10"],
diff --git a/keyboards/yandrstudio/yr80/rules.mk b/keyboards/yandrstudio/yr80/rules.mk
index 43a4366a1f..421ae9fce1 100644
--- a/keyboards/yandrstudio/yr80/rules.mk
+++ b/keyboards/yandrstudio/yr80/rules.mk
@@ -13,4 +13,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-WS2812_DRIVER = pwm # WS2812 RGB Driver
diff --git a/keyboards/yandrstudio/zhou65/config.h b/keyboards/yandrstudio/zhou65/config.h
index 2fa940c63a..66ec91c510 100644
--- a/keyboards/yandrstudio/zhou65/config.h
+++ b/keyboards/yandrstudio/zhou65/config.h
@@ -15,13 +15,5 @@
*/
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { A2, A1, B8, B7, C15 }
-#define MATRIX_COL_PINS { B9, B6, B5, B4, B3, B1, B0, A7, A6, A5, A4, A3, A8, B15, B14 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
/* enable the nkro when using the VIA. */
#define FORCE_NKRO
diff --git a/keyboards/yandrstudio/zhou65/info.json b/keyboards/yandrstudio/zhou65/info.json
index d3c36ca852..7a4754cf29 100644
--- a/keyboards/yandrstudio/zhou65/info.json
+++ b/keyboards/yandrstudio/zhou65/info.json
@@ -4,6 +4,11 @@
"pid": "0xAAAD",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["B9", "B6", "B5", "B4", "B3", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A8", "B15", "B14"],
+ "rows": ["A2", "A1", "B8", "B7", "C15"]
+ },
+ "diode_direction": "ROW2COL",
"indicators": {
"caps_lock": "A15",
"on_state": 0
diff --git a/keyboards/yandrstudio/zhou65/zhou65.c b/keyboards/yandrstudio/zhou65/zhou65.c
deleted file mode 100644
index e527550c9d..0000000000
--- a/keyboards/yandrstudio/zhou65/zhou65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 JasonRen(biu)
- *
- * 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 "zhou65.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-19 15:45:55 +0000