Browse Source

Fix keymap for new framework

core
tmk 11 years ago
parent
commit
88d6bb0b36
3 changed files with 13 additions and 11 deletions
  1. 1
    1
      README.md
  2. 8
    10
      common/keymap.c
  3. 4
    0
      protocol/vusb/vusb.c

+ 1
- 1
README.md View File

@@ -39,7 +39,7 @@ You can find some keyboard specific projects under `converter` and `keyboard` di
* [hhkb](keyboard/hhkb/) - [Happy Hacking Keyboard professional][GH_hhkb]
* [macway](keyboard/macway/) - [Compact keyboard mod][GH_macway]
* [hbkb](keyboard/hbkb/) - [Happy Buckling sprint keyboard(IBM Model M mod)][GH_hbkb]
* [IIgs_Standard](keyboard/IIgs_Standard/) - Apple [IIGS] keyboard mod(by JeffreySung)
* [IIgs_Standard](keyboard/IIgs/) - Apple [IIGS] keyboard mod(by JeffreySung)
* [hid_liber](keyboard/hid_liber/) - [HID liberation controller][HID_liber](by alaricljs)
* [phantom](keyboard/phantom/) - [Phantom keyboard][PHANTOM] (by Tranquilite)
* [gh60](keyboard/gh60/) - [GH60 keyboard][GH60]

+ 8
- 10
common/keymap.c View File

@@ -38,12 +38,6 @@ action_t action_for_key(uint8_t layer, key_t key)
return keycode_to_action(keycode);
}
}

__attribute__ ((weak))
const prog_macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { return MACRO_NONE; }

__attribute__ ((weak))
void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {}
#else
/*
* legacy keymap support
@@ -71,13 +65,17 @@ action_t action_for_key(uint8_t layer, key_t key)
return keycode_to_action(keycode);
}
}
/* not used for legacy keymap */
void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
{
}
#endif


__attribute__ ((weak))
const prog_macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { return MACRO_NONE; }

__attribute__ ((weak))
void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {}




/* translates keycode to action */
static action_t keycode_to_action(uint8_t keycode)

+ 4
- 0
protocol/vusb/vusb.c View File

@@ -88,6 +88,10 @@ static void send_keyboard(report_keyboard_t *report)
} else {
debug("kbuf: full\n");
}

// NOTE: send key strokes of Macro
usbPoll();
vusb_transfer_keyboard();
}