X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=key_process.c;h=e4d66e303cc78c8e97645f887d62a8ec9e6380ab;hb=2f80e790c6310ad24a4cb3d4a72c31314364fef7;hp=5445a4a243f5387d4892539c15427e9e47e57731;hpb=7a336b05ec2d1056fe2206ae218199c66e8980da;p=max%2Ftmk_keyboard.git diff --git a/key_process.c b/key_process.c index 5445a4a2..e4d66e30 100644 --- a/key_process.c +++ b/key_process.c @@ -1,28 +1,27 @@ -// TODO: clean unused headers #include #include -#include -#include #include -#include "usb.h" #include "usb_keyboard.h" #include "usb_mouse.h" +#include "usb_keycodes.h" #include "print.h" +#include "debug.h" +#include "util.h" #include "jump_bootloader.h" #include "matrix_skel.h" #include "keymap_skel.h" +#include "controller.h" #include "key_process.h" -// for Teensy/Teensy++ 2.0 -#define LED_CONFIG (DDRD |= (1<<6)) -#define LED_ON (PORTD |= (1<<6)) -#define LED_OFF (PORTD &= ~(1<<6)) - #define MOUSE_MOVE_UNIT 10 -#define MOUSE_DELAY_MS 200 -#define MOUSE_DELAY_ACC 5 +#define MOUSE_MOVE_ACCEL (mouse_repeat < 50 ? mouse_repeat/5 : 10) + +#ifndef MOUSE_DELAY_TIME +# define MOUSE_DELAY_TIME 255 +#endif +#define MOUSE_DELAY_MS (MOUSE_DELAY_TIME >> (mouse_repeat < 5 ? mouse_repeat : 4)) // TODO: refactoring @@ -35,7 +34,7 @@ void proc_matrix(void) { uint8_t mouse_btn = 0; int8_t mouse_x = 0; int8_t mouse_y = 0; - int8_t mouse_wheel = 0; + int8_t mouse_vwheel = 0; int8_t mouse_hwheel = 0; int fn_bits = 0; @@ -43,50 +42,51 @@ void proc_matrix(void) { modified = matrix_is_modified(); if (modified) { - matrix_print(); - + if (debug_matrix) matrix_print(); +#ifdef DEBUG_LED // LED flash for debug - LED_CONFIG; - LED_ON; + DEBUG_LED_CONFIG; + DEBUG_LED_ON; +#endif } if (matrix_has_ghost()) { // should send error? - print("matrix has ghost!!\n"); + debug("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<= MS_UP) { + // do nothing + } else if (IS_MOD(code)) { + keyboard_modifier_keys |= MOD_BIT(code); + } else if (IS_MOUSE(code)) { // 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_UP) + mouse_y -= MOUSE_MOVE_UNIT + MOUSE_MOVE_ACCEL; + if (code == MS_DOWN) + mouse_y += MOUSE_MOVE_UNIT + MOUSE_MOVE_ACCEL; + if (code == MS_LEFT) + mouse_x -= MOUSE_MOVE_UNIT + MOUSE_MOVE_ACCEL; + if (code == MS_RIGHT) + mouse_x += MOUSE_MOVE_UNIT + MOUSE_MOVE_ACCEL; + if (code == MS_BTN1) mouse_btn |= BIT_BTN1; + if (code == MS_BTN2) mouse_btn |= BIT_BTN2; + if (code == MS_BTN3) mouse_btn |= BIT_BTN3; + if (code == MS_BTN4) mouse_btn |= BIT_BTN4; + if (code == MS_BTN5) mouse_btn |= BIT_BTN5; + if (code == MS_WH_UP) mouse_vwheel += 1; + if (code == MS_WH_DOWN) mouse_vwheel -= 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 if (IS_FN(code)) { + fn_bits |= FN_BIT(code); } else { // normal keys if (key_index < 6) @@ -98,41 +98,103 @@ void proc_matrix(void) { keymap_fn_proc(fn_bits); // 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 (keymap_is_special_mode(fn_bits)) { + switch (keyboard_keys[0]) { + case KB_B: // bootloader + usb_keyboard_clear(); + usb_keyboard_send(); + print_enable = true; + print("jump to bootloader...\n"); + _delay_ms(1000); + jump_bootloader(); // not return + break; + case KB_D: // debug all toggle + usb_keyboard_clear(); + usb_keyboard_send(); + debug_enable = !debug_enable; + if (debug_enable) { + print("debug enabled.\n"); + print_enable = true; + debug_matrix = true; + debug_keyboard = true; + debug_mouse = true; + } else { + print("debug disabled.\n"); + print_enable = false; + debug_matrix = false; + debug_keyboard = false; + debug_mouse = false; + } + _delay_ms(1000); + break; + case KB_X: // debug matrix toggle + usb_keyboard_clear(); + usb_keyboard_send(); + debug_matrix = !debug_matrix; + if (debug_matrix) + print("debug matrix enabled.\n"); + else + print("debug matrix disabled.\n"); + _delay_ms(1000); + break; + case KB_K: // debug keyboard toggle + usb_keyboard_clear(); + usb_keyboard_send(); + debug_keyboard = !debug_keyboard; + if (debug_keyboard) + print("debug keyboard enabled.\n"); + else + print("debug keyboard disabled.\n"); + _delay_ms(1000); + break; + case KB_M: // debug mouse toggle + usb_keyboard_clear(); + usb_keyboard_send(); + debug_mouse = !debug_mouse; + if (debug_mouse) + print("debug mouse enabled.\n"); + else + print("debug mouse disabled.\n"); + _delay_ms(1000); + break; + case KB_V: // print version & information + usb_keyboard_clear(); + usb_keyboard_send(); + print(STR(DESCRIPTION) "\n"); + _delay_ms(1000); + break; + } } - if (mouse_x || mouse_y || mouse_wheel || mouse_hwheel || mouse_btn != mouse_buttons) { + // send mouse packet to host + if (mouse_x || mouse_y || mouse_vwheel || 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); + if (mouse_x && mouse_y) + usb_mouse_move(mouse_x*0.7, mouse_y*0.7, mouse_vwheel, mouse_hwheel); + else + usb_mouse_move(mouse_x, mouse_y, mouse_vwheel, mouse_hwheel); + usb_mouse_print(mouse_x, mouse_y, mouse_vwheel, mouse_hwheel); // acceleration - _delay_ms(MOUSE_DELAY_MS >> (mouse_repeat < MOUSE_DELAY_ACC ? mouse_repeat : MOUSE_DELAY_ACC)); + _delay_ms(MOUSE_DELAY_MS); mouse_repeat++; } else { mouse_repeat = 0; } - // send keys to host + // send key packet to host if (modified) { if (key_index > 6) { //Rollover } usb_keyboard_send(); - usb_keyboard_print(); +#ifdef DEBUG_LED // LED flash for debug - LED_CONFIG; - LED_OFF; + DEBUG_LED_CONFIG; + DEBUG_LED_OFF; +#endif } }