di0ib
/
tmk_keyboard
Watch 1
Star 0
Fork 0
Code Releases 4 Activity
Browse Source

Fix matrix_clear() for new matrix API

master
tmk 7 years ago
parent
f76a786b93
commit
124bafe9f3
3 changed files with 3 additions and 73 deletions
Split View Show Diff Stats
  1. 1
    3
      converter/ibm4704_usb/matrix.c
  2. 1
    67
      converter/ps2_usb/matrix.c
  3. 1
    3
      converter/xt_usb/matrix.c

+ 1
- 3
converter/ibm4704_usb/matrix.c View File

@@ -29,7 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

static void matrix_make(uint8_t code);
static void matrix_break(uint8_t code);
static void matrix_clear(void);


/*
@@ -155,8 +154,7 @@ static void matrix_break(uint8_t code)
matrix[ROW(code)] &= ~(1<<COL(code));
}

inline
static void matrix_clear(void)
void matrix_clear(void)
{
for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
}

+ 1
- 67
converter/ps2_usb/matrix.c View File

@@ -29,10 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

static void matrix_make(uint8_t code);
static void matrix_break(uint8_t code);
static void matrix_clear(void);
#ifdef MATRIX_HAS_GHOST
static bool matrix_has_ghost_in_row(uint8_t row);
#endif


/*
@@ -71,18 +67,6 @@ static uint8_t matrix[MATRIX_ROWS];
static bool is_modified = false;


inline
uint8_t matrix_rows(void)
{
return MATRIX_ROWS;
}

inline
uint8_t matrix_cols(void)
{
return MATRIX_COLS;
}

void matrix_init(void)
{
debug_enable = true;
@@ -398,23 +382,6 @@ uint8_t matrix_scan(void)
return 1;
}

bool matrix_is_modified(void)
{
return is_modified;
}

inline
bool matrix_has_ghost(void)
{
#ifdef MATRIX_HAS_GHOST
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
if (matrix_has_ghost_in_row(i))
return true;
}
#endif
return false;
}

inline
bool matrix_is_on(uint8_t row, uint8_t col)
{
@@ -427,21 +394,6 @@ uint8_t matrix_get_row(uint8_t row)
return matrix[row];
}

void matrix_print(void)
{
print("\nr/c 01234567\n");
for (uint8_t row = 0; row < matrix_rows(); row++) {
phex(row); print(": ");
pbin_reverse(matrix_get_row(row));
#ifdef MATRIX_HAS_GHOST
if (matrix_has_ghost_in_row(row)) {
print(" <ghost");
}
#endif
print("\n");
}
}

uint8_t matrix_key_count(void)
{
uint8_t count = 0;
@@ -451,23 +403,6 @@ uint8_t matrix_key_count(void)
return count;
}

#ifdef MATRIX_HAS_GHOST
inline
static bool matrix_has_ghost_in_row(uint8_t row)
{
// no ghost exists in case less than 2 keys on
if (((matrix[row] - 1) & matrix[row]) == 0)
return false;

// ghost exists in case same state as other row
for (uint8_t i=0; i < MATRIX_ROWS; i++) {
if (i != row && (matrix[i] & matrix[row]) == matrix[row])
return true;
}
return false;
}
#endif


inline
static void matrix_make(uint8_t code)
@@ -487,8 +422,7 @@ static void matrix_break(uint8_t code)
}
}

inline
static void matrix_clear(void)
void matrix_clear(void)
{
for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
}

+ 1
- 3
converter/xt_usb/matrix.c View File

@@ -28,7 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

static void matrix_make(uint8_t code);
static void matrix_break(uint8_t code);
static void matrix_clear(void);
#ifdef MATRIX_HAS_GHOST
static bool matrix_has_ghost_in_row(uint8_t row);
#endif
@@ -326,8 +325,7 @@ static void matrix_break(uint8_t code)
}
}

inline
static void matrix_clear(void)
void matrix_clear(void)
{
for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
}

Write Preview
Loading…
Cancel
Save