From 7b5d613b8f5cddf8efe64e34cb903c936b95fa83 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Tue, 22 Nov 2022 20:07:48 +0100 Subject: [PATCH] Removed mouse support --- firmware/platformio.ini | 2 +- firmware/src/main.cpp | 185 +++------------------------------------- 2 files changed, 12 insertions(+), 175 deletions(-) diff --git a/firmware/platformio.ini b/firmware/platformio.ini index 17401a6..21e374a 100755 --- a/firmware/platformio.ini +++ b/firmware/platformio.ini @@ -12,5 +12,5 @@ platform = teensy board = teensylc framework = arduino -build_flags = -D USB_HID -D LAYOUT_SWEDISH -w +build_flags = -D USB_KEYBOARDONLY -D LAYOUT_SWEDISH -w board_build.f_cpu = 48000000L diff --git a/firmware/src/main.cpp b/firmware/src/main.cpp index 914665b..57a204e 100755 --- a/firmware/src/main.cpp +++ b/firmware/src/main.cpp @@ -32,23 +32,23 @@ * Layer 0 * --------------------------------------- --------------------------------------- * | Tab | Q | W | E | R | T | | Y | U | I | O | P | Å | - * | Ctrl | A | S | D | F | G | | H | J | K | L | Ö | Ä | + * | LCtrl | A | S | D | F | G | | H | J | K | L | Ö | Ä | * | Shift | Z | X | C | V | B | | N | M | , | . | - | Shift | * --------------------| Alt | Fn1 | Spc | | Spc | Fn1 | Win |-------------------- * ------------------- ------------------- * Layer 1 (Fn1) * --------------------------------------- --------------------------------------- * | Esc | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | BSpc | - * | Ctrl | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Enter | + * | LCtrl | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Enter | * | Shift | 6 | 7 | 8 | 9 | 0 | | < | ´ | ' | ¨ | + | Shift | - * --------------------| Alt | Fn1 | Spc | | BSpc| Fn1 | AlrG|-------------------- + * --------------------| Alt | Fn1 | Spc | | BSpc| Fn1 |AlrGr|-------------------- * ------------------- ------------------- - * Layer 2 (Fn2) + * Layer 2 (Fn1 + Fn1) * --------------------------------------- --------------------------------------- * | F11 | F12 | F13 | F14 | F15 | F16 | | § | MWD | MWU | | | CapLk | - * | Ctrl | Play| Next| F17 | F18 | F19 | | Left| Down| Up |Right| Del | | + * | LCtrl | Play| Next| F17 | F18 | F19 | | Left| Down| Up |Right| Del | | * | Shift | F20 | F21 | F22 | F23 | F24 | | Home| PgD | PgU | End | Ins | Shift | - * --------------------| Alt | Fn1 | Win | | | Fn1 | |-------------------- + * --------------------| Alt | Fn1 | Win | | | Fn1 | Win |-------------------- * ------------------- ------------------- * Features: * @@ -71,15 +71,6 @@ #define KEY_OFFSET 0xAA00 // Offset to apply for not interfere with already defined keyboard keys -#define KEY_MWU 1 + KEY_OFFSET // Mouse wheel up -#define KEY_MWD 2 + KEY_OFFSET // Mouse wheel down -#define KEY_M1 3 + KEY_OFFSET // Mouse button 1 (left) -#define KEY_M2 4 + KEY_OFFSET // Mouse button 2 (right) -#define KEY_M3 5 + KEY_OFFSET // Mouse button 3 (middle/wheel) -#define KEY_MU 6 + KEY_OFFSET // Mouse Y+ -#define KEY_ML 7 + KEY_OFFSET // Mouse X- -#define KEY_MD 8 + KEY_OFFSET // Mouse Y- -#define KEY_MR 9 + KEY_OFFSET // Mouse X+ #define KEY_FN1 10 + KEY_OFFSET // Function layer 1 button #define KEY_FN2 11 + KEY_OFFSET // Function layer 2 button @@ -138,10 +129,10 @@ Button buttons[NBR_OF_BUTTONS] = {5, KEY_R, KEY_F4, KEY_F15, IDLE, NO_KEY, false}, {6, KEY_T, KEY_F5, KEY_F16, IDLE, NO_KEY, false}, {7, KEY_Y, KEY_F6, '§', IDLE, NO_KEY, false}, - {8, KEY_U, KEY_F7, KEY_M1, IDLE, NO_KEY, false}, - {9, KEY_I, KEY_F8, KEY_M2, IDLE, NO_KEY, false}, - {10, KEY_O, KEY_F9, KEY_M3, IDLE, NO_KEY, false}, - {11, KEY_P, KEY_F10, KEY_MWU, IDLE, NO_KEY, false}, + {8, KEY_U, KEY_F7, NO_KEY, IDLE, NO_KEY, false}, + {9, KEY_I, KEY_F8, NO_KEY, IDLE, NO_KEY, false}, + {10, KEY_O, KEY_F9, NO_KEY, IDLE, NO_KEY, false}, + {11, KEY_P, KEY_F10, NO_KEY, IDLE, NO_KEY, false}, {12, 'å', KEY_BACKSPACE, KEY_CAPS_LOCK, IDLE, NO_KEY, false}, {13, KEY_LEFT_CTRL, KEY_LEFT_CTRL, KEY_LEFT_CTRL, IDLE, NO_KEY, false}, {14, KEY_A, KEY_1, KEY_MEDIA_PLAY_PAUSE, IDLE, NO_KEY, false}, @@ -172,7 +163,7 @@ Button buttons[NBR_OF_BUTTONS] = {39, KEY_SPACE, KEY_SPACE, KEY_LEFT_GUI, IDLE, NO_KEY, false}, {40, KEY_SPACE, KEY_BACKSPACE, NO_KEY, IDLE, NO_KEY, false}, {41, KEY_FN1, KEY_FN1, KEY_FN1, IDLE, NO_KEY, false}, - {42, KEY_LEFT_GUI, KEY_RIGHT_ALT, NO_KEY, IDLE, NO_KEY, false}}; + {42, KEY_LEFT_GUI, KEY_RIGHT_ALT, KEY_LEFT_GUI, IDLE, NO_KEY, false}}; // clang-format on /* End of keymap config ----------------------------------------------------------------------------------------------------------------------------- */ @@ -183,17 +174,8 @@ int status_led_mode = 0; unsigned long current_timestamp = 0; unsigned long button_timestamp = 0; -unsigned long mouse_wheel_timestamp = 0; unsigned long indicator_timestamp = 0; -bool mouse_l = false; -bool mouse_r = false; -bool mouse_u = false; -bool mouse_d = false; -int mouse_x = 0; -int mouse_y = 0; -int mouse_wheel = 0; - bool key_pressed = false; /** @@ -211,82 +193,6 @@ bool set_key(uint16_t keycode, uint8_t kstate) return false; } - /* Mouse buttons (HID mouse) */ - if (keycode >= KEY_M1 && keycode <= KEY_M3) - { - if (kstate == RELEASED) - { - Mouse.release(1 << (((keycode - KEY_OFFSET) - (KEY_M1 - KEY_OFFSET)))); - } - else if (kstate == PRESSED) - { - Mouse.press(1 << (((keycode - KEY_OFFSET) - (KEY_M1 - KEY_OFFSET)))); - } - } - - /* Mouse wheel (HID mouse) */ - else if ((keycode == KEY_MWU || keycode == KEY_MWD)) - { - if (kstate == RELEASED) - { - mouse_wheel = 0; - } - else if (kstate == PRESSED) - { - if (keycode == KEY_MWU) - { - mouse_wheel = 1; - } - else - { - mouse_wheel = -1; - } - } - } - - /* Mouse X/Y (HID mouse) */ - else if ((keycode == KEY_MU || keycode == KEY_MD || keycode == KEY_ML || keycode == KEY_MR)) - { - if (kstate == RELEASED) - { - if (keycode == KEY_ML) - { - mouse_l = false; - } - if (keycode == KEY_MR) - { - mouse_r = false; - } - if (keycode == KEY_MU) - { - mouse_u = false; - } - if (keycode == KEY_MD) - { - mouse_d = false; - } - } - else if (kstate == PRESSED) - { - if (keycode == KEY_MU) - { - mouse_u = true; - } - else if (keycode == KEY_MD) - { - mouse_d = true; - } - else if (keycode == KEY_MR) - { - mouse_r = true; - } - else if (keycode == KEY_ML) - { - mouse_l = true; - } - } - } - /* Normal keyboard keys (HID keyboard) */ else { @@ -361,28 +267,6 @@ void scan_buttons() } } - if (fn_mode == 0) - { - for (int i = 0; i < LIST_MAX; i++) - { - if (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD) - { - for (int j = 0; j < NBR_OF_BUTTONS; j++) - { - if (buttons[j].keypad_kchar == kp_keypad.key[i].kchar) - { - /* Check if FN2 key are defined to this button (Layer 0 and first position in combo array)*/ - if (buttons[j].keycode == KEY_FN2) - { - fn_mode = 2; - } - break; - } - } - } - } - } - /* Process key press/release */ for (int i = 0; i < LIST_MAX; i++) { @@ -480,53 +364,6 @@ void loop() scan_buttons(); } - /* Update mouse 20ms */ - if (current_timestamp >= mouse_wheel_timestamp && (mouse_wheel != 0 || mouse_x != 0 || mouse_y != 0 || mouse_d == true || mouse_l == true || mouse_r == true || mouse_u == true)) - { - /* Stop movement when no buttons are pressed */ - if (mouse_d == false && mouse_u == false) - { - mouse_y = 0; - } - if (mouse_l == false && mouse_r == false) - { - mouse_x = 0; - } - - /* Stop movement when both up/down or left/right are pressed */ - if (mouse_d == true && mouse_u == true) - { - mouse_y = 0; - } - if (mouse_l == true && mouse_r == true) - { - mouse_x = 0; - } - - /* Move mouse cursor/wheel */ - Mouse.move(mouse_x, mouse_y, mouse_wheel); - - /* Add mouse acceleration for next movement */ - if (mouse_r == true && mouse_x < 50) - { - mouse_x++; - } - if (mouse_l == true && mouse_x > -50) - { - mouse_x--; - } - if (mouse_d == true && mouse_y < 50) - { - mouse_y++; - } - if (mouse_u == true && mouse_y > -50) - { - mouse_y--; - } - - mouse_wheel_timestamp = current_timestamp + 20; - } - /* Update indicator 200ms */ if (current_timestamp >= indicator_timestamp) {