diff options
| author | noroadsleft <18669334+noroadsleft@users.noreply.github.com> | 2018-12-01 16:29:16 -0800 |
|---|---|---|
| committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2018-12-01 16:29:16 -0800 |
| commit | 064d9e21750e8c717aca5f79263ad93b6606e125 (patch) | |
| tree | 38fa67cdbb255a253823acd639596fbc3de29999 | |
| parent | a90331aec21a47ef3a9fe47425c9c7204bc768b5 (diff) | |
| download | qmk_firmware-064d9e21750e8c717aca5f79263ad93b6606e125.tar.gz qmk_firmware-064d9e21750e8c717aca5f79263ad93b6606e125.zip | |
handwired/promethium Refactor and Configurator support (#4524)
* handwired/promethium: refactor
- config.h files
- updated to use #pragma once
- removed redundant config.h includes
- layout macro moved from config.h to promethium.h
- layout macro renamed from KEYMAP_CUSTOM to LAYOUT
* handwired/promethium: Configurator support
| -rw-r--r-- | keyboards/handwired/promethium/config.h | 27 | ||||
| -rw-r--r-- | keyboards/handwired/promethium/info.json | 68 | ||||
| -rw-r--r-- | keyboards/handwired/promethium/keymaps/default/config.h | 7 | ||||
| -rw-r--r-- | keyboards/handwired/promethium/keymaps/default/keymap.c | 30 | ||||
| -rw-r--r-- | keyboards/handwired/promethium/keymaps/priyadi/config.h | 7 | ||||
| -rw-r--r-- | keyboards/handwired/promethium/keymaps/priyadi/keymap.c | 30 | ||||
| -rw-r--r-- | keyboards/handwired/promethium/promethium.h | 19 |
7 files changed, 120 insertions, 68 deletions
diff --git a/keyboards/handwired/promethium/config.h b/keyboards/handwired/promethium/config.h index ea5f2b76e..dca0aec2e 100644 --- a/keyboards/handwired/promethium/config.h +++ b/keyboards/handwired/promethium/config.h | |||
| @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License | |||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | along 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 | 21 | ||
| @@ -159,27 +158,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 159 | #define MAX_VOLTAGE 4.2 | 158 | #define MAX_VOLTAGE 4.2 |
| 160 | #define MIN_VOLTAGE 3.2 | 159 | #define MIN_VOLTAGE 3.2 |
| 161 | 160 | ||
| 162 | #define ___ KC_NO | ||
| 163 | |||
| 164 | #define KEYMAP_CUSTOM( \ | ||
| 165 | k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ | ||
| 166 | k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \ | ||
| 167 | k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \ | ||
| 168 | k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, \ | ||
| 169 | tp1, tp2, tp3 \ | ||
| 170 | ) \ | ||
| 171 | { \ | ||
| 172 | {k11, k12, k13, k14, k15, k16}, \ | ||
| 173 | {k21, k22, k23, k24, k25, k26}, \ | ||
| 174 | {k31, k32, k33, k34, k35, k36}, \ | ||
| 175 | {k41, k42, k43, k44, k45, k46}, \ | ||
| 176 | {k17, k18, k19, k1a, k1b, k1c}, \ | ||
| 177 | {k27, k28, k29, k2a, k2b, k2c}, \ | ||
| 178 | {k37, k38, k39, k3a, k3b, k3c}, \ | ||
| 179 | {k47, k48, k49, k4a, k4b, k4c}, \ | ||
| 180 | {tp1, tp2, tp3, ___, ___, ___} \ | ||
| 181 | } | ||
| 182 | |||
| 183 | #ifndef __ASSEMBLER__ // assembler doesn't like enum in .h file | 161 | #ifndef __ASSEMBLER__ // assembler doesn't like enum in .h file |
| 184 | enum led_sequence { | 162 | enum led_sequence { |
| 185 | LED_IND_LINUX, | 163 | LED_IND_LINUX, |
| @@ -351,6 +329,3 @@ enum led_sequence { | |||
| 351 | #define PS2_USART_ERROR (UCSR1A & ((1<<FE1) | (1<<DOR1) | (1<<UPE1))) | 329 | #define PS2_USART_ERROR (UCSR1A & ((1<<FE1) | (1<<DOR1) | (1<<UPE1))) |
| 352 | #define PS2_USART_RX_VECT USART1_RX_vect | 330 | #define PS2_USART_RX_VECT USART1_RX_vect |
| 353 | #endif | 331 | #endif |
| 354 | |||
| 355 | |||
| 356 | #endif | ||
diff --git a/keyboards/handwired/promethium/info.json b/keyboards/handwired/promethium/info.json new file mode 100644 index 000000000..2742ffa64 --- /dev/null +++ b/keyboards/handwired/promethium/info.json | |||
| @@ -0,0 +1,68 @@ | |||
| 1 | { | ||
| 2 | "keyboard_name": "Promethium51", | ||
| 3 | "url": "", | ||
| 4 | "maintainer": "qmk", | ||
| 5 | "width": 16, | ||
| 6 | "height": 5, | ||
| 7 | "layouts": { | ||
| 8 | "LAYOUT": { | ||
| 9 | "layout": [ | ||
| 10 | { "label": "k11", "x": 0, "y": 0.50 }, | ||
| 11 | { "label": "k12", "x": 1, "y": 0.30 }, | ||
| 12 | { "label": "k13", "x": 2, "y": 0.15 }, | ||
| 13 | { "label": "k14", "x": 3, "y": 0 }, | ||
| 14 | { "label": "k15", "x": 4, "y": 0.15 }, | ||
| 15 | { "label": "k16", "x": 5, "y": 0.15 }, | ||
| 16 | { "label": "k17", "x": 10, "y": 0.15 }, | ||
| 17 | { "label": "k18", "x": 11, "y": 0.15 }, | ||
| 18 | { "label": "k19", "x": 12, "y": 0 }, | ||
| 19 | { "label": "k1a", "x": 13, "y": 0.15 }, | ||
| 20 | { "label": "k1b", "x": 14, "y": 0.30 }, | ||
| 21 | { "label": "k1c", "x": 15, "y": 0.50 }, | ||
| 22 | |||
| 23 | { "label": "k21", "x": 0, "y": 1.50 }, | ||
| 24 | { "label": "k22", "x": 1, "y": 1.30 }, | ||
| 25 | { "label": "k23", "x": 2, "y": 1.15 }, | ||
| 26 | { "label": "k24", "x": 3, "y": 1 }, | ||
| 27 | { "label": "k25", "x": 4, "y": 1.15 }, | ||
| 28 | { "label": "k26", "x": 5, "y": 1.15 }, | ||
| 29 | { "label": "k27", "x": 10, "y": 1.15 }, | ||
| 30 | { "label": "k28", "x": 11, "y": 1.15 }, | ||
| 31 | { "label": "k29", "x": 12, "y": 1 }, | ||
| 32 | { "label": "k2a", "x": 13, "y": 1.15 }, | ||
| 33 | { "label": "k2b", "x": 14, "y": 1.30 }, | ||
| 34 | { "label": "k2c", "x": 15, "y": 1.50 }, | ||
| 35 | |||
| 36 | { "label": "k31", "x": 0, "y": 2.50 }, | ||
| 37 | { "label": "k32", "x": 1, "y": 2.30 }, | ||
| 38 | { "label": "k33", "x": 2, "y": 2.15 }, | ||
| 39 | { "label": "k34", "x": 3, "y": 2 }, | ||
| 40 | { "label": "k35", "x": 4, "y": 2.15 }, | ||
| 41 | { "label": "k36", "x": 5, "y": 2.15 }, | ||
| 42 | { "label": "k37", "x": 10, "y": 2.15 }, | ||
| 43 | { "label": "k38", "x": 11, "y": 2.15 }, | ||
| 44 | { "label": "k39", "x": 12, "y": 2 }, | ||
| 45 | { "label": "k3a", "x": 13, "y": 2.15 }, | ||
| 46 | { "label": "k3b", "x": 14, "y": 2.30 }, | ||
| 47 | { "label": "k3c", "x": 15, "y": 2.50 }, | ||
| 48 | |||
| 49 | { "label": "k41", "x": 0, "y": 3.50 }, | ||
| 50 | { "label": "k42", "x": 1, "y": 3.30 }, | ||
| 51 | { "label": "k43", "x": 2, "y": 3.15 }, | ||
| 52 | { "label": "k44", "x": 3, "y": 3 }, | ||
| 53 | { "label": "k45", "x": 4, "y": 3.15 }, | ||
| 54 | { "label": "k46", "x": 5, "y": 3.15 }, | ||
| 55 | { "label": "k47", "x": 10, "y": 3.15 }, | ||
| 56 | { "label": "k48", "x": 11, "y": 3.15 }, | ||
| 57 | { "label": "k49", "x": 12, "y": 3 }, | ||
| 58 | { "label": "k4a", "x": 13, "y": 3.15 }, | ||
| 59 | { "label": "k4b", "x": 14, "y": 3.30 }, | ||
| 60 | { "label": "k4c", "x": 15, "y": 3.50 }, | ||
| 61 | |||
| 62 | { "label": "tp1", "x": 6.5, "y": 3.15 }, | ||
| 63 | { "label": "tp2", "x": 7.5, "y": 3.15 }, | ||
| 64 | { "label": "tp3", "x": 8.5, "y": 3.15 } | ||
| 65 | ] | ||
| 66 | } | ||
| 67 | } | ||
| 68 | } | ||
diff --git a/keyboards/handwired/promethium/keymaps/default/config.h b/keyboards/handwired/promethium/keymaps/default/config.h index 2064f3676..0630fd43e 100644 --- a/keyboards/handwired/promethium/keymaps/default/config.h +++ b/keyboards/handwired/promethium/keymaps/default/config.h | |||
| @@ -1,7 +1,4 @@ | |||
| 1 | #ifndef CONFIG_USER_H | 1 | #pragma once |
| 2 | #define CONFIG_USER_H | ||
| 3 | |||
| 4 | #include "../../config.h" | ||
| 5 | 2 | ||
| 6 | #define PRIYADI_PROMETHIUM | 3 | #define PRIYADI_PROMETHIUM |
| 7 | 4 | ||
| @@ -23,5 +20,3 @@ | |||
| 23 | 20 | ||
| 24 | #define DOUBLESPACE_LAYER_ENABLE | 21 | #define DOUBLESPACE_LAYER_ENABLE |
| 25 | // #define TOLELOT_ENABLE | 22 | // #define TOLELOT_ENABLE |
| 26 | |||
| 27 | #endif | ||
diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c index e229b67e5..a1ca79f9a 100644 --- a/keyboards/handwired/promethium/keymaps/default/keymap.c +++ b/keyboards/handwired/promethium/keymaps/default/keymap.c | |||
| @@ -686,7 +686,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 686 | * | Ctrl | Alt | GUI | Punc | Num | Space | Fun |Greek | GUI |AltGr | Ctrl | | 686 | * | Ctrl | Alt | GUI | Punc | Num | Space | Fun |Greek | GUI |AltGr | Ctrl | |
| 687 | * `-----------------------------------------------------------------------------------' | 687 | * `-----------------------------------------------------------------------------------' |
| 688 | */ | 688 | */ |
| 689 | [_QWERTY] = KEYMAP_CUSTOM( | 689 | [_QWERTY] = LAYOUT( |
| 690 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, | 690 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, |
| 691 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT , | 691 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT , |
| 692 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, | 692 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, |
| @@ -706,7 +706,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 706 | * `-----------------------------------------------------------------------------------' | 706 | * `-----------------------------------------------------------------------------------' |
| 707 | */ | 707 | */ |
| 708 | #ifdef LAYOUT_DVORAK | 708 | #ifdef LAYOUT_DVORAK |
| 709 | [_DVORAK] = KEYMAP_CUSTOM( | 709 | [_DVORAK] = LAYOUT( |
| 710 | _______, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, _______, | 710 | _______, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, _______, |
| 711 | _______, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, _______, | 711 | _______, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, _______, |
| 712 | _______, KC_SLSH, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, _______, | 712 | _______, KC_SLSH, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, _______, |
| @@ -728,7 +728,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 728 | */ | 728 | */ |
| 729 | 729 | ||
| 730 | #ifdef LAYOUT_COLEMAK | 730 | #ifdef LAYOUT_COLEMAK |
| 731 | [_COLEMAK] = KEYMAP_CUSTOM( | 731 | [_COLEMAK] = LAYOUT( |
| 732 | _______, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, _______, | 732 | _______, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, _______, |
| 733 | _______, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, _______, | 733 | _______, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, _______, |
| 734 | _______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______, | 734 | _______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______, |
| @@ -750,7 +750,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 750 | */ | 750 | */ |
| 751 | 751 | ||
| 752 | #ifdef LAYOUT_NORMAN | 752 | #ifdef LAYOUT_NORMAN |
| 753 | [_NORMAN] = KEYMAP_CUSTOM( | 753 | [_NORMAN] = LAYOUT( |
| 754 | _______, KC_Q, KC_W, KC_D, KC_F, KC_K, KC_J, KC_U, KC_R, KC_L, KC_QUOT, _______, | 754 | _______, KC_Q, KC_W, KC_D, KC_F, KC_K, KC_J, KC_U, KC_R, KC_L, KC_QUOT, _______, |
| 755 | _______, KC_A, KC_S, KC_E, KC_T, KC_G, KC_Y, KC_N, KC_I, KC_O, KC_H, _______, | 755 | _______, KC_A, KC_S, KC_E, KC_T, KC_G, KC_Y, KC_N, KC_I, KC_O, KC_H, _______, |
| 756 | _______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_P, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______, | 756 | _______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_P, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______, |
| @@ -772,7 +772,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 772 | */ | 772 | */ |
| 773 | 773 | ||
| 774 | #ifdef LAYOUT_WORKMAN | 774 | #ifdef LAYOUT_WORKMAN |
| 775 | [_WORKMAN] = KEYMAP_CUSTOM( | 775 | [_WORKMAN] = LAYOUT( |
| 776 | _______, KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_QUOT, _______, | 776 | _______, KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_QUOT, _______, |
| 777 | _______, KC_A, KC_S, KC_H, KC_T, KC_G, KC_Y, KC_N, KC_E, KC_O, KC_I, _______, | 777 | _______, KC_A, KC_S, KC_H, KC_T, KC_G, KC_Y, KC_N, KC_E, KC_O, KC_I, _______, |
| 778 | _______, KC_Z, KC_X, KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, KC_DOT, KC_SLSH, _______, | 778 | _______, KC_Z, KC_X, KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, KC_DOT, KC_SLSH, _______, |
| @@ -792,7 +792,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 792 | * | | | | | | | | | | : | | | 792 | * | | | | | | | | | | : | | |
| 793 | * `-----------------------------------------------------------------------------------' | 793 | * `-----------------------------------------------------------------------------------' |
| 794 | */ | 794 | */ |
| 795 | [_PUNC] = KEYMAP_CUSTOM( | 795 | [_PUNC] = LAYOUT( |
| 796 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, X(LTEQ), X(GTEQ), _______, | 796 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, X(LTEQ), X(GTEQ), _______, |
| 797 | KC_GRV, KC_ASTR, KC_BSLS, KC_MINS, KC_EQL, KC_SLSH, X(NOTEQ),KC_LPRN, KC_RPRN, KC_LABK, KC_RABK, _______, | 797 | KC_GRV, KC_ASTR, KC_BSLS, KC_MINS, KC_EQL, KC_SLSH, X(NOTEQ),KC_LPRN, KC_RPRN, KC_LABK, KC_RABK, _______, |
| 798 | KC_AMPR, KC_CIRC, KC_PIPE, KC_UNDS, KC_PLUS, KC_QUES, X(PLMIN),KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, _______, | 798 | KC_AMPR, KC_CIRC, KC_PIPE, KC_UNDS, KC_PLUS, KC_QUES, X(PLMIN),KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, _______, |
| @@ -811,7 +811,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 811 | * | | | x | | | | | 0 | , | . | : | | | 811 | * | | | x | | | | | 0 | , | . | : | | |
| 812 | * `-----------------------------------------------------------------------------------' | 812 | * `-----------------------------------------------------------------------------------' |
| 813 | */ | 813 | */ |
| 814 | [_NUM] = KEYMAP_CUSTOM( | 814 | [_NUM] = LAYOUT( |
| 815 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, S(KC_A), KC_1, KC_2, KC_3, S(KC_D), _______, | 815 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, S(KC_A), KC_1, KC_2, KC_3, S(KC_D), _______, |
| 816 | KC_GRV, KC_ASTR, KC_BSLS, KC_MINS, KC_EQL, KC_SLSH, S(KC_B), KC_4, KC_5, KC_6, S(KC_E), _______, | 816 | KC_GRV, KC_ASTR, KC_BSLS, KC_MINS, KC_EQL, KC_SLSH, S(KC_B), KC_4, KC_5, KC_6, S(KC_E), _______, |
| 817 | KC_AMPR, KC_CIRC, KC_PIPE, KC_UNDS, KC_PLUS, KC_QUES, S(KC_C), KC_7, KC_8, KC_9, S(KC_F), _______, | 817 | KC_AMPR, KC_CIRC, KC_PIPE, KC_UNDS, KC_PLUS, KC_QUES, S(KC_C), KC_7, KC_8, KC_9, S(KC_F), _______, |
| @@ -830,7 +830,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 830 | * | | | | | | | | | | | | | 830 | * | | | | | | | | | | | | |
| 831 | * `-----------------------------------------------------------------------------------' | 831 | * `-----------------------------------------------------------------------------------' |
| 832 | */ | 832 | */ |
| 833 | [_FUN] = KEYMAP_CUSTOM( | 833 | [_FUN] = LAYOUT( |
| 834 | XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_INS, XXXXXXX, KC_PGUP, KC_UP, KC_PGDN, KC_PGUP, KC_DEL, | 834 | XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_INS, XXXXXXX, KC_PGUP, KC_UP, KC_PGDN, KC_PGUP, KC_DEL, |
| 835 | KC_CAPS, KC_F5, KC_F6, KC_F7, KC_F8, KC_PSCR, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, | 835 | KC_CAPS, KC_F5, KC_F6, KC_F7, KC_F8, KC_PSCR, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, |
| 836 | _______, KC_F9, KC_F10, KC_F11, KC_F12, KC_PAUS, XXXXXXX, XXXXXXX, KC_HOME, KC_END, XXXXXXX, _______, | 836 | _______, KC_F9, KC_F10, KC_F11, KC_F12, KC_PAUS, XXXXXXX, XXXXXXX, KC_HOME, KC_END, XXXXXXX, _______, |
| @@ -849,7 +849,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 849 | * | | | | | | | | | | | | | | 849 | * | | | | | | | | | | | | | |
| 850 | * `-----------------------------------------------------------------------------------' | 850 | * `-----------------------------------------------------------------------------------' |
| 851 | */ | 851 | */ |
| 852 | [_GREEKU] = KEYMAP_CUSTOM( | 852 | [_GREEKU] = LAYOUT( |
| 853 | _______, XXXXXXX, XXXXXXX,X(UEPSI), X(URHO), X(UTAU),X(UUPSI),X(UTHET),X(UIOTA),X(UOMIC), X(UPI), _______, | 853 | _______, XXXXXXX, XXXXXXX,X(UEPSI), X(URHO), X(UTAU),X(UUPSI),X(UTHET),X(UIOTA),X(UOMIC), X(UPI), _______, |
| 854 | _______,X(UALPH),X(USIGM),X(UDELT), X(UPHI),X(UGAMM), X(UETA), X(UXI),X(UKAPP),X(ULAMB), KC_QUOT, _______, | 854 | _______,X(UALPH),X(USIGM),X(UDELT), X(UPHI),X(UGAMM), X(UETA), X(UXI),X(UKAPP),X(ULAMB), KC_QUOT, _______, |
| 855 | _______,X(UZETA), X(UCHI), X(UPSI),X(UOMEG),X(UBETA), X(UNU), X(UMU), KC_COMM, KC_DOT, KC_SLSH, _______, | 855 | _______,X(UZETA), X(UCHI), X(UPSI),X(UOMEG),X(UBETA), X(UNU), X(UMU), KC_COMM, KC_DOT, KC_SLSH, _______, |
| @@ -868,7 +868,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 868 | * | | | | | | | | | | | | | | 868 | * | | | | | | | | | | | | | |
| 869 | * `-----------------------------------------------------------------------------------' | 869 | * `-----------------------------------------------------------------------------------' |
| 870 | */ | 870 | */ |
| 871 | [_GREEKL] = KEYMAP_CUSTOM( | 871 | [_GREEKL] = LAYOUT( |
| 872 | _______, XXXXXXX,X(FSIGM),X(LEPSI), X(LRHO), X(LTAU),X(LUPSI),X(LTHET),X(LIOTA),X(LOMIC), X(LPI), _______, | 872 | _______, XXXXXXX,X(FSIGM),X(LEPSI), X(LRHO), X(LTAU),X(LUPSI),X(LTHET),X(LIOTA),X(LOMIC), X(LPI), _______, |
| 873 | _______,X(LALPH),X(LSIGM),X(LDELT), X(LPHI),X(LGAMM), X(LETA), X(LXI),X(LKAPP),X(LLAMB), KC_QUOT, _______, | 873 | _______,X(LALPH),X(LSIGM),X(LDELT), X(LPHI),X(LGAMM), X(LETA), X(LXI),X(LKAPP),X(LLAMB), KC_QUOT, _______, |
| 874 | _______,X(LZETA), X(LCHI), X(LPSI),X(LOMEG),X(LBETA), X(LNU), X(LMU), KC_COMM, KC_DOT, KC_SLSH, _______, | 874 | _______,X(LZETA), X(LCHI), X(LPSI),X(LOMEG),X(LBETA), X(LNU), X(LMU), KC_COMM, KC_DOT, KC_SLSH, _______, |
| @@ -887,7 +887,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 887 | * | | | | | | | | | | | | | | 887 | * | | | | | | | | | | | | | |
| 888 | * `-----------------------------------------------------------------------------------' | 888 | * `-----------------------------------------------------------------------------------' |
| 889 | */ | 889 | */ |
| 890 | [_EMPTY] = KEYMAP_CUSTOM( | 890 | [_EMPTY] = LAYOUT( |
| 891 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 891 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
| 892 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 892 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
| 893 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 893 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
| @@ -906,7 +906,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 906 | * | | | | | | | | | | | | | | 906 | * | | | | | | | | | | | | | |
| 907 | * `-----------------------------------------------------------------------------------' | 907 | * `-----------------------------------------------------------------------------------' |
| 908 | */ | 908 | */ |
| 909 | [_EMOJI] = KEYMAP_CUSTOM( | 909 | [_EMOJI] = LAYOUT( |
| 910 | X(HART2), X(CRY2),X(WEARY),X(EYERT),X(SMIRK), X(TJOY),X(RECYC),X(UNAMU),X(MUSIC),X(OKHND),X(PENSV), X(PHEW), | 910 | X(HART2), X(CRY2),X(WEARY),X(EYERT),X(SMIRK), X(TJOY),X(RECYC),X(UNAMU),X(MUSIC),X(OKHND),X(PENSV), X(PHEW), |
| 911 | X(THMUP), X(PRAY),X(SMILE),X(SMIL2),X(FLUSH), X(GRIN),X(HEART), X(BYE), X(KISS),X(CELEB), X(COOL),X(NOEVS), | 911 | X(THMUP), X(PRAY),X(SMILE),X(SMIL2),X(FLUSH), X(GRIN),X(HEART), X(BYE), X(KISS),X(CELEB), X(COOL),X(NOEVS), |
| 912 | X(THMDN),X(SLEEP), X(CLAP), X(CRY), X(VIC),X(BHART), X(SUN),X(SMEYE), X(WINK), X(MOON),X(CONFU),X(NOEVH), | 912 | X(THMDN),X(SLEEP), X(CLAP), X(CRY), X(VIC),X(BHART), X(SUN),X(SMEYE), X(WINK), X(MOON),X(CONFU),X(NOEVH), |
| @@ -925,7 +925,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 925 | * | | | | | | | | | | | | | | 925 | * | | | | | | | | | | | | | |
| 926 | * `-----------------------------------------------------------------------------------' | 926 | * `-----------------------------------------------------------------------------------' |
| 927 | */ | 927 | */ |
| 928 | [_GUI] = KEYMAP_CUSTOM( | 928 | [_GUI] = LAYOUT( |
| 929 | XXXXXXX, G(KC_1), G(KC_2), G(KC_3), G(KC_4), G(KC_5), G(KC_6), G(KC_7), G(KC_8), G(KC_9), G(KC_0), XXXXXXX, | 929 | XXXXXXX, G(KC_1), G(KC_2), G(KC_3), G(KC_4), G(KC_5), G(KC_6), G(KC_7), G(KC_8), G(KC_9), G(KC_0), XXXXXXX, |
| 930 | KC_ESC, XXXXXXX, S(KC_TAB),KC_ESC, KC_TAB, XXXXXXX, XXXXXXX, KC_WWWB, XXXXXXX, KC_WWWF, XXXXXXX, XXXXXXX, | 930 | KC_ESC, XXXXXXX, S(KC_TAB),KC_ESC, KC_TAB, XXXXXXX, XXXXXXX, KC_WWWB, XXXXXXX, KC_WWWF, XXXXXXX, XXXXXXX, |
| 931 | XXXXXXX, XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, KC_SPC, KC_SPC, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, | 931 | XXXXXXX, XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, KC_SPC, KC_SPC, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, |
| @@ -944,7 +944,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 944 | * | | | | | | | | | | | | | | 944 | * | | | | | | | | | | | | | |
| 945 | * `-----------------------------------------------------------------------------------' | 945 | * `-----------------------------------------------------------------------------------' |
| 946 | */ | 946 | */ |
| 947 | [_SYS] = KEYMAP_CUSTOM( | 947 | [_SYS] = LAYOUT( |
| 948 | DEBUG, QWERTY, WIN, XXXXXXX, RESET, XXXXXXX, XXXXXXX, OUT_USB, XXXXXXX, XXXXXXX, XXXXXXX, RGBDEMO, | 948 | DEBUG, QWERTY, WIN, XXXXXXX, RESET, XXXXXXX, XXXXXXX, OUT_USB, XXXXXXX, XXXXXXX, XXXXXXX, RGBDEMO, |
| 949 | XXXXXXX, FC_TOG, XXXXXXX, DVORAK, XXXXXXX, GLOW, XXXXXXX, XXXXXXX, WORKMAN, LINUX, XXXXXXX, XXXXXXX, | 949 | XXXXXXX, FC_TOG, XXXXXXX, DVORAK, XXXXXXX, GLOW, XXXXXXX, XXXXXXX, WORKMAN, LINUX, XXXXXXX, XXXXXXX, |
| 950 | XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, XXXXXXX, OUT_BT, NORMAN, OSX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 950 | XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, XXXXXXX, OUT_BT, NORMAN, OSX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
| @@ -1365,4 +1365,4 @@ void turn_off_capslock() { | |||
| 1365 | rcv = ps2_host_send(0x01); | 1365 | rcv = ps2_host_send(0x01); |
| 1366 | } | 1366 | } |
| 1367 | } | 1367 | } |
| 1368 | #endif \ No newline at end of file | 1368 | #endif |
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/config.h b/keyboards/handwired/promethium/keymaps/priyadi/config.h index 2064f3676..0630fd43e 100644 --- a/keyboards/handwired/promethium/keymaps/priyadi/config.h +++ b/keyboards/handwired/promethium/keymaps/priyadi/config.h | |||
| @@ -1,7 +1,4 @@ | |||
| 1 | #ifndef CONFIG_USER_H | 1 | #pragma once |
| 2 | #define CONFIG_USER_H | ||
| 3 | |||
| 4 | #include "../../config.h" | ||
| 5 | 2 | ||
| 6 | #define PRIYADI_PROMETHIUM | 3 | #define PRIYADI_PROMETHIUM |
| 7 | 4 | ||
| @@ -23,5 +20,3 @@ | |||
| 23 | 20 | ||
| 24 | #define DOUBLESPACE_LAYER_ENABLE | 21 | #define DOUBLESPACE_LAYER_ENABLE |
| 25 | // #define TOLELOT_ENABLE | 22 | // #define TOLELOT_ENABLE |
| 26 | |||
| 27 | #endif | ||
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c index e229b67e5..a1ca79f9a 100644 --- a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c +++ b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c | |||
| @@ -686,7 +686,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 686 | * | Ctrl | Alt | GUI | Punc | Num | Space | Fun |Greek | GUI |AltGr | Ctrl | | 686 | * | Ctrl | Alt | GUI | Punc | Num | Space | Fun |Greek | GUI |AltGr | Ctrl | |
| 687 | * `-----------------------------------------------------------------------------------' | 687 | * `-----------------------------------------------------------------------------------' |
| 688 | */ | 688 | */ |
| 689 | [_QWERTY] = KEYMAP_CUSTOM( | 689 | [_QWERTY] = LAYOUT( |
| 690 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, | 690 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, |
| 691 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT , | 691 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT , |
| 692 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, | 692 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, |
| @@ -706,7 +706,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 706 | * `-----------------------------------------------------------------------------------' | 706 | * `-----------------------------------------------------------------------------------' |
| 707 | */ | 707 | */ |
| 708 | #ifdef LAYOUT_DVORAK | 708 | #ifdef LAYOUT_DVORAK |
| 709 | [_DVORAK] = KEYMAP_CUSTOM( | 709 | [_DVORAK] = LAYOUT( |
| 710 | _______, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, _______, | 710 | _______, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, _______, |
| 711 | _______, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, _______, | 711 | _______, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, _______, |
| 712 | _______, KC_SLSH, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, _______, | 712 | _______, KC_SLSH, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, _______, |
| @@ -728,7 +728,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 728 | */ | 728 | */ |
| 729 | 729 | ||
| 730 | #ifdef LAYOUT_COLEMAK | 730 | #ifdef LAYOUT_COLEMAK |
| 731 | [_COLEMAK] = KEYMAP_CUSTOM( | 731 | [_COLEMAK] = LAYOUT( |
| 732 | _______, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, _______, | 732 | _______, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, _______, |
| 733 | _______, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, _______, | 733 | _______, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, _______, |
| 734 | _______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______, | 734 | _______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______, |
| @@ -750,7 +750,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 750 | */ | 750 | */ |
| 751 | 751 | ||
| 752 | #ifdef LAYOUT_NORMAN | 752 | #ifdef LAYOUT_NORMAN |
| 753 | [_NORMAN] = KEYMAP_CUSTOM( | 753 | [_NORMAN] = LAYOUT( |
| 754 | _______, KC_Q, KC_W, KC_D, KC_F, KC_K, KC_J, KC_U, KC_R, KC_L, KC_QUOT, _______, | 754 | _______, KC_Q, KC_W, KC_D, KC_F, KC_K, KC_J, KC_U, KC_R, KC_L, KC_QUOT, _______, |
| 755 | _______, KC_A, KC_S, KC_E, KC_T, KC_G, KC_Y, KC_N, KC_I, KC_O, KC_H, _______, | 755 | _______, KC_A, KC_S, KC_E, KC_T, KC_G, KC_Y, KC_N, KC_I, KC_O, KC_H, _______, |
| 756 | _______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_P, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______, | 756 | _______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_P, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______, |
| @@ -772,7 +772,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 772 | */ | 772 | */ |
| 773 | 773 | ||
| 774 | #ifdef LAYOUT_WORKMAN | 774 | #ifdef LAYOUT_WORKMAN |
| 775 | [_WORKMAN] = KEYMAP_CUSTOM( | 775 | [_WORKMAN] = LAYOUT( |
| 776 | _______, KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_QUOT, _______, | 776 | _______, KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_QUOT, _______, |
| 777 | _______, KC_A, KC_S, KC_H, KC_T, KC_G, KC_Y, KC_N, KC_E, KC_O, KC_I, _______, | 777 | _______, KC_A, KC_S, KC_H, KC_T, KC_G, KC_Y, KC_N, KC_E, KC_O, KC_I, _______, |
| 778 | _______, KC_Z, KC_X, KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, KC_DOT, KC_SLSH, _______, | 778 | _______, KC_Z, KC_X, KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, KC_DOT, KC_SLSH, _______, |
| @@ -792,7 +792,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 792 | * | | | | | | | | | | : | | | 792 | * | | | | | | | | | | : | | |
| 793 | * `-----------------------------------------------------------------------------------' | 793 | * `-----------------------------------------------------------------------------------' |
| 794 | */ | 794 | */ |
| 795 | [_PUNC] = KEYMAP_CUSTOM( | 795 | [_PUNC] = LAYOUT( |
| 796 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, X(LTEQ), X(GTEQ), _______, | 796 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, X(LTEQ), X(GTEQ), _______, |
| 797 | KC_GRV, KC_ASTR, KC_BSLS, KC_MINS, KC_EQL, KC_SLSH, X(NOTEQ),KC_LPRN, KC_RPRN, KC_LABK, KC_RABK, _______, | 797 | KC_GRV, KC_ASTR, KC_BSLS, KC_MINS, KC_EQL, KC_SLSH, X(NOTEQ),KC_LPRN, KC_RPRN, KC_LABK, KC_RABK, _______, |
| 798 | KC_AMPR, KC_CIRC, KC_PIPE, KC_UNDS, KC_PLUS, KC_QUES, X(PLMIN),KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, _______, | 798 | KC_AMPR, KC_CIRC, KC_PIPE, KC_UNDS, KC_PLUS, KC_QUES, X(PLMIN),KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, _______, |
| @@ -811,7 +811,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 811 | * | | | x | | | | | 0 | , | . | : | | | 811 | * | | | x | | | | | 0 | , | . | : | | |
| 812 | * `-----------------------------------------------------------------------------------' | 812 | * `-----------------------------------------------------------------------------------' |
| 813 | */ | 813 | */ |
| 814 | [_NUM] = KEYMAP_CUSTOM( | 814 | [_NUM] = LAYOUT( |
| 815 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, S(KC_A), KC_1, KC_2, KC_3, S(KC_D), _______, | 815 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, S(KC_A), KC_1, KC_2, KC_3, S(KC_D), _______, |
| 816 | KC_GRV, KC_ASTR, KC_BSLS, KC_MINS, KC_EQL, KC_SLSH, S(KC_B), KC_4, KC_5, KC_6, S(KC_E), _______, | 816 | KC_GRV, KC_ASTR, KC_BSLS, KC_MINS, KC_EQL, KC_SLSH, S(KC_B), KC_4, KC_5, KC_6, S(KC_E), _______, |
| 817 | KC_AMPR, KC_CIRC, KC_PIPE, KC_UNDS, KC_PLUS, KC_QUES, S(KC_C), KC_7, KC_8, KC_9, S(KC_F), _______, | 817 | KC_AMPR, KC_CIRC, KC_PIPE, KC_UNDS, KC_PLUS, KC_QUES, S(KC_C), KC_7, KC_8, KC_9, S(KC_F), _______, |
| @@ -830,7 +830,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 830 | * | | | | | | | | | | | | | 830 | * | | | | | | | | | | | | |
| 831 | * `-----------------------------------------------------------------------------------' | 831 | * `-----------------------------------------------------------------------------------' |
| 832 | */ | 832 | */ |
| 833 | [_FUN] = KEYMAP_CUSTOM( | 833 | [_FUN] = LAYOUT( |
| 834 | XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_INS, XXXXXXX, KC_PGUP, KC_UP, KC_PGDN, KC_PGUP, KC_DEL, | 834 | XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_INS, XXXXXXX, KC_PGUP, KC_UP, KC_PGDN, KC_PGUP, KC_DEL, |
| 835 | KC_CAPS, KC_F5, KC_F6, KC_F7, KC_F8, KC_PSCR, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, | 835 | KC_CAPS, KC_F5, KC_F6, KC_F7, KC_F8, KC_PSCR, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, |
| 836 | _______, KC_F9, KC_F10, KC_F11, KC_F12, KC_PAUS, XXXXXXX, XXXXXXX, KC_HOME, KC_END, XXXXXXX, _______, | 836 | _______, KC_F9, KC_F10, KC_F11, KC_F12, KC_PAUS, XXXXXXX, XXXXXXX, KC_HOME, KC_END, XXXXXXX, _______, |
| @@ -849,7 +849,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 849 | * | | | | | | | | | | | | | | 849 | * | | | | | | | | | | | | | |
| 850 | * `-----------------------------------------------------------------------------------' | 850 | * `-----------------------------------------------------------------------------------' |
| 851 | */ | 851 | */ |
| 852 | [_GREEKU] = KEYMAP_CUSTOM( | 852 | [_GREEKU] = LAYOUT( |
| 853 | _______, XXXXXXX, XXXXXXX,X(UEPSI), X(URHO), X(UTAU),X(UUPSI),X(UTHET),X(UIOTA),X(UOMIC), X(UPI), _______, | 853 | _______, XXXXXXX, XXXXXXX,X(UEPSI), X(URHO), X(UTAU),X(UUPSI),X(UTHET),X(UIOTA),X(UOMIC), X(UPI), _______, |
| 854 | _______,X(UALPH),X(USIGM),X(UDELT), X(UPHI),X(UGAMM), X(UETA), X(UXI),X(UKAPP),X(ULAMB), KC_QUOT, _______, | 854 | _______,X(UALPH),X(USIGM),X(UDELT), X(UPHI),X(UGAMM), X(UETA), X(UXI),X(UKAPP),X(ULAMB), KC_QUOT, _______, |
| 855 | _______,X(UZETA), X(UCHI), X(UPSI),X(UOMEG),X(UBETA), X(UNU), X(UMU), KC_COMM, KC_DOT, KC_SLSH, _______, | 855 | _______,X(UZETA), X(UCHI), X(UPSI),X(UOMEG),X(UBETA), X(UNU), X(UMU), KC_COMM, KC_DOT, KC_SLSH, _______, |
| @@ -868,7 +868,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 868 | * | | | | | | | | | | | | | | 868 | * | | | | | | | | | | | | | |
| 869 | * `-----------------------------------------------------------------------------------' | 869 | * `-----------------------------------------------------------------------------------' |
| 870 | */ | 870 | */ |
| 871 | [_GREEKL] = KEYMAP_CUSTOM( | 871 | [_GREEKL] = LAYOUT( |
| 872 | _______, XXXXXXX,X(FSIGM),X(LEPSI), X(LRHO), X(LTAU),X(LUPSI),X(LTHET),X(LIOTA),X(LOMIC), X(LPI), _______, | 872 | _______, XXXXXXX,X(FSIGM),X(LEPSI), X(LRHO), X(LTAU),X(LUPSI),X(LTHET),X(LIOTA),X(LOMIC), X(LPI), _______, |
| 873 | _______,X(LALPH),X(LSIGM),X(LDELT), X(LPHI),X(LGAMM), X(LETA), X(LXI),X(LKAPP),X(LLAMB), KC_QUOT, _______, | 873 | _______,X(LALPH),X(LSIGM),X(LDELT), X(LPHI),X(LGAMM), X(LETA), X(LXI),X(LKAPP),X(LLAMB), KC_QUOT, _______, |
| 874 | _______,X(LZETA), X(LCHI), X(LPSI),X(LOMEG),X(LBETA), X(LNU), X(LMU), KC_COMM, KC_DOT, KC_SLSH, _______, | 874 | _______,X(LZETA), X(LCHI), X(LPSI),X(LOMEG),X(LBETA), X(LNU), X(LMU), KC_COMM, KC_DOT, KC_SLSH, _______, |
| @@ -887,7 +887,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 887 | * | | | | | | | | | | | | | | 887 | * | | | | | | | | | | | | | |
| 888 | * `-----------------------------------------------------------------------------------' | 888 | * `-----------------------------------------------------------------------------------' |
| 889 | */ | 889 | */ |
| 890 | [_EMPTY] = KEYMAP_CUSTOM( | 890 | [_EMPTY] = LAYOUT( |
| 891 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 891 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
| 892 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 892 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
| 893 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 893 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
| @@ -906,7 +906,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 906 | * | | | | | | | | | | | | | | 906 | * | | | | | | | | | | | | | |
| 907 | * `-----------------------------------------------------------------------------------' | 907 | * `-----------------------------------------------------------------------------------' |
| 908 | */ | 908 | */ |
| 909 | [_EMOJI] = KEYMAP_CUSTOM( | 909 | [_EMOJI] = LAYOUT( |
| 910 | X(HART2), X(CRY2),X(WEARY),X(EYERT),X(SMIRK), X(TJOY),X(RECYC),X(UNAMU),X(MUSIC),X(OKHND),X(PENSV), X(PHEW), | 910 | X(HART2), X(CRY2),X(WEARY),X(EYERT),X(SMIRK), X(TJOY),X(RECYC),X(UNAMU),X(MUSIC),X(OKHND),X(PENSV), X(PHEW), |
| 911 | X(THMUP), X(PRAY),X(SMILE),X(SMIL2),X(FLUSH), X(GRIN),X(HEART), X(BYE), X(KISS),X(CELEB), X(COOL),X(NOEVS), | 911 | X(THMUP), X(PRAY),X(SMILE),X(SMIL2),X(FLUSH), X(GRIN),X(HEART), X(BYE), X(KISS),X(CELEB), X(COOL),X(NOEVS), |
| 912 | X(THMDN),X(SLEEP), X(CLAP), X(CRY), X(VIC),X(BHART), X(SUN),X(SMEYE), X(WINK), X(MOON),X(CONFU),X(NOEVH), | 912 | X(THMDN),X(SLEEP), X(CLAP), X(CRY), X(VIC),X(BHART), X(SUN),X(SMEYE), X(WINK), X(MOON),X(CONFU),X(NOEVH), |
| @@ -925,7 +925,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 925 | * | | | | | | | | | | | | | | 925 | * | | | | | | | | | | | | | |
| 926 | * `-----------------------------------------------------------------------------------' | 926 | * `-----------------------------------------------------------------------------------' |
| 927 | */ | 927 | */ |
| 928 | [_GUI] = KEYMAP_CUSTOM( | 928 | [_GUI] = LAYOUT( |
| 929 | XXXXXXX, G(KC_1), G(KC_2), G(KC_3), G(KC_4), G(KC_5), G(KC_6), G(KC_7), G(KC_8), G(KC_9), G(KC_0), XXXXXXX, | 929 | XXXXXXX, G(KC_1), G(KC_2), G(KC_3), G(KC_4), G(KC_5), G(KC_6), G(KC_7), G(KC_8), G(KC_9), G(KC_0), XXXXXXX, |
| 930 | KC_ESC, XXXXXXX, S(KC_TAB),KC_ESC, KC_TAB, XXXXXXX, XXXXXXX, KC_WWWB, XXXXXXX, KC_WWWF, XXXXXXX, XXXXXXX, | 930 | KC_ESC, XXXXXXX, S(KC_TAB),KC_ESC, KC_TAB, XXXXXXX, XXXXXXX, KC_WWWB, XXXXXXX, KC_WWWF, XXXXXXX, XXXXXXX, |
| 931 | XXXXXXX, XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, KC_SPC, KC_SPC, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, | 931 | XXXXXXX, XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, KC_SPC, KC_SPC, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, |
| @@ -944,7 +944,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 944 | * | | | | | | | | | | | | | | 944 | * | | | | | | | | | | | | | |
| 945 | * `-----------------------------------------------------------------------------------' | 945 | * `-----------------------------------------------------------------------------------' |
| 946 | */ | 946 | */ |
| 947 | [_SYS] = KEYMAP_CUSTOM( | 947 | [_SYS] = LAYOUT( |
| 948 | DEBUG, QWERTY, WIN, XXXXXXX, RESET, XXXXXXX, XXXXXXX, OUT_USB, XXXXXXX, XXXXXXX, XXXXXXX, RGBDEMO, | 948 | DEBUG, QWERTY, WIN, XXXXXXX, RESET, XXXXXXX, XXXXXXX, OUT_USB, XXXXXXX, XXXXXXX, XXXXXXX, RGBDEMO, |
| 949 | XXXXXXX, FC_TOG, XXXXXXX, DVORAK, XXXXXXX, GLOW, XXXXXXX, XXXXXXX, WORKMAN, LINUX, XXXXXXX, XXXXXXX, | 949 | XXXXXXX, FC_TOG, XXXXXXX, DVORAK, XXXXXXX, GLOW, XXXXXXX, XXXXXXX, WORKMAN, LINUX, XXXXXXX, XXXXXXX, |
| 950 | XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, XXXXXXX, OUT_BT, NORMAN, OSX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 950 | XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, XXXXXXX, OUT_BT, NORMAN, OSX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
| @@ -1365,4 +1365,4 @@ void turn_off_capslock() { | |||
| 1365 | rcv = ps2_host_send(0x01); | 1365 | rcv = ps2_host_send(0x01); |
| 1366 | } | 1366 | } |
| 1367 | } | 1367 | } |
| 1368 | #endif \ No newline at end of file | 1368 | #endif |
diff --git a/keyboards/handwired/promethium/promethium.h b/keyboards/handwired/promethium/promethium.h index 260f140c5..b8d635220 100644 --- a/keyboards/handwired/promethium/promethium.h +++ b/keyboards/handwired/promethium/promethium.h | |||
| @@ -7,4 +7,23 @@ void battery_poll(uint8_t level); | |||
| 7 | void led_set_kb(uint8_t usb_led); | 7 | void led_set_kb(uint8_t usb_led); |
| 8 | void led_set_user(uint8_t usb_led); | 8 | void led_set_user(uint8_t usb_led); |
| 9 | 9 | ||
| 10 | #define LAYOUT( \ | ||
| 11 | k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ | ||
| 12 | k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \ | ||
| 13 | k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \ | ||
| 14 | k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, \ | ||
| 15 | tp1, tp2, tp3 \ | ||
| 16 | ) \ | ||
| 17 | { \ | ||
| 18 | {k11, k12, k13, k14, k15, k16}, \ | ||
| 19 | {k21, k22, k23, k24, k25, k26}, \ | ||
| 20 | {k31, k32, k33, k34, k35, k36}, \ | ||
| 21 | {k41, k42, k43, k44, k45, k46}, \ | ||
| 22 | {k17, k18, k19, k1a, k1b, k1c}, \ | ||
| 23 | {k27, k28, k29, k2a, k2b, k2c}, \ | ||
| 24 | {k37, k38, k39, k3a, k3b, k3c}, \ | ||
| 25 | {k47, k48, k49, k4a, k4b, k4c}, \ | ||
| 26 | {tp1, tp2, tp3, KC_NO, KC_NO, KC_NO} \ | ||
| 27 | } | ||
| 28 | |||
| 10 | #endif | 29 | #endif |
