diff options
Diffstat (limited to 'quantum/matrix.c')
| -rw-r--r-- | quantum/matrix.c | 326 | 
1 files changed, 221 insertions, 105 deletions
| diff --git a/quantum/matrix.c b/quantum/matrix.c index 3174e07390..07eb87bc36 100644 --- a/quantum/matrix.c +++ b/quantum/matrix.c @@ -25,37 +25,65 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #include "debug.h"  #include "util.h"  #include "matrix.h" +#include "timer.h" +  /* Set 0 if debouncing isn't needed */  #ifndef DEBOUNCING_DELAY  #   define DEBOUNCING_DELAY 5  #endif -static uint8_t debouncing = DEBOUNCING_DELAY; + +#if (DEBOUNCING_DELAY > 0) +    static uint16_t debouncing_time; +    static bool debouncing = false; +#endif + +#if (MATRIX_COLS <= 8) +#    define print_matrix_header()  print("\nr/c 01234567\n") +#    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row)) +#    define matrix_bitpop(i)       bitpop(matrix[i]) +#    define ROW_SHIFTER ((uint8_t)1) +#elif (MATRIX_COLS <= 16) +#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n") +#    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row)) +#    define matrix_bitpop(i)       bitpop16(matrix[i]) +#    define ROW_SHIFTER ((uint16_t)1) +#elif (MATRIX_COLS <= 32) +#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n") +#    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row)) +#    define matrix_bitpop(i)       bitpop32(matrix[i]) +#    define ROW_SHIFTER  ((uint32_t)1) +#endif + +#ifdef MATRIX_MASKED +    extern const matrix_row_t matrix_mask[]; +#endif  static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;  static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;  /* matrix state(1:on, 0:off) */  static matrix_row_t matrix[MATRIX_ROWS]; + +static matrix_row_t matrix_raw[MATRIX_ROWS];  static matrix_row_t matrix_debouncing[MATRIX_ROWS]; -#if DIODE_DIRECTION == ROW2COL -    static matrix_row_t matrix_reversed[MATRIX_COLS]; -    static matrix_row_t matrix_reversed_debouncing[MATRIX_COLS]; -#endif -#if MATRIX_COLS > 16 -    #define SHIFTER 1UL -#else -    #define SHIFTER 1 +#if (DIODE_DIRECTION == COL2ROW) +    static void init_cols(void); +    static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row); +    static void unselect_rows(void); +    static void select_row(uint8_t row); +    static void unselect_row(uint8_t row); +#else // ROW2COL +    static void init_rows(void); +    static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col); +    static void unselect_cols(void); +    static void unselect_col(uint8_t col); +    static void select_col(uint8_t col);  #endif -static matrix_row_t read_cols(void); -static void init_cols(void); -static void unselect_rows(void); -static void select_row(uint8_t row); -  __attribute__ ((weak))  void matrix_init_quantum(void) {      matrix_init_kb(); @@ -95,7 +123,7 @@ uint8_t matrix_cols(void) {  }  // void matrix_power_up(void) { -// #if DIODE_DIRECTION == COL2ROW +// #if (DIODE_DIRECTION == COL2ROW)  //     for (int8_t r = MATRIX_ROWS - 1; r >= 0; --r) {  //         /* DDRxn */  //         _SFR_IO8((row_pins[r] >> 4) + 1) |= _BV(row_pins[r] & 0xF); @@ -119,19 +147,26 @@ uint8_t matrix_cols(void) {  // }  void matrix_init(void) { +      // To use PORTF disable JTAG with writing JTD bit twice within four cycles. -    #ifdef __AVR_ATmega32U4__ +    #if  (defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) || defined(__AVR_ATmega32U4__))          MCUCR |= _BV(JTD);          MCUCR |= _BV(JTD);      #endif      // initialize row and col +#if (DIODE_DIRECTION == COL2ROW)      unselect_rows();      init_cols(); +#else // ROW2COL +    unselect_cols(); +    init_rows(); +#endif      // initialize matrix state: all keys off      for (uint8_t i=0; i < MATRIX_ROWS; i++) {          matrix[i] = 0; +        matrix_raw[i] = 0;          matrix_debouncing[i] = 0;      } @@ -141,71 +176,60 @@ void matrix_init(void) {  uint8_t matrix_scan(void)  { -#if DIODE_DIRECTION == COL2ROW -    for (uint8_t i = 0; i < MATRIX_ROWS; i++) { -        select_row(i); -        wait_us(30);  // without this wait read unstable value. -        matrix_row_t cols = read_cols(); -        if (matrix_debouncing[i] != cols) { -            matrix_debouncing[i] = cols; -            if (debouncing) { -                debug("bounce!: "); debug_hex(debouncing); debug("\n"); -            } -            debouncing = DEBOUNCING_DELAY; -        } -        unselect_rows(); -    } +#if (DIODE_DIRECTION == COL2ROW) -    if (debouncing) { -        if (--debouncing) { -            wait_ms(1); -        } else { -            for (uint8_t i = 0; i < MATRIX_ROWS; i++) { -                matrix[i] = matrix_debouncing[i]; +    // Set row, read cols +    for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) { +#       if (DEBOUNCING_DELAY > 0) +            bool matrix_changed = read_cols_on_row(matrix_debouncing, current_row); + +            if (matrix_changed) { +                debouncing = true; +                debouncing_time = timer_read();              } -        } + +#       else +            read_cols_on_row(matrix, current_row); +#       endif +      } -#else -    for (uint8_t i = 0; i < MATRIX_COLS; i++) { -        select_row(i); -        wait_us(30);  // without this wait read unstable value. -        matrix_row_t rows = read_cols(); -        if (matrix_reversed_debouncing[i] != rows) { -            matrix_reversed_debouncing[i] = rows; -            if (debouncing) { -                debug("bounce!: "); debug_hex(debouncing); debug("\n"); + +#else // ROW2COL + +    // Set col, read rows +    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) { +#       if (DEBOUNCING_DELAY > 0) +            bool matrix_changed = read_rows_on_col(matrix_debouncing, current_col); +            if (matrix_changed) { +                debouncing = true; +                debouncing_time = timer_read();              } -            debouncing = DEBOUNCING_DELAY; -        } -        unselect_rows(); +#       else +             read_rows_on_col(matrix, current_col); +#       endif +      } -    if (debouncing) { -        if (--debouncing) { -            wait_ms(1); -        } else { -            for (uint8_t i = 0; i < MATRIX_COLS; i++) { -                matrix_reversed[i] = matrix_reversed_debouncing[i]; +#endif + +#   if (DEBOUNCING_DELAY > 0) +        if (debouncing && (timer_elapsed(debouncing_time) > DEBOUNCING_DELAY)) { +            for (uint8_t i = 0; i < MATRIX_ROWS; i++) { +                matrix[i] = matrix_debouncing[i];              } +            debouncing = false;          } -    } -    for (uint8_t y = 0; y < MATRIX_ROWS; y++) { -        matrix_row_t row = 0; -        for (uint8_t x = 0; x < MATRIX_COLS; x++) { -            row |= ((matrix_reversed[x] & (1<<y)) >> y) << x; -        } -        matrix[y] = row; -    } -#endif +#   endif      matrix_scan_quantum(); -      return 1;  }  bool matrix_is_modified(void)  { +#if (DEBOUNCING_DELAY > 0)      if (debouncing) return false; +#endif      return true;  } @@ -218,15 +242,22 @@ bool matrix_is_on(uint8_t row, uint8_t col)  inline  matrix_row_t matrix_get_row(uint8_t row)  { +    // Matrix mask lets you disable switches in the returned matrix data. For example, if you have a +    // switch blocker installed and the switch is always pressed. +#ifdef MATRIX_MASKED +    return matrix[row] & matrix_mask[row]; +#else      return matrix[row]; +#endif  }  void matrix_print(void)  { -    print("\nr/c 0123456789ABCDEF\n"); +    print_matrix_header(); +      for (uint8_t row = 0; row < MATRIX_ROWS; row++) {          phex(row); print(": "); -        pbin_reverse16(matrix_get_row(row)); +        print_matrix_row(row);          print("\n");      }  } @@ -235,63 +266,148 @@ uint8_t matrix_key_count(void)  {      uint8_t count = 0;      for (uint8_t i = 0; i < MATRIX_ROWS; i++) { -        count += bitpop16(matrix[i]); +        count += matrix_bitpop(i);      }      return count;  } + + +#if (DIODE_DIRECTION == COL2ROW) +  static void init_cols(void)  { -#if DIODE_DIRECTION == COL2ROW -    for(int x = 0; x < MATRIX_COLS; x++) { -        int pin = col_pins[x]; -#else -    for(int x = 0; x < MATRIX_ROWS; x++) { -        int pin = row_pins[x]; -#endif -        _SFR_IO8((pin >> 4) + 1) &=  ~_BV(pin & 0xF); -        _SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); +    for(uint8_t x = 0; x < MATRIX_COLS; x++) { +        uint8_t pin = col_pins[x]; +        _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN +        _SFR_IO8((pin >> 4) + 2) |=  _BV(pin & 0xF); // HI      }  } -static matrix_row_t read_cols(void) +static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)  { -    matrix_row_t result = 0; +    // Store last value of row prior to reading +    matrix_row_t last_row_value = current_matrix[current_row]; -#if DIODE_DIRECTION == COL2ROW -    for(int x = 0; x < MATRIX_COLS; x++) {      -        int pin = col_pins[x]; -#else -    for(int x = 0; x < MATRIX_ROWS; x++) { -        int pin = row_pins[x]; -#endif -        result |= (_SFR_IO8(pin >> 4) & _BV(pin & 0xF)) ? 0 : (SHIFTER << x); +    // Clear data in matrix row +    current_matrix[current_row] = 0; + +    // Select row and wait for row selecton to stabilize +    select_row(current_row); +    wait_us(30); + +    // For each col... +    for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { + +        // Select the col pin to read (active low) +        uint8_t pin = col_pins[col_index]; +        uint8_t pin_state = (_SFR_IO8(pin >> 4) & _BV(pin & 0xF)); + +        // Populate the matrix row with the state of the col pin +        current_matrix[current_row] |=  pin_state ? 0 : (ROW_SHIFTER << col_index);      } -    return result; + +    // Unselect row +    unselect_row(current_row); + +    return (last_row_value != current_matrix[current_row]); +} + +static void select_row(uint8_t row) +{ +    uint8_t pin = row_pins[row]; +    _SFR_IO8((pin >> 4) + 1) |=  _BV(pin & 0xF); // OUT +    _SFR_IO8((pin >> 4) + 2) &= ~_BV(pin & 0xF); // LOW +} + +static void unselect_row(uint8_t row) +{ +    uint8_t pin = row_pins[row]; +    _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN +    _SFR_IO8((pin >> 4) + 2) |=  _BV(pin & 0xF); // HI  }  static void unselect_rows(void)  { -#if DIODE_DIRECTION == COL2ROW -    for(int x = 0; x < MATRIX_ROWS; x++) {  -        int pin = row_pins[x]; -#else -    for(int x = 0; x < MATRIX_COLS; x++) {  -        int pin = col_pins[x]; -#endif -        _SFR_IO8((pin >> 4) + 1) &=  ~_BV(pin & 0xF); -        _SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); +    for(uint8_t x = 0; x < MATRIX_ROWS; x++) { +        uint8_t pin = row_pins[x]; +        _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN +        _SFR_IO8((pin >> 4) + 2) |=  _BV(pin & 0xF); // HI      }  } -static void select_row(uint8_t row) +#else // ROW2COL + +static void init_rows(void)  { +    for(uint8_t x = 0; x < MATRIX_ROWS; x++) { +        uint8_t pin = row_pins[x]; +        _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN +        _SFR_IO8((pin >> 4) + 2) |=  _BV(pin & 0xF); // HI +    } +} -#if DIODE_DIRECTION == COL2ROW -    int pin = row_pins[row]; -#else -    int pin = col_pins[row]; -#endif -    _SFR_IO8((pin >> 4) + 1) |=  _BV(pin & 0xF); -    _SFR_IO8((pin >> 4) + 2) &= ~_BV(pin & 0xF); +static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) +{ +    bool matrix_changed = false; + +    // Select col and wait for col selecton to stabilize +    select_col(current_col); +    wait_us(30); + +    // For each row... +    for(uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) +    { + +        // Store last value of row prior to reading +        matrix_row_t last_row_value = current_matrix[row_index]; + +        // Check row pin state +        if ((_SFR_IO8(row_pins[row_index] >> 4) & _BV(row_pins[row_index] & 0xF)) == 0) +        { +            // Pin LO, set col bit +            current_matrix[row_index] |= (ROW_SHIFTER << current_col); +        } +        else +        { +            // Pin HI, clear col bit +            current_matrix[row_index] &= ~(ROW_SHIFTER << current_col); +        } + +        // Determine if the matrix changed state +        if ((last_row_value != current_matrix[row_index]) && !(matrix_changed)) +        { +            matrix_changed = true; +        } +    } + +    // Unselect col +    unselect_col(current_col); + +    return matrix_changed;  } + +static void select_col(uint8_t col) +{ +    uint8_t pin = col_pins[col]; +    _SFR_IO8((pin >> 4) + 1) |=  _BV(pin & 0xF); // OUT +    _SFR_IO8((pin >> 4) + 2) &= ~_BV(pin & 0xF); // LOW +} + +static void unselect_col(uint8_t col) +{ +    uint8_t pin = col_pins[col]; +    _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN +    _SFR_IO8((pin >> 4) + 2) |=  _BV(pin & 0xF); // HI +} + +static void unselect_cols(void) +{ +    for(uint8_t x = 0; x < MATRIX_COLS; x++) { +        uint8_t pin = col_pins[x]; +        _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN +        _SFR_IO8((pin >> 4) + 2) |=  _BV(pin & 0xF); // HI +    } +} + +#endif | 
