diff options
author | Drashna Jaelre <drashna@live.com> | 2018-03-31 19:39:00 -0700 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2018-03-31 22:39:00 -0400 |
commit | deb5a4b6a9b99c4aa294608cbf6be821b1d46917 (patch) | |
tree | 5646917c2c26095405d3a0271385e50aa76bbf4f | |
parent | 61a2169ff9dea52136139ec156995efdc7929851 (diff) | |
download | qmk_firmware-deb5a4b6a9b99c4aa294608cbf6be821b1d46917.tar.gz qmk_firmware-deb5a4b6a9b99c4aa294608cbf6be821b1d46917.zip |
Convert all Preonic keymaps to layout format (#2644)
* Convert all Preonic keymaps to layout format
* Make sure preonic layouts are using QMK_KEYBOARD_H
-rw-r--r-- | keyboards/preonic/keymaps/0xdec/keymap.c | 49 | ||||
-rw-r--r-- | keyboards/preonic/keymaps/CMD-Preonic/keymap.c | 119 | ||||
-rw-r--r-- | keyboards/preonic/keymaps/blake-newman/keymap.c | 101 | ||||
-rw-r--r-- | keyboards/preonic/keymaps/bucktooth/keymap.c | 34 | ||||
-rw-r--r-- | keyboards/preonic/keymaps/choromanski/keymap.c | 89 | ||||
-rw-r--r-- | keyboards/preonic/keymaps/default/keymap.c | 87 | ||||
-rw-r--r-- | keyboards/preonic/keymaps/dlaroe/keymap.c | 77 | ||||
-rw-r--r-- | keyboards/preonic/keymaps/dudeofawesome/keymap.c | 115 | ||||
-rw-r--r-- | keyboards/preonic/keymaps/ekis_isa/keymap.c | 87 | ||||
-rw-r--r-- | keyboards/preonic/keymaps/jacwib/keymap.c | 105 | ||||
-rw-r--r-- | keyboards/preonic/keymaps/kinesis/keymap.c | 35 | ||||
-rw-r--r-- | keyboards/preonic/keymaps/nikchi/keymap.c | 63 | ||||
-rw-r--r-- | keyboards/preonic/keymaps/smt/keymap.c | 91 | ||||
-rw-r--r-- | keyboards/preonic/keymaps/that_canadian/keymap.c | 78 | ||||
-rw-r--r-- | keyboards/preonic/keymaps/xyverz/keymap.c | 91 | ||||
-rw-r--r-- | keyboards/preonic/keymaps/zach/keymap.c | 86 |
16 files changed, 627 insertions, 680 deletions
diff --git a/keyboards/preonic/keymaps/0xdec/keymap.c b/keyboards/preonic/keymaps/0xdec/keymap.c index a273f4ed5..5f82087b0 100644 --- a/keyboards/preonic/keymaps/0xdec/keymap.c +++ b/keyboards/preonic/keymaps/0xdec/keymap.c | |||
@@ -1,9 +1,4 @@ | |||
1 | #include "preonic.h" | 1 | #include QMK_KEYBOARD_H |
2 | #include "action_layer.h" | ||
3 | #include "eeconfig.h" | ||
4 | #ifdef AUDIO_ENABLE | ||
5 | #include "audio.h" | ||
6 | #endif | ||
7 | 2 | ||
8 | // Layer names | 3 | // Layer names |
9 | #define _COLEMAK 0 | 4 | #define _COLEMAK 0 |
@@ -35,13 +30,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
35 | * | ESC | ALT | GUI | SHIFT| CTRL | BKSP | SPACE| RAISE| SHIFT| | DEL | TAB | | 30 | * | ESC | ALT | GUI | SHIFT| CTRL | BKSP | SPACE| RAISE| SHIFT| | DEL | TAB | |
36 | * `-----------------------------------------------------------------------------------' | 31 | * `-----------------------------------------------------------------------------------' |
37 | */ | 32 | */ |
38 | [_COLEMAK] = { | 33 | [_COLEMAK] = LAYOUT_preonic_grid( \ |
39 | {KC_GRV ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 ,KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_BSLS}, | 34 | KC_GRV ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 ,KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_BSLS, \ |
40 | {KC_EQL ,KC_Q ,KC_W ,KC_F ,KC_P ,KC_G ,KC_J ,KC_L ,KC_U ,KC_Y ,KC_LBRC,KC_RBRC}, | 35 | KC_EQL ,KC_Q ,KC_W ,KC_F ,KC_P ,KC_G ,KC_J ,KC_L ,KC_U ,KC_Y ,KC_LBRC,KC_RBRC, \ |
41 | {KC_MINS,KC_A ,KC_R ,KC_S ,KC_T ,KC_D ,KC_H ,KC_N ,KC_E ,KC_I ,KC_O ,KC_QUOT}, | 36 | KC_MINS,KC_A ,KC_R ,KC_S ,KC_T ,KC_D ,KC_H ,KC_N ,KC_E ,KC_I ,KC_O ,KC_QUOT, \ |
42 | {KC_SCLN,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,KC_K ,KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_ENT }, | 37 | KC_SCLN,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,KC_K ,KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_ENT, \ |
43 | {KC_ESC ,KC_LALT,KC_LGUI,KC_LSFT,KC_LCTL,KC_BSPC,KC_SPC ,RAISE ,KC_RSFT,_______,KC_DEL ,KC_TAB } | 38 | KC_ESC ,KC_LALT,KC_LGUI,KC_LSFT,KC_LCTL,KC_BSPC,KC_SPC ,RAISE ,KC_RSFT,_______,KC_DEL ,KC_TAB \ |
44 | }, | 39 | ), |
45 | 40 | ||
46 | /* Game | 41 | /* Game |
47 | * ,-----------------------------------------------------------------------------------. | 42 | * ,-----------------------------------------------------------------------------------. |
@@ -56,13 +51,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
56 | * | | ALT | GUI | SPACE| CTRL | BKSP | SPACE| RAISE| , | 0 | . | TAB | | 51 | * | | ALT | GUI | SPACE| CTRL | BKSP | SPACE| RAISE| , | 0 | . | TAB | |
57 | * `-----------------------------------------------------------------------------------' | 52 | * `-----------------------------------------------------------------------------------' |
58 | */ | 53 | */ |
59 | [_GAME] = { | 54 | [_GAME] = LAYOUT_preonic_grid( \ |
60 | {KC_ESC ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 ,KC_6 ,KC_7 ,KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS}, | 55 | KC_ESC ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 ,KC_6 ,KC_7 ,KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS, \ |
61 | {KC_TAB ,KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,KC_Y ,KC_U ,KC_P1 ,KC_P2 ,KC_P3 ,KC_PPLS}, | 56 | KC_TAB ,KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,KC_Y ,KC_U ,KC_P1 ,KC_P2 ,KC_P3 ,KC_PPLS, \ |
62 | {KC_LCTL,KC_A ,KC_S ,KC_D ,KC_F ,KC_G ,KC_H ,KC_J ,KC_P4 ,KC_P5 ,KC_P6 ,KC_PEQL}, | 57 | KC_LCTL,KC_A ,KC_S ,KC_D ,KC_F ,KC_G ,KC_H ,KC_J ,KC_P4 ,KC_P5 ,KC_P6 ,KC_PEQL, \ |
63 | {KC_LSFT,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,KC_N ,KC_M ,KC_P7 ,KC_P8 ,KC_P9 ,KC_PENT}, | 58 | KC_LSFT,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,KC_N ,KC_M ,KC_P7 ,KC_P8 ,KC_P9 ,KC_PENT, \ |
64 | {XXXXXXX,KC_LALT,KC_LGUI,KC_SPC ,KC_LCTL,KC_BSPC,KC_SPC ,RAISE ,KC_PCMM,KC_P0 ,KC_PDOT,KC_TAB } | 59 | XXXXXXX,KC_LALT,KC_LGUI,KC_SPC ,KC_LCTL,KC_BSPC,KC_SPC ,RAISE ,KC_PCMM,KC_P0 ,KC_PDOT,KC_TAB \ |
65 | }, | 60 | ), |
66 | 61 | ||
67 | /* Raise | 62 | /* Raise |
68 | * ,-----------------------------------------------------------------------------------. | 63 | * ,-----------------------------------------------------------------------------------. |
@@ -77,13 +72,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
77 | * | RESET| | | | | DEL | | | | | | | | 72 | * | RESET| | | | | DEL | | | | | | | |
78 | * `-----------------------------------------------------------------------------------' | 73 | * `-----------------------------------------------------------------------------------' |
79 | */ | 74 | */ |
80 | [_RAISE] = { | 75 | [_RAISE] = LAYOUT_preonic_grid( \ |
81 | {KC_SLEP,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,KC_PSCR}, | 76 | KC_SLEP,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,KC_PSCR, \ |
82 | {XXXXXXX,KC_F11 ,KC_F12 ,XXXXXXX,AU_TOG ,KC_VOLU,BL_INC ,COLEMAK,GAME ,MU_TOG ,KC_MENU,KC_SLCK}, | 77 | XXXXXXX,KC_F11 ,KC_F12 ,XXXXXXX,AU_TOG ,KC_VOLU,BL_INC ,COLEMAK,GAME ,MU_TOG ,KC_MENU,KC_SLCK, \ |
83 | {KC_CAPS,KC_MPRV,KC_MSTP,KC_MPLY,KC_MNXT,KC_VOLD,BL_DEC ,KC_LEFT,KC_DOWN,KC_UP ,KC_RGHT,KC_PAUS}, | 78 | KC_CAPS,KC_MPRV,KC_MSTP,KC_MPLY,KC_MNXT,KC_VOLD,BL_DEC ,KC_LEFT,KC_DOWN,KC_UP ,KC_RGHT,KC_PAUS, \ |
84 | {XXXXXXX,KC_WBAK,KC_WSTP,KC_WREF,KC_WFWD,KC_MUTE,BL_TOGG,KC_HOME,KC_PGDN,KC_PGUP,KC_END ,KC_INS }, | 79 | XXXXXXX,KC_WBAK,KC_WSTP,KC_WREF,KC_WFWD,KC_MUTE,BL_TOGG,KC_HOME,KC_PGDN,KC_PGUP,KC_END ,KC_INS, \ |
85 | {RESET ,_______,_______,_______,_______,KC_DEL ,_______,_______,_______,_______,_______,_______} | 80 | RESET ,_______,_______,_______,_______,KC_DEL ,_______,_______,_______,_______,_______,_______ \ |
86 | } | 81 | ) |
87 | 82 | ||
88 | }; | 83 | }; |
89 | 84 | ||
diff --git a/keyboards/preonic/keymaps/CMD-Preonic/keymap.c b/keyboards/preonic/keymaps/CMD-Preonic/keymap.c index 1cbb99caa..6d30a9ab4 100644 --- a/keyboards/preonic/keymaps/CMD-Preonic/keymap.c +++ b/keyboards/preonic/keymaps/CMD-Preonic/keymap.c | |||
@@ -1,9 +1,4 @@ | |||
1 | #include "preonic.h" | 1 | #include QMK_KEYBOARD_H |
2 | #include "action_layer.h" | ||
3 | #include "eeconfig.h" | ||
4 | #ifdef AUDIO_ENABLE | ||
5 | #include "audio.h" | ||
6 | #endif | ||
7 | 2 | ||
8 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | 3 | // Each layer gets a name for readability, which is then used in the keymap matrix below. |
9 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | 4 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. |
@@ -49,13 +44,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
49 | * | Brite| Ctrl | Alt | GUI |Lower | Space | Raise| - | = | [ | ] | | 44 | * | Brite| Ctrl | Alt | GUI |Lower | Space | Raise| - | = | [ | ] | |
50 | * `-----------------------------------------------------------------------------------' | 45 | * `-----------------------------------------------------------------------------------' |
51 | */ | 46 | */ |
52 | [_QWERTY] = { | 47 | [_QWERTY] = LAYOUT_preonic_mit( \ |
53 | {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, | 48 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
54 | {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH}, | 49 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH, \ |
55 | {LT(_RAISE, KC_ENT), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, | 50 | LT(_RAISE, KC_ENT), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
56 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, | 51 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \ |
57 | {M(M_BL), KC_LCTL, KC_LALT, KC_LGUI, LOWER, LT(_LOWER, KC_SPC), KC_SPC, RAISE, KC_MINUS, KC_EQUAL, KC_LBRC, KC_RBRC} | 52 | M(M_BL), KC_LCTL, KC_LALT, KC_LGUI, LOWER, LT(_LOWER, KC_SPC), RAISE, KC_MINUS, KC_EQUAL, KC_LBRC, KC_RBRC \ |
58 | }, | 53 | ), |
59 | 54 | ||
60 | /* Colemak | 55 | /* Colemak |
61 | * ,-----------------------------------------------------------------------------------. | 56 | * ,-----------------------------------------------------------------------------------. |
@@ -70,13 +65,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
70 | * | Brite| Ctrl | Alt | GUI |Lower | Space | Raise| - | = | [ | ] | | 65 | * | Brite| Ctrl | Alt | GUI |Lower | Space | Raise| - | = | [ | ] | |
71 | * `-----------------------------------------------------------------------------------' | 66 | * `-----------------------------------------------------------------------------------' |
72 | */ | 67 | */ |
73 | [_COLEMAK] = { | 68 | [_COLEMAK] = LAYOUT_preonic_mit( \ |
74 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, | 69 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
75 | {_______, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, _______}, | 70 | _______, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, _______, \ |
76 | {_______, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, | 71 | _______, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ |
77 | {_______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______}, | 72 | _______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______, \ |
78 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} | 73 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
79 | }, | 74 | ), |
80 | 75 | ||
81 | /* Dvorak | 76 | /* Dvorak |
82 | * ,-----------------------------------------------------------------------------------. | 77 | * ,-----------------------------------------------------------------------------------. |
@@ -91,13 +86,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
91 | * | Brite| Ctrl | Alt | GUI |Lower | Space | Raise| - | = | [ | ] | | 86 | * | Brite| Ctrl | Alt | GUI |Lower | Space | Raise| - | = | [ | ] | |
92 | * `-----------------------------------------------------------------------------------' | 87 | * `-----------------------------------------------------------------------------------' |
93 | */ | 88 | */ |
94 | [_DVORAK] = { | 89 | [_DVORAK] = LAYOUT_preonic_mit( \ |
95 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, | 90 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
96 | {_______, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, _______}, | 91 | _______, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, _______, \ |
97 | {_______, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, _______}, | 92 | _______, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, _______, \ |
98 | {_______, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, _______}, | 93 | _______, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, _______, \ |
99 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} | 94 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
100 | }, | 95 | ), |
101 | 96 | ||
102 | /* GAME | 97 | /* GAME |
103 | * ,-----------------------------------------------------------------------------------. | 98 | * ,-----------------------------------------------------------------------------------. |
@@ -112,13 +107,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
112 | * | Brite| Ctrl | Alt | XXX | Lower | Space | Raise| - | = | [ | ] | | 107 | * | Brite| Ctrl | Alt | XXX | Lower | Space | Raise| - | = | [ | ] | |
113 | * `-----------------------------------------------------------------------------------' | 108 | * `-----------------------------------------------------------------------------------' |
114 | */ | 109 | */ |
115 | [_GAME] = { | 110 | [_GAME] = LAYOUT_preonic_mit( \ |
116 | {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, | 111 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
117 | {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH}, | 112 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH,\ |
118 | {KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, | 113 | KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
119 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, | 114 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \ |
120 | {_______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______} | 115 | _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______ \ |
121 | }, | 116 | ), |
122 | 117 | ||
123 | /* NUMPAD | 118 | /* NUMPAD |
124 | * ,-----------------------------------------------------------------------------------. | 119 | * ,-----------------------------------------------------------------------------------. |
@@ -133,13 +128,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
133 | * | 0 | 0 | . | Enter| Lower| Space | Raise| - | = | [ | ] | | 128 | * | 0 | 0 | . | Enter| Lower| Space | Raise| - | = | [ | ] | |
134 | * `-----------------------------------------------------------------------------------' | 129 | * `-----------------------------------------------------------------------------------' |
135 | */ | 130 | */ |
136 | [_NUMPAD] = { | 131 | [_NUMPAD] = LAYOUT_preonic_mit( \ |
137 | {KC_ESC, KC_PSLS, KC_PAST, KC_PMNS, _______, _______, _______, _______, _______, _______, _______, _______}, | 132 | KC_ESC, KC_PSLS, KC_PAST, KC_PMNS, _______, _______, _______, _______, _______, _______, _______, _______, \ |
138 | {KC_P7, KC_P8, KC_P9, KC_PPLS, _______, _______, _______, _______, _______, _______, _______, _______}, | 133 | KC_P7, KC_P8, KC_P9, KC_PPLS, _______, _______, _______, _______, _______, _______, _______, _______, \ |
139 | {KC_P4, KC_P5, KC_P6, KC_PPLS, _______, _______, _______, _______, _______, _______, _______, _______}, | 134 | KC_P4, KC_P5, KC_P6, KC_PPLS, _______, _______, _______, _______, _______, _______, _______, _______, \ |
140 | {KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, _______, _______, _______, _______, _______}, | 135 | KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, _______, _______, _______, _______, _______, \ |
141 | {KC_P0, KC_P0, KC_PDOT, KC_PENT, _______, _______, _______, _______, _______, _______, _______, _______}, | 136 | KC_P0, KC_P0, KC_PDOT, KC_PENT, _______, _______, _______, _______, _______, _______, _______ \ |
142 | }, | 137 | ), |
143 | /* Lower | 138 | /* Lower |
144 | * ,-----------------------------------------------------------------------------------. | 139 | * ,-----------------------------------------------------------------------------------. |
145 | * | ` | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | Del | | 140 | * | ` | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | Del | |
@@ -153,13 +148,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
153 | * | Vol- | | | | | | | + | Enter| 0 | . | | 148 | * | Vol- | | | | | | | + | Enter| 0 | . | |
154 | * `-----------------------------------------------------------------------------------' | 149 | * `-----------------------------------------------------------------------------------' |
155 | */ | 150 | */ |
156 | [_LOWER] = { | 151 | [_LOWER] = LAYOUT_preonic_mit( \ |
157 | {KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL}, | 152 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, \ |
158 | {KC_MUTE, KC_BSPC, KC_UP, KC_DEL, KC_WWW_FORWARD, KC_BTN1, KC_MS_U, KC_BTN2, KC_PSLS, KC_P7, KC_P8, KC_P9}, | 153 | KC_MUTE, KC_BSPC, KC_UP, KC_DEL, KC_WWW_FORWARD, KC_BTN1, KC_MS_U, KC_BTN2, KC_PSLS, KC_P7, KC_P8, KC_P9, \ |
159 | {_______, KC_LEFT, KC_DOWN, KC_RIGHT, KC_WWW_REFRESH, KC_MS_L, KC_MS_D, KC_MS_R, KC_PAST, KC_P4, KC_P5, KC_P6}, | 154 | _______, KC_LEFT, KC_DOWN, KC_RIGHT, KC_WWW_REFRESH, KC_MS_L, KC_MS_D, KC_MS_R, KC_PAST, KC_P4, KC_P5, KC_P6, \ |
160 | {KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, KC_WWW_BACK, KC_WH_D, KC_BTN3, KC_WH_U, KC_PMNS, KC_P1, KC_P2, KC_P3}, | 155 | KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, KC_WWW_BACK, KC_WH_D, KC_BTN3, KC_WH_U, KC_PMNS, KC_P1, KC_P2, KC_P3, \ |
161 | {KC_VOLD, _______, _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PENT, KC_P0, KC_PDOT} | 156 | KC_VOLD, _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PENT, KC_P0, KC_PDOT \ |
162 | }, | 157 | ), |
163 | 158 | ||
164 | /* Raise | 159 | /* Raise |
165 | * ,-----------------------------------------------------------------------------------. | 160 | * ,-----------------------------------------------------------------------------------. |
@@ -174,13 +169,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
174 | * | | | | | | | | | | | | | 169 | * | | | | | | | | | | | | |
175 | * `-----------------------------------------------------------------------------------' | 170 | * `-----------------------------------------------------------------------------------' |
176 | */ | 171 | */ |
177 | [_RAISE] = { | 172 | [_RAISE] = LAYOUT_preonic_mit( \ |
178 | {KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC}, | 173 | KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ |
179 | {_______, KC_BSPC, KC_PGUP, KC_DEL, _______, _______, _______, KC_PGUP, KC_UP, _______, _______, _______}, | 174 | _______, KC_BSPC, KC_PGUP, KC_DEL, _______, _______, _______, KC_PGUP, KC_UP, _______, _______, _______, \ |
180 | {_______, KC_HOME, KC_PGDN, KC_END, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______}, | 175 | _______, KC_HOME, KC_PGDN, KC_END, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, \ |
181 | {_______, KC_PAUSE, KC_INS, _______, KC_PSCR, KC_PSCR, _______, KC_END, _______, _______, _______, _______}, | 176 | _______, KC_PAUSE, KC_INS, _______, KC_PSCR, KC_PSCR, _______, KC_END, _______, _______, _______, _______, \ |
182 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} | 177 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
183 | }, | 178 | ), |
184 | 179 | ||
185 | /* Adjust (Lower + Raise) | 180 | /* Adjust (Lower + Raise) |
186 | * ,-----------------------------------------------------------------------------------. | 181 | * ,-----------------------------------------------------------------------------------. |
@@ -195,13 +190,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
195 | * | | | | | | Reset | | | | | | | 190 | * | | | | | | Reset | | | | | | |
196 | * `-----------------------------------------------------------------------------------' | 191 | * `-----------------------------------------------------------------------------------' |
197 | */ | 192 | */ |
198 | [_ADJUST] = { | 193 | [_ADJUST] = LAYOUT_preonic_mit( \ |
199 | {_______, _______, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______}, | 194 | _______, _______, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______, \ |
200 | {_______, RESET, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, KC_DEL}, | 195 | _______, RESET, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, KC_DEL, \ |
201 | {_______, _______, _______, AU_ON, AU_OFF, MI_ON, MI_OFF, QWERTY, COLEMAK, DVORAK, _______, _______}, | 196 | _______, _______, _______, AU_ON, AU_OFF, MI_ON, MI_OFF, QWERTY, COLEMAK, DVORAK, _______, _______, \ |
202 | {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, KC_SYSTEM_SLEEP, KC_SYSTEM_WAKE, ARROW, GAME, NUMPAD, _______, _______}, | 197 | _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, KC_SYSTEM_SLEEP, KC_SYSTEM_WAKE, ARROW, GAME, NUMPAD, _______, _______, \ |
203 | {_______, _______, _______, _______, _______, RESET, RESET, _______, _______, _______, _______, _______} | 198 | _______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______ \ |
204 | } | 199 | ) |
205 | 200 | ||
206 | 201 | ||
207 | }; | 202 | }; |
diff --git a/keyboards/preonic/keymaps/blake-newman/keymap.c b/keyboards/preonic/keymaps/blake-newman/keymap.c index d14263d90..17440d2c6 100644 --- a/keyboards/preonic/keymaps/blake-newman/keymap.c +++ b/keyboards/preonic/keymaps/blake-newman/keymap.c | |||
@@ -14,8 +14,7 @@ | |||
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 | 16 | ||
17 | #include "preonic.h" | 17 | #include QMK_KEYBOARD_H |
18 | #include "action_layer.h" | ||
19 | 18 | ||
20 | enum preonic_layers { | 19 | enum preonic_layers { |
21 | _QWERTY, | 20 | _QWERTY, |
@@ -52,13 +51,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
52 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | | Alt | Ctrl | Shift| | 51 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | | Alt | Ctrl | Shift| |
53 | * `-----------------------------------------------------------------------------------' | 52 | * `-----------------------------------------------------------------------------------' |
54 | */ | 53 | */ |
55 | [_QWERTY] = { | 54 | [_QWERTY] = LAYOUT_preonic_mit( \ |
56 | {KC_GRV, KC_1, KC_2, KC_5, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, | 55 | KC_GRV, KC_1, KC_2, KC_5, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ |
57 | {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, | 56 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ |
58 | {KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, | 57 | KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
59 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT}, | 58 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ |
60 | {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, _______, KC_RALT, KC_RCTL, KC_RSFT} | 59 | BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, _______, KC_RALT, KC_RCTL, KC_RSFT \ |
61 | }, | 60 | ), |
62 | 61 | ||
63 | /* Colemak | 62 | /* Colemak |
64 | * ,-----------------------------------------------------------------------------------. | 63 | * ,-----------------------------------------------------------------------------------. |
@@ -73,13 +72,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
73 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | | Alt | Ctrl | Shift| | 72 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | | Alt | Ctrl | Shift| |
74 | * `-----------------------------------------------------------------------------------' | 73 | * `-----------------------------------------------------------------------------------' |
75 | */ | 74 | */ |
76 | [_COLEMAK] = { | 75 | [_COLEMAK] = LAYOUT_preonic_mit( \ |
77 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, | 76 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ |
78 | {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC}, | 77 | KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ |
79 | {KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, | 78 | KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ |
80 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT}, | 79 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ |
81 | {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, _______, KC_RALT, KC_RCTL, KC_RSFT} | 80 | BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, _______, KC_RALT, KC_RCTL, KC_RSFT \ |
82 | }, | 81 | ), |
83 | 82 | ||
84 | /* Dvorak | 83 | /* Dvorak |
85 | * ,-----------------------------------------------------------------------------------. | 84 | * ,-----------------------------------------------------------------------------------. |
@@ -94,13 +93,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
94 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | | Alt | Ctrl | Shift| | 93 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | | Alt | Ctrl | Shift| |
95 | * `-----------------------------------------------------------------------------------' | 94 | * `-----------------------------------------------------------------------------------' |
96 | */ | 95 | */ |
97 | [_DVORAK] = { | 96 | [_DVORAK] = LAYOUT_preonic_mit( \ |
98 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, | 97 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ |
99 | {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC}, | 98 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ |
100 | {KC_BSPC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH}, | 99 | KC_BSPC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, \ |
101 | {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT}, | 100 | KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, \ |
102 | {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, _______, KC_RALT, KC_RCTL, KC_RSFT} | 101 | BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, _______, KC_RALT, KC_RCTL, KC_RSFT \ |
103 | }, | 102 | ), |
104 | 103 | ||
105 | /* Numpad | 104 | /* Numpad |
106 | * ,-----------------------------------------------------------------------------------. | 105 | * ,-----------------------------------------------------------------------------------. |
@@ -115,13 +114,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
115 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | 0 | . | Ctrl | Shift| | 114 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | 0 | . | Ctrl | Shift| |
116 | * `-----------------------------------------------------------------------------------' | 115 | * `-----------------------------------------------------------------------------------' |
117 | */ | 116 | */ |
118 | [_NUMPAD] = { | 117 | [_NUMPAD] = LAYOUT_preonic_mit( \ |
119 | {KC_ESC, _______, _______, KC_PGDN, KC_PGUP, KC_END, KC_HOME, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_DEL}, | 118 | KC_ESC, _______, _______, KC_PGDN, KC_PGUP, KC_END, KC_HOME, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_DEL, \ |
120 | {KC_TAB, _______, KC_UP, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_BSPC}, | 119 | KC_TAB, _______, KC_UP, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_BSPC, \ |
121 | {KC_BSPC, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_P4, KC_P5, KC_P6, _______, KC_QUOT}, | 120 | KC_BSPC, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_P4, KC_P5, KC_P6, _______, KC_QUOT, \ |
122 | {KC_LSFT, _______, _______, _______, _______, _______, KC_COMM, KC_P1, KC_P2, KC_P3, _______, KC_RSFT}, | 121 | KC_LSFT, _______, _______, _______, _______, _______, KC_COMM, KC_P1, KC_P2, KC_P3, _______, KC_RSFT, \ |
123 | {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_P0, KC_PDOT, KC_RCTL, KC_RSFT} | 122 | BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, KC_P0, KC_PDOT, KC_RCTL, KC_RSFT \ |
124 | }, | 123 | ), |
125 | 124 | ||
126 | 125 | ||
127 | /* Lower | 126 | /* Lower |
@@ -137,13 +136,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
137 | * | Brite| Ctrl | Alt | GUI |Lower | Enter |Raise | | Alt | Ctrl | Shift| | 136 | * | Brite| Ctrl | Alt | GUI |Lower | Enter |Raise | | Alt | Ctrl | Shift| |
138 | * `-----------------------------------------------------------------------------------' | 137 | * `-----------------------------------------------------------------------------------' |
139 | */ | 138 | */ |
140 | [_LOWER] = { | 139 | [_LOWER] = LAYOUT_preonic_mit( \ |
141 | {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, | 140 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ |
142 | {KC_ESC, _______, KC_UP, _______, _______, _______, _______, KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_BSPC}, | 141 | KC_ESC, _______, KC_UP, _______, _______, _______, _______, KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_BSPC, \ |
143 | {KC_BSPC, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_BSLS}, | 142 | KC_BSPC, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_BSLS, \ |
144 | {KC_LSFT, KC_PIPE, _______, _______, _______, _______, _______, _______, ALGR_T(KC_4), ALGR_T(KC_5), _______, KC_RSFT}, | 143 | KC_LSFT, KC_PIPE, _______, _______, _______, _______, _______, _______, ALGR_T(KC_4), ALGR_T(KC_5), _______, KC_RSFT, \ |
145 | {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_ENT, KC_ENT, RAISE, _______, KC_RALT, KC_RCTL, KC_RSFT} | 144 | BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_ENT, RAISE, _______, KC_RALT, KC_RCTL, KC_RSFT \ |
146 | }, | 145 | ), |
147 | 146 | ||
148 | /* Raise | 147 | /* Raise |
149 | * ,-----------------------------------------------------------------------------------. | 148 | * ,-----------------------------------------------------------------------------------. |
@@ -158,13 +157,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
158 | * | Brite| Ctrl | Alt | GUI |Lower | Enter |Raise | | Alt | Ctrl | Shift| | 157 | * | Brite| Ctrl | Alt | GUI |Lower | Enter |Raise | | Alt | Ctrl | Shift| |
159 | * `-----------------------------------------------------------------------------------' | 158 | * `-----------------------------------------------------------------------------------' |
160 | */ | 159 | */ |
161 | [_RAISE] = { | 160 | [_RAISE] = LAYOUT_preonic_mit( \ |
162 | {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, | 161 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ |
163 | {KC_ESC, _______, KC_UP, _______, _______, _______, _______, KC_MINS, KC_UNDS, KC_EQL, KC_PLUS, KC_BSPC}, | 162 | KC_ESC, _______, KC_UP, _______, _______, _______, _______, KC_MINS, KC_UNDS, KC_EQL, KC_PLUS, KC_BSPC, \ |
164 | {KC_BSPC, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, KC_PIPE}, | 163 | KC_BSPC, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, KC_PIPE, \ |
165 | {KC_LSFT, KC_BSLS, _______, _______, _______, _______, _______, _______, _______, ALGR_T(KC_DLR), KC_DLR, KC_RSFT}, | 164 | KC_LSFT, KC_BSLS, _______, _______, _______, _______, _______, _______, _______, ALGR_T(KC_DLR), KC_DLR, KC_RSFT, \ |
166 | {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_ENT, KC_ENT, RAISE, _______, KC_RALT, KC_RCTL, KC_RSFT} | 165 | BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_ENT, RAISE, _______, KC_RALT, KC_RCTL, KC_RSFT \ |
167 | }, | 166 | ), |
168 | 167 | ||
169 | /* Adjust (Lower + Raise) | 168 | /* Adjust (Lower + Raise) |
170 | * ,-----------------------------------------------------------------------------------. | 169 | * ,-----------------------------------------------------------------------------------. |
@@ -179,13 +178,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
179 | * | | | | | | | | Next | Vol- | Vol+ | Play | | 178 | * | | | | | | | | Next | Vol- | Vol+ | Play | |
180 | * `-----------------------------------------------------------------------------------' | 179 | * `-----------------------------------------------------------------------------------' |
181 | */ | 180 | */ |
182 | [_ADJUST] = { | 181 | [_ADJUST] = LAYOUT_preonic_mit( \ |
183 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, | 182 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
184 | {_______, RESET, DEBUG, _______, _______, _______, _______, TERM_ON, TERM_OFF,LALT(KC_PSCR), LCTL(KC_PSCR), KC_PSCR}, | 183 | _______, RESET, DEBUG, _______, _______, _______, _______, TERM_ON, TERM_OFF,LALT(KC_PSCR), LCTL(KC_PSCR), KC_PSCR, \ |
185 | {KC_CAPS, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, NUMPAD, KC_INS}, | 184 | KC_CAPS, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, NUMPAD, KC_INS, \ |
186 | {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______}, | 185 | _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, \ |
187 | {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} | 186 | _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ |
188 | } | 187 | ) |
189 | 188 | ||
190 | }; | 189 | }; |
191 | 190 | ||
diff --git a/keyboards/preonic/keymaps/bucktooth/keymap.c b/keyboards/preonic/keymaps/bucktooth/keymap.c index d135db487..d3bcf66ef 100644 --- a/keyboards/preonic/keymaps/bucktooth/keymap.c +++ b/keyboards/preonic/keymaps/bucktooth/keymap.c | |||
@@ -1,8 +1,4 @@ | |||
1 | #include "preonic.h" | 1 | #include QMK_KEYBOARD_H |
2 | #include "action_layer.h" | ||
3 | #ifdef AUDIO_ENABLE | ||
4 | #include "audio.h" | ||
5 | #endif | ||
6 | 2 | ||
7 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | 3 | // Each layer gets a name for readability, which is then used in the keymap matrix below. |
8 | #define L_QWERTSPLITLY 0 | 4 | #define L_QWERTSPLITLY 0 |
@@ -47,13 +43,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
47 | * |ESC/fn|LCtrl | LOpt | LCmd |Space | Tab | BkSp |Space |En/Cmd|<-/fn |CRSR v|CRSR->| | 43 | * |ESC/fn|LCtrl | LOpt | LCmd |Space | Tab | BkSp |Space |En/Cmd|<-/fn |CRSR v|CRSR->| |
48 | * `-----------------------------------------------------------------------------------' | 44 | * `-----------------------------------------------------------------------------------' |
49 | */ | 45 | */ |
50 | [L_QWERTSPLITLY] = { | 46 | [L_QWERTSPLITLY] = LAYOUT_preonic_grid( \ |
51 | {KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINUS,KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, }, | 47 | KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINUS,KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, \ |
52 | {KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, }, | 48 | KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, \ |
53 | {KC_A, KC_S, KC_D, KC_F, KC_G, KC_GRAVE,KC_QUOTE,KC_H, KC_J, KC_K, KC_L, KC_SCLN }, | 49 | KC_A, KC_S, KC_D, KC_F, KC_G, KC_GRAVE,KC_QUOTE,KC_H, KC_J, KC_K, KC_L, KC_SCLN, \ |
54 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_BSLS, KC_SLASH,KC_N, KC_M, KC_COMM, MT_RSDOT}, | 50 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_BSLS, KC_SLASH,KC_N, KC_M, KC_COMM, MT_RSDOT,\ |
55 | {LT_FNESC,KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_TAB, KC_BSPC, KC_SPC, MT_RGENT,LT_FNLFT,KC_DOWN, KC_RIGHT} | 51 | LT_FNESC,KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_TAB, KC_BSPC, KC_SPC, MT_RGENT,LT_FNLFT,KC_DOWN, KC_RIGHT \ |
56 | }, | 52 | ), |
57 | 53 | ||
58 | /* Fn | 54 | /* Fn |
59 | * ,-----------------------------------------------------------------------------------. | 55 | * ,-----------------------------------------------------------------------------------. |
@@ -68,13 +64,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
68 | * |[ESC] |RCtrl | ROpt | RCmd |Space |Sh-Tab| Del |Space |PadEnt| [fn] | Up | Left | | 64 | * |[ESC] |RCtrl | ROpt | RCmd |Space |Sh-Tab| Del |Space |PadEnt| [fn] | Up | Left | |
69 | * `-----------------------------------------------------------------------------------' | 65 | * `-----------------------------------------------------------------------------------' |
70 | */ | 66 | */ |
71 | [L_FN] = { | 67 | [L_FN] = LAYOUT_preonic_grid( \ |
72 | {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_VOLD, KC_VOLU, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 }, | 68 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_VOLD, KC_VOLU, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, \ |
73 | {KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_MRWD, KC_MFFD, KC_WH_U, KC_BTN1, KC_MS_U, KC_BTN2, KC_PGUP }, | 69 | KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_MRWD, KC_MFFD, KC_WH_U, KC_BTN1, KC_MS_U, KC_BTN2, KC_PGUP, \ |
74 | {KC_CAPS, MF_LPAD, MF_DASH, MF_HELP, MF_DRWR, KC_MUTE, KC_MPLY, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, KC_PGDN }, | 70 | KC_CAPS, MF_LPAD, MF_DASH, MF_HELP, MF_DRWR, KC_MUTE, KC_MPLY, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, KC_PGDN, \ |
75 | {KC_RSFT, MF_MENU, MF_STAT, MF_DOCK, MF_TOOL, MF_NOTI, KC_INS, KC_ACL0, KC_ACL1, KC_ACL2, KC_HOME, KC_END }, | 71 | KC_RSFT, MF_MENU, MF_STAT, MF_DOCK, MF_TOOL, MF_NOTI, KC_INS, KC_ACL0, KC_ACL1, KC_ACL2, KC_HOME, KC_END, \ |
76 | {_______, KC_RCTL, KC_RALT, KC_RGUI, _______, LS_TAB, KC_DEL, _______, KC_PENT, _______, KC_UP, KC_LEFT } | 72 | _______, KC_RCTL, KC_RALT, KC_RGUI, _______, LS_TAB, KC_DEL, _______, KC_PENT, _______, KC_UP, KC_LEFT \ |
77 | } | 73 | ) |
78 | 74 | ||
79 | }; | 75 | }; |
80 | 76 | ||
diff --git a/keyboards/preonic/keymaps/choromanski/keymap.c b/keyboards/preonic/keymaps/choromanski/keymap.c index 195fbeec7..5f11a9feb 100644 --- a/keyboards/preonic/keymaps/choromanski/keymap.c +++ b/keyboards/preonic/keymaps/choromanski/keymap.c | |||
@@ -1,5 +1,4 @@ | |||
1 | #include "preonic.h" | 1 | #include QMK_KEYBOARD_H |
2 | #include "action_layer.h" | ||
3 | 2 | ||
4 | enum preonic_layers { | 3 | enum preonic_layers { |
5 | _COLEMAK, | 4 | _COLEMAK, |
@@ -46,13 +45,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
46 | * |Symbol| Ctrl | Alt | GUI | Bksp | Del |Enter |Space | Left | Down | Up |Right | | 45 | * |Symbol| Ctrl | Alt | GUI | Bksp | Del |Enter |Space | Left | Down | Up |Right | |
47 | * `-----------------------------------------------------------------------------------' | 46 | * `-----------------------------------------------------------------------------------' |
48 | */ | 47 | */ |
49 | [_COLEMAK] = { | 48 | [_COLEMAK] = LAYOUT_preonic_grid( \ |
50 | {TD(G1), KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, TD(EQ)}, | 49 | TD(G1), KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, TD(EQ), \ |
51 | {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, TD(BRC)}, | 50 | KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, TD(BRC), \ |
52 | {KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, | 51 | KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ |
53 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, TG(_NUMPAD)}, | 52 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, TG(_NUMPAD), \ |
54 | {OSL(_SYMB), KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, KC_DEL, KC_ENT, KC_SPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | 53 | OSL(_SYMB), KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, KC_DEL, KC_ENT, KC_SPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
55 | }, | 54 | ), |
56 | 55 | ||
57 | /* Qwerty | 56 | /* Qwerty |
58 | * ,-----------------------------------------------------------------------------------. | 57 | * ,-----------------------------------------------------------------------------------. |
@@ -67,13 +66,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
67 | * |Symbol| Ctrl | Alt | GUI | Bksp | Del |Enter |Space | Left | Down | Up |Right | | 66 | * |Symbol| Ctrl | Alt | GUI | Bksp | Del |Enter |Space | Left | Down | Up |Right | |
68 | * `-----------------------------------------------------------------------------------' | 67 | * `-----------------------------------------------------------------------------------' |
69 | */ | 68 | */ |
70 | [_QWERTY] = { | 69 | [_QWERTY] = LAYOUT_preonic_grid( \ |
71 | {TD(G1), KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, TD(EQ)}, | 70 | TD(G1), KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, TD(EQ), \ |
72 | {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, TD(BRC)}, | 71 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, TD(BRC), \ |
73 | {KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, | 72 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
74 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, TG(_NUMPAD)}, | 73 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, TG(_NUMPAD), \ |
75 | {OSL(_SYMB), KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, KC_DEL, KC_ENT, KC_SPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | 74 | OSL(_SYMB), KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, KC_DEL, KC_ENT, KC_SPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
76 | }, | 75 | ), |
77 | 76 | ||
78 | /* Function | 77 | /* Function |
79 | * ,-----------------------------------------------------------------------------------. | 78 | * ,-----------------------------------------------------------------------------------. |
@@ -88,13 +87,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
88 | * |Symbol| | | | | | | | | | | | | 87 | * |Symbol| | | | | | | | | | | | |
89 | * `-----------------------------------------------------------------------------------' | 88 | * `-----------------------------------------------------------------------------------' |
90 | */ | 89 | */ |
91 | [_FUNCT] = { | 90 | [_FUNCT] = LAYOUT_preonic_grid( \ |
92 | {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, | 91 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ |
93 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, | 92 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
94 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, | 93 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
95 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, | 94 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
96 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} | 95 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
97 | }, | 96 | ), |
98 | 97 | ||
99 | /* Numpad & Mouse | 98 | /* Numpad & Mouse |
100 | * ,-----------------------------------------------------------------------------------. | 99 | * ,-----------------------------------------------------------------------------------. |
@@ -109,13 +108,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
109 | * |Symbol| | VOLD | MUTE | Bksp | Del |Enter |Space | 0 | . |Enter | | | 108 | * |Symbol| | VOLD | MUTE | Bksp | Del |Enter |Space | 0 | . |Enter | | |
110 | * `-----------------------------------------------------------------------------------' | 109 | * `-----------------------------------------------------------------------------------' |
111 | */ | 110 | */ |
112 | [_NUMPAD] = { | 111 | [_NUMPAD] = LAYOUT_preonic_grid( \ |
113 | {KC_GRV, _______, _______, KC_BTN3, _______, _______, _______, KC_NLCK, KC_SLSH, KC_ASTR, KC_MINS, KC_BSLS}, | 112 | KC_GRV, _______, _______, KC_BTN3, _______, _______, _______, KC_NLCK, KC_SLSH, KC_ASTR, KC_MINS, KC_BSLS, \ |
114 | {_______, KC_ACL0, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_7, KC_8, KC_9, KC_PLUS, KC_RBRC}, | 113 | _______, KC_ACL0, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_7, KC_8, KC_9, KC_PLUS, KC_RBRC, \ |
115 | {_______, KC_ACL1, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_4, KC_5, KC_6, KC_PLUS, _______}, | 114 | _______, KC_ACL1, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_4, KC_5, KC_6, KC_PLUS, _______, \ |
116 | {_______, KC_ACL2, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_1, KC_2, KC_3, KC_ENT, _______}, | 115 | _______, KC_ACL2, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_1, KC_2, KC_3, KC_ENT, _______, \ |
117 | {OSL(_SYMB), _______, KC_VOLD, KC_MUTE, KC_BSPC, KC_DEL, KC_ENT, KC_SPC, KC_0, KC_DOT, KC_ENT, _______} | 116 | OSL(_SYMB), _______, KC_VOLD, KC_MUTE, KC_BSPC, KC_DEL, KC_ENT, KC_SPC, KC_0, KC_DOT, KC_ENT, _______ \ |
118 | }, | 117 | ), |
119 | 118 | ||
120 | /* Symbol | 119 | /* Symbol |
121 | * ,-----------------------------------------------------------------------------------. | 120 | * ,-----------------------------------------------------------------------------------. |
@@ -130,13 +129,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
130 | * | | FN |COLMAK|QWERTY| | | | | | | | | | 129 | * | | FN |COLMAK|QWERTY| | | | | | | | | |
131 | * `-----------------------------------------------------------------------------------' | 130 | * `-----------------------------------------------------------------------------------' |
132 | */ | 131 | */ |
133 | [_SYMB] = { | 132 | [_SYMB] = LAYOUT_preonic_grid( \ |
134 | {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, | 133 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ |
135 | {_______, KC_PIPE, KC_PLUS, KC_LABK, KC_RABK, KC_HASH, KC_TILD, KC_LPRN, KC_RPRN, KC_BSLS, KC_COLN, _______}, | 134 | _______, KC_PIPE, KC_PLUS, KC_LABK, KC_RABK, KC_HASH, KC_TILD, KC_LPRN, KC_RPRN, KC_BSLS, KC_COLN, _______, \ |
136 | {_______, KC_EXLM, KC_MINS, KC_EQL, KC_PERC, KC_AT, KC_UNDS, KC_LCBR, KC_RCBR, KC_SLSH, KC_QUES, _______}, | 135 | _______, KC_EXLM, KC_MINS, KC_EQL, KC_PERC, KC_AT, KC_UNDS, KC_LCBR, KC_RCBR, KC_SLSH, KC_QUES, _______, \ |
137 | {TO(_MUSIC), KC_ASTR, KC_AMPR, KC_SLSH, KC_DLR, KC_CIRC, KC_PIPE, KC_LBRC, KC_RBRC, _______, _______, _______}, | 136 | TO(_MUSIC), KC_ASTR, KC_AMPR, KC_SLSH, KC_DLR, KC_CIRC, KC_PIPE, KC_LBRC, KC_RBRC, _______, _______, _______, \ |
138 | {_______, FUNCT, TO(_COLEMAK), TO(_QWERTY), _______, _______, _______, _______, _______, _______, _______, _______} | 137 | _______, FUNCT, TO(_COLEMAK), TO(_QWERTY), _______, _______, _______, _______, _______, _______, _______, _______ \ |
139 | }, | 138 | ), |
140 | 139 | ||
141 | /* Music | 140 | /* Music |
142 | * ,-----------------------------------------------------------------------------------. | 141 | * ,-----------------------------------------------------------------------------------. |
@@ -151,13 +150,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
151 | * |COLMAK| | | | | | | | | | MOD | TOG | | 150 | * |COLMAK| | | | | | | | | | MOD | TOG | |
152 | * `-----------------------------------------------------------------------------------' | 151 | * `-----------------------------------------------------------------------------------' |
153 | */ | 152 | */ |
154 | [_MUSIC] = { | 153 | [_MUSIC] = LAYOUT_preonic_grid( \ |
155 | {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}, | 154 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ |
156 | {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}, | 155 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ |
157 | {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}, | 156 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ |
158 | {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}, | 157 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ |
159 | {TO(_COLEMAK), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, MU_MOD, MU_TOG} | 158 | TO(_COLEMAK), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, MU_MOD, MU_TOG \ |
160 | } | 159 | ) |
161 | 160 | ||
162 | }; | 161 | }; |
163 | 162 | ||
@@ -172,4 +171,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
172 | break; | 171 | break; |
173 | } | 172 | } |
174 | return true; | 173 | return true; |
175 | }; \ No newline at end of file | 174 | }; |
diff --git a/keyboards/preonic/keymaps/default/keymap.c b/keyboards/preonic/keymaps/default/keymap.c index c9d04958a..de3eb2298 100644 --- a/keyboards/preonic/keymaps/default/keymap.c +++ b/keyboards/preonic/keymaps/default/keymap.c | |||
@@ -14,8 +14,7 @@ | |||
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 | 16 | ||
17 | #include "preonic.h" | 17 | #include QMK_KEYBOARD_H |
18 | #include "action_layer.h" | ||
19 | 18 | ||
20 | enum preonic_layers { | 19 | enum preonic_layers { |
21 | _QWERTY, | 20 | _QWERTY, |
@@ -50,13 +49,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
50 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | | 49 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | |
51 | * `-----------------------------------------------------------------------------------' | 50 | * `-----------------------------------------------------------------------------------' |
52 | */ | 51 | */ |
53 | [_QWERTY] = { | 52 | [_QWERTY] = LAYOUT_preonic_grid( \ |
54 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, | 53 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
55 | {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL}, | 54 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, \ |
56 | {KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, | 55 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
57 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, | 56 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \ |
58 | {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | 57 | BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
59 | }, | 58 | ), |
60 | 59 | ||
61 | /* Colemak | 60 | /* Colemak |
62 | * ,-----------------------------------------------------------------------------------. | 61 | * ,-----------------------------------------------------------------------------------. |
@@ -71,13 +70,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
71 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | | 70 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | |
72 | * `-----------------------------------------------------------------------------------' | 71 | * `-----------------------------------------------------------------------------------' |
73 | */ | 72 | */ |
74 | [_COLEMAK] = { | 73 | [_COLEMAK] = LAYOUT_preonic_grid( \ |
75 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, | 74 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
76 | {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL}, | 75 | KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL, \ |
77 | {KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, | 76 | KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ |
78 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, | 77 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \ |
79 | {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | 78 | BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
80 | }, | 79 | ), |
81 | 80 | ||
82 | /* Dvorak | 81 | /* Dvorak |
83 | * ,-----------------------------------------------------------------------------------. | 82 | * ,-----------------------------------------------------------------------------------. |
@@ -92,13 +91,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
92 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | | 91 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | |
93 | * `-----------------------------------------------------------------------------------' | 92 | * `-----------------------------------------------------------------------------------' |
94 | */ | 93 | */ |
95 | [_DVORAK] = { | 94 | [_DVORAK] = LAYOUT_preonic_grid( \ |
96 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, | 95 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
97 | {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_DEL}, | 96 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_DEL, \ |
98 | {KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH}, | 97 | KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, \ |
99 | {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT }, | 98 | KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT, \ |
100 | {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | 99 | BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
101 | }, | 100 | ), |
102 | 101 | ||
103 | /* Lower | 102 | /* Lower |
104 | * ,-----------------------------------------------------------------------------------. | 103 | * ,-----------------------------------------------------------------------------------. |
@@ -113,13 +112,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
113 | * | | | | | | | | Next | Vol- | Vol+ | Play | | 112 | * | | | | | | | | Next | Vol- | Vol+ | Play | |
114 | * `-----------------------------------------------------------------------------------' | 113 | * `-----------------------------------------------------------------------------------' |
115 | */ | 114 | */ |
116 | [_LOWER] = { | 115 | [_LOWER] = LAYOUT_preonic_grid( \ |
117 | {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC}, | 116 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ |
118 | {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL}, | 117 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, \ |
119 | {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, | 118 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ |
120 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______}, | 119 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______, \ |
121 | {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} | 120 | _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ |
122 | }, | 121 | ), |
123 | 122 | ||
124 | /* Raise | 123 | /* Raise |
125 | * ,-----------------------------------------------------------------------------------. | 124 | * ,-----------------------------------------------------------------------------------. |
@@ -134,13 +133,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
134 | * | | | | | | | | Next | Vol- | Vol+ | Play | | 133 | * | | | | | | | | Next | Vol- | Vol+ | Play | |
135 | * `-----------------------------------------------------------------------------------' | 134 | * `-----------------------------------------------------------------------------------' |
136 | */ | 135 | */ |
137 | [_RAISE] = { | 136 | [_RAISE] = LAYOUT_preonic_grid( \ |
138 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, | 137 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
139 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, | 138 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ |
140 | {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS}, | 139 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ |
141 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______}, | 140 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, \ |
142 | {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} | 141 | _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ |
143 | }, | 142 | ), |
144 | 143 | ||
145 | /* Adjust (Lower + Raise) | 144 | /* Adjust (Lower + Raise) |
146 | * ,-----------------------------------------------------------------------------------. | 145 | * ,-----------------------------------------------------------------------------------. |
@@ -155,13 +154,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
155 | * | | | | | | | | | | | | | 154 | * | | | | | | | | | | | | |
156 | * `-----------------------------------------------------------------------------------' | 155 | * `-----------------------------------------------------------------------------------' |
157 | */ | 156 | */ |
158 | [_ADJUST] = { | 157 | [_ADJUST] = LAYOUT_preonic_grid( \ |
159 | {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, | 158 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ |
160 | {_______, RESET, DEBUG, _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL}, | 159 | _______, RESET, DEBUG, _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL, \ |
161 | {_______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______}, | 160 | _______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \ |
162 | {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______}, | 161 | _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, \ |
163 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} | 162 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
164 | } | 163 | ) |
165 | 164 | ||
166 | 165 | ||
167 | }; | 166 | }; |
diff --git a/keyboards/preonic/keymaps/dlaroe/keymap.c b/keyboards/preonic/keymaps/dlaroe/keymap.c index 95ff9792b..0da0d68ef 100644 --- a/keyboards/preonic/keymaps/dlaroe/keymap.c +++ b/keyboards/preonic/keymaps/dlaroe/keymap.c | |||
@@ -1,12 +1,7 @@ | |||
1 | // Dale's Planck with a number row, I mean Preonic. | 1 | // Dale's Planck with a number row, I mean Preonic. |
2 | // I could have done something cooler with the top row I guess but I'm pretty much a Planck guy, that is the reason for the duplication of keys. | 2 | // I could have done something cooler with the top row I guess but I'm pretty much a Planck guy, that is the reason for the duplication of keys. |
3 | 3 | ||
4 | #include "preonic.h" | 4 | #include QMK_KEYBOARD_H |
5 | #include "action_layer.h" | ||
6 | #include "eeconfig.h" | ||
7 | #ifdef AUDIO_ENABLE | ||
8 | #include "audio.h" | ||
9 | #endif | ||
10 | 5 | ||
11 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | 6 | // Each layer gets a name for readability, which is then used in the keymap matrix below. |
12 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | 7 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. |
@@ -48,13 +43,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
48 | * | Ctrl | GUI | \ | Alt |Lower | Space |Raise | [ | - | = | ] | | 43 | * | Ctrl | GUI | \ | Alt |Lower | Space |Raise | [ | - | = | ] | |
49 | * `-----------------------------------------------------------------------------------' | 44 | * `-----------------------------------------------------------------------------------' |
50 | */ | 45 | */ |
51 | [_QWERTY] = { | 46 | [_QWERTY] = LAYOUT_preonic_mit( \ |
52 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, | 47 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ |
53 | {KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, | 48 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ |
54 | {KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, | 49 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
55 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT(MOD_RSFT, KC_ENT) }, | 50 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT(MOD_RSFT, KC_ENT), \ |
56 | {KC_LCTL, KC_LGUI, KC_BSLS, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, LT(_LOWER, KC_LBRC), KC_MINS, KC_EQL, MT(MOD_RCTL, KC_RBRC)} | 51 | KC_LCTL, KC_LGUI, KC_BSLS, KC_LALT, LOWER, KC_SPC, RAISE, LT(_LOWER, KC_LBRC), KC_MINS, KC_EQL, MT(MOD_RCTL, KC_RBRC) \ |
57 | }, | 52 | ), |
58 | 53 | ||
59 | /* Arrow | 54 | /* Arrow |
60 | * ,-----------------------------------------------------------------------------------. | 55 | * ,-----------------------------------------------------------------------------------. |
@@ -69,13 +64,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
69 | * | Ctrl | GUI | \ | Alt |Lower | Space |Raise | Left | Down | Up | Right | | 64 | * | Ctrl | GUI | \ | Alt |Lower | Space |Raise | Left | Down | Up | Right | |
70 | * `-----------------------------------------------------------------------------------' | 65 | * `-----------------------------------------------------------------------------------' |
71 | */ | 66 | */ |
72 | [_ARROW] = { | 67 | [_ARROW] = LAYOUT_preonic_mit( \ |
73 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, | 68 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ |
74 | {KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, | 69 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ |
75 | {KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, | 70 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
76 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT(MOD_RSFT, KC_ENT) }, | 71 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT(MOD_RSFT, KC_ENT), \ |
77 | {KC_LCTL, KC_LGUI, KC_BSLS, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, MT(MOD_RCTL, KC_RGHT)} | 72 | KC_LCTL, KC_LGUI, KC_BSLS, KC_LALT, LOWER, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, MT(MOD_RCTL, KC_RGHT) \ |
78 | }, | 73 | ), |
79 | 74 | ||
80 | /* Lower | 75 | /* Lower |
81 | * ,-----------------------------------------------------------------------------------. | 76 | * ,-----------------------------------------------------------------------------------. |
@@ -90,13 +85,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
90 | * | | | | | | 0 | | [ | - | + | ] | | 85 | * | | | | | | 0 | | [ | - | + | ] | |
91 | * `-----------------------------------------------------------------------------------' | 86 | * `-----------------------------------------------------------------------------------' |
92 | */ | 87 | */ |
93 | [_LOWER] = { | 88 | [_LOWER] = LAYOUT_preonic_mit( \ |
94 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, | 89 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ |
95 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, | 90 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
96 | {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_4, KC_5, KC_6, KC_DOT, KC_ASTR}, | 91 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_4, KC_5, KC_6, KC_DOT, KC_ASTR, \ |
97 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_1, KC_2, KC_3, _______, _______}, | 92 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_1, KC_2, KC_3, _______, _______, \ |
98 | {_______, _______, _______, _______, _______, KC_0, KC_0, _______, _______, _______, KC_PLUS, _______} | 93 | _______, _______, _______, _______, _______, KC_0, _______, _______, _______, KC_PLUS, _______ \ |
99 | }, | 94 | ), |
100 | 95 | ||
101 | /* Raise | 96 | /* Raise |
102 | * ,-----------------------------------------------------------------------------------. | 97 | * ,-----------------------------------------------------------------------------------. |
@@ -111,13 +106,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
111 | * | | App | | | | Ins | | Home | PGDN | PGUP | End | | 106 | * | | App | | | | Ins | | Home | PGDN | PGUP | End | |
112 | * `-----------------------------------------------------------------------------------' | 107 | * `-----------------------------------------------------------------------------------' |
113 | */ | 108 | */ |
114 | [_RAISE] = { | 109 | [_RAISE] = LAYOUT_preonic_mit( \ |
115 | {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC}, | 110 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, |
116 | {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL}, | 111 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, |
117 | { KC_DEL, KC_WH_U, KC_BTN2, KC_MS_U, KC_BTN1, QWERTY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_PIPE, KC_GRV}, | 112 | KC_DEL, KC_WH_U, KC_BTN2, KC_MS_U, KC_BTN1, QWERTY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_PIPE, KC_GRV, |
118 | {_______, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLASH, _______}, | 113 | _______, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLASH, _______, |
119 | {_______, KC_APP, _______, _______, _______, KC_INS, KC_INS, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END} | 114 | _______, KC_APP, _______, _______, _______, KC_INS, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END |
120 | }, | 115 | ), |
121 | 116 | ||
122 | /* Adjust (Lower + Raise) | 117 | /* Adjust (Lower + Raise) |
123 | * ,-----------------------------------------------------------------------------------. | 118 | * ,-----------------------------------------------------------------------------------. |
@@ -132,13 +127,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
132 | * | Brite| | | | | Play/Pause | | BL_T |BL_DEC|BL_INC|BL_ST | | 127 | * | Brite| | | | | Play/Pause | | BL_T |BL_DEC|BL_INC|BL_ST | |
133 | * `-----------------------------------------------------------------------------------' | 128 | * `-----------------------------------------------------------------------------------' |
134 | */ | 129 | */ |
135 | [_ADJUST] = { | 130 | [_ADJUST] = LAYOUT_preonic_mit( \ |
136 | {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, | 131 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, |
137 | {LALT(LCTL(KC_INS)), QWERTY, _______, _______, RESET, M(0), _______, MAGIC_TOGGLE_NKRO, _______, _______, _______, LALT(LCTL(KC_DEL))}, | 132 | LALT(LCTL(KC_INS)), QWERTY, _______, _______, RESET, M(0), _______, MAGIC_TOGGLE_NKRO, _______, _______, _______, LALT(LCTL(KC_DEL)), |
138 | {KC_CAPS, ARROW, _______, AU_ON, AU_OFF, _______, AG_SWAP, AG_NORM, KC_PSCR, KC_SLCK, KC_PAUS, _______}, | 133 | KC_CAPS, ARROW, _______, AU_ON, AU_OFF, _______, AG_SWAP, AG_NORM, KC_PSCR, KC_SLCK, KC_PAUS, _______, |
139 | {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______}, | 134 | _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, |
140 | {BACKLIT, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, BL_TOGG, BL_DEC , BL_INC , BL_STEP} | 135 | BACKLIT, _______, _______, _______, _______, KC_MPLY, _______, BL_TOGG, BL_DEC , BL_INC , BL_STEP |
141 | } | 136 | ) |
142 | 137 | ||
143 | 138 | ||
144 | }; | 139 | }; |
diff --git a/keyboards/preonic/keymaps/dudeofawesome/keymap.c b/keyboards/preonic/keymaps/dudeofawesome/keymap.c index dbe7fb648..d9d720bd8 100644 --- a/keyboards/preonic/keymaps/dudeofawesome/keymap.c +++ b/keyboards/preonic/keymaps/dudeofawesome/keymap.c | |||
@@ -14,8 +14,7 @@ | |||
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 | 16 | ||
17 | #include "preonic.h" | 17 | #include QMK_KEYBOARD_H |
18 | #include "action_layer.h" | ||
19 | 18 | ||
20 | enum preonic_layers { | 19 | enum preonic_layers { |
21 | _QWERTY, | 20 | _QWERTY, |
@@ -53,13 +52,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
53 | * | Num | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | | 52 | * | Num | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | |
54 | * `-----------------------------------------------------------------------------------' | 53 | * `-----------------------------------------------------------------------------------' |
55 | */ | 54 | */ |
56 | [_QWERTY] = { | 55 | [_QWERTY] = LAYOUT_preonic_mit( \ |
57 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, | 56 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ |
58 | {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, | 57 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ |
59 | {KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, | 58 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
60 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_ENT)}, | 59 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_ENT), \ |
61 | {TT(_NUMPAD), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | 60 | TT(_NUMPAD), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
62 | }, | 61 | ), |
63 | 62 | ||
64 | /* Workman | 63 | /* Workman |
65 | * ,-----------------------------------------------------------------------------------. | 64 | * ,-----------------------------------------------------------------------------------. |
@@ -74,13 +73,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
74 | * | Num | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | | 73 | * | Num | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | |
75 | * `-----------------------------------------------------------------------------------' | 74 | * `-----------------------------------------------------------------------------------' |
76 | */ | 75 | */ |
77 | [_WORKMAN] = { | 76 | [_WORKMAN] = LAYOUT_preonic_mit( \ |
78 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, | 77 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ |
79 | {KC_TAB, KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_SCLN, KC_BSPC}, | 78 | KC_TAB, KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_SCLN, KC_BSPC, \ |
80 | {KC_ESC, KC_A, KC_S, KC_H, KC_T, KC_G, KC_Y, KC_N, KC_E, KC_O, KC_I, KC_QUOT}, | 79 | KC_ESC, KC_A, KC_S, KC_H, KC_T, KC_G, KC_Y, KC_N, KC_E, KC_O, KC_I, KC_QUOT, \ |
81 | {KC_LSFT, KC_Z, KC_X, KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_ENT)}, | 80 | KC_LSFT, KC_Z, KC_X, KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_ENT), \ |
82 | {TT(_NUMPAD), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | 81 | TT(_NUMPAD), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
83 | }, | 82 | ), |
84 | 83 | ||
85 | /* Colemak | 84 | /* Colemak |
86 | * ,-----------------------------------------------------------------------------------. | 85 | * ,-----------------------------------------------------------------------------------. |
@@ -95,13 +94,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
95 | * | Num | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | | 94 | * | Num | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | |
96 | * `-----------------------------------------------------------------------------------' | 95 | * `-----------------------------------------------------------------------------------' |
97 | */ | 96 | */ |
98 | [_COLEMAK] = { | 97 | [_COLEMAK] = LAYOUT_preonic_mit( \ |
99 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, | 98 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ |
100 | {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC}, | 99 | KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ |
101 | {KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, | 100 | KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ |
102 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_ENT)}, | 101 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_ENT), \ |
103 | {TT(_NUMPAD), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | 102 | TT(_NUMPAD), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
104 | }, | 103 | ), |
105 | 104 | ||
106 | /* Dvorak | 105 | /* Dvorak |
107 | * ,-----------------------------------------------------------------------------------. | 106 | * ,-----------------------------------------------------------------------------------. |
@@ -116,13 +115,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
116 | * | Num | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | | 115 | * | Num | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | |
117 | * `-----------------------------------------------------------------------------------' | 116 | * `-----------------------------------------------------------------------------------' |
118 | */ | 117 | */ |
119 | [_DVORAK] = { | 118 | [_DVORAK] = LAYOUT_preonic_mit( \ |
120 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, | 119 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ |
121 | {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC}, | 120 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ |
122 | {KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH}, | 121 | KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, \ |
123 | {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, RSFT_T(KC_ENT)}, | 122 | KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, RSFT_T(KC_ENT), \ |
124 | {TT(_NUMPAD), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | 123 | TT(_NUMPAD), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
125 | }, | 124 | ), |
126 | 125 | ||
127 | /* Lower | 126 | /* Lower |
128 | * ,-----------------------------------------------------------------------------------. | 127 | * ,-----------------------------------------------------------------------------------. |
@@ -137,13 +136,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
137 | * | | | | | | | | Play | Vol- | Vol+ | Next | | 136 | * | | | | | | | | Play | Vol- | Vol+ | Next | |
138 | * `-----------------------------------------------------------------------------------' | 137 | * `-----------------------------------------------------------------------------------' |
139 | */ | 138 | */ |
140 | [_LOWER] = { | 139 | [_LOWER] = LAYOUT_preonic_mit( \ |
141 | {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______}, | 140 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \ |
142 | {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______}, | 141 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \ |
143 | {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, | 142 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ |
144 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______}, | 143 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______, \ |
145 | {_______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MNXT} | 144 | _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MNXT \ |
146 | }, | 145 | ), |
147 | 146 | ||
148 | /* Raise | 147 | /* Raise |
149 | * ,-----------------------------------------------------------------------------------. | 148 | * ,-----------------------------------------------------------------------------------. |
@@ -158,13 +157,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
158 | * | | | | | | | | Play | Vol- | Vol+ | Next | | 157 | * | | | | | | | | Play | Vol- | Vol+ | Next | |
159 | * `-----------------------------------------------------------------------------------' | 158 | * `-----------------------------------------------------------------------------------' |
160 | */ | 159 | */ |
161 | [_RAISE] = { | 160 | [_RAISE] = LAYOUT_preonic_mit( \ |
162 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______}, | 161 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ |
163 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______}, | 162 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ |
164 | {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS}, | 163 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ |
165 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______}, | 164 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, \ |
166 | {_______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MNXT} | 165 | _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MNXT \ |
167 | }, | 166 | ), |
168 | 167 | ||
169 | /* Adjust (Lower + Raise) | 168 | /* Adjust (Lower + Raise) |
170 | * ,-----------------------------------------------------------------------------------. | 169 | * ,-----------------------------------------------------------------------------------. |
@@ -179,13 +178,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
179 | * | | | | | | | | | | | | | 178 | * | | | | | | | | | | | | |
180 | * `-----------------------------------------------------------------------------------' | 179 | * `-----------------------------------------------------------------------------------' |
181 | */ | 180 | */ |
182 | [_ADJUST] = { | 181 | [_ADJUST] = LAYOUT_preonic_mit( \ |
183 | {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, | 182 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ |
184 | {_______, RESET, DEBUG, _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL}, | 183 | _______, RESET, DEBUG, _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL, \ |
185 | {KC_CAPS, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, WORKMAN, DVORAK, COLEMAK, _______}, | 184 | KC_CAPS, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, WORKMAN, DVORAK, COLEMAK, _______, \ |
186 | {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______}, | 185 | _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, \ |
187 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} | 186 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
188 | }, | 187 | ), |
189 | 188 | ||
190 | /* Numpad | 189 | /* Numpad |
191 | * ,-----------------------------------------------------------------------------------. | 190 | * ,-----------------------------------------------------------------------------------. |
@@ -200,13 +199,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
200 | * | | | | | ✗ | | 0 | 0 | . | Enter| = | | 199 | * | | | | | ✗ | | 0 | 0 | . | Enter| = | |
201 | * `-----------------------------------------------------------------------------------' | 200 | * `-----------------------------------------------------------------------------------' |
202 | */ | 201 | */ |
203 | [_NUMPAD] = { | 202 | [_NUMPAD] = LAYOUT_preonic_mit( \ |
204 | {_______, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PSLS, KC_PAST, KC_PMNS, _______}, | 203 | _______, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PSLS, KC_PAST, KC_PMNS, _______, \ |
205 | {_______, KC_NO, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_NO, KC_P7, KC_P8, KC_P9, KC_PPLS, _______}, | 204 | _______, KC_NO, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_NO, KC_P7, KC_P8, KC_P9, KC_PPLS, _______, \ |
206 | {_______, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_NO}, | 205 | _______, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_NO, \ |
207 | {_______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, KC_PENT, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_PENT}, | 206 | _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, KC_PENT, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_PENT, \ |
208 | {_______, _______, _______, _______, KC_NO, _______, _______, KC_P0, KC_P0, KC_PDOT, KC_PENT, KC_PEQL} | 207 | _______, _______, _______, _______, KC_NO, _______, KC_P0, KC_P0, KC_PDOT, KC_PENT, KC_PEQL \ |
209 | } | 208 | ) |
210 | 209 | ||
211 | 210 | ||
212 | }; | 211 | }; |
diff --git a/keyboards/preonic/keymaps/ekis_isa/keymap.c b/keyboards/preonic/keymaps/ekis_isa/keymap.c index d99cbff2e..03874e4a9 100644 --- a/keyboards/preonic/keymaps/ekis_isa/keymap.c +++ b/keyboards/preonic/keymaps/ekis_isa/keymap.c | |||
@@ -14,8 +14,7 @@ | |||
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 | 16 | ||
17 | #include "preonic.h" | 17 | #include QMK_KEYBOARD_H |
18 | #include "action_layer.h" | ||
19 | 18 | ||
20 | enum preonic_layers { | 19 | enum preonic_layers { |
21 | _QWERTY, | 20 | _QWERTY, |
@@ -50,13 +49,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
50 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | | 49 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | |
51 | * `-----------------------------------------------------------------------------------' | 50 | * `-----------------------------------------------------------------------------------' |
52 | */ | 51 | */ |
53 | [_QWERTY] = { | 52 | [_QWERTY] = LAYOUT_preonic_mit( \ |
54 | {KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS}, | 53 | KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, \ |
55 | {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, | 54 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ |
56 | {KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, | 55 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
57 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, | 56 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \ |
58 | {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | 57 | BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
59 | }, | 58 | ), |
60 | 59 | ||
61 | /* Colemak | 60 | /* Colemak |
62 | * ,-----------------------------------------------------------------------------------. | 61 | * ,-----------------------------------------------------------------------------------. |
@@ -71,13 +70,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
71 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | | 70 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | |
72 | * `-----------------------------------------------------------------------------------' | 71 | * `-----------------------------------------------------------------------------------' |
73 | */ | 72 | */ |
74 | [_COLEMAK] = { | 73 | [_COLEMAK] = LAYOUT_preonic_mit( \ |
75 | {KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS}, | 74 | KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, \ |
76 | {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC}, | 75 | KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ |
77 | {KC_LTCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, | 76 | KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ |
78 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, | 77 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \ |
79 | {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | 78 | BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
80 | }, | 79 | ), |
81 | 80 | ||
82 | /* Dvorak | 81 | /* Dvorak |
83 | * ,-----------------------------------------------------------------------------------. | 82 | * ,-----------------------------------------------------------------------------------. |
@@ -92,13 +91,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
92 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | | 91 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | |
93 | * `-----------------------------------------------------------------------------------' | 92 | * `-----------------------------------------------------------------------------------' |
94 | */ | 93 | */ |
95 | [_DVORAK] = { | 94 | [_DVORAK] = LAYOUT_preonic_mit( \ |
96 | {KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS}, | 95 | KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, \ |
97 | {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC}, | 96 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ |
98 | {KC_LTCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH}, | 97 | KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, \ |
99 | {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT }, | 98 | KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT, \ |
100 | {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | 99 | BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
101 | }, | 100 | ), |
102 | 101 | ||
103 | /* Lower | 102 | /* Lower |
104 | * ,-----------------------------------------------------------------------------------. | 103 | * ,-----------------------------------------------------------------------------------. |
@@ -113,13 +112,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
113 | * | | | | | | | | Next | Vol- | Vol+ | Play | | 112 | * | | | | | | | | Next | Vol- | Vol+ | Play | |
114 | * `-----------------------------------------------------------------------------------' | 113 | * `-----------------------------------------------------------------------------------' |
115 | */ | 114 | */ |
116 | [_LOWER] = { | 115 | [_LOWER] = LAYOUT_preonic_mit( \ |
117 | {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC}, | 116 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ |
118 | {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL}, | 117 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, \ |
119 | {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, | 118 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ |
120 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______}, | 119 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______, \ |
121 | {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} | 120 | _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ |
122 | }, | 121 | ), |
123 | 122 | ||
124 | /* Raise | 123 | /* Raise |
125 | * ,-----------------------------------------------------------------------------------. | 124 | * ,-----------------------------------------------------------------------------------. |
@@ -134,13 +133,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
134 | * | | | | | | | | Next | Vol- | Vol+ | Play | | 133 | * | | | | | | | | Next | Vol- | Vol+ | Play | |
135 | * `-----------------------------------------------------------------------------------' | 134 | * `-----------------------------------------------------------------------------------' |
136 | */ | 135 | */ |
137 | [_RAISE] = { | 136 | [_RAISE] = LAYOUT_preonic_mit( \ |
138 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, | 137 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
139 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, | 138 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ |
140 | {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS}, | 139 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ |
141 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______}, | 140 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, \ |
142 | {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} | 141 | _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ |
143 | }, | 142 | ), |
144 | 143 | ||
145 | /* Adjust (Lower + Raise) | 144 | /* Adjust (Lower + Raise) |
146 | * ,-----------------------------------------------------------------------------------. | 145 | * ,-----------------------------------------------------------------------------------. |
@@ -155,13 +154,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
155 | * | | | | | | | | | | | | | 154 | * | | | | | | | | | | | | |
156 | * `-----------------------------------------------------------------------------------' | 155 | * `-----------------------------------------------------------------------------------' |
157 | */ | 156 | */ |
158 | [_ADJUST] = { | 157 | [_ADJUST] = LAYOUT_preonic_mit( \ |
159 | {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, | 158 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ |
160 | {_______, RESET, DEBUG, _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL}, | 159 | _______, RESET, DEBUG, _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL, \ |
161 | {_______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______}, | 160 | _______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \ |
162 | {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______}, | 161 | _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, \ |
163 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} | 162 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
164 | } | 163 | ) |
165 | 164 | ||
166 | }; | 165 | }; |
167 | 166 | ||
diff --git a/keyboards/preonic/keymaps/jacwib/keymap.c b/keyboards/preonic/keymaps/jacwib/keymap.c index 37a7dbd9b..0b63abce1 100644 --- a/keyboards/preonic/keymaps/jacwib/keymap.c +++ b/keyboards/preonic/keymaps/jacwib/keymap.c | |||
@@ -1,10 +1,5 @@ | |||
1 | #include "preonic.h" | 1 | #include QMK_KEYBOARD_H |
2 | #include "action_layer.h" | ||
3 | #include "eeconfig.h" | ||
4 | #include "keymap_nordic.h" | 2 | #include "keymap_nordic.h" |
5 | #ifdef AUDIO_ENABLE | ||
6 | #include "audio.h" | ||
7 | #endif | ||
8 | 3 | ||
9 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | 4 | // Each layer gets a name for readability, which is then used in the keymap matrix below. |
10 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | 5 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. |
@@ -46,13 +41,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
46 | * | Ctrl | Alt | GUI |AltGr |Lower | Space| Enter|Raise | Left | Down | Up |Right | | 41 | * | Ctrl | Alt | GUI |AltGr |Lower | Space| Enter|Raise | Left | Down | Up |Right | |
47 | * `-----------------------------------------------------------------------------------' | 42 | * `-----------------------------------------------------------------------------------' |
48 | */ | 43 | */ |
49 | [_QWERTY] = { | 44 | [_QWERTY] = LAYOUT_preonic_grid( \ |
50 | {KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, NO_PLUS, KC_BSPC}, | 45 | KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, NO_PLUS, KC_BSPC, \ |
51 | {KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, NO_AM }, | 46 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, NO_AM, \ |
52 | {KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, NO_AE, NO_OSLH}, | 47 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, NO_AE, NO_OSLH, \ |
53 | {KC_LSFT, NO_LESS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_DOT, KC_COMM, NO_MINS}, | 48 | KC_LSFT, NO_LESS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_DOT, KC_COMM, NO_MINS, \ |
54 | {KC_LCTL, KC_LALT, KC_LGUI, NO_ALGR, LOWER, KC_SPC, KC_ENT, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | 49 | KC_LCTL, KC_LALT, KC_LGUI, NO_ALGR, LOWER, KC_SPC, KC_ENT, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
55 | }, | 50 | ), |
56 | 51 | ||
57 | /* Lower | 52 | /* Lower |
58 | * ,-----------------------------------------------------------------------------------. | 53 | * ,-----------------------------------------------------------------------------------. |
@@ -67,13 +62,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
67 | * | | | | | | |Bspc | | |PgDn |PgUp | | | 62 | * | | | | | | |Bspc | | |PgDn |PgUp | | |
68 | * `-----------------------------------------------------------------------------------' | 63 | * `-----------------------------------------------------------------------------------' |
69 | */ | 64 | */ |
70 | [_LOWER] = { | 65 | [_LOWER] = LAYOUT_preonic_grid( \ |
71 | {_______, NO_AT, NO_PND, NO_DLR, _______, _______, NO_LCBR, NO_LBRC, NO_RBRC, NO_RCBR, NO_BSLS, KC_DEL}, | 66 | _______, NO_AT, NO_PND, NO_DLR, _______, _______, NO_LCBR, NO_LBRC, NO_RBRC, NO_RCBR, NO_BSLS, KC_DEL, \ |
72 | {_______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, NO_TILD}, | 67 | _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, NO_TILD, \ |
73 | {_______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, LSFT(KC_BSLS)}, | 68 | _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, LSFT(KC_BSLS), \ |
74 | {_______, NO_PIPE, _______, _______, _______, _______, _______, _______, KC_VOLD, _______, _______, _______}, | 69 | _______, NO_PIPE, _______, _______, _______, _______, _______, _______, KC_VOLD, _______, _______, _______, \ |
75 | {_______, _______, _______, _______, _______, _______, KC_BSPC, _______, _______, KC_PGDN, KC_PGUP, _______} | 70 | _______, _______, _______, _______, _______, _______, KC_BSPC, _______, _______, KC_PGDN, KC_PGUP, _______ \ |
76 | }, | 71 | ), |
77 | 72 | ||
78 | /* Raise | 73 | /* Raise |
79 | * ,-----------------------------------------------------------------------------------. | 74 | * ,-----------------------------------------------------------------------------------. |
@@ -88,13 +83,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
88 | * | | | | | |Bspc | | | | PgDn | PgUp | | | 83 | * | | | | | |Bspc | | | | PgDn | PgUp | | |
89 | * `-----------------------------------------------------------------------------------' | 84 | * `-----------------------------------------------------------------------------------' |
90 | */ | 85 | */ |
91 | [_RAISE] = { | 86 | [_RAISE] = LAYOUT_preonic_grid( \ |
92 | {LSFT(KC_1),NO_QUO2,LSFT(KC_3), NO_BULT,LSFT(KC_5), NO_AMPR, NO_SLSH, NO_LPRN, NO_RPRN, NO_EQL, NO_QUES, KC_INS}, | 87 | LSFT(KC_1),NO_QUO2,LSFT(KC_3), NO_BULT,LSFT(KC_5), NO_AMPR, NO_SLSH, NO_LPRN, NO_RPRN, NO_EQL, NO_QUES, KC_INS, \ |
93 | {_______, _______, _______, KC_MS_U, _______, _______, _______, _______, KC_WH_U, _______, _______, NO_CIRC}, | 88 | _______, _______, _______, KC_MS_U, _______, _______, _______, _______, KC_WH_U, _______, _______, NO_CIRC, \ |
94 | {_______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, KC_BTN1, KC_BTN3, KC_BTN2, NO_APOS, NO_QUOT}, | 89 | _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, KC_BTN1, KC_BTN3, KC_BTN2, NO_APOS, NO_QUOT, \ |
95 | {_______, NO_GRTR, _______, _______, _______, _______, _______, _______, KC_WH_D, NO_COLN, NO_SCLN, NO_UNDS}, | 90 | _______, NO_GRTR, _______, _______, _______, _______, _______, _______, KC_WH_D, NO_COLN, NO_SCLN, NO_UNDS, \ |
96 | {_______, _______, _______, _______, _______, KC_BSPC, _______, _______, _______, KC_PGDN, KC_PGUP, _______} | 91 | _______, _______, _______, _______, _______, KC_BSPC, _______, _______, _______, KC_PGDN, KC_PGUP, _______ \ |
97 | }, | 92 | ), |
98 | 93 | ||
99 | /* Mac Qwerty | 94 | /* Mac Qwerty |
100 | * ,-----------------------------------------------------------------------------------. | 95 | * ,-----------------------------------------------------------------------------------. |
@@ -109,13 +104,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
109 | * | Ctrl | Alt | GUI |AltGr |Lower | Space| Enter|Raise | Left | Down | Up |Right | | 104 | * | Ctrl | Alt | GUI |AltGr |Lower | Space| Enter|Raise | Left | Down | Up |Right | |
110 | * `-----------------------------------------------------------------------------------' | 105 | * `-----------------------------------------------------------------------------------' |
111 | */ | 106 | */ |
112 | [_MQWERTY] = { | 107 | [_MQWERTY] = LAYOUT_preonic_grid( \ |
113 | {KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, NO_PLUS, KC_BSPC}, | 108 | KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, NO_PLUS, KC_BSPC, \ |
114 | {KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, NO_AM }, | 109 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, NO_AM, \ |
115 | {KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, NO_AE, NO_OSLH}, | 110 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, NO_AE, NO_OSLH, \ |
116 | {KC_LSFT, NO_LESS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_DOT, KC_COMM, NO_MINS}, | 111 | KC_LSFT, NO_LESS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_DOT, KC_COMM, NO_MINS, \ |
117 | {KC_LCTL, KC_LALT, KC_LGUI, NO_ALGR, MLOWER, KC_SPC, KC_ENT, MRAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | 112 | KC_LCTL, KC_LALT, KC_LGUI, NO_ALGR, MLOWER, KC_SPC, KC_ENT, MRAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
118 | }, | 113 | ), |
119 | 114 | ||
120 | /* Mac Lower | 115 | /* Mac Lower |
121 | * ,-----------------------------------------------------------------------------------. | 116 | * ,-----------------------------------------------------------------------------------. |
@@ -130,13 +125,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
130 | * | | | | | | |Bspc | | |PgDn |PgUp | | | 125 | * | | | | | | |Bspc | | |PgDn |PgUp | | |
131 | * `-----------------------------------------------------------------------------------' | 126 | * `-----------------------------------------------------------------------------------' |
132 | */ | 127 | */ |
133 | [_MLOWER] = { | 128 | [_MLOWER] = LAYOUT_preonic_grid( \ |
134 | {_______, NO_AT, NO_PND, NO_DLR, _______, _______, LSFT(LALT(KC_8)), NO_LBRC, NO_RBRC, LSFT(LALT(KC_9)), LSFT(LALT(KC_7)), KC_DEL}, | 129 | _______, NO_AT, NO_PND, NO_DLR, _______, _______, LSFT(LALT(KC_8)), NO_LBRC, NO_RBRC, LSFT(LALT(KC_9)), LSFT(LALT(KC_7)), KC_DEL, \ |
135 | {_______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, NO_TILD}, | 130 | _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, NO_TILD, \ |
136 | {_______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, LSFT(KC_BSLS)}, | 131 | _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, LSFT(KC_BSLS), \ |
137 | {_______, NO_LBRC, _______, _______, _______, _______, _______, _______, KC_VOLD, _______, _______, _______}, | 132 | _______, NO_LBRC, _______, _______, _______, _______, _______, _______, KC_VOLD, _______, _______, _______, \ |
138 | {_______, _______, _______, _______, _______, _______, KC_BSPC, _______, _______, KC_PGDN, KC_PGUP, _______} | 133 | _______, _______, _______, _______, _______, _______, KC_BSPC, _______, _______, KC_PGDN, KC_PGUP, _______ \ |
139 | }, | 134 | ), |
140 | 135 | ||
141 | /* Mac Raise | 136 | /* Mac Raise |
142 | * ,-----------------------------------------------------------------------------------. | 137 | * ,-----------------------------------------------------------------------------------. |
@@ -151,13 +146,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
151 | * | | | | | |Bspc | | | | PgDn | PgUp | | | 146 | * | | | | | |Bspc | | | | PgDn | PgUp | | |
152 | * `-----------------------------------------------------------------------------------' | 147 | * `-----------------------------------------------------------------------------------' |
153 | */ | 148 | */ |
154 | [_MRAISE] = { | 149 | [_MRAISE] = LAYOUT_preonic_grid( \ |
155 | {LSFT(KC_1),NO_QUO2,LSFT(KC_3), NO_BULT,LSFT(KC_5), NO_AMPR, NO_SLSH, NO_LPRN, NO_RPRN, NO_EQL, NO_QUES, KC_INS}, | 150 | LSFT(KC_1),NO_QUO2,LSFT(KC_3), NO_BULT,LSFT(KC_5), NO_AMPR, NO_SLSH, NO_LPRN, NO_RPRN, NO_EQL, NO_QUES, KC_INS, \ |
156 | {_______, _______, _______, KC_MS_U, _______, _______, _______, _______, KC_WH_U, _______, _______, NO_CIRC}, | 151 | _______, _______, _______, KC_MS_U, _______, _______, _______, _______, KC_WH_U, _______, _______, NO_CIRC, \ |
157 | {_______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, KC_BTN1, KC_BTN3, KC_BTN2, NO_APOS, NO_QUOT}, | 152 | _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, KC_BTN1, KC_BTN3, KC_BTN2, NO_APOS, NO_QUOT, \ |
158 | {_______, NO_GRTR, _______, _______, _______, _______, _______, _______, KC_WH_D, NO_COLN, NO_SCLN, NO_UNDS}, | 153 | _______, NO_GRTR, _______, _______, _______, _______, _______, _______, KC_WH_D, NO_COLN, NO_SCLN, NO_UNDS, \ |
159 | {_______, _______, _______, _______, _______, KC_BSPC, _______, _______, _______, KC_PGDN, KC_PGUP, _______} | 154 | _______, _______, _______, _______, _______, KC_BSPC, _______, _______, _______, KC_PGDN, KC_PGUP, _______ \ |
160 | }, | 155 | ), |
161 | 156 | ||
162 | /* Adjust (Lower + Raise) | 157 | /* Adjust (Lower + Raise) |
163 | * ,-----------------------------------------------------------------------------------. | 158 | * ,-----------------------------------------------------------------------------------. |
@@ -172,13 +167,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
172 | * | | | | | | | | | | | | | | 167 | * | | | | | | | | | | | | | |
173 | * `-----------------------------------------------------------------------------------' | 168 | * `-----------------------------------------------------------------------------------' |
174 | */ | 169 | */ |
175 | [_ADJUST] = { | 170 | [_ADJUST] = LAYOUT_preonic_grid( \ |
176 | {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, | 171 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ |
177 | {_______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______}, | 172 | _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, \ |
178 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RSFT}, | 173 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RSFT, \ |
179 | {_______, MU_ON, MU_OFF, _______, _______, _______, _______, TO(0), TO(5), _______, _______, RESET }, | 174 | _______, MU_ON, MU_OFF, _______, _______, _______, _______, TO(0), TO(5), _______, _______, RESET, \ |
180 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} | 175 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
181 | } | 176 | ) |
182 | 177 | ||
183 | 178 | ||
184 | }; | 179 | }; |
diff --git a/keyboards/preonic/keymaps/kinesis/keymap.c b/keyboards/preonic/keymaps/kinesis/keymap.c index 69c33472e..93fd99163 100644 --- a/keyboards/preonic/keymaps/kinesis/keymap.c +++ b/keyboards/preonic/keymaps/kinesis/keymap.c | |||
@@ -1,9 +1,4 @@ | |||
1 | #include "preonic.h" | 1 | #include QMK_KEYBOARD_H |
2 | #include "action_layer.h" | ||
3 | #include "eeconfig.h" | ||
4 | #ifdef AUDIO_ENABLE | ||
5 | #include "audio.h" | ||
6 | #endif | ||
7 | 2 | ||
8 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | 3 | // Each layer gets a name for readability, which is then used in the keymap matrix below. |
9 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | 4 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. |
@@ -41,13 +36,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
41 | * | FN | ` | Alt | LGUI | Back | ESC |ENTER | SPCE | RGUI | [ | ] | FN | | 36 | * | FN | ` | Alt | LGUI | Back | ESC |ENTER | SPCE | RGUI | [ | ] | FN | |
42 | * `-----------------------------------------------------------------------------------' | 37 | * `-----------------------------------------------------------------------------------' |
43 | */ | 38 | */ |
44 | [_QWERTY] = { | 39 | [_QWERTY] = LAYOUT_preonic_grid( \ |
45 | {EQ_LOCK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, MIN_ULK }, | 40 | EQ_LOCK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, MIN_ULK, \ |
46 | {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS }, | 41 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, \ |
47 | {KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT }, | 42 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
48 | {KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC }, | 43 | KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, \ |
49 | {MO(_FN), HYP_TIC, KC_LALT, KC_LGUI, KC_BSPC, KC_ESC, KC_ENT, KC_SPC, KC_RGUI, KC_LBRC, KC_RBRC, MO(_FN) } | 44 | MO(_FN), HYP_TIC, KC_LALT, KC_LGUI, KC_BSPC, KC_ESC, KC_ENT, KC_SPC, KC_RGUI, KC_LBRC, KC_RBRC, MO(_FN) \ |
50 | }, | 45 | ), |
51 | 46 | ||
52 | /* Fn | 47 | /* Fn |
53 | * ,-----------------------------------------------------------------------------------. | 48 | * ,-----------------------------------------------------------------------------------. |
@@ -62,13 +57,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
62 | * | |Voice-|Voice+|Mus on|MusOff| | |PLY/PS| | PREV | NEXT | | | 57 | * | |Voice-|Voice+|Mus on|MusOff| | |PLY/PS| | PREV | NEXT | | |
63 | * `-----------------------------------------------------------------------------------' | 58 | * `-----------------------------------------------------------------------------------' |
64 | */ | 59 | */ |
65 | [_FN] = { | 60 | [_FN] = LAYOUT_preonic_grid( \ |
66 | {_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______ }, | 61 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, \ |
67 | {_______, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, _______ }, | 62 | _______, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, _______, \ |
68 | {_______, KC_VOLD, KC_VOLU, KC_MUTE, BL_TOGG, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______ }, | 63 | _______, KC_VOLD, KC_VOLU, KC_MUTE, BL_TOGG, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, \ |
69 | {_______, BL_DEC, BL_INC, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______ }, | 64 | _______, BL_DEC, BL_INC, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \ |
70 | {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, _______, _______, KC_MPLY, _______, KC_MPRV, KC_MNXT, _______ } | 65 | _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, _______, _______, KC_MPLY, _______, KC_MPRV, KC_MNXT, _______ \ |
71 | } | 66 | ) |
72 | 67 | ||
73 | }; | 68 | }; |
74 | 69 | ||
diff --git a/keyboards/preonic/keymaps/nikchi/keymap.c b/keyboards/preonic/keymaps/nikchi/keymap.c index 4c2bf1fcf..bb7be876c 100644 --- a/keyboards/preonic/keymaps/nikchi/keymap.c +++ b/keyboards/preonic/keymaps/nikchi/keymap.c | |||
@@ -1,9 +1,4 @@ | |||
1 | #include "preonic.h" | 1 | #include QMK_KEYBOARD_H |
2 | #include "action_layer.h" | ||
3 | #include "eeconfig.h" | ||
4 | #ifdef AUDIO_ENABLE | ||
5 | #include "audio.h" | ||
6 | #endif | ||
7 | 2 | ||
8 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | 3 | // Each layer gets a name for readability, which is then used in the keymap matrix below. |
9 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | 4 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. |
@@ -45,13 +40,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
45 | * | Brite| Ctrl | Alt | GUI |BKSP |SHIFT |ENTER |SPC | Left | Down | Up |Right | | 40 | * | Brite| Ctrl | Alt | GUI |BKSP |SHIFT |ENTER |SPC | Left | Down | Up |Right | |
46 | * `-----------------------------------------------------------------------------------' | 41 | * `-----------------------------------------------------------------------------------' |
47 | */ | 42 | */ |
48 | [_QWERTY] = { | 43 | [_QWERTY] = LAYOUT_preonic_grid( |
49 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, | 44 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
50 | {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL}, | 45 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, \ |
51 | {KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, | 46 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
52 | {LOWER , KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RAISE }, | 47 | LOWER , KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RAISE, \ |
53 | {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, KC_LSFT, KC_ENT, KC_SPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | 48 | BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, KC_LSFT, KC_ENT, KC_SPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
54 | }, | 49 | ), |
55 | 50 | ||
56 | /* Lower | 51 | /* Lower |
57 | * ,-----------------------------------------------------------------------------------. | 52 | * ,-----------------------------------------------------------------------------------. |
@@ -66,13 +61,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
66 | * | | | | | | | | Next | Vol- | Vol+ | Play | | 61 | * | | | | | | | | Next | Vol- | Vol+ | Play | |
67 | * `-----------------------------------------------------------------------------------' | 62 | * `-----------------------------------------------------------------------------------' |
68 | */ | 63 | */ |
69 | [_LOWER] = { | 64 | [_LOWER] = LAYOUT_preonic_grid( |
70 | {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC}, | 65 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ |
71 | {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL}, | 66 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, \ |
72 | {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, | 67 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ |
73 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______}, | 68 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \ |
74 | {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} | 69 | _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ |
75 | }, | 70 | ), |
76 | 71 | ||
77 | /* Raise | 72 | /* Raise |
78 | * ,-----------------------------------------------------------------------------------. | 73 | * ,-----------------------------------------------------------------------------------. |
@@ -87,13 +82,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
87 | * | | | | | | | | Next | Vol- | Vol+ | Play | | 82 | * | | | | | | | | Next | Vol- | Vol+ | Play | |
88 | * `-----------------------------------------------------------------------------------' | 83 | * `-----------------------------------------------------------------------------------' |
89 | */ | 84 | */ |
90 | [_RAISE] = { | 85 | [_RAISE] = LAYOUT_preonic_grid( |
91 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, | 86 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
92 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, | 87 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ |
93 | {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS}, | 88 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ |
94 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______}, | 89 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, \ |
95 | {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} | 90 | _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ |
96 | }, | 91 | ), |
97 | 92 | ||
98 | /* Adjust (Lower + Raise) | 93 | /* Adjust (Lower + Raise) |
99 | * ,-----------------------------------------------------------------------------------. | 94 | * ,-----------------------------------------------------------------------------------. |
@@ -108,13 +103,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
108 | * | | | | | | | | | | | | | 103 | * | | | | | | | | | | | | |
109 | * `-----------------------------------------------------------------------------------' | 104 | * `-----------------------------------------------------------------------------------' |
110 | */ | 105 | */ |
111 | [_ADJUST] = { | 106 | [_ADJUST] = LAYOUT_preonic_grid( |
112 | {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, | 107 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ |
113 | {_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL}, | 108 | _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ |
114 | {_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______}, | 109 | _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______, \ |
115 | {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______}, | 110 | _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, \ |
116 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} | 111 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
117 | } | 112 | ) |
118 | 113 | ||
119 | 114 | ||
120 | }; | 115 | }; |
diff --git a/keyboards/preonic/keymaps/smt/keymap.c b/keyboards/preonic/keymaps/smt/keymap.c index b27033b1b..3c703f473 100644 --- a/keyboards/preonic/keymaps/smt/keymap.c +++ b/keyboards/preonic/keymaps/smt/keymap.c | |||
@@ -1,9 +1,4 @@ | |||
1 | #include "preonic.h" | 1 | #include QMK_KEYBOARD_H |
2 | #include "action_layer.h" | ||
3 | #ifdef AUDIO_ENABLE | ||
4 | #include "audio.h" | ||
5 | #endif | ||
6 | #include "eeconfig.h" | ||
7 | 2 | ||
8 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | 3 | // Each layer gets a name for readability, which is then used in the keymap matrix below. |
9 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | 4 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. |
@@ -50,13 +45,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
50 | * | ` | Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | | 45 | * | ` | Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | |
51 | * `-----------------------------------------------------------------------------------' | 46 | * `-----------------------------------------------------------------------------------' |
52 | */ | 47 | */ |
53 | [_QWERTY] = { | 48 | [_QWERTY] = LAYOUT_preonic_grid( \ |
54 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, | 49 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, |
55 | {HPR_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, | 50 | HPR_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, |
56 | {CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, | 51 | CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, |
57 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT}, | 52 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT, |
58 | {MEH_GRV, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | 53 | MEH_GRV, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT |
59 | }, | 54 | ), |
60 | 55 | ||
61 | /* Colemak | 56 | /* Colemak |
62 | * ,-----------------------------------------------------------------------------------. | 57 | * ,-----------------------------------------------------------------------------------. |
@@ -71,13 +66,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
71 | * | ` | Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | | 66 | * | ` | Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | |
72 | * `-----------------------------------------------------------------------------------' | 67 | * `-----------------------------------------------------------------------------------' |
73 | */ | 68 | */ |
74 | [_COLEMAK] = { | 69 | [_COLEMAK] = LAYOUT_preonic_grid( \ |
75 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, | 70 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, |
76 | {HPR_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC}, | 71 | HPR_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, |
77 | {CTL_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, | 72 | CTL_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, |
78 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT}, | 73 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT, |
79 | {MEH_GRV, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | 74 | MEH_GRV, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT |
80 | }, | 75 | ), |
81 | 76 | ||
82 | /* Dvorak | 77 | /* Dvorak |
83 | * ,-----------------------------------------------------------------------------------. | 78 | * ,-----------------------------------------------------------------------------------. |
@@ -92,13 +87,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
92 | * | ` | Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | | 87 | * | ` | Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | |
93 | * `-----------------------------------------------------------------------------------' | 88 | * `-----------------------------------------------------------------------------------' |
94 | */ | 89 | */ |
95 | [_DVORAK] = { | 90 | [_DVORAK] = LAYOUT_preonic_grid( \ |
96 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, | 91 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, |
97 | {HPR_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC}, | 92 | HPR_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, |
98 | {CTL_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS}, | 93 | CTL_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, |
99 | {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_ENT}, | 94 | KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_ENT, |
100 | {MEH_GRV, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | 95 | MEH_GRV, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT |
101 | }, | 96 | ), |
102 | 97 | ||
103 | /* Lower | 98 | /* Lower |
104 | * ,-----------------------------------------------------------------------------------. | 99 | * ,-----------------------------------------------------------------------------------. |
@@ -113,13 +108,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
113 | * | | | | | | | | Next | Vol- | Vol+ | Play | | 108 | * | | | | | | | | Next | Vol- | Vol+ | Play | |
114 | * `-----------------------------------------------------------------------------------' | 109 | * `-----------------------------------------------------------------------------------' |
115 | */ | 110 | */ |
116 | [_LOWER] = { | 111 | [_LOWER] = LAYOUT_preonic_grid( \ |
117 | {ALL_T(KC_GRV), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, | 112 | ALL_T(KC_GRV), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, |
118 | {ALL_T(KC_0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, | 113 | ALL_T(KC_0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, |
119 | {CTL_T(KC_DLR), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_4, KC_5, KC_6, _______, _______}, | 114 | CTL_T(KC_DLR), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_4, KC_5, KC_6, _______, _______, |
120 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_1, KC_2, KC_3, _______, _______}, | 115 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_1, KC_2, KC_3, _______, _______, |
121 | {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} | 116 | _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY |
122 | }, | 117 | ), |
123 | 118 | ||
124 | /* Raise | 119 | /* Raise |
125 | * ,-----------------------------------------------------------------------------------. | 120 | * ,-----------------------------------------------------------------------------------. |
@@ -134,13 +129,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
134 | * | | | | | | | | | Home |PageDn|PageUp| End | | 129 | * | | | | | | | | | Home |PageDn|PageUp| End | |
135 | * `-----------------------------------------------------------------------------------' | 130 | * `-----------------------------------------------------------------------------------' |
136 | */ | 131 | */ |
137 | [_RAISE] = { | 132 | [_RAISE] = LAYOUT_preonic_grid( \ |
138 | {ALL_T(KC_TILD), KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL}, | 133 | ALL_T(KC_TILD), KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, |
139 | {ALL_T(KC_TILD), KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL}, | 134 | ALL_T(KC_TILD), KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, |
140 | {_______, _______, _______, _______, _______, _______, KC_UNDS, KC_QUES, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, | 135 | _______, _______, _______, _______, _______, _______, KC_UNDS, KC_QUES, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, |
141 | {_______, _______, _______, _______, _______, _______, KC_MINS, KC_SLSH, KC_EQL, KC_LBRC, KC_RBRC, SFT_T(KC_BSLS)}, | 136 | _______, _______, _______, _______, _______, _______, KC_MINS, KC_SLSH, KC_EQL, KC_LBRC, KC_RBRC, SFT_T(KC_BSLS), |
142 | {_______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END} | 137 | _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END |
143 | }, | 138 | ), |
144 | 139 | ||
145 | /* Adjust (Lower + Raise) | 140 | /* Adjust (Lower + Raise) |
146 | * ,-----------------------------------------------------------------------------------. | 141 | * ,-----------------------------------------------------------------------------------. |
@@ -155,13 +150,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
155 | * | | | | | | | | | | | | | 150 | * | | | | | | | | | | | | |
156 | * `-----------------------------------------------------------------------------------' | 151 | * `-----------------------------------------------------------------------------------' |
157 | */ | 152 | */ |
158 | [_ADJUST] = { | 153 | [_ADJUST] = LAYOUT_preonic_grid( \ |
159 | {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, | 154 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, |
160 | {_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET}, | 155 | _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, |
161 | {_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______}, | 156 | _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, |
162 | {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______}, | 157 | _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, |
163 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} | 158 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ |
164 | } | 159 | ) |
165 | 160 | ||
166 | 161 | ||
167 | }; | 162 | }; |
diff --git a/keyboards/preonic/keymaps/that_canadian/keymap.c b/keyboards/preonic/keymaps/that_canadian/keymap.c index 41e71697a..968b2ae25 100644 --- a/keyboards/preonic/keymaps/that_canadian/keymap.c +++ b/keyboards/preonic/keymaps/that_canadian/keymap.c | |||
@@ -1,9 +1,5 @@ | |||
1 | #include "preonic.h" | 1 | #include QMK_KEYBOARD_H |
2 | #include "action_layer.h" | 2 | |
3 | #include "eeconfig.h" | ||
4 | #ifdef AUDIO_ENABLE | ||
5 | #include "audio.h" | ||
6 | #endif | ||
7 | 3 | ||
8 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | 4 | // Each layer gets a name for readability, which is then used in the keymap matrix below. |
9 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | 5 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. |
@@ -47,13 +43,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
47 | * | Ctrl | ` | GUI | ALT |Lower | Space |Raise | Left | Down | Up |Right | | 43 | * | Ctrl | ` | GUI | ALT |Lower | Space |Raise | Left | Down | Up |Right | |
48 | * `-----------------------------------------------------------------------------------' | 44 | * `-----------------------------------------------------------------------------------' |
49 | */ | 45 | */ |
50 | [_QWERTY] = { | 46 | [_QWERTY] = LAYOUT_preonic_grid( \ |
51 | {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, | 47 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ |
52 | {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, | 48 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ |
53 | {MO(_FUNCTION), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT}, | 49 | MO(_FUNCTION), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, \ |
54 | {OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT}, | 50 | OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT, \ |
55 | {KC_LCTL, KC_GRV, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | 51 | KC_LCTL, KC_GRV, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
56 | }, | 52 | ), |
57 | 53 | ||
58 | /* Lower | 54 | /* Lower |
59 | * ,-----------------------------------------------------------------------------------. | 55 | * ,-----------------------------------------------------------------------------------. |
@@ -68,13 +64,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
68 | * | | | | |Lower | Bksp |Raise | Next | Vol- | Vol+ | Play | | 64 | * | | | | |Lower | Bksp |Raise | Next | Vol- | Vol+ | Play | |
69 | * `-----------------------------------------------------------------------------------' | 65 | * `-----------------------------------------------------------------------------------' |
70 | */ | 66 | */ |
71 | [_LOWER] = { | 67 | [_LOWER] = LAYOUT_preonic_grid( \ |
72 | {KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11}, | 68 | KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, \ |
73 | {KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL}, | 69 | KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, \ |
74 | {_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______}, | 70 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, \ |
75 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_MUTE, _______, KC_PIPE}, | 71 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_MUTE, _______, KC_PIPE, \ |
76 | {_______, _______, _______, _______, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} | 72 | _______, _______, _______, _______, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ |
77 | }, | 73 | ), |
78 | 74 | ||
79 | /* Raise | 75 | /* Raise |
80 | * ,-----------------------------------------------------------------------------------. | 76 | * ,-----------------------------------------------------------------------------------. |
@@ -89,13 +85,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
89 | * | | , | 0 | . |Lower | Bksp |Raise | Next | Vol- | Vol+ | Play | | 85 | * | | , | 0 | . |Lower | Bksp |Raise | Next | Vol- | Vol+ | Play | |
90 | * `-----------------------------------------------------------------------------------' | 86 | * `-----------------------------------------------------------------------------------' |
91 | */ | 87 | */ |
92 | [_RAISE] = { | 88 | [_RAISE] = LAYOUT_preonic_grid( \ |
93 | {KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11}, | 89 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, \ |
94 | {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, | 90 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ |
95 | {_______, KC_4, KC_5, KC_6, KC_PLUS, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______}, | 91 | _______, KC_4, KC_5, KC_6, KC_PLUS, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, \ |
96 | {KC_ENT, KC_7, KC_8, KC_9, KC_MINS, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_MUTE, _______, KC_BSLS}, | 92 | KC_ENT, KC_7, KC_8, KC_9, KC_MINS, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_MUTE, _______, KC_BSLS, \ |
97 | {_______, KC_COMM, KC_0, KC_DOT, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} | 93 | _______, KC_COMM, KC_0, KC_DOT, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ |
98 | }, | 94 | ), |
99 | 95 | ||
100 | /* Adjust (Lower + Raise) | 96 | /* Adjust (Lower + Raise) |
101 | * ,-----------------------------------------------------------------------------------. | 97 | * ,-----------------------------------------------------------------------------------. |
@@ -110,13 +106,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
110 | * | | | | | | | | | | | |RESET | | 106 | * | | | | | | | | | | | |RESET | |
111 | * `-----------------------------------------------------------------------------------' | 107 | * `-----------------------------------------------------------------------------------' |
112 | */ | 108 | */ |
113 | [_ADJUST] = { | 109 | [_ADJUST] = LAYOUT_preonic_grid( \ |
114 | {KC_ESC, KC_F1, KC_F2, KC_F3, LALT(KC_F4), KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11}, | 110 | KC_ESC, KC_F1, KC_F2, KC_F3, LALT(KC_F4), KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, \ |
115 | {TSKMGR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CALTDEL}, | 111 | TSKMGR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CALTDEL, \ |
116 | {_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______}, | 112 | _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______, \ |
117 | {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______}, | 113 | _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, \ |
118 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET} | 114 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET \ |
119 | }, | 115 | ), |
120 | 116 | ||
121 | /* Function | 117 | /* Function |
122 | * ,-----------------------------------------------------------------------------------. | 118 | * ,-----------------------------------------------------------------------------------. |
@@ -131,13 +127,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
131 | * | | | | | | | | | | | | | 127 | * | | | | | | | | | | | | |
132 | * `-----------------------------------------------------------------------------------' | 128 | * `-----------------------------------------------------------------------------------' |
133 | */ | 129 | */ |
134 | [_FUNCTION] = { | 130 | [_FUNCTION] = LAYOUT_preonic_grid( \ |
135 | {KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11}, | 131 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, \ |
136 | {_______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______}, | 132 | _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, \ |
137 | {_______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______}, | 133 | _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, \ |
138 | {KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, | 134 | KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
139 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} | 135 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
140 | } | 136 | ) |
141 | 137 | ||
142 | 138 | ||
143 | }; | 139 | }; |
diff --git a/keyboards/preonic/keymaps/xyverz/keymap.c b/keyboards/preonic/keymaps/xyverz/keymap.c index e905c458f..53e378e40 100644 --- a/keyboards/preonic/keymaps/xyverz/keymap.c +++ b/keyboards/preonic/keymaps/xyverz/keymap.c | |||
@@ -1,9 +1,4 @@ | |||
1 | #include "preonic.h" | 1 | #include QMK_KEYBOARD_H |
2 | #include "action_layer.h" | ||
3 | #include "eeconfig.h" | ||
4 | #ifdef AUDIO_ENABLE | ||
5 | #include "audio.h" | ||
6 | #endif | ||
7 | 2 | ||
8 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | 3 | // Each layer gets a name for readability, which is then used in the keymap matrix below. |
9 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | 4 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. |
@@ -44,13 +39,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
44 | * | Ctrl | Alt | Left |Right |Lower | Bksp |Space |Raise | Up | Down | GUI |Enter | | 39 | * | Ctrl | Alt | Left |Right |Lower | Bksp |Space |Raise | Up | Down | GUI |Enter | |
45 | * `-----------------------------------------------------------------------------------' | 40 | * `-----------------------------------------------------------------------------------' |
46 | */ | 41 | */ |
47 | [_QWERTY] = { | 42 | [_QWERTY] = LAYOUT_preonic_grid( \ |
48 | {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, | 43 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
49 | {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL }, | 44 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, \ |
50 | {KC_MINS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, | 45 | KC_MINS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
51 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT}, | 46 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ |
52 | {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, GUI_T(KC_BSPC), KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT } | 47 | KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, GUI_T(KC_BSPC), KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT \ |
53 | }, | 48 | ), |
54 | 49 | ||
55 | /* Colemak | 50 | /* Colemak |
56 | * ,-----------------------------------------------------------------------------------. | 51 | * ,-----------------------------------------------------------------------------------. |
@@ -65,13 +60,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
65 | * | Ctrl | Alt | Left |Right |Lower | Bksp |Space |Raise | Up | Down | GUI |Enter | | 60 | * | Ctrl | Alt | Left |Right |Lower | Bksp |Space |Raise | Up | Down | GUI |Enter | |
66 | * `-----------------------------------------------------------------------------------' | 61 | * `-----------------------------------------------------------------------------------' |
67 | */ | 62 | */ |
68 | [_COLEMAK] = { | 63 | [_COLEMAK] = LAYOUT_preonic_grid( \ |
69 | {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, | 64 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
70 | {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL }, | 65 | KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL, \ |
71 | {KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, | 66 | KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ |
72 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT}, | 67 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ |
73 | {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, GUI_T(KC_BSPC), KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT } | 68 | KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, GUI_T(KC_BSPC), KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT \ |
74 | }, | 69 | ), |
75 | 70 | ||
76 | /* Dvorak | 71 | /* Dvorak |
77 | * ,-----------------------------------------------------------------------------------. | 72 | * ,-----------------------------------------------------------------------------------. |
@@ -86,13 +81,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
86 | * | Ctrl | Alt | Left |Right |Lower | Bksp |Space |Raise | Up | Down | GUI |Enter | | 81 | * | Ctrl | Alt | Left |Right |Lower | Bksp |Space |Raise | Up | Down | GUI |Enter | |
87 | * `-----------------------------------------------------------------------------------' | 82 | * `-----------------------------------------------------------------------------------' |
88 | */ | 83 | */ |
89 | [_DVORAK] = { | 84 | [_DVORAK] = LAYOUT_preonic_grid( \ |
90 | {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS}, | 85 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, \ |
91 | {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH}, | 86 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ |
92 | {KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS}, | 87 | KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ |
93 | {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT}, | 88 | KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, \ |
94 | {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, GUI_T(KC_BSPC), KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT } | 89 | KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, GUI_T(KC_BSPC), KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT \ |
95 | }, | 90 | ), |
96 | 91 | ||
97 | /* Lower | 92 | /* Lower |
98 | * ,-----------------------------------------------------------------------------------. | 93 | * ,-----------------------------------------------------------------------------------. |
@@ -107,13 +102,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
107 | * | Brite| | Home | End | | Del | Ins | | PgUp | PgDN | |Enter | | 102 | * | Brite| | Home | End | | Del | Ins | | PgUp | PgDN | |Enter | |
108 | * `-----------------------------------------------------------------------------------' | 103 | * `-----------------------------------------------------------------------------------' |
109 | */ | 104 | */ |
110 | [_LOWER] = { | 105 | [_LOWER] = LAYOUT_preonic_grid( \ |
111 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______}, | 106 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ |
112 | {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE}, | 107 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \ |
113 | {KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______}, | 108 | KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, \ |
114 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______}, | 109 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, \ |
115 | {BACKLIT, _______, KC_HOME, KC_END, _______, KC_DEL, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______} | 110 | BACKLIT, _______, KC_HOME, KC_END, _______, KC_DEL, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______ \ |
116 | }, | 111 | ), |
117 | 112 | ||
118 | /* Raise | 113 | /* Raise |
119 | * ,-----------------------------------------------------------------------------------. | 114 | * ,-----------------------------------------------------------------------------------. |
@@ -128,13 +123,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
128 | * | Brite| | Home | End | | Del | Ins | | PgUp | PgDN | |Enter | | 123 | * | Brite| | Home | End | | Del | Ins | | PgUp | PgDN | |Enter | |
129 | * `-----------------------------------------------------------------------------------' | 124 | * `-----------------------------------------------------------------------------------' |
130 | */ | 125 | */ |
131 | [_RAISE] = { | 126 | [_RAISE] = LAYOUT_preonic_grid( \ |
132 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______}, | 127 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ |
133 | {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSLS}, | 128 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSLS, \ |
134 | {KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______}, | 129 | KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, \ |
135 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______}, | 130 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, \ |
136 | {BACKLIT, _______, KC_HOME, KC_END, _______, KC_DEL, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______} | 131 | BACKLIT, _______, KC_HOME, KC_END, _______, KC_DEL, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______ \ |
137 | }, | 132 | ), |
138 | 133 | ||
139 | /* Adjust (Lower + Raise) | 134 | /* Adjust (Lower + Raise) |
140 | * ,-----------------------------------------------------------------------------------. | 135 | * ,-----------------------------------------------------------------------------------. |
@@ -149,13 +144,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
149 | * | | | | | | | | | | | | | 144 | * | | | | | | | | | | | | |
150 | * `-----------------------------------------------------------------------------------' | 145 | * `-----------------------------------------------------------------------------------' |
151 | */ | 146 | */ |
152 | [_ADJUST] = { | 147 | [_ADJUST] = LAYOUT_preonic_grid( \ |
153 | {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 }, | 148 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ |
154 | {_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, | 149 | _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
155 | {_______, _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______}, | 150 | _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \ |
156 | {_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______}, | 151 | _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, \ |
157 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} | 152 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
158 | } | 153 | ) |
159 | 154 | ||
160 | 155 | ||
161 | }; | 156 | }; |
diff --git a/keyboards/preonic/keymaps/zach/keymap.c b/keyboards/preonic/keymaps/zach/keymap.c index 6ce37840b..2e3add03c 100644 --- a/keyboards/preonic/keymaps/zach/keymap.c +++ b/keyboards/preonic/keymaps/zach/keymap.c | |||
@@ -1,54 +1,54 @@ | |||
1 | // Zach Nielsen Custom Preonic Keyboard layout | 1 | // Zach Nielsen Custom Preonic Keyboard layout |
2 | #include "preonic.h" | 2 | #include QMK_KEYBOARD_H |
3 | #define PREONIC_YES // This is the Preonic | 3 | #define PREONIC_YES // This is the Preonic |
4 | #include "zach_common_functions.c" | 4 | #include "zach_common_functions.c" |
5 | 5 | ||
6 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 6 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
7 | [_COLEMAK] = { /* Base Layer */ | 7 | [_COLEMAK] = LAYOUT_preonic_mit( /* Base Layer */ |
8 | {KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC}, | 8 | KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ |
9 | {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, KC_ENT}, | 9 | KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, KC_ENT, \ |
10 | {KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_ENT}, | 10 | KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_ENT, \ |
11 | {SHFT_CAP, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT}, | 11 | SHFT_CAP, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ |
12 | {CTRLB, TD(SUP), KC_LALT, KC_LCTL, TD(LOW), KC_SPC, KC_SPC, TD(RAI), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | 12 | CTRLB, TD(SUP), KC_LALT, KC_LCTL, TD(LOW), KC_SPC, TD(RAI), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
13 | }, | 13 | ), |
14 | 14 | ||
15 | [_SWCOLE] = { /* Software Colemak */ | 15 | [_SWCOLE] = LAYOUT_preonic_mit( /* Software Colemak */ |
16 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, | 16 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
17 | {_______, CM_Q, CM_W, CM_F, CM_P, CM_G, CM_J, CM_L, CM_U, CM_Y, KC_QUOT, _______}, | 17 | _______, CM_Q, CM_W, CM_F, CM_P, CM_G, CM_J, CM_L, CM_U, CM_Y, KC_QUOT, _______, \ |
18 | {_______, CM_A, CM_R, CM_S, CM_T, CM_D, CM_H, CM_N, CM_E, CM_I, CM_O, _______}, | 18 | _______, CM_A, CM_R, CM_S, CM_T, CM_D, CM_H, CM_N, CM_E, CM_I, CM_O, _______, \ |
19 | {_______, CM_Z, CM_X, CM_C, CM_V, CM_B, CM_K, CM_M, CM_COMM, CM_DOT, CM_SLSH, _______}, | 19 | _______, CM_Z, CM_X, CM_C, CM_V, CM_B, CM_K, CM_M, CM_COMM, CM_DOT, CM_SLSH, _______, \ |
20 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} | 20 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
21 | }, | 21 | ), |
22 | 22 | ||
23 | [_RAISE] = { /* RAISE - Numpad and Unicode symbols */ | 23 | [_RAISE] = LAYOUT_preonic_mit( /* RAISE - Numpad and Unicode symbols */ |
24 | {KC_TILD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, | 24 | KC_TILD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
25 | {KC_GRV, SUPA2, FACE, DISFACE, SHRUG, PLUMIN, IBANG, KC_7, KC_8, KC_9, KC_COLN, _______}, | 25 | KC_GRV, SUPA2, FACE, DISFACE, SHRUG, PLUMIN, IBANG, KC_7, KC_8, KC_9, KC_COLN, _______, \ |
26 | {KC_DEL, DEGREE, MICRO, WOMEGA, OMEGA, XXXXXXX, KC_ENT, KC_4, KC_5, KC_6, KC_SLSH, KC_ASTR}, | 26 | KC_DEL, DEGREE, MICRO, WOMEGA, OMEGA, XXXXXXX, KC_ENT, KC_4, KC_5, KC_6, KC_SLSH, KC_ASTR, \ |
27 | {_______, KC_COLN, TFLIP, LAROW, RAROW, XXXXXXX, KC_SPC, KC_1, KC_2, KC_3, KC_MINS, KC_PLUS}, | 27 | _______, KC_COLN, TFLIP, LAROW, RAROW, XXXXXXX, KC_SPC, KC_1, KC_2, KC_3, KC_MINS, KC_PLUS, \ |
28 | {_______, KC_PIPE, TPUT, _______, _______, KC_TAB, KC_TAB, _______, KC_0, KC_0, KC_DOT, KC_EQL} | 28 | _______, KC_PIPE, TPUT, _______, _______, KC_TAB, _______, KC_0, KC_0, KC_DOT, KC_EQL \ |
29 | }, | 29 | ), |
30 | 30 | ||
31 | [_LOWER] = { /* LOWER - Symbols, Paging, CtrAltDel */ | 31 | [_LOWER] = LAYOUT_preonic_mit( /* LOWER - Symbols, Paging, CtrAltDel */ |
32 | {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_QUES, KC_DQT, KC_DEL}, | 32 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_QUES, KC_DQT, KC_DEL, \ |
33 | {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_QUES, KC_DQT, KC_DEL}, | 33 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_QUES, KC_DQT, KC_DEL, \ |
34 | {KC_DEL, KC_LBRC, KC_RBRC, KC_MINS, KC_UNDS, KC_HOME, KC_END, KC_LPRN, KC_RPRN, KC_SLSH, KC_SCLN, KC_PGUP}, | 34 | KC_DEL, KC_LBRC, KC_RBRC, KC_MINS, KC_UNDS, KC_HOME, KC_END, KC_LPRN, KC_RPRN, KC_SLSH, KC_SCLN, KC_PGUP, \ |
35 | {CPYPST, XXXXXXX, C(KC_X), KC_LABK, KC_RABK, XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, KC_BSLS, KC_COLN, KC_PGDN}, | 35 | CPYPST, XXXXXXX, C(KC_X), KC_LABK, KC_RABK, XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, KC_BSLS, KC_COLN, KC_PGDN, \ |
36 | {_______, _______, _______, _______, _______, KC_TAB, KC_TAB, _______, _______, _______, _______, _______} | 36 | _______, _______, _______, _______, _______, KC_TAB, _______, _______, _______, _______, _______ \ |
37 | }, | 37 | ), |
38 | 38 | ||
39 | [_ADJUST] = { /* ADJUST - Macros, Layer Switching, Function Keys */ | 39 | [_ADJUST] = LAYOUT_preonic_mit( /* ADJUST - Macros, Layer Switching, Function Keys */ |
40 | {UNIWIN, XXXXXXX, XXXXXXX, RANDIG, RANDIG, KC_INS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AU_TOG, MU_TOG}, | 40 | UNIWIN, XXXXXXX, XXXXXXX, RANDIG, RANDIG, KC_INS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AU_TOG, MU_TOG, \ |
41 | {UNILIN, SUPA2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, XXXXXXX}, | 41 | UNILIN, SUPA2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, XXXXXXX, \ |
42 | {XXXXXXX, DEGREE, IBANG, LAROW, RAROW, SWCOLE, COLEMAK, KC_F5, KC_F6, KC_F7, KC_F8, BL_INC}, | 42 | XXXXXXX, DEGREE, IBANG, LAROW, RAROW, SWCOLE, COLEMAK, KC_F5, KC_F6, KC_F7, KC_F8, BL_INC, \ |
43 | {_______, CADKEY, MICRO, WOMEGA, OMEGA, XXXXXXX, XXXXXXX, KC_F9, KC_F10, KC_F11, KC_F12, BL_DEC}, | 43 | _______, CADKEY, MICRO, WOMEGA, OMEGA, XXXXXXX, XXXXXXX, KC_F9, KC_F10, KC_F11, KC_F12, BL_DEC, \ |
44 | {_______, _______, _______, _______, _______, RESET, RESET, _______, XXXXXXX, MUV_DE, MUV_IN, BL_TOGG} | 44 | _______, _______, _______, _______, _______, RESET, _______, XXXXXXX, MUV_DE, MUV_IN, BL_TOGG \ |
45 | }, | 45 | ), |
46 | 46 | ||
47 | [_UNICODES] = { /* UNICODES - Extra layer for unicode stuff */ | 47 | [_UNICODES] = LAYOUT_preonic_mit( /* UNICODES - Extra layer for unicode stuff */ |
48 | {_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______}, | 48 | _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, \ |
49 | {_______, TFLIP, XXXXXXX, XXXXXXX, IBANG, roman7, XXXXXXX, XXXXXXX, ROMAN7, XXXXXXX, XXXXXXX, _______}, | 49 | _______, TFLIP, XXXXXXX, XXXXXXX, IBANG, roman7, XXXXXXX, XXXXXXX, ROMAN7, XXXXXXX, XXXXXXX, _______, \ |
50 | {KC_DEL, TPUT, FACE, DISFACE, SHRUG, roman4, roman5, roman6, ROMAN4, ROMAN5, ROMAN6, _______}, | 50 | KC_DEL, TPUT, FACE, DISFACE, SHRUG, roman4, roman5, roman6, ROMAN4, ROMAN5, ROMAN6, _______, \ |
51 | {XXXXXXX, XXXXXXX, XXXXXXX, LAROW, RAROW, roman1, roman2, roman3, ROMAN1, ROMAN2, ROMAN3, XXXXXXX}, | 51 | XXXXXXX, XXXXXXX, XXXXXXX, LAROW, RAROW, roman1, roman2, roman3, ROMAN1, ROMAN2, ROMAN3, XXXXXXX, \ |
52 | {_______, _______, _______, _______, _______, KC_SPC, KC_SPC, _______, _______, _______, _______, _______} | 52 | _______, _______, _______, _______, _______, KC_SPC, _______, _______, _______, _______, _______ \ |
53 | } | 53 | ) |
54 | }; | 54 | }; |