diff options
Diffstat (limited to 'keyboards/yandrstudio')
-rw-r--r-- | keyboards/yandrstudio/buff67v3/config.h | 4 | ||||
-rw-r--r-- | keyboards/yandrstudio/eau87/config.h | 1 | ||||
-rw-r--r-- | keyboards/yandrstudio/eau_r2/config.h | 4 | ||||
-rw-r--r-- | keyboards/yandrstudio/eau_r2/info.json | 1 | ||||
-rw-r--r-- | keyboards/yandrstudio/nightstar75/config.h | 1 | ||||
-rw-r--r-- | keyboards/yandrstudio/nz64/config.h | 5 | ||||
-rw-r--r-- | keyboards/yandrstudio/nz64/info.json | 3 | ||||
-rw-r--r-- | keyboards/yandrstudio/nz64/rules.mk | 7 | ||||
-rw-r--r-- | keyboards/yandrstudio/nz67v2/config.h | 4 | ||||
-rw-r--r-- | keyboards/yandrstudio/tg67/config.h | 4 | ||||
-rw-r--r-- | keyboards/yandrstudio/yr6095/config.h | 1 | ||||
-rw-r--r-- | keyboards/yandrstudio/yr80/config.h | 1 | ||||
-rw-r--r-- | keyboards/yandrstudio/zhou65/config.h | 4 | ||||
-rw-r--r-- | keyboards/yandrstudio/zhou65/info.json | 3 | ||||
-rw-r--r-- | keyboards/yandrstudio/zhou65/rules.mk | 7 |
15 files changed, 5 insertions, 45 deletions
diff --git a/keyboards/yandrstudio/buff67v3/config.h b/keyboards/yandrstudio/buff67v3/config.h index 0e7392f0e6..dcacb3c52e 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 @@ -28,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/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 <http://www.gnu.org/licenses/>. */ #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..aa6ae708c6 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 <http://www.gnu.org/licenses/>. */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 6 @@ -26,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/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 <http://www.gnu.org/licenses/>. */ #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..f64943aad3 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 @@ -29,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/nz64/info.json b/keyboards/yandrstudio/nz64/info.json index 3275ac6f6e..5aa0c2ae68 100644 --- a/keyboards/yandrstudio/nz64/info.json +++ b/keyboards/yandrstudio/nz64/info.json @@ -1,10 +1,11 @@ { "keyboard_name": "nz64", - "processor": "STM32F401", "usb": { "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/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h index faa7f82141..34136b5838 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 @@ -31,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 b2431df36c..33c472d6b9 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 @@ -27,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/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..b4da724d11 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 @@ -33,6 +32,3 @@ /* enable the nkro when using the VIA. */ #define FORCE_NKRO - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 diff --git a/keyboards/yandrstudio/zhou65/info.json b/keyboards/yandrstudio/zhou65/info.json index 26fc92799a..313a0dd3b3 100644 --- a/keyboards/yandrstudio/zhou65/info.json +++ b/keyboards/yandrstudio/zhou65/info.json @@ -1,10 +1,11 @@ { "keyboard_name": "zhou65", - "processor": "STM32F401", "usb": { "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 # |