From 4ae979f6ef8dbf9e1d1f35be15322ad6d02e2958 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Sat, 6 Oct 2012 02:23:12 +0900
Subject: Initial version of new code for layer switch is added.
---
common/mousekey.c | 120 +++++++++++++++++++++++++++++++++---------------------
1 file changed, 73 insertions(+), 47 deletions(-)
(limited to 'common/mousekey.c')
diff --git a/common/mousekey.c b/common/mousekey.c
index 1d35355b4..7f8e860aa 100644
--- a/common/mousekey.c
+++ b/common/mousekey.c
@@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
static report_mouse_t report;
-static report_mouse_t report_prev;
static uint8_t mousekey_repeat = 0;
@@ -38,84 +37,111 @@ static void mousekey_debug(void);
* see wikipedia http://en.wikipedia.org/wiki/Mouse_keys
*/
#ifndef MOUSEKEY_DELAY_TIME
-# define MOUSEKEY_DELAY_TIME 255
+# define MOUSEKEY_DELAY_TIME 20
#endif
+#define MOUSEKEY_MOVE_INIT 5
+#define MOUSEKEY_WHEEL_INIT 1
+#define MOUSEKEY_MOVE_ACCEL 5
+#define MOUSEKEY_WHEEL_ACCEL 1
+
+static uint16_t last_timer = 0;
+
// acceleration parameters
-uint8_t mousekey_move_unit = 2;
-uint8_t mousekey_resolution = 5;
+//uint8_t mousekey_move_unit = 2;
+//uint8_t mousekey_resolution = 5;
static inline uint8_t move_unit(void)
{
- uint16_t unit = 5 + mousekey_repeat*2;
+ uint16_t unit = 5 + mousekey_repeat*4;
return (unit > 63 ? 63 : unit);
}
-void mousekey_decode(uint8_t code)
-{
- if (code == KB_MS_UP) report.y = -move_unit();
- else if (code == KB_MS_DOWN) report.y = move_unit();
- else if (code == KB_MS_LEFT) report.x = -move_unit();
- else if (code == KB_MS_RIGHT) report.x = move_unit();
- else if (code == KB_MS_BTN1) report.buttons |= MOUSE_BTN1;
- else if (code == KB_MS_BTN2) report.buttons |= MOUSE_BTN2;
- else if (code == KB_MS_BTN3) report.buttons |= MOUSE_BTN3;
- else if (code == KB_MS_BTN4) report.buttons |= MOUSE_BTN4;
- else if (code == KB_MS_BTN5) report.buttons |= MOUSE_BTN5;
- else if (code == KB_MS_WH_UP) report.v += move_unit()/4;
- else if (code == KB_MS_WH_DOWN) report.v -= move_unit()/4;
- else if (code == KB_MS_WH_LEFT) report.h -= move_unit()/4;
- else if (code == KB_MS_WH_RIGHT)report.h += move_unit()/4;
-}
-
-bool mousekey_changed(void)
-{
- return (report.buttons != report_prev.buttons ||
- report.x || report.y || report.v || report.h);
-}
-
-void mousekey_send(void)
+void mousekey_task(void)
{
- static uint16_t last_timer = 0;
-
- if (!mousekey_changed()) {
- mousekey_repeat = 0;
- mousekey_clear_report();
+ if (timer_elapsed(last_timer) < MOUSEKEY_DELAY_TIME)
return;
- }
- // send immediately when buttun state is changed
- if (report.buttons == report_prev.buttons) {
- if (timer_elapsed(last_timer) < 100) {
- mousekey_clear_report();
- return;
- }
- }
+ if (report.x == 0 && report.y == 0 && report.v == 0 && report.h == 0)
+ return;
- if (mousekey_repeat != 0xFF) {
+ if (mousekey_repeat != UINT8_MAX)
mousekey_repeat++;
- }
+
+
+ if (report.x > 0) report.x = move_unit();
+ if (report.x < 0) report.x = move_unit() * -1;
+ if (report.y > 0) report.y = move_unit();
+ if (report.y < 0) report.y = move_unit() * -1;
if (report.x && report.y) {
report.x *= 0.7;
report.y *= 0.7;
}
+ if (report.v > 0) report.v = move_unit();
+ if (report.v < 0) report.v = move_unit() * -1;
+ if (report.h > 0) report.h = move_unit();
+ if (report.h < 0) report.h = move_unit() * -1;
+
+ mousekey_send();
+}
+
+void mousekey_on(uint8_t code)
+{
+ if (code == KB_MS_UP) report.y = MOUSEKEY_MOVE_INIT * -1;
+ else if (code == KB_MS_DOWN) report.y = MOUSEKEY_MOVE_INIT;
+ else if (code == KB_MS_LEFT) report.x = MOUSEKEY_MOVE_INIT * -1;
+ else if (code == KB_MS_RIGHT) report.x = MOUSEKEY_MOVE_INIT;
+ else if (code == KB_MS_WH_UP) report.v = MOUSEKEY_WHEEL_INIT;
+ else if (code == KB_MS_WH_DOWN) report.v = MOUSEKEY_WHEEL_INIT * -1;
+ else if (code == KB_MS_WH_LEFT) report.h = MOUSEKEY_WHEEL_INIT * -1;
+ else if (code == KB_MS_WH_RIGHT) report.h = MOUSEKEY_WHEEL_INIT;
+ else if (code == KB_MS_BTN1) report.buttons |= MOUSE_BTN1;
+ else if (code == KB_MS_BTN2) report.buttons |= MOUSE_BTN2;
+ else if (code == KB_MS_BTN3) report.buttons |= MOUSE_BTN3;
+ else if (code == KB_MS_BTN4) report.buttons |= MOUSE_BTN4;
+ else if (code == KB_MS_BTN5) report.buttons |= MOUSE_BTN5;
+}
+
+void mousekey_off(uint8_t code)
+{
+ if (code == KB_MS_UP && report.y < 0) report.y = 0;
+ else if (code == KB_MS_DOWN && report.y > 0) report.y = 0;
+ else if (code == KB_MS_LEFT && report.x < 0) report.x = 0;
+ else if (code == KB_MS_RIGHT && report.x > 0) report.x = 0;
+ else if (code == KB_MS_WH_UP && report.v > 0) report.v = 0;
+ else if (code == KB_MS_WH_DOWN && report.v < 0) report.v = 0;
+ else if (code == KB_MS_WH_LEFT && report.h < 0) report.h = 0;
+ else if (code == KB_MS_WH_RIGHT && report.h > 0) report.h = 0;
+ else if (code == KB_MS_BTN1) report.buttons &= ~MOUSE_BTN1;
+ else if (code == KB_MS_BTN2) report.buttons &= ~MOUSE_BTN2;
+ else if (code == KB_MS_BTN3) report.buttons &= ~MOUSE_BTN3;
+ else if (code == KB_MS_BTN4) report.buttons &= ~MOUSE_BTN4;
+ else if (code == KB_MS_BTN5) report.buttons &= ~MOUSE_BTN5;
+
+ if (report.x == 0 && report.y == 0 && report.v == 0 && report.h == 0)
+ mousekey_repeat = 0;
+}
+
+void mousekey_send(void)
+{
mousekey_debug();
host_mouse_send(&report);
- report_prev = report;
last_timer = timer_read();
- mousekey_clear_report();
}
-void mousekey_clear_report(void)
+void mousekey_clear(void)
{
+ report = (report_mouse_t){};
+/*
report.buttons = 0;
report.x = 0;
report.y = 0;
report.v = 0;
report.h = 0;
+*/
}
static void mousekey_debug(void)
--
cgit v1.2.3-70-g09d2
From 16ba9bda5601ebef6e4db04a5ad079af32370815 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Tue, 9 Oct 2012 13:48:39 +0900
Subject: Add consumer/system usage support.
---
common/host.c | 8 ++++
common/host.h | 1 +
common/keyboard.c | 122 +++++++++++++++++++++++++++++++++++++++++++-------
common/mousekey.c | 7 ---
common/usb_keycodes.h | 41 ++++++++++-------
5 files changed, 141 insertions(+), 38 deletions(-)
(limited to 'common/mousekey.c')
diff --git a/common/host.c b/common/host.c
index fddd5b662..0a03807f7 100644
--- a/common/host.c
+++ b/common/host.c
@@ -69,6 +69,14 @@ void host_unregister_key(uint8_t 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)
{
diff --git a/common/host.h b/common/host.h
index 84a6c2477..a6dff8de0 100644
--- a/common/host.h
+++ b/common/host.h
@@ -42,6 +42,7 @@ 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 */
void host_add_key(uint8_t key);
diff --git a/common/keyboard.c b/common/keyboard.c
index b7063a264..328941df3 100644
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -41,8 +41,6 @@ typedef enum keykind {
FNK_DOWN, FNK_UP,
KEY_DOWN, KEY_UP,
MOD_DOWN, MOD_UP,
- MOUSEKEY_DOWN, MOUSEKEY_UP,
- DELAY
} keykind_t;
typedef enum { IDLE, DELAYING, WAITING, PRESSING } kbdstate_t;
@@ -69,15 +67,17 @@ static const char *state_str(kbdstate_t state)
static inline keykind_t get_keykind(uint8_t code, bool pressed)
{
- if IS_KEY(code) return (pressed ? KEY_DOWN : KEY_UP);
- if IS_MOD(code) return (pressed ? MOD_DOWN : MOD_UP);
+ if IS_KEY(code) return (pressed ? KEY_DOWN : KEY_UP);
+ if IS_MOD(code) return (pressed ? MOD_DOWN : MOD_UP);
if IS_FN(code) {
if (keymap_fn_keycode(FN_INDEX(code)))
return (pressed ? FNK_DOWN : FNK_UP);
else
return (pressed ? FN_DOWN : FN_UP);
}
- if IS_MOUSEKEY(code) return (pressed ? MOUSEKEY_DOWN : MOUSEKEY_UP);
+ if IS_MOUSEKEY(code) return (pressed ? KEY_DOWN : KEY_UP);
+ if IS_SYSTEM(code) return (pressed ? KEY_DOWN : KEY_UP);
+ if IS_CONSUMER(code) return (pressed ? KEY_DOWN : KEY_UP);
return NONE;
}
@@ -86,7 +86,13 @@ 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))) {
- //TODO: clear all key execpt Mod key
+ // clear all key execpt Mod key
+ host_clear_all_keys_but_mods();
+ host_system_send(0);
+ host_consumer_send(0);
+ mousekey_clear();
+ mousekey_send();
+
debug("Layer Switch(on): "); debug_hex(current_layer);
current_layer = keymap_fn_layer(FN_INDEX(code));
debug(" -> "); debug_hex(current_layer); debug("\n");
@@ -98,7 +104,13 @@ 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))) {
- //TODO: clear all key execpt Mod key
+ // clear all key execpt Mod key
+ host_clear_all_keys_but_mods();
+ host_system_send(0);
+ host_consumer_send(0);
+ mousekey_clear();
+ mousekey_send();
+
debug("Layer Switch(off): "); debug_hex(current_layer);
current_layer = keymap_fn_layer(biton(fn_state_bits));
debug(" -> "); debug_hex(current_layer); debug("\n");
@@ -128,6 +140,7 @@ 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();
@@ -140,6 +153,84 @@ static void register_code(uint8_t code)
mousekey_on(code);
mousekey_send();
}
+ else if IS_CONSUMER(code) {
+debug("consumer\n");
+ uint16_t usage = 0;
+ switch (code) {
+ case KB_AUDIO_MUTE:
+ usage = AUDIO_MUTE;
+ break;
+ case KB_AUDIO_VOL_UP:
+ usage = AUDIO_VOL_UP;
+ break;
+ case KB_AUDIO_VOL_DOWN:
+ usage = AUDIO_VOL_DOWN;
+ break;
+ case KB_MEDIA_NEXT_TRACK:
+ usage = TRANSPORT_NEXT_TRACK;
+ break;
+ case KB_MEDIA_PREV_TRACK:
+ usage = TRANSPORT_PREV_TRACK;
+ break;
+ case KB_MEDIA_STOP:
+ usage = TRANSPORT_STOP;
+ break;
+ case KB_MEDIA_PLAY_PAUSE:
+ usage = TRANSPORT_PLAY_PAUSE;
+ break;
+ case KB_MEDIA_SELECT:
+ usage = AL_CC_CONFIG;
+ break;
+ case KB_MAIL:
+ usage = AL_EMAIL;
+ break;
+ case KB_CALCULATOR:
+ usage = AL_CALCULATOR;
+ break;
+ case KB_MY_COMPUTER:
+ usage = AL_LOCAL_BROWSER;
+ break;
+ case KB_WWW_SEARCH:
+ usage = AC_SEARCH;
+ break;
+ case KB_WWW_HOME:
+ usage = AC_HOME;
+ break;
+ case KB_WWW_BACK:
+ usage = AC_BACK;
+ break;
+ case KB_WWW_FORWARD:
+ usage = AC_FORWARD;
+ break;
+ case KB_WWW_STOP:
+ usage = AC_STOP;
+ break;
+ case KB_WWW_REFRESH:
+ usage = AC_REFRESH;
+ break;
+ case KB_WWW_FAVORITES:
+ usage = AC_BOOKMARKS;
+ break;
+ }
+debug("usage: "); phex16(usage); debug("\n");
+ host_consumer_send(usage);
+ }
+ else if IS_SYSTEM(code) {
+ uint16_t usage = 0;
+ switch (code) {
+ case KB_SYSTEM_POWER:
+ usage = SYSTEM_POWER_DOWN;
+ break;
+ case KB_SYSTEM_SLEEP:
+ usage = SYSTEM_SLEEP;
+ break;
+ case KB_SYSTEM_WAKE:
+ usage = SYSTEM_WAKE_UP;
+ break;
+ }
+ host_system_send(usage);
+ }
+
}
static void unregister_code(uint8_t code)
@@ -156,6 +247,12 @@ static void unregister_code(uint8_t code)
mousekey_off(code);
mousekey_send();
}
+ else if IS_CONSUMER(code) {
+ host_consumer_send(0x0000);
+ }
+ else if IS_SYSTEM(code) {
+ host_system_send(0x0000);
+ }
}
/*
@@ -254,7 +351,6 @@ static inline void process_key(keyevent_t event)
layer_switch_off(code);
break;
case KEY_DOWN:
- case MOUSEKEY_DOWN:
register_code(code);
NEXT(PRESSING);
break;
@@ -262,7 +358,6 @@ static inline void process_key(keyevent_t event)
register_code(code);
break;
case KEY_UP:
- case MOUSEKEY_UP:
case MOD_UP:
unregister_code(code);
break;
@@ -283,16 +378,16 @@ static inline void process_key(keyevent_t event)
register_code(keymap_fn_keycode(FN_INDEX(code)));
break;
case FNK_UP:
+ // can't know whether layer switched or not
+ layer_switch_off(code);
unregister_code(keymap_fn_keycode(FN_INDEX(code)));
break;
case KEY_DOWN:
case MOD_DOWN:
- case MOUSEKEY_DOWN:
register_code(code);
break;
case KEY_UP:
case MOD_UP:
- case MOUSEKEY_UP:
unregister_code(code);
// no key registered? mousekey, mediakey, systemkey
if (!host_has_anykey())
@@ -307,7 +402,6 @@ static inline void process_key(keyevent_t event)
case FN_DOWN:
case FNK_DOWN:
case KEY_DOWN:
- case MOUSEKEY_DOWN:
waiting_key = (keyrecord_t) {
.event = event,
.code = code,
@@ -339,7 +433,6 @@ static inline void process_key(keyevent_t event)
}
break;
case KEY_UP:
- case MOUSEKEY_UP:
unregister_code(code);
NEXT(IDLE);
break;
@@ -355,7 +448,6 @@ static inline void process_key(keyevent_t event)
case FN_DOWN:
case FNK_DOWN:
case KEY_DOWN:
- case MOUSEKEY_DOWN:
tmp_mods = keyboard_report->mods;
host_set_mods(delayed_fn.mods);
register_code(keymap_fn_keycode(FN_INDEX(delayed_fn.code)));
@@ -389,7 +481,6 @@ static inline void process_key(keyevent_t event)
}
break;
case KEY_UP:
- case MOUSEKEY_UP:
if (code == waiting_key.code) {
layer_switch_on(delayed_fn.code);
NEXT(IDLE);
@@ -444,7 +535,6 @@ void keyboard_task(void)
matrix_row = matrix_get_row(r);
matrix_change = matrix_row ^ matrix_prev[r];
if (matrix_change) {
- // TODO: print once per scan
if (debug_matrix) matrix_print();
for (int c = 0; c < MATRIX_COLS; c++) {
diff --git a/common/mousekey.c b/common/mousekey.c
index 7f8e860aa..222d9e445 100644
--- a/common/mousekey.c
+++ b/common/mousekey.c
@@ -135,13 +135,6 @@ void mousekey_send(void)
void mousekey_clear(void)
{
report = (report_mouse_t){};
-/*
- report.buttons = 0;
- report.x = 0;
- report.y = 0;
- report.v = 0;
- report.h = 0;
-*/
}
static void mousekey_debug(void)
diff --git a/common/usb_keycodes.h b/common/usb_keycodes.h
index 61d6bf002..6a4437418 100644
--- a/common/usb_keycodes.h
+++ b/common/usb_keycodes.h
@@ -24,15 +24,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define IS_ERROR(code) (KB_ROLL_OVER <= (code) && (code) <= KB_UNDEFINED)
-#define IS_ANY(code) (KB_A <= (code))
+#define IS_ANY(code) (KB_A <= (code) && (code) <= 0xFF)
#define IS_KEY(code) (KB_A <= (code) && (code) <= KB_EXSEL)
#define IS_MOD(code) (KB_LCTRL <= (code) && (code) <= KB_RGUI)
+
#define IS_FN(code) (KB_FN0 <= (code) && (code) <= KB_FN7)
#define IS_MOUSEKEY(code) (KB_MS_UP <= (code) && (code) <= KB_MS_WH_RIGHT)
#define IS_MOUSEKEY_MOVE(code) (KB_MS_UP <= (code) && (code) <= KB_MS_RIGHT)
#define IS_MOUSEKEY_BUTTON(code) (KB_MS_BTN1 <= (code) && (code) <= KB_MS_BTN5)
#define IS_MOUSEKEY_WHEEL(code) (KB_MS_WH_UP <= (code) && (code) <= KB_MS_WH_RIGHT)
+#define IS_SPECIAL(code) ((0xB0 <= (code) && (code) <= 0xDF) || (0xE8 <= (code) && (code) <= 0xFF))
+#define IS_CONSUMER(code) (KB_MUTE <= (code) && (code) <= KB_WFAV)
+#define IS_SYSTEM(code) (KB_POWER <= (code) && (code) <= KB_WAKE)
+
#define MOD_BIT(code) (1<<((code) & 0x07))
#define FN_BIT(code) (1<<((code) - KB_FN0))
#define FN_INDEX(code) ((code) - KB_FN0)
@@ -137,14 +142,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Special keycode */
+/* NOTE: 0xA5-DF and 0xE8-FF can be used for internal special purpose */
enum special_keycodes {
/* System Control */
- KB_SYSTEM_POWER = 0xB0,
+ KB_SYSTEM_POWER = 0xA5,
KB_SYSTEM_SLEEP,
- KB_SYSTEM_WAKE,
+ KB_SYSTEM_WAKE, /* 0xA7 */
+ /* 0xA8-AF */
/* Consumer Page */
- KB_AUDIO_MUTE,
+ KB_AUDIO_MUTE = 0xB0,
KB_AUDIO_VOL_UP,
KB_AUDIO_VOL_DOWN,
KB_MEDIA_NEXT_TRACK,
@@ -157,13 +164,14 @@ enum special_keycodes {
KB_MY_COMPUTER,
KB_WWW_SEARCH,
KB_WWW_HOME,
- KB_WWW_BACK, /* 0xC0 */
+ KB_WWW_BACK,
KB_WWW_FORWARD,
KB_WWW_STOP,
- KB_WWW_REFRESH,
- KB_WWW_FAVORITES,
+ KB_WWW_REFRESH, /* 0xC0 */
+ KB_WWW_FAVORITES, /* 0xC1 */
+ /* 0xC2-DF vacant for future use */
- /* reserve 0xE0-E7 for Modifiers */
+ /* 0xE0-E7 for Modifiers. DO NOT USE. */
/* Layer Switching */
KB_FN0 = 0xE8,
@@ -173,7 +181,7 @@ enum special_keycodes {
KB_FN4,
KB_FN5,
KB_FN6,
- KB_FN7,
+ KB_FN7, /* 0xEF */
/* Mousekey */
KB_MS_UP = 0xF0,
@@ -189,11 +197,13 @@ enum special_keycodes {
KB_MS_WH_UP,
KB_MS_WH_DOWN,
KB_MS_WH_LEFT,
- KB_MS_WH_RIGHT,
+ KB_MS_WH_RIGHT, /* 0xFC */
+ /* 0xFD-FF vacant for future use */
};
+/* USB HID Keyboard/Keypad Usage(0x07) */
enum keycodes {
- KB_NO = 0,
+ KB_NO = 0x00,
KB_ROLL_OVER,
KB_POST_FAIL,
KB_UNDEFINED,
@@ -357,9 +367,10 @@ enum keycodes {
KB_OPER,
KB_CLEAR_AGAIN,
KB_CRSEL,
- KB_EXSEL,
+ KB_EXSEL, /* 0xA4 */
+
+ /* NOTE: 0xA5-DF are used for internal special purpose */
- /* NOTE: 0xB0-DF are used as special_keycodes */
#if 0
KB_KP_00 = 0xB0,
KB_KP_000,
@@ -406,7 +417,7 @@ enum keycodes {
KB_KP_BINARY,
KB_KP_OCTAL,
KB_KP_DECIMAL,
- KB_KP_HEXADECIMAL,
+ KB_KP_HEXADECIMAL, /* 0xDD */
#endif
/* Modifiers */
@@ -419,7 +430,7 @@ enum keycodes {
KB_RALT,
KB_RGUI,
- /* NOTE: 0xE8-FF are used as special_keycodes */
+ /* NOTE: 0xE8-FF are used for internal special purpose */
};
#endif /* USB_KEYCODES_H */
--
cgit v1.2.3-70-g09d2
From 373ab0e7192811944786c095facb80938c33f1d5 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Tue, 9 Oct 2012 14:36:13 +0900
Subject: Add keycode.h and remove usb_keycodes.h.
---
common/command.c | 38 ++---
common/host.c | 2 +-
common/keyboard.c | 44 ++---
common/keycode.h | 441 +++++++++++++++++++++++++++++++++++++++++++++++++
common/mousekey.c | 54 +++---
common/usb_keycodes.h | 436 ------------------------------------------------
keyboard/hhkb/config.h | 2 +-
keyboard/hhkb/keymap.c | 51 +++---
8 files changed, 536 insertions(+), 532 deletions(-)
create mode 100644 common/keycode.h
delete mode 100644 common/usb_keycodes.h
(limited to 'common/mousekey.c')
diff --git a/common/command.c b/common/command.c
index 0020d8a17..f9cdaf57d 100644
--- a/common/command.c
+++ b/common/command.c
@@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdint.h>
#include <stdbool.h>
#include <util/delay.h>
-#include "usb_keycodes.h"
+#include "keycode.h"
#include "host.h"
#include "print.h"
#include "debug.h"
@@ -74,10 +74,10 @@ uint8_t command_extra(void)
static uint8_t command_common(void)
{
switch (host_get_first_key()) {
- case KB_H:
+ case KC_H:
help();
break;
- case KB_B:
+ case KC_B:
host_clear_keyboard_report();
host_send_keyboard_report();
print("jump to bootloader... ");
@@ -85,7 +85,7 @@ static uint8_t command_common(void)
bootloader_jump(); // not return
print("not supported.\n");
break;
- case KB_D:
+ case KC_D:
debug_enable = !debug_enable;
if (debug_enable) {
last_print_enable = true;
@@ -101,34 +101,34 @@ static uint8_t command_common(void)
debug_mouse = false;
}
break;
- case KB_X: // debug matrix toggle
+ case KC_X: // debug matrix toggle
debug_matrix = !debug_matrix;
if (debug_matrix)
print("debug matrix enabled.\n");
else
print("debug matrix disabled.\n");
break;
- case KB_K: // debug keyboard toggle
+ case KC_K: // debug keyboard toggle
debug_keyboard = !debug_keyboard;
if (debug_keyboard)
print("debug keyboard enabled.\n");
else
print("debug keyboard disabled.\n");
break;
- case KB_M: // debug mouse toggle
+ case KC_M: // debug mouse toggle
debug_mouse = !debug_mouse;
if (debug_mouse)
print("debug mouse enabled.\n");
else
print("debug mouse disabled.\n");
break;
- case KB_V: // print version & information
+ case KC_V: // print version & information
print(STR(DESCRIPTION) "\n");
break;
- case KB_T: // print timer
+ case KC_T: // print timer
print("timer: "); phex16(timer_count); print("\n");
break;
- case KB_P: // print toggle
+ case KC_P: // print toggle
if (last_print_enable) {
print("print disabled.\n");
last_print_enable = false;
@@ -137,7 +137,7 @@ static uint8_t command_common(void)
print("print enabled.\n");
}
break;
- case KB_S:
+ case KC_S:
print("host_keyboard_leds:"); phex(host_keyboard_leds()); print("\n");
#ifdef HOST_PJRC
print("UDCON: "); phex(UDCON); print("\n");
@@ -156,7 +156,7 @@ static uint8_t command_common(void)
#endif
break;
#ifdef NKRO_ENABLE
- case KB_N:
+ case KC_N:
// send empty report before change
host_clear_keyboard_report();
host_send_keyboard_report();
@@ -168,7 +168,7 @@ static uint8_t command_common(void)
break;
#endif
#ifdef EXTRAKEY_ENABLE
- case KB_ESC:
+ case KC_ESC:
host_clear_keyboard_report();
host_send_keyboard_report();
#ifdef HOST_PJRC
@@ -186,23 +186,23 @@ static uint8_t command_common(void)
#endif
break;
#endif
- case KB_BSPC:
+ case KC_BSPC:
matrix_init();
print("clear matrix\n");
break;
- case KB_0:
+ case KC_0:
switch_layer(0);
break;
- case KB_1:
+ case KC_1:
switch_layer(1);
break;
- case KB_2:
+ case KC_2:
switch_layer(2);
break;
- case KB_3:
+ case KC_3:
switch_layer(3);
break;
- case KB_4:
+ case KC_4:
switch_layer(4);
break;
default:
diff --git a/common/host.c b/common/host.c
index 0a03807f7..37f707d0b 100644
--- a/common/host.c
+++ b/common/host.c
@@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdint.h>
#include <avr/interrupt.h>
-#include "usb_keycodes.h"
+#include "keycode.h"
#include "host.h"
#include "util.h"
#include "debug.h"
diff --git a/common/keyboard.c b/common/keyboard.c
index 328941df3..6adad8882 100644
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "keymap.h"
#include "host.h"
#include "led.h"
-#include "usb_keycodes.h"
+#include "keycode.h"
#include "timer.h"
#include "print.h"
#include "debug.h"
@@ -157,58 +157,58 @@ debug("register_code\n");
debug("consumer\n");
uint16_t usage = 0;
switch (code) {
- case KB_AUDIO_MUTE:
+ case KC_AUDIO_MUTE:
usage = AUDIO_MUTE;
break;
- case KB_AUDIO_VOL_UP:
+ case KC_AUDIO_VOL_UP:
usage = AUDIO_VOL_UP;
break;
- case KB_AUDIO_VOL_DOWN:
+ case KC_AUDIO_VOL_DOWN:
usage = AUDIO_VOL_DOWN;
break;
- case KB_MEDIA_NEXT_TRACK:
+ case KC_MEDIA_NEXT_TRACK:
usage = TRANSPORT_NEXT_TRACK;
break;
- case KB_MEDIA_PREV_TRACK:
+ case KC_MEDIA_PREV_TRACK:
usage = TRANSPORT_PREV_TRACK;
break;
- case KB_MEDIA_STOP:
+ case KC_MEDIA_STOP:
usage = TRANSPORT_STOP;
break;
- case KB_MEDIA_PLAY_PAUSE:
+ case KC_MEDIA_PLAY_PAUSE:
usage = TRANSPORT_PLAY_PAUSE;
break;
- case KB_MEDIA_SELECT:
+ case KC_MEDIA_SELECT:
usage = AL_CC_CONFIG;
break;
- case KB_MAIL:
+ case KC_MAIL:
usage = AL_EMAIL;
break;
- case KB_CALCULATOR:
+ case KC_CALCULATOR:
usage = AL_CALCULATOR;
break;
- case KB_MY_COMPUTER:
+ case KC_MY_COMPUTER:
usage = AL_LOCAL_BROWSER;
break;
- case KB_WWW_SEARCH:
+ case KC_WWW_SEARCH:
usage = AC_SEARCH;
break;
- case KB_WWW_HOME:
+ case KC_WWW_HOME:
usage = AC_HOME;
break;
- case KB_WWW_BACK:
+ case KC_WWW_BACK:
usage = AC_BACK;
break;
- case KB_WWW_FORWARD:
+ case KC_WWW_FORWARD:
usage = AC_FORWARD;
break;
- case KB_WWW_STOP:
+ case KC_WWW_STOP:
usage = AC_STOP;
break;
- case KB_WWW_REFRESH:
+ case KC_WWW_REFRESH:
usage = AC_REFRESH;
break;
- case KB_WWW_FAVORITES:
+ case KC_WWW_FAVORITES:
usage = AC_BOOKMARKS;
break;
}
@@ -218,13 +218,13 @@ debug("usage: "); phex16(usage); debug("\n");
else if IS_SYSTEM(code) {
uint16_t usage = 0;
switch (code) {
- case KB_SYSTEM_POWER:
+ case KC_SYSTEM_POWER:
usage = SYSTEM_POWER_DOWN;
break;
- case KB_SYSTEM_SLEEP:
+ case KC_SYSTEM_SLEEP:
usage = SYSTEM_SLEEP;
break;
- case KB_SYSTEM_WAKE:
+ case KC_SYSTEM_WAKE:
usage = SYSTEM_WAKE_UP;
break;
}
diff --git a/common/keycode.h b/common/keycode.h
new file mode 100644
index 000000000..4ed78a46a
--- /dev/null
+++ b/common/keycode.h
@@ -0,0 +1,441 @@
+/*
+Copyright 2011,2012 Jun Wako <wakojun@gmail.com>
+
+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
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+ * Keycodes based on HID Usage Keyboard/Keypad Page(0x07) plus special codes
+ * http://www.usb.org/developers/devclass_docs/Hut1_12.pdf
+ */
+#ifndef KEYCODE_H
+#define KEYCODE_H
+
+
+#define IS_ERROR(code) (KC_ROLL_OVER <= (code) && (code) <= KC_UNDEFINED)
+#define IS_ANY(code) (KC_A <= (code) && (code) <= 0xFF)
+#define IS_KEY(code) (KC_A <= (code) && (code) <= KC_EXSEL)
+#define IS_MOD(code) (KC_LCTRL <= (code) && (code) <= KC_RGUI)
+
+#define IS_FN(code) (KC_FN0 <= (code) && (code) <= KC_FN7)
+#define IS_MOUSEKEY(code) (KC_MS_UP <= (code) && (code) <= KC_MS_WH_RIGHT)
+#define IS_MOUSEKEY_MOVE(code) (KC_MS_UP <= (code) && (code) <= KC_MS_RIGHT)
+#define IS_MOUSEKEY_BUTTON(code) (KC_MS_BTN1 <= (code) && (code) <= KC_MS_BTN5)
+#define IS_MOUSEKEY_WHEEL(code) (KC_MS_WH_UP <= (code) && (code) <= KC_MS_WH_RIGHT)
+
+#define IS_SPECIAL(code) ((0xB0 <= (code) && (code) <= 0xDF) || (0xE8 <= (code) && (code) <= 0xFF))
+#define IS_CONSUMER(code) (KC_MUTE <= (code) && (code) <= KC_WFAV)
+#define IS_SYSTEM(code) (KC_POWER <= (code) && (code) <= KC_WAKE)
+
+#define MOD_BIT(code) (1<<MOD_INDEX(code))
+#define MOD_INDEX(code) ((code) & 0x07)
+#define FN_BIT(code) (1<<FN_INDEX(code))
+#define FN_INDEX(code) ((code) - KC_FN0)
+
+
+/*
+ * Short names for ease of definition of keymap
+ */
+#define KC_LCTL KC_LCTRL
+#define KC_RCTL KC_RCTRL
+#define KC_LSFT KC_LSHIFT
+#define KC_RSFT KC_RSHIFT
+#define KC_ESC KC_ESCAPE
+#define KC_BSPC KC_BSPACE
+#define KC_ENT KC_ENTER
+#define KC_DEL KC_DELETE
+#define KC_INS KC_INSERT
+#define KC_CAPS KC_CAPSLOCK
+#define KC_RGHT KC_RIGHT
+#define KC_PGDN KC_PGDOWN
+#define KC_PSCR KC_PSCREEN
+#define KC_SLCK KC_SCKLOCK
+#define KC_PAUS KC_PAUSE
+#define KC_BRK KC_PAUSE
+#define KC_NLCK KC_NUMLOCK
+#define KC_SPC KC_SPACE
+#define KC_MINS KC_MINUS
+#define KC_EQL KC_EQUAL
+#define KC_GRV KC_GRAVE
+#define KC_RBRC KC_RBRACKET
+#define KC_LBRC KC_LBRACKET
+#define KC_COMM KC_COMMA
+#define KC_BSLS KC_BSLASH
+#define KC_SLSH KC_SLASH
+#define KC_SCLN KC_SCOLON
+#define KC_QUOT KC_QUOTE
+#define KC_APP KC_APPLICATION
+#define KC_NUHS KC_NONUS_HASH
+#define KC_NUBS KC_NONUS_BSLASH
+#define KC_ERAS KC_ALT_ERASE,
+#define KC_CLR KC_CLEAR
+/* Japanese specific */
+#define KC_ZKHK KC_GRAVE
+#define KC_RO KC_INT1
+#define KC_KANA KC_INT2
+#define KC_JYEN KC_INT3
+#define KC_HENK KC_INT4
+#define KC_MHEN KC_INT5
+/* Keypad */
+#define KC_P1 KC_KP_1
+#define KC_P2 KC_KP_2
+#define KC_P3 KC_KP_3
+#define KC_P4 KC_KP_4
+#define KC_P5 KC_KP_5
+#define KC_P6 KC_KP_6
+#define KC_P7 KC_KP_7
+#define KC_P8 KC_KP_8
+#define KC_P9 KC_KP_9
+#define KC_P0 KC_KP_0
+#define KC_PDOT KC_KP_DOT
+#define KC_PCMM KC_KP_COMMA
+#define KC_PSLS KC_KP_SLASH
+#define KC_PAST KC_KP_ASTERISK
+#define KC_PMNS KC_KP_MINUS
+#define KC_PPLS KC_KP_PLUS
+#define KC_PEQL KC_KP_EQUAL
+#define KC_PENT KC_KP_ENTER
+/* Mousekey */
+#define KC_MS_U KC_MS_UP
+#define KC_MS_D KC_MS_DOWN
+#define KC_MS_L KC_MS_LEFT
+#define KC_MS_R KC_MS_RIGHT
+#define KC_BTN1 KC_MS_BTN1
+#define KC_BTN2 KC_MS_BTN2
+#define KC_BTN3 KC_MS_BTN3
+#define KC_BTN4 KC_MS_BTN4
+#define KC_BTN5 KC_MS_BTN5
+#define KC_WH_U KC_MS_WH_UP
+#define KC_WH_D KC_MS_WH_DOWN
+#define KC_WH_L KC_MS_WH_LEFT
+#define KC_WH_R KC_MS_WH_RIGHT
+/* Sytem Control */
+#define KC_PWR KC_SYSTEM_POWER
+#define KC_SLEP KC_SYSTEM_SLEEP
+#define KC_WAKE KC_SYSTEM_WAKE
+/* Consumer Page */
+#define KC_MUTE KC_AUDIO_MUTE
+#define KC_VOLU KC_AUDIO_VOL_UP
+#define KC_VOLD KC_AUDIO_VOL_DOWN
+#define KC_MNXT KC_MEDIA_NEXT_TRACK
+#define KC_MPRV KC_MEDIA_PREV_TRACK
+#define KC_MSTP KC_MEDIA_STOP
+#define KC_MPLY KC_MEDIA_PLAY_PAUSE
+#define KC_MSEL KC_MEDIA_SELECT
+#define KC_MAIL KC_MAIL
+#define KC_CALC KC_CALCULATOR
+#define KC_MYCM KC_MY_COMPUTER
+#define KC_WSCH KC_WWW_SEARCH
+#define KC_WHOM KC_WWW_HOME
+#define KC_WBAK KC_WWW_BACK
+#define KC_WFWD KC_WWW_FORWARD
+#define KC_WSTP KC_WWW_STOP
+#define KC_WREF KC_WWW_REFRESH
+#define KC_WFAV KC_WWW_FAVORITES
+
+
+/* USB HID Keyboard/Keypad Usage(0x07) */
+enum hid_keyboard_keypad_usage {
+ KC_NO = 0x00,
+ KC_ROLL_OVER,
+ KC_POST_FAIL,
+ KC_UNDEFINED,
+ KC_A,
+ KC_B,
+ KC_C,
+ KC_D,
+ KC_E,
+ KC_F,
+ KC_G,
+ KC_H,
+ KC_I,
+ KC_J,
+ KC_K,
+ KC_L,
+ KC_M, /* 0x10 */
+ KC_N,
+ KC_O,
+ KC_P,
+ KC_Q,
+ KC_R,
+ KC_S,
+ KC_T,
+ KC_U,
+ KC_V,
+ KC_W,
+ KC_X,
+ KC_Y,
+ KC_Z,
+ KC_1,
+ KC_2,
+ KC_3, /* 0x20 */
+ KC_4,
+ KC_5,
+ KC_6,
+ KC_7,
+ KC_8,
+ KC_9,
+ KC_0,
+ KC_ENTER,
+ KC_ESCAPE,
+ KC_BSPACE,
+ KC_TAB,
+ KC_SPACE,
+ KC_MINUS,
+ KC_EQUAL,
+ KC_LBRACKET,
+ KC_RBRACKET, /* 0x30 */
+ KC_BSLASH, /* \ (and |) */
+ KC_NONUS_HASH, /* Non-US # and ~ */
+ KC_SCOLON, /* ; (and :) */
+ KC_QUOTE, /* ' and " */
+ KC_GRAVE, /* Grave accent and tilde */
+ KC_COMMA, /* , and < */
+ KC_DOT, /* . and > */
+ KC_SLASH, /* / and ? */
+ KC_CAPSLOCK,
+ KC_F1,
+ KC_F2,
+ KC_F3,
+ KC_F4,
+ KC_F5,
+ KC_F6,
+ KC_F7, /* 0x40 */
+ KC_F8,
+ KC_F9,
+ KC_F10,
+ KC_F11,
+ KC_F12,
+ KC_PSCREEN,
+ KC_SCKLOCK,
+ KC_PAUSE,
+ KC_INSERT,
+ KC_HOME,
+ KC_PGUP,
+ KC_DELETE,
+ KC_END,
+ KC_PGDOWN,
+ KC_RIGHT,
+ KC_LEFT, /* 0x50 */
+ KC_DOWN,
+ KC_UP,
+ KC_NUMLOCK,
+ KC_KP_SLASH,
+ KC_KP_ASTERISK,
+ KC_KP_MINUS,
+ KC_KP_PLUS,
+ KC_KP_ENTER,
+ KC_KP_1,
+ KC_KP_2,
+ KC_KP_3,
+ KC_KP_4,
+ KC_KP_5,
+ KC_KP_6,
+ KC_KP_7,
+ KC_KP_8, /* 0x60 */
+ KC_KP_9,
+ KC_KP_0,
+ KC_KP_DOT,
+ KC_NONUS_BSLASH, /* Non-US \ and | */
+ KC_APPLICATION,
+ KC_POWER,
+ KC_KP_EQUAL,
+ KC_F13,
+ KC_F14,
+ KC_F15,
+ KC_F16,
+ KC_F17,
+ KC_F18,
+ KC_F19,
+ KC_F20,
+ KC_F21, /* 0x70 */
+ KC_F22,
+ KC_F23,
+ KC_F24,
+ KC_EXECUTE,
+ KC_HELP,
+ KC_MENU,
+ KC_SELECT,
+ KC_STOP,
+ KC_AGAIN,
+ KC_UNDO,
+ KC_CUT,
+ KC_COPY,
+ KC_PASTE,
+ KC_FIND,
+ KC__MUTE,
+ KC__VOLUP, /* 0x80 */
+ KC__VOLDOWN,
+ KC_LOCKING_CAPS, /* locking Caps Lock */
+ KC_LOCKING_NUM, /* locking Num Lock */
+ KC_LOCKING_SCROLL, /* locking Scroll Lock */
+ KC_KP_COMMA,
+ KC_KP_EQUAL_AS400, /* equal sign on AS/400 */
+ KC_INT1,
+ KC_INT2,
+ KC_INT3,
+ KC_INT4,
+ KC_INT5,
+ KC_INT6,
+ KC_INT7,
+ KC_INT8,
+ KC_INT9,
+ KC_LANG1, /* 0x90 */
+ KC_LANG2,
+ KC_LANG3,
+ KC_LANG4,
+ KC_LANG5,
+ KC_LANG6,
+ KC_LANG7,
+ KC_LANG8,
+ KC_LANG9,
+ KC_ALT_ERASE,
+ KC_SYSREQ,
+ KC_CANCEL,
+ KC_CLEAR,
+ KC_PRIOR,
+ KC_RETURN,
+ KC_SEPARATOR,
+ KC_OUT, /* 0xA0 */
+ KC_OPER,
+ KC_CLEAR_AGAIN,
+ KC_CRSEL,
+ KC_EXSEL, /* 0xA4 */
+
+ /* NOTE: 0xA5-DF are used for internal special purpose */
+
+#if 0
+ /* NOTE: Following codes(0xB0-DD) are not used. Leave them for reference. */
+ KC_KP_00 = 0xB0,
+ KC_KP_000,
+ KC_THOUSANDS_SEPARATOR,
+ KC_DECIMAL_SEPARATOR,
+ KC_CURRENCY_UNIT,
+ KC_CURRENCY_SUB_UNIT,
+ KC_KP_LPAREN,
+ KC_KP_RPAREN,
+ KC_KP_LCBRACKET, /* { */
+ KC_KP_RCBRACKET, /* } */
+ KC_KP_TAB,
+ KC_KP_BSPACE,
+ KC_KP_A,
+ KC_KP_B,
+ KC_KP_C,
+ KC_KP_D,
+ KC_KP_E, /* 0xC0 */
+ KC_KP_F,
+ KC_KP_XOR,
+ KC_KP_HAT,
+ KC_KP_PERC,
+ KC_KP_LT,
+ KC_KP_GT,
+ KC_KP_AND,
+ KC_KP_LAZYAND,
+ KC_KP_OR,
+ KC_KP_LAZYOR,
+ KC_KP_COLON,
+ KC_KP_HASH,
+ KC_KP_SPACE,
+ KC_KP_ATMARK,
+ KC_KP_EXCLAMATION,
+ KC_KP_MEM_STORE, /* 0xD0 */
+ KC_KP_MEM_RECALL,
+ KC_KP_MEM_CLEAR,
+ KC_KP_MEM_ADD,
+ KC_KP_MEM_SUB,
+ KC_KP_MEM_MUL,
+ KC_KP_MEM_DIV,
+ KC_KP_PLUS_MINUS,
+ KC_KP_CLEAR,
+ KC_KP_CLEAR_ENTRY,
+ KC_KP_BINARY,
+ KC_KP_OCTAL,
+ KC_KP_DECIMAL,
+ KC_KP_HEXADECIMAL, /* 0xDD */
+#endif
+
+ /* Modifiers */
+ KC_LCTRL = 0xE0,
+ KC_LSHIFT,
+ KC_LALT,
+ KC_LGUI,
+ KC_RCTRL,
+ KC_RSHIFT,
+ KC_RALT,
+ KC_RGUI,
+
+ /* NOTE: 0xE8-FF are used for internal special purpose */
+};
+
+/* Special keycodes */
+/* NOTE: 0xA5-DF and 0xE8-FF are used for internal special purpose */
+enum internal_special_keycodes {
+ /* System Control */
+ KC_SYSTEM_POWER = 0xA5,
+ KC_SYSTEM_SLEEP,
+ KC_SYSTEM_WAKE, /* 0xA7 */
+ /* 0xA8-AF */
+
+ /* Consumer Page */
+ KC_AUDIO_MUTE = 0xB0,
+ KC_AUDIO_VOL_UP,
+ KC_AUDIO_VOL_DOWN,
+ KC_MEDIA_NEXT_TRACK,
+ KC_MEDIA_PREV_TRACK,
+ KC_MEDIA_STOP,
+ KC_MEDIA_PLAY_PAUSE,
+ KC_MEDIA_SELECT,
+ KC_MAIL,
+ KC_CALCULATOR,
+ KC_MY_COMPUTER,
+ KC_WWW_SEARCH,
+ KC_WWW_HOME,
+ KC_WWW_BACK,
+ KC_WWW_FORWARD,
+ KC_WWW_STOP,
+ KC_WWW_REFRESH, /* 0xC0 */
+ KC_WWW_FAVORITES, /* 0xC1 */
+ /* 0xC2-DF vacant for future use */
+
+ /* 0xE0-E7 for Modifiers. DO NOT USE. */
+
+ /* Layer Switching */
+ KC_FN0 = 0xE8,
+ KC_FN1,
+ KC_FN2,
+ KC_FN3,
+ KC_FN4,
+ KC_FN5,
+ KC_FN6,
+ KC_FN7, /* 0xEF */
+
+ /* Mousekey */
+ KC_MS_UP = 0xF0,
+ KC_MS_DOWN,
+ KC_MS_LEFT,
+ KC_MS_RIGHT,
+ KC_MS_BTN1,
+ KC_MS_BTN2,
+ KC_MS_BTN3,
+ KC_MS_BTN4,
+ KC_MS_BTN5,
+ /* Mousekey wheel */
+ KC_MS_WH_UP,
+ KC_MS_WH_DOWN,
+ KC_MS_WH_LEFT,
+ KC_MS_WH_RIGHT, /* 0xFC */
+ /* 0xFD-FF vacant for future use */
+};
+
+#endif /* KEYCODE_H */
diff --git a/common/mousekey.c b/common/mousekey.c
index 222d9e445..58a6e35bb 100644
--- a/common/mousekey.c
+++ b/common/mousekey.c
@@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdint.h>
#include <util/delay.h>
-#include "usb_keycodes.h"
+#include "keycode.h"
#include "host.h"
#include "timer.h"
#include "print.h"
@@ -90,36 +90,36 @@ void mousekey_task(void)
void mousekey_on(uint8_t code)
{
- if (code == KB_MS_UP) report.y = MOUSEKEY_MOVE_INIT * -1;
- else if (code == KB_MS_DOWN) report.y = MOUSEKEY_MOVE_INIT;
- else if (code == KB_MS_LEFT) report.x = MOUSEKEY_MOVE_INIT * -1;
- else if (code == KB_MS_RIGHT) report.x = MOUSEKEY_MOVE_INIT;
- else if (code == KB_MS_WH_UP) report.v = MOUSEKEY_WHEEL_INIT;
- else if (code == KB_MS_WH_DOWN) report.v = MOUSEKEY_WHEEL_INIT * -1;
- else if (code == KB_MS_WH_LEFT) report.h = MOUSEKEY_WHEEL_INIT * -1;
- else if (code == KB_MS_WH_RIGHT) report.h = MOUSEKEY_WHEEL_INIT;
- else if (code == KB_MS_BTN1) report.buttons |= MOUSE_BTN1;
- else if (code == KB_MS_BTN2) report.buttons |= MOUSE_BTN2;
- else if (code == KB_MS_BTN3) report.buttons |= MOUSE_BTN3;
- else if (code == KB_MS_BTN4) report.buttons |= MOUSE_BTN4;
- else if (code == KB_MS_BTN5) report.buttons |= MOUSE_BTN5;
+ if (code == KC_MS_UP) report.y = MOUSEKEY_MOVE_INIT * -1;
+ else if (code == KC_MS_DOWN) report.y = MOUSEKEY_MOVE_INIT;
+ else if (code == KC_MS_LEFT) report.x = MOUSEKEY_MOVE_INIT * -1;
+ else if (code == KC_MS_RIGHT) report.x = MOUSEKEY_MOVE_INIT;
+ else if (code == KC_MS_WH_UP) report.v = MOUSEKEY_WHEEL_INIT;
+ else if (code == KC_MS_WH_DOWN) report.v = MOUSEKEY_WHEEL_INIT * -1;
+ else if (code == KC_MS_WH_LEFT) report.h = MOUSEKEY_WHEEL_INIT * -1;
+ else if (code == KC_MS_WH_RIGHT) report.h = MOUSEKEY_WHEEL_INIT;
+ else if (code == KC_MS_BTN1) report.buttons |= MOUSE_BTN1;
+ else if (code == KC_MS_BTN2) report.buttons |= MOUSE_BTN2;
+ else if (code == KC_MS_BTN3) report.buttons |= MOUSE_BTN3;
+ else if (code == KC_MS_BTN4) report.buttons |= MOUSE_BTN4;
+ else if (code == KC_MS_BTN5) report.buttons |= MOUSE_BTN5;
}
void mousekey_off(uint8_t code)
{
- if (code == KB_MS_UP && report.y < 0) report.y = 0;
- else if (code == KB_MS_DOWN && report.y > 0) report.y = 0;
- else if (code == KB_MS_LEFT && report.x < 0) report.x = 0;
- else if (code == KB_MS_RIGHT && report.x > 0) report.x = 0;
- else if (code == KB_MS_WH_UP && report.v > 0) report.v = 0;
- else if (code == KB_MS_WH_DOWN && report.v < 0) report.v = 0;
- else if (code == KB_MS_WH_LEFT && report.h < 0) report.h = 0;
- else if (code == KB_MS_WH_RIGHT && report.h > 0) report.h = 0;
- else if (code == KB_MS_BTN1) report.buttons &= ~MOUSE_BTN1;
- else if (code == KB_MS_BTN2) report.buttons &= ~MOUSE_BTN2;
- else if (code == KB_MS_BTN3) report.buttons &= ~MOUSE_BTN3;
- else if (code == KB_MS_BTN4) report.buttons &= ~MOUSE_BTN4;
- else if (code == KB_MS_BTN5) report.buttons &= ~MOUSE_BTN5;
+ if (code == KC_MS_UP && report.y < 0) report.y = 0;
+ else if (code == KC_MS_DOWN && report.y > 0) report.y = 0;
+ else if (code == KC_MS_LEFT && report.x < 0) report.x = 0;
+ else if (code == KC_MS_RIGHT && report.x > 0) report.x = 0;
+ else if (code == KC_MS_WH_UP && report.v > 0) report.v = 0;
+ else if (code == KC_MS_WH_DOWN && report.v < 0) report.v = 0;
+ else if (code == KC_MS_WH_LEFT && report.h < 0) report.h = 0;
+ else if (code == KC_MS_WH_RIGHT && report.h > 0) report.h = 0;
+ else if (code == KC_MS_BTN1) report.buttons &= ~MOUSE_BTN1;
+ else if (code == KC_MS_BTN2) report.buttons &= ~MOUSE_BTN2;
+ else if (code == KC_MS_BTN3) report.buttons &= ~MOUSE_BTN3;
+ else if (code == KC_MS_BTN4) report.buttons &= ~MOUSE_BTN4;
+ else if (code == KC_MS_BTN5) report.buttons &= ~MOUSE_BTN5;
if (report.x == 0 && report.y == 0 && report.v == 0 && report.h == 0)
mousekey_repeat = 0;
diff --git a/common/usb_keycodes.h b/common/usb_keycodes.h
deleted file mode 100644
index 6a4437418..000000000
--- a/common/usb_keycodes.h
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
-Copyright 2011 Jun Wako <wakojun@gmail.com>
-
-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
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*
- * Key codes: HID Keyboard/Keypad Page(0x07)
- * http://www.usb.org/developers/devclass_docs/Hut1_12.pdf
- */
-#ifndef USB_KEYCODES_H
-#define USB_KEYCODES_H
-
-
-#define IS_ERROR(code) (KB_ROLL_OVER <= (code) && (code) <= KB_UNDEFINED)
-#define IS_ANY(code) (KB_A <= (code) && (code) <= 0xFF)
-#define IS_KEY(code) (KB_A <= (code) && (code) <= KB_EXSEL)
-#define IS_MOD(code) (KB_LCTRL <= (code) && (code) <= KB_RGUI)
-
-#define IS_FN(code) (KB_FN0 <= (code) && (code) <= KB_FN7)
-#define IS_MOUSEKEY(code) (KB_MS_UP <= (code) && (code) <= KB_MS_WH_RIGHT)
-#define IS_MOUSEKEY_MOVE(code) (KB_MS_UP <= (code) && (code) <= KB_MS_RIGHT)
-#define IS_MOUSEKEY_BUTTON(code) (KB_MS_BTN1 <= (code) && (code) <= KB_MS_BTN5)
-#define IS_MOUSEKEY_WHEEL(code) (KB_MS_WH_UP <= (code) && (code) <= KB_MS_WH_RIGHT)
-
-#define IS_SPECIAL(code) ((0xB0 <= (code) && (code) <= 0xDF) || (0xE8 <= (code) && (code) <= 0xFF))
-#define IS_CONSUMER(code) (KB_MUTE <= (code) && (code) <= KB_WFAV)
-#define IS_SYSTEM(code) (KB_POWER <= (code) && (code) <= KB_WAKE)
-
-#define MOD_BIT(code) (1<<((code) & 0x07))
-#define FN_BIT(code) (1<<((code) - KB_FN0))
-#define FN_INDEX(code) ((code) - KB_FN0)
-
-
-/* Short names */
-#define KB_LCTL KB_LCTRL
-#define KB_RCTL KB_RCTRL
-#define KB_LSFT KB_LSHIFT
-#define KB_RSFT KB_RSHIFT
-#define KB_ESC KB_ESCAPE
-#define KB_BSPC KB_BSPACE
-#define KB_ENT KB_ENTER
-#define KB_DEL KB_DELETE
-#define KB_INS KB_INSERT
-#define KB_CAPS KB_CAPSLOCK
-#define KB_RGHT KB_RIGHT
-#define KB_PGDN KB_PGDOWN
-#define KB_PSCR KB_PSCREEN
-#define KB_SLCK KB_SCKLOCK
-#define KB_PAUS KB_PAUSE
-#define KB_BRK KB_PAUSE
-#define KB_NLCK KB_NUMLOCK
-#define KB_SPC KB_SPACE
-#define KB_MINS KB_MINUS
-#define KB_EQL KB_EQUAL
-#define KB_GRV KB_GRAVE
-#define KB_RBRC KB_RBRACKET
-#define KB_LBRC KB_LBRACKET
-#define KB_COMM KB_COMMA
-#define KB_BSLS KB_BSLASH
-#define KB_SLSH KB_SLASH
-#define KB_SCLN KB_SCOLON
-#define KB_QUOT KB_QUOTE
-#define KB_APP KB_APPLICATION
-#define KB_NUHS KB_NONUS_HASH
-#define KB_NUBS KB_NONUS_BSLASH
-#define KB_ERAS KB_ALT_ERASE,
-#define KB_CLR KB_CLEAR
-/* for Japanese */
-#define KB_ZKHK KB_GRAVE
-#define KB_RO KB_INT1
-#define KB_KANA KB_INT2
-#define KB_JYEN KB_INT3
-#define KB_HENK KB_INT4
-#define KB_MHEN KB_INT5
-/* Keypad */
-#define KB_P1 KB_KP_1
-#define KB_P2 KB_KP_2
-#define KB_P3 KB_KP_3
-#define KB_P4 KB_KP_4
-#define KB_P5 KB_KP_5
-#define KB_P6 KB_KP_6
-#define KB_P7 KB_KP_7
-#define KB_P8 KB_KP_8
-#define KB_P9 KB_KP_9
-#define KB_P0 KB_KP_0
-#define KB_PDOT KB_KP_DOT
-#define KB_PCMM KB_KP_COMMA
-#define KB_PSLS KB_KP_SLASH
-#define KB_PAST KB_KP_ASTERISK
-#define KB_PMNS KB_KP_MINUS
-#define KB_PPLS KB_KP_PLUS
-#define KB_PEQL KB_KP_EQUAL
-#define KB_PENT KB_KP_ENTER
-/* Mousekey */
-#define KB_MS_U KB_MS_UP
-#define KB_MS_D KB_MS_DOWN
-#define KB_MS_L KB_MS_LEFT
-#define KB_MS_R KB_MS_RIGHT
-#define KB_BTN1 KB_MS_BTN1
-#define KB_BTN2 KB_MS_BTN2
-#define KB_BTN3 KB_MS_BTN3
-#define KB_BTN4 KB_MS_BTN4
-#define KB_BTN5 KB_MS_BTN5
-#define KB_WH_U KB_MS_WH_UP
-#define KB_WH_D KB_MS_WH_DOWN
-#define KB_WH_L KB_MS_WH_LEFT
-#define KB_WH_R KB_MS_WH_RIGHT
-/* Sytem Control & Consumer usage */
-#define KB_PWR KB_SYSTEM_POWER
-#define KB_SLEP KB_SYSTEM_SLEEP
-#define KB_WAKE KB_SYSTEM_WAKE
-#define KB_MUTE KB_AUDIO_MUTE
-#define KB_VOLU KB_AUDIO_VOL_UP
-#define KB_VOLD KB_AUDIO_VOL_DOWN
-#define KB_MNXT KB_MEDIA_NEXT_TRACK
-#define KB_MPRV KB_MEDIA_PREV_TRACK
-#define KB_MSTP KB_MEDIA_STOP
-#define KB_MPLY KB_MEDIA_PLAY_PAUSE
-#define KB_MSEL KB_MEDIA_SELECT
-#define KB_MAIL KB_MAIL
-#define KB_CALC KB_CALCULATOR
-#define KB_MYCM KB_MY_COMPUTER
-#define KB_WSCH KB_WWW_SEARCH
-#define KB_WHOM KB_WWW_HOME
-#define KB_WBAK KB_WWW_BACK
-#define KB_WFWD KB_WWW_FORWARD
-#define KB_WSTP KB_WWW_STOP
-#define KB_WREF KB_WWW_REFRESH
-#define KB_WFAV KB_WWW_FAVORITES
-
-
-/* Special keycode */
-/* NOTE: 0xA5-DF and 0xE8-FF can be used for internal special purpose */
-enum special_keycodes {
- /* System Control */
- KB_SYSTEM_POWER = 0xA5,
- KB_SYSTEM_SLEEP,
- KB_SYSTEM_WAKE, /* 0xA7 */
- /* 0xA8-AF */
-
- /* Consumer Page */
- KB_AUDIO_MUTE = 0xB0,
- KB_AUDIO_VOL_UP,
- KB_AUDIO_VOL_DOWN,
- KB_MEDIA_NEXT_TRACK,
- KB_MEDIA_PREV_TRACK,
- KB_MEDIA_STOP,
- KB_MEDIA_PLAY_PAUSE,
- KB_MEDIA_SELECT,
- KB_MAIL,
- KB_CALCULATOR,
- KB_MY_COMPUTER,
- KB_WWW_SEARCH,
- KB_WWW_HOME,
- KB_WWW_BACK,
- KB_WWW_FORWARD,
- KB_WWW_STOP,
- KB_WWW_REFRESH, /* 0xC0 */
- KB_WWW_FAVORITES, /* 0xC1 */
- /* 0xC2-DF vacant for future use */
-
- /* 0xE0-E7 for Modifiers. DO NOT USE. */
-
- /* Layer Switching */
- KB_FN0 = 0xE8,
- KB_FN1,
- KB_FN2,
- KB_FN3,
- KB_FN4,
- KB_FN5,
- KB_FN6,
- KB_FN7, /* 0xEF */
-
- /* Mousekey */
- KB_MS_UP = 0xF0,
- KB_MS_DOWN,
- KB_MS_LEFT,
- KB_MS_RIGHT,
- KB_MS_BTN1,
- KB_MS_BTN2,
- KB_MS_BTN3,
- KB_MS_BTN4,
- KB_MS_BTN5,
- /* Mousekey wheel */
- KB_MS_WH_UP,
- KB_MS_WH_DOWN,
- KB_MS_WH_LEFT,
- KB_MS_WH_RIGHT, /* 0xFC */
- /* 0xFD-FF vacant for future use */
-};
-
-/* USB HID Keyboard/Keypad Usage(0x07) */
-enum keycodes {
- KB_NO = 0x00,
- KB_ROLL_OVER,
- KB_POST_FAIL,
- KB_UNDEFINED,
- KB_A,
- KB_B,
- KB_C,
- KB_D,
- KB_E,
- KB_F,
- KB_G,
- KB_H,
- KB_I,
- KB_J,
- KB_K,
- KB_L,
- KB_M, /* 0x10 */
- KB_N,
- KB_O,
- KB_P,
- KB_Q,
- KB_R,
- KB_S,
- KB_T,
- KB_U,
- KB_V,
- KB_W,
- KB_X,
- KB_Y,
- KB_Z,
- KB_1,
- KB_2,
- KB_3, /* 0x20 */
- KB_4,
- KB_5,
- KB_6,
- KB_7,
- KB_8,
- KB_9,
- KB_0,
- KB_ENTER,
- KB_ESCAPE,
- KB_BSPACE,
- KB_TAB,
- KB_SPACE,
- KB_MINUS,
- KB_EQUAL,
- KB_LBRACKET,
- KB_RBRACKET, /* 0x30 */
- KB_BSLASH, /* \ (and |) */
- KB_NONUS_HASH, /* Non-US # and ~ */
- KB_SCOLON, /* ; (and :) */
- KB_QUOTE, /* ' and " */
- KB_GRAVE, /* Grave accent and tilde */
- KB_COMMA, /* , and < */
- KB_DOT, /* . and > */
- KB_SLASH, /* / and ? */
- KB_CAPSLOCK,
- KB_F1,
- KB_F2,
- KB_F3,
- KB_F4,
- KB_F5,
- KB_F6,
- KB_F7, /* 0x40 */
- KB_F8,
- KB_F9,
- KB_F10,
- KB_F11,
- KB_F12,
- KB_PSCREEN,
- KB_SCKLOCK,
- KB_PAUSE,
- KB_INSERT,
- KB_HOME,
- KB_PGUP,
- KB_DELETE,
- KB_END,
- KB_PGDOWN,
- KB_RIGHT,
- KB_LEFT, /* 0x50 */
- KB_DOWN,
- KB_UP,
- KB_NUMLOCK,
- KB_KP_SLASH,
- KB_KP_ASTERISK,
- KB_KP_MINUS,
- KB_KP_PLUS,
- KB_KP_ENTER,
- KB_KP_1,
- KB_KP_2,
- KB_KP_3,
- KB_KP_4,
- KB_KP_5,
- KB_KP_6,
- KB_KP_7,
- KB_KP_8, /* 0x60 */
- KB_KP_9,
- KB_KP_0,
- KB_KP_DOT,
- KB_NONUS_BSLASH, /* Non-US \ and | */
- KB_APPLICATION,
- KB_POWER,
- KB_KP_EQUAL,
- KB_F13,
- KB_F14,
- KB_F15,
- KB_F16,
- KB_F17,
- KB_F18,
- KB_F19,
- KB_F20,
- KB_F21, /* 0x70 */
- KB_F22,
- KB_F23,
- KB_F24,
- KB_EXECUTE,
- KB_HELP,
- KB_MENU,
- KB_SELECT,
- KB_STOP,
- KB_AGAIN,
- KB_UNDO,
- KB_CUT,
- KB_COPY,
- KB_PASTE,
- KB_FIND,
- KB__MUTE,
- KB__VOLUP, /* 0x80 */
- KB__VOLDOWN,
- KB_LOCKING_CAPS, /* locking Caps Lock */
- KB_LOCKING_NUM, /* locking Num Lock */
- KB_LOCKING_SCROLL, /* locking Scroll Lock */
- KB_KP_COMMA,
- KB_KP_EQUAL_AS400, /* equal sign on AS/400 */
- KB_INT1,
- KB_INT2,
- KB_INT3,
- KB_INT4,
- KB_INT5,
- KB_INT6,
- KB_INT7,
- KB_INT8,
- KB_INT9,
- KB_LANG1, /* 0x90 */
- KB_LANG2,
- KB_LANG3,
- KB_LANG4,
- KB_LANG5,
- KB_LANG6,
- KB_LANG7,
- KB_LANG8,
- KB_LANG9,
- KB_ALT_ERASE,
- KB_SYSREQ,
- KB_CANCEL,
- KB_CLEAR,
- KB_PRIOR,
- KB_RETURN,
- KB_SEPARATOR,
- KB_OUT, /* 0xA0 */
- KB_OPER,
- KB_CLEAR_AGAIN,
- KB_CRSEL,
- KB_EXSEL, /* 0xA4 */
-
- /* NOTE: 0xA5-DF are used for internal special purpose */
-
-#if 0
- KB_KP_00 = 0xB0,
- KB_KP_000,
- KB_THOUSANDS_SEPARATOR,
- KB_DECIMAL_SEPARATOR,
- KB_CURRENCY_UNIT,
- KB_CURRENCY_SUB_UNIT,
- KB_KP_LPAREN,
- KB_KP_RPAREN,
- KB_KP_LCBRACKET, /* { */
- KB_KP_RCBRACKET, /* } */
- KB_KP_TAB,
- KB_KP_BSPACE,
- KB_KP_A,
- KB_KP_B,
- KB_KP_C,
- KB_KP_D,
- KB_KP_E, /* 0xC0 */
- KB_KP_F,
- KB_KP_XOR,
- KB_KP_HAT,
- KB_KP_PERC,
- KB_KP_LT,
- KB_KP_GT,
- KB_KP_AND,
- KB_KP_LAZYAND,
- KB_KP_OR,
- KB_KP_LAZYOR,
- KB_KP_COLON,
- KB_KP_HASH,
- KB_KP_SPACE,
- KB_KP_ATMARK,
- KB_KP_EXCLAMATION,
- KB_KP_MEM_STORE, /* 0xD0 */
- KB_KP_MEM_RECALL,
- KB_KP_MEM_CLEAR,
- KB_KP_MEM_ADD,
- KB_KP_MEM_SUB,
- KB_KP_MEM_MUL,
- KB_KP_MEM_DIV,
- KB_KP_PLUS_MINUS,
- KB_KP_CLEAR,
- KB_KP_CLEAR_ENTRY,
- KB_KP_BINARY,
- KB_KP_OCTAL,
- KB_KP_DECIMAL,
- KB_KP_HEXADECIMAL, /* 0xDD */
-#endif
-
- /* Modifiers */
- KB_LCTRL = 0xE0,
- KB_LSHIFT,
- KB_LALT,
- KB_LGUI,
- KB_RCTRL,
- KB_RSHIFT,
- KB_RALT,
- KB_RGUI,
-
- /* NOTE: 0xE8-FF are used for internal special purpose */
-};
-
-#endif /* USB_KEYCODES_H */
diff --git a/keyboard/hhkb/config.h b/keyboard/hhkb/config.h
index 17a449406..e10a7ab37 100644
--- a/keyboard/hhkb/config.h
+++ b/keyboard/hhkb/config.h
@@ -38,7 +38,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
diff --git a/keyboard/hhkb/keymap.c b/keyboard/hhkb/keymap.c
index 43f777c56..3cfa5ff33 100644
--- a/keyboard/hhkb/keymap.c
+++ b/keyboard/hhkb/keymap.c
@@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdbool.h>
#include <avr/pgmspace.h>
#include "host.h"
-#include "usb_keycodes.h"
+#include "keycode.h"
#include "print.h"
#include "debug.h"
#include "util.h"
@@ -39,14 +39,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
K35, K36, K37, K57, K56 \
) \
{ \
- { KB_##K00, KB_##K01, KB_##K02, KB_##K03, KB_##K04, KB_##K05, KB_##K06, KB_##K07 }, \
- { KB_##K10, KB_##K11, KB_##K12, KB_##K13, KB_##K14, KB_##K15, KB_##K16, KB_##K17 }, \
- { KB_##K20, KB_##K21, KB_##K22, KB_##K23, KB_##K24, KB_##K25, KB_##K26, KB_NO }, \
- { KB_##K30, KB_##K31, KB_##K32, KB_##K33, KB_##K34, KB_##K35, KB_##K36, KB_##K37 }, \
- { KB_##K40, KB_##K41, KB_##K42, KB_##K43, KB_##K44, KB_##K45, KB_##K46, KB_NO }, \
- { KB_##K50, KB_##K51, KB_##K52, KB_##K53, KB_##K54, KB_##K55, KB_##K56, KB_##K57 }, \
- { KB_##K60, KB_##K61, KB_##K62, KB_##K63, KB_##K64, KB_##K65, KB_##K66, KB_NO }, \
- { KB_##K70, KB_##K71, KB_##K72, KB_##K73, KB_##K74, KB_##K75, KB_##K76, KB_NO } \
+ { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07 }, \
+ { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17 }, \
+ { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_NO }, \
+ { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37 }, \
+ { KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46, KC_NO }, \
+ { KC_##K50, KC_##K51, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56, KC_##K57 }, \
+ { KC_##K60, KC_##K61, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66, KC_NO }, \
+ { KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_NO } \
}
#define KEYCODE(layer, row, col) (pgm_read_byte(&keymaps[(layer)][(row)][(col)]))
@@ -67,14 +67,14 @@ static const uint8_t PROGMEM fn_layer[] = {
// Assign Fn key(0-7) to a keycode sent when release Fn key without use of the layer.
// See layer.c for details.
static const uint8_t PROGMEM fn_keycode[] = {
- KB_NO, // Fn0
- KB_NO, // Fn1
- KB_SLSH, // Fn2
- KB_SCLN, // Fn3
- KB_NO, // Fn4
- KB_SPC, // Fn5
- KB_NO, // Fn6
- KB_NO // Fn7
+ KC_NO, // Fn0
+ KC_NO, // Fn1
+ KC_SLSH, // Fn2
+ KC_SCLN, // Fn3
+ KC_NO, // Fn4
+ KC_SPC, // Fn5
+ KC_NO, // Fn6
+ KC_NO // Fn7
};
static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -95,7 +95,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSPC, \
LCTL,A, S, D, F, G, H, J, K, L, FN3, QUOT,ENT, \
LSFT,Z, X, C, V, B, N, M, COMM,DOT, FN2, RSFT,FN1, \
- LGUI,LALT, SPC, RALT,FN4),
+ LGUI,LALT, FN5, RALT,FN4),
/* Layer 1: HHKB mode (HHKB Fn)
* ,-----------------------------------------------------------.
@@ -151,10 +151,10 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
#ifdef HOST_IWRAP
// iWRAP does not support mouse wheel, use these keycodes to remap as wheel
-#define KB_KPPL KB_KP_PLUS
-#define KB_KPMI KB_KP_MINUS
-#define KB_KPAS KB_KP_ASTERISK
-#define KB_KPSL KB_KP_SLASH
+#define KC_KPPL KC_KP_PLUS
+#define KC_KPMI KC_KP_MINUS
+#define KC_KPAS KC_KP_ASTERISK
+#define KC_KPSL KC_KP_SLASH
KEYMAP(ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
TAB, KPAS,KPPL,MS_U,KPMI,KPSL,KPAS,KPPL,KPMI,KPSL,NO, NO, NO, BSPC, \
LCTL,NO, MS_L,MS_D,MS_R,NO, MS_L,MS_D,MS_U,MS_R,FN3, NO, ENT, \
@@ -181,14 +181,13 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |Gui |Alt |xxxxxxxxxxxxxxxxxxxxxxx|Alt |Gui|
* `--------------------------------------------'
*/
-/*
KEYMAP(MINS,0, 9, 8, 7, 6, 5, 4, 3, 2, 1, NO, NO, NO, ESC, \
BSPC,P, O, I, U, Y, T, R, E, W, Q, NO, NO, TAB, \
LCTL,SCLN,L, K, J, H, G, F, D, S, A, RCTL,RCTL, \
LSFT,SLSH,DOT, COMM,M, N, B, V, C, X, Z, RSFT,NO, \
- LGUI,LALT, FN5, RALT,RGUI)
-*/
- /* Mouse mode (Space) */
+ LGUI,LALT, FN5, RALT,RGUI),
+
+ /* Layer5: another Mouse mode (Space) */
#ifdef HOST_IWRAP
KEYMAP(ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
TAB, KPAS,KPPL,MS_U,KPMI,KPSL,KPAS,KPPL,KPMI,KPSL,NO, NO, NO, BSPC, \
--
cgit v1.2.3-70-g09d2
From 5b00cf3f024a09d834d125374d93cacc269f84ba Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Wed, 10 Oct 2012 11:06:47 +0900
Subject: Fix build option MOUSEKEY_ENABLE.
---
common/keyboard.c | 12 +++++++++++-
common/mousekey.c | 36 +++++++++++++++++++++---------------
keyboard/hhkb/config.h | 2 +-
keyboard/hhkb/config_vusb.h | 2 +-
4 files changed, 34 insertions(+), 18 deletions(-)
(limited to 'common/mousekey.c')
diff --git a/common/keyboard.c b/common/keyboard.c
index 37d3b06ba..43abf4236 100644
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -90,8 +90,10 @@ static void clear_keyboard(void)
host_system_send(0);
host_consumer_send(0);
+#ifdef MOUSEKEY_ENABLE
mousekey_clear();
mousekey_send();
+#endif
}
static void clear_keyboard_but_mods(void)
@@ -102,8 +104,10 @@ static void clear_keyboard_but_mods(void)
host_system_send(0);
host_consumer_send(0);
+#ifdef MOUSEKEY_ENABLE
mousekey_clear();
mousekey_send();
+#endif
}
static void layer_switch_on(uint8_t code)
@@ -159,8 +163,10 @@ static void register_code(uint8_t code)
host_send_keyboard_report();
}
else if IS_MOUSEKEY(code) {
+#ifdef MOUSEKEY_ENABLE
mousekey_on(code);
mousekey_send();
+#endif
}
else if IS_CONSUMER(code) {
uint16_t usage = 0;
@@ -251,8 +257,10 @@ static void unregister_code(uint8_t code)
host_send_keyboard_report();
}
else if IS_MOUSEKEY(code) {
+#ifdef MOUSEKEY_ENABLE
mousekey_off(code);
mousekey_send();
+#endif
}
else if IS_CONSUMER(code) {
host_consumer_send(0x0000);
@@ -390,7 +398,7 @@ static inline void process_key(keyevent_t event)
case KEY_UP:
case MOD_UP:
unregister_code(code);
- // no key registered? mousekey, mediakey, systemkey
+ // TODO: no key registered? mousekey, mediakey, systemkey
if (!host_has_anykey())
NEXT(IDLE);
break;
@@ -570,8 +578,10 @@ void keyboard_task(void)
}
}
+#ifdef MOUSEKEY_ENABLE
// mousekey repeat & acceleration
mousekey_task();
+#endif
// FAIL SAFE: clear all key if no key down
if (matrix_change) {
diff --git a/common/mousekey.c b/common/mousekey.c
index 58a6e35bb..6fe8e2d26 100644
--- a/common/mousekey.c
+++ b/common/mousekey.c
@@ -37,7 +37,7 @@ static void mousekey_debug(void);
* see wikipedia http://en.wikipedia.org/wiki/Mouse_keys
*/
#ifndef MOUSEKEY_DELAY_TIME
-# define MOUSEKEY_DELAY_TIME 20
+# define MOUSEKEY_DELAY_TIME 100
#endif
#define MOUSEKEY_MOVE_INIT 5
@@ -54,10 +54,16 @@ static uint16_t last_timer = 0;
static inline uint8_t move_unit(void)
{
- uint16_t unit = 5 + mousekey_repeat*4;
+ uint16_t unit = MOUSEKEY_MOVE_INIT + MOUSEKEY_MOVE_ACCEL * mousekey_repeat;
return (unit > 63 ? 63 : unit);
}
+static inline uint8_t wheel_unit(void)
+{
+ uint16_t unit = MOUSEKEY_WHEEL_INIT + MOUSEKEY_WHEEL_ACCEL * mousekey_repeat;
+ return (unit > 15 ? 15 : unit);
+}
+
void mousekey_task(void)
{
if (timer_elapsed(last_timer) < MOUSEKEY_DELAY_TIME)
@@ -80,10 +86,10 @@ void mousekey_task(void)
report.y *= 0.7;
}
- if (report.v > 0) report.v = move_unit();
- if (report.v < 0) report.v = move_unit() * -1;
- if (report.h > 0) report.h = move_unit();
- if (report.h < 0) report.h = move_unit() * -1;
+ if (report.v > 0) report.v = wheel_unit();
+ if (report.v < 0) report.v = wheel_unit() * -1;
+ if (report.h > 0) report.h = wheel_unit();
+ if (report.h < 0) report.h = wheel_unit() * -1;
mousekey_send();
}
@@ -107,19 +113,19 @@ void mousekey_on(uint8_t code)
void mousekey_off(uint8_t code)
{
- if (code == KC_MS_UP && report.y < 0) report.y = 0;
- else if (code == KC_MS_DOWN && report.y > 0) report.y = 0;
- else if (code == KC_MS_LEFT && report.x < 0) report.x = 0;
- else if (code == KC_MS_RIGHT && report.x > 0) report.x = 0;
+ if (code == KC_MS_UP && report.y < 0) report.y = 0;
+ else if (code == KC_MS_DOWN && report.y > 0) report.y = 0;
+ else if (code == KC_MS_LEFT && report.x < 0) report.x = 0;
+ else if (code == KC_MS_RIGHT && report.x > 0) report.x = 0;
else if (code == KC_MS_WH_UP && report.v > 0) report.v = 0;
else if (code == KC_MS_WH_DOWN && report.v < 0) report.v = 0;
else if (code == KC_MS_WH_LEFT && report.h < 0) report.h = 0;
else if (code == KC_MS_WH_RIGHT && report.h > 0) report.h = 0;
- else if (code == KC_MS_BTN1) report.buttons &= ~MOUSE_BTN1;
- else if (code == KC_MS_BTN2) report.buttons &= ~MOUSE_BTN2;
- else if (code == KC_MS_BTN3) report.buttons &= ~MOUSE_BTN3;
- else if (code == KC_MS_BTN4) report.buttons &= ~MOUSE_BTN4;
- else if (code == KC_MS_BTN5) report.buttons &= ~MOUSE_BTN5;
+ else if (code == KC_MS_BTN1) report.buttons &= ~MOUSE_BTN1;
+ else if (code == KC_MS_BTN2) report.buttons &= ~MOUSE_BTN2;
+ else if (code == KC_MS_BTN3) report.buttons &= ~MOUSE_BTN3;
+ else if (code == KC_MS_BTN4) report.buttons &= ~MOUSE_BTN4;
+ else if (code == KC_MS_BTN5) report.buttons &= ~MOUSE_BTN5;
if (report.x == 0 && report.y == 0 && report.v == 0 && report.h == 0)
mousekey_repeat = 0;
diff --git a/keyboard/hhkb/config.h b/keyboard/hhkb/config.h
index e10a7ab37..cca75f243 100644
--- a/keyboard/hhkb/config.h
+++ b/keyboard/hhkb/config.h
@@ -42,7 +42,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* mouse keys */
#ifdef MOUSEKEY_ENABLE
-# define MOUSEKEY_DELAY_TIME 192
+# define MOUSEKEY_DELAY_TIME 100
#endif
diff --git a/keyboard/hhkb/config_vusb.h b/keyboard/hhkb/config_vusb.h
index b85e16fa3..44d5e4557 100644
--- a/keyboard/hhkb/config_vusb.h
+++ b/keyboard/hhkb/config_vusb.h
@@ -37,7 +37,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* mouse keys */
#ifdef MOUSEKEY_ENABLE
-# define MOUSEKEY_DELAY_TIME 255
+# define MOUSEKEY_DELAY_TIME 100
#endif
--
cgit v1.2.3-70-g09d2
From 0a70be9a97215e2b514841f67e52b4c55a6adab1 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Wed, 10 Oct 2012 15:31:00 +0900
Subject: Add subset of Xorg MouseKey acceleration parameters.
---
common/mousekey.c | 102 +++++++++++++++++++++++++++++++++++++++---------------
1 file changed, 74 insertions(+), 28 deletions(-)
(limited to 'common/mousekey.c')
diff --git a/common/mousekey.c b/common/mousekey.c
index 6fe8e2d26..4b1fe1740 100644
--- a/common/mousekey.c
+++ b/common/mousekey.c
@@ -32,41 +32,87 @@ static uint8_t mousekey_repeat = 0;
static void mousekey_debug(void);
+/* max value on report descriptor */
+#define MOUSEKEY_MOVE_MAX 127
+#define MOUSEKEY_WHEEL_MAX 15
+
+#ifndef MOUSEKEY_MOVE_DELTA
+#define MOUSEKEY_MOVE_DELTA 5
+#endif
+#ifndef MOUSEKEY_WHEEL_DELTA
+#define MOUSEKEY_WHEEL_DELTA 1
+#endif
+#ifndef MOUSEKEY_DELAY
+#define MOUSEKEY_DELAY 300
+#endif
+#ifndef MOUSEKEY_INTERVAL
+#define MOUSEKEY_INTERVAL 50
+#endif
+#ifndef MOUSEKEY_MAX_SPEED
+#define MOUSEKEY_MAX_SPEED 10
+#endif
+#ifndef MOUSEKEY_TIME_TO_MAX
+#define MOUSEKEY_TIME_TO_MAX 20
+#endif
+#ifndef MOUSEKEY_WHEEL_MAX_SPEED
+#define MOUSEKEY_WHEEL_MAX_SPEED 8
+#endif
+#ifndef MOUSEKEY_WHEEL_TIME_TO_MAX
+#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
+#endif
+
+
/*
- * TODO: fix acceleration algorithm
- * see wikipedia http://en.wikipedia.org/wiki/Mouse_keys
+ * Mouse keys acceleration algorithm
+ * http://en.wikipedia.org/wiki/Mouse_keys
+ *
+ * speed = delta * max_speed * (repeat / time_to_max)**((1000+curve)/1000)
*/
-#ifndef MOUSEKEY_DELAY_TIME
-# define MOUSEKEY_DELAY_TIME 100
-#endif
+/* milliseconds between the initial key press and first repeated motion event (0-2550) */
+static uint8_t mk_delay = MOUSEKEY_DELAY/10;
+/* milliseconds between repeated motion events (0-255) */
+static uint8_t mk_interval = MOUSEKEY_INTERVAL;
+/* steady speed (in action_delta units) applied each event (0-255) */
+static uint8_t mk_max_speed = MOUSEKEY_MAX_SPEED;
+/* number of events (count) accelerating to steady speed (0-255) */
+static uint8_t mk_time_to_max = MOUSEKEY_TIME_TO_MAX;
+/* ramp used to reach maximum pointer speed (NOT SUPPORTED) */
+//static int8_t mk_curve = 0;
-#define MOUSEKEY_MOVE_INIT 5
-#define MOUSEKEY_WHEEL_INIT 1
-#define MOUSEKEY_MOVE_ACCEL 5
-#define MOUSEKEY_WHEEL_ACCEL 1
+static uint8_t mk_wheel_max_speed = MOUSEKEY_WHEEL_MAX_SPEED;
+static uint8_t mk_wheel_time_to_max = MOUSEKEY_WHEEL_TIME_TO_MAX;
-static uint16_t last_timer = 0;
-// acceleration parameters
-//uint8_t mousekey_move_unit = 2;
-//uint8_t mousekey_resolution = 5;
+static uint16_t last_timer = 0;
-static inline uint8_t move_unit(void)
+static uint8_t move_unit(void)
{
- uint16_t unit = MOUSEKEY_MOVE_INIT + MOUSEKEY_MOVE_ACCEL * mousekey_repeat;
- return (unit > 63 ? 63 : unit);
+ uint16_t unit;
+ if (mousekey_repeat > mk_time_to_max) {
+ unit = MOUSEKEY_MOVE_DELTA * mk_max_speed;
+ } else {
+ unit = (MOUSEKEY_MOVE_DELTA * mk_max_speed * mousekey_repeat) / mk_time_to_max;
+ }
+ if (unit == 0) return 1;
+ return (unit > MOUSEKEY_MOVE_MAX ? MOUSEKEY_MOVE_MAX : unit);
}
-static inline uint8_t wheel_unit(void)
+static uint8_t wheel_unit(void)
{
- uint16_t unit = MOUSEKEY_WHEEL_INIT + MOUSEKEY_WHEEL_ACCEL * mousekey_repeat;
- return (unit > 15 ? 15 : unit);
+ uint16_t unit;
+ if (mousekey_repeat > mk_time_to_max) {
+ unit = MOUSEKEY_WHEEL_DELTA * mk_wheel_max_speed;
+ } else {
+ unit = (MOUSEKEY_WHEEL_DELTA * mk_wheel_max_speed * mousekey_repeat) / mk_time_to_max;
+ }
+ if (unit == 0) return 1;
+ return (unit > MOUSEKEY_WHEEL_MAX ? MOUSEKEY_WHEEL_MAX : unit);
}
void mousekey_task(void)
{
- if (timer_elapsed(last_timer) < MOUSEKEY_DELAY_TIME)
+ if (timer_elapsed(last_timer) < (mousekey_repeat ? mk_interval : mk_delay*10))
return;
if (report.x == 0 && report.y == 0 && report.v == 0 && report.h == 0)
@@ -96,14 +142,14 @@ void mousekey_task(void)
void mousekey_on(uint8_t code)
{
- if (code == KC_MS_UP) report.y = MOUSEKEY_MOVE_INIT * -1;
- else if (code == KC_MS_DOWN) report.y = MOUSEKEY_MOVE_INIT;
- else if (code == KC_MS_LEFT) report.x = MOUSEKEY_MOVE_INIT * -1;
- else if (code == KC_MS_RIGHT) report.x = MOUSEKEY_MOVE_INIT;
- else if (code == KC_MS_WH_UP) report.v = MOUSEKEY_WHEEL_INIT;
- else if (code == KC_MS_WH_DOWN) report.v = MOUSEKEY_WHEEL_INIT * -1;
- else if (code == KC_MS_WH_LEFT) report.h = MOUSEKEY_WHEEL_INIT * -1;
- else if (code == KC_MS_WH_RIGHT) report.h = MOUSEKEY_WHEEL_INIT;
+ if (code == KC_MS_UP) report.y = MOUSEKEY_MOVE_DELTA * -1;
+ else if (code == KC_MS_DOWN) report.y = MOUSEKEY_MOVE_DELTA;
+ else if (code == KC_MS_LEFT) report.x = MOUSEKEY_MOVE_DELTA * -1;
+ else if (code == KC_MS_RIGHT) report.x = MOUSEKEY_MOVE_DELTA;
+ else if (code == KC_MS_WH_UP) report.v = MOUSEKEY_WHEEL_DELTA;
+ else if (code == KC_MS_WH_DOWN) report.v = MOUSEKEY_WHEEL_DELTA * -1;
+ else if (code == KC_MS_WH_LEFT) report.h = MOUSEKEY_WHEEL_DELTA * -1;
+ else if (code == KC_MS_WH_RIGHT) report.h = MOUSEKEY_WHEEL_DELTA;
else if (code == KC_MS_BTN1) report.buttons |= MOUSE_BTN1;
else if (code == KC_MS_BTN2) report.buttons |= MOUSE_BTN2;
else if (code == KC_MS_BTN3) report.buttons |= MOUSE_BTN3;
--
cgit v1.2.3-70-g09d2
From 1677b021d7bff6af7763532b038612363b61dada Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Fri, 12 Oct 2012 04:46:37 +0900
Subject: Fix layer switching and host API.
---
common/host.c | 95 +++++++++++++++++++++++---------------
common/host.h | 24 +++++-----
common/keyboard.c | 136 ++++++++++++++++++++++++++++++------------------------
common/mousekey.c | 95 +++++++++++++++++++-------------------
4 files changed, 194 insertions(+), 156 deletions(-)
(limited to 'common/mousekey.c')
diff --git a/common/host.c b/common/host.c
index a671c97d3..261ec6472 100644
--- a/common/host.c
+++ b/common/host.c
@@ -27,9 +27,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
bool keyboard_nkro = false;
#endif
-static host_driver_t *driver;
report_keyboard_t *keyboard_report = &(report_keyboard_t){};
+report_mouse_t mouse_report = {};
+
+static host_driver_t *driver;
+static uint16_t last_system_report = 0;
+static uint16_t last_consumer_report = 0;
static inline void add_key_byte(uint8_t code);
static inline void del_key_byte(uint8_t code);
@@ -52,8 +56,48 @@ uint8_t host_keyboard_leds(void)
if (!driver) return 0;
return (*driver->keyboard_leds)();
}
+/* send report */
+void host_keyboard_send(report_keyboard_t *report)
+{
+ if (!driver) return;
+ (*driver->send_keyboard)(report);
+
+ if (debug_keyboard) {
+ print("keys: ");
+ for (int i = 0; i < REPORT_KEYS; i++) {
+ phex(keyboard_report->keys[i]); print(" ");
+ }
+ print(" mods: "); phex(keyboard_report->mods); print("\n");
+ }
+}
+
+void host_mouse_send(report_mouse_t *report)
+{
+ if (!driver) return;
+ (*driver->send_mouse)(report);
+}
+
+void host_system_send(uint16_t report)
+{
+ if (report == last_system_report) return;
+ last_system_report = report;
+
+ if (!driver) return;
+ (*driver->send_system)(report);
+}
+
+void host_consumer_send(uint16_t report)
+{
+ if (report == last_consumer_report) return;
+ last_consumer_report = report;
+
+ if (!driver) return;
+ (*driver->send_consumer)(report);
+}
+
+
-/* keyboard report operations */
+/* keyboard report utils */
void host_add_key(uint8_t key)
{
#ifdef NKRO_ENABLE
@@ -113,6 +157,11 @@ uint8_t host_has_anykey(void)
return cnt;
}
+uint8_t host_has_anymod(void)
+{
+ return bitpop(keyboard_report->mods);
+}
+
uint8_t host_get_first_key(void)
{
#ifdef NKRO_ENABLE
@@ -129,52 +178,24 @@ uint8_t host_get_first_key(void)
void host_send_keyboard_report(void)
{
if (!driver) return;
- (*driver->send_keyboard)(keyboard_report);
-
- if (debug_keyboard) {
- print("keys: ");
- for (int i = 0; i < REPORT_KEYS; i++) {
- phex(keyboard_report->keys[i]); print(" ");
- }
- print(" mods: "); phex(keyboard_report->mods); print("\n");
- }
+ host_keyboard_send(keyboard_report);
}
-
-/* send report */
-void host_keyboard_send(report_keyboard_t *report)
+uint8_t host_mouse_in_use(void)
{
- if (!driver) return;
- (*driver->send_keyboard)(report);
+ return (mouse_report.buttons | mouse_report.x | mouse_report.y | mouse_report.v | mouse_report.h);
}
-void host_mouse_send(report_mouse_t *report)
+uint16_t host_last_sysytem_report(void)
{
- if (!driver) return;
- (*driver->send_mouse)(report);
+ return last_system_report;
}
-void host_system_send(uint16_t data)
+uint16_t host_last_consumer_report(void)
{
- static uint16_t last_data = 0;
- if (data == last_data) return;
- last_data = data;
-
- if (!driver) return;
- (*driver->send_system)(data);
+ return last_consumer_report;
}
-void host_consumer_send(uint16_t data)
-{
- static uint16_t last_data = 0;
- if (data == last_data) return;
- last_data = data;
-
- if (!driver) return;
- (*driver->send_consumer)(data);
-}
-
-
static inline void add_key_byte(uint8_t code)
{
int8_t i = 0;
diff --git a/common/host.h b/common/host.h
index a0a661af5..207b68310 100644
--- a/common/host.h
+++ b/common/host.h
@@ -31,38 +31,40 @@ extern "C" {
extern bool keyboard_nkro;
#endif
+/* report */
extern report_keyboard_t *keyboard_report;
-extern report_keyboard_t *keyboard_report_prev;
+extern report_mouse_t mouse_report;
/* host driver */
void host_set_driver(host_driver_t *driver);
host_driver_t *host_get_driver(void);
+/* host driver interface */
uint8_t host_keyboard_leds(void);
+void host_keyboard_send(report_keyboard_t *report);
+void host_mouse_send(report_mouse_t *report);
+void host_system_send(uint16_t data);
+void host_consumer_send(uint16_t data);
-
-/* keyboard report operations */
-/* key */
+/* keyboard report utils */
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_clear_mods(void);
-/* query */
uint8_t host_has_anykey(void);
+uint8_t host_has_anymod(void);
uint8_t host_get_first_key(void);
-/* send report */
void host_send_keyboard_report(void);
+/* mouse report utils */
+uint8_t host_mouse_in_use(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);
+uint16_t host_last_sysytem_report(void);
+uint16_t host_last_consumer_report(void);
#ifdef __cplusplus
}
diff --git a/common/keyboard.c b/common/keyboard.c
index 43abf4236..7a17a9e38 100644
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -110,6 +110,12 @@ static void clear_keyboard_but_mods(void)
#endif
}
+static bool anykey_sent_to_host(void)
+{
+ return (host_has_anykey() || host_mouse_in_use() ||
+ host_last_sysytem_report() || host_last_consumer_report());
+}
+
static void layer_switch_on(uint8_t code)
{
if (!IS_FN(code)) return;
@@ -123,9 +129,9 @@ static void layer_switch_on(uint8_t code)
}
}
-static void layer_switch_off(uint8_t code)
+static bool layer_switch_off(uint8_t code)
{
- if (!IS_FN(code)) return;
+ if (!IS_FN(code)) return false;
fn_state_bits &= ~FN_BIT(code);
if (current_layer != keymap_fn_layer(biton(fn_state_bits))) {
clear_keyboard_but_mods();
@@ -133,21 +139,7 @@ static void layer_switch_off(uint8_t code)
debug("Layer Switch(off): "); debug_hex(current_layer);
current_layer = keymap_fn_layer(biton(fn_state_bits));
debug(" -> "); debug_hex(current_layer); debug("\n");
- }
-}
-
-// whether any key except modifier is down or not
-static inline bool is_anykey_down(void)
-{
- for (int r = 0; r < MATRIX_ROWS; r++) {
- 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(keymap_get_keycode(current_layer, r, c))) {
- return true;
- }
- }
- }
+ return true;
}
return false;
}
@@ -162,6 +154,10 @@ static void register_code(uint8_t code)
host_add_mod_bit(MOD_BIT(code));
host_send_keyboard_report();
}
+ else if IS_FN(code) {
+ host_add_key(keymap_fn_keycode(FN_INDEX(code)));
+ host_send_keyboard_report();
+ }
else if IS_MOUSEKEY(code) {
#ifdef MOUSEKEY_ENABLE
mousekey_on(code);
@@ -256,6 +252,10 @@ static void unregister_code(uint8_t code)
host_del_mod_bit(MOD_BIT(code));
host_send_keyboard_report();
}
+ else if IS_FN(code) {
+ host_del_key(keymap_fn_keycode(FN_INDEX(code)));
+ host_send_keyboard_report();
+ }
else if IS_MOUSEKEY(code) {
#ifdef MOUSEKEY_ENABLE
mousekey_off(code);
@@ -272,24 +272,31 @@ static void unregister_code(uint8_t code)
/*
*
- * Event/State|IDLE DELAYING[f] WAITING[f,k] PRESSING
+ * Event/State|IDLE PRESSING DELAYING[f] WAITING[f,k]
* -----------+------------------------------------------------------------------
- * Fn Down |IDLE(L+) WAITING(Sk) WAITING(Sk) -
- * Up |IDLE(L-) IDLE(L-) IDLE(L-) IDLE(L-)
- * Fnk Down |DELAYING(Sf) WAITING(Sk) WAINTING(Sk) PRESSING(Rf)
- * Up |IDLE(L-) IDLE(Rf,Uf) IDLE(Rf,Ps,Uf)*3 PRESSING(Uf)
- * Key Down |PRESSING(Rk) WAITING(Sk) WAITING(Sk) PRESSING(Rk)
- * Up |IDLE(Uk) DELAYING(Uk) IDLE(L+,Ps,Uk) IDLE(Uk)*4
- * Delay |- IDLE(L+) IDLE(L+,Ps) -
+ * Fn Down |(L+) -*1 WAITING(Sk) IDLE(Rf,Ps)*7
+ * Up |(L-) IDLE(L-)*8 IDLE(L-)*8 IDLE(L-)*8
+ * Fnk Down |DELAYING(Sf)* (Rf) WAITING(Sk) IDLE(Rf,Ps,Rf)
+ * Up |(L-) IDLE(L-/Uf)*8 IDLE(Rf,Uf/L-)*3 IDLE(Rf,Ps,Uf/L-)*3
+ * Key Down |PRESSING(Rk) (Rk) WAITING(Sk) IDLE(Rf,Ps,Rk)
+ * Up |(Uk) IDLE(Uk)*4 (Uk) IDLE(L+,Ps,Pk)/(Uk)*a
* |
- * No key Down|IDLE(Ld) IDLE(Ld) IDLE(Ld) IDLE(Ld)
+ * Delay |- - IDLE(L+) IDLE(L+,Ps)
+ * Magic Key |COMMAND*5
*
+ * *1: ignore Fn if other key is down.
* *2: register Fnk if any key is pressing
- * *3: when Fnk == Stored Fnk, if not ignore.
- * *4: when no registered key any more
+ * *3: register/unregister delayed Fnk and move to IDLE if code == delayed Fnk, else *8
+ * *4: if no keys registered to host
+ * *5: unregister all keys
+ * *6: only if no keys down
+ * *7: ignore Fn because Fnk key and stored key are down.
+ * *8: move to IDLE if layer switch(off) occurs, else stay at current state
+ * *9: repeat key if pressing Fnk twice quickly(move to PRESSING)
+ * *a: layer switch and process waiting key and code if code == wainting key, else unregister key
*
* States:
- * IDLE:
+ * IDLE: No key is down except modifiers
* DELAYING: delay layer switch after pressing Fn with alt keycode
* WAITING: key is pressed during DELAYING
*
@@ -297,17 +304,20 @@ static void unregister_code(uint8_t code)
* Fn: Fn key without alternative keycode
* Fnk: Fn key with alternative keycode
* -: ignore
+ * Delay: layer switch delay term is elapsed
*
* Actions:
* Rk: register key
* Uk: unregister key
- * Rf: register stored Fn(alt keycode)
- * Uf: unregister stored Fn(alt keycode)
+ * Rf: register Fn(alt keycode)
+ * Uf: unregister Fn(alt keycode)
* Rs: register stored key
* Us: unregister stored key
- * Sk: store key
- * Sf: store Fn
- * Ps: play stored key(Interpret stored key and transit state)
+ * Sk: Store key(waiting Key)
+ * Sf: Store Fn(delayed Fn)
+ * Ps: Process stored key
+ * Ps: Process key
+ * Is: Interpret stored keys in current layer
* 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)
@@ -344,7 +354,7 @@ static inline void process_key(keyevent_t event)
// repeat Fn alt key when press Fn key down, up then down again quickly
if (KEYEQ(delayed_fn.event.key, event.key) &&
timer_elapsed(delayed_fn.time) < LAYER_DELAY) {
- register_code(keymap_fn_keycode(FN_INDEX(code)));
+ register_code(code);
NEXT(PRESSING);
} else {
delayed_fn = (keyrecord_t) {
@@ -380,16 +390,20 @@ static inline void process_key(keyevent_t event)
// ignored when any key is pressed
break;
case FN_UP:
- layer_switch_off(code);
- NEXT(IDLE);
+ if (layer_switch_off(code))
+ NEXT(IDLE);
break;
case FNK_DOWN:
- register_code(keymap_fn_keycode(FN_INDEX(code)));
+ register_code(code);
break;
case FNK_UP:
- // can't know whether layer switched or not
- layer_switch_off(code);
- unregister_code(keymap_fn_keycode(FN_INDEX(code)));
+ if (layer_switch_off(code)) {
+ NEXT(IDLE);
+ } else {
+ unregister_code(code);
+ if (!anykey_sent_to_host())
+ NEXT(IDLE);
+ }
break;
case KEY_DOWN:
case MOD_DOWN:
@@ -398,8 +412,7 @@ static inline void process_key(keyevent_t event)
case KEY_UP:
case MOD_UP:
unregister_code(code);
- // TODO: no key registered? mousekey, mediakey, systemkey
- if (!host_has_anykey())
+ if (!anykey_sent_to_host())
NEXT(IDLE);
break;
default:
@@ -423,8 +436,8 @@ static inline void process_key(keyevent_t event)
register_code(code);
break;
case FN_UP:
- layer_switch_off(code);
- NEXT(IDLE);
+ if (layer_switch_off(code))
+ NEXT(IDLE);
break;
case FNK_UP:
if (code == delayed_fn.code) {
@@ -432,19 +445,16 @@ static inline void process_key(keyevent_t event)
// restore the mod status at the time of pressing Fn key
tmp_mods = keyboard_report->mods;
host_set_mods(delayed_fn.mods);
- register_code(keymap_fn_keycode(FN_INDEX(delayed_fn.code)));
- unregister_code(keymap_fn_keycode(FN_INDEX(delayed_fn.code)));
+ register_code(delayed_fn.code);
+ unregister_code(delayed_fn.code);
host_set_mods(tmp_mods);
NEXT(IDLE);
} else {
- layer_switch_off(code);
- NEXT(IDLE);
+ if (layer_switch_off(code))
+ NEXT(IDLE);
}
break;
case KEY_UP:
- unregister_code(code);
- NEXT(IDLE);
- break;
case MOD_UP:
unregister_code(code);
break;
@@ -459,34 +469,40 @@ static inline void process_key(keyevent_t event)
case KEY_DOWN:
tmp_mods = keyboard_report->mods;
host_set_mods(delayed_fn.mods);
- register_code(keymap_fn_keycode(FN_INDEX(delayed_fn.code)));
+ register_code(delayed_fn.code);
host_set_mods(waiting_key.mods);
register_code(waiting_key.code);
host_set_mods(tmp_mods);
- register_code(code);
+ if (kind == FN_DOWN) {
+ // ignore Fn
+ } else if (kind == FNK_DOWN) {
+ register_code(code);
+ } else if (kind == KEY_DOWN) {
+ register_code(code);
+ }
NEXT(IDLE);
break;
case MOD_DOWN:
register_code(code);
break;
case FN_UP:
- layer_switch_off(code);
- NEXT(IDLE);
+ if (layer_switch_off(code))
+ NEXT(IDLE);
break;
case FNK_UP:
if (code == delayed_fn.code) {
// alt down, key down, alt up
tmp_mods = keyboard_report->mods;
host_set_mods(delayed_fn.mods);
- register_code(keymap_fn_keycode(FN_INDEX(delayed_fn.code)));
+ register_code(delayed_fn.code);
host_set_mods(waiting_key.mods);
register_code(waiting_key.code);
- unregister_code(keymap_fn_keycode(FN_INDEX(delayed_fn.code)));
+ unregister_code(delayed_fn.code);
host_set_mods(tmp_mods);
NEXT(IDLE);
} else {
- layer_switch_off(code);
- NEXT(IDLE);
+ if (layer_switch_off(code))
+ NEXT(IDLE);
}
break;
case KEY_UP:
diff --git a/common/mousekey.c b/common/mousekey.c
index 4b1fe1740..353890a16 100644
--- a/common/mousekey.c
+++ b/common/mousekey.c
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "mousekey.h"
-static report_mouse_t report;
static uint8_t mousekey_repeat = 0;
@@ -115,89 +114,89 @@ void mousekey_task(void)
if (timer_elapsed(last_timer) < (mousekey_repeat ? mk_interval : mk_delay*10))
return;
- if (report.x == 0 && report.y == 0 && report.v == 0 && report.h == 0)
+ if (mouse_report.x == 0 && mouse_report.y == 0 && mouse_report.v == 0 && mouse_report.h == 0)
return;
if (mousekey_repeat != UINT8_MAX)
mousekey_repeat++;
- if (report.x > 0) report.x = move_unit();
- if (report.x < 0) report.x = move_unit() * -1;
- if (report.y > 0) report.y = move_unit();
- if (report.y < 0) report.y = move_unit() * -1;
+ if (mouse_report.x > 0) mouse_report.x = move_unit();
+ if (mouse_report.x < 0) mouse_report.x = move_unit() * -1;
+ if (mouse_report.y > 0) mouse_report.y = move_unit();
+ if (mouse_report.y < 0) mouse_report.y = move_unit() * -1;
- if (report.x && report.y) {
- report.x *= 0.7;
- report.y *= 0.7;
+ if (mouse_report.x && mouse_report.y) {
+ mouse_report.x *= 0.7;
+ mouse_report.y *= 0.7;
}
- if (report.v > 0) report.v = wheel_unit();
- if (report.v < 0) report.v = wheel_unit() * -1;
- if (report.h > 0) report.h = wheel_unit();
- if (report.h < 0) report.h = wheel_unit() * -1;
+ if (mouse_report.v > 0) mouse_report.v = wheel_unit();
+ if (mouse_report.v < 0) mouse_report.v = wheel_unit() * -1;
+ if (mouse_report.h > 0) mouse_report.h = wheel_unit();
+ if (mouse_report.h < 0) mouse_report.h = wheel_unit() * -1;
mousekey_send();
}
void mousekey_on(uint8_t code)
{
- if (code == KC_MS_UP) report.y = MOUSEKEY_MOVE_DELTA * -1;
- else if (code == KC_MS_DOWN) report.y = MOUSEKEY_MOVE_DELTA;
- else if (code == KC_MS_LEFT) report.x = MOUSEKEY_MOVE_DELTA * -1;
- else if (code == KC_MS_RIGHT) report.x = MOUSEKEY_MOVE_DELTA;
- else if (code == KC_MS_WH_UP) report.v = MOUSEKEY_WHEEL_DELTA;
- else if (code == KC_MS_WH_DOWN) report.v = MOUSEKEY_WHEEL_DELTA * -1;
- else if (code == KC_MS_WH_LEFT) report.h = MOUSEKEY_WHEEL_DELTA * -1;
- else if (code == KC_MS_WH_RIGHT) report.h = MOUSEKEY_WHEEL_DELTA;
- else if (code == KC_MS_BTN1) report.buttons |= MOUSE_BTN1;
- else if (code == KC_MS_BTN2) report.buttons |= MOUSE_BTN2;
- else if (code == KC_MS_BTN3) report.buttons |= MOUSE_BTN3;
- else if (code == KC_MS_BTN4) report.buttons |= MOUSE_BTN4;
- else if (code == KC_MS_BTN5) report.buttons |= MOUSE_BTN5;
+ if (code == KC_MS_UP) mouse_report.y = MOUSEKEY_MOVE_DELTA * -1;
+ else if (code == KC_MS_DOWN) mouse_report.y = MOUSEKEY_MOVE_DELTA;
+ else if (code == KC_MS_LEFT) mouse_report.x = MOUSEKEY_MOVE_DELTA * -1;
+ else if (code == KC_MS_RIGHT) mouse_report.x = MOUSEKEY_MOVE_DELTA;
+ else if (code == KC_MS_WH_UP) mouse_report.v = MOUSEKEY_WHEEL_DELTA;
+ else if (code == KC_MS_WH_DOWN) mouse_report.v = MOUSEKEY_WHEEL_DELTA * -1;
+ else if (code == KC_MS_WH_LEFT) mouse_report.h = MOUSEKEY_WHEEL_DELTA * -1;
+ else if (code == KC_MS_WH_RIGHT) mouse_report.h = MOUSEKEY_WHEEL_DELTA;
+ else if (code == KC_MS_BTN1) mouse_report.buttons |= MOUSE_BTN1;
+ else if (code == KC_MS_BTN2) mouse_report.buttons |= MOUSE_BTN2;
+ else if (code == KC_MS_BTN3) mouse_report.buttons |= MOUSE_BTN3;
+ else if (code == KC_MS_BTN4) mouse_report.buttons |= MOUSE_BTN4;
+ else if (code == KC_MS_BTN5) mouse_report.buttons |= MOUSE_BTN5;
}
void mousekey_off(uint8_t code)
{
- if (code == KC_MS_UP && report.y < 0) report.y = 0;
- else if (code == KC_MS_DOWN && report.y > 0) report.y = 0;
- else if (code == KC_MS_LEFT && report.x < 0) report.x = 0;
- else if (code == KC_MS_RIGHT && report.x > 0) report.x = 0;
- else if (code == KC_MS_WH_UP && report.v > 0) report.v = 0;
- else if (code == KC_MS_WH_DOWN && report.v < 0) report.v = 0;
- else if (code == KC_MS_WH_LEFT && report.h < 0) report.h = 0;
- else if (code == KC_MS_WH_RIGHT && report.h > 0) report.h = 0;
- else if (code == KC_MS_BTN1) report.buttons &= ~MOUSE_BTN1;
- else if (code == KC_MS_BTN2) report.buttons &= ~MOUSE_BTN2;
- else if (code == KC_MS_BTN3) report.buttons &= ~MOUSE_BTN3;
- else if (code == KC_MS_BTN4) report.buttons &= ~MOUSE_BTN4;
- else if (code == KC_MS_BTN5) report.buttons &= ~MOUSE_BTN5;
-
- if (report.x == 0 && report.y == 0 && report.v == 0 && report.h == 0)
+ if (code == KC_MS_UP && mouse_report.y < 0) mouse_report.y = 0;
+ else if (code == KC_MS_DOWN && mouse_report.y > 0) mouse_report.y = 0;
+ else if (code == KC_MS_LEFT && mouse_report.x < 0) mouse_report.x = 0;
+ else if (code == KC_MS_RIGHT && mouse_report.x > 0) mouse_report.x = 0;
+ else if (code == KC_MS_WH_UP && mouse_report.v > 0) mouse_report.v = 0;
+ else if (code == KC_MS_WH_DOWN && mouse_report.v < 0) mouse_report.v = 0;
+ else if (code == KC_MS_WH_LEFT && mouse_report.h < 0) mouse_report.h = 0;
+ else if (code == KC_MS_WH_RIGHT && mouse_report.h > 0) mouse_report.h = 0;
+ else if (code == KC_MS_BTN1) mouse_report.buttons &= ~MOUSE_BTN1;
+ else if (code == KC_MS_BTN2) mouse_report.buttons &= ~MOUSE_BTN2;
+ else if (code == KC_MS_BTN3) mouse_report.buttons &= ~MOUSE_BTN3;
+ else if (code == KC_MS_BTN4) mouse_report.buttons &= ~MOUSE_BTN4;
+ else if (code == KC_MS_BTN5) mouse_report.buttons &= ~MOUSE_BTN5;
+
+ if (mouse_report.x == 0 && mouse_report.y == 0 && mouse_report.v == 0 && mouse_report.h == 0)
mousekey_repeat = 0;
}
void mousekey_send(void)
{
mousekey_debug();
- host_mouse_send(&report);
+ host_mouse_send(&mouse_report);
last_timer = timer_read();
}
void mousekey_clear(void)
{
- report = (report_mouse_t){};
+ mouse_report = (report_mouse_t){};
}
static void mousekey_debug(void)
{
if (!debug_mouse) return;
print("mousekey [btn|x y v h]rep: [");
- phex(report.buttons); print("|");
- phex(report.x); print(" ");
- phex(report.y); print(" ");
- phex(report.v); print(" ");
- phex(report.h); print("]");
+ phex(mouse_report.buttons); print("|");
+ phex(mouse_report.x); print(" ");
+ phex(mouse_report.y); print(" ");
+ phex(mouse_report.v); print(" ");
+ phex(mouse_report.h); print("]");
phex(mousekey_repeat);
print("\n");
}
--
cgit v1.2.3-70-g09d2
From e451c059296a4c9af7a476577fee64afb9965bca Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Tue, 16 Oct 2012 11:20:49 +0900
Subject: Fix commands
---
common/command.c | 77 +++++++++++++++++++++++++++++++++----------------------
common/command.h | 4 +--
common/debug.h | 2 ++
common/keyboard.c | 28 ++++++++------------
common/matrix.h | 2 +-
common/mousekey.c | 2 +-
6 files changed, 64 insertions(+), 51 deletions(-)
(limited to 'common/mousekey.c')
diff --git a/common/command.c b/common/command.c
index 16c6cfb88..0ad06e65b 100644
--- a/common/command.c
+++ b/common/command.c
@@ -24,9 +24,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "util.h"
#include "timer.h"
#include "keyboard.h"
-#include "matrix.h"
#include "bootloader.h"
#include "command.h"
+#ifdef MOUSEKEY_ENABLE
+#include "mousekey.h"
+#endif
#ifdef HOST_PJRC
# include "usb_keyboard.h"
@@ -40,44 +42,45 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
-static uint8_t command_common(void);
+static bool command_common(uint8_t code);
static void help(void);
static void switch_layer(uint8_t layer);
+static void clear_keyboard(void);
static bool last_print_enable;
-uint8_t command_proc(void)
-{
- uint8_t processed = 0;
- last_print_enable = print_enable;
+bool command_proc(uint8_t code)
+{
if (!IS_COMMAND())
- return 0;
+ return false;
+ last_print_enable = print_enable;
print_enable = true;
- if (command_extra() || command_common()) {
- processed = 1;
+ if (command_extra(code) || command_common(code)) {
_delay_ms(500);
+ return true;
}
print_enable = last_print_enable;
- return processed;
+ return false;
}
/* This allows to define extra commands. return 0 when not processed. */
-uint8_t command_extra(void) __attribute__ ((weak));
-uint8_t command_extra(void)
+bool command_extra(uint8_t code) __attribute__ ((weak));
+bool command_extra(uint8_t code)
{
- return 0;
+ return false;
}
-static uint8_t command_common(void)
+static bool command_common(uint8_t code)
{
- switch (host_get_first_key()) {
+ switch (code) {
case KC_H:
help();
break;
- case KC_B:
+ case KC_DEL:
+ clear_keyboard();
print("jump to bootloader... ");
_delay_ms(1000);
bootloader_jump(); // not return
@@ -179,34 +182,34 @@ static uint8_t command_common(void)
#endif
break;
#endif
- case KC_BSPC:
- matrix_init();
- print("clear matrix\n");
- break;
case KC_0:
+ case KC_F10:
switch_layer(0);
break;
case KC_1:
+ case KC_F1:
switch_layer(1);
break;
case KC_2:
+ case KC_F2:
switch_layer(2);
break;
case KC_3:
+ case KC_F3:
switch_layer(3);
break;
case KC_4:
+ case KC_F4:
switch_layer(4);
break;
default:
- return 0;
+ return false;
}
- return 1;
+ return true;
}
static void help(void)
{
- print("b: jump to bootloader\n");
print("d: toggle debug enable\n");
print("x: toggle matrix debug\n");
print("k: toggle keyboard debug\n");
@@ -215,16 +218,16 @@ static void help(void)
print("v: print version\n");
print("t: print timer count\n");
print("s: print status\n");
+ print("ESC: power down/wake up\n");
+ print("0/F10: switch to Layer0 \n");
+ print("1/F1: switch to Layer1 \n");
+ print("2/F2: switch to Layer2 \n");
+ print("3/F3: switch to Layer3 \n");
+ print("4/F4: switch to Layer4 \n");
#ifdef NKRO_ENABLE
print("n: toggle NKRO\n");
#endif
- print("Backspace: clear matrix\n");
- print("ESC: power down/wake up\n");
- print("0: switch to Layer0 \n");
- print("1: switch to Layer1 \n");
- print("2: switch to Layer2 \n");
- print("3: switch to Layer3 \n");
- print("4: switch to Layer4 \n");
+ print("DEL: jump to bootloader\n");
}
static void switch_layer(uint8_t layer)
@@ -235,3 +238,17 @@ static void switch_layer(uint8_t layer)
default_layer = layer;
print("switch to Layer: "); phex(layer); print("\n");
}
+
+static void clear_keyboard(void)
+{
+ host_clear_keys();
+ host_send_keyboard_report();
+
+ host_system_send(0);
+ host_consumer_send(0);
+
+#ifdef MOUSEKEY_ENABLE
+ mousekey_clear();
+ mousekey_send();
+#endif
+}
diff --git a/common/command.h b/common/command.h
index 4888f5ee0..dafd4d0f3 100644
--- a/common/command.h
+++ b/common/command.h
@@ -18,8 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef COMMAND_H
#define COMMAND
-uint8_t command_proc(void);
+bool command_proc(uint8_t code);
/* This allows to extend commands. Return 0 when command is not processed. */
-uint8_t command_extra(void);
+bool command_extra(uint8_t code);
#endif
diff --git a/common/debug.h b/common/debug.h
index 9cc8d882f..1d56e21f7 100644
--- a/common/debug.h
+++ b/common/debug.h
@@ -23,6 +23,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define debug(s) if(debug_enable) print_P(PSTR(s))
+#define debug_P(s) if(debug_enable) print_P(s)
+#define debug_S(s) if(debug_enable) print_S(s)
#define debug_hex(c) if(debug_enable) phex(c)
#define debug_hex16(i) if(debug_enable) phex16(i)
#define debug_bin(c) if(debug_enable) pbin(c)
diff --git a/common/keyboard.c b/common/keyboard.c
index be01e5540..c7ea2b840 100644
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -28,9 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef MOUSEKEY_ENABLE
#include "mousekey.h"
#endif
-#ifdef EXTRAKEY_ENABLE
-#include <util/delay.h>
-#endif
#define LAYER_DELAY 250
@@ -154,8 +151,12 @@ static bool layer_switch_off(uint8_t code)
static void register_code(uint8_t code)
{
if IS_KEY(code) {
- host_add_key(code);
- host_send_keyboard_report();
+ if (command_proc(code)) {
+ //clear_keyboard();
+ } else {
+ host_add_key(code);
+ host_send_keyboard_report();
+ }
}
else if IS_MOD(code) {
host_add_mod_bit(MOD_BIT(code));
@@ -330,9 +331,9 @@ static void unregister_code(uint8_t code)
* Ld: Switch back to default layer(*unregister* all keys but modifiers)
*/
#define NEXT(state) do { \
- debug("NEXT: "); print_P(state_str(kbdstate)); \
+ debug("NEXT: "); debug_P(state_str(kbdstate)); \
kbdstate = state; \
- debug(" -> "); print_P(state_str(kbdstate)); debug("\n"); \
+ debug(" -> "); debug_P(state_str(kbdstate)); debug("\n"); \
} while (0)
static inline void process_key(keyevent_t event)
@@ -342,7 +343,7 @@ static inline void process_key(keyevent_t event)
uint8_t tmp_mods;
- debug("state: "); print_P(state_str(kbdstate));
+ debug("state: "); debug_P(state_str(kbdstate));
debug(" kind: "); debug_hex(kind);
debug(" code: "); debug_hex(code);
if (event.pressed) { debug("d"); } else { debug("u"); }
@@ -554,18 +555,11 @@ void keyboard_task(void)
matrix_row_t matrix_change = 0;
matrix_scan();
- if (command_proc()) {
- debug("COMMAND\n");
- // 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];
if (matrix_change) {
- if (debug_matrix) matrix_print();
+ matrix_debug();
for (int c = 0; c < MATRIX_COLS; c++) {
if (matrix_change & (1<<c)) {
@@ -618,7 +612,7 @@ void keyboard_task(void)
current_layer = default_layer;
}
}
-
+
return;
}
diff --git a/common/matrix.h b/common/matrix.h
index b3332d5ff..91231e765 100644
--- a/common/matrix.h
+++ b/common/matrix.h
@@ -54,7 +54,7 @@ matrix_row_t matrix_get_row(uint8_t row);
/* count keys pressed */
uint8_t matrix_key_count(void);
/* print matrix for debug */
-void matrix_print(void);
+void matrix_debug(void);
#endif
diff --git a/common/mousekey.c b/common/mousekey.c
index 353890a16..99e6d34ff 100644
--- a/common/mousekey.c
+++ b/common/mousekey.c
@@ -103,7 +103,7 @@ static uint8_t wheel_unit(void)
if (mousekey_repeat > mk_time_to_max) {
unit = MOUSEKEY_WHEEL_DELTA * mk_wheel_max_speed;
} else {
- unit = (MOUSEKEY_WHEEL_DELTA * mk_wheel_max_speed * mousekey_repeat) / mk_time_to_max;
+ unit = (MOUSEKEY_WHEEL_DELTA * mk_wheel_max_speed * mousekey_repeat) / mk_wheel_time_to_max;
}
if (unit == 0) return 1;
return (unit > MOUSEKEY_WHEEL_MAX ? MOUSEKEY_WHEEL_MAX : unit);
--
cgit v1.2.3-70-g09d2
From 8f7ed2bc1902cdeeb78c49f4833816a33cd6d3a0 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Wed, 17 Oct 2012 03:27:25 +0900
Subject: Add Mousekey parameters and accel keys.
---
common/keycode.h | 13 ++++--
common/mousekey.c | 106 +++++++++++++++++++++++--------------------------
common/mousekey.h | 39 ++++++++++++++++++
keyboard/hhkb/keymap.c | 8 ++--
4 files changed, 103 insertions(+), 63 deletions(-)
(limited to 'common/mousekey.c')
diff --git a/common/keycode.h b/common/keycode.h
index 4ed78a46a..f9331cdbf 100644
--- a/common/keycode.h
+++ b/common/keycode.h
@@ -29,10 +29,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define IS_MOD(code) (KC_LCTRL <= (code) && (code) <= KC_RGUI)
#define IS_FN(code) (KC_FN0 <= (code) && (code) <= KC_FN7)
-#define IS_MOUSEKEY(code) (KC_MS_UP <= (code) && (code) <= KC_MS_WH_RIGHT)
+#define IS_MOUSEKEY(code) (KC_MS_UP <= (code) && (code) <= KC_MS_ACCEL2)
#define IS_MOUSEKEY_MOVE(code) (KC_MS_UP <= (code) && (code) <= KC_MS_RIGHT)
#define IS_MOUSEKEY_BUTTON(code) (KC_MS_BTN1 <= (code) && (code) <= KC_MS_BTN5)
#define IS_MOUSEKEY_WHEEL(code) (KC_MS_WH_UP <= (code) && (code) <= KC_MS_WH_RIGHT)
+#define IS_MOUSEKEY_ACCEL(code) (KC_MS_ACCEL0 <= (code) && (code) <= KC_MS_ACCEL2)
#define IS_SPECIAL(code) ((0xB0 <= (code) && (code) <= 0xDF) || (0xE8 <= (code) && (code) <= 0xFF))
#define IS_CONSUMER(code) (KC_MUTE <= (code) && (code) <= KC_WFAV)
@@ -120,6 +121,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define KC_WH_D KC_MS_WH_DOWN
#define KC_WH_L KC_MS_WH_LEFT
#define KC_WH_R KC_MS_WH_RIGHT
+#define KC_ACL0 KC_MS_ACCEL0
+#define KC_ACL1 KC_MS_ACCEL1
+#define KC_ACL2 KC_MS_ACCEL2
/* Sytem Control */
#define KC_PWR KC_SYSTEM_POWER
#define KC_SLEP KC_SYSTEM_SLEEP
@@ -429,13 +433,16 @@ enum internal_special_keycodes {
KC_MS_BTN2,
KC_MS_BTN3,
KC_MS_BTN4,
- KC_MS_BTN5,
+ KC_MS_BTN5, /* 0xF8 */
/* Mousekey wheel */
KC_MS_WH_UP,
KC_MS_WH_DOWN,
KC_MS_WH_LEFT,
KC_MS_WH_RIGHT, /* 0xFC */
- /* 0xFD-FF vacant for future use */
+ /* Mousekey accel */
+ KC_MS_ACCEL0,
+ KC_MS_ACCEL1,
+ KC_MS_ACCEL2 /* 0xFF */
};
#endif /* KEYCODE_H */
diff --git a/common/mousekey.c b/common/mousekey.c
index 99e6d34ff..b8af3e59c 100644
--- a/common/mousekey.c
+++ b/common/mousekey.c
@@ -27,40 +27,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
static uint8_t mousekey_repeat = 0;
+static uint8_t mousekey_accel = 0;
static void mousekey_debug(void);
-/* max value on report descriptor */
-#define MOUSEKEY_MOVE_MAX 127
-#define MOUSEKEY_WHEEL_MAX 15
-
-#ifndef MOUSEKEY_MOVE_DELTA
-#define MOUSEKEY_MOVE_DELTA 5
-#endif
-#ifndef MOUSEKEY_WHEEL_DELTA
-#define MOUSEKEY_WHEEL_DELTA 1
-#endif
-#ifndef MOUSEKEY_DELAY
-#define MOUSEKEY_DELAY 300
-#endif
-#ifndef MOUSEKEY_INTERVAL
-#define MOUSEKEY_INTERVAL 50
-#endif
-#ifndef MOUSEKEY_MAX_SPEED
-#define MOUSEKEY_MAX_SPEED 10
-#endif
-#ifndef MOUSEKEY_TIME_TO_MAX
-#define MOUSEKEY_TIME_TO_MAX 20
-#endif
-#ifndef MOUSEKEY_WHEEL_MAX_SPEED
-#define MOUSEKEY_WHEEL_MAX_SPEED 8
-#endif
-#ifndef MOUSEKEY_WHEEL_TIME_TO_MAX
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
-#endif
-
-
/*
* Mouse keys acceleration algorithm
* http://en.wikipedia.org/wiki/Mouse_keys
@@ -68,18 +39,18 @@ static void mousekey_debug(void);
* speed = delta * max_speed * (repeat / time_to_max)**((1000+curve)/1000)
*/
/* milliseconds between the initial key press and first repeated motion event (0-2550) */
-static uint8_t mk_delay = MOUSEKEY_DELAY/10;
+uint8_t mk_delay = MOUSEKEY_DELAY/10;
/* milliseconds between repeated motion events (0-255) */
-static uint8_t mk_interval = MOUSEKEY_INTERVAL;
+uint8_t mk_interval = MOUSEKEY_INTERVAL;
/* steady speed (in action_delta units) applied each event (0-255) */
-static uint8_t mk_max_speed = MOUSEKEY_MAX_SPEED;
+uint8_t mk_max_speed = MOUSEKEY_MAX_SPEED;
/* number of events (count) accelerating to steady speed (0-255) */
-static uint8_t mk_time_to_max = MOUSEKEY_TIME_TO_MAX;
+uint8_t mk_time_to_max = MOUSEKEY_TIME_TO_MAX;
/* ramp used to reach maximum pointer speed (NOT SUPPORTED) */
-//static int8_t mk_curve = 0;
-
-static uint8_t mk_wheel_max_speed = MOUSEKEY_WHEEL_MAX_SPEED;
-static uint8_t mk_wheel_time_to_max = MOUSEKEY_WHEEL_TIME_TO_MAX;
+//int8_t mk_curve = 0;
+/* wheel params */
+uint8_t mk_wheel_max_speed = MOUSEKEY_WHEEL_MAX_SPEED;
+uint8_t mk_wheel_time_to_max = MOUSEKEY_WHEEL_TIME_TO_MAX;
static uint16_t last_timer = 0;
@@ -88,25 +59,39 @@ static uint16_t last_timer = 0;
static uint8_t move_unit(void)
{
uint16_t unit;
- if (mousekey_repeat > mk_time_to_max) {
+ if (mousekey_accel & (1<<0)) {
+ unit = (MOUSEKEY_MOVE_DELTA * mk_max_speed)/4;
+ } else if (mousekey_accel & (1<<1)) {
+ unit = (MOUSEKEY_MOVE_DELTA * mk_max_speed)/2;
+ } else if (mousekey_accel & (1<<2)) {
+ unit = (MOUSEKEY_MOVE_DELTA * mk_max_speed);
+ } else if (mousekey_repeat == 0) {
+ unit = MOUSEKEY_MOVE_DELTA;
+ } else if (mousekey_repeat >= mk_time_to_max) {
unit = MOUSEKEY_MOVE_DELTA * mk_max_speed;
} else {
unit = (MOUSEKEY_MOVE_DELTA * mk_max_speed * mousekey_repeat) / mk_time_to_max;
}
- if (unit == 0) return 1;
- return (unit > MOUSEKEY_MOVE_MAX ? MOUSEKEY_MOVE_MAX : unit);
+ return (unit > MOUSEKEY_MOVE_MAX ? MOUSEKEY_MOVE_MAX : (unit == 0 ? 1 : unit));
}
static uint8_t wheel_unit(void)
{
uint16_t unit;
- if (mousekey_repeat > mk_time_to_max) {
+ if (mousekey_accel & (1<<0)) {
+ unit = (MOUSEKEY_WHEEL_DELTA * mk_wheel_max_speed)/4;
+ } else if (mousekey_accel & (1<<1)) {
+ unit = (MOUSEKEY_WHEEL_DELTA * mk_wheel_max_speed)/2;
+ } else if (mousekey_accel & (1<<2)) {
+ unit = (MOUSEKEY_WHEEL_DELTA * mk_wheel_max_speed);
+ } else if (mousekey_repeat == 0) {
+ unit = MOUSEKEY_WHEEL_DELTA;
+ } else if (mousekey_repeat >= mk_time_to_max) {
unit = MOUSEKEY_WHEEL_DELTA * mk_wheel_max_speed;
} else {
unit = (MOUSEKEY_WHEEL_DELTA * mk_wheel_max_speed * mousekey_repeat) / mk_wheel_time_to_max;
}
- if (unit == 0) return 1;
- return (unit > MOUSEKEY_WHEEL_MAX ? MOUSEKEY_WHEEL_MAX : unit);
+ return (unit > MOUSEKEY_WHEEL_MAX ? MOUSEKEY_WHEEL_MAX : (unit == 0 ? 1 : unit));
}
void mousekey_task(void)
@@ -126,6 +111,7 @@ void mousekey_task(void)
if (mouse_report.y > 0) mouse_report.y = move_unit();
if (mouse_report.y < 0) mouse_report.y = move_unit() * -1;
+ /* diagonal move [1/sqrt(2) = 0.7] */
if (mouse_report.x && mouse_report.y) {
mouse_report.x *= 0.7;
mouse_report.y *= 0.7;
@@ -141,19 +127,22 @@ void mousekey_task(void)
void mousekey_on(uint8_t code)
{
- if (code == KC_MS_UP) mouse_report.y = MOUSEKEY_MOVE_DELTA * -1;
- else if (code == KC_MS_DOWN) mouse_report.y = MOUSEKEY_MOVE_DELTA;
- else if (code == KC_MS_LEFT) mouse_report.x = MOUSEKEY_MOVE_DELTA * -1;
- else if (code == KC_MS_RIGHT) mouse_report.x = MOUSEKEY_MOVE_DELTA;
- else if (code == KC_MS_WH_UP) mouse_report.v = MOUSEKEY_WHEEL_DELTA;
- else if (code == KC_MS_WH_DOWN) mouse_report.v = MOUSEKEY_WHEEL_DELTA * -1;
- else if (code == KC_MS_WH_LEFT) mouse_report.h = MOUSEKEY_WHEEL_DELTA * -1;
- else if (code == KC_MS_WH_RIGHT) mouse_report.h = MOUSEKEY_WHEEL_DELTA;
+ if (code == KC_MS_UP) mouse_report.y = move_unit() * -1;
+ else if (code == KC_MS_DOWN) mouse_report.y = move_unit();
+ else if (code == KC_MS_LEFT) mouse_report.x = move_unit() * -1;
+ else if (code == KC_MS_RIGHT) mouse_report.x = move_unit();
+ else if (code == KC_MS_WH_UP) mouse_report.v = wheel_unit();
+ else if (code == KC_MS_WH_DOWN) mouse_report.v = wheel_unit() * -1;
+ else if (code == KC_MS_WH_LEFT) mouse_report.h = wheel_unit() * -1;
+ else if (code == KC_MS_WH_RIGHT) mouse_report.h = wheel_unit();
else if (code == KC_MS_BTN1) mouse_report.buttons |= MOUSE_BTN1;
else if (code == KC_MS_BTN2) mouse_report.buttons |= MOUSE_BTN2;
else if (code == KC_MS_BTN3) mouse_report.buttons |= MOUSE_BTN3;
else if (code == KC_MS_BTN4) mouse_report.buttons |= MOUSE_BTN4;
else if (code == KC_MS_BTN5) mouse_report.buttons |= MOUSE_BTN5;
+ else if (code == KC_MS_ACCEL0) mousekey_accel |= (1<<0);
+ else if (code == KC_MS_ACCEL1) mousekey_accel |= (1<<1);
+ else if (code == KC_MS_ACCEL2) mousekey_accel |= (1<<2);
}
void mousekey_off(uint8_t code)
@@ -171,6 +160,9 @@ void mousekey_off(uint8_t code)
else if (code == KC_MS_BTN3) mouse_report.buttons &= ~MOUSE_BTN3;
else if (code == KC_MS_BTN4) mouse_report.buttons &= ~MOUSE_BTN4;
else if (code == KC_MS_BTN5) mouse_report.buttons &= ~MOUSE_BTN5;
+ else if (code == KC_MS_ACCEL0) mousekey_accel &= ~(1<<0);
+ else if (code == KC_MS_ACCEL1) mousekey_accel &= ~(1<<1);
+ else if (code == KC_MS_ACCEL2) mousekey_accel &= ~(1<<2);
if (mouse_report.x == 0 && mouse_report.y == 0 && mouse_report.v == 0 && mouse_report.h == 0)
mousekey_repeat = 0;
@@ -186,17 +178,19 @@ void mousekey_send(void)
void mousekey_clear(void)
{
mouse_report = (report_mouse_t){};
+ mousekey_repeat = 0;
+ mousekey_accel = 0;
}
static void mousekey_debug(void)
{
if (!debug_mouse) return;
- print("mousekey [btn|x y v h]rep: [");
+ print("mousekey [btn|x y v h](rep/acl): [");
phex(mouse_report.buttons); print("|");
phex(mouse_report.x); print(" ");
phex(mouse_report.y); print(" ");
phex(mouse_report.v); print(" ");
- phex(mouse_report.h); print("]");
- phex(mousekey_repeat);
- print("\n");
+ phex(mouse_report.h); print("](");
+ phex(mousekey_repeat); print("/");
+ phex(mousekey_accel); print(")\n");
}
diff --git a/common/mousekey.h b/common/mousekey.h
index 3006c4634..ac26a46c8 100644
--- a/common/mousekey.h
+++ b/common/mousekey.h
@@ -21,6 +21,45 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdbool.h>
#include "host.h"
+
+/* max value on report descriptor */
+#define MOUSEKEY_MOVE_MAX 127
+#define MOUSEKEY_WHEEL_MAX 127
+
+#ifndef MOUSEKEY_MOVE_DELTA
+#define MOUSEKEY_MOVE_DELTA 5
+#endif
+#ifndef MOUSEKEY_WHEEL_DELTA
+#define MOUSEKEY_WHEEL_DELTA 1
+#endif
+#ifndef MOUSEKEY_DELAY
+#define MOUSEKEY_DELAY 300
+#endif
+#ifndef MOUSEKEY_INTERVAL
+#define MOUSEKEY_INTERVAL 50
+#endif
+#ifndef MOUSEKEY_MAX_SPEED
+#define MOUSEKEY_MAX_SPEED 10
+#endif
+#ifndef MOUSEKEY_TIME_TO_MAX
+#define MOUSEKEY_TIME_TO_MAX 20
+#endif
+#ifndef MOUSEKEY_WHEEL_MAX_SPEED
+#define MOUSEKEY_WHEEL_MAX_SPEED 16
+#endif
+#ifndef MOUSEKEY_WHEEL_TIME_TO_MAX
+#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
+#endif
+
+
+uint8_t mk_delay;
+uint8_t mk_interval;
+uint8_t mk_max_speed;
+uint8_t mk_time_to_max;
+uint8_t mk_wheel_max_speed;
+uint8_t mk_wheel_time_to_max;
+
+
void mousekey_task(void);
void mousekey_on(uint8_t code);
void mousekey_off(uint8_t code);
diff --git a/keyboard/hhkb/keymap.c b/keyboard/hhkb/keymap.c
index 3cfa5ff33..659a540b1 100644
--- a/keyboard/hhkb/keymap.c
+++ b/keyboard/hhkb/keymap.c
@@ -59,7 +59,7 @@ static const uint8_t PROGMEM fn_layer[] = {
2, // Fn2
3, // Fn3
3, // Fn4
- 4, // Fn5
+ 5, // Fn5
0, // Fn6
0 // Fn7
};
@@ -162,9 +162,9 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LGUI,LALT, BTN1, RALT,FN4),
#else
KEYMAP(ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
- TAB, WH_L,WH_U,MS_U,WH_D,WH_R,WH_L,WH_D,WH_U,WH_R,NO, NO, NO, BSPC, \
- LCTL,NO, MS_L,MS_D,MS_R,NO, MS_L,MS_D,MS_U,MS_R,FN3, NO, ENT, \
- LSFT,BTN4,BTN5,BTN1,BTN2,BTN3,BTN2,BTN1,BTN4,BTN5,NO, RSFT,NO, \
+ TAB, NO, NO, NO, NO, NO, WH_L,WH_D,WH_U,WH_R,NO, NO, NO, BSPC, \
+ LCTL,NO, ACL0,ACL1,ACL2,NO, MS_L,MS_D,MS_U,MS_R,FN3, NO, ENT, \
+ LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,BTN4,BTN5,NO, RSFT,NO, \
LGUI,LALT, BTN1, RALT,FN4),
#endif
--
cgit v1.2.3-70-g09d2