Usbasploader bootloader option addition (#6304)

[qmk_firmware.git] / tmk_core / common / keyboard.c

diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
index d223001160a7b1a425e08d8dcc76a8c91a3f6697..85d25254808946a0a627b35f8e2470278daf1a7f 100644 (file)
--- a/tmk_core/common/keyboard.c
+++ b/tmk_core/common/keyboard.c
@@ -75,6 +75,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef QWIIC_ENABLE
 #   include "qwiic.h"
 #endif
+#ifdef OLED_DRIVER_ENABLE
+    #include "oled_driver.h"
+#endif
+#ifdef VELOCIKEY_ENABLE
+  #include "velocikey.h"
+#endif
 
 #ifdef MATRIX_HAS_GHOST
 extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
@@ -139,6 +145,40 @@ __attribute__ ((weak))
 void matrix_setup(void) {
 }
 
+/** \brief keyboard_pre_init_user
+ *
+ * FIXME: needs doc
+ */
+__attribute__ ((weak))
+void keyboard_pre_init_user(void) { }
+
+/** \brief keyboard_pre_init_kb
+ *
+ * FIXME: needs doc
+ */
+__attribute__ ((weak))
+void keyboard_pre_init_kb(void) {
+  keyboard_pre_init_user();
+}
+
+/** \brief keyboard_post_init_user
+ *
+ * FIXME: needs doc
+ */
+
+__attribute__ ((weak))
+void keyboard_post_init_user() {}
+
+/** \brief keyboard_post_init_kb
+ *
+ * FIXME: needs doc
+ */
+
+__attribute__ ((weak))
+void keyboard_post_init_kb(void) {
+  keyboard_post_init_user();
+}
+
 /** \brief keyboard_setup
  *
  * FIXME: needs doc
@@ -146,6 +186,7 @@ void matrix_setup(void) {
 void keyboard_setup(void) {
     disable_jtag();
     matrix_setup();
+    keyboard_pre_init_kb();
 }
 
 /** \brief is_keyboard_master
@@ -163,10 +204,13 @@ bool is_keyboard_master(void) {
  */
 void keyboard_init(void) {
     timer_init();
-    matrix_init();    
+    matrix_init();
 #ifdef QWIIC_ENABLE
     qwiic_init();
 #endif
+#ifdef OLED_DRIVER_ENABLE
+    oled_init(OLED_ROTATION_0);
+#endif
 #ifdef PS2_MOUSE_ENABLE
     ps2_mouse_init();
 #endif
@@ -199,6 +243,7 @@ void keyboard_init(void) {
 #if defined(NKRO_ENABLE) && defined(FORCE_NKRO)
     keymap_config.nkro = 1;
 #endif
+    keyboard_post_init_kb(); /* Always keep this last */
 }
 
 /** \brief Keyboard task: Do keyboard routine jobs
@@ -223,7 +268,11 @@ void keyboard_task(void)
     uint8_t keys_processed = 0;
 #endif
 
-    matrix_scan();    
+#if defined(OLED_DRIVER_ENABLE) && !defined(OLED_DISABLE_TIMEOUT)
+    uint8_t ret = matrix_scan();
+#else
+    matrix_scan();
+#endif
 
     if (is_keyboard_master()) {
         for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
@@ -231,7 +280,7 @@ void keyboard_task(void)
             matrix_change = matrix_row ^ matrix_prev[r];
             if (matrix_change) {
 #ifdef MATRIX_HAS_GHOST
-                if (has_ghost_in_row(r, matrix_row)) continue;
+                if (has_ghost_in_row(r, matrix_row)) { continue; }
 #endif
                 if (debug_matrix) matrix_print();
                 for (uint8_t c = 0; c < MATRIX_COLS; c++) {
@@ -267,6 +316,15 @@ MATRIX_LOOP_END:
     qwiic_task();
 #endif
 
+#ifdef OLED_DRIVER_ENABLE
+    oled_task();
+#ifndef OLED_DISABLE_TIMEOUT
+    // Wake up oled if user is using those fabulous keys!
+    if (ret)
+        oled_on();
+#endif
+#endif
+
 #ifdef MOUSEKEY_ENABLE
     // mousekey repeat & acceleration
     mousekey_task();
@@ -300,6 +358,10 @@ MATRIX_LOOP_END:
     midi_task();
 #endif
 
+#ifdef VELOCIKEY_ENABLE
+    if (velocikey_enabled()) { velocikey_decelerate();  }
+#endif
+
     // update LED
     if (led_status != host_keyboard_leds()) {
         led_status = host_keyboard_leds();