@@ -12,6 +12,7 @@ Improving: | |||
- Battry voltage display by command; like full(solid), medium(blink), low(flash) | |||
- move rn42 to protocol directory when it becomes reusable stack | |||
- LUFA sendchar should be buffered and serial_uart.c buffur size is too large(256). | |||
- keyboard LED update | |||
Testing: | |||
- Factroy reset doesn't work; need to **test again** 10K pull-up is too high? |
@@ -53,12 +53,6 @@ SRC += keymap_common.c \ | |||
matrix.c \ | |||
led.c | |||
ifdef KEYMAP | |||
SRC := keymap_$(KEYMAP).c $(SRC) | |||
else | |||
SRC := keymap_hasu.c $(SRC) | |||
endif | |||
CONFIG_H = config.h | |||
@@ -124,6 +118,26 @@ CONSOLE_ENABLE = yes # Console for debug | |||
COMMAND_ENABLE = yes # Commands for debug and configuration | |||
#NKRO_ENABLE = yes # USB Nkey Rollover | |||
#KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor | |||
#HHKB_JP = yes # HHKB JP support | |||
ifdef HHKB_JP | |||
OPT_DEFS += -DHHKB_JP | |||
endif | |||
# | |||
# Keymap file | |||
# | |||
ifdef KEYMAP | |||
SRC := keymap_$(KEYMAP).c $(SRC) | |||
else | |||
ifdef HHKB_JP | |||
SRC := keymap_jp.c $(SRC) | |||
else | |||
SRC := keymap_hasu.c $(SRC) | |||
endif | |||
endif | |||
# Search Path |
@@ -28,7 +28,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
/* matrix size */ | |||
#define MATRIX_ROWS 8 | |||
#ifdef HHKB_JP | |||
# define MATRIX_ROWS 16 | |||
#else | |||
# define MATRIX_ROWS 8 | |||
#endif | |||
#define MATRIX_COLS 8 | |||
@@ -54,4 +54,31 @@ extern const uint16_t fn_actions[]; | |||
{ KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_NO } \ | |||
} | |||
#define KEYMAP_JP( \ | |||
K02, K32, K62, K22, K12, K52, K72, KA2, K92, K82, KB2, KE2, KF2, KD2, KC2, \ | |||
K03, K63, K23, K13, K53, K73, KA3, K93, K83, KB3, KE3, KF3, KD3, \ | |||
K06, K66, K26, K16, K56, K76, KA6, K96, K86, KB6, KE6, KF6, KD6, KC6, \ | |||
K05, K65, K25, K15, K55, K75, KA5, K95, K85, KB5, KE5, KF5, KD5, KC5, \ | |||
K04, K34, K64, K24, K14, K74, K94, K84, KB4, KE4, KF4, KD4, KC4 \ | |||
) \ | |||
{ \ | |||
{ KC_NO, KC_NO, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_NO }, \ | |||
{ KC_NO, KC_NO, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_NO }, \ | |||
{ KC_NO, KC_NO, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_NO }, \ | |||
{ KC_NO, KC_NO, KC_##K32, KC_NO, KC_##K34, KC_NO, KC_NO, KC_NO }, \ | |||
{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | |||
{ KC_NO, KC_NO, KC_##K52, KC_##K53, KC_NO, KC_##K55, KC_##K56, KC_NO }, \ | |||
{ KC_NO, KC_NO, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66, KC_NO }, \ | |||
{ KC_NO, KC_NO, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_NO }, \ | |||
{ KC_NO, KC_NO, KC_##K82, KC_##K83, KC_##K84, KC_##K85, KC_##K86, KC_NO }, \ | |||
{ KC_NO, KC_NO, KC_##K92, KC_##K93, KC_##K94, KC_##K95, KC_##K96, KC_NO }, \ | |||
{ KC_NO, KC_NO, KC_##KA2, KC_##KA3, KC_NO, KC_##KA5, KC_##KA6, KC_NO }, \ | |||
{ KC_NO, KC_NO, KC_##KB2, KC_##KB3, KC_##KB4, KC_##KB5, KC_##KB6, KC_NO }, \ | |||
{ KC_NO, KC_NO, KC_##KC2, KC_NO, KC_##KC4, KC_##KC5, KC_##KC6, KC_NO }, \ | |||
{ KC_NO, KC_NO, KC_##KD2, KC_##KD3, KC_##KD4, KC_##KD5, KC_##KD6, KC_NO }, \ | |||
{ KC_NO, KC_NO, KC_##KE2, KC_##KE3, KC_##KE4, KC_##KE5, KC_##KE6, KC_NO }, \ | |||
{ KC_NO, KC_NO, KC_##KF2, KC_##KF3, KC_##KF4, KC_##KF5, KC_##KF6, KC_NO } \ | |||
} | |||
#endif |
@@ -20,20 +20,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
*/ | |||
#include <stdint.h> | |||
#include <stdbool.h> | |||
#include <avr/io.h> | |||
#include <avr/interrupt.h> | |||
#include <util/delay.h> | |||
#include "print.h" | |||
#include "debug.h" | |||
#include "util.h" | |||
#include "timer.h" | |||
#include "matrix.h" | |||
// Timer resolution check | |||
#if (1000000/TIMER_RAW_FREQ > 20) | |||
# error "Timer resolution(>20us) is not enough for HHKB matrix scan tweak on V-USB." | |||
#endif | |||
#include "hhkb_avr.h" | |||
// matrix state buffer(1:on, 0:off) | |||
@@ -43,122 +36,6 @@ static matrix_row_t _matrix0[MATRIX_ROWS]; | |||
static matrix_row_t _matrix1[MATRIX_ROWS]; | |||
// Matrix I/O ports | |||
// | |||
// row: HC4051[A,B,C] selects scan row0-7 | |||
// col: LS145[A,B,C,D] selects scan col0-7 and enable(D) | |||
// key: on: 0/off: 1 | |||
// prev: unknown: output previous key state(negated)? | |||
#if defined(__AVR_AT90USB1286__) | |||
// Ports for Teensy++ | |||
// row: PB0-2 | |||
// col: PB3-5,6 | |||
// key: PE6(pull-uped) | |||
// prev: PE7 | |||
#define KEY_INIT() do { \ | |||
DDRB |= 0x7F; \ | |||
DDRE |= (1<<7); \ | |||
DDRE &= ~(1<<6); \ | |||
PORTE |= (1<<6); \ | |||
} while (0) | |||
#define KEY_SELECT(ROW, COL) (PORTB = (PORTB & 0xC0) | \ | |||
(((COL) & 0x07)<<3) | \ | |||
((ROW) & 0x07)) | |||
#define KEY_ENABLE() (PORTB &= ~(1<<6)) | |||
#define KEY_UNABLE() (PORTB |= (1<<6)) | |||
#define KEY_STATE() (PINE & (1<<6)) | |||
#define KEY_PREV_ON() (PORTE |= (1<<7)) | |||
#define KEY_PREV_OFF() (PORTE &= ~(1<<7)) | |||
#define KEY_POWER_ON() | |||
#define KEY_POWER_OFF() | |||
#elif defined(__AVR_ATmega32U4__) | |||
// Ports for my designed Alt Controller PCB | |||
// row: PB0-2 | |||
// col: PB3-5,6 | |||
// key: PD7(pull-uped) | |||
// prev: PB7 | |||
// power: PD4(L:off/H:on) | |||
#define KEY_INIT() do { \ | |||
DDRB = 0xFF; \ | |||
PORTB = 0x00; \ | |||
DDRD &= ~0x80; \ | |||
PORTD |= 0x80; \ | |||
/* keyswitch board power on */ \ | |||
DDRD |= (1<<4); \ | |||
PORTD |= (1<<4); \ | |||
KEY_UNABLE(); \ | |||
KEY_PREV_OFF(); \ | |||
} while (0) | |||
#define KEY_SELECT(ROW, COL) (PORTB = (PORTB & 0xC0) | \ | |||
(((COL) & 0x07)<<3) | \ | |||
((ROW) & 0x07)) | |||
#define KEY_ENABLE() (PORTB &= ~(1<<6)) | |||
#define KEY_UNABLE() (PORTB |= (1<<6)) | |||
#define KEY_STATE() (PIND & (1<<7)) | |||
#define KEY_PREV_ON() (PORTB |= (1<<7)) | |||
#define KEY_PREV_OFF() (PORTB &= ~(1<<7)) | |||
#define KEY_POWER_ON() | |||
#define KEY_POWER_OFF() | |||
/* | |||
#define KEY_POWER_ON() do { \ | |||
KEY_INIT(); \ | |||
PORTD |= (1<<4); \ | |||
_delay_ms(1); \ | |||
} while (0) | |||
#define KEY_POWER_OFF() do { \ | |||
PORTD &= ~(1<<4); \ | |||
DDRB &= ~0xFF; \ | |||
PORTB &= ~0xFF; \ | |||
DDRB &= ~0x80; \ | |||
PORTB &= ~0x80; \ | |||
} while (0) | |||
*/ | |||
#elif defined(__AVR_ATmega328P__) | |||
// Ports for V-USB | |||
// key: PB0(pull-uped) | |||
// prev: PB1 | |||
// row: PB2-4 | |||
// col: PC0-2,3 | |||
// power: PB5(Low:on/Hi-z:off) | |||
#define KEY_INIT() do { \ | |||
DDRB |= 0x3E; \ | |||
DDRB &= ~(1<<0); \ | |||
PORTB |= 1<<0; \ | |||
DDRC |= 0x0F; \ | |||
KEY_UNABLE(); \ | |||
KEY_PREV_OFF(); \ | |||
} while (0) | |||
#define KEY_SELECT(ROW, COL) do { \ | |||
PORTB = (PORTB & 0xE3) | ((ROW) & 0x07)<<2; \ | |||
PORTC = (PORTC & 0xF8) | ((COL) & 0x07); \ | |||
} while (0) | |||
#define KEY_ENABLE() (PORTC &= ~(1<<3)) | |||
#define KEY_UNABLE() (PORTC |= (1<<3)) | |||
#define KEY_STATE() (PINB & (1<<0)) | |||
#define KEY_PREV_ON() (PORTB |= (1<<1)) | |||
#define KEY_PREV_OFF() (PORTB &= ~(1<<1)) | |||
// Power supply switching | |||
#define KEY_POWER_ON() do { \ | |||
KEY_INIT(); \ | |||
PORTB &= ~(1<<5); \ | |||
_delay_ms(1); \ | |||
} while (0) | |||
#define KEY_POWER_OFF() do { \ | |||
DDRB &= ~0x3F; \ | |||
PORTB &= ~0x3F; \ | |||
DDRC &= ~0x0F; \ | |||
PORTC &= ~0x0F; \ | |||
} while (0) | |||
#else | |||
# error "define code for matrix scan" | |||
#endif | |||
inline | |||
uint8_t matrix_rows(void) | |||
{ | |||
@@ -199,13 +76,13 @@ uint8_t matrix_scan(void) | |||
for (uint8_t row = 0; row < MATRIX_ROWS; row++) { | |||
for (uint8_t col = 0; col < MATRIX_COLS; col++) { | |||
KEY_SELECT(row, col); | |||
_delay_us(40); | |||
_delay_us(5); | |||
// Not sure this is needed. This just emulates HHKB controller's behaviour. | |||
if (matrix_prev[row] & (1<<col)) { | |||
KEY_PREV_ON(); | |||
} | |||
_delay_us(7); | |||
_delay_us(10); | |||
// NOTE: KEY_STATE is valid only in 20us after KEY_ENABLE. | |||
// If V-USB interrupts in this section we could lose 40us or so | |||
@@ -241,11 +118,13 @@ uint8_t matrix_scan(void) | |||
matrix[row] = matrix_prev[row]; | |||
} | |||
_delay_us(5); | |||
KEY_PREV_OFF(); | |||
KEY_UNABLE(); | |||
// NOTE: KEY_STATE keep its state in 20us after KEY_ENABLE. | |||
// This takes 25us or more to make sure KEY_STATE returns to idle state. | |||
_delay_us(150); | |||
_delay_us(75); | |||
} | |||
} | |||
KEY_POWER_OFF(); |