16 files changed, 563 insertions, 550 deletions

diff --git a/keyboards/pinky/3/3.h b/keyboards/pinky/3/3.h
index 8bd2d49faf..add202537a 100644
--- a/keyboards/pinky/3/3.h
+++ b/keyboards/pinky/3/3.h
@@ -12,7 +12,7 @@
 #endif
 #endif
 
-#define LAYOUT( \
+#define LAYOUT_split_3x7_4( \
   L00, L01, L02, L03, L04, L05, L06,  R00, R01, R02, R03, R04, R05, R06, \
   L10, L11, L12, L13, L14, L15, L16,  R10, R11, R12, R13, R14, R15, R16, \
   L20, L21, L22, L23, L24, L25, L26,  R20, R21, R22, R23, R24, R25, R26, \
@@ -29,15 +29,4 @@
     { KC_NO, KC_NO, KC_NO, R33, R32, R31, R30 } \
   }
 
-#define LAYOUT_kc( \
-  L00, L01, L02, L03, L04, L05, L06,  R00, R01, R02, R03, R04, R05, R06, \
-  L10, L11, L12, L13, L14, L15, L16,  R10, R11, R12, R13, R14, R15, R16, \
-  L20, L21, L22, L23, L24, L25, L26,  R20, R21, R22, R23, R24, R25, R26, \
-                 L30, L31, L32, L33,  R30, R31, R32, R33 \
-  ) \
-  LAYOUT( \
-    KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##L06,   KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, KC_##R06, \
-    KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##L16,   KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, KC_##R16, \
-    KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##L26,   KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, KC_##R26, \
-                                  KC_##L30, KC_##L31, KC_##L32, KC_##L33,   KC_##R30, KC_##R31, KC_##R32, KC_##R33 \
-  )
+#define LAYOUT LAYOUT_split_3x7_4
diff --git a/keyboards/pinky/3/config.h b/keyboards/pinky/3/config.h
index 25cfe22ace..c8d576388c 100644
--- a/keyboards/pinky/3/config.h
+++ b/keyboards/pinky/3/config.h
@@ -17,11 +17,11 @@
 #pragma once
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x3060
+#define VENDOR_ID       0x544E // "TN"
+#define PRODUCT_ID      0x7033 // "P3"
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    tamanishi
-#define PRODUCT         Pinky
+#define PRODUCT         Pinky3
 
 /* key matrix size */
 // Rows are doubled-up
@@ -53,32 +53,6 @@
  */
 #define SOFT_SERIAL_PIN D2 // or D1, D2, D3, E6
 
-// #define BACKLIGHT_PIN B7
-// #define BACKLIGHT_BREATHING
-// #define BACKLIGHT_LEVELS 3
-
-// #define RGB_DI_PIN E2
-// #ifdef RGB_DI_PIN
-//   #define RGBLED_NUM 16
-//   #define RGBLIGHT_HUE_STEP 8
-//   #define RGBLIGHT_SAT_STEP 8
-//   #define RGBLIGHT_VAL_STEP 8
-//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
-// #endif
-
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
@@ -119,54 +93,6 @@
 //#define FORCE_NKRO
 
 /*
- * Magic Key Options
- *
- * Magic keys are hotkey commands that allow control over firmware functions of
- * the keyboard. They are best used in combination with the HID Listen program,
- * found here: https://www.pjrc.com/teensy/hid_listen.html
- *
- * The options below allow the magic key functionality to be changed. This is
- * useful if your keyboard/keypad is missing keys and you want magic key support.
- *
- */
-
-/* control how magic key switches layers */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
-
-/* override magic key keymap */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
-//#define MAGIC_KEY_HELP1          H
-//#define MAGIC_KEY_HELP2          SLASH
-//#define MAGIC_KEY_DEBUG          D
-//#define MAGIC_KEY_DEBUG_MATRIX   X
-//#define MAGIC_KEY_DEBUG_KBD      K
-//#define MAGIC_KEY_DEBUG_MOUSE    M
-//#define MAGIC_KEY_VERSION        V
-//#define MAGIC_KEY_STATUS         S
-//#define MAGIC_KEY_CONSOLE        C
-//#define MAGIC_KEY_LAYER0_ALT1    ESC
-//#define MAGIC_KEY_LAYER0_ALT2    GRAVE
-//#define MAGIC_KEY_LAYER0         0
-//#define MAGIC_KEY_LAYER1         1
-//#define MAGIC_KEY_LAYER2         2
-//#define MAGIC_KEY_LAYER3         3
-//#define MAGIC_KEY_LAYER4         4
-//#define MAGIC_KEY_LAYER5         5
-//#define MAGIC_KEY_LAYER6         6
-//#define MAGIC_KEY_LAYER7         7
-//#define MAGIC_KEY_LAYER8         8
-//#define MAGIC_KEY_LAYER9         9
-//#define MAGIC_KEY_BOOTLOADER     PAUSE
-//#define MAGIC_KEY_LOCK           CAPS
-//#define MAGIC_KEY_EEPROM         E
-//#define MAGIC_KEY_NKRO           N
-//#define MAGIC_KEY_SLEEP_LED      Z
-
-/*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
  */
