From 6266c172b9363aa950cf13c52bed7674aae0375d Mon Sep 17 00:00:00 2001
From: Elliot Powell <32494740+e11i0t23@users.noreply.github.com>
Date: Mon, 26 Nov 2018 15:58:53 +0000
Subject: [PATCH] added ep/96 as a supported keyboard (#4476)

* added ep/96

* Update keyboards/ep/96/readme.md

Co-Authored-By: e11i0t23 <32494740+e11i0t23@users.noreply.github.com>

* removed led code

* Update keyboards/ep/96/config.h

Co-Authored-By: e11i0t23 <32494740+e11i0t23@users.noreply.github.com>

* Update keyboards/ep/96/info.json

Co-Authored-By: e11i0t23 <32494740+e11i0t23@users.noreply.github.com>

* Update keyboards/ep/96/readme.md

Co-Authored-By: e11i0t23 <32494740+e11i0t23@users.noreply.github.com>
---
 keyboards/ep/96/96.c                      |  43 +++
 keyboards/ep/96/96.h                      |  47 +++
 keyboards/ep/96/config.h                  | 212 +++++++++++
 keyboards/ep/96/info.json                 | 426 ++++++++++++++++++++++
 keyboards/ep/96/keymaps/default/keymap.c  |  67 ++++
 keyboards/ep/96/keymaps/default/readme.md |   1 +
 keyboards/ep/96/readme.md                 |  15 +
 keyboards/ep/96/rules.mk                  |  81 ++++
 8 files changed, 892 insertions(+)
 create mode 100644 keyboards/ep/96/96.c
 create mode 100644 keyboards/ep/96/96.h
 create mode 100644 keyboards/ep/96/config.h
 create mode 100644 keyboards/ep/96/info.json
 create mode 100644 keyboards/ep/96/keymaps/default/keymap.c
 create mode 100644 keyboards/ep/96/keymaps/default/readme.md
 create mode 100644 keyboards/ep/96/readme.md
 create mode 100644 keyboards/ep/96/rules.mk

diff --git a/keyboards/ep/96/96.c b/keyboards/ep/96/96.c
new file mode 100644
index 0000000000..9fdd51977d
--- /dev/null
+++ b/keyboards/ep/96/96.c
@@ -0,0 +1,43 @@
+/* Copyright 2018 Elliot Powell
+ *
+ * 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 "96.h"
+
+void matrix_init_kb(void) {
+	// put your keyboard start-up code here
+	// runs once when the firmware starts up
+
+	matrix_init_user();
+}
+
+void matrix_scan_kb(void) {
+	// put your looping keyboard code here
+	// runs every cycle (a lot)
+
+	matrix_scan_user();
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+	// put your per-action keyboard code here
+	// runs for every action, just before processing by the firmware
+
+	return process_record_user(keycode, record);
+}
+
+void led_set_kb(uint8_t usb_led) {
+	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
+
+	led_set_user(usb_led);
+}
diff --git a/keyboards/ep/96/96.h b/keyboards/ep/96/96.h
new file mode 100644
index 0000000000..1887eb472c
--- /dev/null
+++ b/keyboards/ep/96/96.h
@@ -0,0 +1,47 @@
+/* Copyright 2018 Elliot Powell
+ *
+ * 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/>.
+ */
+#ifndef EP96_H
+#define EP96_H
+
+#include "quantum.h"
+
+/* This 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 xxxx KC_NO
+
+#define LAYOUT( \
+    K000, K001, K002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, k017, k018, \
+    K100, K101, K102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,       k114, k115, k116, k117, k118, \
+    K200,       K202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,       k215, k216, k217,       \
+    K300,       K302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314, k315, k316, k317, k318, \
+    K400, K401, K402, k403, k404, k405, k406, k407, k408, k409, k410, k411,       k413, k414, k415, k416, k417,       \
+    K500, K501, K502,                   k506,                         k511, k512, k513, k514, k515, k516, k517, k518) \
+{ \
+    {K000, K001, K002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, k017, k018}, \
+    {K100, K101, K102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, xxxx, k114, k115, k116, k117, k118}, \
+    {K200, xxxx, K202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, xxxx, k215, k216, k217, xxxx}, \
+    {K300, xxxx, K302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314, k315, k316, k317, k318}, \
+    {K400, K401, K402, k403, k404, k405, k406, k407, k408, k409, k410, k411, xxxx, k413, k414, k415, k416, k417, xxxx}, \
+    {K500, K501, K502, xxxx, xxxx, xxxx, k506, xxxx, xxxx, xxxx, xxxx, k511, k512, k513, k514, k515, k516, k517, k518}  \
+}
+
+#endif
diff --git a/keyboards/ep/96/config.h b/keyboards/ep/96/config.h
new file mode 100644
index 0000000000..0c37e4c596
--- /dev/null
+++ b/keyboards/ep/96/config.h
@@ -0,0 +1,212 @@
+/*
+Copyright 2018 Elliot Powell
+
+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       0xFEED
+#define PRODUCT_ID      0x9696
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Elliot Powell
+#define PRODUCT         ep96
+#define DESCRIPTION     A simple 96 key keyboard
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 19
+
+/*
+ * 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 { B0, B1, B3, B2, B7, C6 }
+#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C7, F7, F6, F5, F4, F1, F0, E6 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
+#define DIODE_DIRECTION COL2ROW
+
+// #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCING_DELAY 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Magic Key Options
+ *
+ * Magic keys are hotkey commands that allow control over firmware functions of
+ * the keyboard. They are best used in combination with the HID Listen program,
+ * found here: https://www.pjrc.com/teensy/hid_listen.html
+ *
+ * The options below allow the magic key functionality to be changed. This is
+ * useful if your keyboard/keypad is missing keys and you want magic key support.
+ *
+ */
+
+/* key combination for magic key command */
+#define IS_COMMAND() ( \
+    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
+)
+
+/* control how magic key switches layers */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
+
+/* override magic key keymap */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
+//#define MAGIC_KEY_HELP1          H
+//#define MAGIC_KEY_HELP2          SLASH
+//#define MAGIC_KEY_DEBUG          D
+//#define MAGIC_KEY_DEBUG_MATRIX   X
+//#define MAGIC_KEY_DEBUG_KBD      K
+//#define MAGIC_KEY_DEBUG_MOUSE    M
+//#define MAGIC_KEY_VERSION        V
+//#define MAGIC_KEY_STATUS         S
+//#define MAGIC_KEY_CONSOLE        C
+//#define MAGIC_KEY_LAYER0_ALT1    ESC
+//#define MAGIC_KEY_LAYER0_ALT2    GRAVE
+//#define MAGIC_KEY_LAYER0         0
+//#define MAGIC_KEY_LAYER1         1
+//#define MAGIC_KEY_LAYER2         2
+//#define MAGIC_KEY_LAYER3         3
+//#define MAGIC_KEY_LAYER4         4
+//#define MAGIC_KEY_LAYER5         5
+//#define MAGIC_KEY_LAYER6         6
+//#define MAGIC_KEY_LAYER7         7
+//#define MAGIC_KEY_LAYER8         8
+//#define MAGIC_KEY_LAYER9         9
+//#define MAGIC_KEY_BOOTLOADER     PAUSE
+//#define MAGIC_KEY_LOCK           CAPS
+//#define MAGIC_KEY_EEPROM         E
+//#define MAGIC_KEY_NKRO           N
+//#define MAGIC_KEY_SLEEP_LED      Z
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+//#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 1
+
+/*
+ * HD44780 LCD Display Configuration
+ */
+/*
+#define LCD_LINES           2     //< number of visible lines of the display
+#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
+
+#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
+
+#if LCD_IO_MODE
+#define LCD_PORT         PORTB        //< port for the LCD lines
+#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
+#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
+#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
+#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
+#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
+#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
+#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
+#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
+#define LCD_RS_PORT      LCD_PORT     //< port for RS line
+#define LCD_RS_PIN       3            //< pin  for RS line
+#define LCD_RW_PORT      LCD_PORT     //< port for RW line
+#define LCD_RW_PIN       2            //< pin  for RW line
+#define LCD_E_PORT       LCD_PORT     //< port for Enable line
+#define LCD_E_PIN        1            //< pin  for Enable line
+#endif
+*/
+
diff --git a/keyboards/ep/96/info.json b/keyboards/ep/96/info.json
new file mode 100644
index 0000000000..4be41b24c3
--- /dev/null
+++ b/keyboards/ep/96/info.json
@@ -0,0 +1,426 @@
+{
+  "keyboard_name": "ep96",
+  "maintainer": "e11i0t23",
+  "width": 19,
+  "height": 6,
+  "layouts": {
+    "LAYOUT": {
+      "key_count": 100,
+      "layout": [{
+        "label": "Esc",
+        "x": 0,
+        "y": 0
+      }, {
+        "label": "F1",
+        "x": 1,
+        "y": 0
+      }, {
+        "label": "F2",
+        "x": 2,
+        "y": 0
+      }, {
+        "label": "F3",
+        "x": 3,
+        "y": 0
+      }, {
+        "label": "F4",
+        "x": 4,
+        "y": 0
+      }, {
+        "label": "F5",
+        "x": 5,
+        "y": 0
+      }, {
+        "label": "F6",
+        "x": 6,
+        "y": 0
+      }, {
+        "label": "F7",
+        "x": 7,
+        "y": 0
+      }, {
+        "label": "F8",
+        "x": 8,
+        "y": 0
+      }, {
+        "label": "F9",
+        "x": 9,
+        "y": 0
+      }, {
+        "label": "F10",
+        "x": 10,
+        "y": 0
+      }, {
+        "label": "F11",
+        "x": 11,
+        "y": 0
+      }, {
+        "label": "F12",
+        "x": 12,
+        "y": 0
+      }, {
+        "label": "Prt Sc",
+        "x": 13,
+        "y": 0
+      }, {
+        "label": "Delete",
+        "x": 14,
+        "y": 0
+      }, {
+        "label": "home",
+        "x": 15,
+        "y": 0
+      }, {
+        "label": "Menu",
+        "x": 16,
+        "y": 0
+      }, {
+        "label": "Pg Up",
+        "x": 17,
+        "y": 0
+      }, {
+        "label": "Pg Dn",
+        "x": 18,
+        "y": 0
+      }, {
+        "label": "~",
+        "x": 0,
+        "y": 1
+      }, {
+        "label": "!",
+        "x": 1,
+        "y": 1
+      }, {
+        "label": "@",
+        "x": 2,
+        "y": 1
+      }, {
+        "label": "#",
+        "x": 3,
+        "y": 1
+      }, {
+        "label": "$",
+        "x": 4,
+        "y": 1
+      }, {
+        "label": "%",
+        "x": 5,
+        "y": 1
+      }, {
+        "label": "^",
+        "x": 6,
+        "y": 1
+      }, {
+        "label": "&",
+        "x": 7,
+        "y": 1
+      }, {
+        "label": "*",
+        "x": 8,
+        "y": 1
+      }, {
+        "label": "(",
+        "x": 9,
+        "y": 1
+      }, {
+        "label": ")",
+        "x": 10,
+        "y": 1
+      }, {
+        "label": "_",
+        "x": 11,
+        "y": 1
+      }, {
+        "label": "+",
+        "x": 12,
+        "y": 1
+      }, {
+        "label": "Backspace",
+        "x": 13,
+        "y": 1,
+        "w": 2
+      }, {
+        "label": "Num Lock",
+        "x": 15,
+        "y": 1
+      }, {
+        "label": "/",
+        "x": 16,
+        "y": 1
+      }, {
+        "label": "*",
+        "x": 17,
+        "y": 1
+      }, {
+        "label": "-",
+        "x": 18,
+        "y": 1
+      }, {
+        "label": "Tab",
+        "x": 0,
+        "y": 2,
+        "w": 1.5
+      }, {
+        "label": "Q",
+        "x": 1.5,
+        "y": 2
+      }, {
+        "label": "W",
+        "x": 2.5,
+        "y": 2
+      }, {
+        "label": "E",
+        "x": 3.5,
+        "y": 2
+      }, {
+        "label": "R",
+        "x": 4.5,
+        "y": 2
+      }, {
+        "label": "T",
+        "x": 5.5,
+        "y": 2
+      }, {
+        "label": "Y",
+        "x": 6.5,
+        "y": 2
+      }, {
+        "label": "U",
+        "x": 7.5,
+        "y": 2
+      }, {
+        "label": "I",
+        "x": 8.5,
+        "y": 2
+      }, {
+        "label": "O",
+        "x": 9.5,
+        "y": 2
+      }, {
+        "label": "P",
+        "x": 10.5,
+        "y": 2
+      }, {
+        "label": "{",
+        "x": 11.5,
+        "y": 2
+      }, {
+        "label": "}",
+        "x": 12.5,
+        "y": 2
+      }, {
+        "label": "Enter",
+        "x": 13.75,
+        "y": 2,
+        "w": 1.25,
+        "h": 2
+      }, {
+        "label": "7",
+        "x": 15,
+        "y": 2
+      }, {
+        "label": "8",
+        "x": 16,
+        "y": 2
+      }, {
+        "label": "9",
+        "x": 17,
+        "y": 2
+      }, {
+        "label": "+",
+        "x": 18,
+        "y": 2,
+        "h": 2
+      }, {
+        "label": "Caps Lock",
+        "x": 0,
+        "y": 3,
+        "w": 1.75
+      }, {
+        "label": "A",
+        "x": 1.75,
+        "y": 3
+      }, {
+        "label": "S",
+        "x": 2.75,
+        "y": 3
+      }, {
+        "label": "D",
+        "x": 3.75,
+        "y": 3
+      }, {
+        "label": "F",
+        "x": 4.75,
+        "y": 3
+      }, {
+        "label": "G",
+        "x": 5.75,
+        "y": 3
+      }, {
+        "label": "H",
+        "x": 6.75,
+        "y": 3
+      }, {
+        "label": "J",
+        "x": 7.75,
+        "y": 3
+      }, {
+        "label": "K",
+        "x": 8.75,
+        "y": 3
+      }, {
+        "label": "L",
+        "x": 9.75,
+        "y": 3
+      }, {
+        "label": ":",
+        "x": 10.75,
+        "y": 3
+      }, {
+        "label": "\"",
+        "x": 11.75,
+        "y": 3
+      }, {
+        "label": "~",
+        "x": 12.75,
+        "y": 3
+      }, {
+        "label": "4",
+        "x": 15,
+        "y": 3
+      }, {
+        "label": "5",
+        "x": 16,
+        "y": 3
+      }, {
+        "label": "6",
+        "x": 17,
+        "y": 3
+      }, {
+        "label": "Shift",
+        "x": 0,
+        "y": 4,
+        "w": 1.25
+      }, {
+        "label": "|",
+        "x": 1.25,
+        "y": 4
+      }, {
+        "label": "Z",
+        "x": 2.25,
+        "y": 4
+      }, {
+        "label": "X",
+        "x": 3.25,
+        "y": 4
+      }, {
+        "label": "C",
+        "x": 4.25,
+        "y": 4
+      }, {
+        "label": "V",
+        "x": 5.25,
+        "y": 4
+      }, {
+        "label": "B",
+        "x": 6.25,
+        "y": 4
+      }, {
+        "label": "N",
+        "x": 7.25,
+        "y": 4
+      }, {
+        "label": "M",
+        "x": 8.25,
+        "y": 4
+      }, {
+        "label": "<",
+        "x": 9.25,
+        "y": 4
+      }, {
+        "label": ">",
+        "x": 10.25,
+        "y": 4
+      }, {
+        "label": "?",
+        "x": 11.25,
+        "y": 4
+      }, {
+        "label": "Shift",
+        "x": 12.25,
+        "y": 4,
+        "w": 1.75
+      }, {
+        "label": "\u2191",
+        "x": 14,
+        "y": 4
+      }, {
+        "label": "1",
+        "x": 15,
+        "y": 4
+      }, {
+        "label": "2",
+        "x": 16,
+        "y": 4
+      }, {
+        "label": "3",
+        "x": 17,
+        "y": 4
+      }, {
+        "label": "Enter",
+        "x": 18,
+        "y": 4,
+        "h": 2
+      }, {
+        "label": "Ctrl",
+        "x": 0,
+        "y": 5,
+        "w": 1.25
+      }, {
+        "label": "Win",
+        "x": 1.25,
+        "y": 5,
+        "w": 1.25
+      }, {
+        "label": "Alt",
+        "x": 2.5,
+        "y": 5,
+        "w": 1.25
+      }, {
+        "x": 3.75,
+        "y": 5,
+        "w": 6.25
+      }, {
+        "label": "Alt",
+        "x": 10,
+        "y": 5,
+        "w": 1.5
+      }, {
+        "label": "Crtl",
+        "x": 11.5,
+        "y": 5,
+        "w": 1.5
+      }, {
+        "label": "\u2190",
+        "x": 13,
+        "y": 5
+      }, {
+        "label": "\u2193",
+        "x": 14,
+        "y": 5
+      }, {
+        "label": "\u2192",
+        "x": 15,
+        "y": 5
+      }, {
+        "label": "0",
+        "x": 16,
+        "y": 5
+      }, {
+        "label": ".",
+        "x": 17,
+        "y": 5
+      }]
+    }
+  }
+}
diff --git a/keyboards/ep/96/keymaps/default/keymap.c b/keyboards/ep/96/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d512041535
--- /dev/null
+++ b/keyboards/ep/96/keymaps/default/keymap.c
@@ -0,0 +1,67 @@
+/* Copyright 2018 Elliot Powell
+ *
+ * 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 the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+  QMKBEST = SAFE_RANGE,
+  QMKURL
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT( /* Base */
+    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_DEL,    KC_HOME, KC_END,  KC_PGUP, KC_PGDN, \
+    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_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \
+    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_P7,   KC_P8,   KC_P9,            \
+    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_NUHS, KC_ENT,   KC_P4,   KC_P5,   KC_P6,   KC_PPLS, \
+    KC_LSFT, KC_BSLS, 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_P1,   KC_P2,   KC_P3,            \
+    KC_LCTL, KC_LGUI, KC_LALT,                    KC_SPC,                       KC_RALT,         KC_RCTL, KC_LEFT, KC_DOWN,  KC_RGHT, KC_P0,   KC_PDOT, KC_PENT  \
+  ),
+};
+
+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;
+    case QMKURL:
+      if (record->event.pressed) {
+        // when keycode QMKURL is pressed
+        SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
+      } else {
+        // when keycode QMKURL is released
+      }
+      break;
+  }
+  return true;
+}
+
+void matrix_init_user(void) {
+
+}
+
+void matrix_scan_user(void) {
+
+}
+
+void led_set_user(uint8_t usb_led) {
+
+}
diff --git a/keyboards/ep/96/keymaps/default/readme.md b/keyboards/ep/96/keymaps/default/readme.md
new file mode 100644
index 0000000000..81e87464f0
--- /dev/null
+++ b/keyboards/ep/96/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for ep96
\ No newline at end of file
diff --git a/keyboards/ep/96/readme.md b/keyboards/ep/96/readme.md
new file mode 100644
index 0000000000..404419b63a
--- /dev/null
+++ b/keyboards/ep/96/readme.md
@@ -0,0 +1,15 @@
+# ep96
+
+![ep96](https://i.imgur.com/PZ2C7a8.jpg)
+
+A simple 96 key keyboard
+
+Keyboard Maintainer: Keyboard Maintainer: [Elliot Powell](https://github.com/e11i0t23), [/u/e11i0t23](https://reddit.com/u/e11i0t23)  
+Hardware Supported: EP96 PCB
+Hardware Availability: Possible availability upon request   
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ep/96: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/ep/96/rules.mk b/keyboards/ep/96/rules.mk
new file mode 100644
index 0000000000..407135de2e
--- /dev/null
+++ b/keyboards/ep/96/rules.mk
@@ -0,0 +1,81 @@
+# MCU name
+#MCU = at90usb1286
+MCU = atmega32u4
+
+# Processor frequency.
+#     This will define a symbol, F_CPU, in all source code files equal to the
+#     processor frequency in Hz. You can then use this symbol in your source code to
+#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
+#     automatically to create a 32-bit value in your source code.
+#
+#     This will be an integer division of F_USB below, as it is sourced by
+#     F_USB after it has run through any CPU prescalers. Note that this value
+#     does not *change* the processor frequency - it should merely be updated to
+#     reflect the processor speed set externally so that the code can use accurate
+#     software delays.
+F_CPU = 16000000
+
+
+#
+# LUFA specific
+#
+# Target architecture (see library "Board Types" documentation).
+ARCH = AVR8
+
+# Input clock frequency.
+#     This will define a symbol, F_USB, in all source code files equal to the
+#     input clock frequency (before any prescaling is performed) in Hz. This value may
+#     differ from F_CPU if prescaling is used on the latter, and is required as the
+#     raw input clock is fed directly to the PLL sections of the AVR for high speed
+#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
+#     at the end, this will be done automatically to create a 32-bit value in your
+#     source code.
+#
+#     If no clock division is performed on the input clock inside the AVR (via the
+#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
+F_USB = $(F_CPU)
+
+# Interrupt driven control endpoint task(+60)
+OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   atmega32a    bootloadHID
+BOOTLOADER = atmel-dfu
+
+
+# If you don't know the bootloader type, then you can specify the
+# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
+#   Teensy halfKay      512
+#   Teensy++ halfKay    1024
+#   Atmel DFU loader    4096
+#   LUFA bootloader     4096
+#   USBaspLoader        2048
+# OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no      # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
+CONSOLE_ENABLE = yes        # Console for debug(+400)
+COMMAND_ENABLE = yes        # 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 on B7 by default
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
+UNICODE_ENABLE = no         # Unicode
+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 (+400)