From 48093000e1a8fbe7fc25a43aea3f75913a634d53 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 8 Oct 2022 23:30:51 +0100
Subject: [PATCH] Various keyboard fixes (#18649)

---
 keyboards/dailycraft/sandbox/sandbox.c     |  2 +-
 keyboards/duck/jetfire/indicator_leds.h    |  2 +-
 keyboards/duck/jetfire/jetfire.c           | 61 +++-------------------
 keyboards/duck/octagon/v2/indicator_leds.c |  2 +-
 keyboards/duck/octagon/v2/indicator_leds.h |  2 +-
 keyboards/dyz/synthesis60/synthesis60.c    |  2 +-
 keyboards/yandrstudio/nz64/nz64.c          |  2 +-
 7 files changed, 14 insertions(+), 59 deletions(-)

diff --git a/keyboards/dailycraft/sandbox/sandbox.c b/keyboards/dailycraft/sandbox/sandbox.c
index 9f9aa48190b..0b576a82914 100644
--- a/keyboards/dailycraft/sandbox/sandbox.c
+++ b/keyboards/dailycraft/sandbox/sandbox.c
@@ -17,7 +17,7 @@
 #include "sandbox.h"
 
 #ifdef OLED_ENABLE
-bool oled_task_user(void) {
+bool oled_task_kb(void) {
     if (!oled_task_user()) { return false; }
     switch (get_highest_layer(layer_state)) {
         case 0:
diff --git a/keyboards/duck/jetfire/indicator_leds.h b/keyboards/duck/jetfire/indicator_leds.h
index 695e1db6d41..d94709d1cb1 100644
--- a/keyboards/duck/jetfire/indicator_leds.h
+++ b/keyboards/duck/jetfire/indicator_leds.h
@@ -6,6 +6,6 @@ void backlight_init_ports(void);
 void backlight_set_state(bool cfg[7]);
 void backlight_update_state(void);
 void backlight_toggle_rgb(bool enabled);
-void backlight_set_rgb(uint8_t cfg[17][3]);
+void backlight_set_rgb(uint8_t cfg[RGBLED_NUM][3]);
 void backlight_set(uint8_t level);
 void send_color(uint8_t r, uint8_t g, uint8_t b, enum Device device);
diff --git a/keyboards/duck/jetfire/jetfire.c b/keyboards/duck/jetfire/jetfire.c
index 9bb02ca22cc..d648287156f 100644
--- a/keyboards/duck/jetfire/jetfire.c
+++ b/keyboards/duck/jetfire/jetfire.c
@@ -44,61 +44,16 @@ uint8_t backlight_state_led = 1<<STATE_LED_LAYER_0;
 
 void backlight_toggle_rgb(bool enabled)
 {
+  uint8_t rgb[RGBLED_NUM][3] = { 0 };
+
   if(enabled) {
-    uint8_t rgb[RGBLED_NUM][3] = {
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-      {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b}
-    };
-    backlight_set_rgb(rgb);
-  } else {
-    uint8_t rgb[RGBLED_NUM][3] = {
-      {0, 0, 0},
-      {0, 0, 0},
-      {0, 0, 0},
-      {0, 0, 0},
-      {0, 0, 0},
-      {0, 0, 0},
-      {0, 0, 0},
-      {0, 0, 0},
-      {0, 0, 0},
-      {0, 0, 0},
-      {0, 0, 0},
-      {0, 0, 0},
-      {0, 0, 0},
-      {0, 0, 0},
-      {0, 0, 0},
-      {0, 0, 0},
-      {0, 0, 0},
-      {0, 0, 0},
-      {0, 0, 0},
-      {0, 0, 0},
-      {0, 0, 0},
-      {0, 0, 0},
-      {0, 0, 0}
-    };
-    backlight_set_rgb(rgb);
+    for(uint8_t i = 0; i < RGBLED_NUM; ++i) {
+      rgb[i][0] = backlight_rgb_r;
+      rgb[i][1] = backlight_rgb_g;
+      rgb[i][2] = backlight_rgb_b;
+    }
   }
+  backlight_set_rgb(rgb);
 }
 
 void backlight_set_rgb(uint8_t cfg[RGBLED_NUM][3])
diff --git a/keyboards/duck/octagon/v2/indicator_leds.c b/keyboards/duck/octagon/v2/indicator_leds.c
index 116306fb712..fad5c8d4dc8 100644
--- a/keyboards/duck/octagon/v2/indicator_leds.c
+++ b/keyboards/duck/octagon/v2/indicator_leds.c
@@ -113,7 +113,7 @@ void send_color(uint8_t r, uint8_t g, uint8_t b, enum Device device) {
 }
 
 // Port from backlight_set_state
-void indicator_leds_set(bool leds[8]) {
+void indicator_leds_set(bool leds[7]) {
   cli();
   send_color(leds[1] ? 255 : 0, leds[2] ? 255 : 0, leds[0] ? 255 : 0, Device_STATUSLED);
   send_color(leds[4] ? 255 : 0, leds[3] ? 255 : 0, leds[5] ? 255 : 0, Device_STATUSLED);
diff --git a/keyboards/duck/octagon/v2/indicator_leds.h b/keyboards/duck/octagon/v2/indicator_leds.h
index ad3ec54f52a..2c1bfe56243 100644
--- a/keyboards/duck/octagon/v2/indicator_leds.h
+++ b/keyboards/duck/octagon/v2/indicator_leds.h
@@ -1,6 +1,6 @@
 #include "duck_led/duck_led.h"
 
-void indicator_leds_set(bool leds[8]);
+void indicator_leds_set(bool leds[7]);
 void backlight_toggle_rgb(bool enabled);
 void backlight_set_rgb(uint8_t cfg[17][3]);
 void backlight_init_ports(void);
diff --git a/keyboards/dyz/synthesis60/synthesis60.c b/keyboards/dyz/synthesis60/synthesis60.c
index c56a61b1ec7..e65bbe46972 100644
--- a/keyboards/dyz/synthesis60/synthesis60.c
+++ b/keyboards/dyz/synthesis60/synthesis60.c
@@ -17,7 +17,7 @@
 
 #ifdef OLED_ENABLE
 bool oled_task_kb(void) {
-    if (!oled_task_kb()) { return false; }
+    if (!oled_task_user()) { return false; }
     // Host Keyboard Layer Status
     oled_write_P(PSTR("Synthesis60\nLayer: "), false);
     // Host Keyboard LED Status
diff --git a/keyboards/yandrstudio/nz64/nz64.c b/keyboards/yandrstudio/nz64/nz64.c
index 8b64d36fd1d..f1777ccae34 100644
--- a/keyboards/yandrstudio/nz64/nz64.c
+++ b/keyboards/yandrstudio/nz64/nz64.c
@@ -58,7 +58,7 @@ led_config_t g_led_config = {
 };
 
 bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
-    if (!rgb_matrix_indicators_advanced_kb(led_min, led_max)) {
+    if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
         return false;
     }
     if (rgb_matrix_is_enabled()) {