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

Clean host.h interface.

tags/v1.9
tmk 11 years ago
parent
373ab0e719
commit
71ac82337f
6 changed files with 80 additions and 121 deletions
Split View Show Diff Stats
  1. 0
    7
      common/command.c
  2. 20
    65
      common/host.c
  3. 10
    9
      common/host.h
  4. 47
    37
      common/keyboard.c
  5. 1
    1
      keyboard/hhkb/config_vusb.h
  6. 2
    2
      protocol/vusb/vusb.c

+ 0
- 7
common/command.c View File

@@ -78,8 +78,6 @@ static uint8_t command_common(void)
help();
break;
case KC_B:
host_clear_keyboard_report();
host_send_keyboard_report();
print("jump to bootloader... ");
_delay_ms(1000);
bootloader_jump(); // not return
@@ -157,9 +155,6 @@ static uint8_t command_common(void)
break;
#ifdef NKRO_ENABLE
case KC_N:
// send empty report before change
host_clear_keyboard_report();
host_send_keyboard_report();
keyboard_nkro = !keyboard_nkro;
if (keyboard_nkro)
print("NKRO: enabled\n");
@@ -169,8 +164,6 @@ static uint8_t command_common(void)
#endif
#ifdef EXTRAKEY_ENABLE
case KC_ESC:
host_clear_keyboard_report();
host_send_keyboard_report();
#ifdef HOST_PJRC
if (suspend && remote_wakeup) {
usb_remote_wakeup();

+ 20
- 65
common/host.c View File

@@ -1,5 +1,5 @@
/*
Copyright 2011 Jun Wako <[email protected]>
Copyright 2011,2012 Jun Wako <[email protected]>

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -28,10 +28,7 @@ bool keyboard_nkro = false;
#endif

static host_driver_t *driver;
static report_keyboard_t report0;
static report_keyboard_t report1;
report_keyboard_t *keyboard_report = &report0;
report_keyboard_t *keyboard_report_prev = &report1;
report_keyboard_t *keyboard_report = &(report_keyboard_t){};


static inline void add_key_byte(uint8_t code);
@@ -56,27 +53,6 @@ uint8_t host_keyboard_leds(void)
return (*driver->keyboard_leds)();
}

/* new interface */
void host_register_key(uint8_t key)
{
host_add_key(key);
host_send_keyboard_report();
}

void host_unregister_key(uint8_t key)
{
host_del_key(key);
host_send_keyboard_report();
}

void host_clear_all_keys_but_mods(void)
{
for (int8_t i = 0; i < REPORT_KEYS; i++) {
keyboard_report->keys[i] = 0;
}
host_send_keyboard_report();
}

/* keyboard report operations */
void host_add_key(uint8_t key)
{
@@ -100,6 +76,13 @@ void host_del_key(uint8_t key)
del_key_byte(key);
}

void host_clear_keys(void)
{
for (int8_t i = 0; i < REPORT_KEYS; i++) {
keyboard_report->keys[i] = 0;
}
}

void host_add_mod_bit(uint8_t mod)
{
keyboard_report->mods |= mod;
@@ -115,40 +98,9 @@ void host_set_mods(uint8_t mods)
keyboard_report->mods = mods;
}

void host_add_code(uint8_t code)
{
if (IS_MOD(code)) {
host_add_mod_bit(MOD_BIT(code));
} else {
host_add_key(code);
}
}

void host_del_code(uint8_t code)
{
if (IS_MOD(code)) {
host_del_mod_bit(MOD_BIT(code));
} else {
host_del_key(code);
}
}

void host_swap_keyboard_report(void)
{
uint8_t sreg = SREG;
cli();
report_keyboard_t *tmp = keyboard_report_prev;
keyboard_report_prev = keyboard_report;
keyboard_report = tmp;
SREG = sreg;
}

void host_clear_keyboard_report(void)
void host_clear_mods(void)
{
keyboard_report->mods = 0;
for (int8_t i = 0; i < REPORT_KEYS; i++) {
keyboard_report->keys[i] = 0;
}
}

uint8_t host_has_anykey(void)
@@ -174,7 +126,6 @@ uint8_t host_get_first_key(void)
return keyboard_report->keys[0];
}


void host_send_keyboard_report(void)
{
if (!driver) return;
@@ -189,6 +140,14 @@ void host_send_keyboard_report(void)
}
}


/* send report */
void host_keyboard_send(report_keyboard_t *report)
{
if (!driver) return;
(*driver->send_keyboard)(report);
}

