Merge remote-tracking branch 'origin/master' into develop

2 files changed, 55 insertions, 55 deletions

diff --git a/keyboards/handwired/pill60/info.json b/keyboards/handwired/pill60/info.json
index bb44c9eb94..e7690568e0 100644
--- a/keyboards/handwired/pill60/info.json
+++ b/keyboards/handwired/pill60/info.json
@@ -5,68 +5,68 @@
     "width": 15,
     "height": 5,
     "layouts": {
-        "layout_default": {
+        "LAYOUT_default": {
             "layout": [
-                {"label": "Encoder", "x": 0, "y": 0},
+                {"label": "Enc", "x": 0, "y": 0, "w": 1},
 
-                {"label": "Esc", "x": 0, "y": 1},
-                {"label": "1","x": 1, "y": 1},
-                {"label": "2","x": 2, "y": 1},
-                {"label": "3","x": 3, "y": 1},
-                {"label": "4","x": 4, "y": 1},
-                {"label": "5","x": 5, "y": 1},
-                {"label": "6","x": 6, "y": 1},
-                {"label": "7","x": 7, "y": 1},
-                {"label": "8","x": 8, "y": 1},
-                {"label": "9","x": 9, "y": 1},
-                {"label": "0","x": 10, "y": 1},
-                {"label": "-","x": 11, "y": 1},
-                {"label": "=","x": 12, "y": 1},
-                {"label": "Backspace","x": 13, "y": 1},
-                {"label": "Delete","x": 14, "y": 1},
+                {"label": "Esc", "x": 0, "y": 1, "w": 1},
+                {"label": "1","x": 1, "y": 1, "w": 1},
+                {"label": "2","x": 2, "y": 1, "w": 1},
+                {"label": "3","x": 3, "y": 1, "w": 1},
+                {"label": "4","x": 4, "y": 1, "w": 1},
+                {"label": "5","x": 5, "y": 1, "w": 1},
+                {"label": "6","x": 6, "y": 1, "w": 1},
+                {"label": "7","x": 7, "y": 1, "w": 1},
+                {"label": "8","x": 8, "y": 1, "w": 1},
+                {"label": "9","x": 9, "y": 1, "w": 1},
+                {"label": "0","x": 10, "y": 1, "w": 1},
+                {"label": "-","x": 11, "y": 1, "w": 1},
+                {"label": "=","x": 12, "y": 1, "w": 1},
+                {"label": "\\","x": 13, "y": 1, "w": 1},
+                {"label": "Del","x": 14, "y": 1, "w": 1},
 
                 {"label": "Tab","x": 0, "y": 2, "w": 1.5},
-                {"label": "Q","x": 1.5, "y": 2},
-                {"label": "W","x": 2.5, "y": 2},
-                {"label": "E","x": 3.5, "y": 2},
-                {"label": "R","x": 4.5, "y": 2},
-                {"label": "T","x": 5.5, "y": 2},
-                {"label": "Y","x": 6.5, "y": 2},
-                {"label": "U","x": 7.5, "y": 2},
-                {"label": "I","x": 8.5, "y": 2},
-                {"label": "O","x": 9.5, "y": 2},
-                {"label": "P","x": 10.5, "y": 2},
-                {"label": "[","x": 11.5, "y": 2},
-                {"label": "]","x": 12.5, "y": 2},
-                {"label": "\\","x": 13.5, "y": 2, "w": 1.5},
+                {"label": "Q","x": 1.5, "y": 2, "w": 1},
+                {"label": "W","x": 2.5, "y": 2, "w": 1},
+                {"label": "E","x": 3.5, "y": 2, "w": 1},
+                {"label": "R","x": 4.5, "y": 2, "w": 1},
+                {"label": "T","x": 5.5, "y": 2, "w": 1},
+                {"label": "Y","x": 6.5, "y": 2, "w": 1},
+                {"label": "U","x": 7.5, "y": 2, "w": 1},
+                {"label": "I","x": 8.5, "y": 2, "w": 1},
+                {"label": "O","x": 9.5, "y": 2, "w": 1},
+                {"label": "P","x": 10.5, "y": 2, "w": 1},
+                {"label": "[","x": 11.5, "y": 2, "w": 1},
+                {"label": "]","x": 12.5, "y": 2, "w": 1},
+                {"label": "Backspace","x": 13.5, "y": 2, "w": 1.5},
 
                 {"label": "Caps","x": 0, "y": 3, "w": 1.75},
-                {"label": "A","x": 1.75, "y": 3},
-                {"label": "S","x": 2.75, "y": 3},
-                {"label": "D","x": 3.75, "y": 3},
-                {"label": "F","x": 4.75, "y": 3},
-                {"label": "G","x": 5.75, "y": 3},
-                {"label": "H","x": 6.75, "y": 3},
-                {"label": "J","x": 7.75, "y": 3},
-                {"label": "K","x": 8.75, "y": 3},
-                {"label": "L","x": 9.75, "y": 3},
-                {"label": ";","x": 10.75, "y": 3},
-                {"label": "'","x": 11.75, "y": 3},
+                {"label": "A","x": 1.75, "y": 3, "w": 1},
+                {"label": "S","x": 2.75, "y": 3, "w": 1},
+                {"label": "D","x": 3.75, "y": 3, "w": 1},
+                {"label": "F","x": 4.75, "y": 3, "w": 1},
+                {"label": "G","x": 5.75, "y": 3, "w": 1},
+                {"label": "H","x": 6.75, "y": 3, "w": 1},
+                {"label": "J","x": 7.75, "y": 3, "w": 1},
+                {"label": "K","x": 8.75, "y": 3, "w": 1},
+                {"label": "L","x": 9.75, "y": 3, "w": 1},
+                {"label": ";","x": 10.75, "y": 3, "w": 1},
+                {"label": "'","x": 11.75, "y": 3, "w": 1},
                 {"label": "Enter","x": 12.75, "y": 3, "w": 2.25},
 
                 {"label": "L Shift","x": 0, "y": 4, "w": 2.25},
-                {"label": "Z","x": 2.25, "y": 4},
-                {"label": "X","x": 3.25, "y": 4},
-                {"label": "C","x": 4.25, "y": 4},
-                {"label": "V","x": 5.25, "y": 4},
-                {"label": "B","x": 6.25, "y": 4},
-                {"label": "N","x": 7.25, "y": 4},
-                {"label": "M","x": 8.25, "y": 4},
-                {"label": ",","x": 9.25, "y": 4},
-                {"label": ".","x": 10.25, "y": 4},
-                {"label": "/","x": 11.25, "y": 4},
+                {"label": "Z","x": 2.25, "y": 4, "w": 1},
+                {"label": "X","x": 3.25, "y": 4, "w": 1},
+                {"label": "C","x": 4.25, "y": 4, "w": 1},
+                {"label": "V","x": 5.25, "y": 4, "w": 1},
+                {"label": "B","x": 6.25, "y": 4, "w": 1},
+                {"label": "N","x": 7.25, "y": 4, "w": 1},
+                {"label": "M","x": 8.25, "y": 4, "w": 1},
+                {"label": ",","x": 9.25, "y": 4, "w": 1},
+                {"label": ".","x": 10.25, "y": 4, "w": 1},
+                {"label": "/","x": 11.25, "y": 4, "w": 1},
                 {"label": "R Shift","x": 12.25, "y": 4, "w": 1.75},
-                {"label": "FN","x": 14, "y": 4},
+                {"label": "FN","x": 14, "y": 4, "w": 1},
 
                 {"label": "L CTRL","x": 0, "y": 5, "w": 1.25},
                 {"label": "L GUI","x": 1.25, "y": 5, "w": 1.25},
@@ -74,7 +74,7 @@
                 {"label": "Space","x": 3.75, "y": 5, "w": 6.25},
                 {"label": "R ALT","x": 10, "y": 5, "w": 1.25},
                 {"label": "R GUI","x": 11.25, "y": 5, "w": 1.25},
-                {"label": "R MENU","x": 12.5, "y": 5, "w": 1.25},
+                {"label": "FN","x": 12.5, "y": 5, "w": 1.25},
                 {"label": "R CTRL","x": 13.75, "y": 5, "w": 1.25}
             ]
         }
diff --git a/keyboards/handwired/pill60/keymaps/default/keymap.c b/keyboards/handwired/pill60/keymaps/default/keymap.c
index 6edcb0c2c8..d9f0fa727c 100644
--- a/keyboards/handwired/pill60/keymaps/default/keymap.c
+++ b/keyboards/handwired/pill60/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_BSLS, 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_BSPC,
         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_ENT,
-        KC_RSFT,   KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_LSFT, MO(_FL),
+        KC_LSFT,   KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT, MO(_FL),
         MO(_FL),  KC_LGUI,  KC_LALT,               KC_SPC,                KC_RALT, KC_RGUI, MO(_FL), KC_RCTL
     ),
     [_FL] = LAYOUT(
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #ifdef OLED_DRIVER_ENABLE
 
 static void render_oled(void) {
-    oled_write_P(PSTR("Ikta's Pill60"), false);
+    oled_write_P(PSTR("Pill60"), false);
     oled_write_P(PSTR("\n\n"), false);
     led_t led_usb_state = host_keyboard_led_state();
     oled_write_ln_P(PSTR("CPSLK"), led_usb_state.caps_lock);