Ported J80 to QMK (#7488)

* ported J80 to QMK

* added default ISO layout

* removed optional override functions

* set bootmagic to lite

* removed comment

* added tkl_ansi and tkl_iso layouts

* updated vendor and device name

* set ANSI layout as default and split iso to separate folder

* removed empty file

* Update keyboards/J80/info.json

Added comma

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/J80/keymaps/default/keymap.c

Removed backslash

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/J80/keymaps/default/keymap.c

Removed backslash.

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* removed comments and backslash, fixed JSON formatting

* Rename J80.h to j80.h

* Rename keyboards/J80 to keyboards/j80

* renamed folder to lowercase

* added key definition for reset key

* added define for KC_NO to underscores

* Added backlight and lock LED support

* Fixed BACKLIGHT_PIN

* Fixed typo

* Added define for bootmagic lite and description in readme

* Update keyboards/j80/info.json

Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/j80/readme.md

Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/j80/readme.md

Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/j80/info.json

Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/j80/info.json

Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/j80/info.json

Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/j80/info.json

Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/j80/j80.h

Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/j80/j80.h

Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/j80/keymaps/default/keymap.c

Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>

* Apply suggestions from code review

Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>

* Added full right shift layouts

11 files changed, 1132 insertions, 0 deletions

diff --git a/keyboards/j80/config.h b/keyboards/j80/config.h
new file mode 100644
index 0000000000..3a5328ac41
--- /dev/null
+++ b/keyboards/j80/config.h
@@ -0,0 +1,55 @@
+/*
+Copyright 2019 JER
+
+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"
+
+#define VENDOR_ID 0x20A0
+#define PRODUCT_ID 0x422D
+#define DEVICE_VER 0x0001
+#define MANUFACTURER JER
+#define PRODUCT J80
+
+#define MATRIX_ROWS 7
+#define MATRIX_COLS 14
+
+#define MATRIX_ROW_PINS { B1, B2, B3, B5, B6, B7, B0 }
+#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, A0 }
+#define UNUSED_PINS { B4, C1, C0, D0, D1, D2, D3, D4, D5, D6, D7 }
+
+#define DIODE_DIRECTION COL2ROW
+#define DEBOUNCE 5
+
+#define BACKLIGHT_LEVELS 3
+#define BACKLIGHT_PIN D4
+
+#define NO_UART 1
+
+/* disable these deprecated features by default */
+#ifndef LINK_TIME_OPTIMIZATION_ENABLE
+  #define NO_ACTION_MACRO
+  #define NO_ACTION_FUNCTION
+#endif
+
+/* key combination for magic key command */
+/* defined by default; to change, uncomment and set to the combination you want */
+// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/j80/info.json b/keyboards/j80/info.json
new file mode 100644
index 0000000000..b31b443ede
--- /dev/null
+++ b/keyboards/j80/info.json
@@ -0,0 +1,397 @@
+{
+  "keyboard_name": "J80",
+  "url": "",
+  "maintainer": "oeywil",
+  "width": 18.25,
+  "height": 6.25,
+  "layouts": {
+    "LAYOUT_tkl_ansi": {
+      "layout": [
+        {"x":0, "y":0},
+        {"x":2, "y":0},
+        {"x":3, "y":0},
+        {"x":4, "y":0},
+        {"x":5, "y":0},
+        {"x":6.5, "y":0},
+        {"x":7.5, "y":0},
+        {"x":8.5, "y":0},
+        {"x":9.5, "y":0},
+        {"x":11, "y":0},
+        {"x":12, "y":0},
+        {"x":13, "y":0},
+        {"x":14, "y":0},
+        {"x":15.25, "y":0},
+        {"x":16.25, "y":0},
+        {"x":17.25, "y":0},
+
+        {"x":0, "y":1.25},
+        {"x":1, "y":1.25},
+        {"x":2, "y":1.25},
+        {"x":3, "y":1.25},
+        {"x":4, "y":1.25},
+        {"x":5, "y":1.25},
+        {"x":6, "y":1.25},
+        {"x":7, "y":1.25},
+        {"x":8, "y":1.25},
+        {"x":9, "y":1.25},
+        {"x":10, "y":1.25},
+        {"x":11, "y":1.25},
+        {"x":12, "y":1.25},
+        {"x":13, "y":1.25, "w":2},
+        {"x":15.25, "y":1.25},
+        {"x":16.25, "y":1.25},
+        {"x":17.25, "y":1.25},
+
+        {"x":0, "y":2.25, "w":1.5},
+        {"x":1.5, "y":2.25},
+        {"x":2.5, "y":2.25},
+        {"x":3.5, "y":2.25},
+        {"x":4.5, "y":2.25},
+        {"x":5.5, "y":2.25},
+        {"x":6.5, "y":2.25},
+        {"x":7.5, "y":2.25},
+        {"x":8.5, "y":2.25},
+        {"x":9.5, "y":2.25},
+        {"x":10.5, "y":2.25},
+        {"x":11.5, "y":2.25},
+        {"x":12.5, "y":2.25},
+        {"x":13.5, "y":2.25, "w":1.5},
+        {"x":15.25, "y":2.25},
+        {"x":16.25, "y":2.25},
+        {"x":17.25, "y":2.25},
+
+        {"x":0, "y":3.25, "w":1.75},
+        {"x":1.75, "y":3.25},
+        {"x":2.75, "y":3.25},
+        {"x":3.75, "y":3.25},
+        {"x":4.75, "y":3.25},
+        {"x":5.75, "y":3.25},
+        {"x":6.75, "y":3.25},
+        {"x":7.75, "y":3.25},
+        {"x":8.75, "y":3.25},
+        {"x":9.75, "y":3.25},
+        {"x":10.75, "y":3.25},
+        {"x":11.75, "y":3.25},
+        {"x":12.75, "y":3.25, "w":2.25},
+
+        {"x":0, "y":4.25, "w":2.25},
+        {"x":2.25, "y":4.25},
+        {"x":3.25, "y":4.25},
+        {"x":4.25, "y":4.25},
+        {"x":5.25, "y":4.25},
+        {"x":6.25, "y":4.25},
+        {"x":7.25, "y":4.25},
+        {"x":8.25, "y":4.25},
+        {"x":9.25, "y":4.25},
+        {"x":10.25, "y":4.25},
+        {"x":11.25, "y":4.25},
+        {"x":12.25, "y":4.25, "w":2.75},
+        {"x":16.25, "y":4.25},
+
+        {"x":0, "y":5.25, "w":1.25},
+        {"x":1.25, "y":5.25, "w":1.25},
+        {"x":2.5, "y":5.25, "w":1.25},
+        {"x":3.75, "y":5.25, "w":6.25},
+        {"x":10, "y":5.25, "w":1.25},
+        {"x":11.25, "y":5.25, "w":1.25},
+        {"x":12.5, "y":5.25, "w":1.25},
+        {"x":13.75, "y":5.25, "w":1.25},
+        {"x":15.25, "y":5.25},
+        {"x":16.25, "y":5.25},
+        {"x":17.25, "y":5.25}
+      ]
+    },
+    "LAYOUT_tkl_ansi_split_rshift": {
+      "layout": [
+        {"x":0, "y":0},
+        {"x":2, "y":0},
+        {"x":3, "y":0},
+        {"x":4, "y":0},
+        {"x":5, "y":0},
+        {"x":6.5, "y":0},
+        {"x":7.5, "y":0},
+        {"x":8.5, "y":0},
+        {"x":9.5, "y":0},
+        {"x":11, "y":0},
+        {"x":12, "y":0},
+        {"x":13, "y":0},
+        {"x":14, "y":0},
+        {"x":15.25, "y":0},
+        {"x":16.25, "y":0},
+        {"x":17.25, "y":0},
+
+        {"x":0, "y":1.25},
+        {"x":1, "y":1.25},
+        {"x":2, "y":1.25},
+        {"x":3, "y":1.25},
+        {"x":4, "y":1.25},
+        {"x":5, "y":1.25},
+        {"x":6, "y":1.25},
+        {"x":7, "y":1.25},
+        {"x":8, "y":1.25},
+        {"x":9, "y":1.25},
+        {"x":10, "y":1.25},
+        {"x":11, "y":1.25},
+        {"x":12, "y":1.25},
+        {"x":13, "y":1.25, "w":2},
+        {"x":15.25, "y":1.25},
+        {"x":16.25, "y":1.25},
+        {"x":17.25, "y":1.25},
+
+        {"x":0, "y":2.25, "w":1.5},
+        {"x":1.5, "y":2.25},
+        {"x":2.5, "y":2.25},
+        {"x":3.5, "y":2.25},
+        {"x":4.5, "y":2.25},
+        {"x":5.5, "y":2.25},
+        {"x":6.5, "y":2.25},
+        {"x":7.5, "y":2.25},
+        {"x":8.5, "y":2.25},
+        {"x":9.5, "y":2.25},
+        {"x":10.5, "y":2.25},
+        {"x":11.5, "y":2.25},
+        {"x":12.5, "y":2.25},
+        {"x":13.5, "y":2.25, "w":1.5},
+        {"x":15.25, "y":2.25},
+        {"x":16.25, "y":2.25},
+        {"x":17.25, "y":2.25},
+
+        {"x":0, "y":3.25, "w":1.75},
+        {"x":1.75, "y":3.25},
+        {"x":2.75, "y":3.25},
+        {"x":3.75, "y":3.25},
+        {"x":4.75, "y":3.25},
+        {"x":5.75, "y":3.25},
+        {"x":6.75, "y":3.25},
+        {"x":7.75, "y":3.25},
+        {"x":8.75, "y":3.25},
+        {"x":9.75, "y":3.25},
+        {"x":10.75, "y":3.25},
+        {"x":11.75, "y":3.25},
+        {"x":12.75, "y":3.25, "w":2.25},
+
+        {"x":0, "y":4.25, "w":2.25},
+        {"x":2.25, "y":4.25},
+        {"x":3.25, "y":4.25},
+        {"x":4.25, "y":4.25},
+        {"x":5.25, "y":4.25},
+        {"x":6.25, "y":4.25},
+        {"x":7.25, "y":4.25},
+        {"x":8.25, "y":4.25},
+        {"x":9.25, "y":4.25},
+        {"x":10.25, "y":4.25},
+        {"x":11.25, "y":4.25},
+        {"x":12.25, "y":4.25, "w":1.75},
+        {"x":14, "y":4.25},
+        {"x":16.25, "y":4.25},
+
+        {"x":0, "y":5.25, "w":1.25},
+        {"x":1.25, "y":5.25, "w":1.25},
+        {"x":2.5, "y":5.25, "w":1.25},
+        {"x":3.75, "y":5.25, "w":6.25},
+        {"x":10, "y":5.25, "w":1.25},
+        {"x":11.25, "y":5.25, "w":1.25},
+        {"x":12.5, "y":5.25, "w":1.25},
+        {"x":13.75, "y":5.25, "w":1.25},
+        {"x":15.25, "y":5.25},
+        {"x":16.25, "y":5.25},
+        {"x":17.25, "y":5.25}
+      ]
+    },
+    "LAYOUT_tkl_iso": {
+      "layout": [
+        {"x":0, "y":0},
+        {"x":2, "y":0},
+        {"x":3, "y":0},
+        {"x":4, "y":0},
+        {"x":5, "y":0},
+        {"x":6.5, "y":0},
+        {"x":7.5, "y":0},
+        {"x":8.5, "y":0},
+        {"x":9.5, "y":0},
+        {"x":11, "y":0},
+        {"x":12, "y":0},
+        {"x":13, "y":0},
+        {"x":14, "y":0},
+        {"x":15.25, "y":0},
+        {"x":16.25, "y":0},
+        {"x":17.25, "y":0},
+
+        {"x":0, "y":1.25},
+        {"x":1, "y":1.25},
+        {"x":2, "y":1.25},
+        {"x":3, "y":1.25},
+        {"x":4, "y":1.25},
+        {"x":5, "y":1.25},
+        {"x":6, "y":1.25},
+        {"x":7, "y":1.25},
+        {"x":8, "y":1.25},
+        {"x":9, "y":1.25},
+        {"x":10, "y":1.25},
+        {"x":11, "y":1.25},
+        {"x":12, "y":1.25},
+        {"x":13, "y":1.25, "w":2},
+        {"x":15.25, "y":1.25},
+        {"x":16.25, "y":1.25},
+        {"x":17.25, "y":1.25},
+
+        {"x":0, "y":2.25, "w":1.5},
+        {"x":1.5, "y":2.25},
+        {"x":2.5, "y":2.25},
+        {"x":3.5, "y":2.25},
+        {"x":4.5, "y":2.25},
+        {"x":5.5, "y":2.25},
+        {"x":6.5, "y":2.25},
+        {"x":7.5, "y":2.25},
+        {"x":8.5, "y":2.25},
+        {"x":9.5, "y":2.25},
+        {"x":10.5, "y":2.25},
+        {"x":11.5, "y":2.25},
+        {"x":12.5, "y":2.25},
+        {"x":15.25, "y":2.25},
+        {"x":16.25, "y":2.25},
+        {"x":17.25, "y":2.25},
+
+        {"x":0, "y":3.25, "w":1.75},
+        {"x":1.75, "y":3.25},
+        {"x":2.75, "y":3.25},
+        {"x":3.75, "y":3.25},
+        {"x":4.75, "y":3.25},
+        {"x":5.75, "y":3.25},
+        {"x":6.75, "y":3.25},
+        {"x":7.75, "y":3.25},
+        {"x":8.75, "y":3.25},
+        {"x":9.75, "y":3.25},
+        {"x":10.75, "y":3.25},
+        {"x":11.75, "y":3.25},
+        {"x":12.75, "y":3.25},
+        {"x":13.75, "y":2.25, "w":1.25, "h":2},
+
+        {"x":0, "y":4.25, "w":1.25},
+        {"x":1.25, "y":4.25},
+        {"x":2.25, "y":4.25},
+        {"x":3.25, "y":4.25},
+        {"x":4.25, "y":4.25},
+        {"x":5.25, "y":4.25},
+        {"x":6.25, "y":4.25},
+        {"x":7.25, "y":4.25},
+        {"x":8.25, "y":4.25},
+        {"x":9.25, "y":4.25},
+        {"x":10.25, "y":4.25},
+        {"x":11.25, "y":4.25},
+        {"x":12.25, "y":4.25, "w":2.75},
+        {"x":16.25, "y":4.25},
+
+        {"x":0, "y":5.25, "w":1.25},
+        {"x":1.25, "y":5.25, "w":1.25},
+        {"x":2.5, "y":5.25, "w":1.25},
+        {"x":3.75, "y":5.25, "w":6.25},
+        {"x":10, "y":5.25, "w":1.25},
+        {"x":11.25, "y":5.25, "w":1.25},
+        {"x":12.5, "y":5.25, "w":1.25},
+        {"x":13.75, "y":5.25, "w":1.25},
+        {"x":15.25, "y":5.25},
+        {"x":16.25, "y":5.25},
+        {"x":17.25, "y":5.25}
+      ]
+    },
+    "LAYOUT_tkl_iso_split_rshift": {
+      "layout": [
+        {"x":0, "y":0},
+        {"x":2, "y":0},
+        {"x":3, "y":0},
+        {"x":4, "y":0},
+        {"x":5, "y":0},
+        {"x":6.5, "y":0},
+        {"x":7.5, "y":0},
+        {"x":8.5, "y":0},
+        {"x":9.5, "y":0},
+        {"x":11, "y":0},
+        {"x":12, "y":0},
+        {"x":13, "y":0},
+        {"x":14, "y":0},
+        {"x":15.25, "y":0},
+        {"x":16.25, "y":0},
+        {"x":17.25, "y":0},
+
+        {"x":0, "y":1.25},
+        {"x":1, "y":1.25},
+        {"x":2, "y":1.25},
+        {"x":3, "y":1.25},
+        {"x":4, "y":1.25},
+        {"x":5, "y":1.25},
+        {"x":6, "y":1.25},
+        {"x":7, "y":1.25},
+        {"x":8, "y":1.25},
+        {"x":9, "y":1.25},
+        {"x":10, "y":1.25},
+        {"x":11, "y":1.25},
+        {"x":12, "y":1.25},
+        {"x":13, "y":1.25, "w":2},
+        {"x":15.25, "y":1.25},
+        {"x":16.25, "y":1.25},
+        {"x":17.25, "y":1.25},
+
+        {"x":0, "y":2.25, "w":1.5},
+        {"x":1.5, "y":2.25},
+        {"x":2.5, "y":2.25},
+        {"x":3.5, "y":2.25},
+        {"x":4.5, "y":2.25},
+        {"x":5.5, "y":2.25},
+        {"x":6.5, "y":2.25},
+        {"x":7.5, "y":2.25},
+        {"x":8.5, "y":2.25},
+        {"x":9.5, "y":2.25},
+        {"x":10.5, "y":2.25},
+        {"x":11.5, "y":2.25},
+        {"x":12.5, "y":2.25},
+        {"x":15.25, "y":2.25},
+        {"x":16.25, "y":2.25},
+        {"x":17.25, "y":2.25},
+
+        {"x":0, "y":3.25, "w":1.75},
+        {"x":1.75, "y":3.25},
+        {"x":2.75, "y":3.25},
+        {"x":3.75, "y":3.25},
+        {"x":4.75, "y":3.25},
+        {"x":5.75, "y":3.25},
+        {"x":6.75, "y":3.25},
+        {"x":7.75, "y":3.25},
+        {"x":8.75, "y":3.25},
+        {"x":9.75, "y":3.25},
+        {"x":10.75, "y":3.25},
+        {"x":11.75, "y":3.25},
+        {"x":12.75, "y":3.25},
+        {"x":13.75, "y":2.25, "w":1.25, "h":2},
+
+        {"x":0, "y":4.25, "w":1.25},
+        {"x":1.25, "y":4.25},
+        {"x":2.25, "y":4.25},
+        {"x":3.25, "y":4.25},
+        {"x":4.25, "y":4.25},
+        {"x":5.25, "y":4.25},
+        {"x":6.25, "y":4.25},
+        {"x":7.25, "y":4.25},
+        {"x":8.25, "y":4.25},
+        {"x":9.25, "y":4.25},
+        {"x":10.25, "y":4.25},
+        {"x":11.25, "y":4.25},
+        {"x":12.25, "y":4.25, "w":1.75},
+        {"x":14, "y":4.25},
+        {"x":16.25, "y":4.25},
+
+        {"x":0, "y":5.25, "w":1.25},
+        {"x":1.25, "y":5.25, "w":1.25},
+        {"x":2.5, "y":5.25, "w":1.25},
+        {"x":3.75, "y":5.25, "w":6.25},
+        {"x":10, "y":5.25, "w":1.25},
+        {"x":11.25, "y":5.25, "w":1.25},
+        {"x":12.5, "y":5.25, "w":1.25},
+        {"x":13.75, "y":5.25, "w":1.25},
+        {"x":15.25, "y":5.25},
+        {"x":16.25, "y":5.25},
+        {"x":17.25, "y":5.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/j80/j80.c b/keyboards/j80/j80.c
new file mode 100644
index 0000000000..4ac0200a28
--- /dev/null
+++ b/keyboards/j80/j80.c
@@ -0,0 +1,26 @@
+/* Copyright 2019 JER
+ *
+ * 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 "j80.h"
+
+bool led_update_kb(led_t led_state) {
+    if (led_update_user(led_state)) {
+        writePin(D1, led_state.caps_lock);
+        writePin(D0, led_state.num_lock);
+        writePin(D6, led_state.scroll_lock);
+    }
+    return true;
+}
diff --git a/keyboards/j80/j80.h b/keyboards/j80/j80.h
new file mode 100644
index 0000000000..a528c70c7d
--- /dev/null
+++ b/keyboards/j80/j80.h
@@ -0,0 +1,115 @@
+/* Copyright 2019 JER
+ *
+ * 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 ____ KC_NO
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+ #define LAYOUT_all( \
+   k00, k02, k03, k04, k05, k07, k08, k09, k0A, k0B, k0D, k0C, k01, k61, k62, k6D, \
+   k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D, k1C, k66, k65, k64, \
+   k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2C, k6C, k68, k67, \
+   k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \
+   k40, k3C, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4D, k4C, \
+   k50, k51, k52, k54, k58, k59, k5A, k5B, k5D, k5C, k57 \
+ ){ \
+   { k00,  k01, k02, k03,  k04, k05,  ____, k07, k08, k09,  k0A,  k0B,  k0C, k0D }, \
+   { k10,  k11, k12, k13,  k14, k15,  k16,  k17, k18, k19,  k1A,  k1B,  k1C, k1D }, \
+   { k20,  k21, k22, k23,  k24, k25,  k26,  k27, k28, k29,  k2A,  k2B,  k2C, k2D }, \
+   { k30,  k31, k32, k33,  k34, k35,  k36,  k37, k38, k39,  k3A,  k3B,  k3C, k3D }, \
+   { k40,  k41, k42, k43,  k44, k45,  k46,  k47, k48, k49,  k4A,  k4B,  k4C, k4D }, \
+   { k50,  k51, k52, ____, k54, ____, ____, k57, k58, k59,  k5A,  k5B,  k5C, k5D }, \
+   { ____, k61, k62, ____, k64, k65,  k66,  k67, k68, ____, ____, ____, k6C, k6D }, \
+ }
+
+ #define LAYOUT_tkl_iso( \
+   k00, k02, k03, k04, k05, k07, k08, k09, k0A, k0B, k0D, k0C, k01, k61, k62, k6D, \
+   k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D, k1C, k66, k65, k64, \
+   k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k6C, k68, k67, \
+   k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k2C, k3D, \
+   k40, k3C, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, \
+   k50, k51, k52, k54, k58, k59, k5A, k5B, k5D, k5C, k57  \
+ ){ \
+   { k00,  k01, k02, k03,  k04, k05,  ____, k07, k08, k09,  k0A,  k0B,  k0C, k0D  }, \
+   { k10,  k11, k12, k13,  k14, k15,  k16,  k17, k18, k19,  k1A,  k1B,  k1C, k1D  }, \
+   { k20,  k21, k22, k23,  k24, k25,  k26,  k27, k28, k29,  k2A,  k2B,  k2C, k2D  }, \
+   { k30,  k31, k32, k33,  k34, k35,  k36,  k37, k38, k39,  k3A,  k3B,  k3C, k3D  }, \
+   { k40,  k41, k42, k43,  k44, k45,  k46,  k47, k48, k49,  k4A,  k4B,  k4C, ____ }, \
+   { k50,  k51, k52, ____, k54, ____, ____, k57, k58, k59,  k5A,  k5B,  k5C, k5D  }, \
+   { ____, k61, k62, ____, k64, k65,  k66,  k67, k68, ____, ____, ____, k6C, k6D  }, \
+ }
+
+#define LAYOUT_tkl_iso_split_rshift( \
+  k00, k02, k03, k04, k05, k07, k08, k09, k0A, k0B, k0D, k0C, k01, k61, k62, k6D, \
+  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D, k1C, k66, k65, k64, \
+  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k6C, k68, k67, \
+  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k2C, k3D, \
+  k40, k3C, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4D, k4C, \
+  k50, k51, k52, k54, k58, k59, k5A, k5B, k5D, k5C, k57  \
+){ \
+  { k00,  k01, k02, k03,  k04, k05,  ____, k07, k08, k09,  k0A,  k0B,  k0C, k0D }, \
+  { k10,  k11, k12, k13,  k14, k15,  k16,  k17, k18, k19,  k1A,  k1B,  k1C, k1D }, \
+  { k20,  k21, k22, k23,  k24, k25,  k26,  k27, k28, k29,  k2A,  k2B,  k2C, k2D }, \
+  { k30,  k31, k32, k33,  k34, k35,  k36,  k37, k38, k39,  k3A,  k3B,  k3C, k3D }, \
+  { k40,  k41, k42, k43,  k44, k45,  k46,  k47, k48, k49,  k4A,  k4B,  k4C, k4D }, \
+  { k50,  k51, k52, ____, k54, ____, ____, k57, k58, k59,  k5A,  k5B,  k5C, k5D }, \
+  { ____, k61, k62, ____, k64, k65,  k66,  k67, k68, ____, ____, ____, k6C, k6D }, \
+}
+
+#define LAYOUT_tkl_ansi( \
+  k00, k02, k03, k04, k05, k07, k08, k09, k0A, k0B, k0D, k0C, k01, k61, k62, k6D, \
+  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D, k1C, k66, k65, k64, \
+  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2C, k6C, k68, k67, \
+  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \
+  k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, \
+  k50, k51, k52, k54, k58, k59, k5A, k5B, k5D, k5C, k57  \
+){ \
+  { k00,  k01, k02, k03,  k04, k05,  ____, k07, k08, k09,  k0A,  k0B,  k0C,  k0D  }, \
+  { k10,  k11, k12, k13,  k14, k15,  k16,  k17, k18, k19,  k1A,  k1B,  k1C,  k1D  }, \
+  { k20,  k21, k22, k23,  k24, k25,  k26,  k27, k28, k29,  k2A,  k2B,  k2C,  k2D  }, \
+  { k30,  k31, k32, k33,  k34, k35,  k36,  k37, k38, k39,  k3A,  k3B,  ____, k3D  }, \
+  { k40,  k41, k42, k43,  k44, k45,  k46,  k47, k48, k49,  k4A,  k4B,  k4C,  ____ }, \
+  { k50,  k51, k52, ____, k54, ____, ____, k57, k58, k59,  k5A,  k5B,  k5C,  k5D  }, \
+  { ____, k61, k62, ____, k64, k65,  k66,  k67, k68, ____, ____, ____, k6C,  k6D  }, \
+}
+
+#define LAYOUT_tkl_ansi_split_rshift( \
+  k00, k02, k03, k04, k05, k07, k08, k09, k0A, k0B, k0D, k0C, k01, k61, k62, k6D, \
+  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D, k1C, k66, k65, k64, \
+  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2C, k6C, k68, k67, \
+  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \
+  k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4D, k4C, \
+  k50, k51, k52, k54, k58, k59, k5A, k5B, k5D, k5C, k57  \
+){ \
+  { k00,  k01, k02, k03,  k04, k05,  ____, k07, k08, k09,  k0A,  k0B,  k0C,  k0D }, \
+  { k10,  k11, k12, k13,  k14, k15,  k16,  k17, k18, k19,  k1A,  k1B,  k1C,  k1D }, \
+  { k20,  k21, k22, k23,  k24, k25,  k26,  k27, k28, k29,  k2A,  k2B,  k2C,  k2D }, \
+  { k30,  k31, k32, k33,  k34, k35,  k36,  k37, k38, k39,  k3A,  k3B,  ____, k3D }, \
+  { k40,  k41, k42, k43,  k44, k45,  k46,  k47, k48, k49,  k4A,  k4B,  k4C,  k4D }, \
+  { k50,  k51, k52, ____, k54, ____, ____, k57, k58, k59,  k5A,  k5B,  k5C,  k5D }, \
+  { ____, k61, k62, ____, k64, k65,  k66,  k67, k68, ____, ____, ____, k6C,  k6D }, \
+}
diff --git a/keyboards/j80/keymaps/default/keymap.c b/keyboards/j80/keymaps/default/keymap.c
new file mode 100644
index 0000000000..6926da8ea1
--- /dev/null
+++ b/keyboards/j80/keymaps/default/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2019 JER
+ *
+ * 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
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+    QMKBEST = SAFE_RANGE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_BASE] = LAYOUT_tkl_ansi_split_rshift(
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+  KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FN),          KC_UP,
+  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+[_FN] = LAYOUT_tkl_ansi_split_rshift(
+  RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, QMKBEST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case QMKBEST:
+            if (record->event.pressed) {
+                // when keycode QMKBEST is pressed
+                SEND_STRING("QMK is the best thing ever!");
+            } else {
+                // when keycode QMKBEST is released
+            }
+            break;
+    }
+    return true;
+}
diff --git a/keyboards/j80/keymaps/default/readme.md b/keyboards/j80/keymaps/default/readme.md
new file mode 100644
index 0000000000..21ad7d5aba
--- /dev/null
+++ b/keyboards/j80/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for J80
diff --git a/keyboards/j80/keymaps/default_iso/keymap.c b/keyboards/j80/keymaps/default_iso/keymap.c
new file mode 100644
index 0000000000..4253454f79
--- /dev/null
+++ b/keyboards/j80/keymaps/default_iso/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2019 JER
+ *
+ * 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
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+    QMKBEST = SAFE_RANGE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_BASE] = LAYOUT_tkl_iso_split_rshift(
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS,
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+  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_DEL,  KC_END,  KC_PGDN,
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+  KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FN),            KC_UP,
+  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+[_FN] = LAYOUT_tkl_iso_split_rshift(
+  RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, QMKBEST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case QMKBEST:
+            if (record->event.pressed) {
+                // when keycode QMKBEST is pressed
+                SEND_STRING("QMK is the best thing ever!");
+            } else {
+                // when keycode QMKBEST is released
+            }
+            break;
+    }
+    return true;
+}
diff --git a/keyboards/j80/keymaps/default_iso/readme.md b/keyboards/j80/keymaps/default_iso/readme.md
new file mode 100644
index 0000000000..db7bdb4157
--- /dev/null
+++ b/keyboards/j80/keymaps/default_iso/readme.md
@@ -0,0 +1 @@
+# The default ISO keymap for J80
diff --git a/keyboards/j80/readme.md b/keyboards/j80/readme.md
new file mode 100644
index 0000000000..44ed46fe45
--- /dev/null
+++ b/keyboards/j80/readme.md
@@ -0,0 +1,21 @@
+# J80
+
+JER PLANT - J80 (JER-A06) Round 2
+The J80 is a OG Cherry style(no plate) custom 80% kit.
+It is characterized by the fact that the hoisting PCB has no steel plate and can fully reflect the elasticity of the linear shaft. Tested by the buyer, its feel and typing sound are different from other custom keyboards and are satisfactory. It has a simple and elegant original cherry-like shape, the author's original intention is to start from the touching feel, let everyone have a comfortable tapping experience. The light stick module in the upper right corner is detachable, it could be switches (3 keys) or the light stick module. When using light stick module, PrtScr Scrolllock and Pause are achieved by pressing FN+ Insert / Home / Page Up.
+
+* Keyboard Maintainer: [oeywil](https://github.com/oeywil)
+* Hardware Supported: J80 PCB (atmega32a)
+* Hardware Availability: [J80 R2 GB](https://geekhack.org/index.php?topic=101401.0)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make j80:default
+
+Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
+
+    make j80:default:flash
+
+**Reset Key**: Hold down the key located at *TOP RIGHT*, commonly programmed as *PAUSE* while plugging in the keyboard. The key definition for the reset key is k6D. Bootmagic Lite is enabled so holding down Escape while plugging in the keyboard will also jump to bootloader, after QMK is flashed.
+
+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/j80/rules.mk b/keyboards/j80/rules.mk
new file mode 100644
index 0000000000..1ceafc9c01
--- /dev/null
+++ b/keyboards/j80/rules.mk
@@ -0,0 +1,25 @@
+# MCU name
+MCU = atmega32a
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = bootloadHID
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE  = no       # Mouse keys
+EXTRAKEY_ENABLE  = yes      # Audio control and System control
+CONSOLE_ENABLE   = yes      # Console for debug
+COMMAND_ENABLE   = yes      # Commands for debug and configuration
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE  = no       # Enable keyboard RGB underglow
+
+OPT_DEFS = -DDEBUG_LEVEL=0
diff --git a/keyboards/j80/usbconfig.h b/keyboards/j80/usbconfig.h
new file mode 100644
index 0000000000..0c377f4b7e
--- /dev/null
+++ b/keyboards/j80/usbconfig.h
@@ -0,0 +1,373 @@
+#pragma once
+
+#include "config.h"
+
+/*
+General Description:
+This file is an example configuration (with inline documentation) for the USB
+driver. It configures V-USB for USB D+ connected to Port D bit 2 (which is
+also hardware interrupt 0 on many devices) and USB D- to Port D bit 4. You may
+wire the lines to any other port, as long as D+ is also wired to INT0 (or any
+other hardware interrupt, as long as it is the highest level interrupt, see
+section at the end of this file).
+*/
+
+/* ---------------------------- Hardware Config ---------------------------- */
+
+#define USB_CFG_IOPORTNAME D
+/* This is the port where the USB bus is connected. When you configure it to
+ * "B", the registers PORTB, PINB and DDRB will be used.
+ */
+#define USB_CFG_DMINUS_BIT 3
+/* This is the bit number in USB_CFG_IOPORT where the USB D- line is connected.
+ * This may be any bit in the port.
+ */
+#define USB_CFG_DPLUS_BIT 2
+/* This is the bit number in USB_CFG_IOPORT where the USB D+ line is connected.
+ * This may be any bit in the port. Please note that D+ must also be connected
+ * to interrupt pin INT0! [You can also use other interrupts, see section
+ * "Optional MCU Description" below, or you can connect D- to the interrupt, as
+ * it is required if you use the USB_COUNT_SOF feature. If you use D- for the
+ * interrupt, the USB interrupt will also be triggered at Start-Of-Frame
+ * markers every millisecond.]
+ */
+#define USB_CFG_CLOCK_KHZ (F_CP