diff options
Diffstat (limited to 'keyboard/hbkb')
| -rw-r--r-- | keyboard/hbkb/config.h | 19 | ||||
| -rw-r--r-- | keyboard/hbkb/matrix.c | 65 |
2 files changed, 33 insertions, 51 deletions
diff --git a/keyboard/hbkb/config.h b/keyboard/hbkb/config.h index 57adecfa5e..aa3af30c14 100644 --- a/keyboard/hbkb/config.h +++ b/keyboard/hbkb/config.h @@ -27,18 +27,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define DEVICE_VER 0x0100 #define PRODUCT Happy Buckling Keyboard - #define DESCRIPTION mod version of IBM Model M keyboard - /* matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 8 + /* define if matrix has ghost */ #define MATRIX_HAS_GHOST + /* Set 0 if need no debouncing */ #define DEBOUNCE 10 +/* legacy keymap support */ +#define USE_LEGACY_KEYMAP /* key combination for command */ #define IS_COMMAND() ( \ @@ -46,10 +48,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. keyboard_report->mods == (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT)) \ ) - -/* mouse keys */ -#ifdef MOUSEKEY_ENABLE -# define MOUSEKEY_DELAY_TIME 128 -#endif +/* Boot Section Size in *BYTEs* + * Teensy halfKay 512 + * Teensy++ halfKay 1024 + * Atmel DFU loader 4096 + * LUFA bootloader 4096 + * USBaspLoader 2048 + */ +#define BOOTLOADER_SIZE 4096 #endif diff --git a/keyboard/hbkb/matrix.c b/keyboard/hbkb/matrix.c index a24d24b8c3..f6830a0f71 100644 --- a/keyboard/hbkb/matrix.c +++ b/keyboard/hbkb/matrix.c @@ -32,32 +32,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. * COL: PD0-7 * ROW: PB0-7, PF4-7 */ - -#if (MATRIX_COLS > 16) -# error "MATRIX_COLS must not exceed 16" -#endif -#if (MATRIX_ROWS > 255) -# error "MATRIX_ROWS must not exceed 255" -#endif - - #ifndef DEBOUNCE -# define DEBOUNCE 0 +# define DEBOUNCE 10 #endif static uint8_t debouncing = DEBOUNCE; // matrix state buffer(1:on, 0:off) -#if (MATRIX_COLS <= 8) static uint8_t *matrix; -static uint8_t *matrix_prev; -static uint8_t _matrix0[MATRIX_ROWS]; -static uint8_t _matrix1[MATRIX_ROWS]; -#else -static uint16_t *matrix; -static uint16_t *matrix_prev; -static uint16_t _matrix0[MATRIX_ROWS]; -static uint16_t _matrix1[MATRIX_ROWS]; -#endif +static uint8_t *matrix_debouncing; +static uint8_t matrix0[MATRIX_ROWS]; +static uint8_t matrix1[MATRIX_ROWS]; #ifdef MATRIX_HAS_GHOST static bool matrix_has_ghost_in_row(uint8_t row); @@ -100,37 +84,35 @@ void matrix_init(void) PORTD = 0xFF; // initialize matrix state: all keys off - for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00; - for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00; - matrix = _matrix0; - matrix_prev = _matrix1; + for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix0[i] = 0x00; + for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix1[i] = 0x00; + matrix = matrix0; + matrix_debouncing = matrix1; } uint8_t matrix_scan(void) { - if (!debouncing) { - uint8_t *tmp = matrix_prev; - matrix_prev = matrix; - matrix = tmp; - } - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - unselect_rows(); select_row(i); _delay_us(30); // without this wait read unstable value. - if (matrix[i] != (uint8_t)~read_col()) { - matrix[i] = (uint8_t)~read_col(); + if (matrix_debouncing[i] != read_col()) { + matrix_debouncing[i] = read_col(); if (debouncing) { - debug("bounce!: "); debug_hex(debouncing); print("\n"); + debug("bounce!: "); debug_hex(debouncing); debug("\n"); } - _delay_ms(1); // TODO: work around. HAHAHAHAHAAHA debouncing = DEBOUNCE; } + unselect_rows(); } - unselect_rows(); if (debouncing) { - debouncing--; + if (--debouncing) { + _delay_ms(1); + } else { + uint8_t *tmp = matrix; + matrix = matrix_debouncing; + matrix_debouncing = tmp; + } } return 1; @@ -139,12 +121,7 @@ uint8_t matrix_scan(void) bool matrix_is_modified(void) { if (debouncing) return false; - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - if (matrix[i] != matrix_prev[i]) { - return true; - } - } - return false; + return true; } inline @@ -202,7 +179,7 @@ static bool matrix_has_ghost_in_row(uint8_t row) inline static uint8_t read_col(void) { - return PIND; + return ~PIND; } inline |