Merge pull request qmk#2 from NapOli1084/elora-fix-init-user

Fix missing calls to user's keyboard init for elora
cpcf · Jan 29, 2024 · 3f7358e · 3f7358e
2 parents 8273394 + 68dcb2a
commit 3f7358e
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/keyboards/splitkb/elora/rev1/rev1.c b/keyboards/splitkb/elora/rev1/rev1.c
@@ -38,18 +38,18 @@ static void enter_standby_mode(void) {
         // - deinit PLL
         // - MEMPOWERDOWN
         // - QSPI power-down (idle use is 10-50 uA)
-    
+
         // The RP2040 *should* be able to power-down to about 180uA,
         // while the QSPI chip can do 1-15 uA.
-    
+
         // Additional 3V3 power usage which can't be disabled:
         // - Matrix SPI NOT gate: 0.1-4 uA
         // - Matrix SPI tri-state buffer: 0.1-10 uA
         // - Shift registers: 5x 0.1-2 uA
-    
+
         // Turns off the crystal oscillator until the core is woken by an interrupt.
         // This will block and hence the entire system will stop, until an interrupt wakes it up.
-        // This function will continue to block until the oscillator becomes stable after its wakeup. 
+        // This function will continue to block until the oscillator becomes stable after its wakeup.
         xosc_dormant();
     }
 }
@@ -80,12 +80,16 @@ void keyboard_pre_init_kb(void) {
     // We have to get the SPI interface working quite early,
     // So make sure it is available well before we need it
     spi_init();
+
+    keyboard_pre_init_user();
 }
 
 void keyboard_post_init_kb(void) {
     #ifdef MYRIAD_ENABLE
     myriad_init();
     #endif
+
+    keyboard_post_init_user();
 }
 
 //// Matrix functionality
@@ -161,7 +165,7 @@ void encoder_read_pads_from(bool pads[], matrix_row_t mat[]) {
     // First two matrix rows:
     //
     // Pin  A   B   C   D   E   F   G   H
-    // Left: 
+    // Left:
     //   { __, __, __, __, __, __, A1, B1 },
     //   { A3, B3, A2, B2, __, __, __, __ }
     // Right:
@@ -268,7 +272,7 @@ bool oled_task_kb(void) {
         static const char PROGMEM elora_logo[] = {
             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,192,224,224,240,248,120, 56, 60,188,158,158,222,206,207,207,207,239,239,239,239,239,239,207,207,207,206,222,158,158,188, 60, 56,120,248,240,224,224,192,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192,224,248,252,126, 31,143,199,227,243,249,124, 60, 30, 31, 15,  7,  7,  3,  3,  3,131,193,225,241,249,253,255,255,255,255,127, 63, 31, 15,  7,  7,  7,143,223,254,252,252,249,243,227,199,143, 31,126,252,248,224,192,  0,  0,  0,  0,  0,
             0,192,240,254,255, 63,  7,227,248,252,127, 31, 15,  3,  1,  0,  0,  0,128,192,224,240,248,252,254,255,255,255,127, 63, 31, 15,  7,  3,  1,128,192,224,240,248,252,254,255,255,255,255,127, 63, 31, 15,  7, 15, 31,255,252,248,227,  7, 63,255,254,240,192,  0,252,255,255,255,  1,224,255,255,255,  7,  0,  0,  0,  0,  0,  0,  0,  0, 31, 31, 31, 31, 31, 15,  7,  3,  1,  0,  0,  0,240,248,252,254,255,255,255,255,127, 63, 31, 15,  7,  3,  1,128,192,224,240,248,252,254,255,255,255,255,255,255,224,  1,255,255,255,252,
-            63,255,255,255,128,  7,255,255,255,224,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,192,224,240,248,248,248,248,248,248,  0,  3,  3,  3,  3,  3,  3,  1,128,192,224,240,248,252,254,255,255,255,127, 63, 31, 15,  7,  3,  1,224,255,255,255,  7,128,255,255,255, 63,  0,  3, 15,127,255,252,224,199, 31, 63,254,248,240,192,128,  0,  0,  0,  0, 31, 31, 31, 31, 31, 31, 15,  7,  3,  1,  0,  0,  0,  0,  0,  0, 62, 63, 63, 63, 63, 63, 31, 15,  7,  3,  1,  0,  0,  0,128,192,240,248,254, 63, 31,199,224,252,255,127, 15,  3,  0, 
+            63,255,255,255,128,  7,255,255,255,224,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,192,224,240,248,248,248,248,248,248,  0,  3,  3,  3,  3,  3,  3,  1,128,192,224,240,248,252,254,255,255,255,127, 63, 31, 15,  7,  3,  1,224,255,255,255,  7,128,255,255,255, 63,  0,  3, 15,127,255,252,224,199, 31, 63,254,248,240,192,128,  0,  0,  0,  0, 31, 31, 31, 31, 31, 31, 15,  7,  3,  1,  0,  0,  0,  0,  0,  0, 62, 63, 63, 63, 63, 63, 31, 15,  7,  3,  1,  0,  0,  0,128,192,240,248,254, 63, 31,199,224,252,255,127, 15,  3,  0,
             0,  0,  0,  0,  0,  3,  7, 31, 63,126,248,241,227,199,207,159, 62, 60,120,248,240,224,224,192,192,192,192,128,128,128,128,128,128,128,128,128,128,192,192,192,192,224,224,240,248,120, 60, 62,159,207,199,227,241,248,126, 63, 31,  7,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  3,  7,  7, 15, 31, 30, 28, 60, 61,121,121,123,115,243,243,243,247,247,247,247,247,247,243,243,243,115,123,121,121, 61, 60, 28, 30, 31, 15,  7,  7,  3,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
         };
         // clang-format on