aboutsummaryrefslogtreecommitdiff
path: root/keyboards/bastardkb/scylla
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/bastardkb/scylla')
-rw-r--r--keyboards/bastardkb/scylla/blackpill/config.h4
-rw-r--r--keyboards/bastardkb/scylla/blackpill/keyboard.json (renamed from keyboards/bastardkb/scylla/blackpill/info.json)18
-rw-r--r--keyboards/bastardkb/scylla/blackpill/rules.mk19
-rw-r--r--keyboards/bastardkb/scylla/v1/elitec/keyboard.json (renamed from keyboards/bastardkb/scylla/v1/elitec/info.json)7
-rw-r--r--keyboards/bastardkb/scylla/v1/elitec/rules.mk18
-rw-r--r--keyboards/bastardkb/scylla/v2/elitec/keyboard.json (renamed from keyboards/bastardkb/scylla/v2/elitec/info.json)7
-rw-r--r--keyboards/bastardkb/scylla/v2/elitec/rules.mk18
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json (renamed from keyboards/bastardkb/scylla/v2/splinky_2/info.json)7
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_2/rules.mk18
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json (renamed from keyboards/bastardkb/scylla/v2/splinky_3/info.json)7
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_3/rules.mk18
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/config.h4
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/keyboard.json (renamed from keyboards/bastardkb/scylla/v2/stemcell/info.json)7
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/rules.mk18
14 files changed, 53 insertions, 117 deletions
diff --git a/keyboards/bastardkb/scylla/blackpill/config.h b/keyboards/bastardkb/scylla/blackpill/config.h
index 0c40ed74bc..1d86b474ee 100644
--- a/keyboards/bastardkb/scylla/blackpill/config.h
+++ b/keyboards/bastardkb/scylla/blackpill/config.h
@@ -27,8 +27,8 @@
#define WS2812_PWM_CHANNEL 2
#define WS2812_PWM_PAL_MODE 1
#define WS2812_EXTERNAL_PULLUP
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM1
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
+#define WS2812_PWM_DMA_CHANNEL 3
#define WS2812_PWM_TARGET_PERIOD 800000
/* Serial configuration for split keyboard. */
diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/keyboard.json
index 8d7cb4c823..5294976fd3 100644
--- a/keyboards/bastardkb/scylla/blackpill/info.json
+++ b/keyboards/bastardkb/scylla/blackpill/keyboard.json
@@ -1,11 +1,23 @@
{
"keyboard_name": "Scylla Blackpill",
"usb": {
- "device_version": "1.0.0"
+ "device_version": "1.0.0",
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "rgb_matrix": true
},
"eeprom": {
"driver": "spi"
},
+ "split": {
+ "enabled": true
+ },
"rgb_matrix": {
"driver": "ws2812"
},
@@ -21,7 +33,5 @@
"rows": ["B15", "A2", "B8", "A8", "B9"]
},
"diode_direction": "ROW2COL",
- "processor": "STM32F411",
- "bootloader": "stm32-dfu",
- "board": "BLACKPILL_STM32_F411"
+ "development_board": "blackpill_f411"
}
diff --git a/keyboards/bastardkb/scylla/blackpill/rules.mk b/keyboards/bastardkb/scylla/blackpill/rules.mk
index b5612ce38a..48c904dd64 100644
--- a/keyboards/bastardkb/scylla/blackpill/rules.mk
+++ b/keyboards/bastardkb/scylla/blackpill/rules.mk
@@ -1,24 +1,5 @@
-# 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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
AUDIO_SUPPORTED = no # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-
-SPLIT_KEYBOARD = yes
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-KEYBOARD_SHARED_EP = yes
SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/scylla/v1/elitec/info.json b/keyboards/bastardkb/scylla/v1/elitec/keyboard.json
index 3984c69f2f..17b6b7fc36 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v1/elitec/keyboard.json
@@ -3,6 +3,12 @@
"usb": {
"device_version": "1.0.0"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "rgb_matrix": true
+ },
"ws2812": {
"pin": "D2"
},
@@ -15,6 +21,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/bastardkb/scylla/v1/elitec/rules.mk b/keyboards/bastardkb/scylla/v1/elitec/rules.mk
index ba717ec115..1868c4bb02 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/scylla/v1/elitec/rules.mk
@@ -1,19 +1 @@
-# 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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
AUDIO_SUPPORTED = no # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/keyboard.json
index f9069afd91..7bfb7ff5a4 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v2/elitec/keyboard.json
@@ -3,6 +3,12 @@
"usb": {
"device_version": "2.0.0"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "rgb_matrix": true
+ },
"ws2812": {
"pin": "D3"
},
@@ -15,6 +21,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"processor": "atmega32u4",
diff --git a/keyboards/bastardkb/scylla/v2/elitec/rules.mk b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
index ba717ec115..1868c4bb02 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
@@ -1,19 +1 @@
-# 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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
AUDIO_SUPPORTED = no # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/info.json b/keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json
index 0c7dc406b0..2b9022d24e 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json
@@ -3,6 +3,12 @@
"usb": {
"device_version": "2.0.0"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "rgb_matrix": true
+ },
"rgb_matrix": {
"driver": "ws2812"
},
@@ -12,6 +18,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "GP1"
},
"ws2812": {
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
index 53f4c0baa8..077573eb76 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
@@ -1,21 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # 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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
AUDIO_SUPPORTED = no # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-
-SPLIT_KEYBOARD = yes
SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/info.json b/keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json
index 377fd4424a..cd4da3ac41 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json
@@ -3,6 +3,12 @@
"usb": {
"device_version": "2.0.0"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "rgb_matrix": true
+ },
"rgb_matrix": {
"driver": "ws2812"
},
@@ -12,6 +18,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "GP1"
},
"ws2812": {
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
index 53f4c0baa8..077573eb76 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
@@ -1,21 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # 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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
AUDIO_SUPPORTED = no # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-
-SPLIT_KEYBOARD = yes
SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/config.h b/keyboards/bastardkb/scylla/v2/stemcell/config.h
index 0bbfd39aee..ca1cc0f719 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/config.h
+++ b/keyboards/bastardkb/scylla/v2/stemcell/config.h
@@ -30,8 +30,8 @@
#define WS2812_PWM_DRIVER PWMD2
#define WS2812_PWM_CHANNEL 4
#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM7
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_PWM_DMA_CHANNEL 3
/* CRC. */
#define CRC8_USE_TABLE
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/keyboard.json
index 598ca9d9ee..06bfeda7d2 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/info.json
+++ b/keyboards/bastardkb/scylla/v2/stemcell/keyboard.json
@@ -3,6 +3,12 @@
"usb": {
"device_version": "2.0.0"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "rgb_matrix": true
+ },
"rgb_matrix": {
"driver": "ws2812"
},
@@ -19,6 +25,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "A3"
},
"development_board": "stemcell"
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
index 8256842e21..3fe3e4ffbe 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
@@ -1,21 +1,3 @@
-# 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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
AUDIO_SUPPORTED = no # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-
-SPLIT_KEYBOARD = yes
SERIAL_DRIVER = usart