@@ -184,29 +110,6 @@
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
 
-/*
- * MIDI options
- */
-
-/* Prevent use of disabled MIDI features in the keymap */
-//#define MIDI_ENABLE_STRICT 1
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-//#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 1
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/pinky/3/info.json b/keyboards/pinky/3/info.json
new file mode 100644
index 0000000000..92fa04f793
--- /dev/null
+++ b/keyboards/pinky/3/info.json
@@ -0,0 +1,66 @@
+{
+    "keyboard_name": "Pinky3",
+    "url": "",
+    "maintainer": "tamanishi",
+    "width": 16,
+    "height": 5.3,
+    "layouts": {
+        "LAYOUT_split_3x7_4": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0.3},
+                {"label":"Q", "x":1, "y":0.3},
+                {"label":"W", "x":2, "y":0.2},
+                {"label":"E", "x":3, "y":0},
+                {"label":"R", "x":4, "y":0.2},
+                {"label":"T", "x":5, "y":0.4},
+                {"label":"(", "x":6, "y":0.6},
+                {"label":")", "x":9, "y":0.6},
+                {"label":"Y", "x":10, "y":0.4},
+                {"label":"U", "x":11, "y":0.2},
+                {"label":"I", "x":12, "y":0},
+                {"label":"O", "x":13, "y":0.2},
+                {"label":"P", "x":14, "y":0.3},
+                {"label":"Backspace", "x":15, "y":0.3},
+
+                {"label":"Ctrl / Tab", "x":0, "y":1.3},
+                {"label":"A", "x":1, "y":1.3},
+                {"label":"S", "x":2, "y":1.2},
+                {"label":"D", "x":3, "y":1},
+                {"label":"F", "x":4, "y":1.2},
+                {"label":"G", "x":5, "y":1.4},
+                {"label":"[", "x":6, "y":1.6},
+                {"label":"]", "x":9, "y":1.6},
+                {"label":"H", "x":10, "y":1.4},
+                {"label":"J", "x":11, "y":1.2},
+                {"label":"K", "x":12, "y":1},
+                {"label":"L", "x":13, "y":1.2},
+                {"label":":", "x":14, "y":1.3},
+                {"label":"\"", "x":15, "y":1.3},
+
+                {"label":"Shift", "x":0, "y":2.3},
+                {"label":"Z", "x":1, "y":2.3},
+                {"label":"X", "x":2, "y":2.2},
+                {"label":"C", "x":3, "y":2},
+                {"label":"V", "x":4, "y":2.2},
+                {"label":"B", "x":5, "y":2.4},
+                {"label":"MO(_ADJUST)", "x":6, "y":3},
+                {"label":"MO(_ADJUST)", "x":9, "y":3},
+                {"label":"N", "x":10, "y":2.4},
+                {"label":"M", "x":11, "y":2.2},
+                {"label":"<", "x":12, "y":2},
+                {"label":">", "x":13, "y":2.2},
+                {"label":"?", "x":14, "y":2.3},
+                {"label":"Enter", "x":15, "y":2.3},
+
+                {"label":"Alt", "x":3.5, "y":3.7},
+                {"label":"MO(_LOWER)", "x":4.5, "y":3.8},
+                {"label":"GUI", "x":5.5, "y":4},
+                {"label":"Space", "x":6.5, "y":4.3},
+                {"label":"Space", "x":8.5, "y":4.3},
+                {"label":"GUI", "x":9.5, "y":4},
+                {"label":"MO(_RAISE)", "x":10.5, "y":3.8},
+                {"label":"Alt", "x":11.5, "y":3.7}
+            ]
+        }
+    }
+}
diff --git a/keyboards/pinky/3/keymaps/default/keymap.c b/keyboards/pinky/3/keymaps/default/keymap.c
index 94ed82b02e..b3fb27246a 100644
--- a/keyboards/pinky/3/keymaps/default/keymap.c
+++ b/keyboards/pinky/3/keymaps/default/keymap.c
@@ -15,120 +15,83 @@
  */
 #include QMK_KEYBOARD_H
 
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
+enum layer_names {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
 
 enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST
+    QWERTY = SAFE_RANGE,
+    LOWER,
+    RAISE,
+    ADJUST
 };
 