void host_mouse_send(report_mouse_t *report)
{
if (!driver) return;
@@ -218,17 +177,13 @@ void host_consumer_send(uint16_t data)

static inline void add_key_byte(uint8_t code)
{
// TODO: fix ugly code
int8_t i = 0;
int8_t empty = -1;
for (; i < REPORT_KEYS; i++) {
if (keyboard_report_prev->keys[i] == code) {
keyboard_report->keys[i] = code;
if (keyboard_report->keys[i] == code) {
break;
}
if (empty == -1 &&
keyboard_report_prev->keys[i] == 0 &&
keyboard_report->keys[i] == 0) {
if (empty == -1 && keyboard_report->keys[i] == 0) {
empty = i;
}
}

+ 10
- 9
common/host.h View File

@@ -35,30 +35,31 @@ extern report_keyboard_t *keyboard_report;
extern report_keyboard_t *keyboard_report_prev;


/* host driver */
void host_set_driver(host_driver_t *driver);
host_driver_t *host_get_driver(void);

uint8_t host_keyboard_leds(void);

/* new interface */
void host_register_key(uint8_t key);
void host_unregister_key(uint8_t key);
void host_clear_all_keys_but_mods(void);

/* keyboard report operations */
/* key */
void host_add_key(uint8_t key);
void host_del_key(uint8_t key);
void host_clear_keys(void);
/* modifier */
void host_add_mod_bit(uint8_t mod);
void host_del_mod_bit(uint8_t mod);
void host_set_mods(uint8_t mods);
void host_add_code(uint8_t code);
void host_del_code(uint8_t code);
void host_swap_keyboard_report(void);
void host_clear_keyboard_report(void);
void host_clear_mods(void);
/* query */
uint8_t host_has_anykey(void);
uint8_t host_get_first_key(void);
/* send report */
void host_send_keyboard_report(void);


void host_send_keyboard_report(void);
/* send report: mouse, system contorl and consumer page */
void host_mouse_send(report_mouse_t *report);
void host_system_send(uint16_t data);
void host_consumer_send(uint16_t data);

+ 47
- 37
common/keyboard.c View File

@@ -81,17 +81,37 @@ static inline keykind_t get_keykind(uint8_t code, bool pressed)
return NONE;
}

static void clear_keyboard(void)
{
host_clear_keys();
host_clear_mods();
host_send_keyboard_report();

host_system_send(0);
host_consumer_send(0);

mousekey_clear();
mousekey_send();
}

static void clear_keyboard_but_mods(void)
{
host_clear_keys();
host_send_keyboard_report();

host_system_send(0);
host_consumer_send(0);

mousekey_clear();
mousekey_send();
}

static void layer_switch_on(uint8_t code)
{
if (!IS_FN(code)) return;
fn_state_bits |= FN_BIT(code);
if (current_layer != keymap_fn_layer(FN_INDEX(code))) {
// clear all key execpt Mod key
host_clear_all_keys_but_mods();
host_system_send(0);
host_consumer_send(0);
mousekey_clear();
mousekey_send();
clear_keyboard_but_mods();

debug("Layer Switch(on): "); debug_hex(current_layer);
current_layer = keymap_fn_layer(FN_INDEX(code));
@@ -104,12 +124,7 @@ static void layer_switch_off(uint8_t code)
if (!IS_FN(code)) return;
fn_state_bits &= ~FN_BIT(code);
if (current_layer != keymap_fn_layer(biton(fn_state_bits))) {
// clear all key execpt Mod key
host_clear_all_keys_but_mods();
host_system_send(0);
host_consumer_send(0);
mousekey_clear();
mousekey_send();
clear_keyboard_but_mods();

debug("Layer Switch(off): "); debug_hex(current_layer);
current_layer = keymap_fn_layer(biton(fn_state_bits));
@@ -117,11 +132,6 @@ static void layer_switch_off(uint8_t code)
}
}

static inline uint8_t get_keycode(key_t key)
{
return keymap_get_keycode(current_layer, key.row, key.col);
}

// whether any key except modifier is down or not
static inline bool is_anykey_down(void)
{
@@ -129,7 +139,7 @@ static inline bool is_anykey_down(void)
matrix_row_t matrix_row = matrix_get_row(r);
for (int c = 0; c < MATRIX_COLS; c++) {
if (matrix_row && (1<<c)) {
if (IS_KEY(get_keycode((key_t){ .row = r, .col = c }))) {
if (IS_KEY(keymap_get_keycode(current_layer, r, c))) {
return true;
}
}
@@ -140,7 +150,6 @@ static inline bool is_anykey_down(void)

static void register_code(uint8_t code)
{
debug("register_code\n");
if IS_KEY(code) {
host_add_key(code);
host_send_keyboard_report();
@@ -154,7 +163,6 @@ debug("register_code\n");
mousekey_send();
}
else if IS_CONSUMER(code) {
debug("consumer\n");
uint16_t usage = 0;
switch (code) {
case KC_AUDIO_MUTE:
@@ -212,7 +220,6 @@ debug("consumer\n");
usage = AC_BOOKMARKS;
break;
}
debug("usage: "); phex16(usage); debug("\n");
host_consumer_send(usage);
}
else if IS_SYSTEM(code) {
@@ -293,9 +300,9 @@ static void unregister_code(uint8_t code)
* Sk: store key
* Sf: store Fn
* Ps: play stored key(Interpret stored key and transit state)
* L+: Switch to new layer(*retain* Modifiers only)
* L-: Switch back to last layer(*clear* stored key/Fn, *unregister* all Modifier/key)
* Ld: Switch back to default layer(*clear* stored key/Fn, *unregister* all Modifier/key)
* L+: Switch to new layer(*unregister* all keys but modifiers)
* L-: Switch back to last layer(*unregister* all keys but modifiers)
* Ld: Switch back to default layer(*unregister* all keys but modifiers)
*/
#define NEXT(state) do { \
debug("NEXT: "); print_P(state_str(kbdstate)); \
@@ -305,13 +312,7 @@ static void unregister_code(uint8_t code)

static inline void process_key(keyevent_t event)
{
/* TODO: ring buffer
static keyrecord_t waiting_keys[5];
static uint8_t waiting_keys_head = 0;
static uint8_t waiting_keys_tail = 0;
*/

uint8_t code = get_keycode(event.key);
uint8_t code = keymap_get_keycode(current_layer, event.key.row, event.key.col);
keykind_t kind = get_keykind(code, event.pressed);

uint8_t tmp_mods;
@@ -502,8 +503,6 @@ static inline void process_key(keyevent_t event)
}
break;
}

// TODO: FAIL SAFE: unregister all keys when no key down
}

void keyboard_init(void)
@@ -526,11 +525,11 @@ void keyboard_task(void)
matrix_scan();
if (command_proc()) {
debug("COMMAND\n");
// TODO: clear all keys
host_clear_keyboard_report();
host_send_keyboard_report();
// TODO: COMMAND state?
clear_keyboard();
return;
}

for (int r = 0; r < MATRIX_ROWS; r++) {
matrix_row = matrix_get_row(r);
matrix_change = matrix_row ^ matrix_prev[r];
@@ -552,7 +551,6 @@ void keyboard_task(void)
}
}
MATRIX_LOOP_END:
// TODO: FAIL SAFE: clear all key if no key down

// layer switch when delay term elapses
if (kbdstate == DELAYING || kbdstate == WAITING) {
@@ -575,6 +573,18 @@ void keyboard_task(void)
// mousekey repeat & acceleration
mousekey_task();

// FAIL SAFE: clear all key if no key down
if (matrix_change) {
matrix_row_t is_matrix_on = 0;
for (int r = 0; r < MATRIX_ROWS; r++) {
is_matrix_on |= matrix_get_row(r);
}
if (!is_matrix_on) {
debug("FAIL SAFE: clear all keys.\n");
clear_keyboard();
}
}
return;
}


+ 1
- 1
keyboard/hhkb/config_vusb.h View File

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


/* key combination for command */
#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KB_LSHIFT) | MOD_BIT(KB_RSHIFT)))
#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))

/* mouse keys */
#ifdef MOUSEKEY_ENABLE

+ 2
- 2
protocol/vusb/vusb.c View File

@@ -164,8 +164,8 @@ usbRequest_t *rq = (void *)data;
if(rq->bRequest == USBRQ_HID_GET_REPORT){
debug("GET_REPORT:");
/* we only have one report type, so don't look at wValue */
usbMsgPtr = (void *)keyboard_report_prev;
return sizeof(*keyboard_report_prev);
usbMsgPtr = (void *)keyboard_report;
return sizeof(*keyboard_report);
}else if(rq->bRequest == USBRQ_HID_GET_IDLE){
debug("GET_IDLE: ");
//debug_hex(vusb_idle_rate);

Write Preview
Loading…
Cancel
Save