aboutsummaryrefslogtreecommitdiff
path: root/keyboards/geekboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/geekboards')
-rw-r--r--keyboards/geekboards/macropad_v2/config.h4
-rw-r--r--keyboards/geekboards/macropad_v2/keyboard.json (renamed from keyboards/geekboards/macropad_v2/info.json)9
-rw-r--r--keyboards/geekboards/macropad_v2/rules.mk14
-rw-r--r--keyboards/geekboards/tester/keyboard.json (renamed from keyboards/geekboards/tester/info.json)9
-rw-r--r--keyboards/geekboards/tester/rules.mk12
5 files changed, 20 insertions, 28 deletions
diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h
index 6aed50ec2f..dca98f0c95 100644
--- a/keyboards/geekboards/macropad_v2/config.h
+++ b/keyboards/geekboards/macropad_v2/config.h
@@ -19,7 +19,7 @@
#define WS2812_PWM_DRIVER PWMD3
#define WS2812_PWM_CHANNEL 2
#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
#define WAIT_FOR_USB
diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/keyboard.json
index cb8c3b81be..035a83c157 100644
--- a/keyboards/geekboards/macropad_v2/info.json
+++ b/keyboards/geekboards/macropad_v2/keyboard.json
@@ -55,6 +55,15 @@
},
"processor": "STM32F072",
"bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"direct": [
["B13", "B15", "B3", "B5"],
diff --git a/keyboards/geekboards/macropad_v2/rules.mk b/keyboards/geekboards/macropad_v2/rules.mk
deleted file mode 100644
index c49a369dd0..0000000000
--- a/keyboards/geekboards/macropad_v2/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
-
diff --git a/keyboards/geekboards/tester/info.json b/keyboards/geekboards/tester/keyboard.json
index 03fb682751..0bd115906d 100644
--- a/keyboards/geekboards/tester/info.json
+++ b/keyboards/geekboards/tester/keyboard.json
@@ -52,6 +52,15 @@
},
"driver": "is31fl3731"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["F7", "F6", "D2", "D3"],
"rows": ["B0", "D4"]
diff --git a/keyboards/geekboards/tester/rules.mk b/keyboards/geekboards/tester/rules.mk
deleted file mode 100644
index 8ac152f428..0000000000
--- a/keyboards/geekboards/tester/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes # Use RGB matrix