~ruther/qmk_firmware

c1297ceb972d45407cc1f518fd0527efda7ee796 — Stefan Kerkmann 3 years ago a3e9b34
[Core] Remove matrix_is_modified() and debounce_is_active() (#15349)

52 files changed, 0 insertions(+), 298 deletions(-)

M keyboards/40percentclub/ut47/matrix.c
M keyboards/ai03/orbit/matrix.c
M keyboards/amj96/matrix.c
M keyboards/angel64/alpha/matrix.c
M keyboards/angel64/rev1/matrix.c
M keyboards/bpiphany/kitten_paw/matrix.c
M keyboards/bpiphany/pegasushoof/2013/matrix.c
M keyboards/converter/palm_usb/matrix.c
M keyboards/converter/sun_usb/matrix.c
M keyboards/converter/usb_usb/custom_matrix.cpp
M keyboards/dc01/arrow/matrix.c
M keyboards/dc01/left/matrix.c
M keyboards/dc01/numpad/matrix.c
M keyboards/dc01/right/matrix.c
M keyboards/dm9records/ergoinu/matrix.c
M keyboards/duck/jetfire/matrix.c
M keyboards/ergodox_stm32/matrix.c
M keyboards/ergotaco/matrix.c
M keyboards/gboards/gergoplex/matrix.c
M keyboards/georgi/matrix.c
M keyboards/gergo/matrix.c
M keyboards/handwired/dactyl/matrix.c
M keyboards/handwired/frenchdev/matrix.c
M keyboards/handwired/not_so_minidox/matrix.c
M keyboards/handwired/promethium/matrix.c
M keyboards/handwired/pterodactyl/matrix.c
M keyboards/helix/pico/matrix.c
M keyboards/helix/rev1/matrix.c
M keyboards/helix/rev2/matrix.c
M keyboards/hhkb/ansi/matrix.c
M keyboards/hhkb/jp/matrix.c
M keyboards/hid_liber/matrix.c
M keyboards/kinesis/alvicstep/matrix.c
M keyboards/meira/matrix.c
M keyboards/nek_type_a/matrix.c
M keyboards/redscarf_iiplus/verb/matrix.c
M keyboards/redscarf_iiplus/verc/matrix.c
M keyboards/redscarf_iiplus/verd/matrix.c
M keyboards/sirius/unigo66/custom_matrix.cpp
M keyboards/sixkeyboard/matrix.c
M keyboards/sx60/matrix.c
M keyboards/thedogkeyboard/matrix.c
M keyboards/yosino58/rev1/matrix.c
M quantum/debounce.h
M quantum/debounce/asym_eager_defer_pk.c
M quantum/debounce/none.c
M quantum/debounce/sym_defer_g.c
M quantum/debounce/sym_defer_pk.c
M quantum/debounce/sym_eager_pk.c
M quantum/debounce/sym_eager_pr.c
M quantum/matrix.h
M quantum/matrix_common.c
M keyboards/40percentclub/ut47/matrix.c => keyboards/40percentclub/ut47/matrix.c +0 -6
@@ 104,12 104,6 @@ uint8_t matrix_scan(void)
    return 1;
}

bool matrix_is_modified(void)
{
    if (debouncing) return false;
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/ai03/orbit/matrix.c => keyboards/ai03/orbit/matrix.c +0 -5
@@ 83,11 83,6 @@ inline uint8_t matrix_rows(void) { return MATRIX_ROWS; }

inline uint8_t matrix_cols(void) { return MATRIX_COLS; }

bool matrix_is_modified(void) {
  if (debounce_active()) return false;
  return true;
}

inline bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & ((matrix_row_t)1 << col)); }

inline matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; }

M keyboards/amj96/matrix.c => keyboards/amj96/matrix.c +0 -6
@@ 108,12 108,6 @@ uint8_t matrix_scan(void)
    return 1;
}

