aboutsummaryrefslogtreecommitdiff
path: root/keyboards/edi
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/edi')
-rw-r--r--keyboards/edi/hardlight/mk1/keyboard.json (renamed from keyboards/edi/hardlight/mk1/info.json)10
-rw-r--r--keyboards/edi/hardlight/mk1/rules.mk13
-rw-r--r--keyboards/edi/hardlight/mk2/config.h4
-rw-r--r--keyboards/edi/standaside/keyboard.json (renamed from keyboards/edi/standaside/info.json)9
-rw-r--r--keyboards/edi/standaside/rules.mk12
5 files changed, 21 insertions, 27 deletions
diff --git a/keyboards/edi/hardlight/mk1/info.json b/keyboards/edi/hardlight/mk1/keyboard.json
index dc8bcd01c6..7f33c26227 100644
--- a/keyboards/edi/hardlight/mk1/info.json
+++ b/keyboards/edi/hardlight/mk1/keyboard.json
@@ -6,6 +6,16 @@
"pid": "0x2401",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "key_lock": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5"],
"rows": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4"]
diff --git a/keyboards/edi/hardlight/mk1/rules.mk b/keyboards/edi/hardlight/mk1/rules.mk
deleted file mode 100644
index 1763386b87..0000000000
--- a/keyboards/edi/hardlight/mk1/rules.mk
+++ /dev/null
@@ -1,13 +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 = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-KEY_LOCK_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h
index 73f4b2baae..52636c6484 100644
--- a/keyboards/edi/hardlight/mk2/config.h
+++ b/keyboards/edi/hardlight/mk2/config.h
@@ -28,8 +28,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_PWM_DRIVER PWMD1
#define WS2812_PWM_CHANNEL 3
#define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM5
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 3
#define WS2812_EXTERNAL_PULLUP
/* I2C driver overrides */
diff --git a/keyboards/edi/standaside/info.json b/keyboards/edi/standaside/keyboard.json
index 69f94729fb..ccfa5cf1da 100644
--- a/keyboards/edi/standaside/info.json
+++ b/keyboards/edi/standaside/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x0412",
"device_version": "0.0.3"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F5", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["D1", "F4", "F6", "F7", "B1", "B3", "B2", "B6"]
diff --git a/keyboards/edi/standaside/rules.mk b/keyboards/edi/standaside/rules.mk
deleted file mode 100644
index 8dd3faf689..0000000000
--- a/keyboards/edi/standaside/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 = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes # Enable RGB underlighting support