-#define ________ KC_TRNS
-#define XXXXXXXX KC_NO
-#define KC_LOWER LOWER
-#define KC_RAISE RAISE
-#define KC_ADJ   ADJUST
-#define KC_CTLTB CTL_T(KC_TAB)
+#define CTL_TAB CTL_T(KC_TAB)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT(
-  //,---------------------------------------------------------------------.  ,---------------------------------------------------------------------.
-        KC_ESC,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,  KC_LPRN,     KC_RPRN,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,  KC_BSPC,\
-  //|---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
-      KC_CTLTB,     KC_A,     KC_S,     KC_D,     KC_F,     KC_G,  KC_LBRC,     KC_RBRC,     KC_H,     KC_J,     KC_K,     KC_L,  KC_SCLN,  KC_QUOT,\
-  //|---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
-       KC_LSFT,     KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,   KC_ADJ,      KC_ADJ,     KC_N,     KC_M,  KC_COMM,   KC_DOT,  KC_SLSH,   KC_ENT,\
-  //|---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
-                                     KC_LALT, KC_LOWER,  KC_LGUI,   KC_SPC,      KC_SPC,  KC_RGUI, KC_RAISE,  KC_RALT \
-                                //`---------------------------------------'  `---------------------------------------'
-  ),
-
-  [_LOWER] = LAYOUT( \
-  //,---------------------------------------------------------------------.  ,---------------------------------------------------------------------.
-        KC_GRV,     KC_1,     KC_2,     KC_3,     KC_4,     KC_5, ________,    ________,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,  KC_BSLS,\
-  //|---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
-      ________, ________, ________, ________, ________, ________, ________,    ________, ________, ________, ________,  KC_MINS,   KC_EQL, ________,\
-  //|---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
-      ________, ________, ________, ________, ________, ________, ________,    ________, ________, ________, ________, ________, ________, ________,\
-  //|---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
-                                    ________, ________, ________, ________,    ________, ________, ________, ________ \
-                                //`---------------------------------------'  `---------------------------------------'
-  ),
-
-  [_RAISE] = LAYOUT( \
-  //,---------------------------------------------------------------------.  ,---------------------------------------------------------------------.
-        KC_GRV,     KC_1,     KC_2,     KC_3,     KC_4,     KC_5, ________,    ________,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,  KC_BSLS,\
-  //|---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
-      ________, ________, ________, ________, ________, ________, ________,    ________, ________, ________, ________,  KC_MINS,   KC_EQL, ________,\
-  //|---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
-      ________, ________, ________, ________, ________, ________, ________,    ________, ________, ________, ________, ________, ________, ________,\
-  //|---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
-                                    ________, ________, ________, ________,    ________, ________, ________, ________ \
-                                //`---------------------------------------'  `---------------------------------------'
-  ),
-
-  [_ADJUST] = LAYOUT( \
-  //,---------------------------------------------------------------------.  ,---------------------------------------------------------------------.
-      ________,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,  KC_LCBR,     KC_RCBR,    KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10, ________,\
-  //|---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
-      ________,   KC_F11,   KC_F12, ________, ________, ________,  KC_LCBR,     KC_RCBR,  KC_HOME,  KC_PGDN,  KC_PGUP,   KC_END, ________, ________,\
-  //|---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
-      ________, ________, ________, ________, ________, ________, ________,    ________, ________, ________, ________, ________, ________, ________,\
-  //|---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
-                                    ________, ________, ________, ________,    ________, ________, ________, ________ \
-                                //`---------------------------------------'  `---------------------------------------'
-  )
+    [_QWERTY] = LAYOUT_split_3x7_4(
+        KC_ESC , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_LPRN,    KC_RPRN, KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_BSPC,
+        CTL_TAB, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_LBRC,    KC_RBRC, KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , ADJUST ,    ADJUST , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_ENT ,
+                                   KC_LALT, LOWER  , KC_LGUI, KC_SPC ,    KC_SPC , KC_RGUI, RAISE  , KC_RALT
+    ),
+    [_LOWER] = LAYOUT_split_3x7_4(
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , _______,    _______, KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_BSLS,
+        _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, KC_MINS, KC_EQL , _______,
+        _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
+                                   _______, _______, _______, _______,    _______, _______, _______, _______
+    ),
+    [_RAISE] = LAYOUT_split_3x7_4(
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , _______,    _______, KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_BSLS,
+        _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, KC_MINS, KC_EQL , _______,
+        _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
+                                   _______, _______, _______, _______,    _______, _______, _______, _______
+    ),
+    [_ADJUST] = LAYOUT_split_3x7_4(
+        _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_LCBR,    KC_RCBR, KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , _______,
+        _______, KC_F11 , KC_F12 , _______, _______, _______, KC_LCBR,    KC_RCBR, KC_HOME, KC_PGDN, KC_PGUP, KC_END , _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
+                                   _______, _______, _______, _______,    _______, _______, _______, _______
+    )
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    // set_timelog();
-  }
+    if (record->event.pressed) {
+        // set_timelog();
+    }
 
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-        if (record->event.pressed) {
-          layer_on(_ADJUST);
-        } else {
-          layer_off(_ADJUST);
-        }
-        return false;
-        break;
-  }
-  return true;
+    switch (keycode) {
+        case LOWER:
+            if (record->event.pressed) {
+                layer_on(_LOWER);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            } else {
+                layer_off(_LOWER);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            }
+            return false;
+            break;
+        case RAISE:
+            if (record->event.pressed) {
+                layer_on(_RAISE);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            } else {
+                layer_off(_RAISE);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            }
+            return false;
+            break;
+        case ADJUST:
+            if (record->event.pressed) {
+                layer_on(_ADJUST);
+            } else {
+                layer_off(_ADJUST);
+            }
+            return false;
+            break;
+    }
+    return true;
 }
-
diff --git a/keyboards/pinky/3/keymaps/via/config.h b/keyboards/pinky/3/keymaps/via/config.h
new file mode 100644
index 0000000000..db79776729
--- /dev/null
+++ b/keyboards/pinky/3/keymaps/via/config.h
@@ -0,0 +1,31 @@
+/* Copyright 2018 'Masayuki Sunahara'
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+//#define USE_MATRIX_I2C
+
+/* Select hand configuration */
+
+#define MASTER_LEFT
+// #define MASTER_RIGHT
+// #define EE_HANDS
+
+#define USE_SERIAL_PD2
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 200
+#define RETRO_TAPPPING
diff --git a/keyboards/pinky/3/keymaps/via/keymap.c b/keyboards/pinky/3/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b3fb27246a
--- /dev/null
+++ b/keyboards/pinky/3/keymaps/via/keymap.c
@@ -0,0 +1,97 @@
+/* Copyright 2018 'Masayuki Sunahara'
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
+
+enum custom_keycodes {
+    QWERTY = SAFE_RANGE,
+    LOWER,
+    RAISE,
+    ADJUST
+};
+
+#define CTL_TAB CTL_T(KC_TAB)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_split_3x7_4(
+        KC_ESC , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_LPRN,    KC_RPRN, KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_BSPC,
+        CTL_TAB, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_LBRC,    KC_RBRC, KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , ADJUST ,    ADJUST , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_ENT ,
+                                   KC_LALT, LOWER  , KC_LGUI, KC_SPC ,    KC_SPC , KC_RGUI, RAISE  , KC_RALT
+    ),
+    [_LOWER] = LAYOUT_split_3x7_4(
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , _______,    _______, KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_BSLS,
+        _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, KC_MINS, KC_EQL , _______,
+        _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
+                                   _______, _______, _______, _______,    _______, _______, _______, _______
+    ),
+    [_RAISE] = LAYOUT_split_3x7_4(
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , _______,    _______, KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_BSLS,
+        _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, KC_MINS, KC_EQL , _______,
+        _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
+                                   _______, _______, _______, _______,    _______, _______, _______, _______
+    ),
+    [_ADJUST] = LAYOUT_split_3x7_4(
+        _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_LCBR,    KC_RCBR, KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , _______,
+        _______, KC_F11 , KC_F12 , _______, _______, _______, KC_LCBR,    KC_RCBR, KC_HOME, KC_PGDN, KC_PGUP, KC_END , _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
+                                   _______, _______, _______, _______,    _______, _______, _______, _______
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        // set_timelog();
+    }
+
+    switch (keycode) {
+        case LOWER:
+            if (record->event.pressed) {
+                layer_on(_LOWER);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            } else {
+                layer_off(_LOWER);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            }
+            return false;
+            break;
+        case RAISE:
+            if (record->event.pressed) {
+                layer_on(_RAISE);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            } else {
+                layer_off(_RAISE);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            }
+            return false;
+            break;
+        case ADJUST:
+            if (record->event.pressed) {
+                layer_on(_ADJUST);
+            } else {
+                layer_off(_ADJUST);
+            }
+            return false;
+            break;
+    }
+    return true;
+}
diff --git a/keyboards/pinky/3/keymaps/via/rules.mk b/keyboards/pinky/3/keymaps/via/rules.mk
new file mode 100644
index 0000000000..645d8584d4
--- /dev/null
+++ b/keyboards/pinky/3/keymaps/via/rules.mk
@@ -0,0 +1,5 @@
+
+VIA_ENABLE = yes
+MOUSEKEY_ENABLE = yes
+EXTRAKEY_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/pinky/3/readme.md b/keyboards/pinky/3/readme.md
new file mode 100644
index 0000000000..a9b4c193f7
--- /dev/null
+++ b/keyboards/pinky/3/readme.md
@@ -0,0 +1,20 @@
+# Pinky3
+
+A split keyboard with 3x7 vertically staggered keys and 4 thumb keys.
+An idea is inspired from [crkbd](https://github.com/foostan/crkbd), [Lily58](https://github.com/kata0510/Lily58), [Ergo42](https://github.com/Biacco42/Ergo42) and [Helix](https://github.com/MakotoKurauchi/helix).
+
+* Keyboard Maintainer: [Masayuki Sunahara](https://github.com/tamanishi/) [@tamanishi](https://twitter.com/tamanishi)
+* Hardware Supported: Pinky3 (3rows) PCB, Pro Micro
+* Hardware Availability: [Pinky3 PCB & Case Data](https://github.com/tamanishi/Pinky3)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pinky/3:default
+
+Flashing example for this keyboard:
+
+    make pinky/3:default:flash
+
+To reset the board into bootloader mode, double-tap the Reset switch mounted on the PCB.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/pinky/4/4.h b/keyboards/pinky/4/4.h
index 2550940011..9420a320ff 100644
--- a/keyboards/pinky/4/4.h
+++ b/keyboards/pinky/4/4.h
@@ -12,7 +12,7 @@
 #endif
 #endif
 
-#define LAYOUT( \
+#define LAYOUT_split_4x7_4( \
   L00, L01, L02, L03, L04, L05, L06,  R00, R01, R02, R03, R04, R05, R06, \
   L10, L11, L12, L13, L14, L15, L16,  R10, R11, R12, R13, R14, R15, R16, \
   L20, L21, L22, L23, L24, L25, L26,  R20, R21, R22, R23, R24, R25, R26, \
@@ -32,17 +32,4 @@
     { KC_NO, KC_NO, KC_NO, R43, R42, R41, R40 } \
   }
 
-#define LAYOUT_kc( \
-  L00, L01, L02, L03, L04, L05, L06,  R00, R01, R02, R03, R04, R05, R06, \
-  L10, L11, L12, L13, L14, L15, L16,  R10, R11, R12, R13, R14, R15, R16, \
-  L20, L21, L22, L23, L24, L25, L26,  R20, R21, R22, R23, R24, R25, R26, \
-  L30, L31, L32, L33, L34, L35, L36,  R30, R31, R32, R33, R34, R35, R36, \
-                 L40, L41, L42, L43,  R40, R41, R42, R43 \
-  ) \
-  LAYOUT( \
-    KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##L06,   KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, KC_##R06, \
-    KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##L16,   KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, KC_##R16, \
-    KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##L26,   KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, KC_##R26, \
-    KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36,   KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, KC_##R36, \
-                                  KC_##L40, KC_##L41, KC_##L42, KC_##L43,   KC_##R40, KC_##R41, KC_##R42, KC_##R43 \
-  )
+#define LAYOUT LAYOUT_split_4x7_4
diff --git a/keyboards/pinky/4/config.h b/keyboards/pinky/4/config.h
index 5c955b0b72..d0d46f1926 100644
--- a/keyboards/pinky/4/config.h
+++ b/keyboards/pinky/4/config.h
@@ -17,8 +17,8 @@
 #pragma once
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0x544E
-#define PRODUCT_ID      0x7034
+#define VENDOR_ID       0x544E // "TN"
+#define PRODUCT_ID      0x7034 // "P4"
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    tamanishi
 #define PRODUCT         Pinky4
@@ -53,32 +53,6 @@
  */
 #define SOFT_SERIAL_PIN D2 // or D1, D2, D3, E6
 
-// #define BACKLIGHT_PIN B7
-// #define BACKLIGHT_BREATHING
-// #define BACKLIGHT_LEVELS 3
-
-// #define RGB_DI_PIN E2
-// #ifdef RGB_DI_PIN
-//   #define RGBLED_NUM 16
-//   #define RGBLIGHT_HUE_STEP 8
-//   #define RGBLIGHT_SAT_STEP 8
-//   #define RGBLIGHT_VAL_STEP 8
-//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
-// #endif
-
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
@@ -119,54 +93,6 @@
 //#define FORCE_NKRO
 
 /*
- * Magic Key Options
- *
- * Magic keys are hotkey commands that allow control over firmware functions of
- * the keyboard. They are best used in combination with the HID Listen program,
- * found here: https://www.pjrc.com/teensy/hid_listen.html
- *
- * The options below allow the magic key functionality to be changed. This is
- * useful if your keyboard/keypad is missing keys and you want magic key support.
- *
- */
-
-/* control how magic key switches layers */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
-
-/* override magic key keymap */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
-//#define MAGIC_KEY_HELP1          H
-//#define MAGIC_KEY_HELP2          SLASH
-//#define MAGIC_KEY_DEBUG          D
-//#define MAGIC_KEY_DEBUG_MATRIX   X
-//#define MAGIC_KEY_DEBUG_KBD      K
-//#define MAGIC_KEY_DEBUG_MOUSE    M
-//#define MAGIC_KEY_VERSION        V
-//#define MAGIC_KEY_STATUS         S
-//#define MAGIC_KEY_CONSOLE        C
-//#define MAGIC_KEY_LAYER0_ALT1    ESC
-//#define MAGIC_KEY_LAYER0_ALT2    GRAVE
-//#define MAGIC_KEY_LAYER0         0
-//#define MAGIC_KEY_LAYER1         1
-//#define MAGIC_KEY_LAYER2         2
-//#define MAGIC_KEY_LAYER3         3
-//#define MAGIC_KEY_LAYER4         4
-//#define MAGIC_KEY_LAYER5         5
-//#define MAGIC_KEY_LAYER6         6
-//#define MAGIC_KEY_LAYER7         7
-//#define MAGIC_KEY_LAYER8         8
-//#define MAGIC_KEY_LAYER9         9
-//#define MAGIC_KEY_BOOTLOADER     PAUSE
-//#define MAGIC_KEY_LOCK           CAPS
-//#define MAGIC_KEY_EEPROM         E
-//#define MAGIC_KEY_NKRO           N
-//#define MAGIC_KEY_SLEEP_LED      Z
-
-/*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
  */
@@ -184,29 +110,6 @@
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
 
-/*
- * MIDI options
- */
-
-/* Prevent use of disabled MIDI features in the keymap */
-//#define MIDI_ENABLE_STRICT 1
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-//#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 1
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/pinky/4/info.json b/keyboards/pinky/4/info.json
new file mode 100644
index 0000000000..b96da61fde
--- /dev/null
+++ b/keyboards/pinky/4/info.json
@@ -0,0 +1,81 @@
+{
+    "keyboard_name": "Pinky4",
+    "url": "",
+    "maintainer": "tamanishi",
+    "width": 16,
+    "height": 6.3,
+    "layouts": {
+        "LAYOUT_split_4x7_4": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0.3},
+                {"label":"1", "x":1, "y":0.3},
+                {"label":"2", "x":2, "y":0.2},
+                {"label":"3", "x":3, "y":0},
+                {"label":"4", "x":4, "y":0.2},
+                {"label":"5", "x":5, "y":0.4},
+                {"label":"(", "x":6, "y":0.6},
+                {"label":")", "x":9, "y":0.6},
+                {"label":"6", "x":10, "y":0.4},
+                {"label":"7", "x":11, "y":0.2},
+                {"label":"8", "x":12, "y":0},
+                {"label":"9", "x":13, "y":0.2},
+                {"label":"0", "x":14, "y":0.3},
+                {"label":"Backspace", "x":15, "y":0.3},
+
+                {"label":"Tab", "x":0, "y":1.3},
+                {"label":"Q", "x":1, "y":1.3},
+                {"label":"W", "x":2, "y":1.2},
+                {"label":"E", "x":3, "y":1},