summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorupinthecloudz <46974709+upinthecloudz@users.noreply.github.com>2019-02-18 09:59:08 -0800
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-02-18 09:59:08 -0800
commit0cee0764fd9d53d6bb835e2db2340f2541870386 (patch)
tree1f0fd8ace7d8d21819ccfe2448a279493a0ac70b /keyboards
parentfeee01192eacdbbdc92e76f965d6c93c695b2d2d (diff)
Fix Espectro Mac keymap and add new layout option (#4923)
* Fix Espectro Mac keymap and add new layout option * Fix keymap * Fix keymap
Diffstat (limited to 'keyboards')
-rwxr-xr-xkeyboards/espectro/espectro.h21
-rw-r--r--keyboards/espectro/keymaps/mac/keymap.c3
2 files changed, 20 insertions, 4 deletions
diff --git a/keyboards/espectro/espectro.h b/keyboards/espectro/espectro.h
index ff58f9d97f..98c930f8f5 100755
--- a/keyboards/espectro/espectro.h
+++ b/keyboards/espectro/espectro.h
@@ -104,6 +104,25 @@
{ KC_NO, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C } \
}
+// Split backspace 1.5u right mods
+#define LAYOUT_split_bs_joined_right( \
+ K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09, K0A, K0B, K0C, K7C, \
+ K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K70, K71, K19, K1A, K1B, K1C, \
+ K20, K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28, K73, K29, K2A, K2B, K2C, \
+ K30, K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37, K38, K39, K3A, K3B, \
+ K40, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47, K48, K74, K49, K4A, K4B, K4C, \
+ K50, K51, K52, K59, K55, K57, K58, K53, K54, K5A, K5B \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO }, \
+ { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \
+ { K50, K51, K52, K53, K54, K55, KC_NO, K57, K58, K59, K5A, K5B, KC_NO }, \
+ { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \
+ { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C }, \
+}
+
// Split numpad (enter, 0), split shifts (right, left), split backspace
// This layout contains every possible keycode placement
#define LAYOUT_split_shift_and_bs( \
@@ -121,7 +140,7 @@
{ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \
{ K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C }, \
{ K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \
- { K71, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C }, \
+ { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C }, \
}
// ISO Layout
diff --git a/keyboards/espectro/keymaps/mac/keymap.c b/keyboards/espectro/keymaps/mac/keymap.c
index 9c03e1345f..9bd75d61d6 100644
--- a/keyboards/espectro/keymaps/mac/keymap.c
+++ b/keyboards/espectro/keymaps/mac/keymap.c
@@ -132,7 +132,6 @@ ________________________________________________________________________________
};
-
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) {
switch (keycode) {
@@ -159,8 +158,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
SEND_STRING(SS_DOWN(X_LALT) SS_DOWN(X_LGUI) SS_TAP(X_Q) SS_UP(X_LGUI) SS_UP(X_LALT));
return false;
}
- return false;
}
return true;
};
-