From 20afe4ec9844f87c1209789eb053e4051d4d2849 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Fri, 14 Oct 2022 09:24:42 +0200 Subject: [PATCH] Starting to rewrite code --- firmware/src/main.cpp | 564 +++++++++++++++--------------------------- 1 file changed, 202 insertions(+), 362 deletions(-) diff --git a/firmware/src/main.cpp b/firmware/src/main.cpp index 3b082df..fd0d6bf 100755 --- a/firmware/src/main.cpp +++ b/firmware/src/main.cpp @@ -37,11 +37,7 @@ */ #include -#include #include -#include -#include -#include #define USB_LED_NUM_LOCK 0 #define USB_LED_CAPS_LOCK 1 @@ -64,120 +60,77 @@ #define KEY_FN1 12 + KEY_OFFSET #define KEY_FN2 13 + KEY_OFFSET -#define NBR_OF_FN 3 - -// Start of key edit ----------------------------------------------------------- - -#define NBR_OF_TAP 7 - -#define KEY_TAP1 20 + KEY_OFFSET -#define KEY_TAP2 21 + KEY_OFFSET -#define KEY_TAP3 22 + KEY_OFFSET -#define KEY_TAP4 23 + KEY_OFFSET -#define KEY_TAP5 24 + KEY_OFFSET -#define KEY_TAP6 25 + KEY_OFFSET -#define KEY_TAP7 26 + KEY_OFFSET - -// Keypad button mapping -const uint16_t kp_keys[48][NBR_OF_FN] = { - // Fn 0 Fn 1 Fn 2 - // Row 1 - {KEY_TAP1, KEY_TAP1, KEY_TAP1}, - {KEY_Q, KEY_F1, KEY_F12}, - {KEY_W, KEY_F2, KEY_F13}, - {KEY_E, KEY_F3, KEY_F14}, - {KEY_R, KEY_F4, KEY_F15}, - {KEY_T, KEY_F5, KEY_F16}, - {KEY_Y, KEY_F6, NO_KEY}, - {KEY_U, KEY_F7, NO_KEY}, - {KEY_I, KEY_F8, NO_KEY}, - {KEY_O, KEY_F9, NO_KEY}, - {KEY_P, KEY_F10, NO_KEY}, - {'å', KEY_F11, KEY_CAPS_LOCK}, - // Row 2 - {KEY_TAP2, KEY_TAP2, KEY_TAP2}, - {KEY_A, KEY_1, KEY_MEDIA_PREV_TRACK}, - {KEY_S, KEY_2, KEY_MEDIA_PLAY_PAUSE}, - {KEY_D, KEY_3, KEY_MEDIA_NEXT_TRACK}, - {KEY_F, KEY_4, NO_KEY}, - {KEY_G, KEY_5, NO_KEY}, - {KEY_H, KEY_6, KEY_LEFT_ARROW}, - {KEY_J, KEY_7, KEY_DOWN_ARROW}, - {KEY_K, KEY_8, KEY_UP_ARROW}, - {KEY_L, KEY_9, KEY_RIGHT_ARROW}, - {'ö', KEY_0, NO_KEY}, - {'ä', KEY_EQUAL, NO_KEY}, - // Row 3 - {KEY_TAP3, KEY_TAP3, KEY_TAP3}, - {KEY_Z, '§', NO_KEY}, - {KEY_X, NO_KEY, NO_KEY}, - {KEY_C, NO_KEY, NO_KEY}, - {KEY_V, '<', NO_KEY}, - {KEY_B, NO_KEY, NO_KEY}, - {KEY_N, NO_KEY, KEY_HOME}, - {KEY_M, KEY_BACKSLASH, KEY_PAGE_DOWN}, - {KEY_COMMA, KEY_RIGHT_BRACE, KEY_PAGE_UP}, - {KEY_PERIOD, KEY_MINUS, KEY_END}, - {KEY_SLASH, NO_KEY, KEY_INSERT}, - {KEY_TAP4, KEY_TAP4, KEY_TAP4}, - // Row 4 - {NO_KEY, NO_KEY, NO_KEY}, // N/A - {NO_KEY, NO_KEY, NO_KEY}, // N/A - {NO_KEY, NO_KEY, NO_KEY}, // N/A - {KEY_TAP5, KEY_TAP5, KEY_TAP5}, - {KEY_LEFT_ALT, KEY_LEFT_ALT, KEY_LEFT_ALT}, - {KEY_TAP6, KEY_TAP6, KEY_TAP6}, - {KEY_TAP7, KEY_TAP7, KEY_TAP7}, - {KEY_RIGHT_ALT, KEY_RIGHT_ALT, KEY_RIGHT_ALT}, - {KEY_LEFT_GUI, KEY_LEFT_GUI, KEY_LEFT_GUI}, - {NO_KEY, NO_KEY, NO_KEY}, // N/A - {NO_KEY, NO_KEY, NO_KEY}, // N/A - {NO_KEY, NO_KEY, NO_KEY} // N/A -}; - -// Keypad tap key mapping -const uint16_t tap_keys[NBR_OF_TAP][3] = { - // Trigger, Tap, Hold - {KEY_TAP1, KEY_TAB, KEY_FN2}, - {KEY_TAP2, KEY_ESC, KEY_LEFT_CTRL}, - {KEY_TAP3, KEY_DELETE, KEY_LEFT_SHIFT}, - {KEY_TAP4, KEY_ENTER, KEY_RIGHT_SHIFT}, - {KEY_TAP5, KEY_M1, KEY_M2}, - {KEY_TAP6, KEY_BACKSPACE, KEY_FN1}, - {KEY_TAP7, KEY_SPACE, KEY_FN1}}; - -// End of key edit ----------------------------------------------------------- - -struct Tap +struct Button { - int state = 0; - bool timeout_enable = false; - bool release_enable = false; - unsigned long timeout_timestamp = 0; - unsigned long release_timestamp = 0; - unsigned long timeout_time = 150; - bool fn_fast_switch = true; + int keypad_id = 0; + uint16_t keycode = NO_KEY; + uint16_t tap_keycode = NO_KEY; + uint16_t fn1_keycode = NO_KEY; + uint16_t fn1_tap_keycode = NO_KEY; + uint16_t fn2_keycode = NO_KEY; + uint16_t fn2_tap_keycode = NO_KEY; + bool tap_enable = false; + bool prev_kstate = IDLE; + bool run_keycode = false; + bool run_tap_keycode = false; + int tap_presses = 0; }; -int fn_kp_key_found = 0; -int kp_fn_mode = 0; -Tap tap[NBR_OF_TAP]; +int fn_mode = 0; + +#define NBR_OF_BUTTONS 42 +Button buttons[NBR_OF_BUTTONS] = + { + {0, KEY_FN2, KEY_TAB, KEY_FN2, KEY_TAB, KEY_FN2, KEY_TAB, true, IDLE, false, false}, + {1, KEY_Q, NO_KEY, KEY_F1, NO_KEY, KEY_F12, NO_KEY, false, IDLE, false, false}, + {2, KEY_W, NO_KEY, KEY_F2, NO_KEY, KEY_F13, NO_KEY, false, IDLE, false, false}, + {3, KEY_E, NO_KEY, KEY_F3, NO_KEY, KEY_F14, NO_KEY, false, IDLE, false, false}, + {4, KEY_R, NO_KEY, KEY_F4, NO_KEY, KEY_F15, NO_KEY, false, IDLE, false, false}, + {5, KEY_T, NO_KEY, KEY_F5, NO_KEY, KEY_F16, NO_KEY, false, IDLE, false, false}, + {6, KEY_Y, NO_KEY, KEY_F6, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, false}, + {7, KEY_U, NO_KEY, KEY_F7, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, false}, + {8, KEY_I, NO_KEY, KEY_F8, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, false}, + {9, KEY_O, NO_KEY, KEY_F9, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, false}, + {10, KEY_P, NO_KEY, KEY_F10, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, false}, + {11, 'å', NO_KEY, KEY_F11, NO_KEY, KEY_CAPS_LOCK, NO_KEY, false, IDLE, false, false}, + {12, KEY_LEFT_CTRL, KEY_ESC, KEY_LEFT_CTRL, KEY_ESC, KEY_LEFT_CTRL, KEY_ESC, true, IDLE, false, false}, + {13, KEY_A, NO_KEY, KEY_1, NO_KEY, KEY_MEDIA_PREV_TRACK, NO_KEY, false, IDLE, false, false}, + {14, KEY_S, NO_KEY, KEY_2, NO_KEY, KEY_MEDIA_PLAY_PAUSE, NO_KEY, false, IDLE, false, false}, + {15, KEY_D, NO_KEY, KEY_3, NO_KEY, KEY_MEDIA_NEXT_TRACK, NO_KEY, false, IDLE, false, false}, + {16, KEY_F, NO_KEY, KEY_4, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, false}, + {17, KEY_G, NO_KEY, KEY_5, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, false}, + {18, KEY_H, NO_KEY, KEY_6, NO_KEY, KEY_LEFT_ARROW, NO_KEY, false, IDLE, false, false}, + {19, KEY_J, NO_KEY, KEY_7, NO_KEY, KEY_DOWN_ARROW, NO_KEY, false, IDLE, false, false}, + {20, KEY_K, NO_KEY, KEY_8, NO_KEY, KEY_UP_ARROW, NO_KEY, false, IDLE, false, false}, + {21, KEY_L, NO_KEY, KEY_9, NO_KEY, KEY_RIGHT_ARROW, NO_KEY, false, IDLE, false, false}, + {22, 'ö', NO_KEY, KEY_0, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, false}, + {23, 'ä', NO_KEY, KEY_EQUAL, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, false}, + {24, KEY_LEFT_SHIFT, KEY_DELETE, KEY_LEFT_SHIFT, KEY_DELETE, KEY_LEFT_SHIFT, KEY_DELETE, true, IDLE, false, false}, + {25, KEY_Z, NO_KEY, '§', NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, false}, + {26, KEY_X, NO_KEY, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, false}, + {27, KEY_C, NO_KEY, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, false}, + {28, KEY_V, NO_KEY, '<', NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, false}, + {29, KEY_B, NO_KEY, NO_KEY, NO_KEY, NO_KEY, NO_KEY, false, IDLE, false, false}, + {30, KEY_N, NO_KEY, NO_KEY, NO_KEY, KEY_HOME, NO_KEY, false, IDLE, false, false}, + {31, KEY_M, NO_KEY, KEY_BACKSLASH, NO_KEY, KEY_PAGE_DOWN, NO_KEY, false, IDLE, false, false}, + {32, KEY_COMMA, NO_KEY, KEY_RIGHT_BRACE, NO_KEY, KEY_PAGE_UP, NO_KEY, false, IDLE, false, false}, + {33, KEY_PERIOD, NO_KEY, KEY_MINUS, NO_KEY, KEY_END, NO_KEY, false, IDLE, false, false}, + {34, KEY_SLASH, NO_KEY, NO_KEY, NO_KEY, KEY_INSERT, NO_KEY, false, IDLE, false, false}, + {35, KEY_RIGHT_SHIFT, KEY_ENTER, KEY_RIGHT_SHIFT, KEY_ENTER, KEY_RIGHT_SHIFT, KEY_ENTER, true, IDLE, false, false}, + {39, KEY_M1, KEY_M2, KEY_M1, KEY_M2, KEY_M1, KEY_M2, true, IDLE, false, false}, + {40, KEY_LEFT_ALT, KEY_SPACE, KEY_LEFT_ALT, KEY_SPACE, KEY_LEFT_ALT, KEY_SPACE, true, IDLE, false, false}, + {41, KEY_FN1, KEY_BACKSPACE, KEY_FN1, KEY_BACKSPACE, KEY_FN1, KEY_BACKSPACE, true, IDLE, false, false}, + {42, KEY_FN1, KEY_SPACE, KEY_FN1, KEY_SPACE, KEY_FN1, KEY_SPACE, true, IDLE, false, false}, + {43, KEY_RIGHT_ALT, NO_KEY, KEY_RIGHT_ALT, NO_KEY, KEY_RIGHT_ALT, NO_KEY, false, IDLE, false, false}, + {44, KEY_LEFT_GUI, NO_KEY, KEY_LEFT_GUI, NO_KEY, KEY_LEFT_GUI, NO_KEY, false, IDLE, false, false}}; int mouse_wheel = 0; const int POWER_LED = 13; -#define DATAPIN 22 -#define CLOCKPIN 23 -#define NUMPIXELS 2 -Adafruit_DotStar strip(NUMPIXELS, DATAPIN, CLOCKPIN, DOTSTAR_BGR); - unsigned long current_timestamp = 0; unsigned long button_timestamp = 0; unsigned long mouse_wheel_timestamp = 0; -unsigned long indicator_timestamp = 0; - -byte kp_buttons[48][3]; const byte KP_ROWS = 4; const byte KP_COLS = 12; @@ -239,218 +192,12 @@ void update_key(uint16_t keycode, uint8_t kstate) } } -void update_buttons() -{ - - // Scan all buttons - if (kp_keypad.getKeys()) - { - - int reboot = 0; - - // Enter bootloader if all four corner-buttons is pressed together on the left keypad - for (int i = 0; i < LIST_MAX; i++) - { - if ((kp_keypad.key[i].kchar == 1) && (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD)) - { - reboot += 1; - } - if ((kp_keypad.key[i].kchar == 12) && (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD)) - { - reboot += 1; - } - if ((kp_keypad.key[i].kchar == 25) && (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD)) - { - reboot += 1; - } - if ((kp_keypad.key[i].kchar == 36) && (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD)) - { - reboot += 1; - } - if (reboot == 4) - { - asm("bkpt #251"); - return; - } - } - - // ---------------------------------------------------------- - // Check Fn keys - // ---------------------------------------------------------- - kp_fn_mode = 0; - - // keypad - for (int i = 0; i < (sizeof(kp_keys) / sizeof(kp_keys[0])); i++) - { - if (kp_buttons[i][0] == PRESSED && kp_keys[i][0] == KEY_FN1) - { - kp_fn_mode = 1; - } - if (kp_buttons[i][0] == PRESSED && kp_keys[i][0] == KEY_FN2) - { - kp_fn_mode = 2; - } - for (int j = 0; j < (sizeof(tap) / sizeof(tap[0])); j++) - { - if ((kp_buttons[i][0] == PRESSED && kp_keys[i][0] == tap_keys[j][0] && tap[j].state != 3) && - ((tap[j].fn_fast_switch == false && tap[j].state == 0) || (tap[j].fn_fast_switch == true))) - { - if (tap_keys[j][2] == KEY_FN1) - { - kp_fn_mode = 1; - } - else if (tap_keys[j][2] == KEY_FN2) - { - kp_fn_mode = 2; - } - } - } - } - - // ---------------------------------------------------------- - // Check keys - // ---------------------------------------------------------- - for (int i = 0; i < (sizeof(kp_keys) / sizeof(kp_keys[0])); i++) - { - if (kp_buttons[i][2] == PRESSED && - kp_keys[i][0] != KEY_TAP1 && - kp_keys[i][0] != KEY_TAP2 && - kp_keys[i][0] != KEY_TAP3 && - kp_keys[i][0] != KEY_TAP4 && - kp_keys[i][0] != KEY_TAP5 && - kp_keys[i][0] != KEY_TAP6 && - kp_keys[i][0] != KEY_TAP7 && - kp_keys[i][0] != KEY_FN1 && - kp_keys[i][0] != KEY_FN2) - { - // Press key linked to the FN layer for this button - if (kp_keys[i][kp_fn_mode] != NO_KEY) - { - update_key(kp_keys[i][kp_fn_mode], PRESSED); - } - - // Check if fn related button is pressed - if (kp_fn_mode > 0) - { - fn_kp_key_found = kp_keys[i][0]; - } - } - - else if (kp_buttons[i][2] == RELEASED && - kp_keys[i][0] != KEY_TAP1 && - kp_keys[i][0] != KEY_TAP2 && - kp_keys[i][0] != KEY_TAP3 && - kp_keys[i][0] != KEY_TAP4 && - kp_keys[i][0] != KEY_TAP5 && - kp_keys[i][0] != KEY_TAP6 && - kp_keys[i][0] != KEY_TAP7 && - kp_keys[i][0] != KEY_FN1 && - kp_keys[i][0] != KEY_FN2) - { - - // Release all keys linked to this button - update_key(kp_keys[i][0], RELEASED); - - // Check if fn related button is released - if (kp_keys[i][0] == fn_kp_key_found) - { - fn_kp_key_found = 0; - } - - // Check to not release the same key one more time - if (kp_keys[i][1] != NO_KEY && kp_keys[i][1] != kp_keys[i][0]) - { - update_key(kp_keys[i][1], RELEASED); - } - - // Check to not release the same key one more time - if (kp_keys[i][2] != NO_KEY && kp_keys[i][2] != kp_keys[i][0] && - kp_keys[i][2] != kp_keys[i][1]) - { - update_key(kp_keys[i][2], RELEASED); - } - } - } - - // ---------------------------------------------------------- - // Check tap keys - // ---------------------------------------------------------- - for (int i = 0; i < (sizeof(kp_keys) / sizeof(kp_keys[0])); i++) - { - // Tap state: - // 0 = idle (not pressed for a while) - // 1 = pressed - // 2 = released within timeout, pressing tap key - // 3 = pressed again within timeout, holding tap key - for (int j = 0; j < (sizeof(tap) / sizeof(tap[0])); j++) - { - // Press - if (kp_buttons[i][2] == PRESSED && kp_keys[i][0] == tap_keys[j][0]) - { - if (tap[j].state == 0) - { - tap[j].timeout_timestamp = current_timestamp + tap[j].timeout_time; - tap[j].timeout_enable = true; - tap[j].release_enable = false; - tap[j].state = 1; - } - else if (tap[j].state == 2) - { - tap[j].timeout_enable = false; - tap[j].release_enable = false; - tap[j].state = 3; - } - // Release - } - else if (kp_buttons[i][2] == RELEASED && kp_keys[i][0] == tap_keys[j][0]) - { - if (tap[j].state == 1) - { - update_key(tap_keys[j][1], RELEASED); - - if (tap_keys[j][2] != KEY_FN1 && tap_keys[j][2] != KEY_FN2) - { - update_key(tap_keys[j][2], RELEASED); - } - - if (fn_kp_key_found == 0 && (tap_keys[j][2] == KEY_FN1 || tap_keys[j][2] == KEY_FN2)) - { - update_key(tap_keys[j][1], PRESSED); - tap[j].release_timestamp = current_timestamp + tap[j].timeout_time + 10; - tap[j].release_enable = true; - tap[j].state = 2; - } - else - { - tap[j].timeout_enable = false; - tap[j].release_enable = false; - tap[j].state = 0; - } - } - else - { - update_key(tap_keys[j][1], RELEASED); - tap[j].state = 0; - } - } - } - // Reset key change status - kp_buttons[i][2] = IDLE; - } - } -} - void setup() { // Turn on and off power led. pinMode(POWER_LED, OUTPUT); digitalWrite(POWER_LED, LOW); - - // initialize Dotstar strip - strip.begin(); - strip.setPixelColor(0, 0, 0, 0); - strip.setPixelColor(1, 0, 0, 0); } void loop() @@ -461,17 +208,152 @@ void loop() // ---------------------------------------------------------- // Check keys // ---------------------------------------------------------- - update_buttons(); - // Update button status every 100 millisecond as fallback - // to be able to enter bootloader - // ---------------------------------------------------------- - if (current_timestamp >= button_timestamp) + if (kp_keypad.getKeys()) { - update_buttons(); - button_timestamp = current_timestamp + 100; + // 1: Update button array from keypad data + fn_mode = 0; + for (int i = 0; i < NBR_OF_BUTTONS; i++) + { + if (kp_keypad.key[buttons[i].keypad_id].stateChanged) + { + if (buttons[i].tap_enable == true && kp_keypad.key[buttons[i].keypad_id].kstate == HOLD) + { + if (buttons[i].tap_presses > 0) + { + if (buttons[i].keycode == KEY_FN1) + { + fn_mode = 1; + } + else if (buttons[i].keycode == KEY_FN2) + { + fn_mode = 2; + } + else + { + buttons[i].run_tap_keycode = true; + } + } + else + { + if (buttons[i].keycode == KEY_FN1) + { + fn_mode = 1; + } + else if (buttons[i].keycode == KEY_FN2) + { + fn_mode = 2; + } + else + { + buttons[i].run_keycode = true; + } + } + } + else if (buttons[i].tap_enable == true && kp_keypad.key[buttons[i].keypad_id].kstate == RELEASED && buttons[i].prev_kstate == PRESSED) + { + if (buttons[i].keycode == KEY_FN1 || buttons[i].keycode == KEY_FN2) + { + fn_mode = 0; + } + else + { + buttons[i].run_tap_keycode = true; + } + } + else if (buttons[i].tap_enable == true && kp_keypad.key[buttons[i].keypad_id].kstate == PRESSED && (buttons[i].prev_kstate == IDLE || buttons[i].prev_kstate == RELEASED)) + { + buttons[i].tap_presses++; + } + else if (buttons[i].tap_enable == false && kp_keypad.key[buttons[i].keypad_id].kstate == PRESSED) + { + if (buttons[i].keycode == KEY_FN1) + { + fn_mode = 1; + } + else if (buttons[i].keycode == KEY_FN2) + { + fn_mode = 2; + } + else + { + buttons[i].run_keycode = true; + } + } + else if (buttons[i].tap_enable == false && kp_keypad.key[buttons[i].keypad_id].kstate == RELEASED) + { + if (buttons[i].keycode == KEY_FN1 || buttons[i].keycode == KEY_FN2) + { + fn_mode = 0; + } + else + { + buttons[i].run_keycode = true; + } + } + else if (buttons[i].tap_enable == false && kp_keypad.key[buttons[i].keypad_id].kstate == HOLD) + { + if (buttons[i].keycode == KEY_FN1) + { + fn_mode = 1; + } + else if (buttons[i].keycode == KEY_FN2) + { + fn_mode = 2; + } + } + + buttons[i].prev_kstate = kp_keypad.key[buttons[i].keypad_id].kstate; + } + } + + // 2: Check if enter bootloader command pressed + if (buttons[0].prev_kstate == HOLD && buttons[11].prev_kstate == HOLD && buttons[24].prev_kstate == HOLD && buttons[35].prev_kstate == HOLD) + { + // Enter bootloader + asm("bkpt #251"); + } + + // 3: Execute key command + for (int i = 0; i < NBR_OF_BUTTONS; i++) + { + if (buttons[i].run_keycode == true) + { + if (fn_mode == 1) + { + update_key(buttons[i].fn1_keycode, buttons[i].prev_kstate); + } + else if (fn_mode == 2) + { + update_key(buttons[i].fn2_keycode, buttons[i].prev_kstate); + } + else + { + update_key(buttons[i].keycode, buttons[i].prev_kstate); + } + } + else if (buttons[i].run_tap_keycode == true) + { + if (fn_mode == 1) + { + update_key(buttons[i].fn1_tap_keycode, buttons[i].prev_kstate); + } + else if (fn_mode == 2) + { + update_key(buttons[i].fn2_tap_keycode, buttons[i].prev_kstate); + } + else + { + update_key(buttons[i].tap_keycode, buttons[i].prev_kstate); + } + } + } } + // 4: Update tap timeout + + // 5: Update tap release + // ---------------------------------------------------------- // Update mouse wheel // ---------------------------------------------------------- @@ -480,46 +362,4 @@ void loop() Mouse.move(0, 0, mouse_wheel); mouse_wheel_timestamp = current_timestamp + 20; } - - // ---------------------------------------------------------- - // Tap timeout - // ---------------------------------------------------------- - for (int j = 0; j < (sizeof(tap) / sizeof(tap[0])); j++) - { - if (current_timestamp >= tap[j].timeout_timestamp && tap[j].timeout_enable) - { - if (tap[j].state == 1 || tap[j].state == 2) - { - tap[j].state = 0; - update_key(tap_keys[j][2], PRESSED); - } - tap[j].timeout_enable = false; - } - } - - // ---------------------------------------------------------- - // Tap release - // ---------------------------------------------------------- - for (int j = 0; j < (sizeof(tap) / sizeof(tap[0])); j++) - { - if (current_timestamp >= tap[j].release_timestamp && tap[j].release_enable) - { - update_key(tap_keys[j][1], RELEASED); - tap[j].release_enable = false; - tap[j].state = 0; - } - } - - // ---------------------------------------------------------- - // Update LED indication - // ---------------------------------------------------------- - if (current_timestamp >= indicator_timestamp) - { - indicator_timestamp = current_timestamp + 50; - - strip.setPixelColor(0, 8, 15, 1); - strip.setPixelColor(1, 8, 15, 1); - - strip.show(); - } }