summaryrefslogtreecommitdiff
path: root/keyboard
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-03-05 19:18:01 +0900
committertmk <nobody@nowhere>2013-03-05 21:08:16 +0900
commit9e9a85c1426650148d0d83c900e432003ff174fb (patch)
tree8518cbbb2a1c864a076d1d17758d8584ec367cd2 /keyboard
parent38bbe976e00a9a7bf6f8157016717e80503bf6a9 (diff)
Fix ghost block and remove matrix_has_ghost()
Diffstat (limited to 'keyboard')
-rw-r--r--keyboard/hbkb/Makefile.lufa1
-rw-r--r--keyboard/hbkb/matrix.c15
2 files changed, 3 insertions, 13 deletions
diff --git a/keyboard/hbkb/Makefile.lufa b/keyboard/hbkb/Makefile.lufa
index c73a0ca7d1..33366d7208 100644
--- a/keyboard/hbkb/Makefile.lufa
+++ b/keyboard/hbkb/Makefile.lufa
@@ -99,6 +99,7 @@ F_USB = $(F_CPU)
#
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = yes # Console for debug
#NKRO_ENABLE = yes # USB Nkey Rollover
#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support
diff --git a/keyboard/hbkb/matrix.c b/keyboard/hbkb/matrix.c
index d7c0663642..f3a0cde5f3 100644
--- a/keyboard/hbkb/matrix.c
+++ b/keyboard/hbkb/matrix.c
@@ -148,18 +148,6 @@ bool matrix_is_modified(void)
}
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)
{
return (matrix[row] & (1<<col));
@@ -217,7 +205,8 @@ static bool matrix_has_ghost_in_row(uint8_t row)
// 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])
+ //if (i != row && (matrix[i] & matrix[row]) == matrix[row])
+ if (i != row && (matrix[i] & matrix[row]))
return true;
}
return false;