diff options
Diffstat (limited to 'tmk_core/common/keyboard.c')
| -rw-r--r-- | tmk_core/common/keyboard.c | 43 | 
1 files changed, 30 insertions, 13 deletions
| diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index ce3255c069..3d6092e71c 100644 --- a/tmk_core/common/keyboard.c +++ b/tmk_core/common/keyboard.c @@ -34,11 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #ifdef BACKLIGHT_ENABLE  #    include "backlight.h"  #endif -#ifdef BOOTMAGIC_ENABLE -#    include "bootmagic.h" -#else -#    include "magic.h" -#endif  #ifdef MOUSEKEY_ENABLE  #    include "mousekey.h"  #endif @@ -54,6 +49,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #ifdef RGBLIGHT_ENABLE  #    include "rgblight.h"  #endif +#ifdef LED_MATRIX_ENABLE +#    include "led_matrix.h" +#endif  #ifdef RGB_MATRIX_ENABLE  #    include "rgb_matrix.h"  #endif @@ -96,6 +94,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #ifdef DIP_SWITCH_ENABLE  #    include "dip_switch.h"  #endif +#ifdef STM32_EEPROM_ENABLE +#    include "eeprom_stm32.h" +#endif +#ifdef EEPROM_DRIVER +#    include "eeprom_driver.h" +#endif  static uint32_t last_input_modification_time = 0;  uint32_t        last_input_activity_time(void) { return last_input_modification_time; } @@ -233,6 +237,12 @@ void keyboard_setup(void) {      disable_jtag();  #endif      print_set_sendchar(sendchar); +#ifdef STM32_EEPROM_ENABLE +    EEPROM_Init(); +#endif +#ifdef EEPROM_DRIVER +    eeprom_driver_init(); +#endif      matrix_setup();      keyboard_pre_init_kb();  } @@ -270,6 +280,15 @@ __attribute__((weak)) void housekeeping_task_kb(void) {}   */  __attribute__((weak)) void housekeeping_task_user(void) {} +/** \brief housekeeping_task + * + * Invokes hooks for executing code after QMK is done after each loop iteration. + */ +void housekeeping_task(void) { +    housekeeping_task_kb(); +    housekeeping_task_user(); +} +  /** \brief keyboard_init   *   * FIXME: needs doc @@ -296,11 +315,6 @@ void keyboard_init(void) {  #ifdef ADB_MOUSE_ENABLE      adb_mouse_init();  #endif -#ifdef BOOTMAGIC_ENABLE -    bootmagic(); -#else -    magic(); -#endif  #ifdef BACKLIGHT_ENABLE      backlight_init();  #endif @@ -337,6 +351,9 @@ void keyboard_init(void) {   * This is differnet than keycode events as no layer processing, or filtering occurs.   */  void switch_events(uint8_t row, uint8_t col, bool pressed) { +#if defined(LED_MATRIX_ENABLE) +    process_led_matrix(row, col, pressed); +#endif  #if defined(RGB_MATRIX_ENABLE)      process_rgb_matrix(row, col, pressed);  #endif @@ -366,9 +383,6 @@ void keyboard_task(void) {      bool encoders_changed = false;  #endif -    housekeeping_task_kb(); -    housekeeping_task_user(); -      uint8_t matrix_changed = matrix_scan();      if (matrix_changed) last_matrix_activity_trigger(); @@ -422,6 +436,9 @@ MATRIX_LOOP_END:      rgblight_task();  #endif +#ifdef LED_MATRIX_ENABLE +    led_matrix_task(); +#endif  #ifdef RGB_MATRIX_ENABLE      rgb_matrix_task();  #endif | 
