~ruther/qmk_firmware: Merge remote-tracking branch 'origin/master' into develop

5 files changed, 16 insertions(+), 19 deletions(-)

M keyboards/gorthage_truck/gorthage_truck.h
M keyboards/gorthage_truck/info.json
M keyboards/gorthage_truck/keymaps/10u/keymap.c
M keyboards/gorthage_truck/keymaps/7u/keymap.c
M keyboards/gorthage_truck/keymaps/default/keymap.c

M keyboards/gorthage_truck/gorthage_truck.h => keyboards/gorthage_truck/gorthage_truck.h +6 -6

@@ 27,7 27,7 @@
  * represents the switch matrix.
  */
 #define LAYOUT_3u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k40, k41, k42, k43, k44,      k46, k47, k48, \
+    k00, k01, k02, k03, k04, k05, k06, k07, k40, k41, k42, k43, k44, k45, k46, k47, k48, \
     k10, k11, k12, k13, k14, k15, k16, k17, k50, k51, k52, k53, k54,      k56, k57, k58, \
     k20, k21, k22, k23, k24, k25, k26, k27, k60, k61, k62, k63, k64, k65, k66, k67, k68, \
     k30, k31, k32,      k34,                k70, k71,      k73, k74, k75, k76, k77, k78  \


@@ 36,14 36,14 @@
     { k10, k11, k12, k13, k14, k15, k16, k17     }, \
     { k20, k21, k22, k23, k24, k25, k26, k27     }, \
     { k30, k31, k32, KC_NO, k34, KC_NO, KC_NO, KC_NO }, \
-    { k40, k41, k42, k43, k44, KC_NO, k46, k47, k48 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
     { k50, k51, k52, k53, k54, KC_NO, k56, k57, k58 }, \
     { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \
     { k70, k71, KC_NO, k73, k74, k75, k76, k77, k78} \
 }
 
 #define LAYOUT_7u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k40, k41, k42, k43, k44,      k46, k47, k48, \
+    k00, k01, k02, k03, k04, k05, k06, k07, k40, k41, k42, k43, k44, k45, k46, k47, k48, \
     k10, k11, k12, k13, k14, k15, k16, k17, k50, k51, k52, k53, k54,      k56, k57, k58, \
     k20, k21, k22, k23, k24, k25, k26, k27, k60, k61, k62, k63, k64, k65, k66, k67, k68, \
     k30, k31, k32,                     k37,                k73, k74, k75, k76, k77, k78  \


@@ 52,14 52,14 @@
     { k10, k11, k12, k13, k14, k15, k16, k17     }, \
     { k20, k21, k22, k23, k24, k25, k26, k27     }, \
     { k30, k31, k32, KC_NO, KC_NO, KC_NO, KC_NO, k37 }, \
-    { k40, k41, k42, k43, k44, KC_NO, k46, k47, k48 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
     { k50, k51, k52, k53, k54, KC_NO, k56, k57, k58 }, \
     { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \
     { KC_NO, KC_NO, KC_NO, k73, k74, k75, k76, k77, k78} \
 }
 
 #define LAYOUT_10u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k40, k41, k42, k43, k44,      k46, k47, k48, \
+    k00, k01, k02, k03, k04, k05, k06, k07, k40, k41, k42, k43, k44, k45, k46, k47, k48, \
     k10, k11, k12, k13, k14, k15, k16, k17, k50, k51, k52, k53, k54,      k56, k57, k58, \
     k20, k21, k22, k23, k24, k25, k26, k27, k60, k61, k62, k63, k64, k65, k66, k67, k68, \
     k30,                          k36,                     k73, k74, k75, k76, k77, k78  \


@@ 68,7 68,7 @@
     { k10, k11, k12, k13, k14, k15, k16, k17     }, \
     { k20, k21, k22, k23, k24, k25, k26, k27     }, \
     { k30, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k36, KC_NO }, \
-    { k40, k41, k42, k43, k44, KC_NO, k46, k47, k48 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
     { k50, k51, k52, k53, k54, KC_NO, k56, k57, k58 }, \
     { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \
     { KC_NO, KC_NO, KC_NO, k73, k74, k75, k76, k77, k78} \

M keyboards/gorthage_truck/info.json => keyboards/gorthage_truck/info.json +4 -4

@@ 7,10 7,10 @@
     "layouts": {
         "LAYOUT_3u": {
             "layout": [
-                {"label":"KC_TAB", "x":0, "y":0}, {"label":"KC_Q", "x":1, "y":0}, {"label":"KC_W", "x":2, "y":0}, {"label":"KC_E", "x":3, "y":0}, {"label":"KC_R", "x":4, "y":0}, {"label":"KC_T", "x":5, "y":0}, {"label":"KC_Y", "x":6, "y":0}, {"label":"KC_U", "x":7, "y":0}, {"label":"KC_I", "x":8, "y":0}, {"label":"KC_O", "x":9, "y":0}, {"label":"KC_P", "x":10, "y":0}, {"label":"KC_LBRC", "x":11, "y":0}, {"label":"KC_RBRC", "x":12, "y":0}, {"label":"KC_7", "x":15, "y":0}, {"label":"KC_8", "x":16, "y":0}, {"label":"KC_9", "x":17, "y":0},
+                {"label": "KC_TAB", "x":0, "y":0}, {"label":"KC_Q", "x":1, "y":0}, {"label":"KC_W", "x":2, "y":0}, {"label":"KC_E", "x":3, "y":0}, {"label":"KC_R", "x":4, "y":0}, {"label":"KC_T", "x":5, "y":0}, {"label":"KC_Y", "x":6, "y":0}, {"label":"KC_U", "x":7, "y":0}, {"label":"KC_I", "x":8, "y":0}, {"label":"KC_O", "x":9, "y":0}, {"label":"KC_P", "x":10, "y":0}, {"label":"KC_LBRC", "x":11, "y":0}, {"label":"KC_RBRC", "x":12, "y":0}, {"label":"KC_7", "x":15, "y":0}, {"label":"KC_8", "x":16, "y":0}, {"label":"KC_9", "x":17, "y":0},
                 {"label":"KC_CAPS", "x":0, "y":1}, {"label":"KC_A", "x":1, "y":1}, {"label":"KC_S", "x":2, "y":1}, {"label":"KC_D", "x":3, "y":1}, {"label":"KC_F", "x":4, "y":1}, {"label":"KC_G", "x":5, "y":1}, {"label":"KC_H", "x":6, "y":1}, {"label":"KC_J", "x":7, "y":1}, {"label":"KC_K", "x":8, "y":1}, {"label":"KC_L", "x":9, "y":1}, {"label":"KC_SCLN", "x":10, "y":1}, {"label":"KC_QUOT", "x":11, "y":1}, {"label":"KC_BSLS", "x":12, "y":1}, {"label":"KC_4", "x":15, "y":1}, {"label":"KC_5", "x":16, "y":1}, {"label":"KC_6", "x":17, "y":1},
                 {"label":"KC_MINS", "x":0, "y":2}, {"label":"KC_Z", "x":1, "y":2}, {"label":"KC_X", "x":2, "y":2}, {"label":"KC_C", "x":3, "y":2}, {"label":"KC_V", "x":4, "y":2}, {"label":"KC_B", "x":5, "y":2}, {"label":"KC_N", "x":6, "y":2}, {"label":"KC_M", "x":7, "y":2}, {"label":"KC_COMM", "x":8, "y":2}, {"label":"KC_DOT", "x":9, "y":2}, {"label":"KC_SLSH", "x":10, "y":2}, {"label":"KC_RSFT", "x":11, "y":2}, {"label":"KC_BSPC", "x":12, "y":2}, {"label":"KC_1", "x":15, "y":2}, {"label":"KC_2", "x":16, "y":2}, {"label":"KC_3", "x":17, "y":2},
-                {"label":"KC_UP", "x":13.5, "y":2.5}, {"label":"KC_0", "x":16, "y":3}, {"label":"KC_DOT", "x":17, "y":3}, {"label":"KC_LEFT", "x":12.5, "y":3.5}, {"label":"KC_DOWN", "x":13.5, "y":3.5}, {"label":"KC_RGHT", "x":14.5, "y":3.5},
+                {"label":"KC_UP", "x":13.5, "y":2.5}, {"label":"KC_0", "x":16, "y":3}, {"label":"KC_DOT", "x":17, "y":3}, {"label":"KC_LEFT", "x":12.5, "y":3.5}, {"label":"KC_DOWN", "x":13.5, "y":3.5}, {"label":"KC_RGHT", "x":14.5, "y":3.5}, {"label":"KC_MPLY", "x":13.5, "y":0.5},
                 {"label":"KC_LCTL", "x":0, "y":3, "w":1.25}, {"label":"KC_LALT", "x":1.25, "y":3, "w":1.25}, {"label":"KC_LGUI", "x":2.5, "y":3}, {"label":"KC_SPC", "x":3.5, "y":3, "w":3}, {"label":"KC_ENT", "x":6.5, "y":3, "w":3}, {"label":"KC_RGUI", "x":9.5, "y":3, "w":1.25}, {"label":"KC_RALT", "x":10.75, "y":3, "w":1.25}
             ]
 	    },


@@ 19,7 19,7 @@
                 {"label":"KC_TAB", "x":0, "y":0}, {"label":"KC_Q", "x":1, "y":0}, {"label":"KC_W", "x":2, "y":0}, {"label":"KC_E", "x":3, "y":0}, {"label":"KC_R", "x":4, "y":0}, {"label":"KC_T", "x":5, "y":0}, {"label":"KC_Y", "x":6, "y":0}, {"label":"KC_U", "x":7, "y":0}, {"label":"KC_I", "x":8, "y":0}, {"label":"KC_O", "x":9, "y":0}, {"label":"KC_P", "x":10, "y":0}, {"label":"KC_LBRC", "x":11, "y":0}, {"label":"KC_RBRC", "x":12, "y":0}, {"label":"KC_7", "x":15, "y":0}, {"label":"KC_8", "x":16, "y":0}, {"label":"KC_9", "x":17, "y":0},
                 {"label":"KC_CAPS", "x":0, "y":1}, {"label":"KC_A", "x":1, "y":1}, {"label":"KC_S", "x":2, "y":1}, {"label":"KC_D", "x":3, "y":1}, {"label":"KC_F", "x":4, "y":1}, {"label":"KC_G", "x":5, "y":1}, {"label":"KC_H", "x":6, "y":1}, {"label":"KC_J", "x":7, "y":1}, {"label":"KC_K", "x":8, "y":1}, {"label":"KC_L", "x":9, "y":1}, {"label":"KC_SCLN", "x":10, "y":1}, {"label":"KC_QUOT", "x":11, "y":1}, {"label":"KC_BSLS", "x":12, "y":1}, {"label":"KC_4", "x":15, "y":1}, {"label":"KC_5", "x":16, "y":1}, {"label":"KC_6", "x":17, "y":1},
                 {"label":"KC_MINS", "x":0, "y":2}, {"label":"KC_Z", "x":1, "y":2}, {"label":"KC_X", "x":2, "y":2}, {"label":"KC_C", "x":3, "y":2}, {"label":"KC_V", "x":4, "y":2}, {"label":"KC_B", "x":5, "y":2}, {"label":"KC_N", "x":6, "y":2}, {"label":"KC_M", "x":7, "y":2}, {"label":"KC_COMM", "x":8, "y":2}, {"label":"KC_DOT", "x":9, "y":2}, {"label":"KC_SLSH", "x":10, "y":2}, {"label":"KC_RSFT", "x":11, "y":2}, {"label":"KC_BSPC", "x":12, "y":2}, {"label":"KC_1", "x":15, "y":2}, {"label":"KC_2", "x":16, "y":2}, {"label":"KC_3", "x":17, "y":2},
-                {"label":"KC_UP", "x":13.5, "y":2.5}, {"label":"KC_0", "x":16, "y":3}, {"label":"KC_DOT", "x":17, "y":3}, {"label":"KC_LEFT", "x":12.5, "y":3.5}, {"label":"KC_DOWN", "x":13.5, "y":3.5}, {"label":"KC_RGHT", "x":14.5, "y":3.5},
+                {"label":"KC_UP", "x":13.5, "y":2.5}, {"label":"KC_0", "x":16, "y":3}, {"label":"KC_DOT", "x":17, "y":3}, {"label":"KC_LEFT", "x":12.5, "y":3.5}, {"label":"KC_DOWN", "x":13.5, "y":3.5}, {"label":"KC_RGHT", "x":14.5, "y":3.5}, {"label":"KC_MPLY", "x":13.5, "y":0.5},
                 {"label":"KC_LCTL", "x":0, "y":3, "w":1.25}, {"label":"KC_LALT", "x":1.25, "y":3, "w":1.25}, {"label":"KC_LGUI", "x":2.5, "y":3, "w":1.25}, {"label":"KC_SPC", "x":3.75, "y":3, "w":7}, {"label":"KC_RGUI", "x":10.75, "y":3, "w":1.25}
             ]
         },


@@ 28,7 28,7 @@
                 {"label":"KC_TAB", "x":0, "y":0}, {"label":"KC_Q", "x":1, "y":0}, {"label":"KC_W", "x":2, "y":0}, {"label":"KC_E", "x":3, "y":0}, {"label":"KC_R", "x":4, "y":0}, {"label":"KC_T", "x":5, "y":0}, {"label":"KC_Y", "x":6, "y":0}, {"label":"KC_U", "x":7, "y":0}, {"label":"KC_I", "x":8, "y":0}, {"label":"KC_O", "x":9, "y":0}, {"label":"KC_P", "x":10, "y":0}, {"label":"KC_LBRC", "x":11, "y":0}, {"label":"KC_RBRC", "x":12, "y":0}, {"label":"KC_7", "x":15, "y":0}, {"label":"KC_8", "x":16, "y":0}, {"label":"KC_9", "x":17, "y":0},
                 {"label":"KC_CAPS", "x":0, "y":1}, {"label":"KC_A", "x":1, "y":1}, {"label":"KC_S", "x":2, "y":1}, {"label":"KC_D", "x":3, "y":1}, {"label":"KC_F", "x":4, "y":1}, {"label":"KC_G", "x":5, "y":1}, {"label":"KC_H", "x":6, "y":1}, {"label":"KC_J", "x":7, "y":1}, {"label":"KC_K", "x":8, "y":1}, {"label":"KC_L", "x":9, "y":1}, {"label":"KC_SCLN", "x":10, "y":1}, {"label":"KC_QUOT", "x":11, "y":1}, {"label":"KC_BSLS", "x":12, "y":1}, {"label":"KC_4", "x":15, "y":1}, {"label":"KC_5", "x":16, "y":1}, {"label":"KC_6", "x":17, "y":1},
                 {"label":"KC_MINS", "x":0, "y":2}, {"label":"KC_Z", "x":1, "y":2}, {"label":"KC_X", "x":2, "y":2}, {"label":"KC_C", "x":3, "y":2}, {"label":"KC_V", "x":4, "y":2}, {"label":"KC_B", "x":5, "y":2}, {"label":"KC_N", "x":6, "y":2}, {"label":"KC_M", "x":7, "y":2}, {"label":"KC_COMM", "x":8, "y":2}, {"label":"KC_DOT", "x":9, "y":2}, {"label":"KC_SLSH", "x":10, "y":2}, {"label":"KC_RSFT", "x":11, "y":2}, {"label":"KC_BSPC", "x":12, "y":2}, {"label":"KC_1", "x":15, "y":2}, {"label":"KC_2", "x":16, "y":2}, {"label":"KC_3", "x":17, "y":2},
-                {"label":"KC_UP", "x":13.5, "y":2.5}, {"label":"KC_0", "x":16, "y":3}, {"label":"KC_DOT", "x":17, "y":3}, {"label":"KC_LEFT", "x":12.5, "y":3.5}, {"label":"KC_DOWN", "x":13.5, "y":3.5}, {"label":"KC_RGHT", "x":14.5, "y":3.5},
+                {"label":"KC_UP", "x":13.5, "y":2.5}, {"label":"KC_0", "x":16, "y":3}, {"label":"KC_DOT", "x":17, "y":3}, {"label":"KC_LEFT", "x":12.5, "y":3.5}, {"label":"KC_DOWN", "x":13.5, "y":3.5}, {"label":"KC_RGHT", "x":14.5, "y":3.5}, {"label":"KC_MPLY", "x":13.5, "y":0.5},
                 {"label":"KC_LCTL", "x":0, "y":3}, {"label":"KC_SPC", "x":1, "y":3, "w":10}, {"label":"KC_RGUI", "x":11, "y":3}
             ]
         }

M keyboards/gorthage_truck/keymaps/10u/keymap.c => keyboards/gorthage_truck/keymaps/10u/keymap.c +2 -3

@@ 17,14 17,13 @@
 
 // Defines names for use in layer keycodes and the keymap
 enum layer_names {
-    _BASE,
-    _FN
+    _BASE
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_10u(
-KC_TAB, 	KC_Q, 		KC_W, 		KC_E, KC_R, KC_T, KC_Y, 	KC_U, 		KC_I, 		KC_O, KC_P, KC_BSPC, KC_MINUS,                KC_1, KC_2, KC_3,
+KC_TAB, 	KC_Q, 		KC_W, 		KC_E, KC_R, KC_T, KC_Y, 	KC_U, 		KC_I, 		KC_O, KC_P, KC_BSPC, KC_MINUS,     KC_MPLY,  KC_1, KC_2, KC_3,
 KC_LCTL, 	KC_A, 		KC_S, 		KC_D, KC_F, KC_G, KC_H, 	KC_J, 		KC_K, 		KC_L, KC_SCLN, KC_QUOT, KC_EQUAL,            KC_4, KC_5, KC_6,
 KC_LCAP, 	KC_Z, 		KC_X, 		KC_C, KC_V, KC_B, KC_N, 	KC_M, 		KC_COMM, 	KC_DOT, KC_ENT, KC_SLSH, KC_GRAVE, KC_UP,  KC_7, KC_8, KC_9,
 KC_LGUI, 										 	KC_RSFT, 		        KC_RGUI, KC_LEFT,  KC_DOWN, KC_RIGHT, KC_DOT, KC_0

M keyboards/gorthage_truck/keymaps/7u/keymap.c => keyboards/gorthage_truck/keymaps/7u/keymap.c +2 -3

@@ 17,14 17,13 @@
 
 // Defines names for use in layer keycodes and the keymap
 enum layer_names {
-    _BASE,
-    _FN
+    _BASE
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_7u(
-KC_TAB, 	KC_Q, 		KC_W, 		KC_E, KC_R, KC_T, KC_Y, 	KC_U, 		KC_I, 		KC_O, KC_P, KC_BSPC, KC_MINUS,                KC_1, KC_2, KC_3,
+KC_TAB, 	KC_Q, 		KC_W, 		KC_E, KC_R, KC_T, KC_Y, 	KC_U, 		KC_I, 		KC_O, KC_P, KC_BSPC, KC_MINUS,     KC_MPLY,  KC_1, KC_2, KC_3,
 KC_LCTL, 	KC_A, 		KC_S, 		KC_D, KC_F, KC_G, KC_H, 	KC_J, 		KC_K, 		KC_L, KC_SCLN, KC_QUOT, KC_EQUAL,            KC_4, KC_5, KC_6,
 KC_LCAP, 	KC_Z, 		KC_X, 		KC_C, KC_V, KC_B, KC_N, 	KC_M, 		KC_COMM, 	KC_DOT, KC_ENT, KC_SLSH, KC_GRAVE, KC_UP,  KC_7, KC_8, KC_9,
 KC_LGUI, 	KC_LCTL, 	KC_LSFT,	      							    	KC_RCTL,        KC_RGUI, KC_LEFT,  KC_DOWN, KC_RIGHT, KC_DOT, KC_0

M keyboards/gorthage_truck/keymaps/default/keymap.c => keyboards/gorthage_truck/keymaps/default/keymap.c +2 -3

@@ 17,14 17,13 @@
 
 // Defines names for use in layer keycodes and the keymap
 enum layer_names {
-    _BASE,
-    _FN
+    _BASE
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_3u(
-KC_TAB, 	KC_Q, 		KC_W, 		KC_E, KC_R, KC_T, KC_Y, 	KC_U, 		KC_I, 		KC_O, KC_P, KC_BSPC, KC_MINUS,                KC_1, KC_2, KC_3,
+KC_TAB, 	KC_Q, 		KC_W, 		KC_E, KC_R, KC_T, KC_Y, 	KC_U, 		KC_I, 		KC_O, KC_P, KC_BSPC, KC_MINUS,     KC_MPLY,  KC_1, KC_2, KC_3,
 KC_SLCK, 	KC_A, 		KC_S, 		KC_D, KC_F, KC_G, KC_H, 	KC_J, 		KC_K, 		KC_L, KC_SCLN, KC_QUOT, KC_EQUAL,            KC_4, KC_5, KC_6,
 KC_NLCK, 	KC_Z, 		KC_X, 		KC_C, KC_V, KC_B, KC_N, 	KC_M, 		KC_COMM, 	KC_DOT, KC_ENT, KC_SLSH, KC_GRAVE, KC_UP,  KC_7, KC_8, KC_9,
 KC_CLCK, 	KC_LCTL, 	KC_LSFT,	      KC_SPC,     			 	KC_RSFT, 	KC_RCTL,        KC_RGUI, KC_LEFT,  KC_DOWN, KC_RIGHT, KC_DOT, KC_0