diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/combo/combo_repress/config.h | 10 | ||||
-rw-r--r-- | tests/combo/combo_repress/test.mk | 6 | ||||
-rw-r--r-- | tests/combo/combo_repress/test_combo.cpp | 158 | ||||
-rw-r--r-- | tests/combo/combo_repress/test_combos_repress.c | 43 | ||||
-rw-r--r-- | tests/test_common/keyboard_report_util.cpp | 2 | ||||
-rw-r--r-- | tests/test_common/keycode_table.cpp | 17 |
6 files changed, 231 insertions, 5 deletions
diff --git a/tests/combo/combo_repress/config.h b/tests/combo/combo_repress/config.h new file mode 100644 index 0000000000..61ba58177e --- /dev/null +++ b/tests/combo/combo_repress/config.h @@ -0,0 +1,10 @@ +// Copyright 2024 @Filios92 +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "test_common.h" + +#define TAPPING_TERM 200 + +#define COMBO_PROCESS_KEY_REPRESS diff --git a/tests/combo/combo_repress/test.mk b/tests/combo/combo_repress/test.mk new file mode 100644 index 0000000000..cc3f482f4b --- /dev/null +++ b/tests/combo/combo_repress/test.mk @@ -0,0 +1,6 @@ +# Copyright 2024 @Filios92 +# SPDX-License-Identifier: GPL-2.0-or-later + +COMBO_ENABLE = yes + +INTROSPECTION_KEYMAP_C = test_combos_repress.c diff --git a/tests/combo/combo_repress/test_combo.cpp b/tests/combo/combo_repress/test_combo.cpp new file mode 100644 index 0000000000..1488d5c1bd --- /dev/null +++ b/tests/combo/combo_repress/test_combo.cpp @@ -0,0 +1,158 @@ +// Copyright 2024 @Filios92 +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "keyboard_report_util.hpp" +#include "quantum.h" +#include "keycode.h" +#include "test_common.h" +#include "test_driver.hpp" +#include "test_fixture.hpp" +#include "test_keymap_key.hpp" + +using testing::_; +using testing::InSequence; + +class ComboRepress : public TestFixture {}; + +TEST_F(ComboRepress, combo_repress_tapped) { + TestDriver driver; + KeymapKey key_f(0, 0, 0, KC_F); + KeymapKey key_g(0, 0, 1, KC_G); + set_keymap({key_f, key_g}); + + EXPECT_REPORT(driver, (KC_LEFT_ALT)).Times(2); + EXPECT_REPORT(driver, (KC_TAB, KC_LEFT_ALT)); + EXPECT_EMPTY_REPORT(driver); + tap_combo({key_f, key_g}, 20); + VERIFY_AND_CLEAR(driver); +} + +TEST_F(ComboRepress, combo_repress_held_released_one_key_and_repressed) { + TestDriver driver; + KeymapKey key_f(0, 0, 0, KC_F); + KeymapKey key_g(0, 0, 1, KC_G); + KeymapKey key_h(0, 0, 2, KC_H); + KeymapKey key_j(0, 0, 3, KC_J); + set_keymap({key_f, key_g, key_h, key_j}); + + /* Press combo F+G */ + EXPECT_REPORT(driver, (KC_LEFT_ALT)).Times(2); + EXPECT_REPORT(driver, (KC_TAB, KC_LEFT_ALT)); + key_f.press(); + run_one_scan_loop(); + key_g.press(); + run_one_scan_loop(); + idle_for(COMBO_TERM + 1); + VERIFY_AND_CLEAR(driver); + + /* Release G */ + EXPECT_NO_REPORT(driver); + key_g.release(); + idle_for(80); + VERIFY_AND_CLEAR(driver); + + /* Tap G */ + EXPECT_REPORT(driver, (KC_TAB, KC_LEFT_ALT)); + EXPECT_REPORT(driver, (KC_LEFT_ALT)); + tap_key(key_g, TAPPING_TERM + 1); + VERIFY_AND_CLEAR(driver); + + /* Tap G, but hold for longer */ + EXPECT_REPORT(driver, (KC_TAB, KC_LEFT_ALT)); + EXPECT_REPORT(driver, (KC_LEFT_ALT)); + tap_key(key_g, TAPPING_TERM * 2); + VERIFY_AND_CLEAR(driver); + + idle_for(500); + + /* Tap other combo while holding F */ + EXPECT_REPORT(driver, (KC_ESCAPE, KC_LEFT_ALT)); + EXPECT_REPORT(driver, (KC_LEFT_ALT)); + tap_combo({key_h, key_j}, TAPPING_TERM + 1); + VERIFY_AND_CLEAR(driver); + + /* G press and hold */ + EXPECT_REPORT(driver, (KC_TAB, KC_LEFT_ALT)); + EXPECT_REPORT(driver, (KC_LEFT_ALT)); + key_g.press(); + run_one_scan_loop(); + VERIFY_AND_CLEAR(driver); + + /* F release and tap */ + EXPECT_REPORT(driver, (KC_LEFT_ALT, KC_LEFT_SHIFT)).Times(2); + EXPECT_REPORT(driver, (KC_TAB, KC_LEFT_ALT, KC_LEFT_SHIFT)); + EXPECT_REPORT(driver, (KC_LEFT_ALT)); + key_f.release(); + run_one_scan_loop(); + tap_key(key_f); + VERIFY_AND_CLEAR(driver); + + /* Release G */ + EXPECT_EMPTY_REPORT(driver); + key_g.release(); + run_one_scan_loop(); + VERIFY_AND_CLEAR(driver); +} + +TEST_F(ComboRepress, combo_repress_normal_combo) { + TestDriver driver; + KeymapKey key_f(0, 0, 0, KC_F); + KeymapKey key_g(0, 0, 1, KC_G); + KeymapKey key_h(0, 0, 2, KC_H); + KeymapKey key_j(0, 0, 3, KC_J); + set_keymap({key_f, key_g, key_h, key_j}); + + /* Press combo H+J */ + EXPECT_REPORT(driver, (KC_ESCAPE)); + key_h.press(); + run_one_scan_loop(); + key_j.press(); + run_one_scan_loop(); + idle_for(COMBO_TERM + 10); + VERIFY_AND_CLEAR(driver); + + /* Release H */ + EXPECT_NO_REPORT(driver); + key_h.release(); + idle_for(80); + VERIFY_AND_CLEAR(driver); + + /* Tap H */ + EXPECT_REPORT(driver, (KC_H, KC_ESCAPE)); + EXPECT_REPORT(driver, (KC_ESCAPE)); + tap_key(key_h); + VERIFY_AND_CLEAR(driver); + + /* Tap H, but hold for longer */ + EXPECT_REPORT(driver, (KC_H, KC_ESCAPE)); + EXPECT_REPORT(driver, (KC_ESCAPE)); + tap_key(key_h, TAPPING_TERM + 1); + VERIFY_AND_CLEAR(driver); + + idle_for(500); + + /* Tap other combo while holding K */ + EXPECT_REPORT(driver, (KC_ESCAPE, KC_LEFT_ALT)).Times(2); + EXPECT_REPORT(driver, (KC_ESCAPE, KC_TAB, KC_LEFT_ALT)); + EXPECT_REPORT(driver, (KC_ESCAPE)); + tap_combo({key_f, key_g}, TAPPING_TERM + 1); + VERIFY_AND_CLEAR(driver); + + /* H press and hold */ + EXPECT_REPORT(driver, (KC_H, KC_ESCAPE)); + key_h.press(); + run_one_scan_loop(); + VERIFY_AND_CLEAR(driver); + + /* J release and tap */ + EXPECT_REPORT(driver, (KC_H)); + key_j.release(); + run_one_scan_loop(); + VERIFY_AND_CLEAR(driver); + + /* Release G */ + EXPECT_EMPTY_REPORT(driver); + key_h.release(); + run_one_scan_loop(); + VERIFY_AND_CLEAR(driver); +} diff --git a/tests/combo/combo_repress/test_combos_repress.c b/tests/combo/combo_repress/test_combos_repress.c new file mode 100644 index 0000000000..73fa77b0aa --- /dev/null +++ b/tests/combo/combo_repress/test_combos_repress.c @@ -0,0 +1,43 @@ +// Copyright 2024 @Filios92 +// SPDX-License-Identifier: GPL-2.0-or-later +#include "quantum.h" + +enum combos { alttab, esc }; + +uint16_t const alttab_combo[] = {KC_F, KC_G, COMBO_END}; +uint16_t const esc_combo[] = {KC_H, KC_J, COMBO_END}; + +// clang-format off +combo_t key_combos[] = { + [alttab] = COMBO(alttab_combo, KC_NO), + [esc] = COMBO(esc_combo, KC_ESC) +}; +// clang-format on + +void process_combo_event(uint16_t combo_index, bool pressed) { + switch (combo_index) { + case alttab: + if (pressed) { + register_mods(MOD_LALT); + tap_code(KC_TAB); + } else { + unregister_mods(MOD_LALT); + } + break; + } +} + +bool process_combo_key_repress(uint16_t combo_index, combo_t *combo, uint8_t key_index, uint16_t keycode) { + switch (combo_index) { + case alttab: + switch (keycode) { + case KC_F: + tap_code16(S(KC_TAB)); + return true; + case KC_G: + tap_code(KC_TAB); + return true; + } + } + return false; +} diff --git a/tests/test_common/keyboard_report_util.cpp b/tests/test_common/keyboard_report_util.cpp index 5676483539..18e0574277 100644 --- a/tests/test_common/keyboard_report_util.cpp +++ b/tests/test_common/keyboard_report_util.cpp @@ -29,8 +29,6 @@ std::vector<uint8_t> get_keys(const report_keyboard_t& report) { std::vector<uint8_t> result; #if defined(NKRO_ENABLE) # error NKRO support not implemented yet -#elif defined(RING_BUFFERED_6KRO_REPORT_ENABLE) -# error 6KRO support not implemented yet #else for (size_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) { if (report.keys[i]) { diff --git a/tests/test_common/keycode_table.cpp b/tests/test_common/keycode_table.cpp index 4c28ab4d20..e4d445de82 100644 --- a/tests/test_common/keycode_table.cpp +++ b/tests/test_common/keycode_table.cpp @@ -562,6 +562,20 @@ std::map<uint16_t, std::string> KEYCODE_ID_TABLE = { {QK_MACRO_29, "QK_MACRO_29"}, {QK_MACRO_30, "QK_MACRO_30"}, {QK_MACRO_31, "QK_MACRO_31"}, + {QK_OUTPUT_NEXT, "QK_OUTPUT_NEXT"}, + {QK_OUTPUT_PREV, "QK_OUTPUT_PREV"}, + {QK_OUTPUT_NONE, "QK_OUTPUT_NONE"}, + {QK_OUTPUT_USB, "QK_OUTPUT_USB"}, + {QK_OUTPUT_2P4GHZ, "QK_OUTPUT_2P4GHZ"}, + {QK_OUTPUT_BLUETOOTH, "QK_OUTPUT_BLUETOOTH"}, + {QK_BLUETOOTH_PROFILE_NEXT, "QK_BLUETOOTH_PROFILE_NEXT"}, + {QK_BLUETOOTH_PROFILE_PREV, "QK_BLUETOOTH_PROFILE_PREV"}, + {QK_BLUETOOTH_UNPAIR, "QK_BLUETOOTH_UNPAIR"}, + {QK_BLUETOOTH_PROFILE1, "QK_BLUETOOTH_PROFILE1"}, + {QK_BLUETOOTH_PROFILE2, "QK_BLUETOOTH_PROFILE2"}, + {QK_BLUETOOTH_PROFILE3, "QK_BLUETOOTH_PROFILE3"}, + {QK_BLUETOOTH_PROFILE4, "QK_BLUETOOTH_PROFILE4"}, + {QK_BLUETOOTH_PROFILE5, "QK_BLUETOOTH_PROFILE5"}, {QK_BACKLIGHT_ON, "QK_BACKLIGHT_ON"}, {QK_BACKLIGHT_OFF, "QK_BACKLIGHT_OFF"}, {QK_BACKLIGHT_TOGGLE, "QK_BACKLIGHT_TOGGLE"}, @@ -632,9 +646,6 @@ std::map<uint16_t, std::string> KEYCODE_ID_TABLE = { {QK_SPACE_CADET_LEFT_ALT_PARENTHESIS_OPEN, "QK_SPACE_CADET_LEFT_ALT_PARENTHESIS_OPEN"}, {QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE, "QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE"}, {QK_SPACE_CADET_RIGHT_SHIFT_ENTER, "QK_SPACE_CADET_RIGHT_SHIFT_ENTER"}, - {QK_OUTPUT_AUTO, "QK_OUTPUT_AUTO"}, - {QK_OUTPUT_USB, "QK_OUTPUT_USB"}, - {QK_OUTPUT_BLUETOOTH, "QK_OUTPUT_BLUETOOTH"}, {QK_UNICODE_MODE_NEXT, "QK_UNICODE_MODE_NEXT"}, {QK_UNICODE_MODE_PREVIOUS, "QK_UNICODE_MODE_PREVIOUS"}, {QK_UNICODE_MODE_MACOS, "QK_UNICODE_MODE_MACOS"}, |