summaryrefslogtreecommitdiff
path: root/keyboards/mwstudio
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mwstudio')
-rw-r--r--keyboards/mwstudio/alicekk/config.h11
-rw-r--r--keyboards/mwstudio/alicekk/info.json89
-rw-r--r--keyboards/mwstudio/alicekk/rules.mk6
-rw-r--r--keyboards/mwstudio/mw65_black/config.h11
-rw-r--r--keyboards/mwstudio/mw65_black/info.json2
-rw-r--r--keyboards/mwstudio/mw65_black/rules.mk6
-rw-r--r--keyboards/mwstudio/mw65_rgb/config.h11
-rw-r--r--keyboards/mwstudio/mw65_rgb/info.json2
-rw-r--r--keyboards/mwstudio/mw65_rgb/rules.mk6
-rw-r--r--keyboards/mwstudio/mw660/config.h4
-rw-r--r--keyboards/mwstudio/mw75/config.h11
-rw-r--r--keyboards/mwstudio/mw75/info.json5
-rw-r--r--keyboards/mwstudio/mw75/rules.mk6
-rw-r--r--keyboards/mwstudio/mw75r2/config.h11
-rw-r--r--keyboards/mwstudio/mw75r2/info.json2
-rw-r--r--keyboards/mwstudio/mw75r2/rules.mk6
16 files changed, 100 insertions, 89 deletions
diff --git a/keyboards/mwstudio/alicekk/config.h b/keyboards/mwstudio/alicekk/config.h
index 9657eea13c..dc85bb4fc7 100644
--- a/keyboards/mwstudio/alicekk/config.h
+++ b/keyboards/mwstudio/alicekk/config.h
@@ -16,25 +16,14 @@
#pragma once
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
/* key matrix pins */
#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..19a735ebc5 100644
--- a/keyboards/mwstudio/alicekk/info.json
+++ b/keyboards/mwstudio/alicekk/info.json
@@ -5,5 +5,94 @@
"vid": "0x7BA1",
"pid": "0x3201",
"device_version": "0.0.1"
+ },
+ "processor": "STM32F103",
+ "bootloader": "stm32duino",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"x": 0.5, "y": 0},
+
+ {"x": 1.75, "y": 0},
+ {"x": 2.75, "y": 0},
+ {"x": 3.75, "y": 0},
+ {"x": 4.75, "y": 0},
+ {"x": 5.75, "y": 0},
+ {"x": 6.75, "y": 0},
+ {"x": 7.75, "y": 0},
+
+ {"x": 9.25, "y": 0},
+ {"x": 10.25, "y": 0},
+ {"x": 11.25, "y": 0},
+ {"x": 12.25, "y": 0},
+ {"x": 13.25, "y": 0},
+ {"x": 14.25, "y": 0},
+ {"x": 15.25, "y": 0, "w": 2},
+
+ {"x": 0.25, "y": 1},
+
+ {"x": 1.5, "y": 1, "w": 1.5},
+ {"x": 3, "y": 1},
+ {"x": 4, "y": 1},
+ {"x": 5, "y": 1},
+ {"x": 6, "y": 1},
+ {"x": 7, "y": 1},
+
+ {"x": 9, "y": 1},
+ {"x": 10, "y": 1},
+ {"x": 11, "y": 1},
+ {"x": 12, "y": 1},
+ {"x": 13, "y": 1},
+ {"x": 14, "y": 1},
+ {"x": 15, "y": 1},
+ {"x": 16, "y": 1, "w": 1.5},
+
+ {"x": 0, "y": 2},
+
+ {"x": 1.25, "y": 2, "w": 1.75},
+ {"x": 3, "y": 2},
+ {"x": 4, "y": 2},
+ {"x": 5, "y": 2},
+ {"x": 6, "y": 2},
+ {"x": 7, "y": 2},
+
+ {"x": 9.5, "y": 2},
+ {"x": 10.5, "y": 2},
+ {"x": 11.5, "y": 2},
+ {"x": 12.5, "y": 2},
+ {"x": 13.5, "y": 2},
+ {"x": 14.5, "y": 2},
+ {"x": 15.5, "y": 2, "w": 2.25},
+
+ {"x": 1, "y": 3, "w": 2.25},
+ {"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": 9.75, "y": 3},
+ {"x": 10.75, "y": 3},
+ {"x": 11.75, "y": 3},
+ {"x": 12.75, "y": 3},
+ {"x": 13.75, "y": 3},
+ {"x": 14.75, "y": 3},
+ {"x": 15.75, "y": 3},
+ {"x": 16.75, "y": 3, "w": 1.25},
+
+ {"x": 1, "y": 4, "w": 1.25},
+ {"x": 2.25, "y": 4, "w": 1.25},
+
+ {"x": 4.75, "y": 4, "w": 1.25},
+ {"x": 6, "y": 4, "w": 2.25},
+
+ {"x": 9.75, "y": 4, "w": 2.75},
+ {"x": 12.5, "y": 4, "w": 1.25},
+
+ {"x": 14.75, "y": 4},
+ {"x": 15.75, "y": 4},
+ {"x": 16.75, "y": 4}
+ ]
+ }
}
}
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..3f5d53797d 100644
--- a/keyboards/mwstudio/mw65_black/config.h
+++ b/keyboards/mwstudio/mw65_black/config.h
@@ -16,25 +16,14 @@
#pragma once
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
/* key matrix pins */
#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..62cfab574b 100644
--- a/keyboards/mwstudio/mw65_rgb/config.h
+++ b/keyboards/mwstudio/mw65_rgb/config.h
@@ -16,25 +16,14 @@
#pragma once
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
/* key matrix pins */
#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..7c8ab74588 100644
--- a/keyboards/mwstudio/mw75/config.h
+++ b/keyboards/mwstudio/mw75/config.h
@@ -16,25 +16,14 @@
#pragma once
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 7
-#define MATRIX_COLS 15
/* key matrix pins */
#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, D5, B0}
#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, E6 }
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
-
/* 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..bc4404203f 100644
--- a/keyboards/mwstudio/mw75/info.json
+++ b/keyboards/mwstudio/mw75/info.json
@@ -8,6 +8,11 @@
"pid": "0x7501",
"device_version": "0.0.1"
},
+ "bootmagic": {
+ "matrix": [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..bd39ed9b28 100644
--- a/keyboards/mwstudio/mw75r2/config.h
+++ b/keyboards/mwstudio/mw75r2/config.h
@@ -16,25 +16,14 @@
#pragma once
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 15
/* key matrix pins */
#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
#
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 14:51:30 +0000