summaryrefslogtreecommitdiff
path: root/keyboards/adafruit/macropad
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/adafruit/macropad')
-rw-r--r--keyboards/adafruit/macropad/config.h1
-rw-r--r--keyboards/adafruit/macropad/info.json7
-rw-r--r--keyboards/adafruit/macropad/macropad.c14
-rw-r--r--keyboards/adafruit/macropad/rules.mk2
4 files changed, 7 insertions, 17 deletions
diff --git a/keyboards/adafruit/macropad/config.h b/keyboards/adafruit/macropad/config.h
index af72251dac..08db87fefe 100644
--- a/keyboards/adafruit/macropad/config.h
+++ b/keyboards/adafruit/macropad/config.h
@@ -54,7 +54,6 @@
#ifdef RGB_MATRIX_ENABLE
/* RGB Defines */
-# define RGB_DI_PIN GP19
# define RGB_MATRIX_LED_COUNT 12
# define RGBLED_NUM 12
diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json
index 75c859adb1..8982caaae3 100644
--- a/keyboards/adafruit/macropad/info.json
+++ b/keyboards/adafruit/macropad/info.json
@@ -13,9 +13,16 @@
{"pin_a": "GP18", "pin_b": "GP17"}
]
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
"bootmagic": {
"matrix": [1, 2]
},
+ "ws2812": {
+ "pin": "GP19",
+ "driver": "vendor"
+ },
"processor": "RP2040",
"bootloader": "rp2040",
"matrix_pins": {
diff --git a/keyboards/adafruit/macropad/macropad.c b/keyboards/adafruit/macropad/macropad.c
index 398d0bbdfd..6661e43909 100644
--- a/keyboards/adafruit/macropad/macropad.c
+++ b/keyboards/adafruit/macropad/macropad.c
@@ -65,17 +65,3 @@ void audio_off_user(void) {
writePinLow(SPEAKER_SHUTDOWN);
}
#endif
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) { return false; }
- if (index == 0) {
- if (clockwise) {
- tap_code_delay(KC_VOLU, 10);
- } else {
- tap_code_delay(KC_VOLD, 10);
- }
- }
- return true;
-}
-#endif
diff --git a/keyboards/adafruit/macropad/rules.mk b/keyboards/adafruit/macropad/rules.mk
index fd1ecf7cbc..23b15d77fc 100644
--- a/keyboards/adafruit/macropad/rules.mk
+++ b/keyboards/adafruit/macropad/rules.mk
@@ -13,8 +13,6 @@ AUDIO_ENABLE = yes # Audio output
AUDIO_DRIVER = pwm_hardware
ENCODER_ENABLE = yes
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = vendor
OLED_ENABLE = yes
OLED_DRIVER = custom
# Project specific files