aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-10-13 05:47:54 +0000
committerGitHub <noreply@github.com>2021-10-12 22:47:54 -0700
commitbc51e330c0c183e78e415b6cfbf475990eb1ba86 (patch)
treed287cd482104a3769259d4b70238a4e5114826a2
parentc63c78f0801f595f2200dab7246a1264b1ec847d (diff)
downloadqmk_firmware-bc51e330c0c183e78e415b6cfbf475990eb1ba86.tar.gz
qmk_firmware-bc51e330c0c183e78e415b6cfbf475990eb1ba86.zip
Lucid Alexa layout macro rework (#14799)
* refactor keymaps for readability - use QMK-native keycode aliases - physically align keycodes * rework layout macro A discrepancy between the default and via keymaps prompted a deep dive into the keyboard's switch matrix, which led to the discovery that (1) the layout macro's arguments were not arranged physically, and (2) the keymaps didn't assign the keycodes to the same switches (the default keymap's keycodes were in the wrong sequence). Additionally, the layout macro was built to support a split Backspace, but named as if it were for a 2u Backspace, which broke the enabled support for Community Layout keymaps. This commit: - arranges the layout macro arguments according to physical order - corrects the keymaps - renames the layout macro to specify the split Backspace - disables Community Layout support - updates the `info.json` data * add LAYOUT_65_ansi_blocker * enable Community Layout support * update `info.json` metadata - use full product listing URL - use GitHub username for maintainer field * update readme - fix vendor link in lead paragraph - update metadata list - use GitHub username of keyboard maintainer - correct Supported Hardware - add Hardware Availability link - add flashing and bootloader instructions
-rw-r--r--keyboards/lucid/alexa/alexa.h46
-rw-r--r--keyboards/lucid/alexa/info.json215
-rw-r--r--keyboards/lucid/alexa/keymaps/default/keymap.c27
-rw-r--r--keyboards/lucid/alexa/keymaps/via/keymap.c54
-rw-r--r--keyboards/lucid/alexa/readme.md18
-rw-r--r--keyboards/lucid/alexa/rules.mk2
6 files changed, 236 insertions, 126 deletions
diff --git a/keyboards/lucid/alexa/alexa.h b/keyboards/lucid/alexa/alexa.h
index 3c6f9d4ac..9fd221fce 100644
--- a/keyboards/lucid/alexa/alexa.h
+++ b/keyboards/lucid/alexa/alexa.h
@@ -16,17 +16,45 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
16 16
17#include "quantum.h" 17#include "quantum.h"
18 18
19/* Alexa Keymap Definitions */ 19#define ___ KC_NO
20
21/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐
22 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2D │0E │ │0D │ 2u Backspace
23 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ └───────┘
24 * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │
25 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
26 * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2E │
27 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
28 * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │3E │
29 * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
30 * │40 │41 │42 │45 │49 │4A │ │4C │4D │4E │
31 * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
32 */
33
34#define LAYOUT_65_ansi_blocker_split_bs( \
35 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K0E, \
36 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
37 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \
38 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
39 K40, K41, K42, K45, K49, K4A, K4C, K4D, K4E \
40) { \
41 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
42 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
43 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
44 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
45 { K40, K41, K42, ___, ___, K45, ___, ___, ___, K49, K4A, ___, K4C, K4D, K4E } \
46}
47
20#define LAYOUT_65_ansi_blocker( \ 48#define LAYOUT_65_ansi_blocker( \
21 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ 49 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
22 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ 50 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
23 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ 51 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \
24 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ 52 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
25 K40, K41, K42, K45, K49, K4A, K4C, K4D, K4E \ 53 K40, K41, K42, K45, K49, K4A, K4C, K4D, K4E \
26) { \ 54) { \
27 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ 55 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
28 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ 56 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
29 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ 57 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E }, \
30 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E }, \ 58 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
31 { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, KC_NO, K4C, K4D, K4E } \ 59 { K40, K41, K42, ___, ___, K45, ___, ___, ___, K49, K4A, ___, K4C, K4D, K4E } \
32} 60}
diff --git a/keyboards/lucid/alexa/info.json b/keyboards/lucid/alexa/info.json
index b00d1c15b..91c383644 100644
--- a/keyboards/lucid/alexa/info.json
+++ b/keyboards/lucid/alexa/info.json
@@ -1,82 +1,157 @@
1{ 1{
2 "keyboard_name": "Alexa", 2 "keyboard_name": "Alexa",
3 "url": "http://www.makerkeyboards.com", 3 "url": "https://www.makerkeyboards.com/products/alexa",
4 "maintainer": "Maker Keyboards", 4 "maintainer": "mrnoisytiger",
5 "layouts": { 5 "layouts": {
6 "LAYOUT_65_ansi_blocker_split_bs": {
7 "layout": [
8 {"label":"Esc", "x":0, "y":0},
9 {"label":"1!", "x":1, "y":0},
10 {"label":"2@", "x":2, "y":0},
11 {"label":"3#", "x":3, "y":0},
12 {"label":"4$", "x":4, "y":0},
13 {"label":"5%", "x":5, "y":0},
14 {"label":"6^", "x":6, "y":0},
15 {"label":"7&", "x":7, "y":0},
16 {"label":"8*", "x":8, "y":0},
17 {"label":"9(", "x":9, "y":0},
18 {"label":"0)", "x":10, "y":0},
19 {"label":"-_", "x":11, "y":0},
20 {"label":"=+", "x":12, "y":0},
21 {"label":"Backspace", "x":13, "y":0},
22 {"label":"Delete", "x":14, "y":0},
23 {"label":"Home", "x":15, "y":0},
24
25 {"label":"Tab", "x":0, "y":1, "w":1.5},
26 {"label":"Q", "x":1.5, "y":1},
27 {"label":"W", "x":2.5, "y":1},
28 {"label":"E", "x":3.5, "y":1},
29 {"label":"R", "x":4.5, "y":1},
30 {"label":"T", "x":5.5, "y":1},
31 {"label":"Y", "x":6.5, "y":1},
32 {"label":"U", "x":7.5, "y":1},
33 {"label":"I", "x":8.5, "y":1},
34 {"label":"O", "x":9.5, "y":1},
35 {"label":"P", "x":10.5, "y":1},
36 {"label":"[{", "x":11.5, "y":1},
37 {"label":"]}", "x":12.5, "y":1},
38 {"label":"\\|", "x":13.5, "y":1, "w":1.5},
39 {"label":"PgUp", "x":15, "y":1},
40
41 {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
42 {"label":"A", "x":1.75, "y":2},
43 {"label":"S", "x":2.75, "y":2},
44 {"label":"D", "x":3.75, "y":2},
45 {"label":"F", "x":4.75, "y":2},
46 {"label":"G", "x":5.75, "y":2},
47 {"label":"H", "x":6.75, "y":2},
48 {"label":"J", "x":7.75, "y":2},
49 {"label":"K", "x":8.75, "y":2},
50 {"label":"L", "x":9.75, "y":2},
51 {"label":";:", "x":10.75, "y":2},
52 {"label":"\"'", "x":11.75, "y":2},
53 {"label":"Enter", "x":12.75, "y":2, "w":2.25},
54 {"label":"PgDn", "x":15, "y":2},
55
56 {"label":"Shift", "x":0, "y":3, "w":2.25},
57 {"label":"Z", "x":2.25, "y":3},
58 {"label":"X", "x":3.25, "y":3},
59 {"label":"C", "x":4.25, "y":3},
60 {"label":"V", "x":5.25, "y":3},
61 {"label":"B", "x":6.25, "y":3},
62 {"label":"N", "x":7.25, "y":3},
63 {"label":"M", "x":8.25, "y":3},
64 {"label":",<", "x":9.25, "y":3},
65 {"label":".>", "x":10.25, "y":3},
66 {"label":"/?", "x":11.25, "y":3},
67 {"label":"Shift", "x":12.25, "y":3, "w":1.75},
68 {"label":"\u2191", "x":14, "y":3},
69 {"label":"End", "x":15, "y":3},
70
71 {"label":"Ctrl", "x":0, "y":4, "w":1.25},
72 {"label":"GUI", "x":1.25, "y":4, "w":1.25},
73 {"label":"Alt", "x":2.5, "y":4, "w":1.25},
74 {"label":"Space", "x":3.75, "y":4, "w":6.25},
75 {"label":"Alt", "x":10, "y":4, "w":1.25},
76 {"label":"Fn", "x":11.25, "y":4, "w":1.25},
77 {"label":"\u2190", "x":13, "y":4},
78 {"label":"\u2193", "x":14, "y":4},
79 {"label":"\u2192", "x":15, "y":4}
80 ]
81 },
6 "LAYOUT_65_ansi_blocker": { 82 "LAYOUT_65_ansi_blocker": {
7 "layout": [ 83 "layout": [
8 {"x": 0, "y": 0}, 84 {"label":"Esc", "x":0, "y":0},
9 {"x": 1, "y": 0}, 85 {"label":"1!", "x":1, "y":0},
10 {"x": 2, "y": 0}, 86 {"label":"2@", "x":2, "y":0},
11 {"x": 3, "y": 0}, 87 {"label":"3#", "x":3, "y":0},
12 {"x": 4, "y": 0}, 88 {"label":"4$", "x":4, "y":0},
13 {"x": 5, "y": 0}, 89 {"label":"5%", "x":5, "y":0},
14 {"x": 6, "y": 0}, 90 {"label":"6^", "x":6, "y":0},
15 {"x": 7, "y": 0}, 91 {"label":"7&", "x":7, "y":0},
16 {"x": 8, "y": 0}, 92 {"label":"8*", "x":8, "y":0},
17 {"x": 9, "y": 0}, 93 {"label":"9(", "x":9, "y":0},
18 {"x": 10, "y": 0}, 94 {"label":"0)", "x":10, "y":0},
19 {"x": 11, "y": 0}, 95 {"label":"-_", "x":11, "y":0},
20 {"x": 12, "y": 0}, 96 {"label":"=+", "x":12, "y":0},
21 {"x": 13, "y": 0}, 97 {"label":"Backspace", "x":13, "y":0, "w":2},
22 {"x": 14, "y": 0}, 98 {"label":"Home", "x":15, "y":0},
23 {"x": 15, "y": 0},
24 99
25 {"x": 0, "y": 1, "w": 1.5}, 100 {"label":"Tab", "x":0, "y":1, "w":1.5},
26 {"x": 1.5, "y": 1}, 101 {"label":"Q", "x":1.5, "y":1},
27 {"x": 2.5, "y": 1}, 102 {"label":"W", "x":2.5, "y":1},
28 {"x": 3.5, "y": 1}, 103 {"label":"E", "x":3.5, "y":1},
29 {"x": 4.5, "y": 1}, 104 {"label":"R", "x":4.5, "y":1},
30 {"x": 5.5, "y": 1}, 105 {"label":"T", "x":5.5, "y":1},
31 {"x": 6.5, "y": 1}, 106 {"label":"Y", "x":6.5, "y":1},
32 {"x": 7.5, "y": 1}, 107 {"label":"U", "x":7.5, "y":1},
33 {"x": 8.5, "y": 1}, 108 {"label":"I", "x":8.5, "y":1},
34 {"x": 9.5, "y": 1}, 109 {"label":"O", "x":9.5, "y":1},
35 {"x": 10.5, "y": 1}, 110 {"label":"P", "x":10.5, "y":1},
36 {"x": 11.5, "y": 1}, 111 {"label":"[{", "x":11.5, "y":1},
37 {"x": 12.5, "y": 1}, 112 {"label":"]}", "x":12.5, "y":1},
38 {"x": 13.5, "y": 1, "w": 1.5}, 113 {"label":"\\|", "x":13.5, "y":1, "w":1.5},
39 {"x": 15, "y": 1}, 114 {"label":"PgUp", "x":15, "y":1},
40 115
41 {"x": 0, "y": 2, "w": 1.75}, 116 {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
42 {"x": 1.75, "y": 2}, 117 {"label":"A", "x":1.75, "y":2},
43 {"x": 2.75, "y": 2}, 118 {"label":"S", "x":2.75, "y":2},
44 {"x": 3.75, "y": 2}, 119 {"label":"D", "x":3.75, "y":2},
45 {"x": 4.75, "y": 2}, 120 {"label":"F", "x":4.75, "y":2},
46 {"x": 5.75, "y": 2}, 121 {"label":"G", "x":5.75, "y":2},
47 {"x": 6.75, "y": 2}, 122 {"label":"H", "x":6.75, "y":2},
48 {"x": 7.75, "y": 2}, 123 {"label":"J", "x":7.75, "y":2},
49 {"x": 8.75, "y": 2}, 124 {"label":"K", "x":8.75, "y":2},
50 {"x": 9.75, "y": 2}, 125 {"label":"L", "x":9.75, "y":2},
51 {"x": 10.75, "y": 2}, 126 {"label":";:", "x":10.75, "y":2},
52 {"x": 11.75, "y": 2}, 127 {"label":"\"'", "x":11.75, "y":2},
53 {"x": 12.75, "y": 2, "w": 2.25}, 128 {"label":"Enter", "x":12.75, "y":2, "w":2.25},
54 {"x": 15, "y": 2}, 129 {"label":"PgDn", "x":15, "y":2},
55 130
56 {"x": 0, "y": 3, "w": 2.25}, 131 {"label":"Shift", "x":0, "y":3, "w":2.25},
57 {"x": 2.25, "y": 3}, 132 {"label":"Z", "x":2.25, "y":3},
58 {"x": 3.25, "y": 3}, 133 {"label":"X", "x":3.25, "y":3},
59 {"x": 4.25, "y": 3}, 134 {"label":"C", "x":4.25, "y":3},
60 {"x": 5.25, "y": 3}, 135 {"label":"V", "x":5.25, "y":3},
61 {"x": 6.25, "y": 3}, 136 {"label":"B", "x":6.25, "y":3},
62 {"x": 7.25, "y": 3}, 137 {"label":"N", "x":7.25, "y":3},
63 {"x": 8.25, "y": 3}, 138 {"label":"M", "x":8.25, "y":3},
64 {"x": 9.25, "y": 3}, 139 {"label":",<", "x":9.25, "y":3},
65 {"x": 10.25, "y": 3}, 140 {"label":".>", "x":10.25, "y":3},
66 {"x": 11.25, "y": 3}, 141 {"label":"/?", "x":11.25, "y":3},
67 {"x": 12.25, "y": 3, "w": 1.75}, 142 {"label":"Shift", "x":12.25, "y":3, "w":1.75},
68 {"x": 14, "y": 3}, 143 {"label":"\u2191", "x":14, "y":3},
69 {"x": 15, "y": 3}, 144 {"label":"End", "x":15, "y":3},
70 145
71 {"x": 0, "y": 4, "w": 1.25}, 146 {"label":"Ctrl", "x":0, "y":4, "w":1.25},
72 {"x": 1.25, "y": 4, "w": 1.25}, 147 {"label":"GUI", "x":1.25, "y":4, "w":1.25},
73 {"x": 2.5, "y": 4, "w": 1.25}, 148 {"label":"Alt", "x":2.5, "y":4, "w":1.25},
74 {"x": 3.75, "y": 4, "w": 6.25}, 149 {"label":"Space", "x":3.75, "y":4, "w":6.25},
75 {"x": 10, "y": 4, "w": 1.25}, 150 {"label":"Alt", "x":10, "y":4, "w":1.25},
76 {"x": 11.25, "y": 4, "w": 1.25}, 151 {"label":"Fn", "x":11.25, "y":4, "w":1.25},
77 {"x": 13, "y": 4}, 152 {"label":"\u2190", "x":13, "y":4},
78 {"x": 14, "y": 4}, 153 {"label":"\u2193", "x":14, "y":4},
79 {"x": 15, "y": 4} 154 {"label":"\u2192", "x":15, "y":4}
80 ] 155 ]
81 } 156 }
82 } 157 }
diff --git a/keyboards/lucid/alexa/keymaps/default/keymap.c b/keyboards/lucid/alexa/keymaps/default/keymap.c
index 6faf5102e..29efe094f 100644
--- a/keyboards/lucid/alexa/keymaps/default/keymap.c
+++ b/keyboards/lucid/alexa/keymaps/default/keymap.c
@@ -21,19 +21,18 @@ enum layers {
21 21
22const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 22const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
23 23
24 [_LAYER0] = LAYOUT_65_ansi_blocker( 24 [_LAYER0] = LAYOUT_65_ansi_blocker_split_bs(
25 KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_HOME, 25 KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_HOME,
26 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 26 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
27 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, 27 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
28 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, 28 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
29 KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT 29 KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
30 ),
31 [_LAYER1] = LAYOUT_65_ansi_blocker_split_bs(
32 KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS,
33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET, KC_PGUP,
34 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN,
35 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
36 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
30 ), 37 ),
31
32 [_LAYER1] = LAYOUT_65_ansi_blocker(
33 KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS,
34 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, RESET, KC_PGUP,
35 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN,
36 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE,
37 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
38 )
39}; 38};
diff --git a/keyboards/lucid/alexa/keymaps/via/keymap.c b/keyboards/lucid/alexa/keymaps/via/keymap.c
index 1574c802d..8cfb97af1 100644
--- a/keyboards/lucid/alexa/keymaps/via/keymap.c
+++ b/keyboards/lucid/alexa/keymaps/via/keymap.c
@@ -23,36 +23,32 @@ enum layers {
23 23
24const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 24const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
25 25
26 [_LAYER0] = LAYOUT_65_ansi_blocker( 26 [_LAYER0] = LAYOUT_65_ansi_blocker_split_bs(
27 KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, 27 KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_HOME,
28 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 28 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
29 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_DEL,KC_PGDN, 29 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
30 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, 30 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
31 KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT 31 KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
32 ), 32 ),
33 33 [_LAYER1] = LAYOUT_65_ansi_blocker_split_bs(
34 [_LAYER1] = LAYOUT_65_ansi_blocker( 34 KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS,
35 KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, 35 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET, KC_PGUP,
36 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, RESET, KC_PGUP, 36 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN,
37 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 37 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
40 ), 39 ),
41 40 [_LAYER2] = LAYOUT_65_ansi_blocker_split_bs(
42 [_LAYER2] = LAYOUT_65_ansi_blocker( 41 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
43 KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, 42 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
44 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, 43 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
45 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, 44 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
48 ), 46 ),
49 47 [_LAYER3] = LAYOUT_65_ansi_blocker_split_bs(
50 [_LAYER3] = LAYOUT_65_ansi_blocker( 48 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
51 KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, 49 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
52 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, 50 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
53 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, 51 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
54 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 52 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
55 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 53 )
56 ),
57
58}; 54};
diff --git a/keyboards/lucid/alexa/readme.md b/keyboards/lucid/alexa/readme.md
index 70142271a..a0cef7291 100644
--- a/keyboards/lucid/alexa/readme.md
+++ b/keyboards/lucid/alexa/readme.md
@@ -1,13 +1,25 @@
1# Alexa Hotswap PCB by Maker Keyboards 1# Alexa Hotswap PCB by Maker Keyboards
2 2
3The following is the QMK Firmware for the Alexa Hotswap PCB for [MakerKeyboards](http://www.makerkeyboards.cm). 3The following is the QMK Firmware for the Alexa Hotswap PCB for [Maker Keyboards](https://www.makerkeyboards.com/).
4--- 4---
5 5
6* Keyboard Maintainer: Maker Keyboards 6* Keyboard Maintainer: [mrnoisytiger](https://github.com/mrnoisytiger)
7* Hardware Supported: Phantom 7* Hardware Supported: Alexa Hotswap PCB (ATmega32U4)
8* Hardware Availability: [Maker Keyboards](https://www.makerkeyboards.com/products/alexa)
8 9
9Make example for this keyboard (after setting up your build environment): 10Make example for this keyboard (after setting up your build environment):
10 11
11 make lucid/alexa:default 12 make lucid/alexa:default
12 13
14Flashing example for this keyboard:
15
16 make lucid/alexa:default:flash
17
18## Bootloader
19
20Enter the bootloader in 3 ways:
21
22* **Bootmagic reset**: Hold down the top left key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
23* **Keycode in layout**: Press the key mapped to `RESET` if it is available (Fn+Backslash by default)
24
13See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). 25See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/lucid/alexa/rules.mk b/keyboards/lucid/alexa/rules.mk
index b1d63c682..16bcdf2cf 100644
--- a/keyboards/lucid/alexa/rules.mk
+++ b/keyboards/lucid/alexa/rules.mk
@@ -24,4 +24,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
24AUDIO_ENABLE = no # Audio output 24AUDIO_ENABLE = no # Audio output
25KEYBOARD_LOCK_ENABLE = yes 25KEYBOARD_LOCK_ENABLE = yes
26 26
27LAYOUTS = 65_ansi_blocker 27LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs