aboutsummaryrefslogtreecommitdiff
path: root/keyboards/espectro
diff options
context:
space:
mode:
authornoroadsleft <18669334+noroadsleft@users.noreply.github.com>2018-12-18 09:16:06 -0800
committerDrashna Jaelre <drashna@live.com>2018-12-18 09:16:06 -0800
commit584a7a03952dc5950b22fa4d035dc1c8ee98c87f (patch)
treead448ab6fcbf1fc90d5681c84ae051823275a557 /keyboards/espectro
parent8181c8dc97ddd073a94430032c2505ec2e4d4a05 (diff)
downloadqmk_firmware-584a7a03952dc5950b22fa4d035dc1c8ee98c87f.tar.gz
qmk_firmware-584a7a03952dc5950b22fa4d035dc1c8ee98c87f.zip
Keyboard: Espectro refactor and Configurator support (#4666)
* Espectro: layout macro refactor - updated to #pragma once method - restructure LAYOUT_all data as block comment - Configurator was reading the LAYOUT_all macro even though it was commented out. - updated all keyswitch arguments to use K<ROW><COLUMN> notation - add LAYOUT_iso macro - add info.json file for Configurator support * Espectro: keymap refactor - deleted unused MODS_CTRL_MASK definitions - iso keymap refactored to use LAYOUT_iso macro - default and iso keymaps refactored for readability
Diffstat (limited to 'keyboards/espectro')
-rwxr-xr-xkeyboards/espectro/espectro.h173
-rw-r--r--keyboards/espectro/info.json347
-rwxr-xr-xkeyboards/espectro/keymaps/default/keymap.c29
-rwxr-xr-xkeyboards/espectro/keymaps/iso/keymap.c30
-rw-r--r--keyboards/espectro/keymaps/mac/keymap.c1
-rw-r--r--keyboards/espectro/keymaps/mapdev/keymap.c1
6 files changed, 489 insertions, 92 deletions
diff --git a/keyboards/espectro/espectro.h b/keyboards/espectro/espectro.h
index 6f9e4b7f7..ff58f9d97 100755
--- a/keyboards/espectro/espectro.h
+++ b/keyboards/espectro/espectro.h
@@ -15,77 +15,130 @@
15 */ 15 */
16 16
17 17
18#ifndef ESPECTRO_H 18#pragma once
19#define ESPECTRO_H
20 19
21#include "quantum.h" 20#include "quantum.h"
22 21
23 22
24//Arrow keys and 1.75u shift 23/*
24 * Placement of every possible switch defined below.
25 * x2 means the diode allows two possible positions for the switch
26 *
27 * Layout:
28 * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
29 * │K00 │K01 │K02 │K03 │K04 │K60 │K61 │K62 │K63 │K05 │K06 │K07 │K08 │K72 │K09 │K0A │K0B │K0C │K7C │
30 * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
31 * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
32 * │K10 │K11 │K12 │K13 │K14 │K64 │K65 │K66 │K67 │K15 │K16 │K17 │K18 │K70 │K71 │K19 │K1A │K1B │K1C │
33 * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │x2 │ │ │ │ │
34 * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴─────┼─────┼─────┼─────┼─────┤ ┌────────┐
35 * │K20 │K21 │K22 │K23 │K24 │K68 │K69 │K6A │K6B │K25 │K26 │K27 │K28 │K73 │K29 │K2A │K2B │K2C │ │K38 │
36 * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
37 * ├────────┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴────────┼─────┼─────┼─────┼─────┤ ┌───┴─┐ │
38 * │K30 │K31 │K32 │K33 │K34 │K6C │K75 │K76 │K77 │K35 │K36 │K37 │K38 │K39 │K3A │K3B │K3C │ │K73 │ │
39 * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
40 * ├───────┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──────┬─────┼─────┼─────┼─────┼─────┤ └─────┴──────┘
41 * │K40x2 │K41 │K42 │K43 │K44 │K78 │K79 │K7A │K7B │K45 │K46 │K47 │K48 │K74 │K49 │K4A │K4B │K4C │
42 * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
43 * ├───────┼─────┴─┬───┴───┬─┴─────┴─────┴─────┴─────┴─────┴───┬─┴───┬─┴───┬─┴───┬─────┼─────┼─────┼─────┼─────┼─────┤
44 * │K50 │K51 │K52 │K59 │K55 │K56 │K57 │K58 │K53 │K54 │K5A │K5B │K5C │
45 * │x2 │x2 │ │x3 │x3 │x2 │x2 │x2 │x2 │ │x2 │ │ │
46 * └───────┴───────┴───────┴───────────────────────────────────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
47 *
48 * Variants:
49 * - 2u Backspace: Delete K70 Use K71
50 * - 2u Num +: Delete K3C Use K2C
51 * - 2u Num Enter: Delete K5C Use K4C
52 * - ANSI Left Shift: Delete K41 Use K40
53 *
54 * ANSI Backslash and ISO Hash are the same position
55 * ANSI Enter and ISO Enter are the same position
56 * For two 1.5u modifiers on the right of the Spacebar, delete K56 and use K55 and K57
57 *
58 * Matrix:
59 * { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
60 * { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \
61 * { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
62 * { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C }, \
63 * { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \
64 * { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C }, \
65 * { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \
66 * { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C } \
67 */
68
69
70/* LAYOUT_all (Identical to LAYOUT_split_shift_and_bs)
71 * Every matrix position
72 * ,---------------------------------------------------------------------------.
73 * | 00| 01| 02| 03| 04| 60| 61| 62| 63| 05| 06| 07| 08| 72| 09| 0A| 0B| 0C| 7C|
74 * |---------------------------------------------------------------------------|
75 * | 10| 11| 12| 13| 14| 64| 65| 66| 67| 15| 16| 17| 18| 70| 71| 19| 1A| 1B| 1C|
76 * |---------------------------------------------------------------------------|
77 * | 20 | 21| 22| 23| 24| 68| 69| 6A| 6B| 25| 26| 27| 28| 73| 29| 2A| 2B| 2C|
78 * |---------------------------------------------------------------------------|
79 * | 30 | 31| 32| 33| 34| 6C| 75| 76| 77| 35| 36| 37| 38| 39| 3A| 3B| 3C|
80 * |---------------------------------------------------------------------------|
81 * | 40 | 41| 42| 43| 44| 78| 79| 7A| 7B| 45| 46| 47| 48| 74| 49| 4A| 4B| 4C|
82 * |---------------------------------------------------------------------------|
83 * | 50 | 51 | 52 | 59 | 55| 56| 57| 58| 53| 54| 5A| 5B| 5C|
84 * `---------------------------------------------------------------------------'
85*/
86
87
88//Arrow keys and 1.75u right shift
25#define LAYOUT_default( \ 89#define LAYOUT_default( \
26K000, K001, K002, K003, K004, K600, K601, K602, K603, K005, K006, K007, K008, K702, K009, K010, K011, K012, K712, \ 90 K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09, K0A, K0B, K0C, K7C, \
27K100, K101, K102, K103, K104, K604, K605, K606, K607, K105, K106, K107, K108, K701, K109, K110, K111, K112, \ 91 K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K71, K19, K1A, K1B, K1C, \
28 K200, K201, K202, K203, K204, K608, K609, K610, K611, K205, K206, K207, K208, K703, K209, K210, K211, K212, \ 92 K20, K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28, K73, K29, K2A, K2B, K2C, \
29 K300, K301, K302, K303, K304, K612, K705, K706, K707, K305, K306, K307, K308, K309, K310, K311, \ 93 K30, K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37, K38, K39, K3A, K3B, \
30 K400, K402, K403, K404, K708, K709, K710, K711, K405, K406, K407, K408, K704, K409, K410, K411, K412, \ 94 K40, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47, K48, K74, K49, K4A, K4B, K4C, \
31K500, K501, K502, K509, K505, K506, K507, K508, K503, K504, K510, K511 \ 95 K50, K51, K52, K59, K55, K56, K57, K58, K53, K54, K5A, K5B \
32) { \ 96) { \
33 { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012 }, \ 97 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
34 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112 }, \ 98 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \
35 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212 }, \ 99 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
36 { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO }, \ 100 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO }, \
37 { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412 }, \ 101 { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \
38 { K500, K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, KC_NO }, \ 102 { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, KC_NO }, \
39 { K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610, K611, K612 }, \ 103 { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \
40 { KC_NO, K701, K702, K703, K704, K705, K706, K707, K708, K709, K710, K711, K712 }, \ 104 { KC_NO, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C } \
41} 105}
42 106
43// Split numpad (enter, 0), split shifts (right, left), split backspace 107// Split numpad (enter, 0), split shifts (right, left), split backspace
44// This is more of an example of every possible keycode placement 108// This layout contains every possible keycode placement
45#define LAYOUT_split_shift_and_bs( \ 109#define LAYOUT_split_shift_and_bs( \
46K000, K001, K002, K003, K004, K600, K601, K602, K603, K005, K006, K007, K008, K702, K009, K010, K011, K012, K712, \ 110 K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09, K0A, K0B, K0C, K7C, \
47K100, K101, K102, K103, K104, K604, K605, K606, K607, K105, K106, K107, K108, K700, K701, K109, K110, K111, K112, \ 111 K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K70, K71, K19, K1A, K1B, K1C, \
48 K200, K201, K202, K203, K204, K608, K609, K610, K611, K205, K206, K207, K208, K703, K209, K210, K211, K212, \ 112 K20, K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28, K73, K29, K2A, K2B, K2C, \
49 K300, K301, K302, K303, K304, K612, K705, K706, K707, K305, K306, K307, K308, K309, K310, K311, K312, \ 113 K30, K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
50 K400, K401, K402, K403, K404, K708, K709, K710, K711, K405, K406, K407, K408, K704, K409, K410, K411, K412, \ 114 K40, K41, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47, K48, K74, K49, K4A, K4B, K4C, \
51K500, K501, K502, K509, K505, K506, K507, K508, K503, K504, K510, K511, K512 \ 115 K50, K51, K52, K59, K55, K56, K57, K58, K53, K54, K5A, K5B, K5C \
52) { \ 116) { \
53 { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012 }, \ 117 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
54 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112 }, \ 118 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \
55 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212 }, \ 119 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
56 { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312 }, \ 120 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C }, \
57 { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412 }, \ 121 { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \
58 { K500, K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512 }, \ 122 { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C }, \
59 { K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610, K611, K612 }, \ 123 { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \
60 { K701, K701, K702, K703, K704, K705, K706, K707, K708, K709, K710, K711, K712 }, \ 124 { K71, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C }, \
61} 125}
62 126
63 127// ISO Layout
64 128#define LAYOUT_iso( \
65 129 K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09, K0A, K0B, K0C, K7C, \
66/* 130 K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K71, K19, K1A, K1B, K1C, \
67Placement of every possible switch defined below. 131 K20, K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
68x2 means the diode allows two possible positions for the switch 132 K30, K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37, K73, K38, K39, K3A, K3B, \
69 133 K40, K41, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47, K48, K74, K49, K4A, K4B, K4C, \
70#define LAYOUT_all( \ 134 K50, K51, K52, K59, K55, K56, K57, K58, K53, K54, K5A, K5B \
71K000, K001, K002, K003, K004, K600, K601, K602, K603, K005, K006, K007, K008, K702, K009, K010, K011, K012, K712, \ 135) { \
72K100, K101, K102, K103, K104, K604, K605, K606, K607, K105, K106, K107, K108, K700, K701x2, K109, K110, K111, K112, \ 136 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
73K200, K201, K202, K203, K204, K608, K609, K610, K611, K205, K206, K207, K208, K703, K209, K210, K211, K212, \ 137 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \
74 K308, K212, \ 138 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
75K300, K300, K301, K302, K304, K612, K705, K706, K707, K305, K306, K307, K703, K308, K309, K310, K311, K312, \ 139 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO }, \
76K400x2, K401, K402, K403, K404, K708, K709, K710, K711, K405, K406, K407, K408, K408, K704, K409, K410, K411, K412, \ 140 { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \
77 K412, \ 141 { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, KC_NO }, \
78K500x2, K501x2, K502, K509x3, K505x3, K506x2, K507x2, K508x2, K503x2, K504, K510x2, K511, K512 \ 142 { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \
79) { \ 143 { KC_NO, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C } \
80 { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012 }, \
81 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112 }, \
82 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212 }, \
83 { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312 }, \
84 { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412 }, \
85 { K500, K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512 }, \
86 { K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610, K611, K612 }, \
87 { K700, K701, K702, K703, K704, K705, K706, K707, K708, K709, K710, K711, K712 }, \
88} 144}
89*/
90
91#endif
diff --git a/keyboards/espectro/info.json b/keyboards/espectro/info.json
new file mode 100644
index 000000000..7a8c9bc0a
--- /dev/null
+++ b/keyboards/espectro/info.json
@@ -0,0 +1,347 @@
1{
2 "keyboard_name": "Espectro",
3 "keyboard_folder": "espectro",
4 "url": "",
5 "maintainer": "qmk",
6 "width": 19,
7 "height": 6,
8 "layouts": {
9 "LAYOUT_default": {
10 "key_count": 100,
11 "layout": [
12 {"label":"ESC", "x":0, "y":0},
13 {"label":"F1", "x":1, "y":0},
14 {"label":"F2", "x":2, "y":0},
15 {"label":"F3", "x":3, "y":0},
16 {"label":"F4", "x":4, "y":0},
17 {"label":"F5", "x":5, "y":0},
18 {"label":"F6", "x":6, "y":0},
19 {"label":"F7", "x":7, "y":0},
20 {"label":"F8", "x":8, "y":0},
21 {"label":"F9", "x":9, "y":0},
22 {"label":"F10", "x":10, "y":0},
23 {"label":"F11", "x":11, "y":0},
24 {"label":"F12", "x":12, "y":0},
25 {"label":"PRINT SCREEN", "x":13, "y":0},
26 {"label":"HOME", "x":14, "y":0},
27 {"label":"END", "x":15, "y":0},
28 {"label":"PAGE UP", "x":16, "y":0},
29 {"label":"PAGE DOWN", "x":17, "y":0},
30 {"label":"DELETE", "x":18, "y":0},
31
32 {"label":"GRAVE", "x":0, "y":1},
33 {"label":"1", "x":1, "y":1},
34 {"label":"2", "x":2, "y":1},
35 {"label":"3", "x":3, "y":1},
36 {"label":"4", "x":4, "y":1},
37 {"label":"5", "x":5, "y":1},
38 {"label":"6", "x":6, "y":1},
39 {"label":"7", "x":7, "y":1},
40 {"label":"8", "x":8, "y":1},
41 {"label":"9", "x":9, "y":1},
42 {"label":"0", "x":10, "y":1},
43 {"label":"MINUS", "x":11, "y":1},
44 {"label":"EQUAL", "x":12, "y":1},
45 {"label":"BACKSPACE", "x":13, "y":1, "w":2},
46 {"label":"NUM LOCK", "x":15, "y":1},
47 {"label":"KEYPAD /", "x":16, "y":1},
48 {"label":"KEYPAD *", "x":17, "y":1},
49 {"label":"KEYPAD -", "x":18, "y":1},
50
51 {"label":"TAB", "x":0, "y":2, "w":1.5},
52 {"label":"Q", "x":1.5, "y":2},
53 {"label":"W", "x":2.5, "y":2},
54 {"label":"E", "x":3.5, "y":2},
55 {"label":"R", "x":4.5, "y":2},
56 {"label":"T", "x":5.5, "y":2},
57 {"label":"Y", "x":6.5, "y":2},
58 {"label":"U", "x":7.5, "y":2},
59 {"label":"I", "x":8.5, "y":2},
60 {"label":"O", "x":9.5, "y":2},
61 {"label":"P", "x":10.5, "y":2},
62 {"label":"LBRACKET", "x":11.5, "y":2},
63 {"label":"RBRACKET", "x":12.5, "y":2},
64 {"label":"BACKSLASH", "x":13.5, "y":2, "w":1.5},
65 {"label":"KEYPAD 7", "x":15, "y":2},
66 {"label":"KEYPAD 8", "x":16, "y":2},
67 {"label":"KEYPAD 9", "x":17, "y":2},
68 {"label":"KEYPAD +", "x":18, "y":2, "h":2},
69
70 {"label":"CAPS LOCK", "x":0, "y":3, "w":1.75},
71 {"label":"A", "x":1.75, "y":3},
72 {"label":"S", "x":2.75, "y":3},
73 {"label":"D", "x":3.75, "y":3},
74 {"label":"F", "x":4.75, "y":3},
75 {"label":"G", "x":5.75, "y":3},
76 {"label":"H", "x":6.75, "y":3},
77 {"label":"J", "x":7.75, "y":3},
78 {"label":"K", "x":8.75, "y":3},
79 {"label":"L", "x":9.75, "y":3},
80 {"label":"SEMICOLON", "x":10.75, "y":3},
81 {"label":"QUOTE", "x":11.75, "y":3},
82 {"label":"ENTER", "x":12.75, "y":3, "w":2.25},
83 {"label":"KEYPAD 4", "x":15, "y":3},
84 {"label":"KEYPAD 5", "x":16, "y":3},
85 {"label":"KEYPAD 6", "x":17, "y":3},
86
87 {"label":"LSHIFT", "x":0, "y":4, "w":2.25},
88 {"label":"Z", "x":2.25, "y":4},
89 {"label":"X", "x":3.25, "y":4},
90 {"label":"C", "x":4.25, "y":4},
91 {"label":"V", "x":5.25, "y":4},
92 {"label":"B", "x":6.25, "y":4},
93 {"label":"N", "x":7.25, "y":4},
94 {"label":"M", "x":8.25, "y":4},
95 {"label":"COMMA", "x":9.25, "y":4},
96 {"label":"PERIOD", "x":10.25, "y":4},
97 {"label":"SLASH", "x":11.25, "y":4},
98 {"label":"RSHIFT", "x":12.25, "y":4, "w":1.75},
99 {"label":"UP", "x":14, "y":4},
100 {"label":"KEYPAD 1", "x":15, "y":4},
101 {"label":"KEYPAD 2", "x":16, "y":4},
102 {"label":"KEYPAD 3", "x":17, "y":4},
103 {"label":"KEYPAD ENTER", "x":18, "y":4, "h":2},
104
105 {"label":"LCTRL", "x":0, "y":5, "w":1.25},
106 {"label":"LGUI", "x":1.25, "y":5, "w":1.25},
107 {"label":"LALT", "x":2.5, "y":5, "w":1.25},
108 {"label":"SPACE", "x":3.75, "y":5, "w":6.25},
109 {"label":"RALT", "x":10, "y":5},
110 {"label":"RCTRL", "x":11, "y":5},
111 {"label":"FN", "x":12, "y":5},
112 {"label":"LEFT", "x":13, "y":5},
113 {"label":"DOWN", "x":14, "y":5},
114 {"label":"RIGHT", "x":15, "y":5},
115 {"label":"KEYPAD 0", "x":16, "y":5},
116 {"label":"KEYPAD .", "x":17, "y":5}
117 ]
118 },
119
120 "LAYOUT_split_shift_and_bs": {
121 "key_count": 104,
122 "layout": [
123 {"label":"ESC", "x":0, "y":0},
124 {"label":"F1", "x":1, "y":0},
125 {"label":"F2", "x":2, "y":0},
126 {"label":"F3", "x":3, "y":0},
127 {"label":"F4", "x":4, "y":0},
128 {"label":"F5", "x":5, "y":0},
129 {"label":"F6", "x":6, "y":0},
130 {"label":"F7", "x":7, "y":0},
131 {"label":"F8", "x":8, "y":0},
132 {"label":"F9", "x":9, "y":0},
133 {"label":"F10", "x":10, "y":0},
134 {"label":"F11", "x":11, "y":0},
135 {"label":"F12", "x":12, "y":0},
136 {"label":"PRINT SCREEN", "x":13, "y":0},
137 {"label":"HOME", "x":14, "y":0},
138 {"label":"END", "x":15, "y":0},
139 {"label":"PAGE UP", "x":16, "y":0},
140 {"label":"PAGE DOWN", "x":17, "y":0},
141 {"label":"DELETE", "x":18, "y":0},
142
143 {"label":"GRAVE", "x":0, "y":1},
144 {"label":"1", "x":1, "y":1},
145 {"label":"2", "x":2, "y":1},
146 {"label":"3", "x":3, "y":1},
147 {"label":"4", "x":4, "y":1},
148 {"label":"5", "x":5, "y":1},
149 {"label":"6", "x":6, "y":1},
150 {"label":"7", "x":7, "y":1},
151 {"label":"8", "x":8, "y":1},
152 {"label":"9", "x":9, "y":1},
153 {"label":"0", "x":10, "y":1},
154 {"label":"MINUS", "x":11, "y":1},
155 {"label":"EQUAL", "x":12, "y":1},
156 {"label":"BACKSPACE", "x":13, "y":1},
157 {"label":"BACKSPACE", "x":14, "y":1},
158 {"label":"NUM LOCK", "x":15, "y":1},
159 {"label":"KEYPAD /", "x":16, "y":1},
160 {"label":"KEYPAD *", "x":17, "y":1},
161 {"label":"KEYPAD -", "x":18, "y":1},
162
163 {"label":"TAB", "x":0, "y":2, "w":1.5},
164 {"label":"Q", "x":1.5, "y":2},
165 {"label":"W", "x":2.5, "y":2},
166 {"label":"E", "x":3.5, "y":2},
167 {"label":"R", "x":4.5, "y":2},
168 {"label":"T", "x":5.5, "y":2},
169 {"label":"Y", "x":6.5, "y":2},
170 {"label":"U", "x":7.5, "y":2},
171 {"label":"I", "x":8.5, "y":2},
172 {"label":"O", "x":9.5, "y":2},
173 {"label":"P", "x":10.5, "y":2},
174 {"label":"LBRACKET", "x":11.5, "y":2},
175 {"label":"RBRACKET", "x":12.5, "y":2},
176 {"label":"BACKSLASH", "x":13.5, "y":2, "w":1.5},
177 {"label":"KEYPAD 7", "x":15, "y":2},
178 {"label":"KEYPAD 8", "x":16, "y":2},
179 {"label":"KEYPAD 9", "x":17, "y":2},
180 {"label":"KEYPAD +", "x":18, "y":2},
181
182 {"label":"CAPS LOCK", "x":0, "y":3, "w":1.75},
183 {"label":"A", "x":1.75, "y":3},
184 {"label":"S", "x":2.75, "y":3},
185 {"label":"D", "x":3.75, "y":3},
186 {"label":"F", "x":4.75, "y":3},
187 {"label":"G", "x":5.75, "y":3},
188 {"label":"H", "x":6.75, "y":3},
189 {"label":"J", "x":7.75, "y":3},
190 {"label":"K", "x":8.75, "y":3},
191 {"label":"L", "x":9.75, "y":3},
192 {"label":"SEMICOLON", "x":10.75, "y":3},
193 {"label":"QUOTE", "x":11.75, "y":3},
194 {"label":"ENTER", "x":12.75, "y":3, "w":2.25},
195 {"label":"KEYPAD 4", "x":15, "y":3},
196 {"label":"KEYPAD 5", "x":16, "y":3},
197 {"label":"KEYPAD 6", "x":17, "y":3},
198 {"label":"KEYPAD +", "x":18, "y":3},
199
200 {"label":"LSHIFT", "x":0, "y":4, "w":1.25},
201 {"label":"ISO BACKSLASH", "x":1.25, "y":4},
202 {"label":"Z", "x":2.25, "y":4},
203 {"label":"X", "x":3.25, "y":4},
204 {"label":"C", "x":4.25, "y":4},
205 {"label":"V", "x":5.25, "y":4},
206 {"label":"B", "x":6.25, "y":4},
207 {"label":"N", "x":7.25, "y":4},
208 {"label":"M", "x":8.25, "y":4},
209 {"label":"COMMA", "x":9.25, "y":4},
210 {"label":"PERIOD", "x":10.25, "y":4},
211 {"label":"SLASH", "x":11.25, "y":4},
212 {"label":"RSHIFT", "x":12.25, "y":4, "w":1.75},
213 {"label":"UP", "x":14, "y":4},
214 {"label":"KEYPAD 1", "x":15, "y":4},
215 {"label":"KEYPAD 2", "x":16, "y":4},
216 {"label":"KEYPAD 3", "x":17, "y":4},
217 {"label":"KEYPAD ENTER", "x":18, "y":4},
218
219 {"label":"LCTRL", "x":0, "y":5, "w":1.25},
220 {"label":"LGUI", "x":1.25, "y":5, "w":1.25},
221 {"label":"LALT", "x":2.5, "y":5, "w":1.25},
222 {"label":"SPACE", "x":3.75, "y":5, "w":6.25},
223 {"label":"RALT", "x":10, "y":5},
224 {"label":"MENU", "x":11, "y":5},
225 {"label":"RCTRL", "x":12, "y":5},
226 {"label":"LEFT", "x":13, "y":5},
227 {"label":"DOWN", "x":14, "y":5},
228 {"label":"RIGHT", "x":15, "y":5},
229 {"label":"KEYPAD 0", "x":16, "y":5},
230 {"label":"KEYPAD .", "x":17, "y":5},
231 {"label":"KEYPAD ENTER", "x":18, "y":5}
232 ]
233 },
234
235 "LAYOUT_iso": {
236 "key_count": 101,
237 "layout": [
238 {"label":"ESC", "x":0, "y":0},
239 {"label":"F1", "x":1, "y":0},
240 {"label":"F2", "x":2, "y":0},
241 {"label":"F3", "x":3, "y":0},
242 {"label":"F4", "x":4, "y":0},
243 {"label":"F5", "x":5, "y":0},
244 {"label":"F6", "x":6, "y":0},
245 {"label":"F7", "x":7, "y":0},
246 {"label":"F8", "x":8, "y":0},
247 {"label":"F9", "x":9, "y":0},
248 {"label":"F10", "x":10, "y":0},
249 {"label":"F11", "x":11, "y":0},
250 {"label":"F12", "x":12, "y":0},
251 {"label":"PRINT SCREEN", "x":13, "y":0},
252 {"label":"HOME", "x":14, "y":0},
253 {"label":"END", "x":15, "y":0},
254 {"label":"PAGE UP", "x":16, "y":0},
255 {"label":"PAGE DOWN", "x":17, "y":0},
256 {"label":"DELETE", "x":18, "y":0},
257
258 {"label":"GRAVE", "x":0, "y":1},
259 {"label":"1", "x":1, "y":1},
260 {"label":"2", "x":2, "y":1},
261 {"label":"3", "x":3, "y":1},
262 {"label":"4", "x":4, "y":1},
263 {"label":"5", "x":5, "y":1},
264 {"label":"6", "x":6, "y":1},
265 {"label":"7", "x":7, "y":1},
266 {"label":"8", "x":8, "y":1},
267 {"label":"9", "x":9, "y":1},
268 {"label":"0", "x":10, "y":1},
269 {"label":"MINUS", "x":11, "y":1},
270 {"label":"EQUAL", "x":12, "y":1},
271 {"label":"BACKSPACE", "x":13, "y":1, "w":2},
272 {"label":"NUM LOCK", "x":15, "y":1},
273 {"label":"KEYPAD /", "x":16, "y":1},
274 {"label":"KEYPAD *", "x":17, "y":1},
275 {"label":"KEYPAD -", "x":18, "y":1},
276
277 {"label":"TAB", "x":0, "y":2, "w":1.5},
278 {"label":"Q", "x":1.5, "y":2},
279 {"label":"W", "x":2.5, "y":2},
280 {"label":"E", "x":3.5, "y":2},
281 {"label":"R", "x":4.5, "y":2},
282 {"label":"T", "x":5.5, "y":2},
283 {"label":"Y", "x":6.5, "y":2},
284 {"label":"U", "x":7.5, "y":2},
285 {"label":"I", "x":8.5, "y":2},
286 {"label":"O", "x":9.5, "y":2},
287 {"label":"P", "x":10.5, "y":2},
288 {"label":"LBRACKET", "x":11.5, "y":2},
289 {"label":"RBRACKET", "x":12.5, "y":2},
290 {"label":"KEYPAD 7", "x":15, "y":2},
291 {"label":"KEYPAD 8", "x":16, "y":2},
292 {"label":"KEYPAD 9", "x":17, "y":2},
293 {"label":"KEYPAD +", "x":18, "y":2, "h":2},
294
295 {"label":"CAPS LOCK", "x":0, "y":3, "w":1.75},
296 {"label":"A", "x":1.75, "y":3},
297 {"label":"S", "x":2.75, "y":3},
298 {"label":"D", "x":3.75, "y":3},
299 {"label":"F", "x":4.75, "y":3},
300 {"label":"G", "x":5.75, "y":3},
301 {"label":"H", "x":6.75, "y":3},
302 {"label":"J", "x":7.75, "y":3},
303 {"label":"K", "x":8.75, "y":3},
304 {"label":"L", "x":9.75, "y":3},
305 {"label":"SEMICOLON", "x":10.75, "y":3},
306 {"label":"QUOTE", "x":11.75, "y":3},
307 {"label":"ISO HASH", "x":12.75, "y":3},
308 {"label":"ENTER", "x":13.75, "y":2, "w":1.25, "h":2},
309 {"label":"KEYPAD 4", "x":15, "y":3},
310 {"label":"KEYPAD 5", "x":16, "y":3},
311 {"label":"KEYPAD 6", "x":17, "y":3},
312
313 {"label":"LSHIFT", "x":0, "y":4, "w":1.25},
314 {"label":"ISO BACKSLASH", "x":1.25, "y":4},
315 {"label":"Z", "x":2.25, "y":4},
316 {"label":"X", "x":3.25, "y":4},
317 {"label":"C", "x":4.25, "y":4},
318 {"label":"V", "x":5.25, "y":4},
319 {"label":"B", "x":6.25, "y":4},
320 {"label":"N", "x":7.25, "y":4},
321 {"label":"M", "x":8.25, "y":4},
322 {"label":"COMMA", "x":9.25, "y":4},
323 {"label":"PERIOD", "x":10.25, "y":4},
324 {"label":"SLASH", "x":11.25, "y":4},
325 {"label":"RSHIFT", "x":12.25, "y":4, "w":1.75},
326 {"label":"UP", "x":14, "y":4},
327 {"label":"KEYPAD 1", "x":15, "y":4},
328 {"label":"KEYPAD 2", "x":16, "y":4},
329 {"label":"KEYPAD 3", "x":17, "y":4},
330 {"label":"KEYPAD ENTER", "x":18, "y":4, "h":2},
331
332 {"label":"LCTRL", "x":0, "y":5, "w":1.25},
333 {"label":"LGUI", "x":1.25, "y":5, "w":1.25},
334 {"label":"LALT", "x":2.5, "y":5, "w":1.25},
335 {"label":"SPACE", "x":3.75, "y":5, "w":6.25},
336 {"label":"RALT", "x":10, "y":5},
337 {"label":"MENU", "x":11, "y":5},
338 {"label":"RCTRL", "x":12, "y":5},
339 {"label":"LEFT", "x":13, "y":5},
340 {"label":"DOWN", "x":14, "y":5},
341 {"label":"RIGHT", "x":15, "y":5},
342 {"label":"KEYPAD 0", "x":16, "y":5},
343 {"label":"KEYPAD .", "x":17, "y":5}
344 ]
345 }
346 }
347}
diff --git a/keyboards/espectro/keymaps/default/keymap.c b/keyboards/espectro/keymaps/default/keymap.c
index aeff733fc..b78fdbcac 100755
--- a/keyboards/espectro/keymaps/default/keymap.c
+++ b/keyboards/espectro/keymaps/default/keymap.c
@@ -16,7 +16,6 @@
16 16
17 17
18#include QMK_KEYBOARD_H 18#include QMK_KEYBOARD_H
19#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
20 19
21#define _BL 0 //Base layer 20#define _BL 0 //Base layer
22#define _FN1 1 //Function layer 21#define _FN1 1 //Function layer
@@ -26,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
26/* BL 25/* BL
27____________________________________________________________________________________________________________________________________________________________________________ 26____________________________________________________________________________________________________________________________________________________________________________
28| | | | | | | | | | | | | | | | | | | | 27| | | | | | | | | | | | | | | | | | | |
29| ESC | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | P SCN | HOME | END | P UP | P DOWN | DEL | 28| ESC | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | DEL | PRT SC | SCR LK | PAUSE | P UP | P DOWN |
30|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________| 29|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|
31| | | | | | | | | | | | | | BACK | NUM | | | | 30| | | | | | | | | | | | | | BACK | NUM | | | |
32| ~` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | _ - | = + | SPACE | LOCK | / | * | - | 31| ~` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | _ - | = + | SPACE | LOCK | / | * | - |
@@ -46,12 +45,12 @@ ________________________________________________________________________________
46 */ 45 */
47 46
48 [_BL] = LAYOUT_default( 47 [_BL] = LAYOUT_default(
49 KC_ESC, 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_DEL, KC_PSCR, KC_SLCK, KC_PAUS, KC_PGUP, KC_PGDN, 48 KC_ESC, 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_DEL, KC_PSCR, KC_SLCK, KC_PAUS, KC_PGUP, KC_PGDN, \
50 KC_GRV, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 49 KC_GRV, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \
51 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_P7, KC_P8, KC_P9, KC_PPLS, 50 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_P7, KC_P8, KC_P9, KC_PPLS, \
52 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_P4, KC_P5, KC_P6, 51 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_P4, KC_P5, KC_P6, \
53 KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, 52 KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, \
54 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT, KC_P0, KC_PDOT 53 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT \
55 ), 54 ),
56 55
57/* FN_1 56/* FN_1
@@ -60,7 +59,7 @@ ________________________________________________________________________________
60| RESET | | | | | | | | | | | | | MUTE | DOWN | UP | TRACK | HOME | END | 59| RESET | | | | | | | | | | | | | MUTE | DOWN | UP | TRACK | HOME | END |
61|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________| 60|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|
62| | RGB | RGB | RGB | RGB | RGB | RGB | RGB | RGB | | | | | | | | | | 61| | RGB | RGB | RGB | RGB | RGB | RGB | RGB | RGB | | | | | | | | | |
63| | TOGGLE | MODE |INCREASE|DECREASE| HUE | HUE | SAT | | | | | | DELETE | | | | | 62| | TOGGLE | MODE |INCREASE|DECREASE| HUE | HUE | SAT | SAT | | | | | DELETE | | | | |
64|________|________|________|________|________|INCREASE|DECREASE|INCREASE|DECREASE|________|________|________|________|_________________|________|________|________|________| 63|________|________|________|________|________|INCREASE|DECREASE|INCREASE|DECREASE|________|________|________|________|_________________|________|________|________|________|
65| | BACK | BACK | | | | | | | | | | | | | | | | 64| | BACK | BACK | | | | | | | | | | | | | | | |
66| | LIGHT | LIGHT | | | | | | | | | | | | | | | | 65| | LIGHT | LIGHT | | | | | | | | | | | | | | | |
@@ -77,12 +76,12 @@ ________________________________________________________________________________
77 */ 76 */
78 77
79 [_FN1] = LAYOUT_default( 78 [_FN1] = LAYOUT_default(
80 RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_HOME, KC_END, 79 RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_HOME, KC_END, \
81 _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, 80 _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, \
82 _______, BL_TOGG, BL_INC, BL_DEC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 81 _______, BL_TOGG, BL_INC, BL_DEC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
83 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 82 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
84 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 83 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
85 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 84 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
86 ), 85 ),
87 86
88}; 87};
diff --git a/keyboards/espectro/keymaps/iso/keymap.c b/keyboards/espectro/keymaps/iso/keymap.c
index d22e7aac4..a9625e4d9 100755
--- a/keyboards/espectro/keymaps/iso/keymap.c
+++ b/keyboards/espectro/keymaps/iso/keymap.c
@@ -44,13 +44,13 @@ ________________________________________________________________________________
44|__________|__________|__________|________________________________________________________|________|________|________|________|________|________|________|________|________| 44|__________|__________|__________|________________________________________________________|________|________|________|________|________|________|________|________|________|
45 */ 45 */
46 46
47 [_BL] = LAYOUT_split_shift_and_bs( 47 [_BL] = LAYOUT_iso(
48 KC_ESC, 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_DEL, KC_PSCR, KC_HOME, KC_END, KC_PGUP, KC_PGDN, 48 KC_ESC, 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_DEL, KC_PSCR, KC_HOME, KC_END, KC_PGUP, KC_PGDN, \
49 KC_GRV, 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_NO, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 49 KC_GRV, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \
50 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_NUHS, KC_P7, KC_P8, KC_P9, KC_PPLS, 50 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_P7, KC_P8, KC_P9, KC_PPLS, \
51 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_NO, KC_P4, KC_P5, KC_P6, 51 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_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, \
52 KC_LSFT, KC_NUBS, 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_P1, KC_P2, KC_P3, KC_PENT, 52 KC_LSFT, KC_NUBS, 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_P1, KC_P2, KC_P3, KC_PENT, \
53 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT, KC_P0, KC_PDOT, KC_NO 53 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT \
54 ), 54 ),
55 55
56/* FN_1 56/* FN_1
@@ -59,7 +59,7 @@ ________________________________________________________________________________
59| RESET | | | | | | | | | | | | | MUTE | DOWN | UP | TRACK | HOME | END | 59| RESET | | | | | | | | | | | | | MUTE | DOWN | UP | TRACK | HOME | END |
60|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________| 60|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|
61| | RGB | RGB | RGB | RGB | RGB | RGB | RGB | RGB | | | | | | | | | | 61| | RGB | RGB | RGB | RGB | RGB | RGB | RGB | RGB | | | | | | | | | |
62| | TOGGLE | MODE |INCREASE|DECREASE| HUE | HUE | SAT | | | | | | DELETE | | | | | 62| | TOGGLE | MODE |INCREASE|DECREASE| HUE | HUE | SAT | SAT | | | | | DELETE | | | | |
63|________|________|________|________|________|INCREASE|DECREASE|INCREASE|DECREASE|________|________|________|________|_________________|________|________|________|________| 63|________|________|________|________|________|INCREASE|DECREASE|INCREASE|DECREASE|________|________|________|________|_________________|________|________|________|________|
64| | BACK | BACK | | | | | | | | | | | | | | | | 64| | BACK | BACK | | | | | | | | | | | | | | | |
65| | LIGHT | LIGHT | | | | | | | | | | | | | | | | 65| | LIGHT | LIGHT | | | | | | | | | | | | | | | |
@@ -75,13 +75,13 @@ ________________________________________________________________________________
75|__________|__________|__________|________________________________________________________|________|________|________|________|________|________|________|________|________| 75|__________|__________|__________|________________________________________________________|________|________|________|________|________|________|________|________|________|
76 */ 76 */
77 77
78 [_FN1] = LAYOUT_split_shift_and_bs( 78 [_FN1] = LAYOUT_iso(
79 RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_HOME, KC_END, 79 RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_HOME, KC_END, \
80 _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, 80 _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, \
81 _______, BL_TOGG, BL_INC, BL_DEC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 81 _______, BL_TOGG, BL_INC, BL_DEC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
82 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 82 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
83 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 83 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
84 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 84 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
85 ), 85 ),
86 86
87}; 87};
diff --git a/keyboards/espectro/keymaps/mac/keymap.c b/keyboards/espectro/keymaps/mac/keymap.c
index 4b72ff0aa..9c03e1345 100644
--- a/keyboards/espectro/keymaps/mac/keymap.c
+++ b/keyboards/espectro/keymaps/mac/keymap.c
@@ -17,7 +17,6 @@
17 17
18#include QMK_KEYBOARD_H 18#include QMK_KEYBOARD_H
19 19
20#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
21 20
22#define _QWERTY 0 //BASE layer 21#define _QWERTY 0 //BASE layer
23#define _FUNCTION 1 //Function layer 22#define _FUNCTION 1 //Function layer
diff --git a/keyboards/espectro/keymaps/mapdev/keymap.c b/keyboards/espectro/keymaps/mapdev/keymap.c
index bbd791582..89d412b2d 100644
--- a/keyboards/espectro/keymaps/mapdev/keymap.c
+++ b/keyboards/espectro/keymaps/mapdev/keymap.c
@@ -15,7 +15,6 @@
15 15
16 16
17#include QMK_KEYBOARD_H 17#include QMK_KEYBOARD_H
18#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
19 18
20#define _BL 0 //Base layer 19#define _BL 0 //Base layer
21#define _FN1 1 //Function layer 20#define _FN1 1 //Function layer
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-19 05:56:05 +0000