diff options
| author | toinux <toinux@gmail.com> | 2023-03-18 18:26:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-18 11:26:42 -0600 |
| commit | 319da117b715b54d6f7092732367db62e4848181 (patch) | |
| tree | d3daa5830fad4368ff8a55a7a464d131137ba487 | |
| parent | f8e89a1fe488ff6da8b53756c544912cfd7c2803 (diff) | |
[Keymap] crkbd toinux update (#19673)
| -rw-r--r-- | keyboards/crkbd/keymaps/toinux/config.h | 84 | ||||
| -rw-r--r-- | keyboards/crkbd/keymaps/toinux/keycodes.h | 2 | ||||
| -rw-r--r-- | keyboards/crkbd/keymaps/toinux/keymap.c | 19 | ||||
| -rw-r--r-- | keyboards/crkbd/keymaps/toinux/rgb.c | 7 | ||||
| -rw-r--r-- | users/toinux/keymap_qwerty_fr.h | 91 |
5 files changed, 106 insertions, 97 deletions
diff --git a/keyboards/crkbd/keymaps/toinux/config.h b/keyboards/crkbd/keymaps/toinux/config.h index c033076a5a..83fe82aa8d 100644 --- a/keyboards/crkbd/keymaps/toinux/config.h +++ b/keyboards/crkbd/keymaps/toinux/config.h | |||
| @@ -66,51 +66,51 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 66 | // RGB Matrix Animation modes. Explicitly enabled | 66 | // RGB Matrix Animation modes. Explicitly enabled |
| 67 | // For full list of effects, see: | 67 | // For full list of effects, see: |
| 68 | // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects | 68 | // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects |
| 69 | // # define ENABLE_RGB_MATRIX_ALPHAS_MODS | 69 | # undef ENABLE_RGB_MATRIX_ALPHAS_MODS |
| 70 | // # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN | 70 | # undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN |
| 71 | // # define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT | 71 | # undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT |
| 72 | // # define ENABLE_RGB_MATRIX_BREATHING | 72 | # undef ENABLE_RGB_MATRIX_BREATHING |
| 73 | // # define ENABLE_RGB_MATRIX_BAND_SAT | 73 | # undef ENABLE_RGB_MATRIX_BAND_SAT |
| 74 | // # define ENABLE_RGB_MATRIX_BAND_VAL | 74 | # undef ENABLE_RGB_MATRIX_BAND_VAL |
| 75 | // # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT | 75 | # undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT |
| 76 | // # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL | 76 | # undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL |
| 77 | // # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT | 77 | # undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT |
| 78 | // # define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL | 78 | # undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL |
| 79 | // # define ENABLE_RGB_MATRIX_CYCLE_ALL | 79 | # undef ENABLE_RGB_MATRIX_CYCLE_ALL |
| 80 | // # define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT | 80 | # undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT |
| 81 | // # define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN | 81 | # undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN |
| 82 | // # define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON | 82 | # undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON |
| 83 | // # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN | 83 | # undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN |
| 84 | // # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL | 84 | # undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL |
| 85 | // # define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL | 85 | # undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL |
| 86 | // # define ENABLE_RGB_MATRIX_CYCLE_SPIRAL | 86 | # undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL |
| 87 | // # define ENABLE_RGB_MATRIX_DUAL_BEACON | 87 | # undef ENABLE_RGB_MATRIX_DUAL_BEACON |
| 88 | // # define ENABLE_RGB_MATRIX_RAINBOW_BEACON | 88 | # undef ENABLE_RGB_MATRIX_RAINBOW_BEACON |
| 89 | // # define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS | 89 | # undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS |
| 90 | // # define ENABLE_RGB_MATRIX_RAINDROPS | 90 | # undef ENABLE_RGB_MATRIX_RAINDROPS |
| 91 | // # define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS | 91 | # undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS |
| 92 | // # define ENABLE_RGB_MATRIX_HUE_BREATHING | 92 | # undef ENABLE_RGB_MATRIX_HUE_BREATHING |
| 93 | // # define ENABLE_RGB_MATRIX_HUE_PENDULUM | 93 | # undef ENABLE_RGB_MATRIX_HUE_PENDULUM |
| 94 | // # define ENABLE_RGB_MATRIX_HUE_WAVE | 94 | # undef ENABLE_RGB_MATRIX_HUE_WAVE |
| 95 | // # define ENABLE_RGB_MATRIX_PIXEL_RAIN | 95 | # undef ENABLE_RGB_MATRIX_PIXEL_RAIN |
| 96 | // # define ENABLE_RGB_MATRIX_PIXEL_FLOW | 96 | # undef ENABLE_RGB_MATRIX_PIXEL_FLOW |
| 97 | // # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL | 97 | # undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL |
| 98 | // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined | 98 | // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined |
| 99 | // # define ENABLE_RGB_MATRIX_TYPING_HEATMAP | 99 | # undef ENABLE_RGB_MATRIX_TYPING_HEATMAP |
| 100 | // # define ENABLE_RGB_MATRIX_DIGITAL_RAIN | 100 | # undef ENABLE_RGB_MATRIX_DIGITAL_RAIN |
| 101 | // enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined | 101 | // enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined |
| 102 | // # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE | 102 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE |
| 103 | // # define ENABLE_RGB_MATRIX_SOLID_REACTIVE | 103 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE |
| 104 | // # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE | 104 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE |
| 105 | // # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE | 105 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE |
| 106 | // # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS | 106 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS |
| 107 | // # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS | 107 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS |
| 108 | # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS | 108 | # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS |
| 109 | // # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS | 109 | # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS |
| 110 | # define ENABLE_RGB_MATRIX_SPLASH | 110 | # define ENABLE_RGB_MATRIX_SPLASH |
| 111 | // # define ENABLE_RGB_MATRIX_MULTISPLASH | 111 | # undef ENABLE_RGB_MATRIX_MULTISPLASH |
| 112 | // # define ENABLE_RGB_MATRIX_SOLID_SPLASH | 112 | # undef ENABLE_RGB_MATRIX_SOLID_SPLASH |
| 113 | // # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH | 113 | # undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH |
| 114 | #endif | 114 | #endif |
| 115 | 115 | ||
| 116 | #define OLED_FONT_H "keyboards/crkbd/keymaps/toinux/glcdfont.c" | 116 | #define OLED_FONT_H "keyboards/crkbd/keymaps/toinux/glcdfont.c" |
| @@ -119,3 +119,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 119 | // #define SPLIT_LED_STATE_ENABLE | 119 | // #define SPLIT_LED_STATE_ENABLE |
| 120 | 120 | ||
| 121 | #define LAYER_STATE_16BIT | 121 | #define LAYER_STATE_16BIT |
| 122 | |||
| 123 | #define HOLD_ON_OTHER_KEY_PRESS_PER_KEY | ||
diff --git a/keyboards/crkbd/keymaps/toinux/keycodes.h b/keyboards/crkbd/keymaps/toinux/keycodes.h index 7d812f5c74..0d7c1e3260 100644 --- a/keyboards/crkbd/keymaps/toinux/keycodes.h +++ b/keyboards/crkbd/keymaps/toinux/keycodes.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* Copyright 2022 toinux | 1 | /* Copyright 2022 @toinux |
| 2 | * | 2 | * |
| 3 | * This program is free software: you can redistribute it and/or modify | 3 | * This program is free software: you can redistribute it and/or modify |
| 4 | * it under the terms of the GNU General Public License as published by | 4 | * it under the terms of the GNU General Public License as published by |
diff --git a/keyboards/crkbd/keymaps/toinux/keymap.c b/keyboards/crkbd/keymaps/toinux/keymap.c index bbc917c24a..3742ed9b82 100644 --- a/keyboards/crkbd/keymaps/toinux/keymap.c +++ b/keyboards/crkbd/keymaps/toinux/keymap.c | |||
| @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 59 | 59 | ||
| 60 | // Gaming | 60 | // Gaming |
| 61 | // ,-----------------------------------------------------. ,-----------------------------------------------------. | 61 | // ,-----------------------------------------------------. ,-----------------------------------------------------. |
| 62 | // | Esc | Q | W | E | R | T | | Y | U | I | O | P | Bksp | | 62 | // | Tab | Q | W | E | R | T | | Y | U | I | O | P | Bksp | |
| 63 | // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| | 63 | // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| 64 | // | Ctrl | A | S | D | F | G | | H | J | K | L | ;/Mous | ' | | 64 | // | Ctrl | A | S | D | F | G | | H | J | K | L | ;/Mous | ' | |
| 65 | // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| | 65 | // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| @@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 68 | // | LALT |GAMING2 | Space | | Spc/NAV| RAISE |ACCENTS | | 68 | // | LALT |GAMING2 | Space | | Spc/NAV| RAISE |ACCENTS | |
| 69 | // `--------------------------' `--------------------------' | 69 | // `--------------------------' `--------------------------' |
| 70 | [_GAMING] = LAYOUT_split_3x6_3( | 70 | [_GAMING] = LAYOUT_split_3x6_3( |
| 71 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, | 71 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, |
| 72 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, MOSCLN, KC_QUOT, | 72 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, MOSCLN, KC_QUOT, |
| 73 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFTENT, | 73 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFTENT, |
| 74 | KC_LALT, GAMING2, KC_SPC, SPCNAV, RAISE, ACCENTS | 74 | KC_LALT, GAMING2, KC_SPC, SPCNAV, RAISE, ACCENTS |
| @@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 79 | // ,-----------------------------------------------------. ,-----------------------------------------------------. | 79 | // ,-----------------------------------------------------. ,-----------------------------------------------------. |
| 80 | // | Tab | 1 | 2 | 3 | 4 | 5 | | | | | | | | | 80 | // | Tab | 1 | 2 | 3 | 4 | 5 | | | | | | | | |
| 81 | // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| | 81 | // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| 82 | // | Ctrl | 6 | 7 | 8 | 9 | 0 | | | | | | | | | 82 | // | Esc | 6 | 7 | 8 | 9 | 0 | | | | | | | | |
| 83 | // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| | 83 | // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| 84 | // | LGui | Base | | Vol- | Vol+ | Mute | | | | | | | | | 84 | // | LGui | Base | | Vol- | Vol+ | Mute | | | | | | | | |
| 85 | // `--------+--------+--------+--------+--------+--------+--------. .--------+--------+--------+--------+--------+--------+--------' | 85 | // `--------+--------+--------+--------+--------+--------+--------. .--------+--------+--------+--------+--------+--------+--------' |
| @@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 87 | // `--------------------------' `--------------------------' | 87 | // `--------------------------' `--------------------------' |
| 88 | [_GAMING2] = LAYOUT_split_3x6_3( | 88 | [_GAMING2] = LAYOUT_split_3x6_3( |
| 89 | KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 89 | KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
| 90 | KC_LCTL, KC_6, KC_7, KC_8, KC_9, KC_0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 90 | KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
| 91 | KC_LGUI, BASE, XXXXXXX, KC_VOLD, KC_VOLU, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 91 | KC_LGUI, BASE, XXXXXXX, KC_VOLD, KC_VOLU, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
| 92 | _______, _______, _______, _______, _______, _______ | 92 | _______, _______, _______, _______, _______, _______ |
| 93 | 93 | ||
| @@ -212,7 +212,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 212 | // | | | | | | | | | 212 | // | | | | | | | | |
| 213 | // `--------------------------' `--------------------------' | 213 | // `--------------------------' `--------------------------' |
| 214 | [_ADJUST] = LAYOUT_split_3x6_3( | 214 | [_ADJUST] = LAYOUT_split_3x6_3( |
| 215 | QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_NUM, KC_CAPS, KC_SCRL, XXXXXXX, XXXXXXX, XXXXXXX, | 215 | QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_NUM, KC_CAPS, KC_SCRL, XXXXXXX, XXXXXXX, XXXXXXX, |
| 216 | RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 216 | RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
| 217 | RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 217 | RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
| 218 | _______, _______, _______, _______, _______, _______ | 218 | _______, _______, _______, _______, _______, _______ |
| @@ -223,6 +223,15 @@ layer_state_t layer_state_set_user(layer_state_t state) { | |||
| 223 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | 223 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 224 | } | 224 | } |
| 225 | 225 | ||
| 226 | bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { | ||
| 227 | switch (keycode) { | ||
| 228 | case CTRLSC: | ||
| 229 | return true; | ||
| 230 | default: | ||
| 231 | return false; | ||
| 232 | } | ||
| 233 | } | ||
| 234 | |||
| 226 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 235 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 227 | 236 | ||
| 228 | #ifdef OLED_ENABLE | 237 | #ifdef OLED_ENABLE |
diff --git a/keyboards/crkbd/keymaps/toinux/rgb.c b/keyboards/crkbd/keymaps/toinux/rgb.c index 9a7feabad9..2b1a226602 100644 --- a/keyboards/crkbd/keymaps/toinux/rgb.c +++ b/keyboards/crkbd/keymaps/toinux/rgb.c | |||
| @@ -23,6 +23,7 @@ static const char gaming2_leds[] = {23, 18, 17, 10, 9, 22, 19, 16, 11, 8}; | |||
| 23 | static const char nav_leds[] = {38, 43, 44, 46}; | 23 | static const char nav_leds[] = {38, 43, 44, 46}; |
| 24 | static const char fun_leds[] = {45, 44, 37, 46, 43, 38, 47, 42, 39, 40}; | 24 | static const char fun_leds[] = {45, 44, 37, 46, 43, 38, 47, 42, 39, 40}; |
| 25 | static const char mouse_leds[] = {11, 16, 17, 19}; | 25 | static const char mouse_leds[] = {11, 16, 17, 19}; |
| 26 | static const char adjust_leds[] = {6, 33}; | ||
| 26 | 27 | ||
| 27 | bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { | 28 | bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { |
| 28 | if (host_keyboard_led_state().caps_lock) { | 29 | if (host_keyboard_led_state().caps_lock) { |
| @@ -32,7 +33,7 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { | |||
| 32 | case _GAMING: | 33 | case _GAMING: |
| 33 | if (is_keyboard_master()) { | 34 | if (is_keyboard_master()) { |
| 34 | for (uint8_t i = 0; i < 4; i++) { | 35 | for (uint8_t i = 0; i < 4; i++) { |
| 35 | rgb_matrix_set_color(gaming_leds[i], RGB_RED); | 36 | rgb_matrix_set_color(gaming_leds[i], 0x88, 0x00, 0x00); |
| 36 | } | 37 | } |
| 37 | } | 38 | } |
| 38 | break; | 39 | break; |
| @@ -54,7 +55,9 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { | |||
| 54 | } | 55 | } |
| 55 | break; | 56 | break; |
| 56 | case _ADJUST: | 57 | case _ADJUST: |
| 57 | rgb_matrix_set_color(6, RGB_RED); | 58 | for (uint8_t i = 0; i < 2; i++) { |
| 59 | rgb_matrix_set_color(adjust_leds[i], RGB_RED); | ||
| 60 | } | ||
| 58 | break; | 61 | break; |
| 59 | case _MOUSE: | 62 | case _MOUSE: |
| 60 | if (is_keyboard_master()) { | 63 | if (is_keyboard_master()) { |
diff --git a/users/toinux/keymap_qwerty_fr.h b/users/toinux/keymap_qwerty_fr.h index 3110ee984f..4bd50c4075 100644 --- a/users/toinux/keymap_qwerty_fr.h +++ b/users/toinux/keymap_qwerty_fr.h | |||
| @@ -20,33 +20,33 @@ | |||
| 20 | 20 | ||
| 21 | // clang-format off | 21 | // clang-format off |
| 22 | 22 | ||
| 23 | // keymap adapted for http://marin.jb.free.fr/qwerty-fr/ | 23 | // keymap adapted for https://qwerty-fr.org/ |
| 24 | 24 | ||
| 25 | /* AltGr symbols | 25 | /* AltGr symbols (* symbol = dead key) |
| 26 | * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ | 26 | * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ |
| 27 | * │ ` │ ¹ │ ² │ ³ │ ê │ € │ ^ │ ŷ │ û │ î │ ô │ – │ ≠ │ │ | 27 | * │* `│ ¹ │ ² │ ê │ € │* ¯│* ^│ û │ î │ ô │ ø │ ≠ │ │ |
| 28 | * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ | 28 | * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ |
| 29 | * │ │ â │ é │ è │ ® │ π │ ¥ │ ù │ î │ ò │ œ │ « │ » │ │ | 29 | * │ │ â │ é │ è │ ® │ þ │* ̑ │ ù │ î │ ò │ œ │ « │ » │ │ |
| 30 | * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ | 30 | * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ |
| 31 | * │ │ à │ æ │ ë │ ε │ │ ÿ │ ü │ ï │ ö │ │ ´ │ ¦ │ │ | 31 | * │ │ à │ æ │ ë │ │* │ ÿ │ ü │ ï │ ö │ │ ̀ │ │ │ |
| 32 | * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ | 32 | * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ |
| 33 | * │ │ ≤ │ ä │ × │ ç │ ω │ ß │ ñ │ µ │ ¸ │ │ ʕ │ │ | 33 | * │ │ ≤ │ ä │ × │ ç │ │ ß │ ñ │* * ¸│ │ ’ │ │ |
| 34 | * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ | 34 | * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ |
| 35 | * │ │ │ │ │ │ │ │ │ | 35 | * │ │ │ │ non-breaking space │ │ │ │ │ |
| 36 | * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ | 36 | * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ |
| 37 | */ | 37 | */ |
| 38 | // Row 1 | 38 | // Row 1 |
| 39 | #define QF_DGRV RALT(KC_GRV) // ` (dead) | 39 | #define QF_DGRV RALT(KC_GRV) // ` (dead) |
| 40 | #define QF_SUP1 RALT(KC_1) // ¹ | 40 | #define QF_SUP1 RALT(KC_1) // ¹ |
| 41 | #define QF_SUP2 RALT(KC_2) // ² | 41 | #define QF_SUP2 RALT(KC_2) // ² |
| 42 | #define QF_SUP3 RALT(KC_3) // ³ | 42 | #define QF_ECIR RALT(KC_3) // ê |
| 43 | #define QF_ECIR RALT(KC_4) // ê | 43 | #define QF_EURO RALT(KC_4) // € |
| 44 | #define QF_EURO RALT(KC_5) // € | 44 | #define QF_MACR RALT(KC_5) // ¯ (dead) |
| 45 | #define QF_DCIR RALT(KC_6) // ^ (dead) | 45 | #define QF_DCIR RALT(KC_6) // ^ (dead) |
| 46 | #define QF_YCIR RALT(KC_7) // ŷ | 46 | #define QF_UCIR RALT(KC_7) // û |
| 47 | #define QF_UCIR RALT(KC_8) // | 47 | #define QF_ICIR RALT(KC_8) // |
| 48 | #define QF_ICIR RALT(KC_9) // | 48 | #define QF_OCIR RALT(KC_9) // |
| 49 | #define QF_OCIR RALT(KC_0) // | 49 | #define QF_OSTR RALT(KC_0) // |
| 50 | #define QF_DASH RALT(KC_MINUS) // – | 50 | #define QF_DASH RALT(KC_MINUS) // – |
| 51 | #define QF_NEQL RALT(KC_EQUAL) // ≠ | 51 | #define QF_NEQL RALT(KC_EQUAL) // ≠ |
| 52 | // Row 2 | 52 | // Row 2 |
| @@ -54,8 +54,8 @@ | |||
| 54 | #define QF_EACU RALT(KC_W) // é | 54 | #define QF_EACU RALT(KC_W) // é |
| 55 | #define QF_EGRV RALT(KC_E) // è | 55 | #define QF_EGRV RALT(KC_E) // è |
| 56 | #define QF_REGD RALT(KC_R) // ® | 56 | #define QF_REGD RALT(KC_R) // ® |
| 57 | #define QF_PI RALT(KC_T) // π | 57 | #define QF_THRN RALT(KC_T) // þ |
| 58 | #define QF_YEN RALT(KC_Y) // ¥ | 58 | #define QF_RBRV RALT(KC_Y) // ̑ (dead) |
| 59 | #define QF_UGRV RALT(KC_U) // ù | 59 | #define QF_UGRV RALT(KC_U) // ù |
| 60 | #define QF_IGRV RALT(KC_I) // ì | 60 | #define QF_IGRV RALT(KC_I) // ì |
| 61 | #define QF_OGRV RALT(KC_O) // ò | 61 | #define QF_OGRV RALT(KC_O) // ò |
| @@ -66,65 +66,62 @@ | |||
| 66 | #define QF_AGRV RALT(KC_A) // à | 66 | #define QF_AGRV RALT(KC_A) // à |
| 67 | #define QF_AE RALT(KC_S) // æ | 67 | #define QF_AE RALT(KC_S) // æ |
| 68 | #define QF_EDIA RALT(KC_D) // ë | 68 | #define QF_EDIA RALT(KC_D) // ë |
| 69 | #define QF_EPSL RALT(KC_F) // ε | 69 | #define QF_GR RALT(KC_G) // Greek (dead) |
| 70 | #define QF_ALPH RALT(KC_G) // α | ||
| 71 | #define QF_YDIA RALT(KC_H) // ÿ | 70 | #define QF_YDIA RALT(KC_H) // ÿ |
| 72 | #define QF_UDIA RALT(KC_J) // ü | 71 | #define QF_UDIA RALT(KC_J) // ü |
| 73 | #define QF_IDIA RALT(KC_K) // ï | 72 | #define QF_IDIA RALT(KC_K) // ï |
| 74 | #define QF_ODIA RALT(KC_L) // ö | 73 | #define QF_ODIA RALT(KC_L) // ö |
| 75 | #define QF_PILC RALT(KC_SCLN) // ¶ | 74 | #define QF_ACUT RALT(KC_SCLN) // ´ (dead) |
| 76 | #define QF_ACUT RALT(KC_QUOT) // ´ (dead) | 75 | #define QF_AGR RALT(KC_QUOT) // ̀ (dead) |
| 77 | #define QF_BRKP RALT(KC_BSLS) // ¦ | ||
| 78 | // Row 4 | 76 | // Row 4 |
| 79 | #define QF_LTEQ RALT(KC_NUBS) // ≤ | 77 | #define QF_LTEQ RALT(KC_NUBS) // ≤ |
| 80 | #define QF_ADIA RALT(KC_Z) // ä | 78 | #define QF_ADIA RALT(KC_Z) // ä |
| 81 | #define QF_MUL RALT(KC_X) // × | 79 | #define QF_MUL RALT(KC_X) // × |
| 82 | #define QF_CCED RALT(KC_C) // ç | 80 | #define QF_CCED RALT(KC_C) // ç |
| 83 | #define QF_OMEG RALT(KC_V) // ω | ||
| 84 | #define QF_SS RALT(KC_B) // ß | 81 | #define QF_SS RALT(KC_B) // ß |
| 85 | #define QF_NTIL RALT(KC_N) // ñ | 82 | #define QF_NTIL RALT(KC_N) // ñ |
| 86 | #define QF_MICR RALT(KC_M) // µ | 83 | #define QF_MATH RALT(KC_M) // Math (dead) |
| 87 | #define QF_CEDL RALT(KC_COMM) // ¸ (dead) | 84 | #define QF_CEDL RALT(KC_COMM) // ¸ (dead) |
| 88 | #define QF_DEG RALT(KC_DOT) // | 85 | #define QF_MED RALT(KC_DOT) // |
| 89 | #define QF_VOPH RALT(KC_SLSH) // ʕ | 86 | #define QF_APO RALT(KC_SLSH) // ’ |
| 90 | // Row 5 | 87 | // Row 5 |
| 91 | #define QF_NBSP RALT(KC_SPC) // (non-breaking space) | 88 | #define QF_NBSP RALT(KC_SPC) // (non-breaking space) |
| 92 | 89 | ||
| 93 | 90 | ||
| 94 | /* Shift+AltGr symbols | 91 | /* Shift+AltGr symbols |
| 95 | * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ | 92 | * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ |
| 96 | * │ ~ │ ¡ │ ˝ │ ¯ │ Ê │ │ │ Ŷ │ Û │ Î │ Ô │ — │ ± │ │ | 93 | * │* ~│ ¡ │* ˝│ Ê │* │* │* ˇ│ Û │ Î │ Ô │ Ø │ ≈ │ │ |
| 97 | * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ | 94 | * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ |
| 98 | * │ │  │ É │ È │ © │ Π │ ¤ │ Ù │ Ì │ Ò │ Œ │ “ │ ” │ │ | 95 | * │ │  │ É │ È │ © │ Þ │* ˘│ Ù │ Ì │ Ò │ Œ │ “ │ ” │ │ |
| 99 | * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ | 96 | * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ |
| 100 | * │ │ À │ Æ │ Ë │ Δ │ β │ Ÿ │ Ü │ Ï │ │ │ ¨ │ ø │ │ | 97 | * │ │ À │ Æ │ Ë │ │ │ Ÿ │ Ü │ Ï │ │* │* ¨│ „ │ │ |
| 101 | * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ | 98 | * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ |
| 102 | * │ │ ≥ │ Ä │ ÷ │ Ç │ Ω │ þ │ Ñ │ Σ │ ˛ │ ˚ │ ¿ │ │ | 99 | * │ │ ≥ │ Ä │ ÷ │ Ç │ │ ẞ │ Ñ │ │ ˛ │ … │ ¿ │ │ |
| 103 | * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ | 100 | * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ |
| 104 | * │ │ │ │ │ │ │ │ │ | 101 | * │ │ │ │ narrow non-breaking spc│ │ │ │ │ |
| 105 | * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ | 102 | * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ |
| 106 | */ | 103 | */ |
| 107 | // Row 1 | 104 | // Row 1 |
| 108 | #define QF_DTIL S(RALT(KC_GRV)) // ~ (dead) | 105 | #define QF_DTIL S(RALT(KC_GRV)) // ~ (dead) |
| 109 | #define QF_IEXL S(RALT(KC_1)) // ¡ | 106 | #define QF_IEXL S(RALT(KC_1)) // ¡ |
| 110 | #define QF_DACU S(RALT(KC_2)) // ˝ (dead) | 107 | #define QF_DACU S(RALT(KC_2)) // ˝ (dead) |
| 111 | #define QF_MACR S(RALT(KC_3)) // ¯ (dead) | 108 | #define QF_ECIU S(RALT(KC_3)) // Ê |
| 112 | #define QF_ECIU S(RALT(KC_4)) // Ê | 109 | #define QF_CURR S(RALT(KC_4)) // ¤ (dead) |
| 113 | #define QF_PND S(RALT(KC_5)) // £ | 110 | #define QF_NTON S(RALT(KC_5)) // ˙ (dead) |
| 114 | #define QF_CARN S(RALT(KC_6)) // ˇ (dead) | 111 | #define QF_CARN S(RALT(KC_6)) // ˇ (dead) |
| 115 | #define QF_YCIU S(RALT(KC_7)) // Ŷ | 112 | #define QF_UCIU S(RALT(KC_7)) // Û |
| 116 | #define QF_UCIU S(RALT(KC_8)) // | 113 | #define QF_ICIU S(RALT(KC_8)) // |
| 117 | #define QF_ICIU S(RALT(KC_9)) // | 114 | #define QF_OCIO S(RALT(KC_9)) // |
| 118 | #define QF_OCIO S(RALT(KC_0)) // | 115 | #define QF_UOST S(RALT(KC_0)) // |
| 119 | #define QF_NDSH S(RALT(KC_MINUS)) // — | 116 | #define QF_NDSH S(RALT(KC_MINUS)) // — |
| 120 | #define QF_PLMN S(RALT(KC_EQUAL)) // ± | 117 | #define QF_APPR S(RALT(KC_EQUAL)) // ≈ |
| 121 | // Row 2 | 118 | // Row 2 |
| 122 | #define QF_ACIU S(RALT(KC_Q)) // Â | 119 | #define QF_ACIU S(RALT(KC_Q)) // Â |
| 123 | #define QF_ECUU S(RALT(KC_W)) // É | 120 | #define QF_ECUU S(RALT(KC_W)) // É |
| 124 | #define QF_EGRU S(RALT(KC_E)) // È | 121 | #define QF_EGRU S(RALT(KC_E)) // È |
| 125 | #define QF_COPY S(RALT(KC_R)) // © | 122 | #define QF_COPY S(RALT(KC_R)) // © |
| 126 | #define QF_PIU S(RALT(KC_T)) // Π | 123 | #define QF_UTRN S(RALT(KC_T)) // Þ |
| 127 | #define QF_CURR S(RALT(KC_Y)) // ¤ | 124 | #define QF_BRV S(RALT(KC_Y)) // ˘ (dead) |
| 128 | #define QF_UGRU S(RALT(KC_U)) // Ù | 125 | #define QF_UGRU S(RALT(KC_U)) // Ù |
| 129 | #define QF_IGRU S(RALT(KC_I)) // Ì | 126 | #define QF_IGRU S(RALT(KC_I)) // Ì |
| 130 | #define QF_OGRU S(RALT(KC_O)) // Ò | 127 | #define QF_OGRU S(RALT(KC_O)) // Ò |
| @@ -135,24 +132,22 @@ | |||
| 135 | #define QF_AGRU S(RALT(KC_A)) // À | 132 | #define QF_AGRU S(RALT(KC_A)) // À |
| 136 | #define QF_AEU S(RALT(KC_S)) // Æ | 133 | #define QF_AEU S(RALT(KC_S)) // Æ |
| 137 | #define QF_EDIU S(RALT(KC_D)) // Ë | 134 | #define QF_EDIU S(RALT(KC_D)) // Ë |
| 138 | #define QF_DELT S(RALT(KC_F)) // Δ | ||
| 139 | #define QF_BETA S(RALT(KC_G)) // β | ||
| 140 | #define QF_YDIU S(RALT(KC_H)) // Ÿ | 135 | #define QF_YDIU S(RALT(KC_H)) // Ÿ |
| 141 | #define QF_UDIU S(RALT(KC_J)) // Ü | 136 | #define QF_UDIU S(RALT(KC_J)) // Ü |
| 142 | #define QF_IDIU S(RALT(KC_K)) // Ï | 137 | #define QF_IDIU S(RALT(KC_K)) // Ï |
| 143 | #define QF_ODIU S(RALT(KC_L)) // Ö | 138 | #define QF_ODIU S(RALT(KC_L)) // Ö |
| 144 | #define QF_SECT S(RALT(KC_SCLN)) // | 139 | #define QF_DEG S(RALT(KC_SCLN)) // (dead) |
| 145 | #define QF_DIAE S(RALT(KC_QUOT)) // ¨ (dead) | 140 | #define QF_DIAE S(RALT(KC_QUOT)) // ¨ (dead) |
| 146 | #define QF_OSTR S(RALT(KC_BSLS)) // ø | 141 | #define QF_DLQM S(RALT(KC_BSLS)) // „ |
| 147 | // Row 4 | 142 | // Row 4 |
| 148 | #define QF_GTEQ S(RALT(KC_NUBS)) // ≥ | 143 | #define QF_GTEQ S(RALT(KC_NUBS)) // ≥ |
| 149 | #define QF_ADIU S(RALT(KC_Z)) // Ä | 144 | #define QF_ADIU S(RALT(KC_Z)) // Ä |
| 150 | #define QF_DIV S(RALT(KC_X)) // ÷ | 145 | #define QF_DIV S(RALT(KC_X)) // ÷ |
| 151 | #define QF_CCDU S(RALT(KC_C)) // Ç | 146 | #define QF_CCDU S(RALT(KC_C)) // Ç |
| 152 | #define QF_OMEU S(RALT(KC_V)) // Ω | 147 | #define QF_USS S(RALT(KC_B)) // ẞ |
| 153 | #define QF_THRN S(RALT(KC_B)) // þ | ||
| 154 | #define QF_NTIU S(RALT(KC_N)) // Ñ | 148 | #define QF_NTIU S(RALT(KC_N)) // Ñ |
| 155 | #define QF_SIGM S(RALT(KC_M)) // Σ | ||
| 156 | #define QF_OGON S(RALT(KC_COMM)) // ˛ (dead) | 149 | #define QF_OGON S(RALT(KC_COMM)) // ˛ (dead) |
| 157 | #define QF_RNGA S(RALT(KC_DOT)) // ˚ (dead) | 150 | #define QF_SUSP S(RALT(KC_DOT)) // … |
| 158 | #define QF_IQUE S(RALT(KC_SLSH)) // ¿ | 151 | #define QF_IQUE S(RALT(KC_SLSH)) // ¿ |
| 152 | // Row 5 | ||
| 153 | #define QF_NNBS RALT(KC_SPC) // (narrow non-breaking space) | ||