bool matrix_is_modified(void)
{
    if (debouncing) return false;
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/angel64/alpha/matrix.c => keyboards/angel64/alpha/matrix.c +0 -7
@@ 90,13 90,6 @@ uint8_t matrix_cols(void) {
    return MATRIX_COLS;
}

//Deprecated.
bool matrix_is_modified(void)
{
    if (debounce_active()) return false;
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/angel64/rev1/matrix.c => keyboards/angel64/rev1/matrix.c +0 -7
@@ 90,13 90,6 @@ uint8_t matrix_cols(void) {
    return MATRIX_COLS;
}

//Deprecated.
bool matrix_is_modified(void)
{
    if (debounce_active()) return false;
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/bpiphany/kitten_paw/matrix.c => keyboards/bpiphany/kitten_paw/matrix.c +0 -7
@@ 117,13 117,6 @@ uint8_t matrix_scan(void) {
  return 1;
}

bool matrix_is_modified(void) {
  if (debouncing)
    return false;
  else
    return true;
}

inline bool matrix_is_on(uint8_t row, uint8_t col) {
  return (matrix[row] & ((matrix_row_t)1<<col));
}

M keyboards/bpiphany/pegasushoof/2013/matrix.c => keyboards/bpiphany/pegasushoof/2013/matrix.c +0 -7
@@ 110,13 110,6 @@ uint8_t matrix_scan(void)
	return 1;
}

bool matrix_is_modified(void)
{
	if (debouncing)
		return false;
	return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/converter/palm_usb/matrix.c => keyboards/converter/palm_usb/matrix.c +0 -7
@@ 58,8 58,6 @@ static uint16_t disconnect_counter = 0;
#define COL(code)    ((code & COL_MASK) )
#define KEYUP(code) ((code & KEY_MASK) >>7 )

static bool is_modified = false;

__attribute__ ((weak))
void matrix_init_kb(void) {
    matrix_init_user();


@@ 354,11 352,6 @@ uint8_t matrix_scan(void)
    return code;
}

bool matrix_is_modified(void)
{
    return is_modified;
}

inline
bool matrix_has_ghost(void)
{

M keyboards/converter/sun_usb/matrix.c => keyboards/converter/sun_usb/matrix.c +0 -7
@@ 38,8 38,6 @@ static uint8_t matrix[MATRIX_ROWS];
#define ROW(code)      ((code>>3)&0xF)
#define COL(code)      (code&0x07)

static bool is_modified = false;

__attribute__ ((weak))
void matrix_init_kb(void) {
    matrix_init_user();


@@ 154,11 152,6 @@ uint8_t matrix_scan(void)
    return code;
}

bool matrix_is_modified(void)
{
    return is_modified;
}

inline
bool matrix_has_ghost(void)
{

M keyboards/converter/usb_usb/custom_matrix.cpp => keyboards/converter/usb_usb/custom_matrix.cpp +0 -4
@@ 192,10 192,6 @@ extern "C"
        return 1;
    }

    bool matrix_is_modified(void) {
        return matrix_is_mod;
    }

    bool matrix_is_on(uint8_t row, uint8_t col) {
        uint8_t code = CODE(row, col);


M keyboards/dc01/arrow/matrix.c => keyboards/dc01/arrow/matrix.c +0 -8
@@ 205,14 205,6 @@ uint8_t matrix_scan(void)
    return 1;
}

bool matrix_is_modified(void)
{
#if (DEBOUNCE > 0)
    if (debouncing) return false;
#endif
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/dc01/left/matrix.c => keyboards/dc01/left/matrix.c +0 -8
@@ 230,14 230,6 @@ if (i2c_transaction(SLAVE_I2C_ADDRESS_NUMPAD, 0x1FFFF, 11)) {
    return 1;
}

bool matrix_is_modified(void)
{
#if (DEBOUNCE > 0)
    if (debouncing) return false;
#endif
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/dc01/numpad/matrix.c => keyboards/dc01/numpad/matrix.c +0 -8
@@ 205,14 205,6 @@ uint8_t matrix_scan(void)
    return 1;
}

bool matrix_is_modified(void)
{
#if (DEBOUNCE > 0)
    if (debouncing) return false;
#endif
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/dc01/right/matrix.c => keyboards/dc01/right/matrix.c +0 -8
@@ 206,14 206,6 @@ uint8_t matrix_scan(void)
    return 1;
}

bool matrix_is_modified(void)
{
#if (DEBOUNCE > 0)
    if (debouncing) return false;
#endif
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/dm9records/ergoinu/matrix.c => keyboards/dm9records/ergoinu/matrix.c +0 -6
@@ 223,12 223,6 @@ void matrix_slave_scan(void) {
  }
}

bool matrix_is_modified(void)
{
  if (debouncing) return false;
  return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/duck/jetfire/matrix.c => keyboards/duck/jetfire/matrix.c +0 -6
@@ 116,12 116,6 @@ uint8_t matrix_scan(void)
    return 1;
}

bool matrix_is_modified(void)
{
    if (debouncing) return false;
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/ergodox_stm32/matrix.c => keyboards/ergodox_stm32/matrix.c +0 -4
@@ 119,10 119,6 @@ uint8_t matrix_scan(void) {
  return 0;
}

bool matrix_is_modified(void) {
  return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col) {
  return (matrix[row] & (1 << col));

M keyboards/ergotaco/matrix.c => keyboards/ergotaco/matrix.c +0 -5
@@ 199,11 199,6 @@ uint8_t matrix_scan(void)
    return 1;
}

bool matrix_is_modified(void) // deprecated and evidently not called.
{
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/gboards/gergoplex/matrix.c => keyboards/gboards/gergoplex/matrix.c +0 -5
@@ 152,11 152,6 @@ uint8_t matrix_scan(void) {
    return 1;
}

bool matrix_is_modified(void)  // deprecated and evidently not called.
{
    return true;
}

inline bool         matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & ((matrix_row_t)1 << col)); }
inline matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; }


M keyboards/georgi/matrix.c => keyboards/georgi/matrix.c +0 -5
@@ 220,11 220,6 @@ uint8_t matrix_scan(void)
    return 1;
}

bool matrix_is_modified(void) // deprecated and evidently not called.
{
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/gergo/matrix.c => keyboards/gergo/matrix.c +0 -5
@@ 273,11 273,6 @@ uint8_t matrix_scan(void) {
    return 1;
}

bool matrix_is_modified(void) // deprecated and evidently not called.
{
    return true;
}

inline bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & ((matrix_row_t)1 << col)); }

inline matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; }

M keyboards/handwired/dactyl/matrix.c => keyboards/handwired/dactyl/matrix.c +0 -8
@@ 281,14 281,6 @@ uint8_t matrix_scan(void)
    return 1;
}

