Merge branch 'master' into meteor

32 files changed, 774 insertions, 104 deletions

diff --git a/keyboards/pabile/p18/config.h b/keyboards/pabile/p18/config.h
index f7c258a565..d8d5a95f2d 100644
--- a/keyboards/pabile/p18/config.h
+++ b/keyboards/pabile/p18/config.h
@@ -1,3 +1,21 @@
+/*
+Copyright 2020 Pabile
+
+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
 
 #include "config_common.h"
diff --git a/keyboards/pabile/p20/config.h b/keyboards/pabile/p20/config.h
deleted file mode 100644
index 8a52c1bf1c..0000000000
--- a/keyboards/pabile/p20/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6666
-#define PRODUCT_ID      0x6667
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Pabile
-#define PRODUCT         P20
-#define DESCRIPTION     5x4 Macropad
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 4
-
-/* pin-out */
-#define MATRIX_ROW_PINS { B3, B4, B5, D7, E6 }
-#define MATRIX_COL_PINS { D0, B2, D4, B6 }
-#define UNUSED_PINS
- 
-#define ENCODERS_PAD_A { F5, F7 }
-#define ENCODERS_PAD_B { F6, B1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pabile/p20/p20.c b/keyboards/pabile/p20/p20.c
deleted file mode 100644
index c17efac9b1..0000000000
--- a/keyboards/pabile/p20/p20.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "p20.h"
diff --git a/keyboards/pabile/p20/p20.h b/keyboards/pabile/p20/p20.h
deleted file mode 100644
index b7467dc150..0000000000
--- a/keyboards/pabile/p20/p20.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43 \
-) \
-{ \
-    {k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, k23}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, k43} \
-} 
diff --git a/keyboards/pabile/p20/readme.md b/keyboards/pabile/p20/readme.md
index 256a4772ec..e94005b0d4 100644
--- a/keyboards/pabile/p20/readme.md
+++ b/keyboards/pabile/p20/readme.md
@@ -1,16 +1,16 @@
 # P20
 
 ![Linear grid](https://github.com/pabile/Pabile20/blob/master/_bak/layout-grid.jpg)
-![Numeric pad](https://github.com/pabile/Pabile20/blob/master/_bak/layout-numpad.jpg)
 
-A 5x4 grid keyboard with 2 rotary encoders. 
+A 5x4 grid macro numeric pad with up to 3 optional rotary encoders. 
 
 * Keyboard Maintainer: [pabile](https://github.com/pabile)
-* Hardware Supported: Pabile P20 PCB, Pro Micro
-* Hardware Availability: [Info at pabileonline.blogspot.com](https://pabileonline.blogspot.com/search/label/pabile20)
+* Hardware Supported: Pabile P20 PCB, Pro Micro, Rotary Encoders, Alps/MX Switches
+* Hardware Availability: [pabileonline.blogspot.com](https://pabileonline.blogspot.com/search/label/p20)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make pabile/p20:default
+    make pabile/p20/ver1:default  # for ver1
+    make pabile/p20/ver2:default  # for ver2
 
 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/pabile/p20/ver1/config.h b/keyboards/pabile/p20/ver1/config.h
new file mode 100644
index 0000000000..94c600106b
--- /dev/null
+++ b/keyboards/pabile/p20/ver1/config.h
@@ -0,0 +1,42 @@
+/*
+Copyright 2020 Pabile
+
+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
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x6666
+#define PRODUCT_ID      0x6667
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Pabile
+#define PRODUCT         P20 ver1
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 4
+
+/* pin-out */
+#define MATRIX_ROW_PINS { B3, B4, B5, D7, E6 }
+#define MATRIX_COL_PINS { D0, B2, D4, B6 }
+#define UNUSED_PINS
+ 
+#define ENCODERS_PAD_A { F5, F7 }
+#define ENCODERS_PAD_B { F6, B1 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
\ No newline at end of file
diff --git a/keyboards/pabile/p20/keymaps/default/keymap.c b/keyboards/pabile/p20/ver1/keymaps/default/keymap.c
index 6b815e72e8..6b815e72e8 100644
--- a/keyboards/pabile/p20/keymaps/default/keymap.c
+++ b/keyboards/pabile/p20/ver1/keymaps/default/keymap.c
diff --git a/keyboards/pabile/p20/rules.mk b/keyboards/pabile/p20/ver1/rules.mk
index d4fa25323a..d8e01b847f 100644
--- a/keyboards/pabile/p20/rules.mk
+++ b/keyboards/pabile/p20/ver1/rules.mk
@@ -2,13 +2,6 @@
 MCU = atmega32u4
 
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = caterina
 
 # Build Options
@@ -25,13 +18,11 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-MIDI_ENABLE = no            # MIDI support
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
-FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
-HD44780_ENABLE = no         # Enable support for HD44780 based LCDs
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
 UNICODE_ENABLE = yes        # Unicode
 IOS_DEVICE_ENABLE = no      # connect to IOS Device
 ENCODER_ENABLE = yes
 
-LAYOUTS = ortho_5x4
+LAYOUTS = ortho_5x4 numpad_5x4
diff --git a/keyboards/pabile/p20/ver1/ver1.c b/keyboards/pabile/p20/ver1/ver1.c
new file mode 100644
index 0000000000..65e11630bc
--- /dev/null
+++ b/keyboards/pabile/p20/ver1/ver1.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2020 Pabile
+
+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 "ver1.h"
diff --git a/keyboards/pabile/p20/ver1/ver1.h b/keyboards/pabile/p20/ver1/ver1.h
new file mode 100644
index 0000000000..36ec781fa1
--- /dev/null
+++ b/keyboards/pabile/p20/ver1/ver1.h
@@ -0,0 +1,50 @@
+/*
+Copyright 2020 Pabile
+
+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
+
+#include "quantum.h"
+
+#define LAYOUT_ortho_5x4( \
+    k00, k01, k02, k03, \
+    k10, k11, k12, k13, \
+    k20, k21, k22, k23, \
+    k30, k31, k32, k33, \
+    k40, k41, k42, k43 \
+) \
+{ \
+    {k00, k01, k02, k03}, \
+    {k10, k11, k12, k13}, \
+    {k20, k21, k22, k23}, \
+    {k30, k31, k32, k33}, \
+    {k40, k41, k42, k43} \
+} 
+
+#define LAYOUT_numpad_5x4( \
+    k00, k01, k02, k03, \
+    k10, k11, k12,      \
+    k20, k21, k22, k23, \
+    k30, k31, k32,      \
+    k40,      k42, k43  \
+) \
+{ \
+    {k00, k01,   k02, k03}, \
+    {k10, k11,   k12, KC_NO}, \
+    {k20, k21,   k22, k23}, \
+    {k30, k31,   k32, KC_NO}, \
+    {k40, KC_NO, k42, k43} \
+}
diff --git a/keyboards/pabile/p20/ver2/config.h b/keyboards/pabile/p20/ver2/config.h
new file mode 100644
index 0000000000..0997001836
--- /dev/null
+++ b/keyboards/pabile/p20/ver2/config.h
@@ -0,0 +1,39 @@
+/*
+Copyright 2020 Pabile
+
+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
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x6666
+#define PRODUCT_ID      0x6667
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    Pabile
+#define PRODUCT         P20 ver2
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 4
+
+/* pin-out */
+#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
+#define MATRIX_COL_PINS { D1, D0, D4, B2 }
+#define UNUSED_PINS
+ 
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pabile/p20/ver2/keymaps/default/keymap.c b/keyboards/pabile/p20/ver2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..2c2af0da8a
--- /dev/null
+++ b/keyboards/pabile/p20/ver2/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+/*
+Copyright 2020 Pabile
+
+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 custom_keycodes {
+    DBLZERO = SAFE_RANGE,
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+    case DBLZERO:
+        if (record->event.pressed) {
+            tap_code(KC_P0);
+            tap_code(KC_P0);
+        }
+        break;
+    }
+    return true;
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_5x4(
+        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 
+        KC_P7,   KC_P8,   KC_P9,   KC_TAB, 
+        KC_P4,   KC_P5,   KC_P6,   KC_PPLS, 
+        KC_P1,   KC_P2,   KC_P3,   KC_DEL, 
+        KC_P0,   DBLZERO, KC_PDOT, KC_PENT)
+};
diff --git a/keyboards/pabile/p20/ver2/rules.mk b/keyboards/pabile/p20/ver2/rules.mk
new file mode 100644
index 0000000000..da59201fca
--- /dev/null
+++ b/keyboards/pabile/p20/ver2/rules.mk
@@ -0,0 +1,28 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+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
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
+UNICODE_ENABLE = yes        # Unicode
+IOS_DEVICE_ENABLE = no      # connect to IOS Device
+ENCODER_ENABLE = no
+
+LAYOUTS = ortho_5x4 numpad_5x4
diff --git a/keyboards/pabile/p20/ver2/ver2.c b/keyboards/pabile/p20/ver2/ver2.c
new file mode 100644
index 0000000000..fa7e1f2e39
--- /dev/null
+++ b/keyboards/pabile/p20/ver2/ver2.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2020 Pabile
+
+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 "ver2.h"
diff --git a/keyboards/pabile/p20/ver2/ver2.h b/keyboards/pabile/p20/ver2/ver2.h
new file mode 100644
index 0000000000..36ec781fa1
--- /dev/null
+++ b/keyboards/pabile/p20/ver2/ver2.h
@@ -0,0 +1,50 @@
+/*
+Copyright 2020 Pabile
+
+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
+
+#include "quantum.h"
+
+#define LAYOUT_ortho_5x4( \
+    k00, k01, k02, k03, \
+    k10, k11, k12, k13, \
+    k20, k21, k22, k23, \
+    k30, k31, k32, k33, \
+    k40, k41, k42, k43 \
+) \
+{ \
+    {k00, k01, k02, k03}, \
+    {k10, k11, k12, k13}, \
+    {k20, k21, k22, k23}, \
+    {k30, k31, k32, k33}, \
+    {k40, k41, k42, k43} \
+} 
+
+#define LAYOUT_numpad_5x4( \
+    k00, k01, k02, k03, \
+    k10, k11, k12,      \
+    k20, k21, k22, k23, \
+    k30, k31, k32,      \
+    k40,      k42, k43  \
+) \
+{ \
+    {k00, k01,   k02, k03}, \
+    {k10, k11,   k12, KC_NO}, \
+    {k20, k21,   k22, k23}, \
+    {k30, k31,   k32, KC_NO}, \
+    {k40, KC_NO, k42, k43} \
+}
diff --git a/keyboards/pabile/p40/config.h b/keyboards/pabile/p40/config.h
index f4252f7ab0..02ebb67e6b 100644
--- a/keyboards/pabile/p40/config.h
+++ b/keyboards/pabile/p40/config.h
@@ -1,3 +1,20 @@
+/*
+Copyright 2020 Pabile
+
+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
 
 #include "config_common.h"
diff --git a/keyboards/pabile/p40/info.json b/keyboards/pabile/p40/info.json
index 42f9b4823e..d05d773282 100644
--- a/keyboards/pabile/p40/info.json
+++ b/keyboards/pabile/p40/info.json
@@ -7,46 +7,46 @@
     "layouts": {
         "LAYOUT_ortho_4x10": {
             "layout": [
-				{"x":0, "y":0},
-				{"x":1, "y":0}, 
-				{"x":2, "y":0}, 
-				{"x":3, "y":0}, 
-				{"x":4, "y":0}, 
-				{"x":5, "y":0}, 
-				{"x":6, "y":0}, 
-				{"x":7, "y":0}, 
-				{"x":8, "y":0}, 
-				{"x":9, "y":0}, 
-				{"x":0.25, "y":1}, 
-				{"x":1.25, "y":1}, 
-				{"x":2.25, "y":1}, 
-				{"x":3.25, "y":1}, 
-				{"x":4.25, "y":1}, 
-				{"x":5.25, "y":1}, 
-				{"x":6.25, "y":1}, 
-				{"x":7.25, "y":1}, 
-				{"x":8.25, "y":1}, 
-				{"x":9.25, "y":1}, 
-				{"x":0.5, "y":2}, 
-				{"x":1.5, "y":2}, 
-				{"x":2.5, "y":2}, 
-				{"x":3.5, "y":2}, 
-				{"x":4.5, "y":2}, 
-				{"x":5.5, "y":2}, 
-				{"x":6.5, "y":2}, 
-				{"x":7.5, "y":2}, 
-				{"x":8.5, "y":2}, 
-				{"x":9.5, "y":2}, 
-				{"x":0.75, "y":3}, 
-				{"x":1.75, "y":3}, 
-				{"x":2.75, "y":3}, 
-				{"x":3.75, "y":3}, 
-				{"x":4.75, "y":3}, 
-				{"x":5.75, "y":3}, 
-				{"x":6.75, "y":3}, 
-				{"x":7.75, "y":3}, 
-				{"x":8.75, "y":3}, 
-				{"x":9.75, "y":3}]
+				{"w":1, "x":0, "y":0},
+				{"w":1, "x":1, "y":0}, 
+				{"w":1, "x":2, "y":0}, 
+				{"w":1, "x":3, "y":0}, 
+				{"w":1, "x":4, "y":0}, 
+				{"w":1, "x":5, "y":0}, 
+				{"w":1, "x":6, "y":0}, 
+				{"w":1, "x":7, "y":0}, 
+				{"w":1, "x":8, "y":0}, 
+				{"w":1, "x":9, "y":0}, 
+				{"w":1, "x":0.25, "y":1}, 
+				{"w":1, "x":1.25, "y":1}, 
+				{"w":1, "x":2.25, "y":1}, 
+				{"w":1, "x":3.25, "y":1}, 
+				{"w":1, "x":4.25, "y":1}, 
+				{"w":1, "x":5.25, "y":1}, 
+				{"w":1, "x":6.25, "y":1}, 
+				{"w":1, "x":7.25, "y":1}, 
+				{"w":1, "x":8.25, "y":1}, 
+				{"w":1, "x":9.25, "y":1}, 
+				{"w":1, "x":0.5, "y":2}, 
+				{"w":1, "x":1.5, "y":2}, 
+				{"w":1, "x":2.5, "y":2}, 
+				{"w":1, "x":3.5, "y":2}, 
+				{"w":1, "x":4.5, "y":2}, 
+				{"w":1, "x":5.5, "y":2}, 
+				{"w":1, "x":6.5, "y":2}, 
+				{"w":1, "x":7.5, "y":2}, 
+				{"w":1, "x":8.5, "y":2}, 
+				{"w":1, "x":9.5, "y":2}, 
+				{"w":1, "x":0.75, "y":3}, 
+				{"w":1, "x":1.75, "y":3}, 
+				{"w":1, "x":2.75, "y":3}, 
+				{"w":1, "x":3.75, "y":3}, 
+				{"w":1, "x":4.75, "y":3}, 
+				{"w":1, "x":5.75, "y":3}, 
+				{"w":1, "x":6.75, "y":3}, 
+				{"w":1, "x":7.75, "y":3}, 
+				{"w":1, "x":8.75, "y":3}, 
+				{"w":1, "x":9.75, "y":3}]
         }
     }
 }
diff --git a/keyboards/pabile/p40/readme.md b/keyboards/pabile/p40/readme.md
index 33a657f384..14673d75a2 100644
--- a/keyboards/pabile/p40/readme.md
+++ b/keyboards/pabile/p40/readme.md
@@ -6,10 +6,11 @@ A compact 4x10 (40%) staggered DIY keyboard kit.
 
 * Keyboard Maintainer: [pabile](https://github.com/pabile)
 * Hardware Supported: Pabile P40 PCB, Pro Micro
-* Hardware Availability: [Info at pabileonline.blogspot.com](https://pabileonline.blogspot.com/search/label/pabile40)
+* Hardware Availability: [Info at pabileonline.blogspot.com](https://pabileonline.blogspot.com/search/label/p40)
 
 Make example for this keyboard (after setting up your build environment):
 
     make pabile/p40:default
 
+
 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/pabile/p40_ortho/config.h b/keyboards/pabile/p40_ortho/config.h
new file mode 100644
index 0000000000..4fd8e7a533
--- /dev/null
+++ b/keyboards/pabile/p40_ortho/config.h
@@ -0,0 +1,40 @@
+/*
+Copyright 2020 Pabile
+
+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
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x6666
+#define PRODUCT_ID      0x6669
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Pabile
+#define PRODUCT         P40 Ortho Keyboard
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 10
+
+/* pin-out */
+#define MATRIX_ROW_PINS { D1, D0, F4, F5 }
+#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B2, B3, B1, F7, F6 }
+
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pabile/p40_ortho/info.json b/keyboards/pabile/p40_ortho/info.json
new file mode 100644
index 0000000000..a4d757be92
--- /dev/null
+++ b/keyboards/pabile/p40_ortho/info.json
@@ -0,0 +1,52 @@
+{
+    "keyboard_name": "", 
+    "url": "", 
+    "maintainer": "qmk", 
+    "width": 10, 
+    "height": 4, 
+    "layouts": {
+        "LAYOUT_ortho_4x10": {
+            "layout": [
+                {"label":"Q", "x":0, "y":0}, 
+                {"label":"W", "x":1, "y":0}, 
+                {"label":"E", "x":2, "y":0}, 
+                {"label":"R", "x":3, "y":0}, 
+                {"label":"T", "x":4, "y":0}, 
+                {"label":"Y", "x":5, "y":0}, 
+                {"label":"U", "x":6, "y":0}, 
+                {"label":"I", "x":7, "y":0}, 
+                {"label":"O", "x":8, "y":0}, 
+                {"label":"P", "x":9, "y":0}, 
+                {"label":"A", "x":0, "y":1}, 
+                {"label":"S", "x":1, "y":1}, 
+                {"label":"D", "x":2, "y":1}, 
+                {"label":"F", "x":3, "y":1}, 
+                {"label":"G", "x":4, "y":1}, 
+                {"label":"H", "x":5, "y":1}, 
+                {"label":"J", "x":6, "y":1}, 
+                {"label":"K", "x":7, "y":1}, 
+                {"label":"L", "x":8, "y":1}, 
+                {"label":"-", "x":9, "y":1}, 
+                {"label":"Z", "x":0, "y":2}, 
+                {"label":"X", "x":1, "y":2}, 
+                {"label":"C", "x":2, "y":2}, 
+                {"label":"V", "x":3, "y":2}, 
+                {"label":"B", "x":4, "y":2}, 
+                {"label":"N", "x":5, "y":2}, 
+                {"label":"M", "x":6, "y":2}, 
+                {"label":",", "x":7, "y":2}, 
+                {"label":".", "x":8, "y":2}, 
+                {"label":"?", "x":9, "y":2}, 
+                {"label":"Ctrl", "x":0, "y":3}, 
+                {"label":"Win", "x":1, "y":3}, 
+                {"label":"Alt", "x":2, "y":3}, 
+                {"label":"Shift", "x":3, "y":3}, 
+                {"label":"&larr;", "x":4, "y":3}, 
+                {"x":5, "y":3}, 
+                {"label":"Enter", "x":6, "y":3}, 
+                {"label":"Alt", "x":7, "y":3}, 
+                {"label":"Super", "x":8, "y":3}, 
+                {"label":"Ctrl", "x":9, "y":3}]
+        }
+    }
+}
diff --git a/keyboards/pabile/p40_ortho/keymaps/default/keymap.c b/keyboards/pabile/p40_ortho/keymaps/default/keymap.c
new file mode 100644
index 0000000000..ac41acf2da
--- /dev/null
+++ b/keyboards/pabile/p40_ortho/keymaps/default/keymap.c
@@ -0,0 +1,46 @@
+/*
+Copyright 2020 Pabile
+
+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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ortho_4x10(
+    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,          KC_Y,         KC_U,   KC_I,    KC_O,   KC_P,
+    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,          KC_H,         KC_J,   KC_K,    KC_L,   LT(3,KC_MINS),
+    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,          KC_N,         KC_M,   KC_COMM, KC_DOT, LT(4,KC_SLSH),
+    KC_LCTL, KC_LGUI, KC_LALT, KC_LSFT, LT(2,KC_BSPC), LT(1,KC_SPC), KC_ENT, KC_APP,  KC_DEL, KC_ESC),
+  [1] = LAYOUT_ortho_4x10(
+    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+    KC_TAB,  KC_NO,   KC_NO,   KC_GRV,  KC_LBRC, KC_RBRC, KC_BSLS, KC_SCLN, KC_QUOT, KC_MINS,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_EQL,  KC_MINS, KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+  [2] = LAYOUT_ortho_4x10(
+    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_F6,   KC_F7, KC_F8,   KC_F9,   KC_F10,
+    KC_TAB,  KC_F11,  KC_F12,  KC_NO,   KC_NO, KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO,
+    KC_CAPS, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, KC_NLCK, KC_NO, KC_VOLD, KC_VOLU, KC_MUTE,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO),
+  [3] = LAYOUT_ortho_4x10(
+    KC_ESC,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_INS,  KC_PGUP, KC_UP,   KC_PGDN, KC_DEL,
+    KC_TAB,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_END,  KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO),
+  [4] = LAYOUT_ortho_4x10(
+    KC_ESC,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_BTN1, KC_MS_U, KC_BTN2, KC_DEL,
+    KC_TAB,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_WH_D, KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO)
+};
diff --git a/keyboards/pabile/p40_ortho/p40_ortho.c b/keyboards/pabile/p40_ortho/p40_ortho.c
new file mode 100644
index 0000000000..b6573bd802
--- /dev/null
+++ b/keyboards/pabile/p40_ortho/p40_ortho.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2020 Pabile
+
+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 "p40_ortho.h"
diff --git a/keyboards/pabile/p40_ortho/p40_ortho.h b/keyboards/pabile/p40_ortho/p40_ortho.h
new file mode 100644
index 0000000000..dd2c899daa
--- /dev/null
+++ b/keyboards/pabile/p40_ortho/p40_ortho.h
@@ -0,0 +1,45 @@
+/*
+Copyright 2020 Pabile
+
+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
+
+#include "quantum.h"
+
+#define LAYOUT_ortho_4x10( \
+      k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
+      k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
+      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
+      k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 \
+) \
+{ \
+      {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09}, \
+      {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19}, \
+      {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29}, \
+      {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39} \
+}
+#define LAYOUT_ortho_4x10_1x2u_c( \
+      k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
+      k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
+      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
+      k30, k31, k32, k33,    k34,   k36, k37, k38, k39 \
+) \
+{ \
+      {k00, k01, k02, k03, k04, k05,   k06, k07, k08, k09}, \
+      {k10, k11, k12, k13, k14, k15,   k16, k17, k18, k19}, \
+      {k20, k21, k22, k23, k24, k25,   k26, k27, k28, k29}, \
+      {k30, k31, k32, k33, k34, KC_NO, k36, k37, k38, k39} \
+}
diff --git a/keyboards/pabile/p40_ortho/readme.md b/keyboards/pabile/p40_ortho/readme.md
new file mode 100644
index 0000000000..736c5b497f
--- /dev/null
+++ b/keyboards/pabile/p40_ortho/readme.md
@@ -0,0 +1,15 @@
+# P40 Ortho
+
+![prototype photo1](https://github.com/pabile/p40_ortho/blob/master/files/p40-ortho-003.jpg)
+
+A compact 4x10 (40%) ortho-linear DIY keyboard kit.
+
+* Keyboard Maintainer: [pabile](https://github.com/pabile)
+* Hardware Supported: Pabile P40 PCB, Pro Micro, ALPS / MX Switches
+* Hardware Availability: [pabileonline.blogspot.com](https://pabileonline.blogspot.com/search/label/pabile40)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pabile/p40_ortho:default
+
+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/pabile/p40_ortho/rules.mk b/keyboards/pabile/p40_ortho/rules.mk
new file mode 100644
index 0000000000..ba0ad23c8a
--- /dev/null
+++ b/keyboards/pabile/p40_ortho/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+UNICODE_ENABLE = yes        # Unicode
+IOS_DEVICE_ENABLE = no      # connect to IOS Device
diff --git a/keyboards/pabile/p42/config.h b/keyboards/pabile/p42/config.h
new file mode 100644
index 0000000000..2f7c5ce30a
--- /dev/null
+++ b/keyboards/pabile/p42/config.h
@@ -0,0 +1,45 @@
+/*
+Copyright 2020 Pabile
+
+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
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x6666
+#define PRODUCT_ID      0x6670
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Pabile
+#define PRODUCT         P42 Keyboard
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 11
+
+/* pin-out for PROMICRO */
+#define MATRIX_ROW_PINS { D1, D0, D4, C6 }
+#define MATRIX_COL_PINS { D7, E6, B4, B5, D2, D3, F7, B1, B3, B2, B6 }
+
+/* pin-out for BLUEFRUIT 
+#define MATRIX_ROW_PINS { F7, F6, F5, F4 }
+#define MATRIX_COL_PINS { F1, F0, B1, B2, B3, D2, C7, D6, B7, B6, B5 }
+*/
+
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/pabile/p42/info.json b/keyboards/pabile/p42/info.json
new file mode 100644
index 0000000000..77bce4bab2
--- /dev/null
+++ b/keyboards/pabile/p42/info.json
@@ -0,0 +1,13 @@
+{
+    "keyboard_name": "P42", 
+    "url": "https://pabileonline.blogspot.com/", 
+    "maintainer": "Pabile", 
+    "width": 11.25, 
+    "height": 4, 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+			{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"label":",", "x":7, "y":2}, {"label":".", "x":8, "y":2}, {"x":9, "y":2}, {"x":10.25, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10.25, "y":3}]
+        }
+    }
+}
diff --git a/keyboards/pabile/p42/keymaps/default/keymap.c b/keyboards/pabile/p42/keymaps/default/keymap.c
new file mode 100644
index 0000000000..39c9e639e4
--- /dev/null
+++ b/keyboards/pabile/p42/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT(
+		KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,          KC_Y,         KC_U,         KC_I,    KC_O,    KC_P, 
+		KC_A,    KC_S,    KC_D,    KC_F,    KC_G,          KC_H,         KC_J,         KC_K,    KC_L,    LT(3,KC_MINS), 
+		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_LSFT, LT(2,KC_BSPC), LT(1,KC_SPC), LT(4,KC_ENT), KC_DEL,  KC_RALT, KC_RCTL,       KC_ESC),
+	[1] = LAYOUT(
+		KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, 
+		KC_TAB,  KC_NO,   KC_NO,   KC_GRV,  KC_LBRC, KC_RBRC, KC_BSLS, KC_SCLN, KC_QUOT, KC_MINS, 
+		KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_EQL,  KC_MINS, KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+	[2] = LAYOUT(
+		KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7, KC_F8,   KC_F9,   KC_F10, 
+		KC_TAB,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO, 
+		KC_CAPS, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO,   KC_NLCK, KC_NO, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_TRNS),
+	[3] = LAYOUT(
+		KC_ESC,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_INS,  KC_PGUP, KC_UP,   KC_PGDN, KC_DEL, 
+		KC_TAB,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, 
+		KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_END,  KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_TRNS),
+	[4] = LAYOUT(
+		KC_ESC,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_BTN1, KC_MS_U, KC_BTN2, KC_DEL, 
+		KC_TAB,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, 
+		KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_WH_D, KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_TRNS)
+};
diff --git a/keyboards/pabile/p42/p42.c b/keyboards/pabile/p42/p42.c
new file mode 100644
index 0000000000..63bf51bd58
--- /dev/null
+++ b/keyboards/pabile/p42/p42.c
@@ -0,0 +1 @@
+#include "p42.h"
diff --git a/keyboards/pabile/p42/p42.h b/keyboards/pabile/p42/p42.h
new file mode 100644
index 0000000000..41aed042a2
--- /dev/null
+++ b/keyboards/pabile/p42/p42.h
@@ -0,0 +1,33 @@
+/*
+Copyright 2020 Pabile
+
+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
+
+#include "quantum.h"
+
+#define LAYOUT( \
+      k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, \
+      k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, \
+      k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210,\
+      k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310 \
+) \
+{ \
+      {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, KC_NO}, \
+      {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, KC_NO}, \
+      {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210}, \
+      {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310} \
+}
diff --git a/keyboards/pabile/p42/readme.md b/keyboards/pabile/p42/readme.md
new file mode 100644
index 0000000000..5ad0036bff
--- /dev/null
+++ b/keyboards/pabile/p42/readme.md
@@ -0,0 +1,15 @@
+# P42 
+
+![prototype photo1](https://github.com/pabile/P42/blob/master/docs/p42-001-small.jpg)
+
+42-key Ortho-linear keyboard
+
+* Keyboard Maintainer: [pabile](https://github.com/pabile)
+* Hardware Supported: Pabile P42 PCB, Pro Micro, Bluefruit LE, Hotswap Sockets
+* Hardware Availability: [pabileonline.blogspot.com](https://pabileonline.blogspot.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pabile/p42:default
+
+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/pabile/p42/rules.mk b/keyboards/pabile/p42/rules.mk
new file mode 100644
index 0000000000..ba0ad23c8a
--- /dev/null
+++ b/keyboards/pabile/p42/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+UNICODE_ENABLE = yes        # Unicode
+IOS_DEVICE_ENABLE = no      # connect to IOS Device