aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Đorđević <vomindoraan@gmail.com>2018-12-12 19:17:19 +0100
committerDrashna Jaelre <drashna@live.com>2018-12-12 10:17:19 -0800
commit28fbf84cc5ff52f545011ea4198a6cc6d054f896 (patch)
treecaf444ec1231e5f0852eca8d07e2f8595a153002
parent8b6cdd17886db9847ff91be9c10a1788a7c74a6a (diff)
downloadqmk_firmware-28fbf84cc5ff52f545011ea4198a6cc6d054f896.tar.gz
qmk_firmware-28fbf84cc5ff52f545011ea4198a6cc6d054f896.zip
Add standard definitions for ALGR and KC_ALGR (#4389)
* Add standard ALGR defition, remove (re)definitions from language files * Use ALGR(kc) consistently in ALTGR(kc) aliases * Non-Nordic keymaps should not use NO_ALGR * Add standard KC_ALGR definition * Update docs with ALGR and KC_ALGR * Update SS_ALGR and ALGR_T aliases
-rw-r--r--docs/feature_advanced_keycodes.md4
-rw-r--r--docs/keycodes.md4
-rw-r--r--docs/keycodes_basic.md2
-rwxr-xr-xkeyboards/handwired/reddot/keymaps/default/keymap.c4
-rw-r--r--keyboards/xd75/keymaps/germanized/config.h1
-rw-r--r--quantum/keymap_extras/keymap_belgian.h5
-rw-r--r--quantum/keymap_extras/keymap_bepo.h5
-rw-r--r--quantum/keymap_extras/keymap_canadian_multilingual.h5
-rw-r--r--quantum/keymap_extras/keymap_fr_ch.h1
-rw-r--r--quantum/keymap_extras/keymap_french.h5
-rw-r--r--quantum/keymap_extras/keymap_german.h1
-rw-r--r--quantum/keymap_extras/keymap_german_ch.h1
-rw-r--r--quantum/keymap_extras/keymap_hungarian.h1
-rw-r--r--quantum/keymap_extras/keymap_italian.h1
-rw-r--r--quantum/keymap_extras/keymap_nordic.h1
-rw-r--r--quantum/keymap_extras/keymap_slovenian.h1
-rw-r--r--quantum/keymap_extras/keymap_spanish.h3
-rw-r--r--quantum/keymap_extras/keymap_uk.h3
-rw-r--r--quantum/quantum.h1
-rw-r--r--quantum/quantum_keycodes.h5
-rw-r--r--tmk_core/common/keycode.h1
21 files changed, 18 insertions, 37 deletions
diff --git a/docs/feature_advanced_keycodes.md b/docs/feature_advanced_keycodes.md
index bb5cb7419..e5f241f7f 100644
--- a/docs/feature_advanced_keycodes.md
+++ b/docs/feature_advanced_keycodes.md
@@ -68,7 +68,7 @@ These allow you to combine a modifier with a keycode. When pressed, the keydown
68|`LGUI(kc)`|`LCMD(kc)`, `LWIN(kc)`|Hold Left GUI and press `kc` | 68|`LGUI(kc)`|`LCMD(kc)`, `LWIN(kc)`|Hold Left GUI and press `kc` |
69|`RCTL(kc)`| |Hold Right Control and press `kc` | 69|`RCTL(kc)`| |Hold Right Control and press `kc` |
70|`RSFT(kc)`| |Hold Right Shift and press `kc` | 70|`RSFT(kc)`| |Hold Right Shift and press `kc` |
71|`RALT(kc)`| |Hold Right Alt and press `kc` | 71|`RALT(kc)`|`ALGR(kc)` |Hold Right Alt and press `kc` |
72|`RGUI(kc)`|`RCMD(kc)`, `LWIN(kc)`|Hold Right GUI and press `kc` | 72|`RGUI(kc)`|`RCMD(kc)`, `LWIN(kc)`|Hold Right GUI and press `kc` |
73|`HYPR(kc)`| |Hold Left Control, Shift, Alt and GUI and press `kc`| 73|`HYPR(kc)`| |Hold Left Control, Shift, Alt and GUI and press `kc`|
74|`MEH(kc)` | |Hold Left Control, Shift and Alt and press `kc` | 74|`MEH(kc)` | |Hold Left Control, Shift and Alt and press `kc` |
@@ -92,7 +92,7 @@ The modifiers this keycode and `OSM()` accept are prefixed with `MOD_`, not `KC_
92|`MOD_LGUI`|Left GUI (Windows/Command/Meta key) | 92|`MOD_LGUI`|Left GUI (Windows/Command/Meta key) |
93|`MOD_RCTL`|Right Control | 93|`MOD_RCTL`|Right Control |
94|`MOD_RSFT`|Right Shift | 94|`MOD_RSFT`|Right Shift |
95|`MOD_RALT`|Right Alt | 95|`MOD_RALT`|Right Alt (AltGr) |
96|`MOD_RGUI`|Right GUI (Windows/Command/Meta key) | 96|`MOD_RGUI`|Right GUI (Windows/Command/Meta key) |
97|`MOD_HYPR`|Hyper (Left Control, Shift, Alt and GUI)| 97|`MOD_HYPR`|Hyper (Left Control, Shift, Alt and GUI)|
98|`MOD_MEH` |Meh (Left Control, Shift, and Alt) | 98|`MOD_MEH` |Meh (Left Control, Shift, and Alt) |
diff --git a/docs/keycodes.md b/docs/keycodes.md
index 75b01389c..d12a85aa1 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -177,7 +177,7 @@ This is a reference only. Each group of keys links to the page documenting their
177|`KC_LGUI` |`KC_LCMD`, `KC_LWIN`|Left GUI (Windows/Command/Meta key) | 177|`KC_LGUI` |`KC_LCMD`, `KC_LWIN`|Left GUI (Windows/Command/Meta key) |
178|`KC_RCTRL` |`KC_RCTL` |Right Control | 178|`KC_RCTRL` |`KC_RCTL` |Right Control |
179|`KC_RSHIFT` |`KC_RSFT` |Right Shift | 179|`KC_RSHIFT` |`KC_RSFT` |Right Shift |
180|`KC_RALT` | |Right Alt | 180|`KC_RALT` |`KC_ALGR` |Right Alt (AltGr) |
181|`KC_RGUI` |`KC_RCMD`, `KC_RWIN`|Right GUI (Windows/Command/Meta key) | 181|`KC_RGUI` |`KC_RCMD`, `KC_RWIN`|Right GUI (Windows/Command/Meta key) |
182|`KC_SYSTEM_POWER` |`KC_PWR` |System Power Down | 182|`KC_SYSTEM_POWER` |`KC_PWR` |System Power Down |
183|`KC_SYSTEM_SLEEP` |`KC_SLEP` |System Sleep | 183|`KC_SYSTEM_SLEEP` |`KC_SLEP` |System Sleep |
@@ -331,7 +331,7 @@ This is a reference only. Each group of keys links to the page documenting their
331|`LGUI(kc)`|`LCMD(kc)`, `LWIN(kc)`|Hold Left GUI and press `kc` | 331|`LGUI(kc)`|`LCMD(kc)`, `LWIN(kc)`|Hold Left GUI and press `kc` |
332|`RCTL(kc)`| |Hold Right Control and press `kc` | 332|`RCTL(kc)`| |Hold Right Control and press `kc` |
333|`RSFT(kc)`| |Hold Right Shift and press `kc` | 333|`RSFT(kc)`| |Hold Right Shift and press `kc` |
334|`RALT(kc)`| |Hold Right Alt and press `kc` | 334|`RALT(kc)`|`ALGR(kc)` |Hold Right Alt and press `kc` |
335|`RGUI(kc)`|`RCMD(kc)`, `LWIN(kc)`|Hold Right GUI and press `kc` | 335|`RGUI(kc)`|`RCMD(kc)`, `LWIN(kc)`|Hold Right GUI and press `kc` |
336|`HYPR(kc)`| |Hold Left Control, Shift, Alt and GUI and press `kc`| 336|`HYPR(kc)`| |Hold Left Control, Shift, Alt and GUI and press `kc`|
337|`MEH(kc)` | |Hold Left Control, Shift and Alt and press `kc` | 337|`MEH(kc)` | |Hold Left Control, Shift and Alt and press `kc` |
diff --git a/docs/keycodes_basic.md b/docs/keycodes_basic.md
index 9cc00f032..cba876d34 100644
--- a/docs/keycodes_basic.md
+++ b/docs/keycodes_basic.md
@@ -116,7 +116,7 @@ The basic set of keycodes are based on the [HID Keyboard/Keypad Usage Page (0x07
116|`KC_LGUI` |`KC_LCMD`, `KC_LWIN`|Left GUI (Windows/Command/Meta key) | 116|`KC_LGUI` |`KC_LCMD`, `KC_LWIN`|Left GUI (Windows/Command/Meta key) |
117|`KC_RCTRL` |`KC_RCTL` |Right Control | 117|`KC_RCTRL` |`KC_RCTL` |Right Control |
118|`KC_RSHIFT`|`KC_RSFT` |Right Shift | 118|`KC_RSHIFT`|`KC_RSFT` |Right Shift |
119|`KC_RALT` | |Right Alt | 119|`KC_RALT` |`KC_ALGR` |Right Alt (AltGr) |
120|`KC_RGUI` |`KC_RCMD`, `KC_RWIN`|Right GUI (Windows/Command/Meta key)| 120|`KC_RGUI` |`KC_RCMD`, `KC_RWIN`|Right GUI (Windows/Command/Meta key)|
121 121
122## International 122## International
diff --git a/keyboards/handwired/reddot/keymaps/default/keymap.c b/keyboards/handwired/reddot/keymaps/default/keymap.c
index 44ee2ce51..c67cc0e4c 100755
--- a/keyboards/handwired/reddot/keymaps/default/keymap.c
+++ b/keyboards/handwired/reddot/keymaps/default/keymap.c
@@ -8,14 +8,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
8 KC_LALT, FR_AMP, FR_EACU, FR_QUOT, FR_APOS, FR_LPRN, KC_BSPACE, KC_DELETE, FR_MINS, FR_EGRV, FR_UNDS, FR_CCED, FR_AGRV, FR_RPRN, FR_EQL, KC_INSERT, KC_HOME, KC_PGUP,\ 8 KC_LALT, FR_AMP, FR_EACU, FR_QUOT, FR_APOS, FR_LPRN, KC_BSPACE, KC_DELETE, FR_MINS, FR_EGRV, FR_UNDS, FR_CCED, FR_AGRV, FR_RPRN, FR_EQL, KC_INSERT, KC_HOME, KC_PGUP,\
9 KC_LGUI, FR_A, FR_Z, KC_E, KC_R, KC_T, KC_LSFT, KC_ENT, KC_Y, KC_U, KC_I, KC_O, KC_P, FR_CIRC, FR_DLR, KC_DELETE, KC_END, KC_PGDOWN, KC_KP_PLUS,\ 9 KC_LGUI, FR_A, FR_Z, KC_E, KC_R, KC_T, KC_LSFT, KC_ENT, KC_Y, KC_U, KC_I, KC_O, KC_P, FR_CIRC, FR_DLR, KC_DELETE, KC_END, KC_PGDOWN, KC_KP_PLUS,\
10 KC_LCTL, FR_Q, KC_S, KC_D, KC_F, KC_G, KC_ENT, KC_H, KC_J, KC_K, KC_L, FR_M, FR_UGRV, FR_ASTR, KC_KP_1, KC_UP, KC_KP_3,\ 10 KC_LCTL, FR_Q, KC_S, KC_D, KC_F, KC_G, KC_ENT, KC_H, KC_J, KC_K, KC_L, FR_M, FR_UGRV, FR_ASTR, KC_KP_1, KC_UP, KC_KP_3,\
11 FR_LESS, FR_W, KC_X, KC_C, KC_V, KC_B, KC_SPACE, KC_SPACE, KC_N, FR_COMM, FR_SCLN, FR_COLN, FR_EXLM, NO_ALGR, KC_LEFT, KC_DOWN, KC_RIGHT, KC_KP_ENTER), 11 FR_LESS, FR_W, KC_X, KC_C, KC_V, KC_B, KC_SPACE, KC_SPACE, KC_N, FR_COMM, FR_SCLN, FR_COLN, FR_EXLM, FR_ALGR, KC_LEFT, KC_DOWN, KC_RIGHT, KC_KP_ENTER),
12 12
13 [1] = KEYMAP( 13 [1] = KEYMAP(
14 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TAB, KC_CAPS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_FN0, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,\ 14 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TAB, KC_CAPS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_FN0, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,\
15 KC_LALT, FR_AMP, FR_EACU, FR_QUOT, FR_APOS, FR_LPRN, KC_BSPACE, KC_DELETE, FR_MINS, FR_EGRV, FR_UNDS, FR_CCED, FR_AGRV, FR_RPRN, FR_EQL, KC_7, KC_8, KC_9,\ 15 KC_LALT, FR_AMP, FR_EACU, FR_QUOT, FR_APOS, FR_LPRN, KC_BSPACE, KC_DELETE, FR_MINS, FR_EGRV, FR_UNDS, FR_CCED, FR_AGRV, FR_RPRN, FR_EQL, KC_7, KC_8, KC_9,\
16 KC_LGUI, FR_A, FR_Z, KC_E, KC_R, KC_T, KC_LSFT, KC_ENT, KC_Y, KC_U, KC_I, KC_O, KC_P, FR_CIRC, FR_DLR, KC_4, KC_5, KC_6, KC_KP_PLUS,\ 16 KC_LGUI, FR_A, FR_Z, KC_E, KC_R, KC_T, KC_LSFT, KC_ENT, KC_Y, KC_U, KC_I, KC_O, KC_P, FR_CIRC, FR_DLR, KC_4, KC_5, KC_6, KC_KP_PLUS,\
17 KC_LCTL, FR_Q, KC_S, KC_D, KC_F, KC_G, KC_ENT, KC_H, KC_J, KC_K, KC_L, FR_M, FR_UGRV, FR_ASTR, KC_1, KC_2, KC_3,\ 17 KC_LCTL, FR_Q, KC_S, KC_D, KC_F, KC_G, KC_ENT, KC_H, KC_J, KC_K, KC_L, FR_M, FR_UGRV, FR_ASTR, KC_1, KC_2, KC_3,\
18 FR_LESS, FR_W, KC_X, KC_C, KC_V, KC_B, KC_SPACE, KC_SPACE, KC_N, FR_COMM, FR_SCLN, FR_COLN, FR_EXLM, NO_ALGR, KC_LEFT, KC_DOWN, KC_RIGHT, KC_KP_ENTER), 18 FR_LESS, FR_W, KC_X, KC_C, KC_V, KC_B, KC_SPACE, KC_SPACE, KC_N, FR_COMM, FR_SCLN, FR_COLN, FR_EXLM, FR_ALGR, KC_LEFT, KC_DOWN, KC_RIGHT, KC_KP_ENTER),
19}; 19};
20 20
21 21
diff --git a/keyboards/xd75/keymaps/germanized/config.h b/keyboards/xd75/keymaps/germanized/config.h
index 5b19bddb0..379b95471 100644
--- a/keyboards/xd75/keymaps/germanized/config.h
+++ b/keyboards/xd75/keymaps/germanized/config.h
@@ -28,7 +28,6 @@
28#define TAPPING_TERM 200 28#define TAPPING_TERM 200
29 29
30// Alt gr 30// Alt gr
31#define ALGR(kc) RALT(kc)
32#define DE_ALGR KC_RALT 31#define DE_ALGR KC_RALT
33 32
34// normal characters 33// normal characters
diff --git a/quantum/keymap_extras/keymap_belgian.h b/quantum/keymap_extras/keymap_belgian.h
index 764c56141..573fa2e8a 100644
--- a/quantum/keymap_extras/keymap_belgian.h
+++ b/quantum/keymap_extras/keymap_belgian.h
@@ -22,10 +22,7 @@
22#define BE_LALT KC_LGUI 22#define BE_LALT KC_LGUI
23 23
24// Alt gr 24// Alt gr
25#ifndef ALGR 25#define BE_ALGR KC_RALT
26#define ALGR(kc) RALT(kc)
27#endif
28#define NO_ALGR KC_RALT
29 26
30// Normal characters 27// Normal characters
31// Line 1 28// Line 1
diff --git a/quantum/keymap_extras/keymap_bepo.h b/quantum/keymap_extras/keymap_bepo.h
index 05fd2b002..e6545a7a8 100644
--- a/quantum/keymap_extras/keymap_bepo.h
+++ b/quantum/keymap_extras/keymap_bepo.h
@@ -21,10 +21,7 @@
21 21
22// Alt gr 22// Alt gr
23#ifndef ALTGR 23#ifndef ALTGR
24#define ALTGR(kc) RALT(kc) 24#define ALTGR(kc) ALGR(kc)
25#endif
26#ifndef ALGR
27#define ALGR(kc) ALTGR(kc)
28#endif 25#endif
29#define BP_ALGR KC_RALT 26#define BP_ALGR KC_RALT
30 27
diff --git a/quantum/keymap_extras/keymap_canadian_multilingual.h b/quantum/keymap_extras/keymap_canadian_multilingual.h
index 1d45bee32..fbeef2187 100644
--- a/quantum/keymap_extras/keymap_canadian_multilingual.h
+++ b/quantum/keymap_extras/keymap_canadian_multilingual.h
@@ -20,10 +20,7 @@
20 20
21// Alt gr 21// Alt gr
22#ifndef ALTGR 22#ifndef ALTGR
23#define ALTGR(kc) RALT(kc) 23#define ALTGR(kc) ALGR(kc)
24#endif
25#ifndef ALGR
26#define ALGR(kc) ALTGR(kc)
27#endif 24#endif
28 25
29#define CSA_ALTGR KC_RALT 26#define CSA_ALTGR KC_RALT
diff --git a/quantum/keymap_extras/keymap_fr_ch.h b/quantum/keymap_extras/keymap_fr_ch.h
index c0ca832a6..4eeca7209 100644
--- a/quantum/keymap_extras/keymap_fr_ch.h
+++ b/quantum/keymap_extras/keymap_fr_ch.h
@@ -19,7 +19,6 @@
19#include "keymap.h" 19#include "keymap.h"
20 20
21// Alt gr 21// Alt gr
22#define ALGR(kc) RALT(kc)
23#define FR_CH_ALGR KC_RALT 22#define FR_CH_ALGR KC_RALT
24 23
25// normal characters 24// normal characters
diff --git a/quantum/keymap_extras/keymap_french.h b/quantum/keymap_extras/keymap_french.h
index 3308dc5f7..d2de859ee 100644
--- a/quantum/keymap_extras/keymap_french.h
+++ b/quantum/keymap_extras/keymap_french.h
@@ -19,10 +19,7 @@
19#include "keymap.h" 19#include "keymap.h"
20 20
21// Alt gr 21// Alt gr
22#ifndef ALGR 22#define FR_ALGR KC_RALT
23#define ALGR(kc) RALT(kc)
24#endif
25#define NO_ALGR KC_RALT
26 23
27// Normal characters 24// Normal characters
28#define FR_SUP2 KC_GRV 25#define FR_SUP2 KC_GRV
diff --git a/quantum/keymap_extras/keymap_german.h b/quantum/keymap_extras/keymap_german.h
index e007c26ef..a215570fd 100644
--- a/quantum/keymap_extras/keymap_german.h
+++ b/quantum/keymap_extras/keymap_german.h
@@ -20,7 +20,6 @@
20#include "keymap.h" 20#include "keymap.h"
21 21
22// Alt gr 22// Alt gr
23#define ALGR(kc) RALT(kc)
24#define DE_ALGR KC_RALT 23#define DE_ALGR KC_RALT
25 24
26// normal characters 25// normal characters
diff --git a/quantum/keymap_extras/keymap_german_ch.h b/quantum/keymap_extras/keymap_german_ch.h
index 67350d660..f0376a17c 100644
--- a/quantum/keymap_extras/keymap_german_ch.h
+++ b/quantum/keymap_extras/keymap_german_ch.h
@@ -19,7 +19,6 @@
19#include "keymap.h" 19#include "keymap.h"
20 20
21// Alt gr 21// Alt gr
22#define ALGR(kc) RALT(kc)
23#define CH_ALGR KC_RALT 22#define CH_ALGR KC_RALT
24 23
25// normal characters 24// normal characters
diff --git a/quantum/keymap_extras/keymap_hungarian.h b/quantum/keymap_extras/keymap_hungarian.h
index b37244092..cd2dc94cf 100644
--- a/quantum/keymap_extras/keymap_hungarian.h
+++ b/quantum/keymap_extras/keymap_hungarian.h
@@ -20,7 +20,6 @@
20#include "keymap.h" 20#include "keymap.h"
21 21
22// Alt gr 22// Alt gr
23#define ALGR(kc) RALT(kc)
24#define HU_ALGR KC_RALT 23#define HU_ALGR KC_RALT
25 24
26// basic letters 25// basic letters
diff --git a/quantum/keymap_extras/keymap_italian.h b/quantum/keymap_extras/keymap_italian.h
index 0ff6ce876..f62908150 100644
--- a/quantum/keymap_extras/keymap_italian.h
+++ b/quantum/keymap_extras/keymap_italian.h
@@ -20,7 +20,6 @@
20#include "keymap.h" 20#include "keymap.h"
21 21
22// Alt gr 22// Alt gr
23#define ALGR(kc) RALT(kc)
24#define IT_ALGR KC_RALT 23#define IT_ALGR KC_RALT
25 24
26// normal characters 25// normal characters
diff --git a/quantum/keymap_extras/keymap_nordic.h b/quantum/keymap_extras/keymap_nordic.h
index 6b34db558..4210d3714 100644
--- a/quantum/keymap_extras/keymap_nordic.h
+++ b/quantum/keymap_extras/keymap_nordic.h
@@ -19,7 +19,6 @@
19#include "keymap.h" 19#include "keymap.h"
20 20
21// Alt gr 21// Alt gr
22#define ALGR(kc) RALT(kc)
23#define NO_ALGR KC_RALT 22#define NO_ALGR KC_RALT
24 23
25// Normal characters 24// Normal characters
diff --git a/quantum/keymap_extras/keymap_slovenian.h b/quantum/keymap_extras/keymap_slovenian.h
index f27123c2a..47f5bceed 100644
--- a/quantum/keymap_extras/keymap_slovenian.h
+++ b/quantum/keymap_extras/keymap_slovenian.h
@@ -21,7 +21,6 @@
21#include "keymap.h" 21#include "keymap.h"
22 22
23// Alt gr 23// Alt gr
24#define ALGR(kc) RALT(kc)
25#define SI_ALGR KC_RALT 24#define SI_ALGR KC_RALT
26 25
27//Swapped Z and Y 26//Swapped Z and Y
diff --git a/quantum/keymap_extras/keymap_spanish.h b/quantum/keymap_extras/keymap_spanish.h
index 224db7be1..19d12551a 100644
--- a/quantum/keymap_extras/keymap_spanish.h
+++ b/quantum/keymap_extras/keymap_spanish.h
@@ -19,8 +19,7 @@
19#include "keymap.h" 19#include "keymap.h"
20 20
21// Alt gr 21// Alt gr
22#define ALGR(kc) RALT(kc) 22#define ES_ALGR KC_RALT
23#define NO_ALGR KC_RALT
24 23
25// Normal characters 24// Normal characters
26#define ES_OVRR KC_GRV 25#define ES_OVRR KC_GRV
diff --git a/quantum/keymap_extras/keymap_uk.h b/quantum/keymap_extras/keymap_uk.h
index de47103cb..a7bcd697e 100644
--- a/quantum/keymap_extras/keymap_uk.h
+++ b/quantum/keymap_extras/keymap_uk.h
@@ -19,8 +19,7 @@
19#include "keymap.h" 19#include "keymap.h"
20 20
21// Alt gr 21// Alt gr
22#define ALGR(kc) RALT(kc) 22#define UK_ALGR KC_RALT
23#define NO_ALGR KC_RALT
24 23
25// Normal characters 24// Normal characters
26#define UK_HASH KC_NUHS 25#define UK_HASH KC_NUHS
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 41c7d8351..5920e4b13 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -197,6 +197,7 @@ extern uint32_t default_layer_state;
197#define SS_LALT(string) SS_DOWN(X_LALT) string SS_UP(X_LALT) 197#define SS_LALT(string) SS_DOWN(X_LALT) string SS_UP(X_LALT)
198#define SS_LSFT(string) SS_DOWN(X_LSHIFT) string SS_UP(X_LSHIFT) 198#define SS_LSFT(string) SS_DOWN(X_LSHIFT) string SS_UP(X_LSHIFT)
199#define SS_RALT(string) SS_DOWN(X_RALT) string SS_UP(X_RALT) 199#define SS_RALT(string) SS_DOWN(X_RALT) string SS_UP(X_RALT)
200#define SS_ALGR(string) SS_RALT(string)
200 201
201#define SEND_STRING(str) send_string_P(PSTR(str)) 202#define SEND_STRING(str) send_string_P(PSTR(str))
202extern const bool ascii_to_shift_lut[0x80]; 203extern const bool ascii_to_shift_lut[0x80];
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 7670d53e9..283b4a65c 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -470,6 +470,7 @@ enum quantum_keycodes {
470#define RCTL(kc) (QK_RCTL | (kc)) 470#define RCTL(kc) (QK_RCTL | (kc))
471#define RSFT(kc) (QK_RSFT | (kc)) 471#define RSFT(kc) (QK_RSFT | (kc))
472#define RALT(kc) (QK_RALT | (kc)) 472#define RALT(kc) (QK_RALT | (kc))
473#define ALGR(kc) RALT(kc)
473#define RGUI(kc) (QK_RGUI | (kc)) 474#define RGUI(kc) (QK_RGUI | (kc))
474#define RCMD(kc) RGUI(kc) 475#define RCMD(kc) RGUI(kc)
475#define RWIN(kc) RGUI(kc) 476#define RWIN(kc) RGUI(kc)
@@ -480,7 +481,7 @@ enum quantum_keycodes {
480#define SGUI(kc) (QK_LGUI | QK_LSFT | (kc)) 481#define SGUI(kc) (QK_LGUI | QK_LSFT | (kc))
481#define SCMD(kc) SGUI(kc) 482#define SCMD(kc) SGUI(kc)
482#define SWIN(kc) SGUI(kc) 483#define SWIN(kc) SGUI(kc)
483#define LCA(kc) (QK_LCTL | QK_LALT | (kc)) 484#define LCA(kc) (QK_LCTL | QK_LALT | (kc))
484 485
485#define MOD_HYPR 0xf 486#define MOD_HYPR 0xf
486#define MOD_MEH 0x7 487#define MOD_MEH 0x7
@@ -645,7 +646,7 @@ enum quantum_keycodes {
645#define ALT_T(kc) MT(MOD_LALT, kc) 646#define ALT_T(kc) MT(MOD_LALT, kc)
646#define LALT_T(kc) MT(MOD_LALT, kc) 647#define LALT_T(kc) MT(MOD_LALT, kc)
647#define RALT_T(kc) MT(MOD_RALT, kc) 648#define RALT_T(kc) MT(MOD_RALT, kc)
648#define ALGR_T(kc) MT(MOD_RALT, kc) // dual-function AltGR 649#define ALGR_T(kc) RALT_T(kc)
649 650
650#define GUI_T(kc) MT(MOD_LGUI, kc) 651#define GUI_T(kc) MT(MOD_LGUI, kc)
651#define CMD_T(kc) GUI_T(kc) 652#define CMD_T(kc) GUI_T(kc)
diff --git a/tmk_core/common/keycode.h b/tmk_core/common/keycode.h
index d6fef2beb..ac3edbd21 100644
--- a/tmk_core/common/keycode.h
+++ b/tmk_core/common/keycode.h
@@ -140,6 +140,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
140#define KC_LWIN KC_LGUI 140#define KC_LWIN KC_LGUI
141#define KC_RCTL KC_RCTRL 141#define KC_RCTL KC_RCTRL
142#define KC_RSFT KC_RSHIFT 142#define KC_RSFT KC_RSHIFT
143#define KC_ALGR KC_RALT
143#define KC_RCMD KC_RGUI 144#define KC_RCMD KC_RGUI
144#define KC_RWIN KC_RGUI 145#define KC_RWIN KC_RGUI
145 146