bool matrix_is_modified(void) // deprecated and evidently not called.
{
#if (DEBOUNCE > 0)
    if (debouncing) return false;
#endif
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/handwired/frenchdev/matrix.c => keyboards/handwired/frenchdev/matrix.c +0 -6
@@ 174,12 174,6 @@ uint8_t matrix_scan(void)
    return 1;
}

bool matrix_is_modified(void)
{
    if (debouncing) return false;
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/handwired/not_so_minidox/matrix.c => keyboards/handwired/not_so_minidox/matrix.c +0 -6
@@ 239,12 239,6 @@ void matrix_slave_scan(void) {
#endif
}

bool matrix_is_modified(void)
{
    if (debouncing) return false;
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/handwired/promethium/matrix.c => keyboards/handwired/promethium/matrix.c +0 -8
@@ 148,14 148,6 @@ uint8_t matrix_scan(void)
    return 1;
}

bool matrix_is_modified(void)
{
#if (DEBOUNCE > 0)
    if (debouncing) return false;
#endif
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)


M keyboards/handwired/pterodactyl/matrix.c => keyboards/handwired/pterodactyl/matrix.c +0 -8
@@ 282,14 282,6 @@ uint8_t matrix_scan(void)
    return 1;
}

bool matrix_is_modified(void) // deprecated and evidently not called.
{
#if (DEBOUNCE > 0)
    if (debouncing) return false;
#endif
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/helix/pico/matrix.c => keyboards/helix/pico/matrix.c +0 -6
@@ 273,12 273,6 @@ void matrix_slave_scan(void) {
#endif
}

bool matrix_is_modified(void)
{
    if (debouncing) return false;
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/helix/rev1/matrix.c => keyboards/helix/rev1/matrix.c +0 -6
@@ 239,12 239,6 @@ void matrix_slave_scan(void) {
#endif
}

bool matrix_is_modified(void)
{
    if (debouncing) return false;
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/helix/rev2/matrix.c => keyboards/helix/rev2/matrix.c +0 -6
@@ 287,12 287,6 @@ void matrix_slave_scan(void) {
#endif
}

bool matrix_is_modified(void)
{
    if (debouncing) return false;
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/hhkb/ansi/matrix.c => keyboards/hhkb/ansi/matrix.c +0 -9
@@ 163,15 163,6 @@ uint8_t matrix_scan(void)
    return 1;
}

bool matrix_is_modified(void)
{
    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
        if (matrix[i] != matrix_prev[i])
            return true;
    }
    return false;
}

inline
bool matrix_has_ghost(void)
{

M keyboards/hhkb/jp/matrix.c => keyboards/hhkb/jp/matrix.c +0 -9
@@ 164,15 164,6 @@ uint8_t matrix_scan(void)
    return 1;
}

bool matrix_is_modified(void)
{
    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
        if (matrix[i] != matrix_prev[i])
            return true;
    }
    return false;
}

inline
bool matrix_has_ghost(void)
{

M keyboards/hid_liber/matrix.c => keyboards/hid_liber/matrix.c +0 -6
@@ 218,12 218,6 @@ uint8_t matrix_scan(void)
    return 1;
}

bool matrix_is_modified(void)
{
    // NOTE: no longer used
    return true;
}

inline
bool matrix_has_ghost(void)
{

M keyboards/kinesis/alvicstep/matrix.c => keyboards/kinesis/alvicstep/matrix.c +0 -6
@@ 136,12 136,6 @@ uint8_t matrix_scan(void)
    return 1;
}

bool matrix_is_modified(void)
{
    if (debouncing) return false;
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/meira/matrix.c => keyboards/meira/matrix.c +0 -6
@@ 161,12 161,6 @@ uint8_t matrix_scan(void)
	return ret;
}

bool matrix_is_modified(void)
{
    if (debouncing) return false;
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/nek_type_a/matrix.c => keyboards/nek_type_a/matrix.c +0 -8
@@ 205,14 205,6 @@ uint8_t matrix_scan(void)
    return 1;
}

bool matrix_is_modified(void)
{
#if (DEBOUNCE > 0)
    if (debouncing) return false;
#endif
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/redscarf_iiplus/verb/matrix.c => keyboards/redscarf_iiplus/verb/matrix.c +0 -7
@@ 94,13 94,6 @@ uint8_t matrix_cols(void) {
    return MATRIX_COLS;
}

//Deprecated.
bool matrix_is_modified(void)
{
    if (debounce_active()) return false;
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/redscarf_iiplus/verc/matrix.c => keyboards/redscarf_iiplus/verc/matrix.c +0 -7
@@ 94,13 94,6 @@ uint8_t matrix_cols(void) {
    return MATRIX_COLS;
}

//Deprecated.
bool matrix_is_modified(void)
{
    if (debounce_active()) return false;
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/redscarf_iiplus/verd/matrix.c => keyboards/redscarf_iiplus/verd/matrix.c +0 -7
@@ 94,13 94,6 @@ uint8_t matrix_cols(void) {
    return MATRIX_COLS;
}

//Deprecated.
bool matrix_is_modified(void)
{
    if (debounce_active()) return false;
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/sirius/unigo66/custom_matrix.cpp => keyboards/sirius/unigo66/custom_matrix.cpp +0 -4
@@ 172,10 172,6 @@ extern "C"
        return 1;
    }

    bool matrix_is_modified(void) {
        return matrix_is_mod;
    }

    bool matrix_is_on(uint8_t row, uint8_t col) {
        uint8_t code = CODE(row, col);


M keyboards/sixkeyboard/matrix.c => keyboards/sixkeyboard/matrix.c +0 -5
@@ 114,11 114,6 @@ uint8_t matrix_scan(void)
    return 1;
}

bool matrix_is_modified(void)
{
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/sx60/matrix.c => keyboards/sx60/matrix.c +0 -8
@@ 172,14 172,6 @@ uint8_t matrix_scan(void)
    return 1;
}

bool matrix_is_modified(void)
{
#if (DEBOUNCE > 0)
    if (debouncing) return false;
#endif
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/thedogkeyboard/matrix.c => keyboards/thedogkeyboard/matrix.c +0 -7
@@ 90,13 90,6 @@ uint8_t matrix_cols(void) {
    return MATRIX_COLS;
}

//Deprecated.
bool matrix_is_modified(void)
{
    if (debounce_active()) return false;
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M keyboards/yosino58/rev1/matrix.c => keyboards/yosino58/rev1/matrix.c +0 -6
@@ 289,12 289,6 @@ void matrix_slave_scan(void) {
#endif
}

bool matrix_is_modified(void)
{
    if (debouncing) return false;
    return true;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{

M quantum/debounce.h => quantum/debounce.h +0 -2
@@ 6,8 6,6 @@
// changed is true if raw has changed since the last call
void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed);

bool debounce_active(void);

void debounce_init(uint8_t num_rows);

void debounce_free(void);

M quantum/debounce/asym_eager_defer_pk.c => quantum/debounce/asym_eager_defer_pk.c +0 -1
@@ 165,7 165,6 @@ static void transfer_matrix_values(matrix_row_t raw[], matrix_row_t cooked[], ui
    }
}

bool debounce_active(void) { return true; }
#else
#    include "none.c"
#endif

M quantum/debounce/none.c => quantum/debounce/none.c +0 -2
@@ 26,6 26,4 @@ void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool 
    }
}

bool debounce_active(void) { return false; }

void debounce_free(void) {}

M quantum/debounce/sym_defer_g.c => quantum/debounce/sym_defer_g.c +0 -2
@@ 44,8 44,6 @@ void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool 
    }
}

bool debounce_active(void) { return debouncing; }

void debounce_free(void) {}
#else  // no debouncing.
#    include "none.c"

M quantum/debounce/sym_defer_pk.c => quantum/debounce/sym_defer_pk.c +0 -1
@@ 134,7 134,6 @@ static void start_debounce_counters(matrix_row_t raw[], matrix_row_t cooked[], u
    }
}

bool debounce_active(void) { return true; }
#else
#    include "none.c"
#endif

M quantum/debounce/sym_eager_pk.c => quantum/debounce/sym_eager_pk.c +0 -1
@@ 140,7 140,6 @@ static void transfer_matrix_values(matrix_row_t raw[], matrix_row_t cooked[], ui
    }
}

bool debounce_active(void) { return true; }
#else
#    include "none.c"
#endif

M quantum/debounce/sym_eager_pr.c => quantum/debounce/sym_eager_pr.c +0 -1
@@ 132,7 132,6 @@ static void transfer_matrix_values(matrix_row_t raw[], matrix_row_t cooked[], ui
    }
}

bool debounce_active(void) { return true; }
#else
#    include "none.c"
#endif

M quantum/matrix.h => quantum/matrix.h +0 -2
@@ 46,8 46,6 @@ void matrix_setup(void);
void matrix_init(void);
/* scan all key states on matrix */
uint8_t matrix_scan(void);
/* whether modified from previous scan. used after matrix_scan. */
bool matrix_is_modified(void) __attribute__((deprecated));
/* whether a switch is on */
bool matrix_is_on(uint8_t row, uint8_t col);
/* matrix state on row */

M quantum/matrix_common.c => quantum/matrix_common.c +0 -6
@@ 45,12 45,6 @@ inline matrix_row_t matrix_get_row(uint8_t row) {
#endif
}

// Deprecated.
bool matrix_is_modified(void) {
    if (debounce_active()) return false;
    return true;
}

#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))