summaryrefslogtreecommitdiff
path: root/keyboards/mtbkeys/mtb60
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mtbkeys/mtb60')
-rw-r--r--keyboards/mtbkeys/mtb60/hotswap/hotswap.h38
-rw-r--r--keyboards/mtbkeys/mtb60/hotswap/info.json133
-rw-r--r--keyboards/mtbkeys/mtb60/hotswap/keymaps/default/keymap.c4
-rw-r--r--keyboards/mtbkeys/mtb60/hotswap/rules.mk7
-rw-r--r--keyboards/mtbkeys/mtb60/solder/info.json139
-rw-r--r--keyboards/mtbkeys/mtb60/solder/keymaps/default/keymap.c4
-rw-r--r--keyboards/mtbkeys/mtb60/solder/rules.mk5
-rw-r--r--keyboards/mtbkeys/mtb60/solder/solder.h38
8 files changed, 207 insertions, 161 deletions
diff --git a/keyboards/mtbkeys/mtb60/hotswap/hotswap.h b/keyboards/mtbkeys/mtb60/hotswap/hotswap.h
index 7dae44b5da..e1e607e4c9 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/hotswap.h
+++ b/keyboards/mtbkeys/mtb60/hotswap/hotswap.h
@@ -18,16 +18,32 @@
#include "quantum.h"
-#define LAYOUT( \
- k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, ka0, kb0, kc0, ke0, \
- k11, k21, k31, k41, k51, k61, k71, k81, k91, ka1, kb1, kc1, kd1, ke1, \
- k02, k22, k32, k42, k52, k62, k72, k82, k92, ka2, kb2, kc2, kd2, \
- k03, k23, k33, k43, k53, k63, k73, k83, k93, ka3, kb3, kd3, \
- k04, k14, k24, k64, ka4, kb4, kd4, ke4 \
+#define ___ KC_NO
+
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+ * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │40 │41 │42 │46 │4a │4b │4d │4e │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+
+#define LAYOUT_60_ansi( \
+ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
+ k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
+ k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
+ k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \
+ k40, k41, k42, k46, k4a, k4b, k4d, k4e \
) { \
- { k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, ka0, kb0, kc0, KC_NO, ke0 }, \
- { KC_NO, k11, k21, k31, k41, k51, k61, k71, k81, k91, ka1, kb1, kc1, kd1, ke1 }, \
- { k02, KC_NO, k22, k32, k42, k52, k62, k72, k82, k92, ka2, kb2, kc2, kd2, KC_NO }, \
- { k03, KC_NO, k23, k33, k43, k53, k63, k73, k83, k93, ka3, kb3, KC_NO, kd3, KC_NO }, \
- { k04, k14, k24, KC_NO, KC_NO, KC_NO, k64, KC_NO, KC_NO, KC_NO, ka4, kb4, kd4, KC_NO, ke4 } \
+ { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, ___, k0e }, \
+ { ___, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
+ { k20, ___, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, ___ }, \
+ { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___, k3d, ___ }, \
+ { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4a, k4b, k4d, ___, k4e } \
}
diff --git a/keyboards/mtbkeys/mtb60/hotswap/info.json b/keyboards/mtbkeys/mtb60/hotswap/info.json
index 5718d70507..9e4ae0be29 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/info.json
+++ b/keyboards/mtbkeys/mtb60/hotswap/info.json
@@ -1,71 +1,78 @@
{
"keyboard_name": "MTB60",
"url": "mtbkeys.com",
- "maintainer": "MTBKeys",
+ "maintainer": "kgieselman",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_60_ansi"
+ },
"layouts": {
- "LAYOUT_all": {
+ "LAYOUT_60_ansi": {
"layout": [
- {"label": "Esc" , "x": 0, "y": 0 },
- {"label": "!" , "x": 1, "y": 0 },
- {"label": "@" , "x": 2, "y": 0 },
- {"label": "#" , "x": 3, "y": 0 },
- {"label": "$" , "x": 4, "y": 0 },
- {"label": "%" , "x": 5, "y": 0 },
- {"label": "^" , "x": 6, "y": 0 },
- {"label": "&" , "x": 7, "y": 0 },
- {"label": "*" , "x": 8, "y": 0 },
- {"label": "(" , "x": 9, "y": 0 },
- {"label": ")" , "x": 10, "y": 0 },
- {"label": "_" , "x": 11, "y": 0 },
- {"label": "+" , "x": 12, "y": 0 },
- {"label": "Back Space", "x": 13, "y": 0, "w": 2},
- {"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": "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": "Left 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": "Right Shift", "x": 12.25, "y": 3, "w": 2.75},
- {"label": "Left Ctrl" , "x": 0 , "y": 4, "w": 1.25},
- {"label": "GUI" , "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Left Alt" , "x": 2.5 , "y": 4, "w": 1.25},
- {"label": "Space" , "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Right Ctrl", "x": 10 , "y": 4, "w": 1.25},
- {"label": "GUI" , "x": 11.25, "y": 4, "w": 1.25},
- {"label": "MO(1)" , "x": 12.5 , "y": 4, "w": 1.25},
- {"label": "Right Ctrl", "x": 13.75, "y": 4, "w": 1.25}
+ {"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":"Back Space", "x":13, "y":0, "w":2},
+
+ {"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":"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":"Left 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":"Right Shift", "x":12.25, "y":3, "w":2.75},
+
+ {"label":"Left Ctrl", "x":0, "y":4, "w":1.25},
+ {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+ {"label":"Left Alt", "x":2.5, "y":4, "w":1.25},
+ {"label":"Space", "x":3.75, "y":4, "w":6.25},
+ {"label":"Right Ctrl", "x":10, "y":4, "w":1.25},
+ {"label":"GUI", "x":11.25, "y":4, "w":1.25},
+ {"label":"MO(1)", "x":12.5, "y":4, "w":1.25},
+ {"label":"Right Ctrl", "x":13.75, "y":4, "w":1.25}
]
}
}
diff --git a/keyboards/mtbkeys/mtb60/hotswap/keymaps/default/keymap.c b/keyboards/mtbkeys/mtb60/hotswap/keymaps/default/keymap.c
index 648c8201f5..58dcf77414 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/keymaps/default/keymap.c
+++ b/keyboards/mtbkeys/mtb60/hotswap/keymaps/default/keymap.c
@@ -22,14 +22,14 @@ enum layer_names {
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = LAYOUT(
+ [_BASE] = LAYOUT_60_ansi(
KC_ESC, 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_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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_FN), KC_RCTL
),
- [_FN] = LAYOUT(
+ [_FN] = LAYOUT_60_ansi(
KC_GRV, 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,
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, _______,
diff --git a/keyboards/mtbkeys/mtb60/hotswap/rules.mk b/keyboards/mtbkeys/mtb60/hotswap/rules.mk
index 02ae236709..0d092c2ef8 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/rules.mk
+++ b/keyboards/mtbkeys/mtb60/hotswap/rules.mk
@@ -12,10 +12,9 @@ MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = no # USB Nkey Rollover
+NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
+
+LAYOUTS = 60_ansi
diff --git a/keyboards/mtbkeys/mtb60/solder/info.json b/keyboards/mtbkeys/mtb60/solder/info.json
index e60d3eee2f..c2e49e8f77 100644
--- a/keyboards/mtbkeys/mtb60/solder/info.json
+++ b/keyboards/mtbkeys/mtb60/solder/info.json
@@ -2,73 +2,84 @@
"keyboard_name": "MTB60",
"url": "mtbkeys.com",
"maintainer": "MTBKeys",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_all"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label": "Esc" , "x": 0, "y": 0},
- {"label": "!" , "x": 1, "y": 0},
- {"label": "@" , "x": 2, "y": 0},
- {"label": "#" , "x": 3, "y": 0},
- {"label": "$" , "x": 4, "y": 0},
- {"label": "%" , "x": 5, "y": 0},
- {"label": "^" , "x": 6, "y": 0},
- {"label": "&" , "x": 7, "y": 0},
- {"label": "*" , "x": 8, "y": 0},
- {"label": "(" , "x": 9, "y": 0},
- {"label": ")" , "x": 10, "y": 0},
- {"label": "_" , "x": 11, "y": 0},
- {"label": "+" , "x": 12, "y": 0},
- {"label": "Back Space", "x": 13, "y": 0},
- {"label": "Delete" , "x": 14, "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": "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": "Left 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": "Right Shift", "x": 12.25, "y": 3, "w": 2.75},
- {"label": "Left Ctrl" , "x": 0 , "y": 4, "w": 1.25},
- {"label": "GUI" , "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Left Alt" , "x": 2.5 , "y": 4, "w": 1.25},
- {"label": "Space" , "x": 3.75, "y": 4, "w": 2.25},
- {"label": "Space" , "x": 6 , "y": 4, "w": 1.25},
- {"label": "Space" , "x": 7.25, "y": 4, "w": 2.75},
- {"label": "Right Ctrl", "x": 10 , "y": 4, "w": 1.25},
- {"label": "GUI" , "x": 11.25, "y": 4, "w": 1.25},
- {"label": "MO(1)" , "x": 12.5 , "y": 4, "w": 1.25},
- {"label": "Right Ctrl", "x": 13.75, "y": 4, "w": 1.25}
+ {"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":"Back Space", "x":13, "y":0},
+ {"label":"Delete", "x":14, "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":"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":"Left Shift", "x":0, "y":3},
+ {"label":"\\|", "x":1, "y":3},
+ {"label":"Z", "x":2, "y":3},
+ {"label":"X", "x":3, "y":3},
+ {"label":"C", "x":4, "y":3},
+ {"label":"V", "x":5, "y":3},
+ {"label":"B", "x":6, "y":3},
+ {"label":"N", "x":7, "y":3},
+ {"label":"M", "x":8, "y":3},
+ {"label":",<", "x":9, "y":3},
+ {"label":".>", "x":10, "y":3},
+ {"label":"/?", "x":11, "y":3},
+ {"label":"Right Shift", "x":12, "y":3},
+ {"label":"\u2191", "x":13, "y":3},
+ {"label":"End", "x":14, "y":3},
+
+ {"label":"Left Ctrl", "x":0, "y":4, "w":1.25},
+ {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+ {"label":"Left Alt", "x":2.5, "y":4, "w":1.25},
+ {"label":"Space", "x":3.75, "y":4, "w":2.25},
+ {"label":"Space", "x":6, "y":4, "w":1.25},
+ {"label":"Space", "x":7.25, "y":4, "w":2.75},
+ {"label":"Right Alt", "x":10, "y":4},
+ {"label":"GUI", "x":11, "y":4},
+ {"label":"\u2190", "x":12, "y":4},
+ {"label":"\u2193", "x":13, "y":4},
+ {"label":"\u2192", "x":14, "y":4}
]
}
}
diff --git a/keyboards/mtbkeys/mtb60/solder/keymaps/default/keymap.c b/keyboards/mtbkeys/mtb60/solder/keymaps/default/keymap.c
index 6ed34b6432..a6ce02443a 100644
--- a/keyboards/mtbkeys/mtb60/solder/keymaps/default/keymap.c
+++ b/keyboards/mtbkeys/mtb60/solder/keymaps/default/keymap.c
@@ -23,14 +23,14 @@ enum layer_names {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
- [_BASE] = LAYOUT(
+ [_BASE] = LAYOUT_all(
KC_ESC, 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_BSPC,
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_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_LSFT, 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_RSFT, KC_RSFT,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, MO(_FN), KC_RGUI, KC_RCTL
),
- [_FN] = LAYOUT(
+ [_FN] = LAYOUT_all(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, _______,
diff --git a/keyboards/mtbkeys/mtb60/solder/rules.mk b/keyboards/mtbkeys/mtb60/solder/rules.mk
index 33e1763375..1f52c37154 100644
--- a/keyboards/mtbkeys/mtb60/solder/rules.mk
+++ b/keyboards/mtbkeys/mtb60/solder/rules.mk
@@ -12,10 +12,7 @@ MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = no # USB Nkey Rollover
+NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/mtbkeys/mtb60/solder/solder.h b/keyboards/mtbkeys/mtb60/solder/solder.h
index 31756e7af7..6beed5154e 100644
--- a/keyboards/mtbkeys/mtb60/solder/solder.h
+++ b/keyboards/mtbkeys/mtb60/solder/solder.h
@@ -18,16 +18,32 @@
#include "quantum.h"
-#define LAYOUT( \
- k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, ka0, kb0, kc0, kd0, ke0, \
- k11, k21, k31, k41, k51, k61, k71, k81, k91, ka1, kb1, kc1, kd1, ke1, \
- k02, k22, k32, k42, k52, k62, k72, k82, k92, ka2, kb2, kc2, kd2, \
- k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, ka3, kb3, kc3, kd3, ke3, \
- k04, k14, k34, k44, k64, k84, ka4, kb4, kc4, kd4, ke4 \
+#define ___ KC_NO
+
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │
+ * ├───┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┬───┤
+ * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │3e │
+ * ├───┴┬──┴─┬─┴──┬┴───┴───┼───┴┬──┴───┴───┼───┼───┼───┼───┼───┤
+ * │40 │41 │42 │44 │46 │48 │4a │4b │4c │4d │4e │
+ * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
+ */
+
+#define LAYOUT_all( \
+ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+ k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
+ k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
+ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+ k40, k41, k43, k44, k46, k48, k4a, k4b, k4c, k4d, k4e \
) { \
- { k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, ka0, kb0, kc0, kd0, ke0 }, \
- { KC_NO, k11, k21, k31, k41, k51, k61, k71, k81, k91, ka1, kb1, kc1, kd1, ke1 }, \
- { k02, KC_NO, k22, k32, k42, k52, k62, k72, k82, k92, ka2, kb2, kc2, kd2, KC_NO }, \
- { k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, ka3, kb3, kc3, kd3, ke3 }, \
- { k04, k14, KC_NO, k34, k44, KC_NO, k64, KC_NO, k84, KC_NO, ka4, kb4, kc4, kd4, ke4 } \
+ { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
+ { ___, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
+ { k20, ___, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, ___ }, \
+ { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
+ { k40, k41, ___, k43, k44, ___, k46, ___, k48, ___, k4a, k4b, k4c, k4d, k4e } \
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-05 08:05:18 +0000