mirror of
https://github.com/mfulz/qmk_firmware.git
synced 2025-10-30 21:02:32 +01:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
QMK Bot
commit
918e4fb02c
@ -16,17 +16,45 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
#include "quantum.h"
|
#include "quantum.h"
|
||||||
|
|
||||||
/* Alexa Keymap Definitions */
|
#define ___ KC_NO
|
||||||
#define LAYOUT_65_ansi_blocker( \
|
|
||||||
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
|
/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐
|
||||||
|
* │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2D │0E │ │0D │ 2u Backspace
|
||||||
|
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ └───────┘
|
||||||
|
* │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │
|
||||||
|
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
|
||||||
|
* │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2E │
|
||||||
|
* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
|
||||||
|
* │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │3E │
|
||||||
|
* ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
|
||||||
|
* │40 │41 │42 │45 │49 │4A │ │4C │4D │4E │
|
||||||
|
* └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define LAYOUT_65_ansi_blocker_split_bs( \
|
||||||
|
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K0E, \
|
||||||
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
|
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
|
||||||
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
|
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \
|
||||||
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
|
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
|
||||||
K40, K41, K42, K45, K49, K4A, K4C, K4D, K4E \
|
K40, K41, K42, K45, K49, K4A, K4C, K4D, K4E \
|
||||||
) { \
|
) { \
|
||||||
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
|
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
|
||||||
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
|
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
|
||||||
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
|
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
|
||||||
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E }, \
|
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
|
||||||
{ K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, KC_NO, K4C, K4D, K4E } \
|
{ K40, K41, K42, ___, ___, K45, ___, ___, ___, K49, K4A, ___, K4C, K4D, K4E } \
|
||||||
|
}
|
||||||
|
|
||||||
|
#define LAYOUT_65_ansi_blocker( \
|
||||||
|
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
|
||||||
|
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
|
||||||
|
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \
|
||||||
|
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
|
||||||
|
K40, K41, K42, K45, K49, K4A, K4C, K4D, K4E \
|
||||||
|
) { \
|
||||||
|
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
|
||||||
|
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
|
||||||
|
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E }, \
|
||||||
|
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
|
||||||
|
{ K40, K41, K42, ___, ___, K45, ___, ___, ___, K49, K4A, ___, K4C, K4D, K4E } \
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,82 +1,157 @@
|
|||||||
{
|
{
|
||||||
"keyboard_name": "Alexa",
|
"keyboard_name": "Alexa",
|
||||||
"url": "http://www.makerkeyboards.com",
|
"url": "https://www.makerkeyboards.com/products/alexa",
|
||||||
"maintainer": "Maker Keyboards",
|
"maintainer": "mrnoisytiger",
|
||||||
"layouts": {
|
"layouts": {
|
||||||
|
"LAYOUT_65_ansi_blocker_split_bs": {
|
||||||
|
"layout": [
|
||||||
|
{"label":"Esc", "x":0, "y":0},
|
||||||
|
{"label":"1!", "x":1, "y":0},
|
||||||
|
{"label":"2@", "x":2, "y":0},
|
||||||
|
{"label":"3#", "x":3, "y":0},
|
||||||
|
{"label":"4$", "x":4, "y":0},
|
||||||
|
{"label":"5%", "x":5, "y":0},
|
||||||
|
{"label":"6^", "x":6, "y":0},
|
||||||
|
{"label":"7&", "x":7, "y":0},
|
||||||
|
{"label":"8*", "x":8, "y":0},
|
||||||
|
{"label":"9(", "x":9, "y":0},
|
||||||
|
{"label":"0)", "x":10, "y":0},
|
||||||
|
{"label":"-_", "x":11, "y":0},
|
||||||
|
{"label":"=+", "x":12, "y":0},
|
||||||
|
{"label":"Backspace", "x":13, "y":0},
|
||||||
|
{"label":"Delete", "x":14, "y":0},
|
||||||
|
{"label":"Home", "x":15, "y":0},
|
||||||
|
|
||||||
|
{"label":"Tab", "x":0, "y":1, "w":1.5},
|
||||||
|
{"label":"Q", "x":1.5, "y":1},
|
||||||
|
{"label":"W", "x":2.5, "y":1},
|
||||||
|
{"label":"E", "x":3.5, "y":1},
|
||||||
|
{"label":"R", "x":4.5, "y":1},
|
||||||
|
{"label":"T", "x":5.5, "y":1},
|
||||||
|
{"label":"Y", "x":6.5, "y":1},
|
||||||
|
{"label":"U", "x":7.5, "y":1},
|
||||||
|
{"label":"I", "x":8.5, "y":1},
|
||||||
|
{"label":"O", "x":9.5, "y":1},
|
||||||
|
{"label":"P", "x":10.5, "y":1},
|
||||||
|
{"label":"[{", "x":11.5, "y":1},
|
||||||
|
{"label":"]}", "x":12.5, "y":1},
|
||||||
|
{"label":"\\|", "x":13.5, "y":1, "w":1.5},
|
||||||
|
{"label":"PgUp", "x":15, "y":1},
|
||||||
|
|
||||||
|
{"label":"Caps Lock", "x":0, "y":2, "w":1.75},
|
||||||
|
{"label":"A", "x":1.75, "y":2},
|
||||||
|
{"label":"S", "x":2.75, "y":2},
|
||||||
|
{"label":"D", "x":3.75, "y":2},
|
||||||
|
{"label":"F", "x":4.75, "y":2},
|
||||||
|
{"label":"G", "x":5.75, "y":2},
|
||||||
|
{"label":"H", "x":6.75, "y":2},
|
||||||
|
{"label":"J", "x":7.75, "y":2},
|
||||||
|
{"label":"K", "x":8.75, "y":2},
|
||||||
|
{"label":"L", "x":9.75, "y":2},
|
||||||
|
{"label":";:", "x":10.75, "y":2},
|
||||||
|
{"label":"\"'", "x":11.75, "y":2},
|
||||||
|
{"label":"Enter", "x":12.75, "y":2, "w":2.25},
|
||||||
|
{"label":"PgDn", "x":15, "y":2},
|
||||||
|
|
||||||
|
{"label":"Shift", "x":0, "y":3, "w":2.25},
|
||||||
|
{"label":"Z", "x":2.25, "y":3},
|
||||||
|
{"label":"X", "x":3.25, "y":3},
|
||||||
|
{"label":"C", "x":4.25, "y":3},
|
||||||
|
{"label":"V", "x":5.25, "y":3},
|
||||||
|
{"label":"B", "x":6.25, "y":3},
|
||||||
|
{"label":"N", "x":7.25, "y":3},
|
||||||
|
{"label":"M", "x":8.25, "y":3},
|
||||||
|
{"label":",<", "x":9.25, "y":3},
|
||||||
|
{"label":".>", "x":10.25, "y":3},
|
||||||
|
{"label":"/?", "x":11.25, "y":3},
|
||||||
|
{"label":"Shift", "x":12.25, "y":3, "w":1.75},
|
||||||
|
{"label":"\u2191", "x":14, "y":3},
|
||||||
|
{"label":"End", "x":15, "y":3},
|
||||||
|
|
||||||
|
{"label":"Ctrl", "x":0, "y":4, "w":1.25},
|
||||||
|
{"label":"GUI", "x":1.25, "y":4, "w":1.25},
|
||||||
|
{"label":"Alt", "x":2.5, "y":4, "w":1.25},
|
||||||
|
{"label":"Space", "x":3.75, "y":4, "w":6.25},
|
||||||
|
{"label":"Alt", "x":10, "y":4, "w":1.25},
|
||||||
|
{"label":"Fn", "x":11.25, "y":4, "w":1.25},
|
||||||
|
{"label":"\u2190", "x":13, "y":4},
|
||||||
|
{"label":"\u2193", "x":14, "y":4},
|
||||||
|
{"label":"\u2192", "x":15, "y":4}
|
||||||
|
]
|
||||||
|
},
|
||||||
"LAYOUT_65_ansi_blocker": {
|
"LAYOUT_65_ansi_blocker": {
|
||||||
"layout": [
|
"layout": [
|
||||||
{"x": 0, "y": 0},
|
{"label":"Esc", "x":0, "y":0},
|
||||||
{"x": 1, "y": 0},
|
{"label":"1!", "x":1, "y":0},
|
||||||
{"x": 2, "y": 0},
|
{"label":"2@", "x":2, "y":0},
|
||||||
{"x": 3, "y": 0},
|
{"label":"3#", "x":3, "y":0},
|
||||||
{"x": 4, "y": 0},
|
{"label":"4$", "x":4, "y":0},
|
||||||
{"x": 5, "y": 0},
|
{"label":"5%", "x":5, "y":0},
|
||||||
{"x": 6, "y": 0},
|
{"label":"6^", "x":6, "y":0},
|
||||||
{"x": 7, "y": 0},
|
{"label":"7&", "x":7, "y":0},
|
||||||
{"x": 8, "y": 0},
|
{"label":"8*", "x":8, "y":0},
|
||||||
{"x": 9, "y": 0},
|
{"label":"9(", "x":9, "y":0},
|
||||||
{"x": 10, "y": 0},
|
{"label":"0)", "x":10, "y":0},
|
||||||
{"x": 11, "y": 0},
|
{"label":"-_", "x":11, "y":0},
|
||||||
{"x": 12, "y": 0},
|
{"label":"=+", "x":12, "y":0},
|
||||||
{"x": 13, "y": 0},
|
{"label":"Backspace", "x":13, "y":0, "w":2},
|
||||||
{"x": 14, "y": 0},
|
{"label":"Home", "x":15, "y":0},
|
||||||
{"x": 15, "y": 0},
|
|
||||||
|
|
||||||
{"x": 0, "y": 1, "w": 1.5},
|
{"label":"Tab", "x":0, "y":1, "w":1.5},
|
||||||
{"x": 1.5, "y": 1},
|
{"label":"Q", "x":1.5, "y":1},
|
||||||
{"x": 2.5, "y": 1},
|
{"label":"W", "x":2.5, "y":1},
|
||||||
{"x": 3.5, "y": 1},
|
{"label":"E", "x":3.5, "y":1},
|
||||||
{"x": 4.5, "y": 1},
|
{"label":"R", "x":4.5, "y":1},
|
||||||
{"x": 5.5, "y": 1},
|
{"label":"T", "x":5.5, "y":1},
|
||||||
{"x": 6.5, "y": 1},
|
{"label":"Y", "x":6.5, "y":1},
|
||||||
{"x": 7.5, "y": 1},
|
{"label":"U", "x":7.5, "y":1},
|
||||||
{"x": 8.5, "y": 1},
|
{"label":"I", "x":8.5, "y":1},
|
||||||
{"x": 9.5, "y": 1},
|
{"label":"O", "x":9.5, "y":1},
|
||||||
{"x": 10.5, "y": 1},
|
{"label":"P", "x":10.5, "y":1},
|
||||||
{"x": 11.5, "y": 1},
|
{"label":"[{", "x":11.5, "y":1},
|
||||||
{"x": 12.5, "y": 1},
|
{"label":"]}", "x":12.5, "y":1},
|
||||||
{"x": 13.5, "y": 1, "w": 1.5},
|
{"label":"\\|", "x":13.5, "y":1, "w":1.5},
|
||||||
{"x": 15, "y": 1},
|
{"label":"PgUp", "x":15, "y":1},
|
||||||
|
|
||||||
{"x": 0, "y": 2, "w": 1.75},
|
{"label":"Caps Lock", "x":0, "y":2, "w":1.75},
|
||||||
{"x": 1.75, "y": 2},
|
{"label":"A", "x":1.75, "y":2},
|
||||||
{"x": 2.75, "y": 2},
|
{"label":"S", "x":2.75, "y":2},
|
||||||
{"x": 3.75, "y": 2},
|
{"label":"D", "x":3.75, "y":2},
|
||||||
{"x": 4.75, "y": 2},
|
{"label":"F", "x":4.75, "y":2},
|
||||||
{"x": 5.75, "y": 2},
|
{"label":"G", "x":5.75, "y":2},
|
||||||
{"x": 6.75, "y": 2},
|
{"label":"H", "x":6.75, "y":2},
|
||||||
{"x": 7.75, "y": 2},
|
{"label":"J", "x":7.75, "y":2},
|
||||||
{"x": 8.75, "y": 2},
|
{"label":"K", "x":8.75, "y":2},
|
||||||
{"x": 9.75, "y": 2},
|
{"label":"L", "x":9.75, "y":2},
|
||||||
{"x": 10.75, "y": 2},
|
{"label":";:", "x":10.75, "y":2},
|
||||||
{"x": 11.75, "y": 2},
|
{"label":"\"'", "x":11.75, "y":2},
|
||||||
{"x": 12.75, "y": 2, "w": 2.25},
|
{"label":"Enter", "x":12.75, "y":2, "w":2.25},
|
||||||
{"x": 15, "y": 2},
|
{"label":"PgDn", "x":15, "y":2},
|
||||||
|
|
||||||
{"x": 0, "y": 3, "w": 2.25},
|
{"label":"Shift", "x":0, "y":3, "w":2.25},
|
||||||
{"x": 2.25, "y": 3},
|
{"label":"Z", "x":2.25, "y":3},
|
||||||
{"x": 3.25, "y": 3},
|
{"label":"X", "x":3.25, "y":3},
|
||||||
{"x": 4.25, "y": 3},
|
{"label":"C", "x":4.25, "y":3},
|
||||||
{"x": 5.25, "y": 3},
|
{"label":"V", "x":5.25, "y":3},
|
||||||
{"x": 6.25, "y": 3},
|
{"label":"B", "x":6.25, "y":3},
|
||||||
{"x": 7.25, "y": 3},
|
{"label":"N", "x":7.25, "y":3},
|
||||||
{"x": 8.25, "y": 3},
|
{"label":"M", "x":8.25, "y":3},
|
||||||
{"x": 9.25, "y": 3},
|
{"label":",<", "x":9.25, "y":3},
|
||||||
{"x": 10.25, "y": 3},
|
{"label":".>", "x":10.25, "y":3},
|
||||||
{"x": 11.25, "y": 3},
|
{"label":"/?", "x":11.25, "y":3},
|
||||||
{"x": 12.25, "y": 3, "w": 1.75},
|
{"label":"Shift", "x":12.25, "y":3, "w":1.75},
|
||||||
{"x": 14, "y": 3},
|
{"label":"\u2191", "x":14, "y":3},
|
||||||
{"x": 15, "y": 3},
|
{"label":"End", "x":15, "y":3},
|
||||||
|
|
||||||
{"x": 0, "y": 4, "w": 1.25},
|
{"label":"Ctrl", "x":0, "y":4, "w":1.25},
|
||||||
{"x": 1.25, "y": 4, "w": 1.25},
|
{"label":"GUI", "x":1.25, "y":4, "w":1.25},
|
||||||
{"x": 2.5, "y": 4, "w": 1.25},
|
{"label":"Alt", "x":2.5, "y":4, "w":1.25},
|
||||||
{"x": 3.75, "y": 4, "w": 6.25},
|
{"label":"Space", "x":3.75, "y":4, "w":6.25},
|
||||||
{"x": 10, "y": 4, "w": 1.25},
|
{"label":"Alt", "x":10, "y":4, "w":1.25},
|
||||||
{"x": 11.25, "y": 4, "w": 1.25},
|
{"label":"Fn", "x":11.25, "y":4, "w":1.25},
|
||||||
{"x": 13, "y": 4},
|
{"label":"\u2190", "x":13, "y":4},
|
||||||
{"x": 14, "y": 4},
|
{"label":"\u2193", "x":14, "y":4},
|
||||||
{"x": 15, "y": 4}
|
{"label":"\u2192", "x":15, "y":4}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -21,19 +21,18 @@ enum layers {
|
|||||||
|
|
||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
|
|
||||||
[_LAYER0] = LAYOUT_65_ansi_blocker(
|
[_LAYER0] = LAYOUT_65_ansi_blocker_split_bs(
|
||||||
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,
|
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,
|
||||||
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,
|
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,
|
||||||
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,
|
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,
|
||||||
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,
|
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,
|
||||||
KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
|
KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
|
||||||
),
|
),
|
||||||
|
[_LAYER1] = LAYOUT_65_ansi_blocker_split_bs(
|
||||||
[_LAYER1] = LAYOUT_65_ansi_blocker(
|
|
||||||
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,
|
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,
|
||||||
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,
|
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,
|
||||||
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,
|
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,
|
||||||
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,
|
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,
|
||||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
|
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
|
||||||
)
|
),
|
||||||
};
|
};
|
||||||
|
|||||||
@ -23,36 +23,32 @@ enum layers {
|
|||||||
|
|
||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
|
|
||||||
[_LAYER0] = LAYOUT_65_ansi_blocker(
|
[_LAYER0] = LAYOUT_65_ansi_blocker_split_bs(
|
||||||
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,
|
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,
|
||||||
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,
|
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,
|
||||||
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,
|
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,
|
||||||
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,
|
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,
|
||||||
KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
|
KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
|
||||||
),
|
),
|
||||||
|
[_LAYER1] = LAYOUT_65_ansi_blocker_split_bs(
|
||||||
[_LAYER1] = LAYOUT_65_ansi_blocker(
|
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,
|
||||||
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, 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,
|
||||||
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,
|
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,
|
||||||
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,
|
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,
|
||||||
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,
|
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
|
||||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
|
|
||||||
),
|
),
|
||||||
|
[_LAYER2] = LAYOUT_65_ansi_blocker_split_bs(
|
||||||
[_LAYER2] = LAYOUT_65_ansi_blocker(
|
|
||||||
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,
|
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,
|
||||||
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, 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, 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, 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, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
|
||||||
),
|
),
|
||||||
|
[_LAYER3] = LAYOUT_65_ansi_blocker_split_bs(
|
||||||
[_LAYER3] = LAYOUT_65_ansi_blocker(
|
|
||||||
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,
|
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,
|
||||||
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, 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, 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, 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, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
|
||||||
),
|
)
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|||||||
@ -1,13 +1,25 @@
|
|||||||
# Alexa Hotswap PCB by Maker Keyboards
|
# Alexa Hotswap PCB by Maker Keyboards
|
||||||
|
|
||||||
The following is the QMK Firmware for the Alexa Hotswap PCB for [MakerKeyboards](http://www.makerkeyboards.cm).
|
The following is the QMK Firmware for the Alexa Hotswap PCB for [Maker Keyboards](https://www.makerkeyboards.com/).
|
||||||
---
|
---
|
||||||
|
|
||||||
* Keyboard Maintainer: Maker Keyboards
|
* Keyboard Maintainer: [mrnoisytiger](https://github.com/mrnoisytiger)
|
||||||
* Hardware Supported: Phantom
|
* Hardware Supported: Alexa Hotswap PCB (ATmega32U4)
|
||||||
|
* Hardware Availability: [Maker Keyboards](https://www.makerkeyboards.com/products/alexa)
|
||||||
|
|
||||||
Make example for this keyboard (after setting up your build environment):
|
Make example for this keyboard (after setting up your build environment):
|
||||||
|
|
||||||
make lucid/alexa:default
|
make lucid/alexa:default
|
||||||
|
|
||||||
|
Flashing example for this keyboard:
|
||||||
|
|
||||||
|
make lucid/alexa:default:flash
|
||||||
|
|
||||||
|
## Bootloader
|
||||||
|
|
||||||
|
Enter the bootloader in 3 ways:
|
||||||
|
|
||||||
|
* **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
|
||||||
|
* **Keycode in layout**: Press the key mapped to `RESET` if it is available (Fn+Backslash by default)
|
||||||
|
|
||||||
See 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).
|
See 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).
|
||||||
|
|||||||
@ -24,4 +24,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
|||||||
AUDIO_ENABLE = no # Audio output
|
AUDIO_ENABLE = no # Audio output
|
||||||
KEYBOARD_LOCK_ENABLE = yes
|
KEYBOARD_LOCK_ENABLE = yes
|
||||||
|
|
||||||
LAYOUTS = 65_ansi_blocker
|
LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user