summaryrefslogtreecommitdiff
path: root/keyboards/anavi
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/anavi')
-rw-r--r--keyboards/anavi/knob1/info.json5
-rw-r--r--keyboards/anavi/knob1/knob1.c12
-rw-r--r--keyboards/anavi/knob1/rules.mk2
-rw-r--r--keyboards/anavi/knobs3/info.json5
-rw-r--r--keyboards/anavi/knobs3/rules.mk2
-rw-r--r--keyboards/anavi/macropad10/info.json5
-rw-r--r--keyboards/anavi/macropad10/macropad10.c16
-rw-r--r--keyboards/anavi/macropad10/rules.mk1
-rw-r--r--keyboards/anavi/macropad8/config.h1
-rw-r--r--keyboards/anavi/macropad8/info.json3
10 files changed, 15 insertions, 37 deletions
diff --git a/keyboards/anavi/knob1/info.json b/keyboards/anavi/knob1/info.json
index cb85035a22..272097dd8c 100644
--- a/keyboards/anavi/knob1/info.json
+++ b/keyboards/anavi/knob1/info.json
@@ -15,7 +15,6 @@
"rgblight": true
},
"rgblight": {
- "pin": "GP12",
"led_count": 1,
"hue_steps": 10,
"saturation_steps": 17,
@@ -34,6 +33,10 @@
"twinkle": true
}
},
+ "ws2812": {
+ "pin": "GP12",
+ "driver": "vendor"
+ },
"encoder": {
"enabled": true,
"rotary": [
diff --git a/keyboards/anavi/knob1/knob1.c b/keyboards/anavi/knob1/knob1.c
index c1ed7b7726..bb6f1e38bf 100644
--- a/keyboards/anavi/knob1/knob1.c
+++ b/keyboards/anavi/knob1/knob1.c
@@ -14,18 +14,6 @@ void keyboard_post_init_kb(void) {
keyboard_post_init_user();
}
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) { return false; }
- if (clockwise) {
- tap_code(KC_VOLU);
- } else {
- tap_code(KC_VOLD);
- }
- return true;
-}
-#endif
-
#ifdef OLED_ENABLE
bool oled_task_kb(void) {
diff --git a/keyboards/anavi/knob1/rules.mk b/keyboards/anavi/knob1/rules.mk
index ed8acbe4ac..c3600290d9 100644
--- a/keyboards/anavi/knob1/rules.mk
+++ b/keyboards/anavi/knob1/rules.mk
@@ -1,5 +1,3 @@
-WS2812_DRIVER = vendor
-
OLED_ENABLE = yes
OLED_DRIVER = SSD1306 # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
diff --git a/keyboards/anavi/knobs3/info.json b/keyboards/anavi/knobs3/info.json
index 8bea49066d..2500d2554e 100644
--- a/keyboards/anavi/knobs3/info.json
+++ b/keyboards/anavi/knobs3/info.json
@@ -20,7 +20,6 @@
"rgblight": true
},
"rgblight": {
- "pin": "GP12",
"led_count": 1,
"hue_steps": 10,
"saturation_steps": 17,
@@ -39,6 +38,10 @@
"twinkle": true
}
},
+ "ws2812": {
+ "pin": "GP12",
+ "driver": "vendor"
+ },
"encoder": {
"enabled": true,
"rotary": [
diff --git a/keyboards/anavi/knobs3/rules.mk b/keyboards/anavi/knobs3/rules.mk
index ed8acbe4ac..c3600290d9 100644
--- a/keyboards/anavi/knobs3/rules.mk
+++ b/keyboards/anavi/knobs3/rules.mk
@@ -1,5 +1,3 @@
-WS2812_DRIVER = vendor
-
OLED_ENABLE = yes
OLED_DRIVER = SSD1306 # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
diff --git a/keyboards/anavi/macropad10/info.json b/keyboards/anavi/macropad10/info.json
index 5b1a9d8546..57f1d321ff 100644
--- a/keyboards/anavi/macropad10/info.json
+++ b/keyboards/anavi/macropad10/info.json
@@ -20,7 +20,6 @@
"rgblight": true
},
"rgblight": {
- "pin": "GP3",
"led_count": 4,
"hue_steps": 10,
"saturation_steps": 17,
@@ -39,6 +38,10 @@
"twinkle": true
}
},
+ "ws2812": {
+ "pin": "GP3",
+ "driver": "vendor"
+ },
"encoder": {
"enabled": true,
"rotary": [
diff --git a/keyboards/anavi/macropad10/macropad10.c b/keyboards/anavi/macropad10/macropad10.c
deleted file mode 100644
index bebefd0da9..0000000000
--- a/keyboards/anavi/macropad10/macropad10.c
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2022 Leon Anavi <leon@anavi.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "encoder.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) { return false; }
- if (clockwise) {
- tap_code(KC_VOLU);
- } else {
- tap_code(KC_VOLD);
- }
- return true;
-}
-#endif
-
diff --git a/keyboards/anavi/macropad10/rules.mk b/keyboards/anavi/macropad10/rules.mk
index 997fce7e65..e69de29bb2 100644
--- a/keyboards/anavi/macropad10/rules.mk
+++ b/keyboards/anavi/macropad10/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor
diff --git a/keyboards/anavi/macropad8/config.h b/keyboards/anavi/macropad8/config.h
index fce7328718..2f848d551b 100644
--- a/keyboards/anavi/macropad8/config.h
+++ b/keyboards/anavi/macropad8/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* ws2812B RGB LED */
#ifdef RGBLIGHT_ENABLE
-# define RGB_DI_PIN F4
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/anavi/macropad8/info.json b/keyboards/anavi/macropad8/info.json
index b52ca5a176..9032ac5fa8 100644
--- a/keyboards/anavi/macropad8/info.json
+++ b/keyboards/anavi/macropad8/info.json
@@ -12,6 +12,9 @@
"pin": "D7",
"breathing": true
},
+ "ws2812": {
+ "pin": "F4"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"matrix_pins": {