From f3394139dead525d8bb3e638497d4e2c4e4bc0a0 Mon Sep 17 00:00:00 2001
From: ojthetiny <65928618+ojthetiny@users.noreply.github.com>
Date: Tue, 17 Nov 2020 04:12:10 +0200
Subject: [PATCH] [Keyboard] Add Beatervan keyboard (#10939)

* Added Beatervan Keyboard

* added files for beatervan

* Update keyboards/beatervan/beatervan.h

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

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

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/beatervan/beatervan.h

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/beatervan/info.json

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

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

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/beatervan/keymaps/oj/keymap.c

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/beatervan/config.h

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

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

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

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

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

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

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

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

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/beatervan/rules.mk

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/beatervan/keymaps/oj/keymap.c

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/beatervan/keymaps/oj/keymap.c

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/beatervan/keymaps/oj/keymap.c

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/beatervan/keymaps/oj/keymap.c

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Delete config.h

* Delete config.h

* Update keymap.c

* Update beatervan.c

* Update beatervan.h

* Update config.h

* Update keymap.c

* Update keymap.c

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
---
 keyboards/beatervan/beatervan.c               |  16 ++
 keyboards/beatervan/beatervan.h               |  70 ++++++
 keyboards/beatervan/config.h                  |  55 +++++
 keyboards/beatervan/info.json                 | 204 ++++++++++++++++++
 keyboards/beatervan/keymaps/default/keymap.c  |  93 ++++++++
 keyboards/beatervan/keymaps/default/readme.md |   1 +
 keyboards/beatervan/keymaps/oj/keymap.c       |  93 ++++++++
 keyboards/beatervan/keymaps/oj/readme.md      |   1 +
 keyboards/beatervan/readme.md                 |  13 ++
 keyboards/beatervan/rules.mk                  |  23 ++
 10 files changed, 569 insertions(+)
 create mode 100644 keyboards/beatervan/beatervan.c
 create mode 100644 keyboards/beatervan/beatervan.h
 create mode 100644 keyboards/beatervan/config.h
 create mode 100644 keyboards/beatervan/info.json
 create mode 100644 keyboards/beatervan/keymaps/default/keymap.c
 create mode 100644 keyboards/beatervan/keymaps/default/readme.md
 create mode 100644 keyboards/beatervan/keymaps/oj/keymap.c
 create mode 100644 keyboards/beatervan/keymaps/oj/readme.md
 create mode 100644 keyboards/beatervan/readme.md
 create mode 100644 keyboards/beatervan/rules.mk

diff --git a/keyboards/beatervan/beatervan.c b/keyboards/beatervan/beatervan.c
new file mode 100644
index 0000000000..0730af001b
--- /dev/null
+++ b/keyboards/beatervan/beatervan.c
@@ -0,0 +1,16 @@
+/* Copyright 2020 OJtheTiny
+ *
+ * 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 "beatervan.h"
diff --git a/keyboards/beatervan/beatervan.h b/keyboards/beatervan/beatervan.h
new file mode 100644
index 0000000000..e645809825
--- /dev/null
+++ b/keyboards/beatervan/beatervan.h
@@ -0,0 +1,70 @@
+/* Copyright 2020 OJtheTiny
+ *
+ * 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( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
+    K30, K31, K32,           K34, K36,           K37, K38, K39  \
+) \
+{ \
+    { K00, K01, K02, K03,   K04,  K05,   K06,  K07, K08, K09, K0A,   K0B }, \
+    { K10, K11, K12, K13,   K14,  K15,   K16,  K17, K18, K19, K1A,   K1B }, \
+    { K20, K21, K22, K23,   K24,  K25,   K26,  K27, K28, K29, K2A,   K2B }, \
+    { K30, K31, K32, KC_NO, K34,  KC_NO, K36,  K37, K38, K39, KC_NO, KC_NO }  \
+}
+
+#define LAYOUT_arrow( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
+    K30, K31, K32,      K33, K37,      K38, K39, K3A, K3B  \
+) \
+{ \
+    { K00,   K01,   K02,   K03,  K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B }, \
+    { K10,   K11,   K12,   K13,  K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B }, \
+    { K20,   K21,   K22,   K23,  K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B }, \
+    { K30,   K31,   K32,   K33,  KC_NO, KC_NO, KC_NO, K37,   K38,   K39,   K3A,   K3B }  \
+}
+
+#define LAYOUT_command( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
+    K30, K31, K32, K34,      K33, K37,           K38, K39, K3B  \
+) \
+{ \
+    { K00,   K01,   K02,   K03,  K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B }, \
+    { K10,   K11,   K12,   K13,  K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B }, \
+    { K20,   K21,   K22,   K23,  K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B }, \
+    { K30,   K31,   K32,   K33,  K34,   KC_NO, KC_NO, K37,   K38,   K39, KC_NO,   K3B }  \
+}
+
+#define LAYOUT_arrow_command( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
+    K30, K31, K32, K34,      K33, K37,      K38, K39, K3A, K3B  \
+) \
+{ \
+    { K00,   K01,   K02,   K03,  K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B }, \
+    { K10,   K11,   K12,   K13,  K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B }, \
+    { K20,   K21,   K22,   K23,  K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B }, \
+    { K30,   K31,   K32,   K33,  K34,   KC_NO, KC_NO, K37,   K38,   K39,   K3A,   K3B }  \
+}
diff --git a/keyboards/beatervan/config.h b/keyboards/beatervan/config.h
new file mode 100644
index 0000000000..a8973ab4a6
--- /dev/null
+++ b/keyboards/beatervan/config.h
@@ -0,0 +1,55 @@
+
+/* Copyright 2020 OJtheTiny
+ *
+ * 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 0x6F6A // "oj"
+#define PRODUCT_ID 0x6276 // "bv"
+#define DEVICE_VER 0x0001
+#define MANUFACTURER OJ
+#define PRODUCT beatervan
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 12
+
+/*
+ * 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 { D1, D0, D4, C6 }
+#define MATRIX_COL_PINS { D7, E6, B4, B5, F4, F5, F6, F7, B1, B3, B2, B6 }
+#define UNUSED_PINS
+
+/* 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/beatervan/info.json b/keyboards/beatervan/info.json
new file mode 100644
index 0000000000..f6f3876422
--- /dev/null
+++ b/keyboards/beatervan/info.json
@@ -0,0 +1,204 @@
+{
+  "keyboard_name": "beatervan",
+  "url": "",
+  "maintainer": "OJ",
+  "width": 12.75,
+  "height": 4,
+  "layouts": {
+    "LAYOUT": {
+        "layout": [
+            {"label":"Tab", "x":0, "y":0},
+            {"label":"Q", "x":1, "y":0},
+            {"label":"W", "x":2, "y":0},
+            {"label":"E", "x":3, "y":0},
+            {"label":"R", "x":4, "y":0},
+            {"label":"T", "x":5, "y":0},
+            {"label":"Y", "x":6, "y":0},
+            {"label":"U", "x":7, "y":0},
+            {"label":"I", "x":8, "y":0},
+            {"label":"O", "x":9, "y":0},
+            {"label":"P", "x":10, "y":0},
+            {"label":"|", "x":11, "y":0, "w":1.75},
+            {"label":"Caps Lock", "x":0, "y":1, "w":1.25},
+            {"label":"A", "x":1.25, "y":1},
+            {"label":"S", "x":2.25, "y":1},
+            {"label":"D", "x":3.25, "y":1},
+            {"label":"F", "x":4.25, "y":1},
+            {"label":"G", "x":5.25, "y":1},
+            {"label":"H", "x":6.25, "y":1},
+            {"label":"J", "x":7.25, "y":1},
+            {"label":"K", "x":8.25, "y":1},
+            {"label":"L", "x":9.25, "y":1},
+            {"label":":", "x":10.25, "y":1},
+            {"label":"\"", "x":11.25, "y":1, "w":1.5},
+            {"label":"Shift", "x":0, "y":2, "w":1.75},
+            {"label":"Z", "x":1.75, "y":2},
+            {"label":"X", "x":2.75, "y":2},
+            {"label":"C", "x":3.75, "y":2},
+            {"label":"V", "x":4.75, "y":2},
+            {"label":"B", "x":5.75, "y":2},
+            {"label":"N", "x":6.75, "y":2},
+            {"label":"M", "x":7.75, "y":2},
+            {"label":"<", "x":8.75, "y":2},
+            {"label":">", "x":9.75, "y":2},
+            {"label":"?", "x":10.75, "y":2},
+            {"x":11.75, "y":2},
+            {"label":"Ctrl", "x":0, "y":3, "w":1.25},
+            {"label":"Win", "x":1.25, "y":3, "w":1.5},
+            {"label":"Alt", "x":2.75, "y":3, "w":1.25},
+            {"x":4, "y":3, "w":2.25},
+            {"x":6.25, "y":3, "w":2},
+            {"label":"Alt", "x":8.25, "y":3, "w":1.25},
+            {"label":"Win", "x":9.5, "y":3, "w":1.5},
+            {"label":"Menu", "x":11, "y":3, "w":1.75} ]
+    },
+
+    "LAYOUT_arrow": {
+        "layout": [
+            {"label":"Tab", "x":0, "y":0},
+            {"label":"Q", "x":1, "y":0},
+            {"label":"W", "x":2, "y":0},
+            {"label":"E", "x":3, "y":0},
+            {"label":"R", "x":4, "y":0},
+            {"label":"T", "x":5, "y":0},
+            {"label":"Y", "x":6, "y":0},
+            {"label":"U", "x":7, "y":0},
+            {"label":"I", "x":8, "y":0},
+            {"label":"O", "x":9, "y":0},
+            {"label":"P", "x":10, "y":0},
+            {"label":"|", "x":11, "y":0, "w":1.75},
+            {"label":"Caps Lock", "x":0, "y":1, "w":1.25},
+            {"label":"A", "x":1.25, "y":1},
+            {"label":"S", "x":2.25, "y":1},
+            {"label":"D", "x":3.25, "y":1},
+            {"label":"F", "x":4.25, "y":1},
+            {"label":"G", "x":5.25, "y":1},
+            {"label":"H", "x":6.25, "y":1},
+            {"label":"J", "x":7.25, "y":1},
+            {"label":"K", "x":8.25, "y":1},
+            {"label":"L", "x":9.25, "y":1},
+            {"label":":", "x":10.25, "y":1},
+            {"label":"\"", "x":11.25, "y":1, "w":1.5},
+            {"label":"Shift", "x":0, "y":2, "w":1.75},
+            {"label":"Z", "x":1.75, "y":2},
+            {"label":"X", "x":2.75, "y":2},
+            {"label":"C", "x":3.75, "y":2},
+            {"label":"V", "x":4.75, "y":2},
+            {"label":"B", "x":5.75, "y":2},
+            {"label":"N", "x":6.75, "y":2},
+            {"label":"M", "x":7.75, "y":2},
+            {"label":"<", "x":8.75, "y":2},
+            {"label":">", "x":9.75, "y":2},
+            {"label":"?", "x":10.75, "y":2},
+            {"x":11.75, "y":2},
+            {"label":"Ctrl", "x":0, "y":3, "w":1.25},
+            {"label":"Win", "x":1.25, "y":3, "w":1.5},
+            {"label":"Alt", "x":2.75, "y":3, "w":1.25},
+            {"x":4, "y":3, "w":2.25},
+            {"x":6.25, "y":3, "w":2},
+            {"x":8.25, "y":3, "w":1.5},
+            {"label":"Alt", "x":9.75, "y":3},
+            {"label":"Win", "x":10.75, "y":3},
+            {"label":"Menu", "x":11.75, "y":3} ]
+    },
+
+    "LAYOUT_command": {
+        "layout": [
+            {"label":"Tab", "x":0, "y":0},
+            {"label":"Q", "x":1, "y":0},
+            {"label":"W", "x":2, "y":0},
+            {"label":"E", "x":3, "y":0},
+            {"label":"R", "x":4, "y":0},
+            {"label":"T", "x":5, "y":0},
+            {"label":"Y", "x":6, "y":0},
+            {"label":"U", "x":7, "y":0},
+            {"label":"I", "x":8, "y":0},
+            {"label":"O", "x":9, "y":0},
+            {"label":"P", "x":10, "y":0},
+            {"label":"|", "x":11, "y":0, "w":1.75},
+            {"label":"Caps Lock", "x":0, "y":1, "w":1.25},
+            {"label":"A", "x":1.25, "y":1},
+            {"label":"S", "x":2.25, "y":1},
+            {"label":"D", "x":3.25, "y":1},
+            {"label":"F", "x":4.25, "y":1},
+            {"label":"G", "x":5.25, "y":1},
+            {"label":"H", "x":6.25, "y":1},
+            {"label":"J", "x":7.25, "y":1},
+            {"label":"K", "x":8.25, "y":1},
+            {"label":"L", "x":9.25, "y":1},
+            {"label":":", "x":10.25, "y":1},
+            {"label":"\"", "x":11.25, "y":1, "w":1.5},
+            {"label":"Shift", "x":0, "y":2, "w":1.75},
+            {"label":"Z", "x":1.75, "y":2},
+            {"label":"X", "x":2.75, "y":2},
+            {"label":"C", "x":3.75, "y":2},
+            {"label":"V", "x":4.75, "y":2},
+            {"label":"B", "x":5.75, "y":2},
+            {"label":"N", "x":6.75, "y":2},
+            {"label":"M", "x":7.75, "y":2},
+            {"label":"<", "x":8.75, "y":2},
+            {"label":">", "x":9.75, "y":2},
+            {"label":"?", "x":10.75, "y":2},
+            {"x":11.75, "y":2},
+            {"label":"Ctrl", "x":0, "y":3},
+            {"label":"Win", "x":1, "y":3},
+            {"label":"Alt", "x":2, "y":3},
+            {"x":3, "y":3},
+            {"x":4, "y":3, "w":2.25},
+            {"x":6.25, "y":3, "w":2},
+            {"x":8.25, "y":3, "w":1.5},
+            {"label":"Alt", "x":9.75, "y":3, "w":1.5},
+            {"label":"Win", "x":11.25, "y":3, "w":1.5} ]
+    },
+
+    "LAYOUT_arrow_command": {
+        "layout": [
+            {"label":"Tab", "x":0, "y":0},
+            {"label":"Q", "x":1, "y":0},
+            {"label":"W", "x":2, "y":0},
+            {"label":"E", "x":3, "y":0},
+            {"label":"R", "x":4, "y":0},
+            {"label":"T", "x":5, "y":0},
+            {"label":"Y", "x":6, "y":0},
+            {"label":"U", "x":7, "y":0},
+            {"label":"I", "x":8, "y":0},
+            {"label":"O", "x":9, "y":0},
+            {"label":"P", "x":10, "y":0},
+            {"label":"|", "x":11, "y":0, "w":1.75},
+            {"label":"Caps Lock", "x":0, "y":1, "w":1.25},
+            {"label":"A", "x":1.25, "y":1},
+            {"label":"S", "x":2.25, "y":1},
+            {"label":"D", "x":3.25, "y":1},
+            {"label":"F", "x":4.25, "y":1},
+            {"label":"G", "x":5.25, "y":1},
+            {"label":"H", "x":6.25, "y":1},
+            {"label":"J", "x":7.25, "y":1},
+            {"label":"K", "x":8.25, "y":1},
+            {"label":"L", "x":9.25, "y":1},
+            {"label":":", "x":10.25, "y":1},
+            {"label":"\"", "x":11.25, "y":1, "w":1.5},
+            {"label":"Shift", "x":0, "y":2, "w":1.75},
+            {"label":"Z", "x":1.75, "y":2},
+            {"label":"X", "x":2.75, "y":2},
+            {"label":"C", "x":3.75, "y":2},
+            {"label":"V", "x":4.75, "y":2},
+            {"label":"B", "x":5.75, "y":2},
+            {"label":"N", "x":6.75, "y":2},
+            {"label":"M", "x":7.75, "y":2},
+            {"label":"<", "x":8.75, "y":2},
+            {"label":">", "x":9.75, "y":2},
+            {"label":"?", "x":10.75, "y":2},
+            {"x":11.75, "y":2},
+            {"label":"Ctrl", "x":0, "y":3},
+            {"label":"Win", "x":1, "y":3},
+            {"label":"Alt", "x":2, "y":3},
+            {"x":3, "y":3},
+            {"x":4, "y":3, "w":2.25},
+            {"x":6.25, "y":3, "w":2},
+            {"x":8.25, "y":3, "w":1.5},
+            {"label":"Alt", "x":9.75, "y":3},
+            {"label":"Win", "x":10.75, "y":3},
+            {"label":"Menu", "x":11.75, "y":3} ]
+    }
+  }
+}
diff --git a/keyboards/beatervan/keymaps/default/keymap.c b/keyboards/beatervan/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a99b9c9e51
--- /dev/null
+++ b/keyboards/beatervan/keymaps/default/keymap.c
@@ -0,0 +1,93 @@
+/* Copyright 2020 OJtheTiny
+ *
+ * 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 layers {
+  _QW,
+  _DV,
+  _CM,
+  _L1,
+  _L2,
+  _L3,
+};
+
+enum custom_keycodes {
+  DVORAK = SAFE_RANGE,
+  QWERTY,
+  COLEMAK
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QW] = LAYOUT( /* Qwerty */
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    MO(_L1), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, MO(_L1),
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MO(_L2),
+    KC_LCTL, MO(_L2), KC_LGUI,                   KC_ENT,  KC_SPC,                    KC_RALT, KC_ESC,  TG(_L3)
+  ),
+  [_DV] = LAYOUT( /* Dvorak */
+    KC_TAB,  KC_SLSH, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
+    MO(_L1), KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    MO(_L1),
+    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    MO(_L2),
+    KC_LCTL, MO(_L2), KC_LGUI,                   KC_ENT,  KC_SPC,                    KC_RALT, KC_ESC,  TG(_L3)
+  ),
+  [_CM] = LAYOUT( /* Colemak */
+    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
+    MO(_L1), KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    MO(_L1),
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MO(_L2),
+    KC_LCTL, MO(_L2), KC_LGUI,                   KC_ENT,  KC_SPC,                    KC_RALT, KC_ESC,  TG(_L3)
+  ),
+  [_L1] = LAYOUT( /* LAYER 1 */
+    KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
+    _______, KC_BSLS, KC_QUOT, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_DOWN, KC_UP,   KC_LEFT, KC_RGHT, _______,
+    _______, KC_ESC,  _______, KC_PSCR, _______, _______, _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, KC_RSFT,
+    _______, KC_LGUI, _______,                   _______, _______,                   _______, _______, _______
+  ),
+  [_L2] = LAYOUT( /* LAYER 2 */
+    _______, QWERTY,  DVORAK,  COLEMAK, _______, _______, _______, KC_7,    KC_8,    KC_9,    KC_0,    _______,
+    KC_ESC,  KC_PIPE, KC_DQUO, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_4,    KC_5,    KC_6,    KC_VOLU, KC_ENT,
+    _______, _______, _______, _______, _______, _______, KC_0,    KC_1,    KC_2,    KC_3,    KC_VOLD, _______,
+    _______, _______, _______,                   _______, _______,                   _______, _______, _______
+  ),
+  [_L3] = LAYOUT( /* LAYER 3 */
+    _______, _______, _______, _______, _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______,
+    KC_ESC,  _______, _______, _______, _______, _______, _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______,
+    KC_LSFT, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+    _______, KC_LSFT, KC_B,                      KC_SPC,  KC_C,                      _______, _______, _______
+  )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+      switch(keycode) {
+        case DVORAK:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_DV);
+          }
+          return false;
+        case QWERTY:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_QW);
+          }
+          return false;
+        case COLEMAK:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_CM);
+          }
+          return false;
+        default:
+          return true;
+      }
+    return true;
+};
diff --git a/keyboards/beatervan/keymaps/default/readme.md b/keyboards/beatervan/keymaps/default/readme.md
new file mode 100644
index 0000000000..ac84c08cfa
--- /dev/null
+++ b/keyboards/beatervan/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for tv44
\ No newline at end of file
diff --git a/keyboards/beatervan/keymaps/oj/keymap.c b/keyboards/beatervan/keymaps/oj/keymap.c
new file mode 100644
index 0000000000..6b32c4ddc1
--- /dev/null
+++ b/keyboards/beatervan/keymaps/oj/keymap.c
@@ -0,0 +1,93 @@
+/* Copyright 2020 OJtheTiny
+ *
+ * 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 layers {
+  _QW,
+  _DV,
+  _CM,
+  _L1,
+  _L2,
+  _L3
+};
+enum custom_keycodes {
+  DVORAK = SAFE_RANGE,
+  QWERTY,
+  COLEMAK
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QW] = LAYOUT( /* Qwerty */
+    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+    KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENTER,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MO(_L2),
+    KC_TAB,  MO(_L1), KC_LGUI,                   KC_SPC,  KC_BSPC,                   KC_LALT, KC_RALT, TG(_L3)
+  ),
+  [_DV] = LAYOUT( /* Dvorak */
+    KC_ESC,  KC_SLSH, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_QUOT,
+    KC_LCTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_ENTER,
+    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    MO(_L2),
+    KC_TAB,  MO(_L1), KC_LGUI,                   KC_SPC,  KC_BSPC,                   KC_LALT, KC_RALT, TG(_L3)
+  ),
+  [_CM] = LAYOUT( /* Colemak */
+    KC_ESC,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_QUOT,
+    KC_LCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_ENTER,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MO(_L2),
+    KC_TAB,  MO(_L1), KC_LGUI,                   KC_SPC,  KC_BSPC,                   KC_LALT, KC_RALT, TG(_L3)
+  ),
+  [_L1] = LAYOUT( /* NUM */
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+    _______, _______, _______, _______, _______, _______, KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT, KC_SCLN, KC_BSLS,
+    _______, _______, _______, KC_PSCR, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL,
+    _______, _______, _______,                   _______, _______,                   _______, _______, _______
+  ),
+  [_L2] = LAYOUT( /* F Keys */
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,      KC_F10,     KC_F11,
+    _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______,    _______, KC_ENTER,
+    _______, QWERTY,  DVORAK,  COLEMAK, _______, _______, _______, _______, _______, _______,    _______,    _______,
+    _______, _______, _______,                   _______, _______,                   _______,    _______,    _______
+  ),
+  [_L3] = LAYOUT( /* Gaming */
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    _______, _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______,
+    KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    _______, MO(_L2), KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+    KC_LSFT, KC_Z,    KC_B,                      KC_SPC,  KC_BSPC,                   _______, _______, TG(_L3)
+  )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+      switch(keycode) {
+        case DVORAK:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_DV);
+          }
+          return false;
+        case QWERTY:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_QW);
+          }
+          return false;
+        case COLEMAK:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_CM);
+          }
+          return false;
+        default:
+          return true;
+      }
+    return true;
+};
diff --git a/keyboards/beatervan/keymaps/oj/readme.md b/keyboards/beatervan/keymaps/oj/readme.md
new file mode 100644
index 0000000000..34c2f075c8
--- /dev/null
+++ b/keyboards/beatervan/keymaps/oj/readme.md
@@ -0,0 +1 @@
+#Objectively superior keymap for v44
diff --git a/keyboards/beatervan/readme.md b/keyboards/beatervan/readme.md
new file mode 100644
index 0000000000..2b7dd59054
--- /dev/null
+++ b/keyboards/beatervan/readme.md
@@ -0,0 +1,13 @@
+# Beatervan (minivan)
+
+A Pro-Micro based Minivan with THT diodes
+
+Keyboard Maintainer: OJ  
+Hardware Supported: Beatervan PCB, 32u4 "pro-micro"  
+Hardware Availability: Private GB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make beatervan: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/beatervan/rules.mk b/keyboards/beatervan/rules.mk
new file mode 100644
index 0000000000..1ea4a84d52
--- /dev/null
+++ b/keyboards/beatervan/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # 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 = 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
+MIDI_ENABLE = no            # MIDI controls
+UNICODE_ENABLE = yes         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE = no           # Audio output on port C6