[Core] Add Chordal Hold, an "opposite hands rule" tap-hold option similar to Achordion, Bilateral Combinations. (#24560)
* Chordal Hold: restrict what chords settle as hold * Chordal Hold: docs and further improvements * Fix formatting. * Doc rewording and minor edit. * Support Chordal Hold of multiple tap-hold keys. * Fix formatting. * Simplification and additional test. * Fix formatting. * Tighten tests. * Add test two_mod_taps_same_hand_hold_til_timeout. * Revise handing of pairs of tap-hold keys. * Generate a default chordal_hold_layout. * Document chordal_hold_handedness(). * Add license notice to new and branched files in PR. * Add `tapping.chordal_hold` property for info.json. * Update docs/reference_info_json.md * Revise "hand" jsonschema. * Chordal Hold: Improved layout handedness heuristic. This commit improves the heuristic used in generate-keyboard-c for inferring key handedness from keyboard.json geometry data. Heuristic summary: 1. If the layout is symmetric (e.g. most split keyboards), guess the handedness based on the sign of (x - layout_x_midpoint). 2. Otherwise, if the layout has a key of >=6u width, it is probably the spacebar. Form a dividing line through the spacebar, nearly vertical but with a slight angle to follow typical row stagger. 3. Otherwise, assume handedness based on the widest horizontal separation. I have tested this strategy on a couple dozen keyboards and found it to work reliably. * Use Optional instead of `| None`. * Refactor to avoid lambdas. * Remove trailing comma in chordal_hold_layout. * Minor docs edits. * Revise to allow combining multiple same-hand mods. This commit revises Chordal Hold as described in discussion in https://github.com/qmk/qmk_firmware/pull/24560#discussion_r1894655238 1. In "RCTL_T(KC_A)↓, RSFT_T(KC_C)↓, RCTL_T(KC_A)↑" before the tapping term, RCTL_T(KC_A) is settled as tapped. 2. In "RCTL_T(KC_A)↓, RSFT_T(KC_C)↓, RSFT_T(KC_C)↑", both RCTL_T(KC_A) and RSFT_T(KC_C) are settled as tapped. 3. In "RCTL_T(KC_A)↓, RSFT_T(KC_C)↓, KC_U↓" (all keys on the same side), both RCTL_T(KC_A) and RSFT_T(KC_C) are settled as tapped. 4. In "RCTL_T(KC_A)↓, RSFT_T(KC_C)↓, LSFT_T(KC_T)↓", with the third key on the other side, we allow Permissive Hold or Hold On Other Keypress to decide how/when to settle the keys. 5. In "RCTL_T(KC_A)↓, RSFT_T(KC_C)↓" held until the tapping term, the keys are settled as held. 1–3 provide same-hand roll protection. 4–5 are for combining multiple same-hand modifiers. I've updated the unit tests and have been running it on my keyboard, for a few hours so far, and all seems good. I really like this scheme. It allows combining same-side mods, yet it also has roll protection on streaks. For me, this feels like Achordion, but clearly better streak handling and improved responsiveness. * Fix formatting. * Add a couple tests with LT keys. * Remove stale use of CHORDAL_HOLD_LAYOUT. * Fix misspelling lastest -> latest * Handling tweak for LTs and tests. * Fix formatting. * More tests with LT keys. * Fix formatting.
This commit is contained in:
		
							parent
							
								
									ee63d39058
								
							
						
					
					
						commit
						544ddde113
					
				| @ -200,6 +200,7 @@ | ||||
|     "SPLIT_WPM_ENABLE": {"info_key": "split.transport.sync.wpm", "value_type": "flag"}, | ||||
| 
 | ||||
|     // Tapping | ||||
|     "CHORDAL_HOLD": {"info_key": "tapping.chordal_hold", "value_type": "flag"}, | ||||
|     "HOLD_ON_OTHER_KEY_PRESS": {"info_key": "tapping.hold_on_other_key_press", "value_type": "flag"}, | ||||
|     "HOLD_ON_OTHER_KEY_PRESS_PER_KEY": {"info_key": "tapping.hold_on_other_key_press_per_key", "value_type": "flag"}, | ||||
|     "PERMISSIVE_HOLD": {"info_key": "tapping.permissive_hold", "value_type": "flag"}, | ||||
|  | ||||
| @ -422,7 +422,11 @@ | ||||
|                                 "h": {"$ref": "qmk.definitions.v1#/key_unit"}, | ||||
|                                 "w": {"$ref": "qmk.definitions.v1#/key_unit"}, | ||||
|                                 "x": {"$ref": "qmk.definitions.v1#/key_unit"}, | ||||
|                                 "y": {"$ref": "qmk.definitions.v1#/key_unit"} | ||||
|                                 "y": {"$ref": "qmk.definitions.v1#/key_unit"}, | ||||
|                                 "hand": { | ||||
|                                     "type": "string", | ||||
|                                     "enum": ["L", "R", "*"] | ||||
|                                 } | ||||
|                             } | ||||
|                         } | ||||
|                     } | ||||
| @ -915,6 +919,7 @@ | ||||
|         "tapping": { | ||||
|             "type": "object", | ||||
|             "properties": { | ||||
|                 "chordal_hold": {"type": "boolean"}, | ||||
|                 "force_hold": {"type": "boolean"}, | ||||
|                 "force_hold_per_key": {"type": "boolean"}, | ||||
|                 "ignore_mod_tap_interrupt": {"type": "boolean"}, | ||||
|  | ||||
| @ -74,6 +74,8 @@ You can create `info.json` files at every level under `qmk_firmware/keyboards/<k | ||||
|         * The delay between keydown and keyup for tap events in milliseconds. | ||||
|         * Default: `0` (no delay) | ||||
| * `tapping` | ||||
|     * `chordal_hold` <Badge type="info">Boolean</Badge> | ||||
|         * Default: `false` | ||||
|     * `hold_on_other_key_press` <Badge type="info">Boolean</Badge> | ||||
|         * Default: `false` | ||||
|     * `hold_on_other_key_press_per_key` <Badge type="info">Boolean</Badge> | ||||
| @ -328,6 +330,8 @@ The ISO enter key is represented by a 1.25u×2uh key. Renderers which utilize in | ||||
|                 * `h` <Badge type="info">KeyUnit</Badge> | ||||
|                     * The height of the key, in key units. | ||||
|                     * Default: `1` (1u) | ||||
|                 * `hand` <Badge type="info">String</Badge> | ||||
|                     * The handedness of the key for Chordal Hold, either `"L"` (left hand), `"R"` (right hand), or `"*"` (either or exempted handedness). | ||||
|                 * `label` <Badge type="info">String</Badge> | ||||
|                     * What to name the key. This is *not* a key assignment as in the keymap, but should usually correspond to the keycode for the first layer of the default keymap. | ||||
|                     * Example: `"Escape"` | ||||
|  | ||||
							
								
								
									
										163
									
								
								docs/tap_hold.md
									
									
									
									
									
								
							
							
						
						
									
										163
									
								
								docs/tap_hold.md
									
									
									
									
									
								
							| @ -425,6 +425,169 @@ uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { | ||||
| If `QUICK_TAP_TERM` is set higher than `TAPPING_TERM`, it will default to `TAPPING_TERM`. | ||||
| ::: | ||||
| 
 | ||||
| ## Chordal Hold | ||||
| 
 | ||||
| Chordal Hold is intended to be used together with either Permissive Hold or Hold | ||||
| On Other Key Press. Chordal Hold is enabled by adding to your `config.h`: | ||||
| 
 | ||||
| ```c | ||||
| #define CHORDAL_HOLD | ||||
| ``` | ||||
| 
 | ||||
| Chordal Hold implements, by default, an "opposite hands" rule. Suppose a | ||||
| tap-hold key is pressed and then, before the tapping term, another key is | ||||
| pressed. With Chordal Hold, the tap-hold key is settled as tapped if the two | ||||
| keys are on the same hand. | ||||
| 
 | ||||
| Otherwise, if the keys are on opposite hands, Chordal Hold introduces no new | ||||
| behavior. Hold On Other Key Press or Permissive Hold may be used together with | ||||
| Chordal Hold to configure the behavior in the opposite hands case. With Hold On | ||||
| Other Key Press, an opposite hands chord is settled immediately as held. Or with | ||||
| Permissive Hold, an opposite hands chord is settled as held provided the other | ||||
| key is pressed and released (nested press) before releasing the tap-hold key. | ||||
| 
 | ||||
| Chordal Hold may be useful to avoid accidental modifier activation with | ||||
| mod-taps, particularly in rolled keypresses when using home row mods. | ||||
| 
 | ||||
| Notes: | ||||
| 
 | ||||
| * Chordal Hold has no effect after the tapping term.  | ||||
| 
 | ||||
| * Combos are exempt from the opposite hands rule, since "handedness" is | ||||
|   ill-defined in this case. Even so, Chordal Hold's behavior involving combos | ||||
|   may be customized through the `get_chordal_hold()` callback. | ||||
| 
 | ||||
| An example of a sequence that is affected by “chordal hold”:  | ||||
| 
 | ||||
| - `SFT_T(KC_A)` Down | ||||
| - `KC_C` Down | ||||
| - `KC_C` Up | ||||
| - `SFT_T(KC_A)` Up | ||||
| 
 | ||||
| ``` | ||||
|                          TAPPING_TERM    | ||||
|   +---------------------------|--------+ | ||||
|   | +----------------------+  |        | | ||||
|   | | SFT_T(KC_A)          |  |        | | ||||
|   | +----------------------+  |        | | ||||
|   |    +--------------+       |        | | ||||
|   |    | KC_C         |       |        | | ||||
|   |    +--------------+       |        | | ||||
|   +---------------------------|--------+ | ||||
| ``` | ||||
| 
 | ||||
| If the two keys are on the same hand, then this will produce `ac` with | ||||
| `SFT_T(KC_A)` settled as tapped the moment that `KC_C` is pressed.  | ||||
| 
 | ||||
| If the two keys are on opposite hands and the `HOLD_ON_OTHER_KEY_PRESS` option | ||||
| enabled, this will produce `C` with `SFT_T(KC_A)` settled as held when `KC_C` is | ||||
| pressed. | ||||
| 
 | ||||
| Or if the two keys are on opposite hands and the `PERMISSIVE_HOLD` option is | ||||
| enabled, this will produce `C` with `SFT_T(KC_A)` settled as held when that | ||||
| `KC_C` is released. | ||||
| 
 | ||||
| ### Chordal Hold Handedness | ||||
| 
 | ||||
| Determining whether keys are on the same or opposite hands involves defining the | ||||
| "handedness" of each key position. By default, if nothing is specified, | ||||
| handedness is guessed based on keyboard geometry. | ||||
| 
 | ||||
| Handedness may be specified with `chordal_hold_layout`. In keymap.c, define | ||||
| `chordal_hold_layout` in the following form: | ||||
| 
 | ||||
| ```c | ||||
| const char chordal_hold_layout[MATRIX_ROWS][MATRIX_COLS] PROGMEM = | ||||
|     LAYOUT( | ||||
|         'L', 'L', 'L', 'L', 'L', 'L',  'R', 'R', 'R', 'R', 'R', 'R',  | ||||
|         'L', 'L', 'L', 'L', 'L', 'L',  'R', 'R', 'R', 'R', 'R', 'R',  | ||||
|         'L', 'L', 'L', 'L', 'L', 'L',  'R', 'R', 'R', 'R', 'R', 'R',  | ||||
|                        'L', 'L', 'L',  'R', 'R', 'R' | ||||
|     ); | ||||
| ``` | ||||
| 
 | ||||
| Use the same `LAYOUT` macro as used to define your keymap layers. Each entry is | ||||
| a character indicating the handedness of one key, either `'L'` for left, `'R'` | ||||
| for right, or `'*'` to exempt keys from the "opposite hands rule." A key with | ||||
| `'*'` handedness may settle as held in chords with any other key. This could be | ||||
| used perhaps on thumb keys or other places where you want to allow same-hand | ||||
| chords. | ||||
| 
 | ||||
| Keyboard makers may specify handedness in keyboard.json. Under `"layouts"`, | ||||
| specify the handedness of a key by adding a `"hand"` field with a value of | ||||
| either `"L"`, `"R"`, or `"*"`. Note that if `"layouts"` contains multiple | ||||
| layouts, only the first one is read. For example: | ||||
| 
 | ||||
| ```json | ||||
| {"matrix": [5, 6], "x": 0, "y": 5.5, "w": 1.25, "hand", "*"}, | ||||
| ``` | ||||
| 
 | ||||
| Alternatively, handedness may be defined functionally with | ||||
| `chordal_hold_handedness()`. For example, in keymap.c define: | ||||
| 
 | ||||
| ```c | ||||
| char chordal_hold_handedness(keypos_t key) { | ||||
|     if (key.col == 0 || key.col == MATRIX_COLS - 1) { | ||||
|         return '*';  // Exempt the outer columns. | ||||
|     } | ||||
|     // On split keyboards, typically, the first half of the rows are on the | ||||
|     // left, and the other half are on the right. | ||||
|     return key.row < MATRIX_ROWS / 2 ? 'L' : 'R'; | ||||
| } | ||||
| ``` | ||||
| 
 | ||||
| Given the matrix position of a key, the function should return `'L'`, `'R'`, or | ||||
| `'*'`. Adapt the logic in this function according to the keyboard's matrix. | ||||
| 
 | ||||
| ::: warning | ||||
| Note the matrix may have irregularities around larger keys, around the edges of | ||||
| the board, and around thumb clusters. You may find it helpful to use [this | ||||
| debugging example](faq_debug#which-matrix-position-is-this-keypress) to | ||||
| correspond physical keys to matrix positions. | ||||
| ::: | ||||
| 
 | ||||
| ::: tip If you define both `chordal_hold_layout[MATRIX_ROWS][MATRIX_COLS]` and | ||||
| `chordal_hold_handedness(keypos_t key)` for handedness, the latter takes | ||||
| precedence. | ||||
| ::: | ||||
| 
 | ||||
| 
 | ||||
| ### Per-chord customization | ||||
| 
 | ||||
| Beyond the per-key configuration possible through handedness, Chordal Hold may | ||||
| be configured at a *per-chord* granularity for detailed tuning. In keymap.c, | ||||
| define `get_chordal_hold()`. Returning `true` allows the chord to be held, while | ||||
| returning `false` settles as tapped. | ||||
| 
 | ||||
| For example: | ||||
| 
 | ||||
| ```c | ||||
| bool get_chordal_hold(uint16_t tap_hold_keycode, keyrecord_t* tap_hold_record, | ||||
|                       uint16_t other_keycode, keyrecord_t* other_record) { | ||||
|     // Exceptionally allow some one-handed chords for hotkeys. | ||||
|     switch (tap_hold_keycode) { | ||||
|         case LCTL_T(KC_Z): | ||||
|             if (other_keycode == KC_C || other_keycode == KC_V) { | ||||
|                 return true; | ||||
|             } | ||||
|             break; | ||||
| 
 | ||||
|         case RCTL_T(KC_SLSH): | ||||
|             if (other_keycode == KC_N) { | ||||
|                 return true; | ||||
|             } | ||||
|             break; | ||||
|     } | ||||
|     // Otherwise defer to the opposite hands rule. | ||||
|     return get_chordal_hold_default(tap_hold_record, other_record); | ||||
| } | ||||
| ``` | ||||
| 
 | ||||
| As shown in the last line above, you may use | ||||
| `get_chordal_hold_default(tap_hold_record, other_record)` to get the default tap | ||||
| vs. hold decision according to the opposite hands rule. | ||||
| 
 | ||||
| 
 | ||||
| ## Retro Tapping | ||||
| 
 | ||||
| To enable `retro tapping`, add the following to your `config.h`: | ||||
|  | ||||
| @ -1,5 +1,9 @@ | ||||
| """Used by the make system to generate keyboard.c from info.json. | ||||
| """ | ||||
| import bisect | ||||
| import dataclasses | ||||
| from typing import Optional | ||||
| 
 | ||||
| from milc import cli | ||||
| 
 | ||||
| from qmk.info import info_json | ||||
| @ -87,6 +91,7 @@ def _gen_matrix_mask(info_data): | ||||
|         lines.append(f'    0b{"".join(reversed(mask[i]))},') | ||||
|     lines.append('};') | ||||
|     lines.append('#endif') | ||||
|     lines.append('') | ||||
| 
 | ||||
|     return lines | ||||
| 
 | ||||
| @ -122,6 +127,128 @@ def _gen_joystick_axes(info_data): | ||||
| 
 | ||||
|     lines.append('};') | ||||
|     lines.append('#endif') | ||||
|     lines.append('') | ||||
| 
 | ||||
|     return lines | ||||
| 
 | ||||
| 
 | ||||
| @dataclasses.dataclass | ||||
| class LayoutKey: | ||||
|     """Geometric info for one key in a layout.""" | ||||
|     row: int | ||||
|     col: int | ||||
|     x: float | ||||
|     y: float | ||||
|     w: float = 1.0 | ||||
|     h: float = 1.0 | ||||
|     hand: Optional[str] = None | ||||
| 
 | ||||
|     @staticmethod | ||||
|     def from_json(key_json): | ||||
|         row, col = key_json['matrix'] | ||||
|         return LayoutKey( | ||||
|             row=row, | ||||
|             col=col, | ||||
|             x=key_json['x'], | ||||
|             y=key_json['y'], | ||||
|             w=key_json.get('w', 1.0), | ||||
|             h=key_json.get('h', 1.0), | ||||
|             hand=key_json.get('hand', None), | ||||
|         ) | ||||
| 
 | ||||
|     @property | ||||
|     def cx(self): | ||||
|         """Center x coordinate of the key.""" | ||||
|         return self.x + self.w / 2.0 | ||||
| 
 | ||||
|     @property | ||||
|     def cy(self): | ||||
|         """Center y coordinate of the key.""" | ||||
|         return self.y + self.h / 2.0 | ||||
| 
 | ||||
| 
 | ||||
| class Layout: | ||||
|     """Geometric info of a layout.""" | ||||
|     def __init__(self, layout_json): | ||||
|         self.keys = [LayoutKey.from_json(key_json) for key_json in layout_json['layout']] | ||||
|         self.x_min = min(key.cx for key in self.keys) | ||||
|         self.x_max = max(key.cx for key in self.keys) | ||||
|         self.x_mid = (self.x_min + self.x_max) / 2 | ||||
|         # If there is one key with width >= 6u, it is probably the spacebar. | ||||
|         i = [i for i, key in enumerate(self.keys) if key.w >= 6.0] | ||||
|         self.spacebar = self.keys[i[0]] if len(i) == 1 else None | ||||
| 
 | ||||
|     def is_symmetric(self, tol: float = 0.02): | ||||
|         """Whether the key positions are symmetric about x_mid.""" | ||||
|         x = sorted([key.cx for key in self.keys]) | ||||
|         for i in range(len(x)): | ||||
|             x_i_mirrored = 2.0 * self.x_mid - x[i] | ||||
|             # Find leftmost x element greater than or equal to (x_i_mirrored - tol). | ||||
|             j = bisect.bisect_left(x, x_i_mirrored - tol) | ||||
|             if j == len(x) or abs(x[j] - x_i_mirrored) > tol: | ||||
|                 return False | ||||
| 
 | ||||
|         return True | ||||
| 
 | ||||
|     def widest_horizontal_gap(self): | ||||
|         """Finds the x midpoint of the widest horizontal gap between keys.""" | ||||
|         x = sorted([key.cx for key in self.keys]) | ||||
|         x_mid = self.x_mid | ||||
|         max_sep = 0 | ||||
|         for i in range(len(x) - 1): | ||||
|             sep = x[i + 1] - x[i] | ||||
|             if sep > max_sep: | ||||
|                 max_sep = sep | ||||
|                 x_mid = (x[i + 1] + x[i]) / 2 | ||||
| 
 | ||||
|         return x_mid | ||||
| 
 | ||||
| 
 | ||||
| def _gen_chordal_hold_layout(info_data): | ||||
|     """Convert info.json content to chordal_hold_layout | ||||
|     """ | ||||
|     # NOTE: If there are multiple layouts, only the first is read. | ||||
|     for layout_name, layout_json in info_data['layouts'].items(): | ||||
|         layout = Layout(layout_json) | ||||
|         break | ||||
| 
 | ||||
|     if layout.is_symmetric(): | ||||
|         # If the layout is symmetric (e.g. most split keyboards), guess the | ||||
|         # handedness based on the sign of (x - layout.x_mid). | ||||
|         hand_signs = [key.x - layout.x_mid for key in layout.keys] | ||||
|     elif layout.spacebar is not None: | ||||
|         # If the layout has a spacebar, form a dividing line through the spacebar, | ||||
|         # nearly vertical but with a slight angle to follow typical row stagger. | ||||
|         x0 = layout.spacebar.cx - 0.05 | ||||
|         y0 = layout.spacebar.cy - 1.0 | ||||
|         hand_signs = [(key.x - x0) - (key.y - y0) / 3.0 for key in layout.keys] | ||||
|     else: | ||||
|         # Fallback: assume handedness based on the widest horizontal separation. | ||||
|         x_mid = layout.widest_horizontal_gap() | ||||
|         hand_signs = [key.x - x_mid for key in layout.keys] | ||||
| 
 | ||||
|     for key, hand_sign in zip(layout.keys, hand_signs): | ||||
|         if key.hand is None: | ||||
|             if key == layout.spacebar or abs(hand_sign) <= 0.02: | ||||
|                 key.hand = '*' | ||||
|             else: | ||||
|                 key.hand = 'L' if hand_sign < 0.0 else 'R' | ||||
| 
 | ||||
|     lines = [] | ||||
|     lines.append('#ifdef CHORDAL_HOLD') | ||||
|     line = ('__attribute__((weak)) const char chordal_hold_layout[MATRIX_ROWS][MATRIX_COLS] PROGMEM = ' + layout_name + '(') | ||||
| 
 | ||||
|     x_prev = None | ||||
|     for key in layout.keys: | ||||
|         if x_prev is None or key.x < x_prev: | ||||
|             lines.append(line) | ||||
|             line = '  ' | ||||
|         line += f"'{key.hand}', " | ||||
|         x_prev = key.x | ||||
| 
 | ||||
|     lines.append(line[:-2]) | ||||
|     lines.append(');') | ||||
|     lines.append('#endif') | ||||
| 
 | ||||
|     return lines | ||||
| 
 | ||||
| @ -136,11 +263,12 @@ def generate_keyboard_c(cli): | ||||
|     kb_info_json = info_json(cli.args.keyboard) | ||||
| 
 | ||||
|     # Build the layouts.h file. | ||||
|     keyboard_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#include QMK_KEYBOARD_H', ''] | ||||
|     keyboard_c_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#include QMK_KEYBOARD_H', ''] | ||||
| 
 | ||||
|     keyboard_h_lines.extend(_gen_led_configs(kb_info_json)) | ||||
|     keyboard_h_lines.extend(_gen_matrix_mask(kb_info_json)) | ||||
|     keyboard_h_lines.extend(_gen_joystick_axes(kb_info_json)) | ||||
|     keyboard_c_lines.extend(_gen_led_configs(kb_info_json)) | ||||
|     keyboard_c_lines.extend(_gen_matrix_mask(kb_info_json)) | ||||
|     keyboard_c_lines.extend(_gen_joystick_axes(kb_info_json)) | ||||
|     keyboard_c_lines.extend(_gen_chordal_hold_layout(kb_info_json)) | ||||
| 
 | ||||
|     # Show the results | ||||
|     dump_lines(cli.args.output, keyboard_h_lines, cli.args.quiet) | ||||
|     dump_lines(cli.args.output, keyboard_c_lines, cli.args.quiet) | ||||
|  | ||||
| @ -49,6 +49,45 @@ __attribute__((weak)) bool get_permissive_hold(uint16_t keycode, keyrecord_t *re | ||||
| } | ||||
| #    endif | ||||
| 
 | ||||
| #    if defined(CHORDAL_HOLD) | ||||
| extern const char chordal_hold_layout[MATRIX_ROWS][MATRIX_COLS] PROGMEM; | ||||
| 
 | ||||
| #        define REGISTERED_TAPS_SIZE 8 | ||||
| // Array of tap-hold keys that have been settled as tapped but not yet released.
 | ||||
| static keypos_t registered_taps[REGISTERED_TAPS_SIZE] = {}; | ||||
| static uint8_t  num_registered_taps                   = 0; | ||||
| 
 | ||||
| /** Adds `key` to the registered_taps array. */ | ||||
| static void registered_taps_add(keypos_t key); | ||||
| /** Returns the index of `key` in registered_taps, or -1 if not found. */ | ||||
| static int8_t registered_tap_find(keypos_t key); | ||||
| /** Removes index `i` from the registered_taps array. */ | ||||
| static void registered_taps_del_index(uint8_t i); | ||||
| /** Logs the registered_taps array for debugging. */ | ||||
| static void debug_registered_taps(void); | ||||
| 
 | ||||
| /** \brief Finds which queued events should be held according to Chordal Hold.
 | ||||
|  * | ||||
|  * In a situation with multiple unsettled tap-hold key presses, scan the queue | ||||
|  * up until the first release, non-tap-hold, or one-shot event and find the | ||||
|  * latest event in the queue that settles as held according to | ||||
|  * get_chordal_hold(). | ||||
|  * | ||||
|  * \return Index of the first tap, or equivalently, one past the latest hold. | ||||
|  */ | ||||
| static uint8_t waiting_buffer_find_chordal_hold_tap(void); | ||||
| 
 | ||||
| /** Processes queued events up to and including `key` as tapped. */ | ||||
| static void waiting_buffer_chordal_hold_taps_until(keypos_t key); | ||||
| 
 | ||||
| /** \brief Processes and pops buffered events until the first tap-hold event. */ | ||||
| static void waiting_buffer_process_regular(void); | ||||
| 
 | ||||
| static bool is_mt_or_lt(uint16_t keycode) { | ||||
|     return IS_QK_MOD_TAP(keycode) || IS_QK_LAYER_TAP(keycode); | ||||
| } | ||||
| #    endif // CHORDAL_HOLD
 | ||||
| 
 | ||||
| #    ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY | ||||
| __attribute__((weak)) bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { | ||||
|     return false; | ||||
| @ -166,6 +205,20 @@ void action_tapping_process(keyrecord_t record) { | ||||
| bool process_tapping(keyrecord_t *keyp) { | ||||
|     const keyevent_t event = keyp->event; | ||||
| 
 | ||||
| #    if defined(CHORDAL_HOLD) | ||||
|     if (!event.pressed) { | ||||
|         const int8_t i = registered_tap_find(event.key); | ||||
|         if (i != -1) { | ||||
|             // If a tap-hold key was previously settled as tapped, set its
 | ||||
|             // tap.count correspondingly on release.
 | ||||
|             keyp->tap.count = 1; | ||||
|             registered_taps_del_index(i); | ||||
|             ac_dprintf("Found tap release for [%d]\n", i); | ||||
|             debug_registered_taps(); | ||||
|         } | ||||
|     } | ||||
| #    endif // CHORDAL_HOLD
 | ||||
| 
 | ||||
|     // state machine is in the "reset" state, no tapping key is to be
 | ||||
|     // processed
 | ||||
|     if (IS_NOEVENT(tapping_key.event)) { | ||||
| @ -188,7 +241,7 @@ bool process_tapping(keyrecord_t *keyp) { | ||||
|         return true; | ||||
|     } | ||||
| 
 | ||||
| #    if (defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT)) || defined(PERMISSIVE_HOLD_PER_KEY) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY) | ||||
| #    if (defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT)) || defined(PERMISSIVE_HOLD_PER_KEY) || defined(CHORDAL_HOLD) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY) | ||||
|     TAP_DEFINE_KEYCODE; | ||||
| #    endif | ||||
| 
 | ||||
| @ -199,6 +252,7 @@ bool process_tapping(keyrecord_t *keyp) { | ||||
|                 // early return for tick events
 | ||||
|                 return true; | ||||
|             } | ||||
| 
 | ||||
|             if (tapping_key.tap.count == 0) { | ||||
|                 if (IS_TAPPING_RECORD(keyp) && !event.pressed) { | ||||
|                     // first tap!
 | ||||
| @ -212,6 +266,25 @@ bool process_tapping(keyrecord_t *keyp) { | ||||
|                     // enqueue
 | ||||
|                     return false; | ||||
|                 } | ||||
| #    if defined(CHORDAL_HOLD) | ||||
|                 else if (is_mt_or_lt(tapping_keycode) && !event.pressed && waiting_buffer_typed(event) && !get_chordal_hold(tapping_keycode, &tapping_key, get_record_keycode(keyp, false), keyp)) { | ||||
|                     // Key release that is not a chord with the tapping key.
 | ||||
|                     // Settle the tapping key and any other pending tap-hold
 | ||||
|                     // keys preceding the press of this key as tapped.
 | ||||
| 
 | ||||
|                     ac_dprintf("Tapping: End. Chord considered a tap\n"); | ||||
|                     tapping_key.tap.count = 1; | ||||
|                     registered_taps_add(tapping_key.event.key); | ||||
|                     process_record(&tapping_key); | ||||
|                     tapping_key = (keyrecord_t){0}; | ||||
| 
 | ||||
|                     waiting_buffer_chordal_hold_taps_until(event.key); | ||||
|                     debug_registered_taps(); | ||||
|                     debug_waiting_buffer(); | ||||
|                     // enqueue
 | ||||
|                     return false; | ||||
|                 } | ||||
| #    endif      // CHORDAL_HOLD
 | ||||
|                 /* Process a key typed within TAPPING_TERM
 | ||||
|                  * This can register the key before settlement of tapping, | ||||
|                  * useful for long TAPPING_TERM but may prevent fast typing. | ||||
| @ -229,6 +302,22 @@ bool process_tapping(keyrecord_t *keyp) { | ||||
|                     // clang-format on
 | ||||
|                     ac_dprintf("Tapping: End. No tap. Interfered by typing key\n"); | ||||
|                     process_record(&tapping_key); | ||||
| 
 | ||||
| #    if defined(CHORDAL_HOLD) | ||||
|                     uint8_t first_tap = waiting_buffer_find_chordal_hold_tap(); | ||||
|                     ac_dprintf("first_tap = %u\n", first_tap); | ||||
|                     if (first_tap < WAITING_BUFFER_SIZE) { | ||||
|                         for (; waiting_buffer_tail != first_tap; waiting_buffer_tail = (waiting_buffer_tail + 1) % WAITING_BUFFER_SIZE) { | ||||
|                             ac_dprintf("Processing [%u]\n", waiting_buffer_tail); | ||||
|                             process_record(&waiting_buffer[waiting_buffer_tail]); | ||||
|                         } | ||||
|                     } | ||||
| 
 | ||||
|                     waiting_buffer_chordal_hold_taps_until(event.key); | ||||
|                     debug_registered_taps(); | ||||
|                     debug_waiting_buffer(); | ||||
| #    endif // CHORDAL_HOLD
 | ||||
| 
 | ||||
|                     tapping_key = (keyrecord_t){0}; | ||||
|                     debug_tapping_key(); | ||||
|                     // enqueue
 | ||||
| @ -237,6 +326,19 @@ bool process_tapping(keyrecord_t *keyp) { | ||||
|                 /* Process release event of a key pressed before tapping starts
 | ||||
|                  * Without this unexpected repeating will occur with having fast repeating setting | ||||
|                  * https://github.com/tmk/tmk_keyboard/issues/60
 | ||||
|                  * | ||||
|                  * NOTE: This workaround causes events to process out of order, | ||||
|                  * e.g. in a rolled press of three tap-hold keys like | ||||
|                  * | ||||
|                  *   "A down, B down, C down, A up, B up, C up" | ||||
|                  * | ||||
|                  * events are processed as | ||||
|                  * | ||||
|                  *   "A down, B down, A up, B up, C down, C up" | ||||
|                  * | ||||
|                  * It seems incorrect to process keyp before the tapping key. | ||||
|                  * This workaround is old, from 2013. This might no longer | ||||
|                  * be needed for the original problem it was meant to address. | ||||
|                  */ | ||||
|                 else if (!event.pressed && !waiting_buffer_typed(event)) { | ||||
|                     // Modifier/Layer should be retained till end of this tapping.
 | ||||
| @ -271,19 +373,52 @@ bool process_tapping(keyrecord_t *keyp) { | ||||
|                     // set interrupted flag when other key pressed during tapping
 | ||||
|                     if (event.pressed) { | ||||
|                         tapping_key.tap.interrupted = true; | ||||
|                         if (TAP_GET_HOLD_ON_OTHER_KEY_PRESS | ||||
| 
 | ||||
| #    if defined(CHORDAL_HOLD) | ||||
|                         if (is_mt_or_lt(tapping_keycode) && !get_chordal_hold(tapping_keycode, &tapping_key, get_record_keycode(keyp, false), keyp)) { | ||||
|                             // In process_action(), HOLD_ON_OTHER_KEY_PRESS
 | ||||
|                             // will revert interrupted events to holds, so
 | ||||
|                             // this needs to be set false.
 | ||||
|                             tapping_key.tap.interrupted = false; | ||||
| 
 | ||||
|                             if (!is_tap_record(keyp)) { | ||||
|                                 ac_dprintf("Tapping: End. Chord considered a tap\n"); | ||||
|                                 tapping_key.tap.count = 1; | ||||
|                                 registered_taps_add(tapping_key.event.key); | ||||
|                                 debug_registered_taps(); | ||||
|                                 process_record(&tapping_key); | ||||
|                                 tapping_key = (keyrecord_t){0}; | ||||
|                             } | ||||
|                         } else | ||||
| #    endif // CHORDAL_HOLD
 | ||||
|                             if (TAP_GET_HOLD_ON_OTHER_KEY_PRESS | ||||
| #    if defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT) | ||||
|                             // Auto Shift cannot evaluate this early
 | ||||
|                             // Retro Shift uses the hold action for all nested taps even without HOLD_ON_OTHER_KEY_PRESS, so this is fine to skip
 | ||||
|                             && !(MAYBE_RETRO_SHIFTING(event, keyp) && get_auto_shifted_key(get_record_keycode(keyp, false), keyp)) | ||||
|                                 // Auto Shift cannot evaluate this early
 | ||||
|                                 // Retro Shift uses the hold action for all nested taps even without HOLD_ON_OTHER_KEY_PRESS, so this is fine to skip
 | ||||
|                                 && !(MAYBE_RETRO_SHIFTING(event, keyp) && get_auto_shifted_key(get_record_keycode(keyp, false), keyp)) | ||||
| #    endif | ||||
|                         ) { | ||||
|                             ) { | ||||
|                             // Settle the tapping key as *held*, since
 | ||||
|                             // HOLD_ON_OTHER_KEY_PRESS is enabled for this key.
 | ||||
|                             ac_dprintf("Tapping: End. No tap. Interfered by pressed key\n"); | ||||
|                             process_record(&tapping_key); | ||||
|                             tapping_key = (keyrecord_t){0}; | ||||
| 
 | ||||
| #    if defined(CHORDAL_HOLD) | ||||
|                             if (waiting_buffer_tail != waiting_buffer_head && is_tap_record(&waiting_buffer[waiting_buffer_tail])) { | ||||
|                                 tapping_key = waiting_buffer[waiting_buffer_tail]; | ||||
|                                 // Pop tail from the queue.
 | ||||
|                                 waiting_buffer_tail = (waiting_buffer_tail + 1) % WAITING_BUFFER_SIZE; | ||||
|                                 debug_waiting_buffer(); | ||||
|                             } else | ||||
| #    endif // CHORDAL_HOLD
 | ||||
|                             { | ||||
|                                 tapping_key = (keyrecord_t){0}; | ||||
|                             } | ||||
|                             debug_tapping_key(); | ||||
|                             // enqueue
 | ||||
|                             return false; | ||||
| 
 | ||||
| #    if defined(CHORDAL_HOLD) | ||||
|                             waiting_buffer_process_regular(); | ||||
| #    endif // CHORDAL_HOLD
 | ||||
|                         } | ||||
|                     } | ||||
|                     // enqueue
 | ||||
| @ -520,26 +655,125 @@ void waiting_buffer_scan_tap(void) { | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| /** \brief Tapping key debug print
 | ||||
|  * | ||||
|  * FIXME: Needs docs | ||||
|  */ | ||||
| #    ifdef CHORDAL_HOLD | ||||
| __attribute__((weak)) bool get_chordal_hold(uint16_t tap_hold_keycode, keyrecord_t *tap_hold_record, uint16_t other_keycode, keyrecord_t *other_record) { | ||||
|     return get_chordal_hold_default(tap_hold_record, other_record); | ||||
| } | ||||
| 
 | ||||
| bool get_chordal_hold_default(keyrecord_t *tap_hold_record, keyrecord_t *other_record) { | ||||
|     if (tap_hold_record->event.type != KEY_EVENT || other_record->event.type != KEY_EVENT) { | ||||
|         return true; // Return true on combos or other non-key events.
 | ||||
|     } | ||||
| 
 | ||||
|     char tap_hold_hand = chordal_hold_handedness(tap_hold_record->event.key); | ||||
|     if (tap_hold_hand == '*') { | ||||
|         return true; | ||||
|     } | ||||
|     char other_hand = chordal_hold_handedness(other_record->event.key); | ||||
|     return other_hand == '*' || tap_hold_hand != other_hand; | ||||
| } | ||||
| 
 | ||||
| __attribute__((weak)) char chordal_hold_handedness(keypos_t key) { | ||||
|     return (char)pgm_read_byte(&chordal_hold_layout[key.row][key.col]); | ||||
| } | ||||
| 
 | ||||
| static void registered_taps_add(keypos_t key) { | ||||
|     if (num_registered_taps >= REGISTERED_TAPS_SIZE) { | ||||
|         ac_dprintf("TAPS OVERFLOW: CLEAR ALL STATES\n"); | ||||
|         clear_keyboard(); | ||||
|         num_registered_taps = 0; | ||||
|     } | ||||
| 
 | ||||
|     registered_taps[num_registered_taps] = key; | ||||
|     ++num_registered_taps; | ||||
| } | ||||
| 
 | ||||
| static int8_t registered_tap_find(keypos_t key) { | ||||
|     for (int8_t i = 0; i < num_registered_taps; ++i) { | ||||
|         if (KEYEQ(registered_taps[i], key)) { | ||||
|             return i; | ||||
|         } | ||||
|     } | ||||
|     return -1; | ||||
| } | ||||
| 
 | ||||
| static void registered_taps_del_index(uint8_t i) { | ||||
|     if (i < num_registered_taps) { | ||||
|         --num_registered_taps; | ||||
|         if (i < num_registered_taps) { | ||||
|             registered_taps[i] = registered_taps[num_registered_taps]; | ||||
|         } | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| static void debug_registered_taps(void) { | ||||
|     ac_dprintf("registered_taps = { "); | ||||
|     for (int8_t i = 0; i < num_registered_taps; ++i) { | ||||
|         ac_dprintf("%02X%02X ", registered_taps[i].row, registered_taps[i].col); | ||||
|     } | ||||
|     ac_dprintf("}\n"); | ||||
| } | ||||
| 
 | ||||
| static uint8_t waiting_buffer_find_chordal_hold_tap(void) { | ||||
|     keyrecord_t *prev         = &tapping_key; | ||||
|     uint16_t     prev_keycode = get_record_keycode(&tapping_key, false); | ||||
|     uint8_t      first_tap    = WAITING_BUFFER_SIZE; | ||||
|     for (uint8_t i = waiting_buffer_tail; i != waiting_buffer_head; i = (i + 1) % WAITING_BUFFER_SIZE) { | ||||
|         keyrecord_t *  cur         = &waiting_buffer[i]; | ||||
|         const uint16_t cur_keycode = get_record_keycode(cur, false); | ||||
|         if (!cur->event.pressed || !is_mt_or_lt(prev_keycode)) { | ||||
|             break; | ||||
|         } else if (get_chordal_hold(prev_keycode, prev, cur_keycode, cur)) { | ||||
|             first_tap = i; // Track one index past the latest hold.
 | ||||
|         } | ||||
|         prev         = cur; | ||||
|         prev_keycode = cur_keycode; | ||||
|     } | ||||
|     return first_tap; | ||||
| } | ||||
| 
 | ||||
| static void waiting_buffer_chordal_hold_taps_until(keypos_t key) { | ||||
|     while (waiting_buffer_tail != waiting_buffer_head) { | ||||
|         keyrecord_t *record = &waiting_buffer[waiting_buffer_tail]; | ||||
|         ac_dprintf("waiting_buffer_chordal_hold_taps_until: processing [%u]\n", waiting_buffer_tail); | ||||
|         if (is_tap_record(record)) { | ||||
|             record->tap.count = 1; | ||||
|             registered_taps_add(record->event.key); | ||||
|         } | ||||
|         process_record(record); | ||||
|         waiting_buffer_tail = (waiting_buffer_tail + 1) % WAITING_BUFFER_SIZE; | ||||
| 
 | ||||
|         if (KEYEQ(key, record->event.key) && record->event.pressed) { | ||||
|             break; | ||||
|         } | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| static void waiting_buffer_process_regular(void) { | ||||
|     for (; waiting_buffer_tail != waiting_buffer_head; waiting_buffer_tail = (waiting_buffer_tail + 1) % WAITING_BUFFER_SIZE) { | ||||
|         if (is_tap_record(&waiting_buffer[waiting_buffer_tail])) { | ||||
|             break; // Stop once a tap-hold key event is reached.
 | ||||
|         } | ||||
|         ac_dprintf("waiting_buffer_process_regular: processing [%u]\n", waiting_buffer_tail); | ||||
|         process_record(&waiting_buffer[waiting_buffer_tail]); | ||||
|     } | ||||
|     debug_waiting_buffer(); | ||||
| } | ||||
| #    endif // CHORDAL_HOLD
 | ||||
| 
 | ||||
| /** \brief Logs tapping key if ACTION_DEBUG is enabled. */ | ||||
| static void debug_tapping_key(void) { | ||||
|     ac_dprintf("TAPPING_KEY="); | ||||
|     debug_record(tapping_key); | ||||
|     ac_dprintf("\n"); | ||||
| } | ||||
| 
 | ||||
| /** \brief Waiting buffer debug print
 | ||||
|  * | ||||
|  * FIXME: Needs docs | ||||
|  */ | ||||
| /** \brief Logs waiting buffer if ACTION_DEBUG is enabled. */ | ||||
| static void debug_waiting_buffer(void) { | ||||
|     ac_dprintf("{ "); | ||||
|     ac_dprintf("{"); | ||||
|     for (uint8_t i = waiting_buffer_tail; i != waiting_buffer_head; i = (i + 1) % WAITING_BUFFER_SIZE) { | ||||
|         ac_dprintf("[%u]=", i); | ||||
|         ac_dprintf(" [%u]=", i); | ||||
|         debug_record(waiting_buffer[i]); | ||||
|         ac_dprintf(" "); | ||||
|     } | ||||
|     ac_dprintf("}\n"); | ||||
| } | ||||
|  | ||||
| @ -46,6 +46,71 @@ bool     get_permissive_hold(uint16_t keycode, keyrecord_t *record); | ||||
| bool     get_retro_tapping(uint16_t keycode, keyrecord_t *record); | ||||
| bool     get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record); | ||||
| 
 | ||||
| #ifdef CHORDAL_HOLD | ||||
| /**
 | ||||
|  * Callback to say when a key chord before the tapping term may be held. | ||||
|  * | ||||
|  * In keymap.c, define the callback | ||||
|  * | ||||
|  *     bool get_chordal_hold(uint16_t tap_hold_keycode, | ||||
|  *                           keyrecord_t* tap_hold_record, | ||||
|  *                           uint16_t other_keycode, | ||||
|  *                           keyrecord_t* other_record) { | ||||
|  *        // Conditions...
 | ||||
|  *     } | ||||
|  * | ||||
|  * This callback is called when: | ||||
|  * | ||||
|  * 1. `tap_hold_keycode` is pressed. | ||||
|  * 2. `other_keycode` is pressed while `tap_hold_keycode` is still held, | ||||
|  *     provided `other_keycode` is *not* also a tap-hold key and it is pressed | ||||
|  *     before the tapping term. | ||||
|  * | ||||
|  * If false is returned, this has the effect of immediately settling the | ||||
|  * tap-hold key as tapped. If true is returned, the tap-hold key is still | ||||
|  * unsettled, and may be settled as held depending on configuration and | ||||
|  * subsequent events. | ||||
|  * | ||||
|  * @param tap_hold_keycode   Keycode of the tap-hold key. | ||||
|  * @param tap_hold_record    Record from the tap-hold press event. | ||||
|  * @param other_keycode      Keycode of the other key. | ||||
|  * @param other_record       Record from the other key's press event. | ||||
|  * @return True if the tap-hold key may be considered held; false if tapped. | ||||
|  */ | ||||
| bool get_chordal_hold(uint16_t tap_hold_keycode, keyrecord_t *tap_hold_record, uint16_t other_keycode, keyrecord_t *other_record); | ||||
| 
 | ||||
| /**
 | ||||
|  * Default "opposite hands rule" for whether a key chord may settle as held. | ||||
|  * | ||||
|  * This function returns true when the tap-hold key and other key are on | ||||
|  * "opposite hands." In detail, handedness of the two keys are compared. If | ||||
|  * handedness values differ, or if either handedness is '*', the function | ||||
|  * returns true, indicating that it may be held. Otherwise, it returns false, | ||||
|  * in which case the tap-hold key is immediately settled at tapped. | ||||
|  * | ||||
|  * @param tap_hold_record  Record of the active tap-hold key press. | ||||
|  * @param other_record     Record of the other, interrupting key press. | ||||
|  * @return True if the tap-hold key may be considered held; false if tapped. | ||||
|  */ | ||||
| bool get_chordal_hold_default(keyrecord_t *tap_hold_record, keyrecord_t *other_record); | ||||
| 
 | ||||
| /**
 | ||||
|  * Gets the handedness of a key. | ||||
|  * | ||||
|  * This function returns: | ||||
|  *   'L' for keys pressed by the left hand, | ||||
|  *   'R' for keys on the right hand, | ||||
|  *   '*' for keys exempt from the "opposite hands rule." This could be used | ||||
|  *       perhaps on thumb keys or keys that might be pressed by either hand. | ||||
|  * | ||||
|  * @param key   A key matrix position. | ||||
|  * @return Handedness value. | ||||
|  */ | ||||
| char chordal_hold_handedness(keypos_t key); | ||||
| 
 | ||||
| extern const char chordal_hold_layout[MATRIX_ROWS][MATRIX_COLS] PROGMEM; | ||||
| #endif | ||||
| 
 | ||||
| #ifdef DYNAMIC_TAPPING_TERM_ENABLE | ||||
| extern uint16_t g_tapping_term; | ||||
| #endif | ||||
|  | ||||
							
								
								
									
										21
									
								
								tests/tap_hold_configurations/chordal_hold/default/config.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								tests/tap_hold_configurations/chordal_hold/default/config.h
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,21 @@ | ||||
| /* Copyright 2022 Vladislav Kucheriavykh
 | ||||
|  * Copyright 2024 Google LLC | ||||
|  * | ||||
|  * This program is free software: you can redistribute it and/or modify | ||||
|  * it under the terms of the GNU General Public License as published by | ||||
|  * the Free Software Foundation, either version 2 of the License, or | ||||
|  * (at your option) any later version. | ||||
|  * | ||||
|  * This program is distributed in the hope that it will be useful, | ||||
|  * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
|  * GNU General Public License for more details. | ||||
|  * | ||||
|  * You should have received a copy of the GNU General Public License | ||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
|  */ | ||||
| 
 | ||||
| #pragma once | ||||
| 
 | ||||
| #include "test_common.h" | ||||
| #define CHORDAL_HOLD | ||||
							
								
								
									
										17
									
								
								tests/tap_hold_configurations/chordal_hold/default/test.mk
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								tests/tap_hold_configurations/chordal_hold/default/test.mk
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,17 @@ | ||||
| # Copyright 2022 Vladislav Kucheriavykh
 | ||||
| # Copyright 2024 Google LLC
 | ||||
| #
 | ||||
| # This program is free software: you can redistribute it and/or modify
 | ||||
| # it under the terms of the GNU General Public License as published by
 | ||||
| # the Free Software Foundation, either version 2 of the License, or
 | ||||
| # (at your option) any later version.
 | ||||
| #
 | ||||
| # This program is distributed in the hope that it will be useful,
 | ||||
| # but WITHOUT ANY WARRANTY; without even the implied warranty of
 | ||||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | ||||
| # GNU General Public License for more details.
 | ||||
| #
 | ||||
| # You should have received a copy of the GNU General Public License
 | ||||
| # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
| 
 | ||||
| INTROSPECTION_KEYMAP_C = test_keymap.c | ||||
| @ -0,0 +1,22 @@ | ||||
| // Copyright 2024 Google LLC
 | ||||
| //
 | ||||
| // Licensed under the Apache License, Version 2.0 (the "License");
 | ||||
| // you may not use this file except in compliance with the License.
 | ||||
| // You may obtain a copy of the License at
 | ||||
| //
 | ||||
| //     https://www.apache.org/licenses/LICENSE-2.0
 | ||||
| //
 | ||||
| // Unless required by applicable law or agreed to in writing, software
 | ||||
| // distributed under the License is distributed on an "AS IS" BASIS,
 | ||||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | ||||
| // See the License for the specific language governing permissions and
 | ||||
| // limitations under the License.
 | ||||
| 
 | ||||
| #include "quantum.h" | ||||
| 
 | ||||
| const char chordal_hold_layout[MATRIX_ROWS][MATRIX_COLS] PROGMEM = { | ||||
|     {'L', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R'}, | ||||
|     {'L', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R'}, | ||||
|     {'*', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R'}, | ||||
|     {'L', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R'}, | ||||
| }; | ||||
| @ -0,0 +1,168 @@ | ||||
| /* Copyright 2021 Stefan Kerkmann
 | ||||
|  * Copyright 2024 Google LLC | ||||
|  * | ||||
|  * This program is free software: you can redistribute it and/or modify | ||||
|  * it under the terms of the GNU General Public License as published by | ||||
|  * the Free Software Foundation, either version 2 of the License, or | ||||
|  * (at your option) any later version. | ||||
|  * | ||||
|  * This program is distributed in the hope that it will be useful, | ||||
|  * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
|  * GNU General Public License for more details. | ||||
|  * | ||||
|  * You should have received a copy of the GNU General Public License | ||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
|  */ | ||||
| 
 | ||||
| #include "action_util.h" | ||||
| #include "keyboard_report_util.hpp" | ||||
| #include "test_common.hpp" | ||||
| 
 | ||||
| using testing::_; | ||||
| using testing::InSequence; | ||||
| 
 | ||||
| class OneShot : public TestFixture {}; | ||||
| class OneShotParametrizedTestFixture : public ::testing::WithParamInterface<std::pair<KeymapKey, KeymapKey>>, public OneShot {}; | ||||
| 
 | ||||
| TEST_P(OneShotParametrizedTestFixture, OSMWithAdditionalKeypress) { | ||||
|     TestDriver driver; | ||||
|     KeymapKey  osm_key     = GetParam().first; | ||||
|     KeymapKey  regular_key = GetParam().second; | ||||
| 
 | ||||
|     set_keymap({osm_key, regular_key}); | ||||
| 
 | ||||
|     // Press and release OSM.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     tap_key(osm_key); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press regular key.
 | ||||
|     EXPECT_REPORT(driver, (osm_key.report_code, regular_key.report_code)); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release regular key.
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_P(OneShotParametrizedTestFixture, OSMAsRegularModifierWithAdditionalKeypress) { | ||||
|     TestDriver driver; | ||||
|     KeymapKey  osm_key     = GetParam().first; | ||||
|     KeymapKey  regular_key = GetParam().second; | ||||
| 
 | ||||
|     set_keymap({osm_key, regular_key}); | ||||
| 
 | ||||
|     // Press OSM.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     osm_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     // Press regular key.
 | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     // Release regular key.
 | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release OSM.
 | ||||
|     EXPECT_REPORT(driver, (regular_key.report_code, osm_key.report_code)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     osm_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| // clang-format off
 | ||||
| 
 | ||||
| INSTANTIATE_TEST_CASE_P( | ||||
|     OneShotModifierTests, | ||||
|     OneShotParametrizedTestFixture, | ||||
|     ::testing::Values( | ||||
|         // First is osm key, second is regular key.
 | ||||
|         std::make_pair(KeymapKey{0, 0, 0, OSM(MOD_LSFT), KC_LSFT}, KeymapKey{0, 1, 1, KC_A}), | ||||
|         std::make_pair(KeymapKey{0, 0, 0, OSM(MOD_LCTL), KC_LCTL}, KeymapKey{0, 1, 1, KC_A}), | ||||
|         std::make_pair(KeymapKey{0, 0, 0, OSM(MOD_LALT), KC_LALT}, KeymapKey{0, 1, 1, KC_A}), | ||||
|         std::make_pair(KeymapKey{0, 0, 0, OSM(MOD_LGUI), KC_LGUI}, KeymapKey{0, 1, 1, KC_A}), | ||||
|         std::make_pair(KeymapKey{0, 0, 0, OSM(MOD_RCTL), KC_RCTL}, KeymapKey{0, 1, 1, KC_A}), | ||||
|         std::make_pair(KeymapKey{0, 0, 0, OSM(MOD_RSFT), KC_RSFT}, KeymapKey{0, 1, 1, KC_A}), | ||||
|         std::make_pair(KeymapKey{0, 0, 0, OSM(MOD_RALT), KC_RALT}, KeymapKey{0, 1, 1, KC_A}), | ||||
|         std::make_pair(KeymapKey{0, 0, 0, OSM(MOD_RGUI), KC_RGUI}, KeymapKey{0, 1, 1, KC_A}) | ||||
|         )); | ||||
| // clang-format on
 | ||||
| 
 | ||||
| TEST_F(OneShot, OSLWithAdditionalKeypress) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     KeymapKey  osl_key      = KeymapKey{0, 0, 0, OSL(1)}; | ||||
|     KeymapKey  osl_key1     = KeymapKey{1, 0, 0, KC_X}; | ||||
|     KeymapKey  regular_key0 = KeymapKey{0, 1, 0, KC_Y}; | ||||
|     KeymapKey  regular_key1 = KeymapKey{1, 1, 0, KC_A}; | ||||
| 
 | ||||
|     set_keymap({osl_key, osl_key1, regular_key0, regular_key1}); | ||||
| 
 | ||||
|     // Press OSL key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     osl_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release OSL key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     osl_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press regular key.
 | ||||
|     EXPECT_REPORT(driver, (regular_key1.report_code)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     regular_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release regular key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     regular_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(OneShot, OSLWithOsmAndAdditionalKeypress) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     KeymapKey  osl_key     = KeymapKey{0, 0, 0, OSL(1)}; | ||||
|     KeymapKey  osm_key     = KeymapKey{1, 1, 0, OSM(MOD_LSFT), KC_LSFT}; | ||||
|     KeymapKey  regular_key = KeymapKey{1, 1, 1, KC_A}; | ||||
|     KeymapKey  blank_key   = KeymapKey{1, 0, 0, KC_NO}; | ||||
| 
 | ||||
|     set_keymap({osl_key, osm_key, regular_key, blank_key}); | ||||
| 
 | ||||
|     // Press OSL key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     osl_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release OSL key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     osl_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     EXPECT_TRUE(layer_state_is(1)); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press and release OSM.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     tap_key(osm_key); | ||||
|     EXPECT_TRUE(layer_state_is(1)); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Tap regular key.
 | ||||
|     EXPECT_REPORT(driver, (osm_key.report_code, regular_key.report_code)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     tap_key(regular_key); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| @ -0,0 +1,264 @@ | ||||
| // Copyright 2024 Google LLC
 | ||||
| //
 | ||||
| // Licensed under the Apache License, Version 2.0 (the "License");
 | ||||
| // you may not use this file except in compliance with the License.
 | ||||
| // You may obtain a copy of the License at
 | ||||
| //
 | ||||
| //     https://www.apache.org/licenses/LICENSE-2.0
 | ||||
| //
 | ||||
| // Unless required by applicable law or agreed to in writing, software
 | ||||
| // distributed under the License is distributed on an "AS IS" BASIS,
 | ||||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | ||||
| // See the License for the specific language governing permissions and
 | ||||
| // limitations under the License.
 | ||||
| 
 | ||||
| #include "keyboard_report_util.hpp" | ||||
| #include "keycode.h" | ||||
| #include "test_common.hpp" | ||||
| #include "action_tapping.h" | ||||
| #include "test_fixture.hpp" | ||||
| #include "test_keymap_key.hpp" | ||||
| 
 | ||||
| using testing::_; | ||||
| using testing::InSequence; | ||||
| 
 | ||||
| class ChordalHoldDefault : public TestFixture {}; | ||||
| 
 | ||||
| TEST_F(ChordalHoldDefault, chord_nested_press_settled_as_tap) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     // Mod-tap key on the left hand.
 | ||||
|     auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); | ||||
|     // Regular key on the right hand.
 | ||||
|     auto regular_key = KeymapKey(0, MATRIX_COLS - 1, 0, KC_A); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key, regular_key}); | ||||
| 
 | ||||
|     // Press mod-tap key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     // Tap regular key.
 | ||||
|     tap_key(regular_key); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release mod-tap key.
 | ||||
|     EXPECT_REPORT(driver, (KC_P)); | ||||
|     EXPECT_REPORT(driver, (KC_P, KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_P)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldDefault, chord_rolled_press_settled_as_tap) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     // Mod-tap key on the left hand.
 | ||||
|     auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); | ||||
|     // Regular key on the right hand.
 | ||||
|     auto regular_key = KeymapKey(0, MATRIX_COLS - 1, 0, KC_A); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key, regular_key}); | ||||
| 
 | ||||
|     // Press mod-tap key and regular key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release mod-tap key.
 | ||||
|     EXPECT_REPORT(driver, (KC_P)); | ||||
|     EXPECT_REPORT(driver, (KC_P, KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     mod_tap_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release regular key.
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldDefault, non_chord_with_mod_tap_settled_as_tap) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     // Mod-tap key and regular key both on the left hand.
 | ||||
|     auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); | ||||
|     auto regular_key = KeymapKey(0, 2, 0, KC_A); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key, regular_key}); | ||||
| 
 | ||||
|     // Press mod-tap-hold key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press regular key.
 | ||||
|     EXPECT_REPORT(driver, (KC_P)); | ||||
|     EXPECT_REPORT(driver, (KC_P, KC_A)); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release regular key.
 | ||||
|     EXPECT_REPORT(driver, (KC_P)); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release mod-tap-hold key.
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldDefault, tap_mod_tap_key) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key}); | ||||
| 
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key.press(); | ||||
|     idle_for(TAPPING_TERM - 1); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_REPORT(driver, (KC_P)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldDefault, hold_mod_tap_key) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key}); | ||||
| 
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     mod_tap_key.press(); | ||||
|     idle_for(TAPPING_TERM + 1); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldDefault, two_mod_taps_same_hand_hold_til_timeout) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key1 = KeymapKey(0, MATRIX_COLS - 2, 0, RCTL_T(KC_A)); | ||||
|     auto       mod_tap_key2 = KeymapKey(0, MATRIX_COLS - 1, 0, RSFT_T(KC_B)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key1, mod_tap_key2}); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Continue holding til the tapping term.
 | ||||
|     EXPECT_REPORT(driver, (KC_RIGHT_CTRL)); | ||||
|     EXPECT_REPORT(driver, (KC_RIGHT_CTRL, KC_RIGHT_SHIFT)); | ||||
|     idle_for(TAPPING_TERM); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release mod-tap keys.
 | ||||
|     EXPECT_REPORT(driver, (KC_RIGHT_SHIFT)); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldDefault, three_mod_taps_same_hand_streak_roll) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key1 = KeymapKey(0, 1, 0, SFT_T(KC_A)); | ||||
|     auto       mod_tap_key2 = KeymapKey(0, 2, 0, CTL_T(KC_B)); | ||||
|     auto       mod_tap_key3 = KeymapKey(0, 3, 0, RSFT_T(KC_C)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key1, mod_tap_key2, mod_tap_key3}); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release keys 1, 2, 3.
 | ||||
|     //
 | ||||
|     // NOTE: The correct order of events should be
 | ||||
|     // EXPECT_REPORT(driver, (KC_A, KC_B, KC_C));
 | ||||
|     // EXPECT_REPORT(driver, (KC_B, KC_C));
 | ||||
|     // EXPECT_REPORT(driver, (KC_C));
 | ||||
|     // EXPECT_EMPTY_REPORT(driver);
 | ||||
|     //
 | ||||
|     // However, due to a workaround for https://github.com/tmk/tmk_keyboard/issues/60,
 | ||||
|     // the events are processed out of order, with the first two keys released
 | ||||
|     // before pressing KC_C.
 | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_B)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     EXPECT_REPORT(driver, (KC_C)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldDefault, tap_regular_key_while_layer_tap_key_is_held) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       layer_tap_hold_key = KeymapKey(0, 1, 0, LT(1, KC_P)); | ||||
|     auto       regular_key        = KeymapKey(0, MATRIX_COLS - 1, 0, KC_A); | ||||
|     auto       layer_key          = KeymapKey(1, MATRIX_COLS - 1, 0, KC_B); | ||||
| 
 | ||||
|     set_keymap({layer_tap_hold_key, regular_key, layer_key}); | ||||
| 
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     layer_tap_hold_key.press(); // Press layer-tap-hold key.
 | ||||
|     run_one_scan_loop(); | ||||
|     regular_key.press(); // Press regular key.
 | ||||
|     run_one_scan_loop(); | ||||
|     regular_key.release(); // Release regular key.
 | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_REPORT(driver, (KC_P)); | ||||
|     EXPECT_REPORT(driver, (KC_P, KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_P)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     layer_tap_hold_key.release(); // Release layer-tap-hold key.
 | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| @ -0,0 +1,22 @@ | ||||
| /* Copyright 2022 Vladislav Kucheriavykh
 | ||||
|  * Copyright 2024 Google LLC | ||||
|  * | ||||
|  * This program is free software: you can redistribute it and/or modify | ||||
|  * it under the terms of the GNU General Public License as published by | ||||
|  * the Free Software Foundation, either version 2 of the License, or | ||||
|  * (at your option) any later version. | ||||
|  * | ||||
|  * This program is distributed in the hope that it will be useful, | ||||
|  * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
|  * GNU General Public License for more details. | ||||
|  * | ||||
|  * You should have received a copy of the GNU General Public License | ||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
|  */ | ||||
| 
 | ||||
| #pragma once | ||||
| 
 | ||||
| #include "test_common.h" | ||||
| #define CHORDAL_HOLD | ||||
| #define HOLD_ON_OTHER_KEY_PRESS | ||||
| @ -0,0 +1,17 @@ | ||||
| # Copyright 2022 Vladislav Kucheriavykh
 | ||||
| # Copyright 2024 Google LLC
 | ||||
| #
 | ||||
| # This program is free software: you can redistribute it and/or modify
 | ||||
| # it under the terms of the GNU General Public License as published by
 | ||||
| # the Free Software Foundation, either version 2 of the License, or
 | ||||
| # (at your option) any later version.
 | ||||
| #
 | ||||
| # This program is distributed in the hope that it will be useful,
 | ||||
| # but WITHOUT ANY WARRANTY; without even the implied warranty of
 | ||||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | ||||
| # GNU General Public License for more details.
 | ||||
| #
 | ||||
| # You should have received a copy of the GNU General Public License
 | ||||
| # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
| 
 | ||||
| INTROSPECTION_KEYMAP_C = test_keymap.c | ||||
| @ -0,0 +1,22 @@ | ||||
| // Copyright 2024 Google LLC
 | ||||
| //
 | ||||
| // Licensed under the Apache License, Version 2.0 (the "License");
 | ||||
| // you may not use this file except in compliance with the License.
 | ||||
| // You may obtain a copy of the License at
 | ||||
| //
 | ||||
| //     https://www.apache.org/licenses/LICENSE-2.0
 | ||||
| //
 | ||||
| // Unless required by applicable law or agreed to in writing, software
 | ||||
| // distributed under the License is distributed on an "AS IS" BASIS,
 | ||||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | ||||
| // See the License for the specific language governing permissions and
 | ||||
| // limitations under the License.
 | ||||
| 
 | ||||
| #include "quantum.h" | ||||
| 
 | ||||
| const char chordal_hold_layout[MATRIX_ROWS][MATRIX_COLS] PROGMEM = { | ||||
|     {'L', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R'}, | ||||
|     {'L', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R'}, | ||||
|     {'*', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R'}, | ||||
|     {'L', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R'}, | ||||
| }; | ||||
| @ -0,0 +1,807 @@ | ||||
| // Copyright 2024-2025 Google LLC
 | ||||
| //
 | ||||
| // Licensed under the Apache License, Version 2.0 (the "License");
 | ||||
| // you may not use this file except in compliance with the License.
 | ||||
| // You may obtain a copy of the License at
 | ||||
| //
 | ||||
| //     https://www.apache.org/licenses/LICENSE-2.0
 | ||||
| //
 | ||||
| // Unless required by applicable law or agreed to in writing, software
 | ||||
| // distributed under the License is distributed on an "AS IS" BASIS,
 | ||||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | ||||
| // See the License for the specific language governing permissions and
 | ||||
| // limitations under the License.
 | ||||
| 
 | ||||
| #include "keyboard_report_util.hpp" | ||||
| #include "keycode.h" | ||||
| #include "test_common.hpp" | ||||
| #include "action_tapping.h" | ||||
| #include "test_fixture.hpp" | ||||
| #include "test_keymap_key.hpp" | ||||
| 
 | ||||
| using testing::_; | ||||
| using testing::InSequence; | ||||
| 
 | ||||
| class ChordalHoldHoldOnOtherKeyPress : public TestFixture {}; | ||||
| 
 | ||||
| TEST_F(ChordalHoldHoldOnOtherKeyPress, chord_with_mod_tap_settled_as_hold) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     // Mod-tap key on the left hand.
 | ||||
|     auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); | ||||
|     // Regular key on the right hand.
 | ||||
|     auto regular_key = KeymapKey(0, MATRIX_COLS - 1, 0, KC_A); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key, regular_key}); | ||||
| 
 | ||||
|     // Press mod-tap-hold key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press regular key.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_A)); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release regular key.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release mod-tap-hold key.
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldHoldOnOtherKeyPress, chord_nested_press_settled_as_hold) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     // Mod-tap key on the left hand.
 | ||||
|     auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); | ||||
|     // Regular key on the right hand.
 | ||||
|     auto regular_key = KeymapKey(0, MATRIX_COLS - 1, 0, KC_A); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key, regular_key}); | ||||
| 
 | ||||
|     // Press mod-tap-hold key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Tap regular key.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     tap_key(regular_key); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release mod-tap-hold key.
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldHoldOnOtherKeyPress, chord_rolled_press_settled_as_hold) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     // Mod-tap key on the left hand.
 | ||||
|     auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); | ||||
|     // Regular key on the right hand.
 | ||||
|     auto regular_key = KeymapKey(0, MATRIX_COLS - 1, 0, KC_A); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key, regular_key}); | ||||
| 
 | ||||
|     // Press mod-tap key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press regular key.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_A)); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release mod-tap key.
 | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     mod_tap_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release regular key.
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldHoldOnOtherKeyPress, non_chord_with_mod_tap_settled_as_tap) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     // Mod-tap key and regular key both on the left hand.
 | ||||
|     auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); | ||||
|     auto regular_key = KeymapKey(0, 2, 0, KC_A); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key, regular_key}); | ||||
| 
 | ||||
|     // Press mod-tap-hold key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press regular key.
 | ||||
|     EXPECT_REPORT(driver, (KC_P)); | ||||
|     EXPECT_REPORT(driver, (KC_P, KC_A)); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release regular key.
 | ||||
|     EXPECT_REPORT(driver, (KC_P)); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release mod-tap-hold key.
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldHoldOnOtherKeyPress, tap_mod_tap_key) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key}); | ||||
| 
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key.press(); | ||||
|     idle_for(TAPPING_TERM - 1); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_REPORT(driver, (KC_P)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldHoldOnOtherKeyPress, hold_mod_tap_key) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key}); | ||||
| 
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     mod_tap_key.press(); | ||||
|     idle_for(TAPPING_TERM + 1); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldHoldOnOtherKeyPress, two_mod_taps_same_hand_hold_til_timeout) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key1 = KeymapKey(0, MATRIX_COLS - 2, 0, RCTL_T(KC_A)); | ||||
|     auto       mod_tap_key2 = KeymapKey(0, MATRIX_COLS - 1, 0, RSFT_T(KC_B)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key1, mod_tap_key2}); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Continue holding til the tapping term.
 | ||||
|     EXPECT_REPORT(driver, (KC_RIGHT_CTRL)); | ||||
|     EXPECT_REPORT(driver, (KC_RIGHT_CTRL, KC_RIGHT_SHIFT)); | ||||
|     idle_for(TAPPING_TERM); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release mod-tap keys.
 | ||||
|     EXPECT_REPORT(driver, (KC_RIGHT_SHIFT)); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldHoldOnOtherKeyPress, two_mod_taps_nested_press_opposite_hands) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key1 = KeymapKey(0, 1, 0, SFT_T(KC_A)); | ||||
|     auto       mod_tap_key2 = KeymapKey(0, MATRIX_COLS - 1, 0, RSFT_T(KC_B)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key1, mod_tap_key2}); | ||||
| 
 | ||||
|     // Press first mod-tap key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press second mod-tap key.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release second mod-tap key.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release first mod-tap key.
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldHoldOnOtherKeyPress, two_mod_taps_nested_press_same_hand) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key1 = KeymapKey(0, 1, 0, SFT_T(KC_A)); | ||||
|     auto       mod_tap_key2 = KeymapKey(0, 2, 0, RSFT_T(KC_B)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key1, mod_tap_key2}); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release mod-tap keys.
 | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldHoldOnOtherKeyPress, three_mod_taps_same_hand_streak_roll) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key1 = KeymapKey(0, 1, 0, SFT_T(KC_A)); | ||||
|     auto       mod_tap_key2 = KeymapKey(0, 2, 0, CTL_T(KC_B)); | ||||
|     auto       mod_tap_key3 = KeymapKey(0, 3, 0, RSFT_T(KC_C)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key1, mod_tap_key2, mod_tap_key3}); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release keys 1, 2, 3.
 | ||||
|     //
 | ||||
|     // NOTE: The correct order of events should be
 | ||||
|     // EXPECT_REPORT(driver, (KC_A));
 | ||||
|     // EXPECT_REPORT(driver, (KC_A, KC_B));
 | ||||
|     // EXPECT_REPORT(driver, (KC_A, KC_B, KC_C));
 | ||||
|     // EXPECT_REPORT(driver, (KC_B, KC_C));
 | ||||
|     // EXPECT_REPORT(driver, (KC_C));
 | ||||
|     // EXPECT_EMPTY_REPORT(driver);
 | ||||
|     //
 | ||||
|     // However, due to a workaround for https://github.com/tmk/tmk_keyboard/issues/60,
 | ||||
|     // the events are processed out of order, with the first two keys released
 | ||||
|     // before pressing KC_C.
 | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_B)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     EXPECT_REPORT(driver, (KC_C)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldHoldOnOtherKeyPress, three_mod_taps_same_hand_streak_orders) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key1 = KeymapKey(0, 1, 0, SFT_T(KC_A)); | ||||
|     auto       mod_tap_key2 = KeymapKey(0, 2, 0, CTL_T(KC_B)); | ||||
|     auto       mod_tap_key3 = KeymapKey(0, 3, 0, RSFT_T(KC_C)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key1, mod_tap_key2, mod_tap_key3}); | ||||
| 
 | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_B, KC_C)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     // Press mod-tap keys.
 | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.press(); | ||||
|     run_one_scan_loop(); | ||||
|     // Release keys 3, 2, 1.
 | ||||
|     mod_tap_key3.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_B, KC_C)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_B)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     idle_for(TAPPING_TERM); | ||||
|     // Press mod-tap keys.
 | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.press(); | ||||
|     run_one_scan_loop(); | ||||
|     // Release keys 3, 1, 2.
 | ||||
|     mod_tap_key3.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // NOTE: The correct order of events should be
 | ||||
|     // EXPECT_REPORT(driver, (KC_A));
 | ||||
|     // EXPECT_REPORT(driver, (KC_A, KC_B));
 | ||||
|     // EXPECT_REPORT(driver, (KC_A, KC_B, KC_C));
 | ||||
|     // EXPECT_REPORT(driver, (KC_A, KC_C));
 | ||||
|     // EXPECT_REPORT(driver, (KC_A));
 | ||||
|     // EXPECT_EMPTY_REPORT(driver);
 | ||||
|     //
 | ||||
|     // However, due to a workaround for https://github.com/tmk/tmk_keyboard/issues/60,
 | ||||
|     // the events are processed out of order, with the first two keys released
 | ||||
|     // before pressing KC_C.
 | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_C)); | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     idle_for(TAPPING_TERM); | ||||
|     // Press mod-tap keys.
 | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.press(); | ||||
|     run_one_scan_loop(); | ||||
|     // Release keys 2, 3, 1.
 | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldHoldOnOtherKeyPress, three_mod_taps_two_left_one_right) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key1 = KeymapKey(0, 1, 0, SFT_T(KC_A)); | ||||
|     auto       mod_tap_key2 = KeymapKey(0, 2, 0, CTL_T(KC_B)); | ||||
|     auto       mod_tap_key3 = KeymapKey(0, MATRIX_COLS - 1, 0, RSFT_T(KC_C)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key1, mod_tap_key2, mod_tap_key3}); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_LEFT_CTRL)); | ||||
|     mod_tap_key3.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release key 3.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_LEFT_CTRL, KC_C)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_LEFT_CTRL)); | ||||
|     mod_tap_key3.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release key 2, then key 1.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_LEFT_CTRL)); | ||||
|     mod_tap_key3.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release key 3.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_LEFT_CTRL, KC_C)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_LEFT_CTRL)); | ||||
|     mod_tap_key3.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release key 1, then key 2.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_CTRL)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldHoldOnOtherKeyPress, three_mod_taps_one_held_two_tapped) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key1 = KeymapKey(0, 1, 0, SFT_T(KC_A)); | ||||
|     auto       mod_tap_key2 = KeymapKey(0, MATRIX_COLS - 2, 0, CTL_T(KC_B)); | ||||
|     auto       mod_tap_key3 = KeymapKey(0, MATRIX_COLS - 1, 0, RSFT_T(KC_C)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key1, mod_tap_key2, mod_tap_key3}); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release keys 3, 2, 1.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_B, KC_C)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key3.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     idle_for(TAPPING_TERM); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
| 
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release keys 3, 1, 2.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_B, KC_C)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_B)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key3.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldHoldOnOtherKeyPress, tap_regular_key_while_layer_tap_key_is_held) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       layer_tap_hold_key = KeymapKey(0, 1, 0, LT(1, KC_P)); | ||||
|     auto       regular_key        = KeymapKey(0, MATRIX_COLS - 1, 0, KC_A); | ||||
|     auto       no_key             = KeymapKey(1, 1, 0, XXXXXXX); | ||||
|     auto       layer_key          = KeymapKey(1, MATRIX_COLS - 1, 0, KC_B); | ||||
| 
 | ||||
|     set_keymap({layer_tap_hold_key, regular_key, no_key, layer_key}); | ||||
| 
 | ||||
|     // Press layer-tap-hold key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     layer_tap_hold_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press regular key.
 | ||||
|     EXPECT_REPORT(driver, (KC_B)); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     EXPECT_EQ(layer_state, 2); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release regular key.
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     EXPECT_EQ(layer_state, 2); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release layer-tap-hold key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     layer_tap_hold_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     EXPECT_EQ(layer_state, 0); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldHoldOnOtherKeyPress, long_distinct_taps_of_layer_tap_key_and_regular_key) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       layer_tap_hold_key = KeymapKey(0, 1, 0, LT(1, KC_P)); | ||||
|     auto       regular_key        = KeymapKey(0, MATRIX_COLS - 1, 0, KC_A); | ||||
|     auto       layer_key          = KeymapKey(0, MATRIX_COLS - 1, 0, KC_B); | ||||
| 
 | ||||
|     set_keymap({layer_tap_hold_key, regular_key}); | ||||
| 
 | ||||
|     // Press layer-tap-hold key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     layer_tap_hold_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Idle for tapping term of layer tap hold key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     idle_for(TAPPING_TERM + 1); | ||||
|     EXPECT_EQ(layer_state, 2); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release layer-tap-hold key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     layer_tap_hold_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     EXPECT_EQ(layer_state, 0); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press regular key.
 | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release regular key.
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldHoldOnOtherKeyPress, nested_tap_of_layer_0_layer_tap_keys) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     // The keys are layer-taps on layer 0 but regular keys on layer 1.
 | ||||
|     auto first_layer_tap_key  = KeymapKey(0, 1, 0, LT(1, KC_A)); | ||||
|     auto second_layer_tap_key = KeymapKey(0, MATRIX_COLS - 1, 0, LT(1, KC_P)); | ||||
|     auto first_key_on_layer   = KeymapKey(1, 1, 0, KC_B); | ||||
|     auto second_key_on_layer  = KeymapKey(1, MATRIX_COLS - 1, 0, KC_Q); | ||||
| 
 | ||||
|     set_keymap({first_layer_tap_key, second_layer_tap_key, first_key_on_layer, second_key_on_layer}); | ||||
| 
 | ||||
|     // Press first layer-tap key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     first_layer_tap_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press second layer-tap key.
 | ||||
|     EXPECT_REPORT(driver, (KC_Q)); | ||||
|     second_layer_tap_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     EXPECT_EQ(layer_state, 2); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release second layer-tap key.
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     second_layer_tap_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     EXPECT_EQ(layer_state, 2); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release first layer-tap key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     first_layer_tap_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     EXPECT_EQ(layer_state, 0); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldHoldOnOtherKeyPress, lt_mt_one_regular_key) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       lt_key      = KeymapKey(0, 1, 0, LT(1, KC_A)); | ||||
|     auto       mt_key0     = KeymapKey(0, 2, 0, SFT_T(KC_B)); | ||||
|     auto       mt_key1     = KeymapKey(1, 2, 0, CTL_T(KC_C)); | ||||
|     auto       regular_key = KeymapKey(1, MATRIX_COLS - 1, 0, KC_X); | ||||
|     auto       no_key0     = KeymapKey(0, MATRIX_COLS - 1, 0, XXXXXXX); | ||||
|     auto       no_key1     = KeymapKey(1, 1, 0, XXXXXXX); | ||||
| 
 | ||||
|     set_keymap({lt_key, mt_key0, mt_key1, regular_key, no_key0, no_key1}); | ||||
| 
 | ||||
|     // Press LT, MT.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     lt_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mt_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press regular key.
 | ||||
|     EXPECT_REPORT(driver, (KC_LCTL)); | ||||
|     EXPECT_REPORT(driver, (KC_LCTL, KC_X)); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release the regular key.
 | ||||
|     EXPECT_REPORT(driver, (KC_LCTL)); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release MT key.
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mt_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     EXPECT_EQ(get_mods(), 0); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release LT key.
 | ||||
|     lt_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     EXPECT_EQ(layer_state, 0); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldHoldOnOtherKeyPress, nested_tap_of_layer_tap_keys) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     // The keys are layer-taps on all layers.
 | ||||
|     auto first_key_layer_0  = KeymapKey(0, 1, 0, LT(1, KC_A)); | ||||
|     auto second_key_layer_0 = KeymapKey(0, MATRIX_COLS - 1, 0, LT(1, KC_P)); | ||||
|     auto first_key_layer_1  = KeymapKey(1, 1, 0, LT(2, KC_B)); | ||||
|     auto second_key_layer_1 = KeymapKey(1, MATRIX_COLS - 1, 0, LT(2, KC_Q)); | ||||
|     auto first_key_layer_2  = KeymapKey(2, 1, 0, KC_TRNS); | ||||
|     auto second_key_layer_2 = KeymapKey(2, MATRIX_COLS - 1, 0, KC_TRNS); | ||||
| 
 | ||||
|     set_keymap({first_key_layer_0, second_key_layer_0, first_key_layer_1, second_key_layer_1, first_key_layer_2, second_key_layer_2}); | ||||
| 
 | ||||
|     // Press first layer-tap key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     first_key_layer_0.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press second layer-tap key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     second_key_layer_0.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release second layer-tap key.
 | ||||
|     EXPECT_REPORT(driver, (KC_Q)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     second_key_layer_0.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release first layer-tap key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     first_key_layer_0.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldHoldOnOtherKeyPress, roll_layer_tap_key_with_regular_key) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
| 
 | ||||
|     auto layer_tap_hold_key = KeymapKey(0, 1, 0, LT(1, KC_P)); | ||||
|     auto regular_key        = KeymapKey(0, MATRIX_COLS - 1, 0, KC_A); | ||||
|     auto layer_key          = KeymapKey(1, MATRIX_COLS - 1, 0, KC_B); | ||||
| 
 | ||||
|     set_keymap({layer_tap_hold_key, regular_key, layer_key}); | ||||
| 
 | ||||
|     // Press layer-tap-hold key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     layer_tap_hold_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press regular key.
 | ||||
|     EXPECT_REPORT(driver, (KC_B)); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release layer-tap-hold key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     layer_tap_hold_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release regular key.
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| @ -0,0 +1,22 @@ | ||||
| /* Copyright 2022 Vladislav Kucheriavykh
 | ||||
|  * Copyright 2024 Google LLC | ||||
|  * | ||||
|  * This program is free software: you can redistribute it and/or modify | ||||
|  * it under the terms of the GNU General Public License as published by | ||||
|  * the Free Software Foundation, either version 2 of the License, or | ||||
|  * (at your option) any later version. | ||||
|  * | ||||
|  * This program is distributed in the hope that it will be useful, | ||||
|  * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
|  * GNU General Public License for more details. | ||||
|  * | ||||
|  * You should have received a copy of the GNU General Public License | ||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
|  */ | ||||
| 
 | ||||
| #pragma once | ||||
| 
 | ||||
| #include "test_common.h" | ||||
| #define CHORDAL_HOLD | ||||
| #define PERMISSIVE_HOLD | ||||
| @ -0,0 +1,17 @@ | ||||
| # Copyright 2022 Vladislav Kucheriavykh
 | ||||
| # Copyright 2024 Google LLC
 | ||||
| #
 | ||||
| # This program is free software: you can redistribute it and/or modify
 | ||||
| # it under the terms of the GNU General Public License as published by
 | ||||
| # the Free Software Foundation, either version 2 of the License, or
 | ||||
| # (at your option) any later version.
 | ||||
| #
 | ||||
| # This program is distributed in the hope that it will be useful,
 | ||||
| # but WITHOUT ANY WARRANTY; without even the implied warranty of
 | ||||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | ||||
| # GNU General Public License for more details.
 | ||||
| #
 | ||||
| # You should have received a copy of the GNU General Public License
 | ||||
| # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
| 
 | ||||
| INTROSPECTION_KEYMAP_C = test_keymap.c | ||||
| @ -0,0 +1,22 @@ | ||||
| // Copyright 2024 Google LLC
 | ||||
| //
 | ||||
| // Licensed under the Apache License, Version 2.0 (the "License");
 | ||||
| // you may not use this file except in compliance with the License.
 | ||||
| // You may obtain a copy of the License at
 | ||||
| //
 | ||||
| //     https://www.apache.org/licenses/LICENSE-2.0
 | ||||
| //
 | ||||
| // Unless required by applicable law or agreed to in writing, software
 | ||||
| // distributed under the License is distributed on an "AS IS" BASIS,
 | ||||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | ||||
| // See the License for the specific language governing permissions and
 | ||||
| // limitations under the License.
 | ||||
| 
 | ||||
| #include "quantum.h" | ||||
| 
 | ||||
| const char chordal_hold_layout[MATRIX_ROWS][MATRIX_COLS] PROGMEM = { | ||||
|     {'L', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R'}, | ||||
|     {'L', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R'}, | ||||
|     {'*', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R'}, | ||||
|     {'L', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R'}, | ||||
| }; | ||||
| @ -0,0 +1,174 @@ | ||||
| /* Copyright 2021 Stefan Kerkmann
 | ||||
|  * Copyright 2024 Google LLC | ||||
|  * | ||||
|  * This program is free software: you can redistribute it and/or modify | ||||
|  * it under the terms of the GNU General Public License as published by | ||||
|  * the Free Software Foundation, either version 2 of the License, or | ||||
|  * (at your option) any later version. | ||||
|  * | ||||
|  * This program is distributed in the hope that it will be useful, | ||||
|  * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
|  * GNU General Public License for more details. | ||||
|  * | ||||
|  * You should have received a copy of the GNU General Public License | ||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
|  */ | ||||
| 
 | ||||
| #include "action_util.h" | ||||
| #include "keyboard_report_util.hpp" | ||||
| #include "test_common.hpp" | ||||
| 
 | ||||
| using testing::_; | ||||
| using testing::InSequence; | ||||
| 
 | ||||
| class OneShot : public TestFixture {}; | ||||
| class OneShotParametrizedTestFixture : public ::testing::WithParamInterface<std::pair<KeymapKey, KeymapKey>>, public OneShot {}; | ||||
| 
 | ||||
| TEST_P(OneShotParametrizedTestFixture, OSMWithAdditionalKeypress) { | ||||
|     TestDriver driver; | ||||
|     KeymapKey  osm_key     = GetParam().first; | ||||
|     KeymapKey  regular_key = GetParam().second; | ||||
| 
 | ||||
|     set_keymap({osm_key, regular_key}); | ||||
| 
 | ||||
|     // Press and release OSM.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     tap_key(osm_key); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press regular key.
 | ||||
|     EXPECT_REPORT(driver, (osm_key.report_code, regular_key.report_code)); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release regular key.
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_P(OneShotParametrizedTestFixture, OSMAsRegularModifierWithAdditionalKeypress) { | ||||
|     TestDriver driver; | ||||
|     KeymapKey  osm_key     = GetParam().first; | ||||
|     KeymapKey  regular_key = GetParam().second; | ||||
| 
 | ||||
|     set_keymap({osm_key, regular_key}); | ||||
| 
 | ||||
|     // Press OSM.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     osm_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press regular key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release regular key.
 | ||||
|     EXPECT_REPORT(driver, (osm_key.report_code)).Times(2); | ||||
|     EXPECT_REPORT(driver, (regular_key.report_code, osm_key.report_code)); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release OSM.
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     osm_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| // clang-format off
 | ||||
| 
 | ||||
| INSTANTIATE_TEST_CASE_P( | ||||
|     OneShotModifierTests, | ||||
|     OneShotParametrizedTestFixture, | ||||
|     ::testing::Values( | ||||
|         // First is osm key, second is regular key.
 | ||||
|         std::make_pair(KeymapKey{0, 0, 0, OSM(MOD_LSFT), KC_LSFT}, KeymapKey{0, 1, 1, KC_A}), | ||||
|         std::make_pair(KeymapKey{0, 0, 0, OSM(MOD_LCTL), KC_LCTL}, KeymapKey{0, 1, 1, KC_A}), | ||||
|         std::make_pair(KeymapKey{0, 0, 0, OSM(MOD_LALT), KC_LALT}, KeymapKey{0, 1, 1, KC_A}), | ||||
|         std::make_pair(KeymapKey{0, 0, 0, OSM(MOD_LGUI), KC_LGUI}, KeymapKey{0, 1, 1, KC_A}), | ||||
|         std::make_pair(KeymapKey{0, 0, 0, OSM(MOD_RCTL), KC_RCTL}, KeymapKey{0, 1, 1, KC_A}), | ||||
|         std::make_pair(KeymapKey{0, 0, 0, OSM(MOD_RSFT), KC_RSFT}, KeymapKey{0, 1, 1, KC_A}), | ||||
|         std::make_pair(KeymapKey{0, 0, 0, OSM(MOD_RALT), KC_RALT}, KeymapKey{0, 1, 1, KC_A}), | ||||
|         std::make_pair(KeymapKey{0, 0, 0, OSM(MOD_RGUI), KC_RGUI}, KeymapKey{0, 1, 1, KC_A}) | ||||
|         )); | ||||
| // clang-format on
 | ||||
| 
 | ||||
| TEST_F(OneShot, OSLWithAdditionalKeypress) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     KeymapKey  osl_key      = KeymapKey{0, 0, 0, OSL(1)}; | ||||
|     KeymapKey  osl_key1     = KeymapKey{1, 0, 0, KC_X}; | ||||
|     KeymapKey  regular_key0 = KeymapKey{0, 1, 0, KC_Y}; | ||||
|     KeymapKey  regular_key1 = KeymapKey{1, 1, 0, KC_A}; | ||||
| 
 | ||||
|     set_keymap({osl_key, osl_key1, regular_key0, regular_key1}); | ||||
| 
 | ||||
|     // Press OSL key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     osl_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release OSL key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     osl_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press regular key.
 | ||||
|     EXPECT_REPORT(driver, (regular_key1.report_code)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     regular_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release regular key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     regular_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(OneShot, OSLWithOsmAndAdditionalKeypress) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     KeymapKey  osl_key     = KeymapKey{0, 0, 0, OSL(1)}; | ||||
|     KeymapKey  osm_key     = KeymapKey{1, 1, 0, OSM(MOD_LSFT), KC_LSFT}; | ||||
|     KeymapKey  regular_key = KeymapKey{1, 1, 1, KC_A}; | ||||
|     KeymapKey  blank_key   = KeymapKey{1, 0, 0, KC_NO}; | ||||
| 
 | ||||
|     set_keymap({osl_key, osm_key, regular_key, blank_key}); | ||||
| 
 | ||||
|     // Press OSL key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     osl_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release OSL key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     osl_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     EXPECT_TRUE(layer_state_is(1)); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press and release OSM.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     tap_key(osm_key); | ||||
|     EXPECT_TRUE(layer_state_is(1)); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Tap regular key.
 | ||||
|     EXPECT_REPORT(driver, (osm_key.report_code, regular_key.report_code)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     tap_key(regular_key); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| @ -0,0 +1,898 @@ | ||||
| // Copyright 2024-2025 Google LLC
 | ||||
| //
 | ||||
| // Licensed under the Apache License, Version 2.0 (the "License");
 | ||||
| // you may not use this file except in compliance with the License.
 | ||||
| // You may obtain a copy of the License at
 | ||||
| //
 | ||||
| //     https://www.apache.org/licenses/LICENSE-2.0
 | ||||
| //
 | ||||
| // Unless required by applicable law or agreed to in writing, software
 | ||||
| // distributed under the License is distributed on an "AS IS" BASIS,
 | ||||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | ||||
| // See the License for the specific language governing permissions and
 | ||||
| // limitations under the License.
 | ||||
| 
 | ||||
| #include "keyboard_report_util.hpp" | ||||
| #include "keycode.h" | ||||
| #include "test_common.hpp" | ||||
| #include "action_tapping.h" | ||||
| #include "test_fixture.hpp" | ||||
| #include "test_keymap_key.hpp" | ||||
| 
 | ||||
| using testing::_; | ||||
| using testing::InSequence; | ||||
| 
 | ||||
| class ChordalHoldPermissiveHold : public TestFixture {}; | ||||
| 
 | ||||
| TEST_F(ChordalHoldPermissiveHold, chordal_hold_handedness) { | ||||
|     EXPECT_EQ(chordal_hold_handedness({.col = 0, .row = 0}), 'L'); | ||||
|     EXPECT_EQ(chordal_hold_handedness({.col = MATRIX_COLS - 1, .row = 0}), 'R'); | ||||
|     EXPECT_EQ(chordal_hold_handedness({.col = 0, .row = 2}), '*'); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldPermissiveHold, get_chordal_hold_default) { | ||||
|     auto make_record = [](uint8_t row, uint8_t col, keyevent_type_t type = KEY_EVENT) { | ||||
|         return keyrecord_t{ | ||||
|             .event = | ||||
|                 { | ||||
|                     .key     = {.col = col, .row = row}, | ||||
|                     .type    = type, | ||||
|                     .pressed = true, | ||||
|                 }, | ||||
|         }; | ||||
|     }; | ||||
|     // Create two records on the left hand.
 | ||||
|     keyrecord_t record_l0 = make_record(0, 0); | ||||
|     keyrecord_t record_l1 = make_record(1, 0); | ||||
|     // Create a record on the right hand.
 | ||||
|     keyrecord_t record_r = make_record(0, MATRIX_COLS - 1); | ||||
| 
 | ||||
|     // Function should return true when records are on opposite hands.
 | ||||
|     EXPECT_TRUE(get_chordal_hold_default(&record_l0, &record_r)); | ||||
|     EXPECT_TRUE(get_chordal_hold_default(&record_r, &record_l0)); | ||||
|     // ... and false when on the same hand.
 | ||||
|     EXPECT_FALSE(get_chordal_hold_default(&record_l0, &record_l1)); | ||||
|     EXPECT_FALSE(get_chordal_hold_default(&record_l1, &record_l0)); | ||||
|     // But (2, 0) has handedness '*', for which true is returned for chords
 | ||||
|     // with either hand.
 | ||||
|     keyrecord_t record_l2 = make_record(2, 0); | ||||
|     EXPECT_TRUE(get_chordal_hold_default(&record_l2, &record_l0)); | ||||
|     EXPECT_TRUE(get_chordal_hold_default(&record_l2, &record_r)); | ||||
| 
 | ||||
|     // Create a record resulting from a combo.
 | ||||
|     keyrecord_t record_combo = make_record(0, 0, COMBO_EVENT); | ||||
|     // Function returns true in all cases.
 | ||||
|     EXPECT_TRUE(get_chordal_hold_default(&record_l0, &record_combo)); | ||||
|     EXPECT_TRUE(get_chordal_hold_default(&record_r, &record_combo)); | ||||
|     EXPECT_TRUE(get_chordal_hold_default(&record_combo, &record_l0)); | ||||
|     EXPECT_TRUE(get_chordal_hold_default(&record_combo, &record_r)); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldPermissiveHold, chord_nested_press_settled_as_hold) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     // Mod-tap key on the left hand.
 | ||||
|     auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); | ||||
|     // Regular key on the right hand.
 | ||||
|     auto regular_key = KeymapKey(0, MATRIX_COLS - 1, 0, KC_A); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key, regular_key}); | ||||
| 
 | ||||
|     // Press mod-tap key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Tap regular key.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     tap_key(regular_key); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release mod-tap key.
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldPermissiveHold, chord_rolled_press_settled_as_tap) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     // Mod-tap key on the left hand.
 | ||||
|     auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); | ||||
|     // Regular key on the right hand.
 | ||||
|     auto regular_key = KeymapKey(0, MATRIX_COLS - 1, 0, KC_A); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key, regular_key}); | ||||
| 
 | ||||
|     // Press mod-tap key and regular key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release mod-tap key.
 | ||||
|     EXPECT_REPORT(driver, (KC_P)); | ||||
|     EXPECT_REPORT(driver, (KC_P, KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     mod_tap_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release regular key.
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldPermissiveHold, non_chord_with_mod_tap_settled_as_tap) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     // Mod-tap key and regular key both on the left hand.
 | ||||
|     auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); | ||||
|     auto regular_key = KeymapKey(0, 2, 0, KC_A); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key, regular_key}); | ||||
| 
 | ||||
|     // Press mod-tap-hold key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press regular key.
 | ||||
|     EXPECT_REPORT(driver, (KC_P)); | ||||
|     EXPECT_REPORT(driver, (KC_P, KC_A)); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release regular key.
 | ||||
|     EXPECT_REPORT(driver, (KC_P)); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release mod-tap-hold key.
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldPermissiveHold, tap_mod_tap_key) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key}); | ||||
| 
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key.press(); | ||||
|     idle_for(TAPPING_TERM - 1); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_REPORT(driver, (KC_P)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldPermissiveHold, hold_mod_tap_key) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key}); | ||||
| 
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     mod_tap_key.press(); | ||||
|     idle_for(TAPPING_TERM + 1); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldPermissiveHold, two_mod_taps_same_hand_hold_til_timeout) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key1 = KeymapKey(0, MATRIX_COLS - 2, 0, RCTL_T(KC_A)); | ||||
|     auto       mod_tap_key2 = KeymapKey(0, MATRIX_COLS - 1, 0, RSFT_T(KC_B)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key1, mod_tap_key2}); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Continue holding til the tapping term.
 | ||||
|     EXPECT_REPORT(driver, (KC_RIGHT_CTRL)); | ||||
|     EXPECT_REPORT(driver, (KC_RIGHT_CTRL, KC_RIGHT_SHIFT)); | ||||
|     idle_for(TAPPING_TERM); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release mod-tap keys.
 | ||||
|     EXPECT_REPORT(driver, (KC_RIGHT_SHIFT)); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldPermissiveHold, two_mod_taps_nested_press_opposite_hands) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key1 = KeymapKey(0, 1, 0, SFT_T(KC_A)); | ||||
|     auto       mod_tap_key2 = KeymapKey(0, MATRIX_COLS - 1, 0, RSFT_T(KC_B)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key1, mod_tap_key2}); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release mod-tap keys.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldPermissiveHold, two_mod_taps_nested_press_same_hand) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key1 = KeymapKey(0, 1, 0, SFT_T(KC_A)); | ||||
|     auto       mod_tap_key2 = KeymapKey(0, 2, 0, RSFT_T(KC_B)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key1, mod_tap_key2}); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release mod-tap keys.
 | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
| 
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldPermissiveHold, three_mod_taps_same_hand_streak_roll) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key1 = KeymapKey(0, 1, 0, SFT_T(KC_A)); | ||||
|     auto       mod_tap_key2 = KeymapKey(0, 2, 0, CTL_T(KC_B)); | ||||
|     auto       mod_tap_key3 = KeymapKey(0, 3, 0, RSFT_T(KC_C)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key1, mod_tap_key2, mod_tap_key3}); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release keys 1, 2, 3.
 | ||||
|     //
 | ||||
|     // NOTE: The correct order of events should be
 | ||||
|     // EXPECT_REPORT(driver, (KC_A, KC_B, KC_C));
 | ||||
|     // EXPECT_REPORT(driver, (KC_B, KC_C));
 | ||||
|     // EXPECT_REPORT(driver, (KC_C));
 | ||||
|     // EXPECT_EMPTY_REPORT(driver);
 | ||||
|     //
 | ||||
|     // However, due to a workaround for https://github.com/tmk/tmk_keyboard/issues/60,
 | ||||
|     // the events are processed out of order, with the first two keys released
 | ||||
|     // before pressing KC_C.
 | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_B)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     EXPECT_REPORT(driver, (KC_C)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldPermissiveHold, three_mod_taps_same_hand_streak_orders) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key1 = KeymapKey(0, 1, 0, SFT_T(KC_A)); | ||||
|     auto       mod_tap_key2 = KeymapKey(0, 2, 0, CTL_T(KC_B)); | ||||
|     auto       mod_tap_key3 = KeymapKey(0, 3, 0, RSFT_T(KC_C)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key1, mod_tap_key2, mod_tap_key3}); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release keys 3, 2, 1.
 | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_B, KC_C)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_B)); | ||||
|     mod_tap_key3.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     idle_for(TAPPING_TERM); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release keys 3, 1, 2.
 | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_B, KC_C)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_B)); | ||||
|     mod_tap_key3.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_REPORT(driver, (KC_B)); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     idle_for(TAPPING_TERM); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release keys 2, 3, 1.
 | ||||
|     //
 | ||||
|     // NOTE: The correct order of events should be
 | ||||
|     // EXPECT_REPORT(driver, (KC_A, KC_B, KC_C));
 | ||||
|     // EXPECT_REPORT(driver, (KC_A, KC_C));
 | ||||
|     // EXPECT_REPORT(driver, (KC_A));
 | ||||
|     // EXPECT_EMPTY_REPORT(driver);
 | ||||
|     //
 | ||||
|     // However, due to a workaround for https://github.com/tmk/tmk_keyboard/issues/60,
 | ||||
|     // the events are processed out of order.
 | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_C)); | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldPermissiveHold, three_mod_taps_opposite_hands_roll) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key1 = KeymapKey(0, 1, 0, SFT_T(KC_A)); | ||||
|     auto       mod_tap_key2 = KeymapKey(0, 2, 0, CTL_T(KC_B)); | ||||
|     auto       mod_tap_key3 = KeymapKey(0, MATRIX_COLS - 1, 0, RSFT_T(KC_C)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key1, mod_tap_key2, mod_tap_key3}); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release keys 1, 2, 3.
 | ||||
|     //
 | ||||
|     // NOTE: The correct order of events should be
 | ||||
|     // EXPECT_REPORT(driver, (KC_A, KC_B));
 | ||||
|     // EXPECT_REPORT(driver, (KC_A, KC_B, KC_C));
 | ||||
|     // EXPECT_REPORT(driver, (KC_B, KC_C));
 | ||||
|     // EXPECT_REPORT(driver, (KC_C));
 | ||||
|     // EXPECT_EMPTY_REPORT(driver);
 | ||||
|     //
 | ||||
|     // However, due to a workaround for https://github.com/tmk/tmk_keyboard/issues/60,
 | ||||
|     // the events are processed out of order, with the first two keys released
 | ||||
|     // before pressing KC_C.
 | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_A, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_B)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     EXPECT_REPORT(driver, (KC_C)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldPermissiveHold, three_mod_taps_two_left_one_right) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key1 = KeymapKey(0, 1, 0, SFT_T(KC_A)); | ||||
|     auto       mod_tap_key2 = KeymapKey(0, 2, 0, CTL_T(KC_B)); | ||||
|     auto       mod_tap_key3 = KeymapKey(0, MATRIX_COLS - 1, 0, RSFT_T(KC_C)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key1, mod_tap_key2, mod_tap_key3}); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release key 3.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_LEFT_CTRL)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_LEFT_CTRL, KC_C)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_LEFT_CTRL)); | ||||
|     mod_tap_key3.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release key 2, then key 1.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     idle_for(TAPPING_TERM); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release key 3.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_LEFT_CTRL)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_LEFT_CTRL, KC_C)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_LEFT_CTRL)); | ||||
|     mod_tap_key3.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release key 1, then key 2.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_CTRL)); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldPermissiveHold, three_mod_taps_one_held_two_tapped) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key1 = KeymapKey(0, 1, 0, SFT_T(KC_A)); | ||||
|     auto       mod_tap_key2 = KeymapKey(0, MATRIX_COLS - 2, 0, CTL_T(KC_B)); | ||||
|     auto       mod_tap_key3 = KeymapKey(0, MATRIX_COLS - 1, 0, RSFT_T(KC_C)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key1, mod_tap_key2, mod_tap_key3}); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release keys 3, 2, 1.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_B, KC_C)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_B)); | ||||
|     mod_tap_key3.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     idle_for(TAPPING_TERM); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key3.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release keys 3, 1, 2.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_B, KC_C)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_B)); | ||||
|     mod_tap_key3.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_REPORT(driver, (KC_B)); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldPermissiveHold, two_mod_taps_one_regular_key) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_key1 = KeymapKey(0, 1, 0, SFT_T(KC_A)); | ||||
|     auto       mod_tap_key2 = KeymapKey(0, MATRIX_COLS - 2, 0, CTL_T(KC_B)); | ||||
|     auto       regular_key  = KeymapKey(0, MATRIX_COLS - 1, 0, KC_C); | ||||
| 
 | ||||
|     set_keymap({mod_tap_key1, mod_tap_key2, regular_key}); | ||||
| 
 | ||||
|     // Press keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release keys.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_B, KC_C)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_C)); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press mod-tap keys.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     idle_for(TAPPING_TERM); | ||||
|     mod_tap_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mod_tap_key2.press(); | ||||
|     run_one_scan_loop(); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release keys.
 | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_B)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_B, KC_C)); | ||||
|     EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_B)); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_REPORT(driver, (KC_B)); | ||||
|     mod_tap_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_key2.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldPermissiveHold, tap_regular_key_while_layer_tap_key_is_held) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       layer_tap_hold_key = KeymapKey(0, 1, 0, LT(1, KC_P)); | ||||
|     auto       regular_key        = KeymapKey(0, MATRIX_COLS - 1, 0, KC_A); | ||||
|     auto       no_key             = KeymapKey(1, 1, 0, XXXXXXX); | ||||
|     auto       layer_key          = KeymapKey(1, MATRIX_COLS - 1, 0, KC_B); | ||||
| 
 | ||||
|     set_keymap({layer_tap_hold_key, regular_key, no_key, layer_key}); | ||||
| 
 | ||||
|     // Press layer-tap-hold key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     layer_tap_hold_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     // Press regular key.
 | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release regular key.
 | ||||
|     EXPECT_REPORT(driver, (KC_B)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     EXPECT_EQ(layer_state, 2); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release layer-tap-hold key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     layer_tap_hold_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     EXPECT_EQ(layer_state, 0); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldPermissiveHold, nested_tap_of_layer_0_layer_tap_keys) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     // The keys are layer-taps on layer 2 but regular keys on layer 1.
 | ||||
|     auto first_layer_tap_key  = KeymapKey(0, 1, 0, LT(1, KC_A)); | ||||
|     auto second_layer_tap_key = KeymapKey(0, MATRIX_COLS - 1, 0, LT(1, KC_P)); | ||||
|     auto first_key_on_layer   = KeymapKey(1, 1, 0, KC_B); | ||||
|     auto second_key_on_layer  = KeymapKey(1, MATRIX_COLS - 1, 0, KC_Q); | ||||
| 
 | ||||
|     set_keymap({first_layer_tap_key, second_layer_tap_key, first_key_on_layer, second_key_on_layer}); | ||||
| 
 | ||||
|     // Press first layer-tap key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     first_layer_tap_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     // Press second layer-tap key.
 | ||||
|     second_layer_tap_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release second layer-tap key.
 | ||||
|     EXPECT_REPORT(driver, (KC_Q)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     second_layer_tap_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     EXPECT_EQ(layer_state, 2); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release first layer-tap key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     first_layer_tap_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     EXPECT_EQ(layer_state, 0); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldPermissiveHold, lt_mt_one_regular_key) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       lt_key      = KeymapKey(0, 1, 0, LT(1, KC_A)); | ||||
|     auto       mt_key0     = KeymapKey(0, 2, 0, SFT_T(KC_B)); | ||||
|     auto       mt_key1     = KeymapKey(1, 2, 0, CTL_T(KC_C)); | ||||
|     auto       regular_key = KeymapKey(1, MATRIX_COLS - 1, 0, KC_X); | ||||
|     auto       no_key0     = KeymapKey(0, MATRIX_COLS - 1, 0, XXXXXXX); | ||||
|     auto       no_key1     = KeymapKey(1, 1, 0, XXXXXXX); | ||||
| 
 | ||||
|     set_keymap({lt_key, mt_key0, mt_key1, regular_key, no_key0, no_key1}); | ||||
| 
 | ||||
|     // Press LT, MT, and regular key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     lt_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     mt_key1.press(); | ||||
|     run_one_scan_loop(); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release the regular key.
 | ||||
|     EXPECT_REPORT(driver, (KC_LCTL)); | ||||
|     EXPECT_REPORT(driver, (KC_LCTL, KC_X)); | ||||
|     EXPECT_REPORT(driver, (KC_LCTL)); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     EXPECT_EQ(get_mods(), MOD_BIT_LCTRL); | ||||
|     EXPECT_EQ(layer_state, 2); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release MT key.
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mt_key1.release(); | ||||
|     run_one_scan_loop(); | ||||
|     EXPECT_EQ(get_mods(), 0); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release LT key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     lt_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     EXPECT_EQ(layer_state, 0); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldPermissiveHold, nested_tap_of_layer_tap_keys) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     // The keys are layer-taps on all layers.
 | ||||
|     auto first_key_layer_0  = KeymapKey(0, 1, 0, LT(1, KC_A)); | ||||
|     auto second_key_layer_0 = KeymapKey(0, MATRIX_COLS - 1, 0, LT(1, KC_P)); | ||||
|     auto first_key_layer_1  = KeymapKey(1, 1, 0, LT(2, KC_B)); | ||||
|     auto second_key_layer_1 = KeymapKey(1, MATRIX_COLS - 1, 0, LT(2, KC_Q)); | ||||
|     auto first_key_layer_2  = KeymapKey(2, 1, 0, KC_TRNS); | ||||
|     auto second_key_layer_2 = KeymapKey(2, MATRIX_COLS - 1, 0, KC_TRNS); | ||||
| 
 | ||||
|     set_keymap({first_key_layer_0, second_key_layer_0, first_key_layer_1, second_key_layer_1, first_key_layer_2, second_key_layer_2}); | ||||
| 
 | ||||
|     // Press first layer-tap key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     first_key_layer_0.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press second layer-tap key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     second_key_layer_0.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release second layer-tap key.
 | ||||
|     EXPECT_REPORT(driver, (KC_Q)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     second_key_layer_0.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release first layer-tap key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     first_key_layer_0.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(ChordalHoldPermissiveHold, roll_layer_tap_key_with_regular_key) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
| 
 | ||||
|     auto layer_tap_hold_key = KeymapKey(0, 1, 0, LT(1, KC_P)); | ||||
|     auto regular_key        = KeymapKey(0, MATRIX_COLS - 1, 0, KC_A); | ||||
|     auto layer_key          = KeymapKey(1, MATRIX_COLS - 1, 0, KC_B); | ||||
| 
 | ||||
|     set_keymap({layer_tap_hold_key, regular_key, layer_key}); | ||||
| 
 | ||||
|     // Press layer-tap-hold key.
 | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     layer_tap_hold_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Press regular key.
 | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release layer-tap-hold key.
 | ||||
|     EXPECT_REPORT(driver, (KC_P)); | ||||
|     EXPECT_REPORT(driver, (KC_P, KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     layer_tap_hold_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| 
 | ||||
|     // Release regular key.
 | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     VERIFY_AND_CLEAR(driver); | ||||
| } | ||||
| @ -0,0 +1,28 @@ | ||||
| /* Copyright 2022 Isaac Elenbaas
 | ||||
|  * Copyright 2024 Google LLC | ||||
|  * | ||||
|  * This program is free software: you can redistribute it and/or modify | ||||
|  * it under the terms of the GNU General Public License as published by | ||||
|  * the Free Software Foundation, either version 2 of the License, or | ||||
|  * (at your option) any later version. | ||||
|  * | ||||
|  * This program is distributed in the hope that it will be useful, | ||||
|  * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
|  * GNU General Public License for more details. | ||||
|  * | ||||
|  * You should have received a copy of the GNU General Public License | ||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
|  */ | ||||
| 
 | ||||
| #pragma once | ||||
| 
 | ||||
| #include "test_common.h" | ||||
| 
 | ||||
| #define CHORDAL_HOLD | ||||
| #define PERMISSIVE_HOLD | ||||
| 
 | ||||
| #define RETRO_SHIFT 2 * TAPPING_TERM | ||||
| // releases between AUTO_SHIFT_TIMEOUT and TAPPING_TERM are not tested
 | ||||
| #define AUTO_SHIFT_TIMEOUT TAPPING_TERM | ||||
| #define AUTO_SHIFT_MODIFIERS | ||||
| @ -0,0 +1,18 @@ | ||||
| # Copyright 2022 Isaac Elenbaas
 | ||||
| # Copyright 2024 Google LLC
 | ||||
| #
 | ||||
| # This program is free software: you can redistribute it and/or modify
 | ||||
| # it under the terms of the GNU General Public License as published by
 | ||||
| # the Free Software Foundation, either version 2 of the License, or
 | ||||
| # (at your option) any later version.
 | ||||
| #
 | ||||
| # This program is distributed in the hope that it will be useful,
 | ||||
| # but WITHOUT ANY WARRANTY; without even the implied warranty of
 | ||||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | ||||
| # GNU General Public License for more details.
 | ||||
| #
 | ||||
| # You should have received a copy of the GNU General Public License
 | ||||
| # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
| 
 | ||||
| AUTO_SHIFT_ENABLE = yes | ||||
| INTROSPECTION_KEYMAP_C = test_keymap.c | ||||
| @ -0,0 +1,22 @@ | ||||
| // Copyright 2024 Google LLC
 | ||||
| //
 | ||||
| // Licensed under the Apache License, Version 2.0 (the "License");
 | ||||
| // you may not use this file except in compliance with the License.
 | ||||
| // You may obtain a copy of the License at
 | ||||
| //
 | ||||
| //     https://www.apache.org/licenses/LICENSE-2.0
 | ||||
| //
 | ||||
| // Unless required by applicable law or agreed to in writing, software
 | ||||
| // distributed under the License is distributed on an "AS IS" BASIS,
 | ||||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | ||||
| // See the License for the specific language governing permissions and
 | ||||
| // limitations under the License.
 | ||||
| 
 | ||||
| #include "quantum.h" | ||||
| 
 | ||||
| const char chordal_hold_layout[MATRIX_ROWS][MATRIX_COLS] PROGMEM = { | ||||
|     {'L', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R'}, | ||||
|     {'L', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R'}, | ||||
|     {'*', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R'}, | ||||
|     {'L', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R'}, | ||||
| }; | ||||
| @ -0,0 +1,420 @@ | ||||
| /* Copyright 2022 Isaac Elenbaas
 | ||||
|  * Copyright 2024 Google LLC | ||||
|  * | ||||
|  * This program is free software: you can redistribute it and/or modify | ||||
|  * it under the terms of the GNU General Public License as published by | ||||
|  * the Free Software Foundation, either version 2 of the License, or | ||||
|  * (at your option) any later version. | ||||
|  * | ||||
|  * This program is distributed in the hope that it will be useful, | ||||
|  * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
|  * GNU General Public License for more details. | ||||
|  * | ||||
|  * You should have received a copy of the GNU General Public License | ||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
|  */ | ||||
| 
 | ||||
| #include "keyboard_report_util.hpp" | ||||
| #include "keycode.h" | ||||
| #include "test_common.hpp" | ||||
| #include "action_tapping.h" | ||||
| #include "test_fixture.hpp" | ||||
| #include "test_keymap_key.hpp" | ||||
| 
 | ||||
| bool get_auto_shifted_key(uint16_t keycode, keyrecord_t *record) { | ||||
|     return true; | ||||
| } | ||||
| 
 | ||||
| using testing::_; | ||||
| using testing::AnyNumber; | ||||
| using testing::AnyOf; | ||||
| using testing::InSequence; | ||||
| 
 | ||||
| class RetroShiftPermissiveHold : public TestFixture {}; | ||||
| 
 | ||||
| TEST_F(RetroShiftPermissiveHold, tap_regular_key_while_mod_tap_key_is_held_under_tapping_term) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_hold_key = KeymapKey(0, 0, 0, CTL_T(KC_P)); | ||||
|     auto       regular_key      = KeymapKey(0, MATRIX_COLS - 1, 0, KC_A); | ||||
| 
 | ||||
|     set_keymap({mod_tap_hold_key, regular_key}); | ||||
| 
 | ||||
|     /* Press mod-tap-hold key. */ | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_hold_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Press regular key. */ | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Release regular key. */ | ||||
|     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LCTL))).Times(AnyNumber()); | ||||
|     EXPECT_REPORT(driver, (KC_LCTL, KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_LCTL)); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Release mod-tap-hold key. */ | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_hold_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(RetroShiftPermissiveHold, tap_mod_tap_key_while_mod_tap_key_is_held_under_tapping_term) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_hold_key    = KeymapKey(0, 0, 0, CTL_T(KC_P)); | ||||
|     auto       mod_tap_regular_key = KeymapKey(0, MATRIX_COLS - 1, 0, ALT_T(KC_A)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_hold_key, mod_tap_regular_key}); | ||||
| 
 | ||||
|     /* Press mod-tap-hold key. */ | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_hold_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Press mod-tap-regular key. */ | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Release mod-tap-regular key. */ | ||||
|     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LCTL))).Times(AnyNumber()); | ||||
|     EXPECT_REPORT(driver, (KC_LCTL, KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_LCTL)); | ||||
|     mod_tap_regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Release mod-tap-hold key. */ | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_hold_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(RetroShiftPermissiveHold, tap_regular_key_while_mod_tap_key_is_held_over_tapping_term) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_hold_key = KeymapKey(0, 0, 0, CTL_T(KC_P)); | ||||
|     auto       regular_key      = KeymapKey(0, MATRIX_COLS - 1, 0, KC_A); | ||||
| 
 | ||||
|     set_keymap({mod_tap_hold_key, regular_key}); | ||||
| 
 | ||||
|     /* Press mod-tap-hold key. */ | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_hold_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Press regular key. */ | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Release regular key. */ | ||||
|     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LCTL))).Times(AnyNumber()); | ||||
|     EXPECT_REPORT(driver, (KC_LCTL, KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_LCTL)); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     idle_for(TAPPING_TERM); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Release mod-tap-hold key. */ | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_hold_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(RetroShiftPermissiveHold, tap_mod_tap_key_while_mod_tap_key_is_held_over_tapping_term) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_hold_key    = KeymapKey(0, 0, 0, CTL_T(KC_P)); | ||||
|     auto       mod_tap_regular_key = KeymapKey(0, MATRIX_COLS - 1, 0, ALT_T(KC_A)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_hold_key, mod_tap_regular_key}); | ||||
| 
 | ||||
|     /* Press mod-tap-hold key. */ | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_hold_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Press mod-tap-regular key. */ | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Release mod-tap-regular key. */ | ||||
|     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LCTL))).Times(AnyNumber()); | ||||
|     EXPECT_REPORT(driver, (KC_LCTL, KC_A)); | ||||
|     EXPECT_REPORT(driver, (KC_LCTL)); | ||||
|     mod_tap_regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     idle_for(TAPPING_TERM); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Release mod-tap-hold key. */ | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_hold_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(RetroShiftPermissiveHold, hold_regular_key_while_mod_tap_key_is_held_over_tapping_term) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_hold_key = KeymapKey(0, 0, 0, CTL_T(KC_P)); | ||||
|     auto       regular_key      = KeymapKey(0, MATRIX_COLS - 1, 0, KC_A); | ||||
| 
 | ||||
|     set_keymap({mod_tap_hold_key, regular_key}); | ||||
| 
 | ||||
|     /* Press mod-tap-hold key. */ | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_hold_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Press regular key. */ | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     idle_for(AUTO_SHIFT_TIMEOUT); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Release regular key. */ | ||||
|     // clang-format off
 | ||||
|     EXPECT_CALL(driver, send_keyboard_mock(AnyOf( | ||||
|                 KeyboardReport(KC_LCTL, KC_LSFT), | ||||
|                 KeyboardReport(KC_LSFT), | ||||
|                 KeyboardReport(KC_LCTL)))) | ||||
|         .Times(AnyNumber()); | ||||
|     // clang-format on
 | ||||
|     EXPECT_REPORT(driver, (KC_LCTL, KC_LSFT, KC_A)); | ||||
|     // clang-format off
 | ||||
|     EXPECT_CALL(driver, send_keyboard_mock(AnyOf( | ||||
|                 KeyboardReport(KC_LCTL, KC_LSFT), | ||||
|                 KeyboardReport(KC_LSFT)))) | ||||
|         .Times(AnyNumber()); | ||||
|     // clang-format on
 | ||||
|     EXPECT_REPORT(driver, (KC_LCTL)); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Release mod-tap-hold key. */ | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_hold_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(RetroShiftPermissiveHold, hold_mod_tap_key_while_mod_tap_key_is_held_over_tapping_term) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_hold_key    = KeymapKey(0, 0, 0, CTL_T(KC_P)); | ||||
|     auto       mod_tap_regular_key = KeymapKey(0, MATRIX_COLS - 1, 0, ALT_T(KC_A)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_hold_key, mod_tap_regular_key}); | ||||
| 
 | ||||
|     /* Press mod-tap-hold key. */ | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_hold_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Press mod-tap-regular key. */ | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     idle_for(AUTO_SHIFT_TIMEOUT); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Release mod-tap-regular key. */ | ||||
|     // clang-format off
 | ||||
|     EXPECT_CALL(driver, send_keyboard_mock(AnyOf( | ||||
|                 KeyboardReport(KC_LCTL, KC_LSFT), | ||||
|                 KeyboardReport(KC_LSFT), | ||||
|                 KeyboardReport(KC_LCTL)))) | ||||
|         .Times(AnyNumber()); | ||||
|     // clang-format on
 | ||||
|     EXPECT_REPORT(driver, (KC_LCTL, KC_LSFT, KC_A)); | ||||
|     // clang-format off
 | ||||
|     EXPECT_CALL(driver, send_keyboard_mock(AnyOf( | ||||
|                 KeyboardReport(KC_LCTL, KC_LSFT), | ||||
|                 KeyboardReport(KC_LSFT)))) | ||||
|         .Times(AnyNumber()); | ||||
|     // clang-format on
 | ||||
|     EXPECT_REPORT(driver, (KC_LCTL)); | ||||
|     mod_tap_regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     idle_for(TAPPING_TERM); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Release mod-tap-hold key. */ | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_hold_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(RetroShiftPermissiveHold, roll_tap_regular_key_while_mod_tap_key_is_held_under_tapping_term) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_hold_key = KeymapKey(0, 0, 0, CTL_T(KC_P)); | ||||
|     auto       regular_key      = KeymapKey(0, MATRIX_COLS - 1, 0, KC_A); | ||||
| 
 | ||||
|     set_keymap({mod_tap_hold_key, regular_key}); | ||||
| 
 | ||||
|     /* Press mod-tap-hold key. */ | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_hold_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Press regular key. */ | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Release mod-tap-hold key. */ | ||||
|     EXPECT_REPORT(driver, (KC_P)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_hold_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Release regular key. */ | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(RetroShiftPermissiveHold, roll_tap_mod_tap_key_while_mod_tap_key_is_held_under_tapping_term) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_hold_key    = KeymapKey(0, 0, 0, CTL_T(KC_P)); | ||||
|     auto       mod_tap_regular_key = KeymapKey(0, MATRIX_COLS - 1, 0, ALT_T(KC_A)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_hold_key, mod_tap_regular_key}); | ||||
| 
 | ||||
|     /* Press mod-tap-hold key. */ | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_hold_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Press mod-tap-regular key. */ | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Release mod-tap-hold key. */ | ||||
|     EXPECT_REPORT(driver, (KC_P)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_hold_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Release mod-tap-regular key. */ | ||||
|     EXPECT_REPORT(driver, (KC_A)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(RetroShiftPermissiveHold, roll_hold_regular_key_while_mod_tap_key_is_held_under_tapping_term) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_hold_key = KeymapKey(0, 0, 0, CTL_T(KC_P)); | ||||
|     auto       regular_key      = KeymapKey(0, MATRIX_COLS - 1, 0, KC_A); | ||||
| 
 | ||||
|     set_keymap({mod_tap_hold_key, regular_key}); | ||||
| 
 | ||||
|     /* Press mod-tap-hold key. */ | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_hold_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Press regular key. */ | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Release mod-tap-hold key. */ | ||||
|     EXPECT_REPORT(driver, (KC_P)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT))).Times(AnyNumber()); | ||||
|     EXPECT_REPORT(driver, (KC_LSFT, KC_A)); | ||||
|     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT))).Times(AnyNumber()); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_hold_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     idle_for(AUTO_SHIFT_TIMEOUT); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Release regular key. */ | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| } | ||||
| 
 | ||||
| TEST_F(RetroShiftPermissiveHold, roll_hold_mod_tap_key_while_mod_tap_key_is_held_under_tapping_term) { | ||||
|     TestDriver driver; | ||||
|     InSequence s; | ||||
|     auto       mod_tap_hold_key    = KeymapKey(0, 0, 0, CTL_T(KC_P)); | ||||
|     auto       mod_tap_regular_key = KeymapKey(0, MATRIX_COLS - 1, 0, ALT_T(KC_A)); | ||||
| 
 | ||||
|     set_keymap({mod_tap_hold_key, mod_tap_regular_key}); | ||||
| 
 | ||||
|     /* Press mod-tap-hold key. */ | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_hold_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Press mod-tap-regular key. */ | ||||
|     EXPECT_NO_REPORT(driver); | ||||
|     mod_tap_regular_key.press(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Release mod-tap-hold key. */ | ||||
|     EXPECT_REPORT(driver, (KC_P)); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     mod_tap_hold_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| 
 | ||||
|     /* Release mod-tap-regular key. */ | ||||
|     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT))).Times(AnyNumber()); | ||||
|     EXPECT_REPORT(driver, (KC_LSFT, KC_A)); | ||||
|     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT))).Times(AnyNumber()); | ||||
|     EXPECT_EMPTY_REPORT(driver); | ||||
|     idle_for(AUTO_SHIFT_TIMEOUT); | ||||
|     mod_tap_regular_key.release(); | ||||
|     run_one_scan_loop(); | ||||
|     testing::Mock::VerifyAndClearExpectations(&driver); | ||||
| } | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user