Fix pressing two keys with the same keycode but different modifiers (#2710)
* Fix extra keyboard report during test_fixture teardown * Add tests for pressing two keys with only different modifers * Fix #1708 When two keys that use the same keycode, but different modifiers were pressed at the same time, the second keypress wasn't registered. This is fixed by forcing a key release when we detect a new press for the same keycode. * Fix the NKRO version of is_key_pressed * Fix uninitalized loop variable Co-authored-by: Jack Humbert <jack.humb@gmail.com>
This commit is contained in:
		
							parent
							
								
									f89439ae09
								
							
						
					
					
						commit
						9e8767917d
					
				
					 6 changed files with 158 additions and 5 deletions
				
			
		| 
						 | 
				
			
			@ -68,6 +68,32 @@ uint8_t get_first_key(report_keyboard_t* keyboard_report) {
 | 
			
		|||
#endif
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/** \brief Checks if a key is pressed in the report
 | 
			
		||||
 *
 | 
			
		||||
 * Returns true if the keyboard_report reports that the key is pressed, otherwise false
 | 
			
		||||
 * Note: The function doesn't support modifers currently, and it returns false for KC_NO
 | 
			
		||||
 */
 | 
			
		||||
bool is_key_pressed(report_keyboard_t* keyboard_report, uint8_t key) {
 | 
			
		||||
  if (key == KC_NO) {
 | 
			
		||||
    return false;
 | 
			
		||||
  }
 | 
			
		||||
#ifdef NKRO_ENABLE
 | 
			
		||||
  if (keyboard_protocol && keymap_config.nkro) {
 | 
			
		||||
    if ((key>>3) < KEYBOARD_REPORT_BITS) {
 | 
			
		||||
        return keyboard_report->nkro.bits[key>>3] & 1<<(key&7);
 | 
			
		||||
    } else {
 | 
			
		||||
      return false;
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
#endif
 | 
			
		||||
  for (int i=0; i < KEYBOARD_REPORT_KEYS; i++) {
 | 
			
		||||
      if (keyboard_report->keys[i] == key) {
 | 
			
		||||
          return true;
 | 
			
		||||
      }
 | 
			
		||||
  }
 | 
			
		||||
  return false;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/** \brief add key byte
 | 
			
		||||
 *
 | 
			
		||||
 * FIXME: Needs doc
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue