FJLabs Midway60: physically arrange layout macro and fix info.json data (#13386)

author: James Young <18669334+noroadsleft@users.noreply.github.com> 2021-07-01 01:23:33 -0700
committer: GitHub <noreply@github.com> 2021-07-01 01:23:33 -0700
commit: a001df5e807ee17f084ac363d9c57734fc613140 (patch)
tree: 3f9efa6b175033b2fdc162aa2ebd25a5026aeeea
parent: 1e809e28b7e7ade54b444254bb716f3f0e20b80b (diff)
download: qmk_firmware-a001df5e807ee17f084ac363d9c57734fc613140.tar.gz
qmk_firmware-a001df5e807ee17f084ac363d9c57734fc613140.zip
4 files changed, 93 insertions, 94 deletions
diff --git a/keyboards/fjlabs/midway60/info.json b/keyboards/fjlabs/midway60/info.json
index c398eab1e..04e12e398 100644
--- a/keyboards/fjlabs/midway60/info.json
+++ b/keyboards/fjlabs/midway60/info.json
@@ -5,77 +5,76 @@
    "width": 15,
    "height": 5,
    "layouts": {
-        "LAYOUT_60": {
+        "LAYOUT_all": {
            "layout": [
-                {"x": 0, "y": 0},
+                {"x":0, "y":0},
-                {"x": 1, "y": 0},
+                {"x":1, "y":0},
-                {"x": 2, "y": 0},
+                {"x":2, "y":0},
-                {"x": 3, "y": 0},
+                {"x":3, "y":0},
-                {"x": 4, "y": 0},
+                {"x":4, "y":0},
-                {"x": 5, "y": 0},
+                {"x":5, "y":0},
-                {"x": 6, "y": 0},
+                {"x":6, "y":0},
-                {"x": 7, "y": 0},
+                {"x":7, "y":0},
-                {"x": 8, "y": 0},
+                {"x":8, "y":0},
-                {"x": 9, "y": 0},
+                {"x":9, "y":0},
-                {"x": 10, "y": 0},
+                {"x":10, "y":0},
-                {"x": 11, "y": 0},
+                {"x":11, "y":0},
-                {"x": 12, "y": 0},
+                {"x":12, "y":0},
-                {"x": 13, "y": 0},
+                {"x":13, "y":0},
-                {"x": 14, "y": 0},
+                {"x":14, "y":0},
-                {"x": 0, "y": 1, "w": 1.5},
+                {"x":0, "y":1, "w":1.5},
-                {"x": 1.5, "y": 1},
+                {"x":1.5, "y":1},
-                {"x": 2.5, "y": 1},
+                {"x":2.5, "y":1},
-                {"x": 3.5, "y": 1},
+                {"x":3.5, "y":1},
-                {"x": 4.5, "y": 1},
+                {"x":4.5, "y":1},
-                {"x": 5.5, "y": 1},
+                {"x":5.5, "y":1},
-                {"x": 6.5, "y": 1},
+                {"x":6.5, "y":1},
-                {"x": 7.5, "y": 1},
+                {"x":7.5, "y":1},
-                {"x": 8.5, "y": 1},
+                {"x":8.5, "y":1},
-                {"x": 9.5, "y": 1},
+                {"x":9.5, "y":1},
-                {"x": 10.5, "y": 1},
+                {"x":10.5, "y":1},
-                {"x": 11.5, "y": 1},
+                {"x":11.5, "y":1},
-                {"x": 12.5, "y": 1},
+                {"x":12.5, "y":1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"x":13.5, "y":1, "w":1.5},
-                {"x": 0, "y": 2, "w": 1.75},
+                {"x":0, "y":2, "w":1.75},
-                {"x": 1.75, "y": 2},
+                {"x":1.75, "y":2},
-                {"x": 2.75, "y": 2},
+                {"x":2.75, "y":2},
-                {"x": 3.75, "y": 2},
+                {"x":3.75, "y":2},
-                {"x": 4.75, "y": 2},
+                {"x":4.75, "y":2},
-                {"x": 5.75, "y": 2},
+                {"x":5.75, "y":2},
-                {"x": 6.75, "y": 2},
+                {"x":6.75, "y":2},
-                {"x": 7.75, "y": 2},
+                {"x":7.75, "y":2},
-                {"x": 8.75, "y": 2},
+                {"x":8.75, "y":2},
-                {"x": 9.75, "y": 2},
+                {"x":9.75, "y":2},
-                {"x": 10.75, "y": 2},
+                {"x":10.75, "y":2},
-                {"x": 11.75, "y": 2},
+                {"x":11.75, "y":2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"x":12.75, "y":2, "w":2.25},
-                {"x": 0, "y": 3, "w": 1.25},
+                {"x":0, "y":3, "w":1.25},
-                {"x": 1.25, "y": 3},
+                {"x":1.25, "y":3},
-                {"x": 2.25, "y": 3},
+                {"x":2.25, "y":3},
-                {"x": 3.25, "y": 3},
+                {"x":3.25, "y":3},
-                {"x": 4.25, "y": 3},
+                {"x":4.25, "y":3},
-                {"x": 5.25, "y": 3},
+                {"x":5.25, "y":3},
-                {"x": 6.25, "y": 3},
+                {"x":6.25, "y":3},
-                {"x": 7.25, "y": 3},
+                {"x":7.25, "y":3},
-                {"x": 8.25, "y": 3},
+                {"x":8.25, "y":3},
-                {"x": 9.25, "y": 3},
+                {"x":9.25, "y":3},
-                {"x": 10.25, "y": 3},
+                {"x":10.25, "y":3},
-                {"x": 11.25, "y": 3},
+                {"x":11.25, "y":3},
-                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x":12.25, "y":3, "w":1.75},
-                {"x": 14, "y": 3},
+                {"x":14, "y":3},
-                {"x": 0, "y": 4, "w": 1.25},
+                {"x":0, "y":4, "w":1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x":1.25, "y":4, "w":1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x":2.5, "y":4, "w":1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x":3.75, "y":4, "w":6.25},
-                {"x": 10, "y": 4},
+                {"x":10, "y":4, "w":1.25},
-                {"x": 11, "y": 4},
+                {"x":11.25, "y":4, "w":1.25},
-                {"x": 12, "y": 4},
+                {"x":12.5, "y":4, "w":1.25},
-                {"x": 13, "y": 4},
+                {"x":13.75, "y":4, "w":1.25}
-                {"x": 14, "y": 4}
            ]
        }
    }
diff --git a/keyboards/fjlabs/midway60/keymaps/default/keymap.c b/keyboards/fjlabs/midway60/keymaps/default/keymap.c
index 3ef29c17b..47545e925 100644
--- a/keyboards/fjlabs/midway60/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/midway60/keymaps/default/keymap.c
@@ -22,18 +22,18 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [_LAYER0] = LAYOUT_all(
-        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_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_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_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_DEL,
+        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_UP, 
+        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_UP,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RWIN, KC_RCTL 
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RWIN, KC_RCTL
    ),
    [_LAYER1] = LAYOUT_all(
-        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_DEL,
+        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_DEL,  KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, RESET,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
        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_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
    )
 };
diff --git a/keyboards/fjlabs/midway60/keymaps/via/keymap.c b/keyboards/fjlabs/midway60/keymaps/via/keymap.c
index 38eef4927..cd83e23a5 100644
--- a/keyboards/fjlabs/midway60/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/midway60/keymaps/via/keymap.c
@@ -24,35 +24,35 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [_LAYER0] = LAYOUT_all(
-        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_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_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_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_DEL,
+        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_UP, 
+        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_UP,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RWIN, KC_RCTL 
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RWIN, KC_RCTL
    ),
    [_LAYER1] = LAYOUT_all(
-        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_DEL,
+        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_DEL,  KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, RESET,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
        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_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
    ),
    [_LAYER2] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    )
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
 };
diff --git a/keyboards/fjlabs/midway60/midway60.h b/keyboards/fjlabs/midway60/midway60.h
index 2311f983e..cbe9bf396 100644
--- a/keyboards/fjlabs/midway60/midway60.h
+++ b/keyboards/fjlabs/midway60/midway60.h
@@ -18,11 +18,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Midway60 Keymap Definitions */
 #define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,  \
+    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, K3C, K3D, \
-    K40, K41, K42,                K46,           K49, K4A,      K4C, K4D \
+    K40, K41, K42,                K46,                K49, K4A, K4C, K4D  \
 ) { \
    { K00, K01, K02, K03,   K04,     K05,   K06,   K07,   K08,   K09, K0A, K0B,   K0C, K0D }, \
    { K10, K11, K12, K13,   K14,     K15,   K16,   K17,   K18,   K19, K1A, K1B,   K1C, K1D }, \
author	James Young <18669334+noroadsleft@users.noreply.github.com>	2021-07-01 01:23:33 -0700
committer	GitHub <noreply@github.com>	2021-07-01 01:23:33 -0700
commit	a001df5e807ee17f084ac363d9c57734fc613140 (patch)
tree	3f9efa6b175033b2fdc162aa2ebd25a5026aeeea
parent	1e809e28b7e7ade54b444254bb716f3f0e20b80b (diff)
download	qmk_firmware-a001df5e807ee17f084ac363d9c57734fc613140.tar.gz qmk_firmware-a001df5e807ee17f084ac363d9c57734fc613140.zip

diff --git a/keyboards/fjlabs/midway60/info.json b/keyboards/fjlabs/midway60/info.json index c398eab1e..04e12e398 100644 --- a/keyboards/fjlabs/midway60/info.json +++ b/keyboards/fjlabs/midway60/info.json
@@ -5,77 +5,76 @@
5	"width": 15,	5	"width": 15,
6	"height": 5,	6	"height": 5,
7	"layouts": {	7	"layouts": {
8	"LAYOUT_60": {	8	"LAYOUT_all": {
9	"layout": [	9	"layout": [
10	{"x": 0, "y": 0},	10	{"x":0, "y":0},
11	{"x": 1, "y": 0},	11	{"x":1, "y":0},
12	{"x": 2, "y": 0},	12	{"x":2, "y":0},
13	{"x": 3, "y": 0},	13	{"x":3, "y":0},
14	{"x": 4, "y": 0},	14	{"x":4, "y":0},
15	{"x": 5, "y": 0},	15	{"x":5, "y":0},
16	{"x": 6, "y": 0},	16	{"x":6, "y":0},
17	{"x": 7, "y": 0},	17	{"x":7, "y":0},
18	{"x": 8, "y": 0},	18	{"x":8, "y":0},
19	{"x": 9, "y": 0},	19	{"x":9, "y":0},
20	{"x": 10, "y": 0},	20	{"x":10, "y":0},
21	{"x": 11, "y": 0},	21	{"x":11, "y":0},
22	{"x": 12, "y": 0},	22	{"x":12, "y":0},
23	{"x": 13, "y": 0},	23	{"x":13, "y":0},
24	{"x": 14, "y": 0},	24	{"x":14, "y":0},
25		25
26	{"x": 0, "y": 1, "w": 1.5},	26	{"x":0, "y":1, "w":1.5},
27	{"x": 1.5, "y": 1},	27	{"x":1.5, "y":1},
28	{"x": 2.5, "y": 1},	28	{"x":2.5, "y":1},
29	{"x": 3.5, "y": 1},	29	{"x":3.5, "y":1},
30	{"x": 4.5, "y": 1},	30	{"x":4.5, "y":1},
31	{"x": 5.5, "y": 1},	31	{"x":5.5, "y":1},
32	{"x": 6.5, "y": 1},	32	{"x":6.5, "y":1},
33	{"x": 7.5, "y": 1},	33	{"x":7.5, "y":1},
34	{"x": 8.5, "y": 1},	34	{"x":8.5, "y":1},
35	{"x": 9.5, "y": 1},	35	{"x":9.5, "y":1},
36	{"x": 10.5, "y": 1},	36	{"x":10.5, "y":1},
37	{"x": 11.5, "y": 1},	37	{"x":11.5, "y":1},
38	{"x": 12.5, "y": 1},	38	{"x":12.5, "y":1},
39	{"x": 13.5, "y": 1, "w": 1.5},	39	{"x":13.5, "y":1, "w":1.5},
40		40
41	{"x": 0, "y": 2, "w": 1.75},	41	{"x":0, "y":2, "w":1.75},
42	{"x": 1.75, "y": 2},	42	{"x":1.75, "y":2},
43	{"x": 2.75, "y": 2},	43	{"x":2.75, "y":2},
44	{"x": 3.75, "y": 2},	44	{"x":3.75, "y":2},
45	{"x": 4.75, "y": 2},	45	{"x":4.75, "y":2},
46	{"x": 5.75, "y": 2},	46	{"x":5.75, "y":2},
47	{"x": 6.75, "y": 2},	47	{"x":6.75, "y":2},
48	{"x": 7.75, "y": 2},	48	{"x":7.75, "y":2},
49	{"x": 8.75, "y": 2},	49	{"x":8.75, "y":2},
50	{"x": 9.75, "y": 2},	50	{"x":9.75, "y":2},
51	{"x": 10.75, "y": 2},	51	{"x":10.75, "y":2},
52	{"x": 11.75, "y": 2},	52	{"x":11.75, "y":2},
53	{"x": 12.75, "y": 2, "w": 2.25},	53	{"x":12.75, "y":2, "w":2.25},
54		54
55	{"x": 0, "y": 3, "w": 1.25},	55	{"x":0, "y":3, "w":1.25},
56	{"x": 1.25, "y": 3},	56	{"x":1.25, "y":3},
57	{"x": 2.25, "y": 3},	57	{"x":2.25, "y":3},
58	{"x": 3.25, "y": 3},	58	{"x":3.25, "y":3},
59	{"x": 4.25, "y": 3},	59	{"x":4.25, "y":3},
60	{"x": 5.25, "y": 3},	60	{"x":5.25, "y":3},
61	{"x": 6.25, "y": 3},	61	{"x":6.25, "y":3},
62	{"x": 7.25, "y": 3},	62	{"x":7.25, "y":3},
63	{"x": 8.25, "y": 3},	63	{"x":8.25, "y":3},
64	{"x": 9.25, "y": 3},	64	{"x":9.25, "y":3},
65	{"x": 10.25, "y": 3},	65	{"x":10.25, "y":3},
66	{"x": 11.25, "y": 3},	66	{"x":11.25, "y":3},
67	{"x": 12.25, "y": 3, "w": 1.75},	67	{"x":12.25, "y":3, "w":1.75},
68	{"x": 14, "y": 3},	68	{"x":14, "y":3},
69		69
70	{"x": 0, "y": 4, "w": 1.25},	70	{"x":0, "y":4, "w":1.25},
71	{"x": 1.25, "y": 4, "w": 1.25},	71	{"x":1.25, "y":4, "w":1.25},
72	{"x": 2.5, "y": 4, "w": 1.25},	72	{"x":2.5, "y":4, "w":1.25},
73	{"x": 3.75, "y": 4, "w": 6.25},	73	{"x":3.75, "y":4, "w":6.25},
74	{"x": 10, "y": 4},	74	{"x":10, "y":4, "w":1.25},
75	{"x": 11, "y": 4},	75	{"x":11.25, "y":4, "w":1.25},
76	{"x": 12, "y": 4},	76	{"x":12.5, "y":4, "w":1.25},
77	{"x": 13, "y": 4},	77	{"x":13.75, "y":4, "w":1.25}
78	{"x": 14, "y": 4}
79	]	78	]
80	}	79	}
81	}	80	}


diff --git a/keyboards/fjlabs/midway60/keymaps/default/keymap.c b/keyboards/fjlabs/midway60/keymaps/default/keymap.c index 3ef29c17b..47545e925 100644 --- a/keyboards/fjlabs/midway60/keymaps/default/keymap.c +++ b/keyboards/fjlabs/midway60/keymaps/default/keymap.c
@@ -22,18 +22,18 @@ enum layers {
22	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	22	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
23		23
24	[_LAYER0] = LAYOUT_all(	24	[_LAYER0] = LAYOUT_all(
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,	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,
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,	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,
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_DEL,	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,
28	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_UP,	28	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_UP,
29	KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RWIN, KC_RCTL	29	KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RWIN, KC_RCTL
30	),	30	),
31		31
32	[_LAYER1] = LAYOUT_all(	32	[_LAYER1] = LAYOUT_all(
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_DEL,	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_DEL, KC_TRNS,
34	KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, RESET,	34	KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
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_TRNS,	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,
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_TRNS, KC_TRNS,	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_TRNS, KC_TRNS,
37	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS	37	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
38	)	38	)
39	};	39	};


