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

9 files changed, 408 insertions, 0 deletions

diff --git a/keyboards/kopibeng/typ65/config.h b/keyboards/kopibeng/typ65/config.h
new file mode 100644
index 0000000000..9b96483b6a
--- /dev/null
+++ b/keyboards/kopibeng/typ65/config.h
@@ -0,0 +1,59 @@
+/* Copyright 2021 Samuel Lu
+ *
+ * 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       0x4B50 // 'KP' kopibeng  
+#define PRODUCT_ID      0x065E 
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    kopibeng
+#define PRODUCT         Typ65+
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { D0, D1, D2, F6, B0 }
+#define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F5, F4, F1, F0, E6 }
+
+#define LED_CAPS_LOCK_PIN B1
+#define INDICATOR_0 B2
+#define INDICATOR_1 B7
+#define INDICATOR_2 B3
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/kopibeng/typ65/info.json b/keyboards/kopibeng/typ65/info.json
new file mode 100644
index 0000000000..ce3bfbee39
--- /dev/null
+++ b/keyboards/kopibeng/typ65/info.json
@@ -0,0 +1,88 @@
+{
+    "keyboard_name": "Typ65+",
+    "maintainer": "kopibeng",
+    "url": "https://www.axiomstudios.shop/",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "K01", "x": 1.25, "y": 0 },
+                { "label": "K02", "x": 2.25, "y": 0 },
+                { "label": "K03", "x": 3.25, "y": 0 },
+                { "label": "K04", "x": 4.25, "y": 0 },
+                { "label": "K05", "x": 5.25, "y": 0 },
+                { "label": "K06", "x": 6.25, "y": 0 },
+                { "label": "K07", "x": 7.25, "y": 0 },
+                { "label": "K08", "x": 8.25, "y": 0 },
+                { "label": "K09", "x": 9.25, "y": 0 },
+                { "label": "K0A", "x": 10.25, "y": 0 },
+                { "label": "K0B", "x": 11.25, "y": 0 },
+                { "label": "K0C", "x": 12.25, "y": 0 },
+                { "label": "K0D", "x": 13.25, "y": 0 },
+                { "label": "K1E", "x": 14.25, "y": 0 },
+                { "label": "K0E", "x": 15.25, "y": 0 },
+                { "label": "K0F", "x": 16.25, "y": 0 },
+				
+                { "label": "K00", "x": 0, "y": 1 },
+                { "label": "K11", "w": 1.5, "x": 1.25, "y": 1 },
+                { "label": "K12", "x": 2.75, "y": 1 },
+                { "label": "K13", "x": 3.75, "y": 1 },
+                { "label": "K14", "x": 4.75, "y": 1 },
+                { "label": "K15", "x": 5.75, "y": 1 },
+                { "label": "K16", "x": 6.75, "y": 1 },
+                { "label": "K17", "x": 7.75, "y": 1 },
+                { "label": "K18", "x": 8.75, "y": 1 },
+                { "label": "K19", "x": 9.75, "y": 1 },
+                { "label": "K1A", "x": 10.75, "y": 1 },
+                { "label": "K1B", "x": 11.75, "y": 1 },
+                { "label": "K1C", "x": 12.75, "y": 1 },
+                { "label": "K1D", "x": 13.75, "y": 1 },
+                { "label": "K2E", "w": 1.5, "x": 14.75, "y": 1 },
+                { "label": "K1F", "x": 16.25, "y": 1 },
+                
+                { "label": "K10", "x": 0, "y": 2 },
+				{ "label": "K21", "w": 1.75, "x": 1.25, "y": 2 },
+                { "label": "K22", "x": 3, "y": 2 },
+                { "label": "K23", "x": 4, "y": 2 },
+                { "label": "K24", "x": 5, "y": 2 },
+                { "label": "K25", "x": 6, "y": 2 },
+                { "label": "K26", "x": 7, "y": 2 },
+                { "label": "K27", "x": 8, "y": 2 },
+                { "label": "K28", "x": 9, "y": 2 },
+                { "label": "K29", "x": 10, "y": 2 },
+                { "label": "K2A", "x": 11, "y": 2 },
+                { "label": "K2B", "x": 12, "y": 2 },
+                { "label": "K2C", "x": 13, "y": 2 },
+                { "label": "K2D", "w": 2.25, "x": 14, "y": 2 },
+                { "label": "K2F", "x": 16.25, "y": 2 },
+                
+				{ "label": "K20", "x": 0, "y": 3 },
+                { "label": "K31", "w": 1.25, "x": 1.25, "y": 3 },
+                { "label": "K32", "x": 2.5, "y": 3 },
+                { "label": "K33", "x": 3.5, "y": 3 },
+                { "label": "K34", "x": 4.5, "y": 3 },
+                { "label": "K35", "x": 5.5, "y": 3 },
+                { "label": "K36", "x": 6.5, "y": 3 },
+                { "label": "K37", "x": 7.5, "y": 3 },
+                { "label": "K38", "x": 8.5, "y": 3 },
+                { "label": "K39", "x": 9.5, "y": 3 },
+                { "label": "K3A", "x": 10.5, "y": 3 },
+                { "label": "K3B", "x": 11.5, "y": 3 },
+                { "label": "K3C", "x": 12.5, "y": 3 },
+                { "label": "K3D", "w": 1.75, "x": 13.5, "y": 3 },
+                { "label": "K3E", "x": 15.25, "y": 3 },
+                { "label": "K3F", "x": 16.25, "y": 3 },
+                
+				{ "label": "K30", "x": 0, "y": 4 },
+                { "label": "K41", "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "K42", "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "K43", "w": 1.25, "x": 3.75, "y": 4 },
+                { "label": "K47", "w": 6.25, "x": 5, "y": 4 },
+                { "label": "K4B", "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "K4C", "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "K4D", "x": 14.25, "y": 4 },
+                { "label": "K4E", "x": 15.25, "y": 4 },
+                { "label": "K4F", "x": 16.25, "y": 4 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/kopibeng/typ65/keymaps/default/keymap.c b/keyboards/kopibeng/typ65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..63628ade61
--- /dev/null
+++ b/keyboards/kopibeng/typ65/keymaps/default/keymap.c
@@ -0,0 +1,57 @@
+/* Copyright 2021 Samuel Lu
+ *
+ * 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] = {
+
+	// Default layer
+	[0] = LAYOUT_all(
+		         KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
+		KC_TRNS, 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_PGUP,
+		KC_TRNS, 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_PGDN,
+		KC_TRNS, 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, KC_UP,            KC_END,
+		KC_TRNS, KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_LEFT, KC_DOWN,          KC_RGHT
+	),
+
+	// Fn1 Layer
+	[1] = LAYOUT_all(
+		         KC_TRNS, 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_TRNS, KC_TRNS, 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, 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
+	),
+
+	// Fn2 Layer
+	[2] = LAYOUT_all(
+		         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, 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
+	),
+	
+	// Fn3 Layer
+	[3] = LAYOUT_all(
+		         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, 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
+	),
+};
+
diff --git a/keyboards/kopibeng/typ65/keymaps/via/keymap.c b/keyboards/kopibeng/typ65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..63628ade61
--- /dev/null
+++ b/keyboards/kopibeng/typ65/keymaps/via/keymap.c
@@ -0,0 +1,57 @@
+/* Copyright 2021 Samuel Lu
+ *
+ * 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] = {
+
+	// Default layer
+	[0] = LAYOUT_all(
+		         KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
+		KC_TRNS, 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_PGUP,
+		KC_TRNS, 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_PGDN,
+		KC_TRNS, 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, KC_UP,            KC_END,
+		KC_TRNS, KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_LEFT, KC_DOWN,          KC_RGHT
+	),
+
+	// Fn1 Layer
+	[1] = LAYOUT_all(
+		         KC_TRNS, 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_TRNS, KC_TRNS, 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, 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
+	),
+
+	// Fn2 Layer
+	[2] = LAYOUT_all(
+		         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, 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
+	),
+	
+	// Fn3 Layer
+	[3] = LAYOUT_all(
+		         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, 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
+	),
+};
+
diff --git a/keyboards/kopibeng/typ65/keymaps/via/rules.mk b/keyboards/kopibeng/typ65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/kopibeng/typ65/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kopibeng/typ65/readme.md b/keyboards/kopibeng/typ65/readme.md
new file mode 100644
index 0000000000..af8106891d
--- /dev/null
+++ b/keyboards/kopibeng/typ65/readme.md
@@ -0,0 +1,21 @@
+# Typ65+
+
+![Typ65+](https://i.imgur.com/WCTwfdF.jpg)
+
+A 65% solderable or hotswap PCB with left side macro column, support for VIA and layer indicator LEDs.
+
+* Keyboard Maintainer: kopibeng
+* Hardware Supported: A 65% keyboard with ATMEGA32U4
+* Hardware Availability: https://www.axiomstudios.shop/
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kopibeng/typ65:via
+    
+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).
+
+## Bootloader
+
+* Physical reset button: Press the RESET switch on top side of PCB.
+* Bootmagic reset: Unplug keyboard, hold down ESC key and plug in the keyboard.
+* Keycode reset: Press the RESET keycode (default: MO(1) + HOME keys in default layout).
diff --git a/keyboards/kopibeng/typ65/rules.mk b/keyboards/kopibeng/typ65/rules.mk
new file mode 100644
index 0000000000..6089f643c4
--- /dev/null
+++ b/keyboards/kopibeng/typ65/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = no			# Enable Encoder
\ No newline at end of file
diff --git a/keyboards/kopibeng/typ65/typ65.c b/keyboards/kopibeng/typ65/typ65.c
new file mode 100644
index 0000000000..152b2e7737
--- /dev/null
+++ b/keyboards/kopibeng/typ65/typ65.c
@@ -0,0 +1,51 @@
+/* Copyright 2021 Samuel Lu
+ *
+ * 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 "typ65.h"
+
+void keyboard_pre_init_kb (void) {
+  setPinOutput(INDICATOR_0);
+  setPinOutput(INDICATOR_1);
+  setPinOutput(INDICATOR_2);
+
+  keyboard_pre_init_user();
+}
+
+__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
+    switch (get_highest_layer(state)) {
+        case 1:
+            writePinHigh(INDICATOR_0);
+            writePinLow(INDICATOR_1);
+            writePinLow(INDICATOR_2);
+            break;
+        case 2:
+            writePinLow(INDICATOR_0);
+            writePinHigh(INDICATOR_1);
+            writePinLow(INDICATOR_2);
+            break;
+		case 3:
+            writePinLow(INDICATOR_0);
+            writePinLow(INDICATOR_1);
+            writePinHigh(INDICATOR_2);
+            break;
+        default:
+            writePinHigh(INDICATOR_0);
+            writePinHigh(INDICATOR_1);
+            writePinHigh(INDICATOR_2);
+            break;
+    }
+	return state;
+}
\ No newline at end of file
diff --git a/keyboards/kopibeng/typ65/typ65.h b/keyboards/kopibeng/typ65/typ65.h
new file mode 100644
index 0000000000..189139df3b
--- /dev/null
+++ b/keyboards/kopibeng/typ65/typ65.h
@@ -0,0 +1,54 @@
+/* Copyright 2021 Samuel Lu
+ *
+ * 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
+
+/*
+ * 
+ *                   ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐  ┌───────┐
+ *                   │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1E │0E │0F │  │0E     │ Full Backspace
+ *             ┌───┐ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤  └─┬─────┤
+ *             │00 │ │11   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │2E   │1F │    │2E   │
+ *  2.25u      ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤  ┌─┴─┐   │ ISO
+ *  LShift     │10 │ │21    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D      │2F │  │2D │   │
+ * ┌────────┐  ├───┤ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤  └───┴───┘
+ * │31      │  │20 │ │31  │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D    │3E │3F │
+ * └────────┘  ├───┤ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ *             │30 │ │41  │42  │43  │47                      │4B  │4C  │ │4D │4E │4F │
+ *             └───┘ └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ *                   ┌─────┬───┬─────┬───────────────────────────┬─────┐
+ *                   │41   │42 │43   │47                         │4C   │ 7u Tsangan
+ *                   └─────┴───┴─────┴───────────────────────────┴─────┘
+ *
+ */
+
+#define LAYOUT_all( \
+         K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1E, K0E, K0F, \
+    K00, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2E,      K1F, \
+    K10, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,           K2F, \
+    K20, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3E, K3F, \
+    K30, K41, K42, K43,                K47,                K4B, K4C,      K4D, K4E, K4F  \
+) { \
+    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F}, \
+    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F}, \
+    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F}, \
+    {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F}, \
+    {___, K41, K42, K43, ___, ___, ___, K47, ___, ___, ___, K4B, K4C, K4D, K4E, K4F}  \
+}