From 36ce81df592ca8e9f9fed498e513437aa1cae54f Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 26 Mar 2023 18:22:12 +1100 Subject: Move `WS2812_DRIVER` to data driven (#20248) --- keyboards/anavi/knob1/info.json | 3 +++ keyboards/anavi/knob1/rules.mk | 2 -- keyboards/anavi/knobs3/info.json | 3 +++ keyboards/anavi/knobs3/rules.mk | 2 -- keyboards/anavi/macropad10/info.json | 3 +++ keyboards/anavi/macropad10/rules.mk | 1 - 6 files changed, 9 insertions(+), 5 deletions(-) (limited to 'keyboards/anavi') diff --git a/keyboards/anavi/knob1/info.json b/keyboards/anavi/knob1/info.json index cb85035a22..3d9780a741 100644 --- a/keyboards/anavi/knob1/info.json +++ b/keyboards/anavi/knob1/info.json @@ -34,6 +34,9 @@ "twinkle": true } }, + "ws2812": { + "driver": "vendor" + }, "encoder": { "enabled": true, "rotary": [ 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..b7bba5eddc 100644 --- a/keyboards/anavi/knobs3/info.json +++ b/keyboards/anavi/knobs3/info.json @@ -39,6 +39,9 @@ "twinkle": true } }, + "ws2812": { + "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..4572655ce7 100644 --- a/keyboards/anavi/macropad10/info.json +++ b/keyboards/anavi/macropad10/info.json @@ -39,6 +39,9 @@ "twinkle": true } }, + "ws2812": { + "driver": "vendor" + }, "encoder": { "enabled": true, "rotary": [ 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 -- cgit v1.2.3 From 36ab0c0aaa613fe0946e10133315b071c0d87012 Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Mon, 3 Apr 2023 10:18:17 -0600 Subject: Add core/fallback encoder behaviour (#20320) --- keyboards/anavi/knob1/knob1.c | 12 ------------ keyboards/anavi/macropad10/macropad10.c | 16 ---------------- 2 files changed, 28 deletions(-) delete mode 100644 keyboards/anavi/macropad10/macropad10.c (limited to 'keyboards/anavi') 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/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 -// 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 - -- cgit v1.2.3 From 47966dc2a65c88ac90fcd64d12243d72f3f6753b Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 6 Apr 2023 18:00:54 +1000 Subject: Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303) --- keyboards/anavi/knob1/info.json | 2 +- keyboards/anavi/knobs3/info.json | 2 +- keyboards/anavi/macropad10/info.json | 2 +- keyboards/anavi/macropad8/config.h | 1 - keyboards/anavi/macropad8/info.json | 3 +++ 5 files changed, 6 insertions(+), 4 deletions(-) (limited to 'keyboards/anavi') diff --git a/keyboards/anavi/knob1/info.json b/keyboards/anavi/knob1/info.json index 3d9780a741..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, @@ -35,6 +34,7 @@ } }, "ws2812": { + "pin": "GP12", "driver": "vendor" }, "encoder": { diff --git a/keyboards/anavi/knobs3/info.json b/keyboards/anavi/knobs3/info.json index b7bba5eddc..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, @@ -40,6 +39,7 @@ } }, "ws2812": { + "pin": "GP12", "driver": "vendor" }, "encoder": { diff --git a/keyboards/anavi/macropad10/info.json b/keyboards/anavi/macropad10/info.json index 4572655ce7..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, @@ -40,6 +39,7 @@ } }, "ws2812": { + "pin": "GP3", "driver": "vendor" }, "encoder": { 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 . /* 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": { -- cgit v1.2.3 From 798cbfe6a3430be9f73d3bc7c76550394077ccdb Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 16 Apr 2023 15:37:24 +1000 Subject: Fix info.json LTO and format encoder definitions (#20456) --- keyboards/anavi/knob1/info.json | 6 +----- keyboards/anavi/knobs3/info.json | 18 +++--------------- keyboards/anavi/macropad10/info.json | 6 +----- 3 files changed, 5 insertions(+), 25 deletions(-) (limited to 'keyboards/anavi') diff --git a/keyboards/anavi/knob1/info.json b/keyboards/anavi/knob1/info.json index 272097dd8c..fd22b96603 100644 --- a/keyboards/anavi/knob1/info.json +++ b/keyboards/anavi/knob1/info.json @@ -40,11 +40,7 @@ "encoder": { "enabled": true, "rotary": [ - { - "pin_a": "GP27", - "pin_b": "GP28", - "resolution": 2 - } + {"pin_a": "GP27", "pin_b": "GP28", "resolution": 2} ] }, "matrix_pins": { diff --git a/keyboards/anavi/knobs3/info.json b/keyboards/anavi/knobs3/info.json index 2500d2554e..1a9f6e064c 100644 --- a/keyboards/anavi/knobs3/info.json +++ b/keyboards/anavi/knobs3/info.json @@ -45,21 +45,9 @@ "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/macropad10/info.json b/keyboards/anavi/macropad10/info.json index 57f1d321ff..214a72ec33 100644 --- a/keyboards/anavi/macropad10/info.json +++ b/keyboards/anavi/macropad10/info.json @@ -45,11 +45,7 @@ "encoder": { "enabled": true, "rotary": [ - { - "pin_a": "GP1", - "pin_b": "GP2", - "resolution": 2 - } + {"pin_a": "GP1", "pin_b": "GP2", "resolution": 2} ] }, "layouts": { -- cgit v1.2.3 From 79aa31994698c9050141714f77c0177edbcd9488 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 2 May 2023 08:25:15 +1000 Subject: `info.json` whitespace cleanups (#20651) --- keyboards/anavi/knob1/info.json | 34 +++++++++++++++++----------------- keyboards/anavi/macropad10/info.json | 32 ++++++++++++++++---------------- 2 files changed, 33 insertions(+), 33 deletions(-) (limited to 'keyboards/anavi') diff --git a/keyboards/anavi/knob1/info.json b/keyboards/anavi/knob1/info.json index fd22b96603..06acec583f 100644 --- a/keyboards/anavi/knob1/info.json +++ b/keyboards/anavi/knob1/info.json @@ -12,25 +12,25 @@ "extrakey": true, "mousekey": false, "nkro": true, - "rgblight": true + "rgblight": true }, "rgblight": { "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": { @@ -38,7 +38,7 @@ "driver": "vendor" }, "encoder": { - "enabled": true, + "enabled": true, "rotary": [ {"pin_a": "GP27", "pin_b": "GP28", "resolution": 2} ] @@ -51,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/macropad10/info.json b/keyboards/anavi/macropad10/info.json index 214a72ec33..41f25ee633 100644 --- a/keyboards/anavi/macropad10/info.json +++ b/keyboards/anavi/macropad10/info.json @@ -17,25 +17,25 @@ "extrakey": true, "mousekey": false, "nkro": true, - "rgblight": true + "rgblight": true }, "rgblight": { "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": { @@ -43,7 +43,7 @@ "driver": "vendor" }, "encoder": { - "enabled": true, + "enabled": true, "rotary": [ {"pin_a": "GP1", "pin_b": "GP2", "resolution": 2} ] -- cgit v1.2.3 From a5e46d80822797cd2e0dc2a2b81c4ccce9e167f4 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 3 May 2023 12:19:34 +1000 Subject: More `info.json` whitespace cleanups (#20665) --- keyboards/anavi/knobs3/info.json | 6 +++--- keyboards/anavi/macropad8/info.json | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'keyboards/anavi') diff --git a/keyboards/anavi/knobs3/info.json b/keyboards/anavi/knobs3/info.json index 1a9f6e064c..ad51b7ce6c 100644 --- a/keyboards/anavi/knobs3/info.json +++ b/keyboards/anavi/knobs3/info.json @@ -53,9 +53,9 @@ "layouts": { "LAYOUT": { "layout": [ - { "label":"Mute", "x": 0, "y": 0, "matrix": [0, 0] }, - { "label":"RGB", "x": 0, "y": 1, "matrix": [0, 1] }, - { "label":"Animation", "x": 0, "y": 2, "matrix": [0, 2] } + {"label": "Mute", "x": 0, "y": 0, "matrix": [0, 0]}, + {"label": "RGB", "x": 0, "y": 1, "matrix": [0, 1]}, + {"label": "Animation", "x": 0, "y": 2, "matrix": [0, 2]} ] } }, diff --git a/keyboards/anavi/macropad8/info.json b/keyboards/anavi/macropad8/info.json index 9032ac5fa8..1fa276d94e 100644 --- a/keyboards/anavi/macropad8/info.json +++ b/keyboards/anavi/macropad8/info.json @@ -26,14 +26,14 @@ "layouts": { "LAYOUT_ortho_2x4": { "layout": [ - {"x":0, "y":0, "matrix": [0, 0]}, - {"x":1, "y":0, "matrix": [0, 1]}, - {"x":2, "y":0, "matrix": [0, 2]}, - {"x":3, "y":0, "matrix": [0, 3]}, - {"x":0, "y":1, "matrix": [1, 0]}, - {"x":1, "y":1, "matrix": [1, 1]}, - {"x":2, "y":1, "matrix": [1, 2]}, - {"x":3, "y":1, "matrix": [1, 3]} + {"x": 0, "y": 0, "matrix": [0, 0]}, + {"x": 1, "y": 0, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 3, "y": 0, "matrix": [0, 3]}, + {"x": 0, "y": 1, "matrix": [1, 0]}, + {"x": 1, "y": 1, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]}, + {"x": 3, "y": 1, "matrix": [1, 3]} ] } } -- cgit v1.2.3 From ef6a712899f4ac3cf75f989221351c1cfb57f3b9 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 4 May 2023 19:09:59 +1000 Subject: Even more `info.json` whitespace cleanups (#20703) --- keyboards/anavi/macropad10/info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'keyboards/anavi') diff --git a/keyboards/anavi/macropad10/info.json b/keyboards/anavi/macropad10/info.json index 41f25ee633..a355fdd549 100644 --- a/keyboards/anavi/macropad10/info.json +++ b/keyboards/anavi/macropad10/info.json @@ -51,15 +51,15 @@ "layouts": { "LAYOUT_mp10": { "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0 }, - { "matrix": [0, 1], "x": 1, "y": 0 }, - { "matrix": [0, 2], "x": 2, "y": 0 }, - { "matrix": [1, 0], "x": 0, "y": 1 }, - { "matrix": [1, 1], "x": 1, "y": 1 }, - { "matrix": [1, 2], "x": 2, "y": 1 }, - { "matrix": [2, 0], "x": 0, "y": 2 }, - { "matrix": [2, 1], "x": 1, "y": 2 }, - { "matrix": [2, 2], "x": 2, "y": 2 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2} ] } }, -- cgit v1.2.3 From 363bfdbfda5ea9fa996390920a9e8982535b76c8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 27 May 2023 12:27:44 +1000 Subject: Move `RGBLIGHT_LIMIT_VAL` to data driven (#20974) Co-authored-by: Nick Brassel --- keyboards/anavi/macropad8/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/anavi') diff --git a/keyboards/anavi/macropad8/config.h b/keyboards/anavi/macropad8/config.h index 2f848d551b..cce2b5bc14 100644 --- a/keyboards/anavi/macropad8/config.h +++ b/keyboards/anavi/macropad8/config.h @@ -36,7 +36,6 @@ along with this program. If not, see . # define RGBLIGHT_HUE_STEP 10 # define RGBLIGHT_SAT_STEP 17 # define RGBLIGHT_VAL_STEP 17 -# define RGBLIGHT_LIMIT_VAL 255 #endif #ifdef OLED_ENABLE -- cgit v1.2.3