summaryrefslogtreecommitdiffstats
path: root/key_process.c
diff options
context:
space:
mode:
Diffstat (limited to 'key_process.c')
-rw-r--r--key_process.c207
1 files changed, 85 insertions, 122 deletions
diff --git a/key_process.c b/key_process.c
index 4a9e81b756..8006ae72f7 100644
--- a/key_process.c
+++ b/key_process.c
@@ -8,7 +8,7 @@
#include "usb_keyboard.h"
#include "usb_mouse.h"
#include "print.h"
-#include "matrix.h"
+#include "matrix_skel.h"
#include "keymap.h"
#include "jump_bootloader.h"
@@ -25,150 +25,113 @@
#define MOUSE_DELAY_ACC 5
-
-static void print_matrix(void);
-static void print_keys(void);
-static void print_mouse(int8_t mouse_x, int8_t mouse_y, int8_t wheel_v, int8_t wheel_h);
-
void proc_matrix(void) {
static int mouse_repeat = 0;
bool modified = false;
- bool has_ghost = false;
- int layer = 0;
+ //bool has_ghost = false;
int key_index = 0;
uint8_t mouse_btn = 0;
int8_t mouse_x = 0;
int8_t mouse_y = 0;
int8_t mouse_wheel = 0;
int8_t mouse_hwheel = 0;
+ int fn_bits = 0;
- matrix_scan();
- modified = matrix_is_modified();
- has_ghost = matrix_has_ghost();
- layer = get_layer();
+ matrix_scan();
+ modified = matrix_is_modified();
- // print matrix state for debug
- if (modified) {
- print_matrix();
+ if (modified) {
+ matrix_print();
- // LED flash for debug
- LED_CONFIG;
- LED_ON;
- }
+ // LED flash for debug
+ LED_CONFIG;
+ LED_ON;
+ }
- keyboard_modifier_keys = 0;
- for (int i = 0; i < 6; i++) keyboard_keys[i] = KB_NO;
- key_index = 0;
- mouse_btn = 0;
- mouse_x = 0;
- mouse_y = 0;
- mouse_wheel = 0;
- mouse_hwheel = 0;
-
- // convert matrix state to HID report
- for (int row = 0; row < MATRIX_ROWS; row++) {
- for (int col = 0; col < MATRIX_COLS; col++) {
- if (matrix[row] & 1<<col) continue;
-
- uint8_t code = get_keycode(layer, row, col);
- if (code == KB_NO) {
- continue;
- } else if (KB_LCTRL <= code && code <= KB_RGUI) {
- // modifier keys(0xE0-0xE7)
- keyboard_modifier_keys |= 1<<(code & 0x07);
- } else if (code >= MS_UP) {
- // mouse
- if (code == MS_UP) mouse_y -= MOUSE_MOVE_UNIT + (mouse_repeat < 50 ? mouse_repeat/5 : 10);
- if (code == MS_DOWN) mouse_y += MOUSE_MOVE_UNIT + (mouse_repeat < 50 ? mouse_repeat/5 : 10);
- if (code == MS_LEFT) mouse_x -= MOUSE_MOVE_UNIT + (mouse_repeat < 50 ? mouse_repeat/5 : 10);
- if (code == MS_RIGHT) mouse_x += MOUSE_MOVE_UNIT + (mouse_repeat < 50 ? mouse_repeat/5 : 10);
- if (code == MS_BTN1) mouse_btn |= 1<<0;
- if (code == MS_BTN2) mouse_btn |= 1<<1;
- if (code == MS_BTN3) mouse_btn |= 1<<2;
- if (code == MS_BTN4) mouse_btn |= 1<<3;
- if (code == MS_BTN5) mouse_btn |= 1<<4;
- if (code == MS_WH_UP) mouse_wheel += 1;
- if (code == MS_WH_DOWN) mouse_wheel -= 1;
- if (code == MS_WH_LEFT) mouse_hwheel -= 1;
- if (code == MS_WH_RIGHT) mouse_hwheel += 1;
- } else {
- // normal keys
- if (key_index < 6)
- keyboard_keys[key_index] = code;
- key_index++;
+ if (matrix_has_ghost()) {
+ // should send error?
+ print("matrix has ghost!!\n");
+ return;
+ }
+
+ usb_keyboard_clear();
+ for (int row = 0; row < matrix_rows(); row++) {
+ for (int col = 0; col < matrix_cols(); col++) {
+ if (matrix_get_row(row) & 1<<col) continue;
+
+ uint8_t code = keymap_get_keycode(row, col);
+ if (code == KB_NO) {
+ code = keymap_get_keycodel(0, row, col);
+ if (FN_0 <= code && code <= FN_7) {
+ fn_bits |= 1<<(code - FN_0);
}
+ } else if (KB_LCTRL <= code && code <= KB_RGUI) {
+ // modifier keys(0xE0-0xE7)
+ keyboard_modifier_keys |= 1<<(code & 0x07);
+ } else if (code >= MS_UP) {
+ // mouse
+ if (code == MS_UP) mouse_y -= MOUSE_MOVE_UNIT + (mouse_repeat < 50 ? mouse_repeat/5 : 10);
+ if (code == MS_DOWN) mouse_y += MOUSE_MOVE_UNIT + (mouse_repeat < 50 ? mouse_repeat/5 : 10);
+ if (code == MS_LEFT) mouse_x -= MOUSE_MOVE_UNIT + (mouse_repeat < 50 ? mouse_repeat/5 : 10);
+ if (code == MS_RIGHT) mouse_x += MOUSE_MOVE_UNIT + (mouse_repeat < 50 ? mouse_repeat/5 : 10);
+ if (code == MS_BTN1) mouse_btn |= 1<<0;
+ if (code == MS_BTN2) mouse_btn |= 1<<1;
+ if (code == MS_BTN3) mouse_btn |= 1<<2;
+ if (code == MS_BTN4) mouse_btn |= 1<<3;
+ if (code == MS_BTN5) mouse_btn |= 1<<4;
+ if (code == MS_WH_UP) mouse_wheel += 1;
+ if (code == MS_WH_DOWN) mouse_wheel -= 1;
+ if (code == MS_WH_LEFT) mouse_hwheel -= 1;
+ if (code == MS_WH_RIGHT) mouse_hwheel += 1;
+ } else if (FN_0 <= code && code <= FN_7) {
+ fn_bits |= 1<<(code - FN_0);
+ } else {
+ // normal keys
+ if (key_index < 6)
+ keyboard_keys[key_index] = code;
+ key_index++;
}
}
+ }
+ keymap_fn_proc(fn_bits);
- if (!has_ghost) {
- // when 4 left modifier keys down
- if (keyboard_modifier_keys == (MOD_LCTRL | MOD_LSHIFT | MOD_LALT | MOD_LGUI)) {
- // cancel all keys
- keyboard_modifier_keys = 0;
- for (int i = 0; i < 6; i++) keyboard_keys[i] = KB_NO;
- usb_keyboard_send();
-
- print("jump to bootloader...\n");
- _delay_ms(100);
- jump_bootloader(); // not return
- }
-
- if (mouse_x || mouse_y || mouse_wheel || mouse_hwheel || mouse_btn != mouse_buttons) {
- mouse_buttons = mouse_btn;
- usb_mouse_move(mouse_x, mouse_y, mouse_wheel, mouse_hwheel);
- print_mouse(mouse_x, mouse_y, mouse_wheel, mouse_hwheel);
- key_sent = true;
+ // when 4 left modifier keys down
+ if (keyboard_modifier_keys == (MOD_LCTRL | MOD_LSHIFT | MOD_LALT | MOD_LGUI)) {
+ // cancel all keys
+ keyboard_modifier_keys = 0;
+ for (int i = 0; i < 6; i++) keyboard_keys[i] = KB_NO;
+ usb_keyboard_send();
- // acceleration
- _delay_ms(MOUSE_DELAY_MS >> (mouse_repeat < MOUSE_DELAY_ACC ? mouse_repeat : MOUSE_DELAY_ACC));
- mouse_repeat++;
- } else {
- mouse_repeat = 0;
- }
+ print("jump to bootloader...\n");
+ _delay_ms(100);
+ jump_bootloader(); // not return
+ }
- // send keys to host
- if (modified) {
- if (key_index > 6) {
- //Rollover
- }
- usb_keyboard_send();
- if (keyboard_keys[0])
- key_sent = true;
-
- print_keys();
- // LED flash for debug
- LED_CONFIG;
- LED_OFF;
- }
- }
-}
+ if (mouse_x || mouse_y || mouse_wheel || mouse_hwheel || mouse_btn != mouse_buttons) {
+ mouse_buttons = mouse_btn;
+ usb_mouse_move(mouse_x, mouse_y, mouse_wheel, mouse_hwheel);
+ usb_mouse_print(mouse_x, mouse_y, mouse_wheel, mouse_hwheel);
-static void print_matrix(void) {
- print("\nr/c 01234567\n");
- for (int row = 0; row < MATRIX_ROWS; row++) {
- phex(row); print(": ");
- pbin_reverse(matrix[row]);
- if (matrix_has_ghost_in_row(row)) {
- print(" <ghost");
- }
- print("\n");
+ // acceleration
+ _delay_ms(MOUSE_DELAY_MS >> (mouse_repeat < MOUSE_DELAY_ACC ? mouse_repeat : MOUSE_DELAY_ACC));
+ mouse_repeat++;
+ } else {
+ mouse_repeat = 0;
}
-}
-static void print_keys(void) {
- print("\nkeys: ");
- for (int i = 0; i < 6; i++) { phex(keyboard_keys[i]); print(" "); }
- print("\n");
- print("mods: "); phex(keyboard_modifier_keys); print("\n");
-}
-static void print_mouse(int8_t mouse_x, int8_t mouse_y, int8_t wheel_v, int8_t wheel_h) {
- print("\nmouse_x y v h: ");
- phex(mouse_x); print(" ");
- phex(mouse_y); print(" ");
- phex(wheel_v); print(" ");
- phex(wheel_h); print("\n");
- print("buttons: "); phex(mouse_buttons); print("\n");
+ // send keys to host
+ if (modified) {
+ if (key_index > 6) {
+ //Rollover
+ }
+ usb_keyboard_send();
+
+ usb_keyboard_print();
+ // LED flash for debug
+ LED_CONFIG;
+ LED_OFF;
+ }
}