diff options
Diffstat (limited to 'keyboards/anavi')
-rw-r--r-- | keyboards/anavi/knob1/info.json | 45 | ||||
-rw-r--r-- | keyboards/anavi/knob1/knob1.c | 12 | ||||
-rw-r--r-- | keyboards/anavi/knob1/rules.mk | 2 | ||||
-rw-r--r-- | keyboards/anavi/knobs3/info.json | 23 | ||||
-rw-r--r-- | keyboards/anavi/knobs3/rules.mk | 2 | ||||
-rw-r--r-- | keyboards/anavi/macropad10/info.json | 43 | ||||
-rw-r--r-- | keyboards/anavi/macropad10/macropad10.c | 16 | ||||
-rw-r--r-- | keyboards/anavi/macropad10/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/anavi/macropad8/config.h | 1 | ||||
-rw-r--r-- | keyboards/anavi/macropad8/info.json | 3 |
10 files changed, 53 insertions, 95 deletions
diff --git a/keyboards/anavi/knob1/info.json b/keyboards/anavi/knob1/info.json index cb85035a22..06acec583f 100644 --- a/keyboards/anavi/knob1/info.json +++ b/keyboards/anavi/knob1/info.json @@ -12,36 +12,35 @@ "extrakey": true, "mousekey": false, "nkro": true, - "rgblight": true + "rgblight": true }, "rgblight": { - "pin": "GP12", "led_count": 1, - "hue_steps": 10, - "saturation_steps": 17, + "hue_steps": 10, + "saturation_steps": 17, "brightness_steps": 17, - "max_brightness": 255, - "animations": { - "alternating": true, - "breathing": true, - "christmas": true, - "knight": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "rgb_test": true, - "snake": true, - "static_gradient": true, - "twinkle": true + "max_brightness": 255, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true } }, + "ws2812": { + "pin": "GP12", + "driver": "vendor" + }, "encoder": { - "enabled": true, + "enabled": true, "rotary": [ - { - "pin_a": "GP27", - "pin_b": "GP28", - "resolution": 2 - } + {"pin_a": "GP27", "pin_b": "GP28", "resolution": 2} ] }, "matrix_pins": { @@ -52,7 +51,7 @@ "layouts": { "LAYOUT_k1": { "layout": [ - { "x": 0, "y": 0, "matrix": [0, 0] } + {"x": 0, "y": 0, "matrix": [0, 0]} ] } }, 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..1a9f6e064c 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,24 +38,16 @@ "twinkle": true } }, + "ws2812": { + "pin": "GP12", + "driver": "vendor" + }, "encoder": { "enabled": true, "rotary": [ - { - "pin_a": "GP27", - "pin_b": "GP28", - "resolution": 2 - }, - { - "pin_a": "GP4", - "pin_b": "GP3", - "resolution": 2 - }, - { - "pin_a": "GP1", - "pin_b": "GP2", - "resolution": 2 - } + {"pin_a": "GP27", "pin_b": "GP28", "resolution": 2}, + {"pin_a": "GP4", "pin_b": "GP3", "resolution": 2}, + {"pin_a": "GP1", "pin_b": "GP2", "resolution": 2} ] }, "layouts": { 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..41f25ee633 100644 --- a/keyboards/anavi/macropad10/info.json +++ b/keyboards/anavi/macropad10/info.json @@ -17,36 +17,35 @@ "extrakey": true, "mousekey": false, "nkro": true, - "rgblight": true + "rgblight": true }, "rgblight": { - "pin": "GP3", "led_count": 4, - "hue_steps": 10, - "saturation_steps": 17, + "hue_steps": 10, + "saturation_steps": 17, "brightness_steps": 17, - "max_brightness": 255, - "animations": { - "alternating": true, - "breathing": true, - "christmas": true, - "knight": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "rgb_test": true, - "snake": true, - "static_gradient": true, - "twinkle": true + "max_brightness": 255, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true } }, + "ws2812": { + "pin": "GP3", + "driver": "vendor" + }, "encoder": { - "enabled": true, + "enabled": true, "rotary": [ - { - "pin_a": "GP1", - "pin_b": "GP2", - "resolution": 2 - } + {"pin_a": "GP1", "pin_b": "GP2", "resolution": 2} ] }, "layouts": { 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": { |