aboutsummaryrefslogtreecommitdiff
path: root/keyboards/mwstudio
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mwstudio')
-rw-r--r--keyboards/mwstudio/alicekk/keyboard.json (renamed from keyboards/mwstudio/alicekk/info.json)10
-rw-r--r--keyboards/mwstudio/alicekk/rules.mk15
-rw-r--r--keyboards/mwstudio/mmk_3/config.h4
-rw-r--r--keyboards/mwstudio/mmk_3/keyboard.json (renamed from keyboards/mwstudio/mmk_3/info.json)0
-rw-r--r--keyboards/mwstudio/mmk_3/rules.mk1
-rw-r--r--keyboards/mwstudio/mw65_black/keyboard.json (renamed from keyboards/mwstudio/mw65_black/info.json)10
-rw-r--r--keyboards/mwstudio/mw65_black/rules.mk13
-rw-r--r--keyboards/mwstudio/mw65_rgb/keyboard.json (renamed from keyboards/mwstudio/mw65_rgb/info.json)10
-rw-r--r--keyboards/mwstudio/mw65_rgb/rules.mk16
-rw-r--r--keyboards/mwstudio/mw660/config.h4
-rw-r--r--keyboards/mwstudio/mw660/keyboard.json (renamed from keyboards/mwstudio/mw660/info.json)0
-rw-r--r--keyboards/mwstudio/mw660/rules.mk1
-rw-r--r--keyboards/mwstudio/mw75/keyboard.json (renamed from keyboards/mwstudio/mw75/info.json)10
-rw-r--r--keyboards/mwstudio/mw75/rules.mk14
-rw-r--r--keyboards/mwstudio/mw75r2/keyboard.json (renamed from keyboards/mwstudio/mw75r2/info.json)10
-rw-r--r--keyboards/mwstudio/mw75r2/rules.mk14
-rw-r--r--keyboards/mwstudio/mw80/keyboard.json (renamed from keyboards/mwstudio/mw80/info.json)0
-rw-r--r--keyboards/mwstudio/mw80/rules.mk0
18 files changed, 54 insertions, 78 deletions
diff --git a/keyboards/mwstudio/alicekk/info.json b/keyboards/mwstudio/alicekk/keyboard.json
index 75b65279d6..141be9909e 100644
--- a/keyboards/mwstudio/alicekk/info.json
+++ b/keyboards/mwstudio/alicekk/keyboard.json
@@ -7,6 +7,16 @@
"device_version": "0.0.1",
"force_nkro": true
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "A4", "A2", "A1", "B6", "B5", "B4", "B3", "A15"],
"rows": ["A3", "A5", "A6", "A7", "B0"]
diff --git a/keyboards/mwstudio/alicekk/rules.mk b/keyboards/mwstudio/alicekk/rules.mk
deleted file mode 100644
index f365071da0..0000000000
--- a/keyboards/mwstudio/alicekk/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-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
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
-
-
diff --git a/keyboards/mwstudio/mmk_3/config.h b/keyboards/mwstudio/mmk_3/config.h
index 0265d3ed6e..f8916cddd0 100644
--- a/keyboards/mwstudio/mmk_3/config.h
+++ b/keyboards/mwstudio/mmk_3/config.h
@@ -22,5 +22,5 @@
#define WS2812_PWM_DRIVER PWMD4
#define WS2812_PWM_CHANNEL 3
#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM7
-#define WS2812_DMA_CHANNEL 2
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_PWM_DMA_CHANNEL 2
diff --git a/keyboards/mwstudio/mmk_3/info.json b/keyboards/mwstudio/mmk_3/keyboard.json
index c63bd69f62..c63bd69f62 100644
--- a/keyboards/mwstudio/mmk_3/info.json
+++ b/keyboards/mwstudio/mmk_3/keyboard.json
diff --git a/keyboards/mwstudio/mmk_3/rules.mk b/keyboards/mwstudio/mmk_3/rules.mk
deleted file mode 100644
index 7ff128fa69..0000000000
--- a/keyboards/mwstudio/mmk_3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank \ No newline at end of file
diff --git a/keyboards/mwstudio/mw65_black/info.json b/keyboards/mwstudio/mw65_black/keyboard.json
index 2646340658..8955cf9688 100644
--- a/keyboards/mwstudio/mw65_black/info.json
+++ b/keyboards/mwstudio/mw65_black/keyboard.json
@@ -16,6 +16,16 @@
"ws2812": {
"pin": "C7"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B0", "B1", "B2", "D0", "D1", "D2", "D3", "D5", "C6", "F7", "F4", "F6", "F5", "F1", "F0"],
"rows": ["D4", "D7", "B4", "B3", "B6"]
diff --git a/keyboards/mwstudio/mw65_black/rules.mk b/keyboards/mwstudio/mw65_black/rules.mk
deleted file mode 100644
index 6c261600bc..0000000000
--- a/keyboards/mwstudio/mw65_black/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-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
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/mwstudio/mw65_rgb/info.json b/keyboards/mwstudio/mw65_rgb/keyboard.json
index 502a112c43..f1a8190948 100644
--- a/keyboards/mwstudio/mw65_rgb/info.json
+++ b/keyboards/mwstudio/mw65_rgb/keyboard.json
@@ -57,6 +57,16 @@
"driver": "ws2812",
"max_brightness": 200
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
"rows": ["D0", "D1", "D2", "D3", "B7"]
diff --git a/keyboards/mwstudio/mw65_rgb/rules.mk b/keyboards/mwstudio/mw65_rgb/rules.mk
deleted file mode 100644
index faabb5cad7..0000000000
--- a/keyboards/mwstudio/mw65_rgb/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-RGB_MATRIX_ENABLE = yes
-
-ENCODER_ENABLE = yes
diff --git a/keyboards/mwstudio/mw660/config.h b/keyboards/mwstudio/mw660/config.h
index 87659c1f67..58d0eee9e0 100644
--- a/keyboards/mwstudio/mw660/config.h
+++ b/keyboards/mwstudio/mw660/config.h
@@ -20,5 +20,5 @@
#define WS2812_PWM_CHANNEL 3 // default: 2
//#define WS2812_PWM_COMPLEMENTARY_OUTPUT // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy).
#define WS2812_PWM_PAL_MODE 1 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-#define WS2812_DMA_CHANNEL 2 \ No newline at end of file
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_PWM_DMA_CHANNEL 2 \ No newline at end of file
diff --git a/keyboards/mwstudio/mw660/info.json b/keyboards/mwstudio/mw660/keyboard.json
index fdbd7564a7..fdbd7564a7 100644
--- a/keyboards/mwstudio/mw660/info.json
+++ b/keyboards/mwstudio/mw660/keyboard.json
diff --git a/keyboards/mwstudio/mw660/rules.mk b/keyboards/mwstudio/mw660/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/mwstudio/mw660/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mwstudio/mw75/info.json b/keyboards/mwstudio/mw75/keyboard.json
index 61533f6266..d19d6b49ba 100644
--- a/keyboards/mwstudio/mw75/info.json
+++ b/keyboards/mwstudio/mw75/keyboard.json
@@ -56,6 +56,16 @@
"driver": "ws2812",
"max_brightness": 200
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
"rows": ["B7", "D0", "D1", "D2", "D3", "D5", "B0"]
diff --git a/keyboards/mwstudio/mw75/rules.mk b/keyboards/mwstudio/mw75/rules.mk
deleted file mode 100644
index 041f588c14..0000000000
--- a/keyboards/mwstudio/mw75/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/mwstudio/mw75r2/info.json b/keyboards/mwstudio/mw75r2/keyboard.json
index 950ded1e80..ae227830e5 100644
--- a/keyboards/mwstudio/mw75r2/info.json
+++ b/keyboards/mwstudio/mw75r2/keyboard.json
@@ -42,6 +42,16 @@
},
"driver": "ws2812"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "F7", "F6", "E6", "F0", "F1", "F4", "F5"],
"rows": ["B7", "D0", "D1", "D2", "D3", "D5"]
diff --git a/keyboards/mwstudio/mw75r2/rules.mk b/keyboards/mwstudio/mw75r2/rules.mk
deleted file mode 100644
index 041f588c14..0000000000
--- a/keyboards/mwstudio/mw75r2/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/mwstudio/mw80/info.json b/keyboards/mwstudio/mw80/keyboard.json
index 829e97591c..829e97591c 100644
--- a/keyboards/mwstudio/mw80/info.json
+++ b/keyboards/mwstudio/mw80/keyboard.json
diff --git a/keyboards/mwstudio/mw80/rules.mk b/keyboards/mwstudio/mw80/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/mwstudio/mw80/rules.mk
+++ /dev/null