aboutsummaryrefslogtreecommitdiff
path: root/keyboards/redox
diff options
context:
space:
mode:
authorMattia Dal Ben <mattdibi@users.noreply.github.com>2018-10-27 18:40:28 +0200
committerDrashna Jaelre <drashna@live.com>2018-10-27 09:40:28 -0700
commit9ea01035202e0d9b43413537702ac77b4c32108c (patch)
treeb1aa46898c47b6bd994a2ca490512ff36d704802 /keyboards/redox
parent569545a78f24644b1b130369d53932f7f46a588a (diff)
downloadqmk_firmware-9ea01035202e0d9b43413537702ac77b4c32108c.tar.gz
qmk_firmware-9ea01035202e0d9b43413537702ac77b4c32108c.zip
Keyboard: Redox keymaps refactoring (#4258)
* Reconfigured keymap macro to resemble physical layout * Updated italian keymap * Added RGB controls * Updated default keymap * Updated german layout * Updated jeherve keymap * Changed include guards to pragmas * Changed include guards to pragmas in keymaps * Update readme * Fixed unused include * Fixed indentation
Diffstat (limited to 'keyboards/redox')
-rw-r--r--keyboards/redox/config.h5
-rw-r--r--keyboards/redox/keymaps/default/config.h7
-rw-r--r--keyboards/redox/keymaps/default/keymap.c136
-rw-r--r--keyboards/redox/keymaps/german/keymap.c126
-rw-r--r--keyboards/redox/keymaps/italian/config.h7
-rw-r--r--keyboards/redox/keymaps/italian/keymap.c146
-rw-r--r--keyboards/redox/keymaps/jeherve/keymap.c179
-rw-r--r--keyboards/redox/readme.md10
-rw-r--r--keyboards/redox/redox.h22
-rw-r--r--keyboards/redox/rev1/config.h5
-rw-r--r--keyboards/redox/rev1/rev1.h74
11 files changed, 290 insertions, 427 deletions
diff --git a/keyboards/redox/config.h b/keyboards/redox/config.h
index 1083ff5f5..96f57f25e 100644
--- a/keyboards/redox/config.h
+++ b/keyboards/redox/config.h
@@ -15,9 +15,6 @@ You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>. 15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/ 16*/
17 17
18#ifndef CONFIG_H 18#pragma once
19#define CONFIG_H
20 19
21#include "config_common.h" 20#include "config_common.h"
22
23#endif
diff --git a/keyboards/redox/keymaps/default/config.h b/keyboards/redox/keymaps/default/config.h
index 22e26c004..0670bf294 100644
--- a/keyboards/redox/keymaps/default/config.h
+++ b/keyboards/redox/keymaps/default/config.h
@@ -15,10 +15,7 @@ You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>. 15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/ 16*/
17 17
18#ifndef CONFIG_USER_H 18#pragma once
19#define CONFIG_USER_H
20
21#include "../../config.h"
22 19
23/* Use I2C or Serial, not both */ 20/* Use I2C or Serial, not both */
24 21
@@ -37,5 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
37#define RGBLIGHT_HUE_STEP 8 34#define RGBLIGHT_HUE_STEP 8
38#define RGBLIGHT_SAT_STEP 8 35#define RGBLIGHT_SAT_STEP 8
39#define RGBLIGHT_VAL_STEP 8 36#define RGBLIGHT_VAL_STEP 8
40
41#endif
diff --git a/keyboards/redox/keymaps/default/keymap.c b/keyboards/redox/keymaps/default/keymap.c
index 3031a0c8e..ef8eeb2e1 100644
--- a/keyboards/redox/keymaps/default/keymap.c
+++ b/keyboards/redox/keymaps/default/keymap.c
@@ -18,99 +18,75 @@ enum custom_keycodes {
18 ADJUST, 18 ADJUST,
19}; 19};
20 20
21// Fillers to make layering more clear 21// Shortcut to make keymap more readable
22#define KC_ KC_TRNS 22#define KC_BKSL KC_BSLASH
23#define _______ KC_TRNS 23#define SYM_L MO(_SYMB)
24#define XXXXXXX KC_NO 24
25#define KC_ALAS LALT_T(KC_PAST)
26#define KC_CTPL LCTL_T(KC_PSLS)
27
28#define KC_NAGR LT(_NAV, KC_GRV)
29#define KC_NAMI LT(_NAV, KC_MINS)
30
31#define KC_ADEN LT(_ADJUST, KC_END)
32#define KC_ADPU LT(_ADJUST, KC_PGUP)
25 33
26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 34const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27 35
28/* QWERTY
29 * ,------------------------------------------------. ,------------------------------------------------.
30 * |`-Lyr2| 1 | 2 | 3 | 4 | 5 | Lyr1 | | Lyr1 | 6 | 7 | 8 | 9 | 0 |--Lyr2|
31 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
32 * | Tab | Q | W | E | R | T | [ | | ] | Y | U | I | O | P | = |
33 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
34 * | Esc | A | S | D | F | G | PgUp | | End | H | J | K | L | ; | ' |
35 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
36 * | Shift| Z | X | C | V | B | PgDn | | Home | N | M | , | . | \ |Shift |
37 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
38 * | Gui | + | - |*(Alt)|/(Ctr)|Bcksp | Del | |Enter |Space | Alt | Left | Down | Up | Right|
39 * `------------------------------------------------' `------------------------------------------------'
40 */
41 [_QWERTY] = LAYOUT( 36 [_QWERTY] = LAYOUT(
42 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. 37 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
43 LT(_NAV, KC_GRV) , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 ,MO(_SYMB), MO(_SYMB), KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,LT(_NAV, KC_MINS), 38 KC_NAGR ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 , KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_NAMI ,
44 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 39 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
45 KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T ,KC_LBRC, KC_RBRC , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_EQL, 40 KC_TAB ,KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,SYM_L , SYM_L ,KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,KC_EQL ,
46 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 41 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
47 KC_ESC , KC_A , KC_S , KC_D , KC_F , KC_G , LT(_ADJUST, KC_PGUP), LT( _ADJUST, KC_END) , KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_QUOT, 42 KC_ESC ,KC_A ,KC_S ,KC_D ,KC_F ,KC_G ,KC_LBRC , KC_RBRC ,KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN ,KC_QUOT ,
48 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 43 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
49 KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B ,KC_PGDN, KC_HOME , KC_N , KC_M ,KC_COMM,KC_DOT ,KC_BSLASH, KC_RSFT, 44 KC_LSFT ,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,KC_ADPU ,KC_PGDN , KC_HOME ,KC_ADEN ,KC_N ,KC_M ,KC_COMM ,KC_DOT ,KC_BKSL ,KC_RSFT ,
50 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 45 //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
51 KC_LGUI,KC_PPLS,KC_PMNS,LALT_T(KC_PAST),LCTL_T(KC_PSLS),KC_BSPC,KC_DEL , KC_ENT , KC_SPC, KC_RALT,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT 46 KC_LGUI ,KC_PPLS ,KC_PMNS ,KC_ALAS , KC_CTPL , KC_BSPC ,KC_DEL , KC_ENT ,KC_SPC , KC_RALT , KC_LEFT ,KC_DOWN ,KC_UP ,KC_RGHT
52 //`----+----+----+----+----+----+----' `----+----+----+----+----+----+----' 47 //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
53 ), 48 ),
54 49
55/* Symbols
56 * ,------------------------------------------------. ,------------------------------------------------.
57 * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | |
58 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
59 * | | ! | @ | { | } | | | | | | | 7 | 8 | 9 | | |
60 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
61 * | | # | $ | [ | ] | ~ | | | | | 4 | 5 | 6 | | |
62 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
63 * | | % | ^ | ( | ) | ` | | | | | 1 | 2 | 3 | | |
64 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
65 * | | | | | | | | | | | 0 | 0 | . | | |
66 * `------------------------------------------------' `------------------------------------------------'
67 */
68
69 [_SYMB] = LAYOUT( 50 [_SYMB] = LAYOUT(
70 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, 51 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
71 _______, KC_EXLM, KC_AT , KC_LCBR, KC_RCBR, KC_PIPE, _______, _______, XXXXXXX, KC_KP_7, KC_KP_8, KC_KP_9, XXXXXXX, XXXXXXX, 52 _______ ,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 , KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,XXXXXXX ,
72 _______, KC_HASH, KC_DLR , KC_LBRC, KC_RBRC, KC_GRV, _______, _______, XXXXXXX, KC_KP_4, KC_KP_5, KC_KP_6, XXXXXXX, XXXXXXX, 53 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
73 _______, KC_PERC, KC_CIRC, KC_LPRN, KC_RPRN, KC_TILD, _______, _______, XXXXXXX, KC_KP_1, KC_KP_2, KC_KP_3, XXXXXXX, XXXXXXX, 54 _______ ,KC_EXLM ,KC_AT ,KC_LCBR ,KC_RCBR ,KC_PIPE ,_______ , _______ ,XXXXXXX ,KC_KP_7 ,KC_KP_8 ,KC_KP_9 ,XXXXXXX ,XXXXXXX ,
74 _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_0, KC_KP_0, KC_PDOT, XXXXXXX, XXXXXXX 55 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
56 _______ ,KC_HASH ,KC_DLR ,KC_LBRC ,KC_RBRC ,KC_GRV ,_______ , _______ ,XXXXXXX ,KC_KP_4 ,KC_KP_5 ,KC_KP_6 ,XXXXXXX ,XXXXXXX ,
57 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
58 _______ ,KC_PERC ,KC_CIRC ,KC_LPRN ,KC_RPRN ,KC_TILD ,_______ ,_______ , _______ ,_______ ,XXXXXXX ,KC_KP_1 ,KC_KP_2 ,KC_KP_3 ,XXXXXXX ,XXXXXXX ,
59 //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
60 _______ ,_______ ,_______ ,_______ , _______ , _______ ,_______ , _______ ,_______ , KC_KP_0 , KC_KP_0 ,KC_PDOT ,XXXXXXX ,XXXXXXX
61 //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
75 ), 62 ),
76 63
77/* Navigation
78 * ,------------------------------------------------. ,------------------------------------------------.
79 * | | | | | | | | | | | | | | | |
80 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
81 * | | |MOUS_U| |WHEL_U| | | | | | | | | | |
82 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
83 * | |MOUS_L|MOUS_D|MOUS_R|WHEL_D| | | | | LEFT | DOWN | UP |RIGHT | | |
84 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
85 * | | | | | | | | | | | | | | | |
86 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
87 * | | | | |MOUS_1|MOUS_2| | | | | | | | | |
88 * `------------------------------------------------' `------------------------------------------------'
89 */
90 [_NAV] = LAYOUT( 64 [_NAV] = LAYOUT(
91 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 65 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
92 XXXXXXX, XXXXXXX, KC_MS_U, XXXXXXX, KC_WH_U, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 66 _______ ,_______ ,_______ ,_______ ,_______ ,_______ , _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
93 XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP , KC_RIGHT,XXXXXXX, XXXXXXX, 67 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
94 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 68 XXXXXXX ,XXXXXXX ,KC_MS_U ,XXXXXXX ,KC_WH_U ,XXXXXXX ,_______ , _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
95 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN2, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX 69 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
70 XXXXXXX ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_WH_D ,XXXXXXX ,_______ , _______ ,KC_LEFT ,KC_DOWN ,KC_UP ,KC_RIGHT,XXXXXXX ,XXXXXXX ,
71 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
72 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,_______ , _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
73 //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
74 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , KC_BTN1 , KC_BTN2 ,_______ , _______ ,_______ , XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
75 //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
96 ), 76 ),
97 77
98 [_ADJUST] = LAYOUT( 78 [_ADJUST] = LAYOUT(
99 XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, 79 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
100 XXXXXXX, RESET , RGB_M_P, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, XXXXXXX, KC_DEL, XXXXXXX, 80 XXXXXXX ,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 , KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,XXXXXXX ,
101 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 81 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
102 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 82 XXXXXXX ,RESET ,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI , RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
103 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX 83 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
84 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
85 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
86 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,XXXXXXX , XXXXXXX ,_______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
87 //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
88 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX , XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX , XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
89 //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
104 ) 90 )
105 91
106}; 92};
107
108#ifdef AUDIO_ENABLE
109float tone_qwerty[][2] = SONG(QWERTY_SOUND);
110#endif
111
112void persistent_default_layer_set(uint16_t default_layer) {
113 eeconfig_update_default_layer(default_layer);
114 default_layer_set(default_layer);
115}
116
diff --git a/keyboards/redox/keymaps/german/keymap.c b/keyboards/redox/keymaps/german/keymap.c
index 315740f68..f94cd164a 100644
--- a/keyboards/redox/keymaps/german/keymap.c
+++ b/keyboards/redox/keymaps/german/keymap.c
@@ -1,4 +1,5 @@
1#include QMK_KEYBOARD_H 1#include QMK_KEYBOARD_H
2
2#include "keymap_german.h" 3#include "keymap_german.h"
3 4
4extern keymap_config_t keymap_config; 5extern keymap_config_t keymap_config;
@@ -20,89 +21,76 @@ enum custom_keycodes {
20 ADJUST, 21 ADJUST,
21}; 22};
22 23
23// Fillers to make layering more clear 24// Shortcut to make keymap more readable
24#define KC_ KC_TRNS 25#define KC_BKSL KC_BSLASH
25#define _______ KC_TRNS 26#define SYM_L MO(_SYMB)
26#define XXXXXXX KC_NO 27
28#define KC_ALAS LALT_T(KC_PAST)
29#define KC_CTPL LCTL_T(KC_PSLS)
30
31#define KC_NAGR LT(_NAV, DE_CIRC)
32#define KC_NAMI LT(_NAV, DE_SS)
33
34#define KC_ADEN LT(_ADJUST, KC_END)
35#define KC_ADPU LT(_ADJUST, KC_PGUP)
27 36
28const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 37const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
29 38
30/* QWERTY
31 * ,------------------------------------------------. ,------------------------------------------------.
32 * |^/Lyr2| 1 | 2 | 3 | 4 | 5 | Lyr1 | | Lyr1 | 6 | 7 | 8 | 9 | 0 |--Lyr2|
33 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
34 * | Tab | Q | W | E | R | T | ` | | + | Y | U | I | O | P | = |
35 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
36 * | Esc | A | S | D | F | G | PgUp | | End | H | J | K | L | Ö | Ä |
37 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
38 * | Shift| Z | X | C | V | B | PgDn | | Home | N | M | , | . | - |Shift |
39 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
40 * | Gui | < | # |*(Alt)|/(Ctr)|Bcksp | Del | |Enter |Space | Alt | Left | Down | Up | Right|
41 * `------------------------------------------------' `------------------------------------------------'
42 */
43 [_QWERTY] = LAYOUT( 39 [_QWERTY] = LAYOUT(
44 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. 40 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
45 LT(_NAV, DE_CIRC) , DE_1 , DE_2 , DE_3 , DE_4 , DE_5 ,MO(_SYMB), MO(_SYMB), DE_6 , DE_7 , DE_8 , DE_9 , DE_0 ,LT(_NAV, DE_SS), 41 KC_NAGR ,DE_1 ,DE_2 ,DE_3 ,DE_4 ,DE_5 , DE_6 ,DE_7 ,DE_8 ,DE_9 ,DE_0 ,KC_NAMI ,
46 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 42 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
47 KC_TAB , DE_Q , DE_W , DE_E , DE_R , DE_T , DE_ACUT, DE_PLUS , DE_Z , DE_U , DE_I , DE_O , DE_P , DE_UE, 43 KC_TAB ,DE_Q ,DE_W ,DE_E ,DE_R ,DE_T ,SYM_L , SYM_L ,DE_Z ,DE_U ,DE_I ,DE_O ,DE_P ,DE_UE ,
48 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 44 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
49 KC_ESC , DE_A , DE_S , DE_D , DE_F , DE_G , LT(_ADJUST, KC_PGUP), LT( _ADJUST, KC_END) , DE_H , DE_J , DE_K , DE_L , DE_OE , DE_AE, 45 KC_ESC ,DE_A ,DE_S ,DE_D ,DE_F ,DE_G ,DE_ACUT , DE_PLUS ,DE_H ,DE_J ,DE_K ,DE_L ,DE_OE ,DE_AE ,
50 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 46 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
51 KC_LSFT, DE_Y , DE_X , DE_C , DE_V , DE_B ,KC_PGDN, KC_HOME , DE_N , DE_M , DE_COMM, DE_DOT , DE_MINS , KC_RSFT, 47 KC_LSFT ,DE_Y ,DE_X ,DE_C ,DE_V ,DE_B ,KC_ADPU ,KC_PGDN , KC_HOME ,KC_ADEN ,DE_N ,DE_M ,DE_COMM ,DE_DOT ,DE_MINS ,KC_RSFT ,
52 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 48 //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
53 KC_LGUI , DE_LESS , DE_HASH , LALT_T(KC_KP_PLUS),LCTL_T(KC_KP_ASTERISK),KC_BSPC,KC_DEL , KC_ENT , KC_SPC, DE_ALGR , KC_LEFT, KC_DOWN, KC_UP , KC_RGHT 49 KC_LGUI ,KC_PPLS ,KC_PMNS ,KC_ALAS , KC_CTPL , KC_BSPC ,KC_DEL , KC_ENT ,KC_SPC , KC_RALT , KC_LEFT ,KC_DOWN ,KC_UP ,KC_RGHT
54 //`----+----+----+----+----+----+----' `----+----+----+----+----+----+----' 50 //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
55 ), 51 ),
56 52
57/* Symbols
58 * ,------------------------------------------------. ,------------------------------------------------.
59 * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
60 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
61 * | | ! | @ | { | } | | | | | | | 7 | 8 | 9 | | F12 |
62 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
63 * | | # | $ | [ | ] | ~ | | | | | 4 | 5 | 6 | | |
64 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
65 * | Shift| % | ^ | ( | ) | ` | | | | | 1 | 2 | 3 | |Shift |
66 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
67 * | | | | Alt | Ctrl | | | | | | 0 | 0 | . | | |
68 * `------------------------------------------------' `------------------------------------------------'
69 */
70 53
71 [_SYMB] = LAYOUT( 54 [_SYMB] = LAYOUT(
72 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, 55 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
73 _______, DE_EXLM, DE_AT , DE_LCBR, DE_RCBR, DE_PIPE, _______, _______, XXXXXXX, KC_KP_7, KC_KP_8, KC_KP_9, XXXXXXX, KC_F12, 56 _______ ,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 , KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,KC_F11 ,
74 _______, DE_HASH, DE_DLR , DE_LBRC, DE_RBRC, DE_TILD, _______, _______, XXXXXXX, KC_KP_4, KC_KP_5, KC_KP_6, XXXXXXX, XXXXXXX, 57 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
75 KC_LSFT, DE_PERC, DE_CIRC, DE_LPRN, DE_RPRN, DE_GRV, _______, _______, XXXXXXX, KC_KP_1, KC_KP_2, KC_KP_3, XXXXXXX, KC_RSFT, 58 _______ ,DE_EXLM ,DE_AT ,DE_LCBR ,DE_RCBR ,DE_PIPE ,_______ , _______ ,XXXXXXX ,KC_KP_7 ,KC_KP_8 ,KC_KP_9 ,XXXXXXX ,KC_F12 ,
76 _______, _______, _______, KC_LALT, KC_LCTL, _______, _______, _______, _______, KC_KP_0, KC_KP_0, KC_PDOT, XXXXXXX, XXXXXXX 59 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
60 _______ ,DE_HASH ,DE_DLR ,DE_LBRC ,DE_RBRC ,DE_TILD ,_______ , _______ ,XXXXXXX ,KC_KP_4 ,KC_KP_5 ,KC_KP_6 ,XXXXXXX ,XXXXXXX ,
61 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
62 KC_LSFT ,DE_PERC ,DE_CIRC ,DE_LPRN ,DE_RPRN ,DE_GRV ,_______ ,_______ , _______ ,_______ ,XXXXXXX ,KC_KP_1 ,KC_KP_2 ,KC_KP_3 ,XXXXXXX ,KC_RSFT ,
63 //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
64 _______ ,_______ ,_______ ,KC_LALT , KC_LCTL , _______ ,_______ , _______ ,_______ , KC_KP_0 , KC_KP_0 ,KC_PDOT ,XXXXXXX ,XXXXXXX
65 //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
77 ), 66 ),
78 67
79/* Navigation
80 * ,------------------------------------------------. ,------------------------------------------------.
81 * | | | | | | | | | | | | | | | |
82 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
83 * | | |MOUS_U| |WHEL_U| | | | | | | | | | |
84 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
85 * | |MOUS_L|MOUS_D|MOUS_R|WHEL_D| | | | | LEFT | DOWN | UP |RIGHT | | |
86 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
87 * | | | | | | | | | | | | | | | |
88 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
89 * | | | | |MOUS_1|MOUS_2| | | | | | | | | |
90 * `------------------------------------------------' `------------------------------------------------'
91 */
92 [_NAV] = LAYOUT( 68 [_NAV] = LAYOUT(
93 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 69 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
94 XXXXXXX, XXXXXXX, KC_MS_U, XXXXXXX, KC_WH_U, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 70 _______ ,_______ ,_______ ,_______ ,_______ ,_______ , _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
95 XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP , KC_RIGHT,XXXXXXX, XXXXXXX, 71 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
96 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 72 XXXXXXX ,XXXXXXX ,KC_MS_U ,XXXXXXX ,KC_WH_U ,XXXXXXX ,_______ , _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
97 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN2, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX 73 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
74 XXXXXXX ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_WH_D ,XXXXXXX ,_______ , _______ ,KC_LEFT ,KC_DOWN ,KC_UP ,KC_RIGHT,XXXXXXX ,XXXXXXX ,
75 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
76 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,_______ , _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
77 //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
78 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , KC_BTN1 , KC_BTN2 ,_______ , _______ ,_______ , XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
79 //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
98 ), 80 ),
99 81
100 [_ADJUST] = LAYOUT( 82 [_ADJUST] = LAYOUT(
101 XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, 83 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
102 XXXXXXX, RESET , RGB_M_P, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, XXXXXXX, KC_DEL, XXXXXXX, 84 XXXXXXX ,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 , KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,XXXXXXX ,
103 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 85 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
104 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 86 XXXXXXX ,RESET ,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI , RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
105 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX 87 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
88 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
89 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
90 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,XXXXXXX , XXXXXXX ,_______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
91 //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
92 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX , XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX , XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
93 //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
106 ) 94 )
107 95
108}; 96};
diff --git a/keyboards/redox/keymaps/italian/config.h b/keyboards/redox/keymaps/italian/config.h
index 22e26c004..0670bf294 100644
--- a/keyboards/redox/keymaps/italian/config.h
+++ b/keyboards/redox/keymaps/italian/config.h
@@ -15,10 +15,7 @@ You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>. 15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/ 16*/
17 17
18#ifndef CONFIG_USER_H 18#pragma once
19#define CONFIG_USER_H
20
21#include "../../config.h"
22 19
23/* Use I2C or Serial, not both */ 20/* Use I2C or Serial, not both */
24 21
@@ -37,5 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
37#define RGBLIGHT_HUE_STEP 8 34#define RGBLIGHT_HUE_STEP 8
38#define RGBLIGHT_SAT_STEP 8 35#define RGBLIGHT_SAT_STEP 8
39#define RGBLIGHT_VAL_STEP 8 36#define RGBLIGHT_VAL_STEP 8
40
41#endif
diff --git a/keyboards/redox/keymaps/italian/keymap.c b/keyboards/redox/keymaps/italian/keymap.c
index c590d2d2d..1eb34ff10 100644
--- a/keyboards/redox/keymaps/italian/keymap.c
+++ b/keyboards/redox/keymaps/italian/keymap.c
@@ -1,5 +1,7 @@
1#include QMK_KEYBOARD_H 1#include QMK_KEYBOARD_H
2 2
3#include "keymap_italian.h"
4
3extern keymap_config_t keymap_config; 5extern keymap_config_t keymap_config;
4 6
5// Each layer gets a name for readability, which is then used in the keymap matrix below. 7// Each layer gets a name for readability, which is then used in the keymap matrix below.
@@ -18,99 +20,83 @@ enum custom_keycodes {
18 ADJUST, 20 ADJUST,
19}; 21};
20 22
21// Fillers to make layering more clear 23// Shortcut to make keymap more readable
22#define KC_ KC_TRNS 24#define KC_BKSL KC_BSLASH
23#define _______ KC_TRNS 25#define SYM_L MO(_SYMB)
24#define XXXXXXX KC_NO 26
27#define KC_ALAS LALT_T(KC_PAST)
28#define KC_CTPL LCTL_T(KC_PSLS)
29
30#define KC_NAGR LT(_NAV, KC_GRV)
31#define KC_NAMI LT(_NAV, KC_MINS)
32
33#define KC_ADEN LT(_ADJUST, KC_END)
34#define KC_ADPU LT(_ADJUST, KC_PGUP)
35
36// Italian specific shortcuts
37#define ALT_IACC RALT_T(IT_IACC)
38#define GUI_LESS LGUI_T(IT_LESS)
39
40#define IT_SHSL RSFT_T(KC_SLSH)
41#define IT_GRV RALT(KC_MINS)
42#define IT_TILD RALT(KC_EQL)
25 43
26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 44const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27 45
28/* QWERTY
29 * ,------------------------------------------------. ,------------------------------------------------.
30 * |\-Lyr2| 1 | 2 | 3 | 4 | 5 | Lyr1 | | Lyr1 | 6 | 7 | 8 | 9 | 0 |'-Lyr2|
31 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
32 * | Tab | Q | W | E | R | T | [ | | ] | Y | U | I | O | P | è |
33 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
34 * | Esc | A | S | D | F | G | PgUp | | End | H | J | K | L | ò | à |
35 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
36 * | Shift| Z | X | C | V | B | PgDn | | Home | N | M | , | . | ù |-(Sft)|
37 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
38 * |<(Gui)| + | - |*(Alt)|/(Ctr)|Bcksp | Del | |Enter |Space |ì(AlG)| Left | Down | Up | Right|
39 * `------------------------------------------------' `------------------------------------------------'
40 */
41 [_QWERTY] = LAYOUT( 46 [_QWERTY] = LAYOUT(
42 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. 47 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
43 LT(_NAV, KC_GRV) , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 ,MO(_SYMB), MO(_SYMB), KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,LT(_NAV, KC_MINS), 48 KC_NAGR ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 , KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_NAMI ,
44 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 49 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
45 KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T ,RALT(KC_LBRC), RALT(KC_RBRC) , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_LBRC, 50 KC_TAB ,KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,SYM_L , SYM_L ,KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,IT_EACC ,
46 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 51 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
47 KC_ESC , KC_A , KC_S , KC_D , KC_F , KC_G , LT(_ADJUST, KC_PGUP), LT( _ADJUST, KC_END) , KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_QUOT, 52 KC_ESC ,KC_A ,KC_S ,KC_D ,KC_F ,KC_G ,IT_LBRC , IT_RBRC ,KC_H ,KC_J ,KC_K ,KC_L ,IT_OACC ,IT_AACC ,
48 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 53 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
49 KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B ,KC_PGDN, KC_HOME , KC_N , KC_M ,KC_COMM,KC_DOT ,KC_BSLASH,RSFT_T(KC_SLSH), 54 KC_LSFT ,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,KC_ADPU ,KC_PGDN , KC_HOME ,KC_ADEN ,KC_N ,KC_M ,KC_COMM ,KC_DOT ,IT_UACC ,IT_SHSL ,
50 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 55 //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
51 LGUI_T(KC_NONUS_BSLASH),KC_PPLS,KC_PMNS,LALT_T(KC_PAST),LCTL_T(KC_PSLS),KC_BSPC,KC_DEL , KC_ENT , KC_SPC, RALT_T(KC_EQL),KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT 56 GUI_LESS,KC_PPLS ,KC_PMNS ,KC_ALAS , KC_CTPL , KC_BSPC ,KC_DEL , KC_ENT ,KC_SPC , ALT_IACC, KC_LEFT ,KC_DOWN ,KC_UP ,KC_RGHT
52 //`----+----+----+----+----+----+----' `----+----+----+----+----+----+----' 57 //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
53 ), 58 ),
54 59
55/* Symbols
56 * ,------------------------------------------------. ,------------------------------------------------.
57 * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | |
58 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
59 * | | ! | @ | { | } | | | | | | | 7 | 8 | 9 | | |
60 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
61 * | | # | $ | [ | ] | ~ | | | | | 4 | 5 | 6 | | |
62 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
63 * | | % | ^ | ( | ) | ` | | | | | 1 | 2 | 3 | | |
64 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
65 * | | | | | | | | | | | 0 | 0 | . | | |
66 * `------------------------------------------------' `------------------------------------------------'
67 */
68
69 [_SYMB] = LAYOUT( 60 [_SYMB] = LAYOUT(
70 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, 61 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
71 _______, KC_EXLM, RALT(KC_SCLN), RALT(KC_LCBR), RALT(KC_RCBR), KC_TILD, _______, _______, XXXXXXX, KC_KP_7, KC_KP_8, KC_KP_9, XXXXXXX, XXXXXXX, 62 _______ ,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 , KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,XXXXXXX ,
72 _______, RALT(KC_QUOT), KC_DLR , RALT(KC_LBRC), RALT(KC_RBRC), RALT(KC_EQL), _______, _______, XXXXXXX, KC_KP_4, KC_KP_5, KC_KP_6, XXXXXXX, XXXXXXX, 63 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
73 _______, KC_PERC, LSFT(KC_EQL) , LSFT(KC_8), LSFT(KC_9), RALT(KC_MINS), _______, _______, XXXXXXX, KC_KP_1, KC_KP_2, KC_KP_3, XXXXXXX, XXXXXXX, 64 _______ ,IT_EXLM ,IT_AT ,IT_LCBR ,IT_RCBR ,IT_PIPE ,_______ , _______ ,XXXXXXX ,KC_KP_7 ,KC_KP_8 ,KC_KP_9 ,XXXXXXX ,XXXXXXX ,
74 _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_0, KC_KP_0, KC_PDOT, XXXXXXX, XXXXXXX 65 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
66 _______ ,IT_SHRP ,IT_DLR ,IT_LBRC ,IT_RBRC ,IT_GRV ,_______ , _______ ,XXXXXXX ,KC_KP_4 ,KC_KP_5 ,KC_KP_6 ,XXXXXXX ,XXXXXXX ,
67 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
68 _______ ,IT_PERC ,IT_CRC ,IT_LPRN ,IT_RPRN ,IT_TILD ,_______ ,_______ , _______ ,_______ ,XXXXXXX ,KC_KP_1 ,KC_KP_2 ,KC_KP_3 ,XXXXXXX ,XXXXXXX ,
69 //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
70 _______ ,_______ ,_______ ,_______ , _______ , _______ ,_______ , _______ ,_______ , KC_KP_0 , KC_KP_0 ,KC_PDOT ,XXXXXXX ,XXXXXXX
71 //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
75 ), 72 ),
76 73
77/* Navigation
78 * ,------------------------------------------------. ,------------------------------------------------.
79 * | | | | | | | | | | | | | | | |
80 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
81 * | | |MOUS_U| |WHEL_U| | | | | | | | | | |
82 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
83 * | |MOUS_L|MOUS_D|MOUS_R|WHEL_D| | | | | LEFT | DOWN | UP |RIGHT | | |
84 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
85 * | | | | | | | | | | | | | | | |
86 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
87 * | | | | |MOUS_1|MOUS_2| | | | | | | | | |
88 * `------------------------------------------------' `------------------------------------------------'
89 */
90 [_NAV] = LAYOUT( 74 [_NAV] = LAYOUT(
91 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 75 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
92 XXXXXXX, XXXXXXX, KC_MS_U, XXXXXXX, KC_WH_U, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 76 _______ ,_______ ,_______ ,_______ ,_______ ,_______ , _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
93 XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP , KC_RIGHT,XXXXXXX, XXXXXXX, 77 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
94 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 78 XXXXXXX ,XXXXXXX ,KC_MS_U ,XXXXXXX ,KC_WH_U ,XXXXXXX ,_______ , _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
95 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN2, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX 79 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
80 XXXXXXX ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_WH_D ,XXXXXXX ,_______ , _______ ,KC_LEFT ,KC_DOWN ,KC_UP ,KC_RIGHT,XXXXXXX ,XXXXXXX ,
81 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
82 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,_______ , _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
83 //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
84 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , KC_BTN1 , KC_BTN2 ,_______ , _______ ,_______ , XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
85 //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
96 ), 86 ),
97 87
98 [_ADJUST] = LAYOUT( 88 [_ADJUST] = LAYOUT(
99 XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, 89 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
100 XXXXXXX, RESET , RGB_M_P, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, XXXXXXX, KC_DEL, XXXXXXX, 90 XXXXXXX ,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 , KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,XXXXXXX ,
101 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 91 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
102 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 92 XXXXXXX ,RESET ,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI , RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
103 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX 93 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
94 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
95 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
96 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,XXXXXXX , XXXXXXX ,_______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
97 //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
98 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX , XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX , XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
99 //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
104 ) 100 )
105 101
106}; 102};
107
108#ifdef AUDIO_ENABLE
109float tone_qwerty[][2] = SONG(QWERTY_SOUND);
110#endif
111
112void persistent_default_layer_set(uint16_t default_layer) {
113 eeconfig_update_default_layer(default_layer);
114 default_layer_set(default_layer);
115}
116
diff --git a/keyboards/redox/keymaps/jeherve/keymap.c b/keyboards/redox/keymaps/jeherve/keymap.c
index d298fa9a3..f8dfc4854 100644
--- a/keyboards/redox/keymaps/jeherve/keymap.c
+++ b/keyboards/redox/keymaps/jeherve/keymap.c
@@ -28,11 +28,6 @@ enum custom_keycodes {
28 NBSP 28 NBSP
29}; 29};
30 30
31// Fillers to make layering more clear
32#define KC_ KC_TRNS
33#define _______ KC_TRNS
34#define XXXXXXX KC_NO
35
36// Make macros a bit simpler with this shortcut. 31// Make macros a bit simpler with this shortcut.
37#define TAP_ONCE(code) \ 32#define TAP_ONCE(code) \
38 register_code (code); \ 33 register_code (code); \
@@ -129,118 +124,98 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
129 return true; 124 return true;
130}; 125};
131 126
127// Shortcut to make keymap more readable
128#define KC_CTDN LCTL(KC_DOWN)
129#define KC_SYQT LT(_SYMB,KC_QUOT)
130#define SYM_L MO(_SYMB)
131#define MO_INTR MO(_INTER)
132#define TT_ADJ TT(_ADJUST)
133
134#define UC_00E0 UC(0x00E0)
135#define UC_00FC UC(0x00FC)
136#define UC_00E8 UC(0x00E8)
137#define UC_00F6 UC(0x00F6)
138#define UC_00E1 UC(0x00E1)
139#define UC_00F9 UC(0x00F9)
140#define UC_00E9 UC(0x00E9)
141#define UC_00ED UC(0x00ED)
142#define UC_00F3 UC(0x00F3)
143#define UC_00E2 UC(0x00E2)
144#define UC_00E7 UC(0x00E7)
145#define UC_0171 UC(0x0171)
146#define UC_00EA UC(0x00EA)
147#define UC_0151 UC(0x0151)
148
132const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 149const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
133 150
134/* COLEMAK
135 * ,------------------------------------------------. ,------------------------------------------------.
136 * | ` | 1 | 2 | 3 | 4 | 5 | Esc | | Exp | 6 | 7 | 8 | 9 | 0 | = |
137 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
138 * | Tab | Q | W | F | P | G | ( | | ) | J | L | U | Y | ; | \ |
139 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
140 * | Lay1 | A | R | S | T | D | Lay2 | | Lay2 | H | N | E | I | O |'/Lay1|
141 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
142 * | Shift| Z | X | C | V | B | Lay1 | | Lay1 | K | M | , | . | / |Shift |
143 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
144 * | Lay3 | Ctrl | Hyper| Alt | Cmd |Bcksp | Ctrl | |Enter |Space | Cmd | Lay4 | Hyper| Ctrl | Lay3 |
145 * `------------------------------------------------' `------------------------------------------------'
146 */
147 [_COLEMAK] = LAYOUT( 151 [_COLEMAK] = LAYOUT(
148 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. 152 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
149 KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 ,KC_ESC, LCTL(KC_DOWN), KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_EQL, 153 KC_GRV ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 , KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_EQL ,
150 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 154 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
151 KC_TAB , KC_Q , KC_W , KC_F , KC_P , KC_G , M_BRACKET_LEFT, M_BRACKET_RIGHT , KC_J , KC_L , KC_U , KC_Y , KC_SCLN , KC_BSLS, 155 KC_TAB ,KC_Q ,KC_W ,KC_F ,KC_P ,KC_G ,KC_ESC , KC_CTDN ,KC_J ,KC_L ,KC_U ,KC_Y ,KC_SCLN ,KC_BSLS ,
152 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 156 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
153 MO(_SYMB) , KC_A , KC_R , KC_S , KC_T , KC_D ,TT(_NAV), TT(_NAV) , KC_H , KC_N , KC_E , KC_I , KC_O , LT(_SYMB,KC_QUOT), 157 SYM_L ,KC_A ,KC_R ,KC_S ,KC_T ,KC_D ,M_BRACKET_LEFT, M_BRACKET_RIGHT ,KC_H ,KC_N ,KC_E ,KC_I ,KC_O ,KC_SYQT ,
154 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 158 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
155 KC_LSFT , KC_Z , KC_X , KC_C , KC_V , KC_B ,TT(_SYMB), TT(_SYMB) , KC_K , KC_M , KC_COMM , KC_DOT , KC_SLSH , KC_RSFT, 159 KC_LSFT ,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,TT(_NAV),TT(_SYMB), TT(_SYMB),TT(_NAV),KC_K ,KC_M ,KC_COMM ,KC_DOT ,KC_SLSH ,KC_RSFT ,
156 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 160 //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
157 MO(_INTER),KC_LCTL,KC_HYPR,KC_LALT, KC_LCMD, KC_BSPC,KC_LCTL, KC_ENT,KC_SPC , KC_RCMD , TT(_ADJUST),KC_HYPR,KC_RCTL,MO(_INTER) 161 MO_INTR ,KC_LCTL ,KC_HYPR ,KC_LALT , KC_LCMD , KC_BSPC ,KC_LCTL , KC_ENT ,KC_SPC , KC_RCMD , TT_ADJ ,KC_HYPR ,KC_RCTL ,MO_INTR
158 //`----+----+----+----+----+----+----' `----+----+----+----+----+----+----' 162 //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
159 ), 163 ),
160 164
161/* Symbols
162 * ,------------------------------------------------. ,------------------------------------------------.
163 * | | | | | | | | | | | | | | | |
164 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
165 * | | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | | |
166 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
167 * | | ! | @ | # | $ | % | | | | ^ | & | * | - | _ | |
168 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
169 * | | | | | | | | | | | | | | | |
170 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
171 * | | | | | | | | | | | | | | | |
172 * `------------------------------------------------' `------------------------------------------------'
173 */
174
175 [_SYMB] = LAYOUT( 165 [_SYMB] = LAYOUT(
176 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 166 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
177 _______, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_LCBR, KC_RCBR, KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , _______, 167 _______ ,_______ ,_______ ,_______ ,_______ ,_______ , _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
178 _______, KC_EXLM, KC_AT , KC_HASH, KC_DLR , KC_PERC, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_UNDS, _______, 168 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
179 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 169 _______ ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 ,KC_LCBR , KC_RCBR ,KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,_______ ,
180 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 170 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
171 _______ ,KC_EXLM ,KC_AT ,KC_HASH ,KC_DLR ,KC_PERC ,_______ , _______ ,KC_CIRC ,KC_AMPR ,KC_ASTR ,KC_MINS ,KC_UNDS ,_______ ,
172 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
173 _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ , _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
174 //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
175 _______ ,_______ ,_______ ,_______ , _______ , _______ ,_______ , _______ ,_______ , _______ , _______ ,_______ ,_______ ,_______
176 //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
181 ), 177 ),
182 178
183/* Navigation
184 * ,------------------------------------------------. ,------------------------------------------------.
185 * | | | | | | | | | | | | | | | |
186 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
187 * | | | | | | | | | | | | | | | |
188 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
189 * | | | |VOLDOW|VOL UP| MUTE | | | | LEFT | DOWN | UP |RIGHT | | |
190 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
191 * | | | | | | | | | | | | | | | |
192 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
193 * | | | | | | | | | | | | | | | |
194 * `------------------------------------------------' `------------------------------------------------'
195 */
196 [_NAV] = LAYOUT( 179 [_NAV] = LAYOUT(
197 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 180 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
198 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 181 _______ ,_______ ,_______ ,_______ ,_______ ,_______ , _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
199 XXXXXXX, XXXXXXX, KC_VOLD, KC_VOLU, KC_MUTE, XXXXXXX, _______, _______, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP , KC_RIGHT, XXXXXXX, 182 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
200 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 183 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ , _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
201 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______ 184 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
185 XXXXXXX ,XXXXXXX ,KC_VOLD ,KC_VOLU ,KC_MUTE ,XXXXXXX ,_______ , _______ ,XXXXXXX ,KC_LEFT ,KC_DOWN ,KC_UP ,KC_RIGHT,XXXXXXX ,
186 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
187 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ , _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
188 //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
189 _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX , XXXXXXX ,_______ , _______ ,XXXXXXX , XXXXXXX , _______ ,XXXXXXX ,XXXXXXX ,_______
190 //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
202 ), 191 ),
203 192
204/* i18n + emoji
205* ,------------------------------------------------. ,------------------------------------------------.
206* | | | | | | | | | | | | | | | |
207* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
208* | | à | 👋 | | | | | | | | ü | è | YOSHI| ö | |
209* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
210* | | á | |SHRUG | 👍 | | | | | | ú | é | í | ó | |
211* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
212* | | â | | ç | | | | | | | ű | ê | | ő | |
213* |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
214* | | | | | | | | | | | | | | | |
215* `------------------------------------------------' `------------------------------------------------'
216*/
217 [_INTER] = LAYOUT( 193 [_INTER] = LAYOUT(
218 XXXXXXX, _______ , _______, _______ , _______ , _______, _______, _______, _______, _______, _______, _______, _______, _______, 194 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
219 XXXXXXX, UC(0x00E0), WAVE , XXXXXXX , XXXXXXX , XXXXXXX, _______, _______, XXXXXXX, UC(0x00FC), UC(0x00E8), YOSHI, UC(0x00F6), XXXXXXX, 195 XXXXXXX ,_______ ,_______ ,_______ ,_______ ,_______ , _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
220 _______, UC(0x00E1), XXXXXXX, SHRUG , THUMB_UP, XXXXXXX, _______, _______, XXXXXXX, UC(0x00F9), UC(0x00E9), UC(0x00ED) , UC(0x00F3), _______, 196 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
221 XXXXXXX, UC(0x00E2), XXXXXXX, UC(0x00E7), XXXXXXX , XXXXXXX, _______, _______, XXXXXXX, UC(0x0171), UC(0x00EA), XXXXXXX, UC(0x0151), XXXXXXX, 197 XXXXXXX ,UC_00E0 ,WAVE ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ , _______ ,XXXXXXX ,UC_00FC ,UC_00E8 ,YOSHI ,UC_00F6 ,XXXXXXX ,
222 _______, XXXXXXX , XXXXXXX, XXXXXXX , XXXXXXX , XXXXXXX, _______, _______, NBSP, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______ 198 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
199 _______ ,UC_00E1 ,XXXXXXX ,SHRUG ,THUMB_UP,XXXXXXX ,_______ , _______ ,XXXXXXX ,UC_00F9 ,UC_00E9 ,UC_00ED ,UC_00F3 ,_______ ,
200 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
201 XXXXXXX ,UC_00E2 ,XXXXXXX ,UC_00E7 ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ , _______ ,XXXXXXX ,XXXXXXX ,UC_0171 ,UC_00EA ,XXXXXXX ,UC_0151 ,XXXXXXX ,
202 //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
203 _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX , XXXXXXX ,_______ , _______ ,NBSP , XXXXXXX , _______ ,XXXXXXX ,XXXXXXX ,_______
204 //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
223 ), 205 ),
224 206
225/* Adjust keyboard settings
226 * ,------------------------------------------------. ,------------------------------------------------.
227 * | | | | | | | | | | | | | | | |
228 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
229 * | | | | | | | | | | | | | | | |
230 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
231 * | | | RGB- | RGB+ |RGB ON| | | | | | RESET| DEBUG|AUD ON| | |
232 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
233 * | | | | | | | | | | | | | | | |
234 * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------|
235 * | | | | | | | | | | | | | | | |
236 * `------------------------------------------------' `------------------------------------------------'
237 */
238 [_ADJUST] = LAYOUT( 207 [_ADJUST] = LAYOUT(
239 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 208 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
240 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 209 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
241 _______, XXXXXXX, RGB_VAD, RGB_VAI, RGB_TOG, XXXXXXX, _______, _______, XXXXXXX, RESET , DEBUG , AU_TOG , XXXXXXX, _______, 210 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
242 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 211 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
243 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______ 212 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
213 _______ ,XXXXXXX ,RGB_VAD ,RGB_VAI ,RGB_TOG ,XXXXXXX ,_______ , _______ ,XXXXXXX ,RESET ,DEBUG ,AU_TOG ,XXXXXXX ,_______ ,
214 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
215 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ , _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
216 //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
217 _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX , XXXXXXX ,_______ , _______ ,XXXXXXX , XXXXXXX , _______ ,XXXXXXX ,XXXXXXX ,_______
218 //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
244 ) 219 )
245 220
246}; 221};
diff --git a/keyboards/redox/readme.md b/keyboards/redox/readme.md
index 8a2fc4b04..d237caf01 100644
--- a/keyboards/redox/readme.md
+++ b/keyboards/redox/readme.md
@@ -16,10 +16,14 @@
16 16
17Make example for this keyboard (after setting up your build environment): 17Make example for this keyboard (after setting up your build environment):
18 18
19 make redox/rev1:default 19```sh
20make redox/rev1:default
21```
20 22
21Example of flashing this keyboard: 23Example of flashing this keyboard:
22 24
23 make redox/rev1:default:avrdude 25```sh
26make redox/rev1:default:avrdude
27```
24 28
25See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. 29See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/redox/redox.h b/keyboards/redox/redox.h
index 73f5ab85a..2f08bddcc 100644
--- a/keyboards/redox/redox.h
+++ b/keyboards/redox/redox.h
@@ -13,29 +13,11 @@
13 * You should have received a copy of the GNU General Public License 13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16#ifndef REDOX_H 16
17#define REDOX_H 17#pragma once
18 18
19#ifdef KEYBOARD_redox_rev1 19#ifdef KEYBOARD_redox_rev1
20 #include "rev1.h" 20 #include "rev1.h"
21#endif 21#endif
22 22
23// Used to create a keymap using only KC_ prefixed keys
24#define LAYOUT_kc( \
25 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
26 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
27 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
28 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
29 L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \
30 ) \
31 KEYMAP( \
32 KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##L06, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, KC_##R06, \
33 KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##L16, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, KC_##R16, \
34 KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##L26, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, KC_##R26, \
35 KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, KC_##R36, \
36 KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##L46, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45, KC_##R46 \
37 )
38
39#include "quantum.h" 23#include "quantum.h"
40
41#endif
diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h
index fe951f722..f4ccbd2fd 100644
--- a/keyboards/redox/rev1/config.h
+++ b/keyboards/redox/rev1/config.h
@@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>. 15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/ 16*/
17 17
18#ifndef REV1_CONFIG_H 18#pragma once
19#define REV1_CONFIG_H
20 19
21#include "config_common.h" 20#include "config_common.h"
22 21
@@ -82,5 +81,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
82//#define NO_ACTION_ONESHOT 81//#define NO_ACTION_ONESHOT
83//#define NO_ACTION_MACRO 82//#define NO_ACTION_MACRO
84//#define NO_ACTION_FUNCTION 83//#define NO_ACTION_FUNCTION
85
86#endif
diff --git a/keyboards/redox/rev1/rev1.h b/keyboards/redox/rev1/rev1.h
index be6224750..1bc1531ee 100644
--- a/keyboards/redox/rev1/rev1.h
+++ b/keyboards/redox/rev1/rev1.h
@@ -1,66 +1,34 @@
1#ifndef REV1_H 1#pragma once
2#define REV1_H
3 2
4#include "../redox.h" 3#include "../redox.h"
5 4
6//void promicro_bootloader_jmp(bool program);
7#include "quantum.h" 5#include "quantum.h"
8 6
9 7
10#ifdef USE_I2C 8#ifdef USE_I2C
11#include <stddef.h> 9#include <stddef.h>
12#ifdef __AVR__ 10#ifdef __AVR__
13 #include <avr/io.h> 11 #include <avr/io.h>
14 #include <avr/interrupt.h> 12 #include <avr/interrupt.h>
15#endif 13#endif
16#endif 14#endif
17 15
18//void promicro_bootloader_jmp(bool program);
19
20#ifndef FLIP_HALF
21// Standard Keymap
22// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
23#define LAYOUT( \
24 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
25 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
26 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
27 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
28 L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \
29 ) \
30 { \
31 { L00, L01, L02, L03, L04, L05, L06 }, \
32 { L10, L11, L12, L13, L14, L15, L16 }, \
33 { L20, L21, L22, L23, L24, L25, L26 }, \
34 { L30, L31, L32, L33, L34, L35, L36 }, \
35 { L40, L41, L42, L43, L44, L45, L46 }, \
36 { R06, R05, R04, R03, R02, R01, R00 }, \
37 { R16, R15, R14, R13, R12, R11, R10 }, \
38 { R26, R25, R24, R23, R22, R21, R20 }, \
39 { R36, R35, R34, R33, R32, R31, R30 }, \
40 { R46, R45, R44, R43, R42, R41, R40 } \
41 }
42#else
43// Keymap with right side flipped
44// (TRRS jack on both halves are to the right)
45#define LAYOUT( \ 16#define LAYOUT( \
46 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ 17 k00, k01, k02, k03, k04, k05, k08, k09, k10, k11, k12, k13, \
47 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ 18 k14, k15, k16, k17, k18, k19, k06, k07, k22, k23, k24, k25, k26, k27, \
48 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ 19 k28, k29, k30, k31, k32, k33, k20, k21, k36, k37, k38, k39, k40, k41, \
49 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ 20 k42, k43, k44, k45, k46, k47, k34, k48, k49, k35, k50, k51, k52, k53, k54, k55, \
50 L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ 21 k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 \
51 ) \ 22) \
52 { \ 23{ \
53 { L00, L01, L02, L03, L04, L05, L06 }, \ 24 { k00, k01, k02, k03, k04, k05, k06 }, \
54 { L10, L11, L12, L13, L14, L15, L16 }, \ 25 { k14, k15, k16, k17, k18, k19, k20 }, \
55 { L20, L21, L22, L23, L24, L25, L26 }, \ 26 { k28, k29, k30, k31, k32, k33, k34 }, \
56 { L30, L31, L32, L33, L34, L35, L36 }, \ 27 { k42, k43, k44, k45, k46, k47, k48 }, \
57 { L40, L41, L42, L43, L44, L45, L46 }, \ 28 { k56, k57, k58, k59, k60, k61, k62 }, \
58 { R00, R01, R02, R03, R04, R05, R06 }, \ 29 { k13, k12, k11, k10, k09, k08, k07 }, \
59 { R10, R11, R12, R13, R14, R15, R16 }, \ 30 { k27, k26, k25, k24, k23, k22, k21 }, \
60 { R20, R21, R22, R23, R24, R25, R26 }, \ 31 { k41, k40, k39, k38, k37, k36, k35 }, \
61 { R30, R31, R32, R33, R34, R35, R36 }, \ 32 { k55, k54, k53, k52, k51, k50, k49 }, \
62 { R40, R41, R42, R43, R44, R45, R46 } \ 33 { k69, k68, k67, k66, k65, k64, k63 } \
63 } 34}
64#endif
65
66#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-19 01:36:47 +0000