aboutsummaryrefslogtreecommitdiff
path: root/keyboards/matrix/m20add
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/matrix/m20add')
-rw-r--r--keyboards/matrix/m20add/keyboard.json (renamed from keyboards/matrix/m20add/info.json)11
-rw-r--r--keyboards/matrix/m20add/matrix.c4
-rw-r--r--keyboards/matrix/m20add/rgb_ring.c4
-rw-r--r--keyboards/matrix/m20add/rules.mk26
4 files changed, 15 insertions, 30 deletions
diff --git a/keyboards/matrix/m20add/info.json b/keyboards/matrix/m20add/keyboard.json
index 6e1a1c493f..fc58d242e6 100644
--- a/keyboards/matrix/m20add/info.json
+++ b/keyboards/matrix/m20add/keyboard.json
@@ -6,7 +6,8 @@
"usb": {
"vid": "0x4D58",
"pid": "0x20AD",
- "device_version": "0.0.1"
+ "device_version": "0.0.1",
+ "no_startup_check": true
},
"rgblight": {
"led_count": 20,
@@ -27,6 +28,14 @@
"ws2812": {
"pin": "B4"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "rgblight": true
+ },
+ "processor": "STM32F411",
+ "bootloader": "custom",
"layouts": {
"LAYOUT_tkl_ansi_tsangan": {
"layout": [
diff --git a/keyboards/matrix/m20add/matrix.c b/keyboards/matrix/m20add/matrix.c
index e9ddbdff62..85f5863725 100644
--- a/keyboards/matrix/m20add/matrix.c
+++ b/keyboards/matrix/m20add/matrix.c
@@ -2,10 +2,6 @@
* matrix.c
*/
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include "quantum.h"
#include "matrix.h"
#include "tca6424.h"
#include "m20add.h"
diff --git a/keyboards/matrix/m20add/rgb_ring.c b/keyboards/matrix/m20add/rgb_ring.c
index f32875cf4f..ecdac9130a 100644
--- a/keyboards/matrix/m20add/rgb_ring.c
+++ b/keyboards/matrix/m20add/rgb_ring.c
@@ -18,9 +18,13 @@
#include "rgb_ring.h"
+#include <stdint.h>
+#include <stdbool.h>
#include <string.h>
#include "quantum.h"
#include "rgblight.h"
+#include "timer.h"
+#include "action.h"
#include "drivers/led/issi/is31fl3731.h"
#include "i2c_master.h"
diff --git a/keyboards/matrix/m20add/rules.mk b/keyboards/matrix/m20add/rules.mk
index 1b005b8c17..980cf9518b 100644
--- a/keyboards/matrix/m20add/rules.mk
+++ b/keyboards/matrix/m20add/rules.mk
@@ -1,31 +1,7 @@
-# MCU name
-MCU = STM32F411
-
-# Linker script to use
-# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
-# or <this_dir>/ld/
+# custom bootloader
MCU_LDSCRIPT = m20add_boot
-
-# Board: it should exist either in <chibios>/os/hal/boards/
-# or <this_dir>/boards
BOARD = ST_NUCLEO64_F411RE
-# Bootloader selection
-BOOTLOADER = custom
-
-# 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
-NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in
-
-RGBLIGHT_ENABLE = yes
-
CUSTOM_MATRIX = lite
# project specific files
SRC += matrix.c tca6424.c rgb_ring.c drivers/led/issi/is31fl3731.c