diff options
| author | tmk <nobody@nowhere> | 2013-02-11 12:48:49 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-02-11 12:48:49 +0900 |
| commit | 8c80deb775ac151001dc1592a2e94e8677b49964 (patch) | |
| tree | aa62c5cbef8419d9cdded26440cfdb42f7d806fd /keyboard/hhkb/matrix.c | |
| parent | 4701b08b71b187cb3d015bec7e05d30e35c344ac (diff) | |
| parent | 39d093339393e1758eede06f736b1f99a68ac74c (diff) | |
| download | firmware-8c80deb775ac151001dc1592a2e94e8677b49964.tar.gz firmware-8c80deb775ac151001dc1592a2e94e8677b49964.tar.bz2 firmware-8c80deb775ac151001dc1592a2e94e8677b49964.zip | |
Merge branch 'keymap2'
Conflicts:
common/keyboard.c
Diffstat (limited to 'keyboard/hhkb/matrix.c')
| -rw-r--r-- | keyboard/hhkb/matrix.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/keyboard/hhkb/matrix.c b/keyboard/hhkb/matrix.c index fd0d6f97f..f53e36dbe 100644 --- a/keyboard/hhkb/matrix.c +++ b/keyboard/hhkb/matrix.c @@ -24,6 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <avr/interrupt.h> #include <util/delay.h> #include "print.h" +#include "debug.h" #include "util.h" #include "timer.h" #include "matrix.h" @@ -135,6 +136,12 @@ uint8_t matrix_cols(void) void matrix_init(void) { +#ifdef DEBUG + print_enable = true; + debug_enable = true; + debug_keyboard = true; +#endif + KEY_INIT(); // initialize matrix state: all keys off |