diff options
Diffstat (limited to 'keyboards/mwstudio')
-rw-r--r-- | keyboards/mwstudio/alicekk/config.h | 7 | ||||
-rw-r--r-- | keyboards/mwstudio/alicekk/info.json | 4 | ||||
-rw-r--r-- | keyboards/mwstudio/alicekk/rules.mk | 6 | ||||
-rw-r--r-- | keyboards/mwstudio/mw65_black/config.h | 7 | ||||
-rw-r--r-- | keyboards/mwstudio/mw65_black/info.json | 2 | ||||
-rw-r--r-- | keyboards/mwstudio/mw65_black/rules.mk | 6 | ||||
-rw-r--r-- | keyboards/mwstudio/mw65_rgb/config.h | 7 | ||||
-rw-r--r-- | keyboards/mwstudio/mw65_rgb/info.json | 2 | ||||
-rw-r--r-- | keyboards/mwstudio/mw65_rgb/rules.mk | 6 | ||||
-rw-r--r-- | keyboards/mwstudio/mw660/config.h | 4 | ||||
-rw-r--r-- | keyboards/mwstudio/mw75/config.h | 4 | ||||
-rw-r--r-- | keyboards/mwstudio/mw75/info.json | 2 | ||||
-rw-r--r-- | keyboards/mwstudio/mw75/rules.mk | 6 | ||||
-rw-r--r-- | keyboards/mwstudio/mw75r2/config.h | 7 | ||||
-rw-r--r-- | keyboards/mwstudio/mw75r2/info.json | 2 | ||||
-rw-r--r-- | keyboards/mwstudio/mw75r2/rules.mk | 6 |
16 files changed, 11 insertions, 67 deletions
diff --git a/keyboards/mwstudio/alicekk/config.h b/keyboards/mwstudio/alicekk/config.h index 9657eea13c..8b391445cc 100644 --- a/keyboards/mwstudio/alicekk/config.h +++ b/keyboards/mwstudio/alicekk/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 @@ -26,15 +25,9 @@ #define MATRIX_ROW_PINS { A3, A5, A6, A7, B0 } #define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, A4, A2, A1, B6, B5, B4, B3, A15 } -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #define FORCE_NKRO diff --git a/keyboards/mwstudio/alicekk/info.json b/keyboards/mwstudio/alicekk/info.json index 7a2f830273..a60e30be8f 100644 --- a/keyboards/mwstudio/alicekk/info.json +++ b/keyboards/mwstudio/alicekk/info.json @@ -5,5 +5,7 @@ "vid": "0x7BA1", "pid": "0x3201", "device_version": "0.0.1" - } + }, + "processor": "STM32F103", + "bootloader": "stm32duino" } diff --git a/keyboards/mwstudio/alicekk/rules.mk b/keyboards/mwstudio/alicekk/rules.mk index 3c4396fabf..f365071da0 100644 --- a/keyboards/mwstudio/alicekk/rules.mk +++ b/keyboards/mwstudio/alicekk/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/mwstudio/mw65_black/config.h b/keyboards/mwstudio/mw65_black/config.h index c7ca78706f..15a63d6fd2 100644 --- a/keyboards/mwstudio/mw65_black/config.h +++ b/keyboards/mwstudio/mw65_black/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 @@ -26,15 +25,9 @@ #define MATRIX_ROW_PINS { D4, D7, B4, B3, B6 } #define MATRIX_COL_PINS { B0, B1, B2, D0, D1, D2, D3, D5, C6, F7, F4, F6, F5, F1, F0 } -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't neede */ -#define DEBOUNCE 5 - #define RGB_DI_PIN C7 #ifdef RGB_DI_PIN #define RGBLED_NUM 21 diff --git a/keyboards/mwstudio/mw65_black/info.json b/keyboards/mwstudio/mw65_black/info.json index 05057ba8f0..9030c897f6 100644 --- a/keyboards/mwstudio/mw65_black/info.json +++ b/keyboards/mwstudio/mw65_black/info.json @@ -8,6 +8,8 @@ "pid": "0x6500", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_65_ansi_blocker" }, diff --git a/keyboards/mwstudio/mw65_black/rules.mk b/keyboards/mwstudio/mw65_black/rules.mk index ed59e99abc..6c261600bc 100644 --- a/keyboards/mwstudio/mw65_black/rules.mk +++ b/keyboards/mwstudio/mw65_black/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mwstudio/mw65_rgb/config.h b/keyboards/mwstudio/mw65_rgb/config.h index e5c5e62e11..de8cf65568 100644 --- a/keyboards/mwstudio/mw65_rgb/config.h +++ b/keyboards/mwstudio/mw65_rgb/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 @@ -26,15 +25,9 @@ #define MATRIX_ROW_PINS { D0, D1, D2, D3, B7 } #define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, D4, C7, F7, F6, F5, F4, F1, F0, E6 } -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* Encoder pins */ #define ENCODERS_PAD_A { B1 } #define ENCODERS_PAD_B { B2 } diff --git a/keyboards/mwstudio/mw65_rgb/info.json b/keyboards/mwstudio/mw65_rgb/info.json index 9518a2b54c..d09a0d7b3a 100644 --- a/keyboards/mwstudio/mw65_rgb/info.json +++ b/keyboards/mwstudio/mw65_rgb/info.json @@ -8,6 +8,8 @@ "pid": "0x6502", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mwstudio/mw65_rgb/rules.mk b/keyboards/mwstudio/mw65_rgb/rules.mk index e2e979fb68..b7a0f357da 100644 --- a/keyboards/mwstudio/mw65_rgb/rules.mk +++ b/keyboards/mwstudio/mw65_rgb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mwstudio/mw660/config.h b/keyboards/mwstudio/mw660/config.h index eb9fb1c473..f9040f64ad 100644 --- a/keyboards/mwstudio/mw660/config.h +++ b/keyboards/mwstudio/mw660/config.h @@ -16,10 +16,6 @@ #pragma once -#include "config_common.h" - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 #define FORCE_NKRO diff --git a/keyboards/mwstudio/mw75/config.h b/keyboards/mwstudio/mw75/config.h index c08ce5018b..bea5848869 100644 --- a/keyboards/mwstudio/mw75/config.h +++ b/keyboards/mwstudio/mw75/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 7 @@ -32,9 +31,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #define RGB_DI_PIN B3 #define RGBLIGHT_SLEEP diff --git a/keyboards/mwstudio/mw75/info.json b/keyboards/mwstudio/mw75/info.json index e861c5ea23..bfba17e818 100644 --- a/keyboards/mwstudio/mw75/info.json +++ b/keyboards/mwstudio/mw75/info.json @@ -8,6 +8,8 @@ "pid": "0x7501", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mwstudio/mw75/rules.mk b/keyboards/mwstudio/mw75/rules.mk index 9407031ed8..067e1df2ae 100644 --- a/keyboards/mwstudio/mw75/rules.mk +++ b/keyboards/mwstudio/mw75/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mwstudio/mw75r2/config.h b/keyboards/mwstudio/mw75r2/config.h index 692ed3cd73..209fb1fc31 100644 --- a/keyboards/mwstudio/mw75r2/config.h +++ b/keyboards/mwstudio/mw75r2/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 6 @@ -26,15 +25,9 @@ #define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, D5} #define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D4, D6, F7, F6, E6, F0, F1, F4, F5 } -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #define RGB_DI_PIN B3 #define RGBLIGHT_SLEEP diff --git a/keyboards/mwstudio/mw75r2/info.json b/keyboards/mwstudio/mw75r2/info.json index fc6f8e4c80..621d9beafa 100644 --- a/keyboards/mwstudio/mw75r2/info.json +++ b/keyboards/mwstudio/mw75r2/info.json @@ -8,6 +8,8 @@ "pid": "0x7502", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mwstudio/mw75r2/rules.mk b/keyboards/mwstudio/mw75r2/rules.mk index 9407031ed8..067e1df2ae 100644 --- a/keyboards/mwstudio/mw75r2/rules.mk +++ b/keyboards/mwstudio/mw75r2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |