From f6dd8dea2e493dc549a60fee99de871c4088d09a Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Tue, 31 Jan 2023 06:03:30 +1100 Subject: Remove usages of config_common.h from config.h files. (#19714) --- keyboards/yandrstudio/buff67v3/config.h | 1 - keyboards/yandrstudio/eau87/config.h | 1 - keyboards/yandrstudio/eau_r2/config.h | 1 - keyboards/yandrstudio/nightstar75/config.h | 1 - keyboards/yandrstudio/nz64/config.h | 1 - keyboards/yandrstudio/nz67v2/config.h | 1 - keyboards/yandrstudio/tg67/config.h | 1 - keyboards/yandrstudio/yr6095/config.h | 1 - keyboards/yandrstudio/yr80/config.h | 1 - keyboards/yandrstudio/zhou65/config.h | 1 - 10 files changed, 10 deletions(-) (limited to 'keyboards/yandrstudio') diff --git a/keyboards/yandrstudio/buff67v3/config.h b/keyboards/yandrstudio/buff67v3/config.h index 0e7392f0e6..d4e46e68f0 100644 --- a/keyboards/yandrstudio/buff67v3/config.h +++ b/keyboards/yandrstudio/buff67v3/config.h @@ -15,7 +15,6 @@ */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/yandrstudio/eau87/config.h b/keyboards/yandrstudio/eau87/config.h index 698b5ca141..9d34fe51c6 100644 --- a/keyboards/yandrstudio/eau87/config.h +++ b/keyboards/yandrstudio/eau87/config.h @@ -14,7 +14,6 @@ * along with this program. If not, see . */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 6 diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h index 28cb9106bc..33e88a33b8 100644 --- a/keyboards/yandrstudio/eau_r2/config.h +++ b/keyboards/yandrstudio/eau_r2/config.h @@ -14,7 +14,6 @@ * along with this program. If not, see . */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 6 diff --git a/keyboards/yandrstudio/nightstar75/config.h b/keyboards/yandrstudio/nightstar75/config.h index 6f2942042a..10b69c89ff 100644 --- a/keyboards/yandrstudio/nightstar75/config.h +++ b/keyboards/yandrstudio/nightstar75/config.h @@ -14,7 +14,6 @@ * along with this program. If not, see . */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 6 diff --git a/keyboards/yandrstudio/nz64/config.h b/keyboards/yandrstudio/nz64/config.h index 224eb16bb3..86aab7e7d5 100644 --- a/keyboards/yandrstudio/nz64/config.h +++ b/keyboards/yandrstudio/nz64/config.h @@ -15,7 +15,6 @@ */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/yandrstudio/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h index faa7f82141..9512986977 100644 --- a/keyboards/yandrstudio/nz67v2/config.h +++ b/keyboards/yandrstudio/nz67v2/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h index b2431df36c..3ace278dc9 100644 --- a/keyboards/yandrstudio/tg67/config.h +++ b/keyboards/yandrstudio/tg67/config.h @@ -15,7 +15,6 @@ */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/yandrstudio/yr6095/config.h b/keyboards/yandrstudio/yr6095/config.h index 1e51826d94..686eae0118 100644 --- a/keyboards/yandrstudio/yr6095/config.h +++ b/keyboards/yandrstudio/yr6095/config.h @@ -15,7 +15,6 @@ */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/yandrstudio/yr80/config.h b/keyboards/yandrstudio/yr80/config.h index ced858fafd..b5f122fdc8 100644 --- a/keyboards/yandrstudio/yr80/config.h +++ b/keyboards/yandrstudio/yr80/config.h @@ -15,7 +15,6 @@ */ #pragma once -#include "config_common.h" #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/yandrstudio/zhou65/config.h b/keyboards/yandrstudio/zhou65/config.h index 23638206f7..0fa89e6325 100644 --- a/keyboards/yandrstudio/zhou65/config.h +++ b/keyboards/yandrstudio/zhou65/config.h @@ -15,7 +15,6 @@ */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 -- cgit v1.2.3 From ebb512db827e84619e7151fcf76e3daf9328fe59 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 4 Feb 2023 06:19:58 +1100 Subject: Debounce defines cleanup (#19742) * Clean up `DEBOUNCE` in config.h, 0-9 * Clean up `DEBOUNCE` in config.h, A * Clean up `DEBOUNCE` in config.h, B * Clean up `DEBOUNCE` in config.h, C * Clean up `DEBOUNCE` in config.h, D * Clean up `DEBOUNCE` in config.h, E * Clean up `DEBOUNCE` in config.h, F * Clean up `DEBOUNCE` in config.h, G * Clean up `DEBOUNCE` in config.h, H * Clean up `DEBOUNCE` in config.h, handwired * Clean up `DEBOUNCE` in config.h, I * Clean up `DEBOUNCE` in config.h, J * Clean up `DEBOUNCE` in config.h, K * Clean up `DEBOUNCE` in config.h, L * Clean up `DEBOUNCE` in config.h, M * Clean up `DEBOUNCE` in config.h, N * Clean up `DEBOUNCE` in config.h, O * Clean up `DEBOUNCE` in config.h, P * Clean up `DEBOUNCE` in config.h, Q * Clean up `DEBOUNCE` in config.h, R * Clean up `DEBOUNCE` in config.h, S * Clean up `DEBOUNCE` in config.h, T * Clean up `DEBOUNCE` in config.h, U * Clean up `DEBOUNCE` in config.h, V * Clean up `DEBOUNCE` in config.h, W * Clean up `DEBOUNCE` in config.h, X * Clean up `DEBOUNCE` in config.h, Y * Clean up `DEBOUNCE` in config.h, Z * Remove default debounce from info.json * Migrate non-default debounce to info.json --- keyboards/yandrstudio/buff67v3/config.h | 3 --- keyboards/yandrstudio/eau_r2/config.h | 3 --- keyboards/yandrstudio/eau_r2/info.json | 1 + keyboards/yandrstudio/nz64/config.h | 4 ---- keyboards/yandrstudio/nz67v2/config.h | 3 --- keyboards/yandrstudio/tg67/config.h | 3 --- keyboards/yandrstudio/zhou65/config.h | 3 --- 7 files changed, 1 insertion(+), 19 deletions(-) (limited to 'keyboards/yandrstudio') diff --git a/keyboards/yandrstudio/buff67v3/config.h b/keyboards/yandrstudio/buff67v3/config.h index d4e46e68f0..dcacb3c52e 100644 --- a/keyboards/yandrstudio/buff67v3/config.h +++ b/keyboards/yandrstudio/buff67v3/config.h @@ -27,9 +27,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN B4 diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h index 33e88a33b8..aa6ae708c6 100644 --- a/keyboards/yandrstudio/eau_r2/config.h +++ b/keyboards/yandrstudio/eau_r2/config.h @@ -25,9 +25,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 8 - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN A8 diff --git a/keyboards/yandrstudio/eau_r2/info.json b/keyboards/yandrstudio/eau_r2/info.json index cf289b3b26..74f5dd6e86 100644 --- a/keyboards/yandrstudio/eau_r2/info.json +++ b/keyboards/yandrstudio/eau_r2/info.json @@ -6,6 +6,7 @@ "pid": "0xAACD", "device_version": "1.0.0" }, + "debounce": 8, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yandrstudio/nz64/config.h b/keyboards/yandrstudio/nz64/config.h index 86aab7e7d5..f64943aad3 100644 --- a/keyboards/yandrstudio/nz64/config.h +++ b/keyboards/yandrstudio/nz64/config.h @@ -28,10 +28,6 @@ /* Fix VIA RGB_light */ #define VIA_HAS_BROKEN_KEYCODES -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - - /* RGB Matrix */ #ifdef RGB_MATRIX_ENABLE # define RGB_DI_PIN A7 diff --git a/keyboards/yandrstudio/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h index 9512986977..34136b5838 100644 --- a/keyboards/yandrstudio/nz67v2/config.h +++ b/keyboards/yandrstudio/nz67v2/config.h @@ -30,9 +30,6 @@ #define TAP_CODE_DELAY 15 -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #ifdef ENCODER_ENABLE # define ENCODERS_PAD_A { A9 } diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h index 3ace278dc9..33c472d6b9 100644 --- a/keyboards/yandrstudio/tg67/config.h +++ b/keyboards/yandrstudio/tg67/config.h @@ -26,9 +26,6 @@ #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 } -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* RGB Matrix */ #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/yandrstudio/zhou65/config.h b/keyboards/yandrstudio/zhou65/config.h index 0fa89e6325..b4da724d11 100644 --- a/keyboards/yandrstudio/zhou65/config.h +++ b/keyboards/yandrstudio/zhou65/config.h @@ -32,6 +32,3 @@ /* enable the nkro when using the VIA. */ #define FORCE_NKRO - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 -- cgit v1.2.3 From f9aeea64c1f85d388485503e52035b5f7533ed26 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 8 Feb 2023 18:41:46 +1100 Subject: Migrate `MCU` and `BOOTLOADER` to data-driven (#19529) --- keyboards/yandrstudio/nz64/info.json | 2 ++ keyboards/yandrstudio/nz64/rules.mk | 7 ------- keyboards/yandrstudio/zhou65/info.json | 2 ++ keyboards/yandrstudio/zhou65/rules.mk | 7 ------- 4 files changed, 4 insertions(+), 14 deletions(-) (limited to 'keyboards/yandrstudio') diff --git a/keyboards/yandrstudio/nz64/info.json b/keyboards/yandrstudio/nz64/info.json index 3275ac6f6e..6e174509db 100644 --- a/keyboards/yandrstudio/nz64/info.json +++ b/keyboards/yandrstudio/nz64/info.json @@ -5,6 +5,8 @@ "pid": "0xAAAF", "device_version": "1.0.0" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}] diff --git a/keyboards/yandrstudio/nz64/rules.mk b/keyboards/yandrstudio/nz64/rules.mk index 8debea0e66..302cf375a3 100644 --- a/keyboards/yandrstudio/nz64/rules.mk +++ b/keyboards/yandrstudio/nz64/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/yandrstudio/zhou65/info.json b/keyboards/yandrstudio/zhou65/info.json index 26fc92799a..e0fee4588e 100644 --- a/keyboards/yandrstudio/zhou65/info.json +++ b/keyboards/yandrstudio/zhou65/info.json @@ -5,6 +5,8 @@ "pid": "0xAAAD", "device_version": "1.0.0" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/yandrstudio/zhou65/rules.mk b/keyboards/yandrstudio/zhou65/rules.mk index 0a84b0a1fe..3b6a1809db 100644 --- a/keyboards/yandrstudio/zhou65/rules.mk +++ b/keyboards/yandrstudio/zhou65/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # -- cgit v1.2.3 From c67285587c812a3dffb20113c8a270b596156d0e Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 9 Feb 2023 14:34:21 +1100 Subject: Fix errors flagged by generate-api (#19784) --- keyboards/yandrstudio/nz64/info.json | 1 - keyboards/yandrstudio/zhou65/info.json | 1 - 2 files changed, 2 deletions(-) (limited to 'keyboards/yandrstudio') diff --git a/keyboards/yandrstudio/nz64/info.json b/keyboards/yandrstudio/nz64/info.json index 6e174509db..5aa0c2ae68 100644 --- a/keyboards/yandrstudio/nz64/info.json +++ b/keyboards/yandrstudio/nz64/info.json @@ -1,6 +1,5 @@ { "keyboard_name": "nz64", - "processor": "STM32F401", "usb": { "pid": "0xAAAF", "device_version": "1.0.0" diff --git a/keyboards/yandrstudio/zhou65/info.json b/keyboards/yandrstudio/zhou65/info.json index e0fee4588e..313a0dd3b3 100644 --- a/keyboards/yandrstudio/zhou65/info.json +++ b/keyboards/yandrstudio/zhou65/info.json @@ -1,6 +1,5 @@ { "keyboard_name": "zhou65", - "processor": "STM32F401", "usb": { "pid": "0xAAAD", "device_version": "1.0.0" -- cgit v1.2.3 From f4ba17c4a0ee59603c167b04f2d6f6eee8b2cf1b Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 13:14:29 +1100 Subject: Move LED indicator config to data driven (#19800) --- keyboards/yandrstudio/zhou65/config.h | 3 --- keyboards/yandrstudio/zhou65/info.json | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'keyboards/yandrstudio') diff --git a/keyboards/yandrstudio/zhou65/config.h b/keyboards/yandrstudio/zhou65/config.h index b4da724d11..3c205e2570 100644 --- a/keyboards/yandrstudio/zhou65/config.h +++ b/keyboards/yandrstudio/zhou65/config.h @@ -27,8 +27,5 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL -#define LED_CAPS_LOCK_PIN A15 -#define LED_PIN_ON_STATE 0 - /* 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 313a0dd3b3..d3c36ca852 100644 --- a/keyboards/yandrstudio/zhou65/info.json +++ b/keyboards/yandrstudio/zhou65/info.json @@ -4,6 +4,10 @@ "pid": "0xAAAD", "device_version": "1.0.0" }, + "indicators": { + "caps_lock": "A15", + "on_state": 0 + }, "processor": "STM32F401", "bootloader": "stm32-dfu", "layouts": { -- cgit v1.2.3 From 2da0827d4ffbcba161126d6001f370e97d0172a8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 16:08:25 +1100 Subject: Remove matrix size defines (#19581) --- keyboards/yandrstudio/buff67v3/config.h | 4 ---- keyboards/yandrstudio/eau87/config.h | 4 ---- keyboards/yandrstudio/eau_r2/config.h | 4 ---- keyboards/yandrstudio/nightstar75/config.h | 4 ---- keyboards/yandrstudio/nz64/config.h | 3 --- keyboards/yandrstudio/nz67v2/config.h | 4 ---- keyboards/yandrstudio/tg67/config.h | 4 ---- keyboards/yandrstudio/yr6095/config.h | 4 ---- keyboards/yandrstudio/zhou65/config.h | 4 ---- 9 files changed, 35 deletions(-) (limited to 'keyboards/yandrstudio') diff --git a/keyboards/yandrstudio/buff67v3/config.h b/keyboards/yandrstudio/buff67v3/config.h index dcacb3c52e..fe7045efad 100644 --- a/keyboards/yandrstudio/buff67v3/config.h +++ b/keyboards/yandrstudio/buff67v3/config.h @@ -16,10 +16,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 - /* 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 } diff --git a/keyboards/yandrstudio/eau87/config.h b/keyboards/yandrstudio/eau87/config.h index 9d34fe51c6..328e3e3852 100644 --- a/keyboards/yandrstudio/eau87/config.h +++ b/keyboards/yandrstudio/eau87/config.h @@ -15,10 +15,6 @@ */ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 17 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h index aa6ae708c6..d1405b2bbf 100644 --- a/keyboards/yandrstudio/eau_r2/config.h +++ b/keyboards/yandrstudio/eau_r2/config.h @@ -15,10 +15,6 @@ */ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 17 - #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 } diff --git a/keyboards/yandrstudio/nightstar75/config.h b/keyboards/yandrstudio/nightstar75/config.h index 10b69c89ff..79f37b9bde 100644 --- a/keyboards/yandrstudio/nightstar75/config.h +++ b/keyboards/yandrstudio/nightstar75/config.h @@ -15,10 +15,6 @@ */ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 15 - #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 } diff --git a/keyboards/yandrstudio/nz64/config.h b/keyboards/yandrstudio/nz64/config.h index f64943aad3..06de2f5680 100644 --- a/keyboards/yandrstudio/nz64/config.h +++ b/keyboards/yandrstudio/nz64/config.h @@ -16,9 +16,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 #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 } diff --git a/keyboards/yandrstudio/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h index 34136b5838..5e36cf0b6b 100644 --- a/keyboards/yandrstudio/nz67v2/config.h +++ b/keyboards/yandrstudio/nz67v2/config.h @@ -17,10 +17,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 - /* 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 } diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h index 33c472d6b9..d52452e0a2 100644 --- a/keyboards/yandrstudio/tg67/config.h +++ b/keyboards/yandrstudio/tg67/config.h @@ -16,10 +16,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/yandrstudio/yr6095/config.h b/keyboards/yandrstudio/yr6095/config.h index 686eae0118..ec02b66c19 100644 --- a/keyboards/yandrstudio/yr6095/config.h +++ b/keyboards/yandrstudio/yr6095/config.h @@ -16,10 +16,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 - #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 } diff --git a/keyboards/yandrstudio/zhou65/config.h b/keyboards/yandrstudio/zhou65/config.h index 3c205e2570..2fa940c63a 100644 --- a/keyboards/yandrstudio/zhou65/config.h +++ b/keyboards/yandrstudio/zhou65/config.h @@ -16,10 +16,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 - /* 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 } -- cgit v1.2.3 From 0152dd811dad101d5764f66476fa842170b86695 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 19 Feb 2023 07:59:50 +0000 Subject: Move `KC_MISSION_CONTROL`/`KC_LAUNCHPAD` keycodes to core (#19884) --- keyboards/yandrstudio/wave75/wave75.c | 14 -------------- keyboards/yandrstudio/wave75/wave75.h | 6 ------ keyboards/yandrstudio/yr6095/yr6095.c | 14 -------------- keyboards/yandrstudio/yr6095/yr6095.h | 6 ------ keyboards/yandrstudio/yr80/yr80.c | 14 -------------- keyboards/yandrstudio/yr80/yr80.h | 6 ------ 6 files changed, 60 deletions(-) (limited to 'keyboards/yandrstudio') diff --git a/keyboards/yandrstudio/wave75/wave75.c b/keyboards/yandrstudio/wave75/wave75.c index cc58a1d43e..4e0d748c23 100644 --- a/keyboards/yandrstudio/wave75/wave75.c +++ b/keyboards/yandrstudio/wave75/wave75.c @@ -28,20 +28,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { process_magic(CG_TOGG, record); } return false; - case KC_MCTL: - if (record->event.pressed) { - host_consumer_send(0x29F); - } else { - host_consumer_send(0); - } - return false; - case KC_LPAD: - if (record->event.pressed) { - host_consumer_send(0x2A0); - } else { - host_consumer_send(0); - } - return false; default: return true; } diff --git a/keyboards/yandrstudio/wave75/wave75.h b/keyboards/yandrstudio/wave75/wave75.h index f0d041241a..209a044466 100644 --- a/keyboards/yandrstudio/wave75/wave75.h +++ b/keyboards/yandrstudio/wave75/wave75.h @@ -37,19 +37,13 @@ enum keyboard_keycodes { #ifdef VIA_ENABLE LOCK_GUI = USER00, TOG_MACOS_KEYMAP, - KC_MISSION_CONTROL, - KC_LAUNCHPAD, NEW_SAFE_RANGE = SAFE_RANGE // Important! #else LOCK_GUI = SAFE_RANGE, TOG_MACOS_KEYMAP, - KC_MISSION_CONTROL, - KC_LAUNCHPAD, NEW_SAFE_RANGE // Important! #endif }; #define KC_LG LOCK_GUI #define KC_MACOS TOG_MACOS_KEYMAP -#define KC_MCTL KC_MISSION_CONTROL -#define KC_LPAD KC_LAUNCHPAD diff --git a/keyboards/yandrstudio/yr6095/yr6095.c b/keyboards/yandrstudio/yr6095/yr6095.c index c0a2c94cc2..3ce43eb297 100644 --- a/keyboards/yandrstudio/yr6095/yr6095.c +++ b/keyboards/yandrstudio/yr6095/yr6095.c @@ -57,20 +57,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { process_magic(CG_TOGG, record); } return false; - case KC_MCTL: - if (record->event.pressed) { - host_consumer_send(0x29F); - } else { - host_consumer_send(0); - } - return false; - case KC_LPAD: - if (record->event.pressed) { - host_consumer_send(0x2A0); - } else { - host_consumer_send(0); - } - return false; default: return true; } diff --git a/keyboards/yandrstudio/yr6095/yr6095.h b/keyboards/yandrstudio/yr6095/yr6095.h index 37b4412aaa..f21ee93634 100644 --- a/keyboards/yandrstudio/yr6095/yr6095.h +++ b/keyboards/yandrstudio/yr6095/yr6095.h @@ -62,19 +62,13 @@ enum keyboard_keycodes { #ifdef VIA_ENABLE LOCK_GUI = USER00, TOG_MACOS_KEYMAP, - KC_MISSION_CONTROL, - KC_LAUNCHPAD, NEW_SAFE_RANGE = SAFE_RANGE // Important! #else LOCK_GUI = SAFE_RANGE, TOG_MACOS_KEYMAP, - KC_MISSION_CONTROL, - KC_LAUNCHPAD, NEW_SAFE_RANGE // Important! #endif }; #define KC_LG LOCK_GUI #define KC_MACOS TOG_MACOS_KEYMAP -#define KC_MCTL KC_MISSION_CONTROL -#define KC_LPAD KC_LAUNCHPAD diff --git a/keyboards/yandrstudio/yr80/yr80.c b/keyboards/yandrstudio/yr80/yr80.c index 16415bf9ab..0228545e8c 100644 --- a/keyboards/yandrstudio/yr80/yr80.c +++ b/keyboards/yandrstudio/yr80/yr80.c @@ -52,20 +52,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { process_magic(CG_TOGG, record); } return false; - case KC_MCTL: - if (record->event.pressed) { - host_consumer_send(0x29F); - } else { - host_consumer_send(0); - } - return false; - case KC_LPAD: - if (record->event.pressed) { - host_consumer_send(0x2A0); - } else { - host_consumer_send(0); - } - return false; default: return true; } diff --git a/keyboards/yandrstudio/yr80/yr80.h b/keyboards/yandrstudio/yr80/yr80.h index 11cec853c3..c5289696f8 100644 --- a/keyboards/yandrstudio/yr80/yr80.h +++ b/keyboards/yandrstudio/yr80/yr80.h @@ -38,19 +38,13 @@ enum keyboard_keycodes { #ifdef VIA_ENABLE LOCK_GUI = USER00, TOG_MACOS_KEYMAP, - KC_MISSION_CONTROL, - KC_LAUNCHPAD, NEW_SAFE_RANGE = SAFE_RANGE // Important! #else LOCK_GUI = SAFE_RANGE, TOG_MACOS_KEYMAP, - KC_MISSION_CONTROL, - KC_LAUNCHPAD, NEW_SAFE_RANGE // Important! #endif }; #define KC_LG LOCK_GUI #define KC_MACOS TOG_MACOS_KEYMAP -#define KC_MCTL KC_MISSION_CONTROL -#define KC_LPAD KC_LAUNCHPAD -- cgit v1.2.3 From 0512e286a6aabe8645ed980abec82790a1f881cd Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 22 Feb 2023 01:15:18 +0000 Subject: Remove magic bodges from via keymaps (#19890) --- keyboards/yandrstudio/buff67v3/buff67v3.c | 12 ------------ keyboards/yandrstudio/buff67v3/buff67v3.h | 10 ---------- keyboards/yandrstudio/nz64/nz64.c | 3 --- keyboards/yandrstudio/nz64/nz64.h | 2 -- keyboards/yandrstudio/nz67v2/nz67v2.c | 3 --- keyboards/yandrstudio/nz67v2/nz67v2.h | 2 -- keyboards/yandrstudio/wave75/wave75.c | 19 ------------------- keyboards/yandrstudio/wave75/wave75.h | 15 --------------- keyboards/yandrstudio/yr6095/yr6095.c | 19 ------------------- keyboards/yandrstudio/yr6095/yr6095.h | 15 --------------- keyboards/yandrstudio/yr80/yr80.c | 20 -------------------- keyboards/yandrstudio/yr80/yr80.h | 15 --------------- 12 files changed, 135 deletions(-) (limited to 'keyboards/yandrstudio') diff --git a/keyboards/yandrstudio/buff67v3/buff67v3.c b/keyboards/yandrstudio/buff67v3/buff67v3.c index 62a74c82bb..5ba95efbcc 100644 --- a/keyboards/yandrstudio/buff67v3/buff67v3.c +++ b/keyboards/yandrstudio/buff67v3/buff67v3.c @@ -41,18 +41,6 @@ void keyboard_post_init_kb(void) { #endif -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - if (!process_record_user(keycode, record)) { return false; } - switch(keycode) { - case LOCK_GUI: - process_magic(GUI_TOG, record); - return false; - default: - break; - } - return true; -} - void board_init(void) { AFIO->MAPR |= AFIO_MAPR_TIM3_REMAP_PARTIALREMAP; } diff --git a/keyboards/yandrstudio/buff67v3/buff67v3.h b/keyboards/yandrstudio/buff67v3/buff67v3.h index dc6f334a58..64970d3863 100644 --- a/keyboards/yandrstudio/buff67v3/buff67v3.h +++ b/keyboards/yandrstudio/buff67v3/buff67v3.h @@ -30,13 +30,3 @@ { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, KC_NO, K312, K313, K314 }, \ { K400, K401, K402, KC_NO, KC_NO, K405, KC_NO, KC_NO, KC_NO, K409, K410, KC_NO, K412, K413, K414 } \ } - -enum keyboard_keycodes { -#ifdef VIA_ENABLE - LOCK_GUI = USER00, - NEW_SAFE_RANGE = SAFE_RANGE // Important! -#else - LOCK_GUI = SAFE_RANGE, - NEW_SAFE_RANGE // Important! -#endif -}; diff --git a/keyboards/yandrstudio/nz64/nz64.c b/keyboards/yandrstudio/nz64/nz64.c index f1777ccae3..b5a53273df 100644 --- a/keyboards/yandrstudio/nz64/nz64.c +++ b/keyboards/yandrstudio/nz64/nz64.c @@ -103,9 +103,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { eeconfig_update_kb(kb_cums.raw); return false; #endif - case LOCK_GUI: - process_magic(GUI_TOG, record); - return false; default: return true; } diff --git a/keyboards/yandrstudio/nz64/nz64.h b/keyboards/yandrstudio/nz64/nz64.h index fd28481d55..41b2a056c5 100644 --- a/keyboards/yandrstudio/nz64/nz64.h +++ b/keyboards/yandrstudio/nz64/nz64.h @@ -36,5 +36,3 @@ #else #define URGB_K KC_TRNS #endif - -#define LOCK_GUI KC_F23 diff --git a/keyboards/yandrstudio/nz67v2/nz67v2.c b/keyboards/yandrstudio/nz67v2/nz67v2.c index 64e287b868..346556c25e 100644 --- a/keyboards/yandrstudio/nz67v2/nz67v2.c +++ b/keyboards/yandrstudio/nz67v2/nz67v2.c @@ -108,9 +108,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { eeconfig_update_kb(kb_cums.raw); return false; #endif - case LOCK_GUI: - process_magic(GUI_TOG, record); - return false; default: break; } diff --git a/keyboards/yandrstudio/nz67v2/nz67v2.h b/keyboards/yandrstudio/nz67v2/nz67v2.h index af66280132..f538c624d9 100644 --- a/keyboards/yandrstudio/nz67v2/nz67v2.h +++ b/keyboards/yandrstudio/nz67v2/nz67v2.h @@ -85,5 +85,3 @@ #else # define URGB_K KC_TRNS #endif - -#define LOCK_GUI KC_F23 diff --git a/keyboards/yandrstudio/wave75/wave75.c b/keyboards/yandrstudio/wave75/wave75.c index 4e0d748c23..56ffa33ade 100644 --- a/keyboards/yandrstudio/wave75/wave75.c +++ b/keyboards/yandrstudio/wave75/wave75.c @@ -14,22 +14,3 @@ * along with this program. If not, see . */ #include "wave75.h" - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - if (!process_record_user(keycode, record)) { return false; } - switch(keycode) { - case KC_LG: - if (record->event.pressed) { - process_magic(GUI_TOG, record); - } - return false; - case KC_MACOS: - if (record->event.pressed) { - process_magic(CG_TOGG, record); - } - return false; - default: - return true; - } - return true; -} diff --git a/keyboards/yandrstudio/wave75/wave75.h b/keyboards/yandrstudio/wave75/wave75.h index 209a044466..e3b2f19f42 100644 --- a/keyboards/yandrstudio/wave75/wave75.h +++ b/keyboards/yandrstudio/wave75/wave75.h @@ -32,18 +32,3 @@ { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, KC_NO }, \ { K500, K501, K502, KC_NO, KC_NO, KC_NO, K506, KC_NO, KC_NO, K509, K510, KC_NO, K512, K513, K514 } \ } - -enum keyboard_keycodes { -#ifdef VIA_ENABLE - LOCK_GUI = USER00, - TOG_MACOS_KEYMAP, - NEW_SAFE_RANGE = SAFE_RANGE // Important! -#else - LOCK_GUI = SAFE_RANGE, - TOG_MACOS_KEYMAP, - NEW_SAFE_RANGE // Important! -#endif -}; - -#define KC_LG LOCK_GUI -#define KC_MACOS TOG_MACOS_KEYMAP diff --git a/keyboards/yandrstudio/yr6095/yr6095.c b/keyboards/yandrstudio/yr6095/yr6095.c index 3ce43eb297..b4168279a7 100644 --- a/keyboards/yandrstudio/yr6095/yr6095.c +++ b/keyboards/yandrstudio/yr6095/yr6095.c @@ -43,22 +43,3 @@ void keyboard_post_init_kb(void) { } #endif - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - if (!process_record_user(keycode, record)) { return false; } - switch(keycode) { - case KC_LG: - if (record->event.pressed) { - process_magic(GUI_TOG, record); - } - return false; - case KC_MACOS: - if (record->event.pressed) { - process_magic(CG_TOGG, record); - } - return false; - default: - return true; - } - return true; -} diff --git a/keyboards/yandrstudio/yr6095/yr6095.h b/keyboards/yandrstudio/yr6095/yr6095.h index f21ee93634..f09b65bdfa 100644 --- a/keyboards/yandrstudio/yr6095/yr6095.h +++ b/keyboards/yandrstudio/yr6095/yr6095.h @@ -57,18 +57,3 @@ { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \ { K400, K401, K402, K403, K404, K405, KC_NO, K407, K408, K409, K410, K411, K412, K413 } \ } - -enum keyboard_keycodes { -#ifdef VIA_ENABLE - LOCK_GUI = USER00, - TOG_MACOS_KEYMAP, - NEW_SAFE_RANGE = SAFE_RANGE // Important! -#else - LOCK_GUI = SAFE_RANGE, - TOG_MACOS_KEYMAP, - NEW_SAFE_RANGE // Important! -#endif -}; - -#define KC_LG LOCK_GUI -#define KC_MACOS TOG_MACOS_KEYMAP diff --git a/keyboards/yandrstudio/yr80/yr80.c b/keyboards/yandrstudio/yr80/yr80.c index 0228545e8c..2752dc9230 100644 --- a/keyboards/yandrstudio/yr80/yr80.c +++ b/keyboards/yandrstudio/yr80/yr80.c @@ -37,23 +37,3 @@ void keyboard_post_init_kb(void) { } #endif - - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - if (!process_record_user(keycode, record)) { return false; } - switch(keycode) { - case KC_LG: - if (record->event.pressed) { - process_magic(GUI_TOG, record); - } - return false; - case KC_MACOS: - if (record->event.pressed) { - process_magic(CG_TOGG, record); - } - return false; - default: - return true; - } - return true; -} diff --git a/keyboards/yandrstudio/yr80/yr80.h b/keyboards/yandrstudio/yr80/yr80.h index c5289696f8..79cbfca91b 100644 --- a/keyboards/yandrstudio/yr80/yr80.h +++ b/keyboards/yandrstudio/yr80/yr80.h @@ -33,18 +33,3 @@ { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO, KC_NO, KC_NO, K416 }, \ { K500, K501, K502, KC_NO, KC_NO, KC_NO, K506, K507, K508, K509, K510, KC_NO, KC_NO, KC_NO, K514, K515, K516 } \ } - -enum keyboard_keycodes { -#ifdef VIA_ENABLE - LOCK_GUI = USER00, - TOG_MACOS_KEYMAP, - NEW_SAFE_RANGE = SAFE_RANGE // Important! -#else - LOCK_GUI = SAFE_RANGE, - TOG_MACOS_KEYMAP, - NEW_SAFE_RANGE // Important! -#endif -}; - -#define KC_LG LOCK_GUI -#define KC_MACOS TOG_MACOS_KEYMAP -- cgit v1.2.3 From e719f5e2944b13588277eeefe460f6e21091c6fb Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Thu, 23 Feb 2023 07:46:15 -0700 Subject: Open Use standard magic keycodes in yandrstudio keymaps (#19919) --- keyboards/yandrstudio/buff67v3/keymaps/default/keymap.c | 2 +- keyboards/yandrstudio/buff67v3/keymaps/via/keymap.c | 2 +- keyboards/yandrstudio/nz64/keymaps/default/keymap.c | 2 +- keyboards/yandrstudio/nz64/keymaps/via/keymap.c | 2 +- keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c | 2 +- keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c | 2 +- keyboards/yandrstudio/wave75/keymaps/default/keymap.c | 4 ++-- keyboards/yandrstudio/wave75/keymaps/via/keymap.c | 4 ++-- keyboards/yandrstudio/yr6095/keymaps/default/keymap.c | 4 ++-- keyboards/yandrstudio/yr6095/keymaps/via/keymap.c | 4 ++-- 10 files changed, 14 insertions(+), 14 deletions(-) (limited to 'keyboards/yandrstudio') diff --git a/keyboards/yandrstudio/buff67v3/keymaps/default/keymap.c b/keyboards/yandrstudio/buff67v3/keymaps/default/keymap.c index 3ca660e9e0..276c073889 100644 --- a/keyboards/yandrstudio/buff67v3/keymaps/default/keymap.c +++ b/keyboards/yandrstudio/buff67v3/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, LOCK_GUI,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/yandrstudio/buff67v3/keymaps/via/keymap.c b/keyboards/yandrstudio/buff67v3/keymaps/via/keymap.c index d88884740e..7ee3017117 100644 --- a/keyboards/yandrstudio/buff67v3/keymaps/via/keymap.c +++ b/keyboards/yandrstudio/buff67v3/keymaps/via/keymap.c @@ -27,7 +27,7 @@ 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, LOCK_GUI,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + KC_TRNS, GUI_TOG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/yandrstudio/nz64/keymaps/default/keymap.c b/keyboards/yandrstudio/nz64/keymaps/default/keymap.c index 9d722b6f22..3ecbcf8362 100644 --- a/keyboards/yandrstudio/nz64/keymaps/default/keymap.c +++ b/keyboards/yandrstudio/nz64/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_GRV , KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, LOCK_GUI, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/yandrstudio/nz64/keymaps/via/keymap.c b/keyboards/yandrstudio/nz64/keymaps/via/keymap.c index f6f8bb4ed6..284a06cacd 100644 --- a/keyboards/yandrstudio/nz64/keymaps/via/keymap.c +++ b/keyboards/yandrstudio/nz64/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_GRV , KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, LOCK_GUI, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT( diff --git a/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c b/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c index 69bf3e8898..7ed06c9ec5 100644 --- a/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c +++ b/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, LOCK_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c b/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c index 93b3027c7a..3da37b5315 100644 --- a/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c +++ b/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, LOCK_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT_all( diff --git a/keyboards/yandrstudio/wave75/keymaps/default/keymap.c b/keyboards/yandrstudio/wave75/keymaps/default/keymap.c index a4e4bc286d..d9201d06cf 100644 --- a/keyboards/yandrstudio/wave75/keymaps/default/keymap.c +++ b/keyboards/yandrstudio/wave75/keymaps/default/keymap.c @@ -29,6 +29,6 @@ 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MACOS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_LG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/yandrstudio/wave75/keymaps/via/keymap.c b/keyboards/yandrstudio/wave75/keymaps/via/keymap.c index 38eb0515e0..47b133af1e 100644 --- a/keyboards/yandrstudio/wave75/keymaps/via/keymap.c +++ b/keyboards/yandrstudio/wave75/keymaps/via/keymap.c @@ -29,8 +29,8 @@ 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MACOS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_LG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c b/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c index 194e85d719..3347731f2b 100644 --- a/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c +++ b/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c @@ -26,6 +26,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV , KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, KC_MACOS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_LG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) + KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, CG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c b/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c index 4287097f97..7bb2ef6265 100644 --- a/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c +++ b/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c @@ -26,8 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV , KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, KC_MACOS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_LG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, CG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -- cgit v1.2.3 From 7e0299117b389b1c7fcdfa2f20891ba2287ea771 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 26 Feb 2023 09:45:12 +1100 Subject: Move encoder config to data driven (#19923) Co-authored-by: Nick Brassel --- keyboards/yandrstudio/nz67v2/config.h | 7 ------- keyboards/yandrstudio/nz67v2/info.json | 5 +++++ 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'keyboards/yandrstudio') diff --git a/keyboards/yandrstudio/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h index 5e36cf0b6b..a3d9bb74c5 100644 --- a/keyboards/yandrstudio/nz67v2/config.h +++ b/keyboards/yandrstudio/nz67v2/config.h @@ -26,13 +26,6 @@ #define TAP_CODE_DELAY 15 -#ifdef ENCODER_ENABLE - -# define ENCODERS_PAD_A { A9 } -# define ENCODERS_PAD_B { A10 } - -#endif - /* RGB Matrix */ #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/yandrstudio/nz67v2/info.json b/keyboards/yandrstudio/nz67v2/info.json index 033b05a3cb..ed06374976 100644 --- a/keyboards/yandrstudio/nz67v2/info.json +++ b/keyboards/yandrstudio/nz67v2/info.json @@ -6,6 +6,11 @@ "pid": "0xAA83", "device_version": "1.0.0" }, + "encoder": { + "rotary": [ + {"pin_a": "A9", "pin_b": "A10"} + ] + }, "layouts": { "LAYOUT_all": { "layout": [ -- cgit v1.2.3