diff options
Diffstat (limited to 'quantum')
-rw-r--r-- | quantum/keymap_extras/keymap_belgian.h | 5 | ||||
-rw-r--r-- | quantum/keymap_extras/keymap_bepo.h | 5 | ||||
-rw-r--r-- | quantum/keymap_extras/keymap_canadian_multilingual.h | 5 | ||||
-rw-r--r-- | quantum/keymap_extras/keymap_fr_ch.h | 1 | ||||
-rw-r--r-- | quantum/keymap_extras/keymap_french.h | 5 | ||||
-rw-r--r-- | quantum/keymap_extras/keymap_german.h | 1 | ||||
-rw-r--r-- | quantum/keymap_extras/keymap_german_ch.h | 1 | ||||
-rw-r--r-- | quantum/keymap_extras/keymap_hungarian.h | 1 | ||||
-rw-r--r-- | quantum/keymap_extras/keymap_italian.h | 1 | ||||
-rw-r--r-- | quantum/keymap_extras/keymap_nordic.h | 1 | ||||
-rw-r--r-- | quantum/keymap_extras/keymap_slovenian.h | 1 | ||||
-rw-r--r-- | quantum/keymap_extras/keymap_spanish.h | 3 | ||||
-rw-r--r-- | quantum/keymap_extras/keymap_uk.h | 3 | ||||
-rw-r--r-- | quantum/quantum.h | 1 | ||||
-rw-r--r-- | quantum/quantum_keycodes.h | 5 |
15 files changed, 10 insertions, 29 deletions
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)) |
202 | extern const bool ascii_to_shift_lut[0x80]; | 203 | extern 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) |