diff --git a/keyboards/fjlabs/midway60/keymaps/via/keymap.c b/keyboards/fjlabs/midway60/keymaps/via/keymap.c index 38eef4927..cd83e23a5 100644 --- a/keyboards/fjlabs/midway60/keymaps/via/keymap.c +++ b/keyboards/fjlabs/midway60/keymaps/via/keymap.c
@@ -24,35 +24,35 @@ enum layers {
24	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	24	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
25		25
26	[_LAYER0] = LAYOUT_all(	26	[_LAYER0] = LAYOUT_all(
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,	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,
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,	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,
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,	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,
30	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_UP,	30	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_UP,
31	KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RWIN, KC_RCTL	31	KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RWIN, KC_RCTL
32	),	32	),
33		33
34	[_LAYER1] = LAYOUT_all(	34	[_LAYER1] = LAYOUT_all(
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_DEL,	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_DEL, KC_TRNS,
36	KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, RESET,	36	KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
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,	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,
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_TRNS, KC_TRNS,	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_TRNS, KC_TRNS,
39	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS	39	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
40	),	40	),
41		41
42	[_LAYER2] = LAYOUT_all(	42	[_LAYER2] = LAYOUT_all(
		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,
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,	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,
		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,
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, 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
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,
47	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
48	),	48	),
49		49
50	[_LAYER3] = LAYOUT_all(	50	[_LAYER3] = LAYOUT_all(
		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,
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,	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,
		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,
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,	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,
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,	55	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,	56	)
55	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
56	),
57		57
58	};	58	};


diff --git a/keyboards/fjlabs/midway60/midway60.h b/keyboards/fjlabs/midway60/midway60.h index 2311f983e..cbe9bf396 100644 --- a/keyboards/fjlabs/midway60/midway60.h +++ b/keyboards/fjlabs/midway60/midway60.h
@@ -18,11 +18,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
18		18
19	/* Midway60 Keymap Definitions */	19	/* Midway60 Keymap Definitions */
20	#define LAYOUT_all( \	20	#define LAYOUT_all( \
21	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \	21	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
22	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \	22	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
23	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \	23	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
24	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \	24	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
25	K40, K41, K42, K46, K49, K4A, K4C, K4D \	25	K40, K41, K42, K46, K49, K4A, K4C, K4D \
26	) { \	26	) { \
27	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \	27	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
28	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \	28	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \