diff options
Diffstat (limited to 'quantum/keyboard.c')
| -rw-r--r-- | quantum/keyboard.c | 20 | 
1 files changed, 5 insertions, 15 deletions
| diff --git a/quantum/keyboard.c b/quantum/keyboard.c index ce4f06ae69..1dccd48e2f 100644 --- a/quantum/keyboard.c +++ b/quantum/keyboard.c @@ -211,17 +211,6 @@ static inline bool has_ghost_in_row(uint8_t row, matrix_row_t rowdata) {  #endif -void disable_jtag(void) { -// To use PF4-7 (PC2-5 on ATmega32A), disable JTAG by writing JTD bit twice within four cycles. -#if (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) || defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__)) -    MCUCR |= _BV(JTD); -    MCUCR |= _BV(JTD); -#elif defined(__AVR_ATmega32A__) -    MCUCSR |= _BV(JTD); -    MCUCSR |= _BV(JTD); -#endif -} -  /** \brief matrix_setup   *   * FIXME: needs doc @@ -263,9 +252,6 @@ __attribute__((weak)) void keyboard_post_init_kb(void) {   * FIXME: needs doc   */  void keyboard_setup(void) { -#ifndef NO_JTAG_DISABLE -    disable_jtag(); -#endif      print_set_sendchar(sendchar);  #ifdef EEPROM_DRIVER      eeprom_driver_init(); @@ -489,7 +475,7 @@ bool matrix_scan_task(void) {      // we can get here with some keys processed now.      if (!keys_processed)  #endif -        action_exec(TICK); +        action_exec(TICK_EVENT);  MATRIX_LOOP_END: @@ -562,6 +548,10 @@ void quantum_task(void) {  #ifdef AUTO_SHIFT_ENABLE      autoshift_matrix_scan();  #endif + +#ifdef SECURE_ENABLE +    secure_task(); +#endif  }  /** \brief Keyboard task: Do keyboard routine jobs | 
