fix: improper usage of keyboard/user-level functions (#22652)

1 files changed, 28 insertions, 22 deletions

diff --git a/keyboards/aeboards/ext65/rev2/rev2.c b/keyboards/aeboards/ext65/rev2/rev2.c
index 6fe2d469dc..934553abcf 100644
--- a/keyboards/aeboards/ext65/rev2/rev2.c
+++ b/keyboards/aeboards/ext65/rev2/rev2.c
@@ -17,16 +17,18 @@
 #include "quantum.h"
 
 // Tested and verified working on ext65rev2
-void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); }
+void matrix_io_delay(void) {
+    __asm__ volatile("nop\nnop\nnop\n");
+}
 
 #ifdef OLED_ENABLE
 void board_init(void) {
-  SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;
-  SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP);
+    SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;
+    SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP);
 }
 
 oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
-    return OLED_ROTATION_90;  // rotates the display 90 degrees
+    return OLED_ROTATION_90; // rotates the display 90 degrees
 }
 
 void render_layer_state(void) {
@@ -55,26 +57,31 @@ void render_mod_status(uint8_t modifiers) {
 }
 
 bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
     render_layer_state();
     render_keylock_status(host_keyboard_led_state());
-    render_mod_status(get_mods()|get_oneshot_mods());
-    return false;
+    render_mod_status(get_mods() | get_oneshot_mods());
+    return true;
 }
 
 #else
 
-void keyboard_pre_init_user(void) {
-  // Call the keyboard pre init code.
-  // Set our LED pins as output
-  setPinOutput(B4);
-  setPinOutput(B3);
-  setPinOutput(A15);
-  setPinOutput(A14);
+void keyboard_pre_init_kb(void) {
+    // Call the keyboard pre init code.
+    // Set our LED pins as output
+    setPinOutput(B4);
+    setPinOutput(B3);
+    setPinOutput(A15);
+    setPinOutput(A14);
+
+    keyboard_pre_init_user();
 }
 
 bool led_update_kb(led_t led_state) {
     bool res = led_update_user(led_state);
-    if(res) {
+    if (res) {
         writePin(B4, led_state.num_lock);
         writePin(B3, led_state.caps_lock);
         writePin(A15, led_state.scroll_lock);
@@ -84,14 +91,13 @@ bool led_update_kb(led_t led_state) {
 
 layer_state_t layer_state_set_kb(layer_state_t state) {
     switch (get_highest_layer(state)) {
-      case 1:
-        writePinHigh(A14);
-        break;
-      default: //  for any other layers, or the default layer
-        writePinLow(A14);
-        break;
-      }
+        case 1:
+            writePinHigh(A14);
+            break;
+        default: //  for any other layers, or the default layer
+            writePinLow(A14);
+            break;
+    }
     return layer_state_set_user(state);
 }
 #endif
-