Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						584e390703
					
				| @ -176,11 +176,11 @@ See also: [Basic Keycodes](keycodes_basic) | ||||
| |`KC_LEFT_CTRL`          |`KC_LCTL`                      |Left Control                           |✔            |✔            |✔                | | ||||
| |`KC_LEFT_SHIFT`         |`KC_LSFT`                      |Left Shift                             |✔            |✔            |✔                | | ||||
| |`KC_LEFT_ALT`           |`KC_LALT`, `KC_LOPT`           |Left Alt (Option)                      |✔            |✔            |✔                | | ||||
| |`KC_LEFT_GUI`           |`KC_LGUI`, `KC_LCMD`, `KC_LWIN`|Left GUI (Windows/Command/Meta key)    |✔            |✔            |✔                | | ||||
| |`KC_LEFT_GUI`           |`KC_LGUI`, `KC_LCMD`, `KC_LWIN`|Left GUI (Windows/Command/Super key)   |✔            |✔            |✔                | | ||||
| |`KC_RIGHT_CTRL`         |`KC_RCTL`                      |Right Control                          |✔            |✔            |✔                | | ||||
| |`KC_RIGHT_SHIFT`        |`KC_RSFT`                      |Right Shift                            |✔            |✔            |✔                | | ||||
| |`KC_RIGHT_ALT`          |`KC_RALT`, `KC_ROPT`, `KC_ALGR`|Right Alt (Option/AltGr)               |✔            |✔            |✔                | | ||||
| |`KC_RIGHT_GUI`          |`KC_RGUI`, `KC_RCMD`, `KC_RWIN`|Right GUI (Windows/Command/Meta key)   |✔            |✔            |✔                | | ||||
| |`KC_RIGHT_GUI`          |`KC_RGUI`, `KC_RCMD`, `KC_RWIN`|Right GUI (Windows/Command/Super key)  |✔            |✔            |✔                | | ||||
| |`KC_SYSTEM_POWER`       |`KC_PWR`                       |System Power Down                      |✔            |✔<sup>3</sup>|✔                | | ||||
| |`KC_SYSTEM_SLEEP`       |`KC_SLEP`                      |System Sleep                           |✔            |✔<sup>3</sup>|✔                | | ||||
| |`KC_SYSTEM_WAKE`        |`KC_WAKE`                      |System Wake                            |             |✔<sup>3</sup>|✔                | | ||||
|  | ||||
| @ -109,15 +109,15 @@ The basic set of keycodes are based on the [HID Keyboard/Keypad Usage Page (0x07 | ||||
| ## Modifiers | ||||
| 
 | ||||
| |Key             |Aliases                        |Description                          | | ||||
| |----------------|-------------------------------|------------------------------------| | ||||
| |----------------|-------------------------------|-------------------------------------| | ||||
| |`KC_LEFT_CTRL`  |`KC_LCTL`                      |Left Control                         | | ||||
| |`KC_LEFT_SHIFT` |`KC_LSFT`                      |Left Shift                           | | ||||
| |`KC_LEFT_ALT`   |`KC_LALT`, `KC_LOPT`           |Left Alt (Option)                    | | ||||
| |`KC_LEFT_GUI`   |`KC_LGUI`, `KC_LCMD`, `KC_LWIN`|Left GUI (Windows/Command/Meta key) | | ||||
| |`KC_LEFT_GUI`   |`KC_LGUI`, `KC_LCMD`, `KC_LWIN`|Left GUI (Windows/Command/Super key) | | ||||
| |`KC_RIGHT_CTRL` |`KC_RCTL`                      |Right Control                        | | ||||
| |`KC_RIGHT_SHIFT`|`KC_RSFT`                      |Right Shift                          | | ||||
| |`KC_RIGHT_ALT`  |`KC_RALT`, `KC_ROPT`, `KC_ALGR`|Right Alt (Option/AltGr)             | | ||||
| |`KC_RIGHT_GUI`  |`KC_RGUI`, `KC_RCMD`, `KC_RWIN`|Right GUI (Windows/Command/Meta key)| | ||||
| |`KC_RIGHT_GUI`  |`KC_RGUI`, `KC_RCMD`, `KC_RWIN`|Right GUI (Windows/Command/Super key)| | ||||
| 
 | ||||
| ## International | ||||
| 
 | ||||
|  | ||||
| @ -9,11 +9,11 @@ The modifiers (`mod`) argument to the `MT()` macro are prefixed with `MOD_`, not | ||||
| |`MOD_LCTL`|Left Control                            | | ||||
| |`MOD_LSFT`|Left Shift                              | | ||||
| |`MOD_LALT`|Left Alt                                | | ||||
| |`MOD_LGUI`|Left GUI (Windows/Command/Meta key)     | | ||||
| |`MOD_LGUI`|Left GUI (Windows/Command/Super key)    | | ||||
| |`MOD_RCTL`|Right Control                           | | ||||
| |`MOD_RSFT`|Right Shift                             | | ||||
| |`MOD_RALT`|Right Alt (AltGr)                       | | ||||
| |`MOD_RGUI`|Right GUI (Windows/Command/Meta key)    | | ||||
| |`MOD_RGUI`|Right GUI (Windows/Command/Super key)   | | ||||
| |`MOD_HYPR`|Hyper (Left Control, Shift, Alt and GUI)| | ||||
| |`MOD_MEH` |Meh (Left Control, Shift, and Alt)      | | ||||
| 
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user