From bd27e7e16bab52e3eb170e6c01eb1ae2ac2ba43b Mon Sep 17 00:00:00 2001 From: Jeremy Bernhardt Date: Sat, 12 Jan 2019 20:42:35 -0600 Subject: [PATCH 1/9] Added aliases for OSX brightness --- tmk_core/common/keycode.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tmk_core/common/keycode.h b/tmk_core/common/keycode.h index ac3edbd21526..488559034b5a 100644 --- a/tmk_core/common/keycode.h +++ b/tmk_core/common/keycode.h @@ -192,6 +192,12 @@ along with this program. If not, see . #define KC_ACL1 KC_MS_ACCEL1 #define KC_ACL2 KC_MS_ACCEL2 +/* System Specfic Aliases */ +#define KC_MAC_BRIU KC_SLCK +#define KC_MAC_BRID KC_PAUS +#define KC_MAC_BRIGHTNESS_UP KC_SLCK +#define KC_MAC_BRIGHTNESS_DOWN KC_PAUS + /* Keyboard/Keypad Page (0x07) */ enum hid_keyboard_keypad_usage { KC_NO = 0x00, From be8f3a98980c95ce748dcafe226d03b0ec1beba9 Mon Sep 17 00:00:00 2001 From: Jeremy Bernhardt Date: Sat, 12 Jan 2019 21:03:27 -0600 Subject: [PATCH 2/9] Updated docs for alises --- docs/keycodes.md | 2 ++ tmk_core/common/keycode.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/keycodes.md b/docs/keycodes.md index 6f28bbb97aaa..dee40867e4a4 100644 --- a/docs/keycodes.md +++ b/docs/keycodes.md @@ -205,6 +205,8 @@ This is a reference only. Each group of keys links to the page documenting their |`KC_MEDIA_REWIND` |`KC_MRWD` |Previous Track (macOS) | |`KC_BRIGHTNESS_UP` |`KC_BRIU` |Brightness Up | |`KC_BRIGHTNESS_DOWN` |`KC_BRID` |Brightness Down | +|`KC_MAC_BRIGHTNESS_UP` |`KC_MAC_BRIU` |Brightness Up (macOS) | +|`KC_MAC_BRIGHTNESS_DWN`|`KC_MAC_BRID` |Brightness Down (macOS) | ## [Quantum Keycodes](quantum_keycodes.md#qmk-keycodes) diff --git a/tmk_core/common/keycode.h b/tmk_core/common/keycode.h index 488559034b5a..1a9d4a203afc 100644 --- a/tmk_core/common/keycode.h +++ b/tmk_core/common/keycode.h @@ -196,7 +196,7 @@ along with this program. If not, see . #define KC_MAC_BRIU KC_SLCK #define KC_MAC_BRID KC_PAUS #define KC_MAC_BRIGHTNESS_UP KC_SLCK -#define KC_MAC_BRIGHTNESS_DOWN KC_PAUS +#define KC_MAC_BRIGHTNESS_DWN KC_PAUS /* Keyboard/Keypad Page (0x07) */ enum hid_keyboard_keypad_usage { From 6f54b9db0c3bf27d7fa0061cf11425cc61f98037 Mon Sep 17 00:00:00 2001 From: Jeremy Bernhardt Date: Sat, 12 Jan 2019 21:45:37 -0600 Subject: [PATCH 3/9] Moved aliases, added docs to Brightness section --- docs/keycodes.md | 10 ++++------ tmk_core/common/keycode.h | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/docs/keycodes.md b/docs/keycodes.md index dee40867e4a4..6fdc19079e68 100644 --- a/docs/keycodes.md +++ b/docs/keycodes.md @@ -77,8 +77,8 @@ This is a reference only. Each group of keys links to the page documenting their |`KC_F11` | |F11 | |`KC_F12` | |F12 | |`KC_PSCREEN` |`KC_PSCR` |Print Screen | -|`KC_SCROLLLOCK` |`KC_SLCK` |Scroll Lock | -|`KC_PAUSE` |`KC_PAUS`, `KC_BRK` |Pause | +|`KC_SCROLLLOCK` |`KC_SLCK` |Scroll Lock (macOS: Brightness Down) | +|`KC_PAUSE` |`KC_PAUS`,`KC_BRK` |Pause (macOS: Brightness up.) | |`KC_INSERT` |`KC_INS` |Insert | |`KC_HOME` | |Home | |`KC_PGUP` | |Page Up | @@ -203,10 +203,8 @@ This is a reference only. Each group of keys links to the page documenting their |`KC_WWW_FAVORITES` |`KC_WFAV` |Browser Favorites (Windows) | |`KC_MEDIA_FAST_FORWARD`|`KC_MFFD` |Next Track (macOS) | |`KC_MEDIA_REWIND` |`KC_MRWD` |Previous Track (macOS) | -|`KC_BRIGHTNESS_UP` |`KC_BRIU` |Brightness Up | -|`KC_BRIGHTNESS_DOWN` |`KC_BRID` |Brightness Down | -|`KC_MAC_BRIGHTNESS_UP` |`KC_MAC_BRIU` |Brightness Up (macOS) | -|`KC_MAC_BRIGHTNESS_DWN`|`KC_MAC_BRID` |Brightness Down (macOS) | +|`KC_BRIGHTNESS_UP` |`KC_BRIU` |Brightness Up (macOS: use `KC_BRMU`) | +|`KC_BRIGHTNESS_DOWN` |`KC_BRID` |Brightness Down (macOS: use `KC_BRMD`) | ## [Quantum Keycodes](quantum_keycodes.md#qmk-keycodes) diff --git a/tmk_core/common/keycode.h b/tmk_core/common/keycode.h index 1a9d4a203afc..c6e687505007 100644 --- a/tmk_core/common/keycode.h +++ b/tmk_core/common/keycode.h @@ -121,6 +121,10 @@ along with this program. If not, see . #define KC_PEQL KC_KP_EQUAL #define KC_PCMM KC_KP_COMMA +/* System Specfic */ +#define KC_BRMU KC_SCROLLLOCK +#define KC_BRMD KC_PAUSE + /* Japanese specific */ #define KC_ZKHK KC_GRAVE #define KC_RO KC_INT1 @@ -192,12 +196,6 @@ along with this program. If not, see . #define KC_ACL1 KC_MS_ACCEL1 #define KC_ACL2 KC_MS_ACCEL2 -/* System Specfic Aliases */ -#define KC_MAC_BRIU KC_SLCK -#define KC_MAC_BRID KC_PAUS -#define KC_MAC_BRIGHTNESS_UP KC_SLCK -#define KC_MAC_BRIGHTNESS_DWN KC_PAUS - /* Keyboard/Keypad Page (0x07) */ enum hid_keyboard_keypad_usage { KC_NO = 0x00, From 61f6e4790ad2e6d815abe355caf54be59971ef79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20=C4=90or=C4=91evi=C4=87?= Date: Sun, 13 Jan 2019 01:18:29 -0600 Subject: [PATCH 4/9] Update docs/keycodes.md Co-Authored-By: germ --- docs/keycodes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/keycodes.md b/docs/keycodes.md index 6fdc19079e68..59a475b86047 100644 --- a/docs/keycodes.md +++ b/docs/keycodes.md @@ -77,7 +77,7 @@ This is a reference only. Each group of keys links to the page documenting their |`KC_F11` | |F11 | |`KC_F12` | |F12 | |`KC_PSCREEN` |`KC_PSCR` |Print Screen | -|`KC_SCROLLLOCK` |`KC_SLCK` |Scroll Lock (macOS: Brightness Down) | +|`KC_SCROLLLOCK` |`KC_SLCK`, `KC_BRMD` |Scroll Lock, Brightness Down (macOS) | |`KC_PAUSE` |`KC_PAUS`,`KC_BRK` |Pause (macOS: Brightness up.) | |`KC_INSERT` |`KC_INS` |Insert | |`KC_HOME` | |Home | From 9dbe726d5a68e0ed4219bbf3c3e4bfb1b0b54432 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Sun, 13 Jan 2019 01:23:55 -0600 Subject: [PATCH 5/9] Update docs/keycodes.md Co-Authored-By: germ --- docs/keycodes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/keycodes.md b/docs/keycodes.md index 59a475b86047..647497b2d342 100644 --- a/docs/keycodes.md +++ b/docs/keycodes.md @@ -78,7 +78,7 @@ This is a reference only. Each group of keys links to the page documenting their |`KC_F12` | |F12 | |`KC_PSCREEN` |`KC_PSCR` |Print Screen | |`KC_SCROLLLOCK` |`KC_SLCK`, `KC_BRMD` |Scroll Lock, Brightness Down (macOS) | -|`KC_PAUSE` |`KC_PAUS`,`KC_BRK` |Pause (macOS: Brightness up.) | +|`KC_PAUSE` |`KC_PAUS`, `KC_BRK` |Pause (macOS: Brightness up) | |`KC_INSERT` |`KC_INS` |Insert | |`KC_HOME` | |Home | |`KC_PGUP` | |Page Up | From d65cdbcfaa271acead98784ef717fabbf55eef97 Mon Sep 17 00:00:00 2001 From: Jeremy Bernhardt Date: Sun, 13 Jan 2019 07:26:34 +0000 Subject: [PATCH 6/9] Update keycode.h --- tmk_core/common/keycode.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tmk_core/common/keycode.h b/tmk_core/common/keycode.h index c6e687505007..ae3eb7ceb2f9 100644 --- a/tmk_core/common/keycode.h +++ b/tmk_core/common/keycode.h @@ -121,10 +121,6 @@ along with this program. If not, see . #define KC_PEQL KC_KP_EQUAL #define KC_PCMM KC_KP_COMMA -/* System Specfic */ -#define KC_BRMU KC_SCROLLLOCK -#define KC_BRMD KC_PAUSE - /* Japanese specific */ #define KC_ZKHK KC_GRAVE #define KC_RO KC_INT1 @@ -178,6 +174,10 @@ along with this program. If not, see . #define KC_BRIU KC_BRIGHTNESS_UP #define KC_BRID KC_BRIGHTNESS_DOWN +/* System Specfic */ +#define KC_BRMU KC_SCROLLLOCK +#define KC_BRMD KC_PAUSE + /* Mouse Keys */ #define KC_MS_U KC_MS_UP #define KC_MS_D KC_MS_DOWN From 94ce467510e244798d04417d3b79591589937ab9 Mon Sep 17 00:00:00 2001 From: Jeremy Bernhardt Date: Sun, 13 Jan 2019 07:27:57 +0000 Subject: [PATCH 7/9] Update keycode.h --- tmk_core/common/keycode.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmk_core/common/keycode.h b/tmk_core/common/keycode.h index ae3eb7ceb2f9..3e312b82921a 100644 --- a/tmk_core/common/keycode.h +++ b/tmk_core/common/keycode.h @@ -174,7 +174,7 @@ along with this program. If not, see . #define KC_BRIU KC_BRIGHTNESS_UP #define KC_BRID KC_BRIGHTNESS_DOWN -/* System Specfic */ +/* System Specific */ #define KC_BRMU KC_SCROLLLOCK #define KC_BRMD KC_PAUSE From 71515d8fdccdb94ade17630c4e5018d00bd04f5c Mon Sep 17 00:00:00 2001 From: Jeremy Bernhardt Date: Sun, 13 Jan 2019 07:30:31 +0000 Subject: [PATCH 8/9] Update keycodes.md --- docs/keycodes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/keycodes.md b/docs/keycodes.md index 647497b2d342..b5092571c8c9 100644 --- a/docs/keycodes.md +++ b/docs/keycodes.md @@ -77,7 +77,7 @@ This is a reference only. Each group of keys links to the page documenting their |`KC_F11` | |F11 | |`KC_F12` | |F12 | |`KC_PSCREEN` |`KC_PSCR` |Print Screen | -|`KC_SCROLLLOCK` |`KC_SLCK`, `KC_BRMD` |Scroll Lock, Brightness Down (macOS) | +|`KC_SCROLLLOCK` |`KC_SLCK`, `KC_BRMD`|Scroll Lock, Brightness Down (macOS) | |`KC_PAUSE` |`KC_PAUS`, `KC_BRK` |Pause (macOS: Brightness up) | |`KC_INSERT` |`KC_INS` |Insert | |`KC_HOME` | |Home | @@ -203,7 +203,7 @@ This is a reference only. Each group of keys links to the page documenting their |`KC_WWW_FAVORITES` |`KC_WFAV` |Browser Favorites (Windows) | |`KC_MEDIA_FAST_FORWARD`|`KC_MFFD` |Next Track (macOS) | |`KC_MEDIA_REWIND` |`KC_MRWD` |Previous Track (macOS) | -|`KC_BRIGHTNESS_UP` |`KC_BRIU` |Brightness Up (macOS: use `KC_BRMU`) | +|`KC_BRIGHTNESS_UP` |`KC_BRIU` |Brightness Up (macOS: use `KC_BRMU`) | |`KC_BRIGHTNESS_DOWN` |`KC_BRID` |Brightness Down (macOS: use `KC_BRMD`) | ## [Quantum Keycodes](quantum_keycodes.md#qmk-keycodes) From d89eae264cacf4014cf6691928fe41b9afa0451c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20=C4=90or=C4=91evi=C4=87?= Date: Sun, 13 Jan 2019 19:55:08 -0600 Subject: [PATCH 9/9] Update docs/keycodes.md Co-Authored-By: germ --- docs/keycodes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/keycodes.md b/docs/keycodes.md index b5092571c8c9..a98d1096be6e 100644 --- a/docs/keycodes.md +++ b/docs/keycodes.md @@ -78,7 +78,7 @@ This is a reference only. Each group of keys links to the page documenting their |`KC_F12` | |F12 | |`KC_PSCREEN` |`KC_PSCR` |Print Screen | |`KC_SCROLLLOCK` |`KC_SLCK`, `KC_BRMD`|Scroll Lock, Brightness Down (macOS) | -|`KC_PAUSE` |`KC_PAUS`, `KC_BRK` |Pause (macOS: Brightness up) | +|`KC_PAUSE` |`KC_PAUS`, `KC_BRK`, `KC_BRMU`|Pause, Brightness Up (macOS) | |`KC_INSERT` |`KC_INS` |Insert | |`KC_HOME` | |Home | |`KC_PGUP` | |Page Up |