Merge branch 'develop'

6 files changed, 24 insertions, 26 deletions

diff --git a/keyboards/aeboards/ext65/rev1/keymaps/via/rules.mk b/keyboards/aeboards/ext65/rev1/keymaps/via/rules.mk
index e9a8bec879..ab9d5c6ac2 100644
--- a/keyboards/aeboards/ext65/rev1/keymaps/via/rules.mk
+++ b/keyboards/aeboards/ext65/rev1/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
 OLED_ENABLE = yes
-# OLED_DRIVER = not a real thing
diff --git a/keyboards/aeboards/ext65/rev2/config.h b/keyboards/aeboards/ext65/rev2/config.h
index 0bc48fb562..78d20f300f 100644
--- a/keyboards/aeboards/ext65/rev2/config.h
+++ b/keyboards/aeboards/ext65/rev2/config.h
@@ -16,19 +16,6 @@
 
 #pragma once
 
-//RGB Underglow WS2812
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 24
-
 //SPI
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
diff --git a/keyboards/aeboards/ext65/rev2/info.json b/keyboards/aeboards/ext65/rev2/info.json
index bfdcae090e..d9d0ee62ee 100644
--- a/keyboards/aeboards/ext65/rev2/info.json
+++ b/keyboards/aeboards/ext65/rev2/info.json
@@ -12,6 +12,21 @@
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 24,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
     "ws2812": {
         "pin": "B15",
         "driver": "spi"
diff --git a/keyboards/aeboards/ext65/rev2/keymaps/via/rules.mk b/keyboards/aeboards/ext65/rev2/keymaps/via/rules.mk
index e9a8bec879..ab9d5c6ac2 100644
--- a/keyboards/aeboards/ext65/rev2/keymaps/via/rules.mk
+++ b/keyboards/aeboards/ext65/rev2/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
 OLED_ENABLE = yes
-# OLED_DRIVER = not a real thing
diff --git a/keyboards/aeboards/ext65/rev2/rules.mk b/keyboards/aeboards/ext65/rev2/rules.mk
index d52eea26d1..b9637955ff 100644
--- a/keyboards/aeboards/ext65/rev2/rules.mk
+++ b/keyboards/aeboards/ext65/rev2/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 SLEEP_LED_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/aeboards/satellite/rev1/rev1.c b/keyboards/aeboards/satellite/rev1/rev1.c
index aafd0e0848..785fa8af9f 100644
--- a/keyboards/aeboards/satellite/rev1/rev1.c
+++ b/keyboards/aeboards/satellite/rev1/rev1.c
@@ -145,30 +145,30 @@ led_config_t g_led_config = { {
 // Custom Driver
 static void init(void) {
     i2c_init();
-    IS31FL3731_init(DRIVER_ADDR_1);
-    IS31FL3731_init(DRIVER_ADDR_2);
+    is31fl3731_init(DRIVER_ADDR_1);
+    is31fl3731_init(DRIVER_ADDR_2);
     for (int index = 0; index < ISSI_DRIVER_TOTAL; index++) {
         bool enabled = !(   ( index == 18+5) || //B5
                             ( index == 36+17) || //C17
                             ( index == 54+13) //D13
                         );
-        IS31FL3731_set_led_control_register(index, enabled, enabled, enabled);
+        is31fl3731_set_led_control_register(index, enabled, enabled, enabled);
     }
-    IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0);
-    IS31FL3731_update_led_control_registers(DRIVER_ADDR_2, 1);
+    is31fl3731_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3731_update_led_control_registers(DRIVER_ADDR_2, 1);
 }
 
 static void flush(void) {
-    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
-    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
+    is31fl3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
+    is31fl3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
 }
 
 static void set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
-    IS31FL3731_set_color(index, red, green, blue);
+    is31fl3731_set_color(index, red, green, blue);
 }
 
 static void set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
-    IS31FL3731_set_color_all( red, green, blue );
+    is31fl3731_set_color_all( red, green, blue );
 }