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

12 files changed, 703 insertions, 0 deletions

diff --git a/keyboards/boardsource/the_mark/config.h b/keyboards/boardsource/the_mark/config.h
new file mode 100644
index 0000000000..507bac966a
--- /dev/null
+++ b/keyboards/boardsource/the_mark/config.h
@@ -0,0 +1,152 @@
+/*
+Copyright 2020 Boardsource
+
+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    0x4273 // "Bs" - Boardsource
+#define PRODUCT_ID   0x0001
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Boardsource
+#define PRODUCT      The Mark65
+
+/* 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 {B0, B1, B2, B3, B4,}
+#define MATRIX_COL_PINS { B5, B6, B7, F5, C7, D0, D1, D2, D3, D4, D5, D6, D7,F0, F1, F4}
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+#define RGBLIGHT_ANIMATIONS
+#define RGB_DI_PIN C6
+#ifdef RGBLIGHT_ENABLE
+#define RGBLED_NUM 24    // Number of LEDs
+#endif
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+//#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+//#    define RGBLIGHT_EFFECT_BREATHING
+//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//#    define RGBLIGHT_EFFECT_SNAKE
+//#    define RGBLIGHT_EFFECT_KNIGHT
+//#    define RGBLIGHT_EFFECT_CHRISTMAS
+//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//#    define RGBLIGHT_EFFECT_RGB_TEST
+//#    define RGBLIGHT_EFFECT_ALTERNATING
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 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 useful 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
+
+/*
+ * 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
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/boardsource/the_mark/info.json b/keyboards/boardsource/the_mark/info.json
new file mode 100644
index 0000000000..5a9cdb6be0
--- /dev/null
+++ b/keyboards/boardsource/the_mark/info.json
@@ -0,0 +1,232 @@
+{
+    "keyboard_name": "The Mark: 65",
+    "url": "",
+    "maintainer": "Boardsource",
+    "width": 16,
+    "height": 5,
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "x": 0, "y": 0, "w": 1 },
+                { "x": 1, "y": 0, "w": 1 },
+                { "x": 2, "y": 0, "w": 1 },
+                { "x": 3, "y": 0, "w": 1 },
+                { "x": 4, "y": 0, "w": 1 },
+                { "x": 5, "y": 0, "w": 1 },
+                { "x": 6, "y": 0, "w": 1 },
+                { "x": 7, "y": 0, "w": 1 },
+                { "x": 8, "y": 0, "w": 1 },
+                { "x": 9, "y": 0, "w": 1 },
+                { "x": 10, "y": 0, "w": 1 },
+                { "x": 11, "y": 0, "w": 1 },
+                { "x": 12, "y": 0, "w": 1 },
+                { "x": 13, "y": 0, "w": 1 },
+                { "x": 14, "y": 0, "w": 1 },
+                { "x": 15.25, "y": 0, "w": 1 },
+                { "x": 0, "y": 1, "w": 1.5 },
+                { "x": 1.5, "y": 1, "w": 1 },
+                { "x": 2.5, "y": 1, "w": 1 },
+                { "x": 3.5, "y": 1, "w": 1 },
+                { "x": 4.5, "y": 1, "w": 1 },
+                { "x": 5.5, "y": 1, "w": 1 },
+                { "x": 6.5, "y": 1, "w": 1 },
+                { "x": 7.5, "y": 1, "w": 1 },
+                { "x": 8.5, "y": 1, "w": 1 },
+                { "x": 9.5, "y": 1, "w": 1 },
+                { "x": 10.5, "y": 1, "w": 1 },
+                { "x": 11.5, "y": 1, "w": 1 },
+                { "x": 12.5, "y": 1, "w": 1 },
+                { "x": 13.5, "y": 1, "w": 1.5 },
+                { "x": 15.25, "y": 1, "w": 1 },
+                { "x": 0, "y": 2, "w": 1.75 },
+                { "x": 1.75, "y": 2, "w": 1 },
+                { "x": 2.75, "y": 2, "w": 1 },
+                { "x": 3.75, "y": 2, "w": 1 },
+                { "x": 4.75, "y": 2, "w": 1 },
+                { "x": 5.75, "y": 2, "w": 1 },
+                { "x": 6.75, "y": 2, "w": 1 },
+                { "x": 7.75, "y": 2, "w": 1 },
+                { "x": 8.75, "y": 2, "w": 1 },
+                { "x": 9.75, "y": 2, "w": 1 },
+                { "x": 10.75, "y": 2, "w": 1 },
+                { "x": 11.75, "y": 2, "w": 1 },
+                { "x": 12.75, "y": 2, "w": 2.25 },
+                { "x": 15.25, "y": 2, "w": 1 },
+                { "x": 0, "y": 3, "w": 1.25 },
+                { "x": 1.25, "y": 3, "w": 1 },
+                { "x": 2.25, "y": 3, "w": 1 },
+                { "x": 3.25, "y": 3, "w": 1 },
+                { "x": 4.25, "y": 3, "w": 1 },
+                { "x": 5.25, "y": 3, "w": 1 },
+                { "x": 6.25, "y": 3, "w": 1 },
+                { "x": 7.25, "y": 3, "w": 1 },
+                { "x": 8.25, "y": 3, "w": 1 },
+                { "x": 9.25, "y": 3, "w": 1 },
+                { "x": 10.25, "y": 3, "w": 1 },
+                { "x": 11.25, "y": 3, "w": 1 },
+                { "x": 12.25, "y": 3, "w": 1.75 },
+                { "x": 14.25, "y": 3.25, "w": 1 },
+                { "x": 0, "y": 4, "w": 1.25 },
+                { "x": 1.25, "y": 4, "w": 1.25 },
+                { "x": 2.5, "y": 4, "w": 1.25 },
+                { "x": 3.75, "y": 4, "w": 2.25 },
+                { "x": 6, "y": 4, "w": 1.25 },
+                { "x": 7.25, "y": 4, "w": 2.75 },
+                { "x": 10, "y": 4, "w": 1 },
+                { "x": 11, "y": 4, "w": 1 },
+                { "x": 12, "y": 4, "w": 1 },
+                { "x": 13.25, "y": 4.25, "w": 1 },
+                { "x": 14.25, "y": 4.25, "w": 1 },
+                { "x": 15.25, "y": 4.25, "w": 1 }
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                { "x": 0, "y": 0, "w": 1 },
+                { "x": 1, "y": 0, "w": 1 },
+                { "x": 2, "y": 0, "w": 1 },
+                { "x": 3, "y": 0, "w": 1 },
+                { "x": 4, "y": 0, "w": 1 },
+                { "x": 5, "y": 0, "w": 1 },
+                { "x": 6, "y": 0, "w": 1 },
+                { "x": 7, "y": 0, "w": 1 },
+                { "x": 8, "y": 0, "w": 1 },
+                { "x": 9, "y": 0, "w": 1 },
+                { "x": 10, "y": 0, "w": 1 },
+                { "x": 11, "y": 0, "w": 1 },
+                { "x": 12, "y": 0, "w": 1 },
+                { "x": 13, "y": 0, "w": 2 },
+                { "x": 15.25, "y": 0, "w": 1 },
+                { "x": 0, "y": 1, "w": 1.5 },
+                { "x": 1.5, "y": 1, "w": 1 },
+                { "x": 2.5, "y": 1, "w": 1 },
+                { "x": 3.5, "y": 1, "w": 1 },
+                { "x": 4.5, "y": 1, "w": 1 },
+                { "x": 5.5, "y": 1, "w": 1 },
+                { "x": 6.5, "y": 1, "w": 1 },
+                { "x": 7.5, "y": 1, "w": 1 },
+                { "x": 8.5, "y": 1, "w": 1 },
+                { "x": 9.5, "y": 1, "w": 1 },
+                { "x": 10.5, "y": 1, "w": 1 },
+                { "x": 11.5, "y": 1, "w": 1 },
+                { "x": 12.5, "y": 1, "w": 1 },
+                { "x": 13.5, "y": 1, "w": 1.5 },
+                { "x": 15.25, "y": 1, "w": 1 },
+                { "x": 0, "y": 2, "w": 1.75 },
+                { "x": 1.75, "y": 2, "w": 1 },
+                { "x": 2.75, "y": 2, "w": 1 },
+                { "x": 3.75, "y": 2, "w": 1 },
+                { "x": 4.75, "y": 2, "w": 1 },
+                { "x": 5.75, "y": 2, "w": 1 },
+                { "x": 6.75, "y": 2, "w": 1 },
+                { "x": 7.75, "y": 2, "w": 1 },
+                { "x": 8.75, "y": 2, "w": 1 },
+                { "x": 9.75, "y": 2, "w": 1 },
+                { "x": 10.75, "y": 2, "w": 1 },
+                { "x": 11.75, "y": 2, "w": 1 },
+                { "x": 12.75, "y": 2, "w": 2.25 },
+                { "x": 15.25, "y": 2, "w": 1 },
+                { "x": 0, "y": 3, "w": 2.25 },
+                { "x": 2.25, "y": 3, "w": 1 },
+                { "x": 3.25, "y": 3, "w": 1 },
+                { "x": 4.25, "y": 3, "w": 1 },
+                { "x": 5.25, "y": 3, "w": 1 },
+                { "x": 6.25, "y": 3, "w": 1 },
+                { "x": 7.25, "y": 3, "w": 1 },
+                { "x": 8.25, "y": 3, "w": 1 },
+                { "x": 9.25, "y": 3, "w": 1 },
+                { "x": 10.25, "y": 3, "w": 1 },
+                { "x": 11.25, "y": 3, "w": 1 },
+                { "x": 12.25, "y": 3, "w": 1.75 },
+                { "x": 14.25, "y": 3.25, "w": 1 },
+                { "x": 0, "y": 4, "w": 1.25 },
+                { "x": 1.25, "y": 4, "w": 1.25 },
+                { "x": 2.5, "y": 4, "w": 1.25 },
+                { "x": 3.75, "y": 4, "w": 6.25 },
+                { "x": 10, "y": 4, "w": 1 },
+                { "x": 11, "y": 4, "w": 1 },
+                { "x": 12, "y": 4, "w": 1 },
+                { "x": 13.25, "y": 4.25, "w": 1 },
+                { "x": 14.25, "y": 4.25, "w": 1 },
+                { "x": 15.25, "y": 4.25, "w": 1 }
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                { "x": 0, "y": 0, "w": 1 },
+                { "x": 1, "y": 0, "w": 1 },
+                { "x": 2, "y": 0, "w": 1 },
+                { "x": 3, "y": 0, "w": 1 },
+                { "x": 4, "y": 0, "w": 1 },
+                { "x": 5, "y": 0, "w": 1 },
+                { "x": 6, "y": 0, "w": 1 },
+                { "x": 7, "y": 0, "w": 1 },
+                { "x": 8, "y": 0, "w": 1 },
+                { "x": 9, "y": 0, "w": 1 },
+                { "x": 10, "y": 0, "w": 1 },
+                { "x": 11, "y": 0, "w": 1 },
+                { "x": 12, "y": 0, "w": 1 },
+                { "x": 13, "y": 0, "w": 2 },
+                { "x": 15.25, "y": 0, "w": 1 },
+                { "x": 0, "y": 1, "w": 1.5 },
+                { "x": 1.5, "y": 1, "w": 1 },
+                { "x": 2.5, "y": 1, "w": 1 },
+                { "x": 3.5, "y": 1, "w": 1 },
+                { "x": 4.5, "y": 1, "w": 1 },
+                { "x": 5.5, "y": 1, "w": 1 },
+                { "x": 6.5, "y": 1, "w": 1 },
+                { "x": 7.5, "y": 1, "w": 1 },
+                { "x": 8.5, "y": 1, "w": 1 },
+                { "x": 9.5, "y": 1, "w": 1 },
+                { "x": 10.5, "y": 1, "w": 1 },
+                { "x": 11.5, "y": 1, "w": 1 },
+                { "x": 12.5, "y": 1, "w": 1 },
+                { "x": 15.25, "y": 1, "w": 1 },
+                { "x": 0, "y": 2, "w": 1.75 },
+                { "x": 1.75, "y": 2, "w": 1 },
+                { "x": 2.75, "y": 2, "w": 1 },
+                { "x": 3.75, "y": 2, "w": 1 },
+                { "x": 4.75, "y": 2, "w": 1 },
+                { "x": 5.75, "y": 2, "w": 1 },
+                { "x": 6.75, "y": 2, "w": 1 },
+                { "x": 7.75, "y": 2, "w": 1 },
+                { "x": 8.75, "y": 2, "w": 1 },
+                { "x": 9.75, "y": 2, "w": 1 },
+                { "x": 10.75, "y": 2, "w": 1 },
+                { "x": 11.75, "y": 2, "w": 1 },
+                { "x": 12.75, "y": 2, "w": 1 },
+                {
+                    "x": 13.75,
+                    "y": 1,
+                    "w": 1.25,
+                    "h": 2
+                },
+                { "x": 15.25, "y": 2, "w": 1 },
+                { "x": 0, "y": 3, "w": 1.25 },
+                { "x": 1.25, "y": 3, "w": 1 },
+                { "x": 2.25, "y": 3, "w": 1 },
+                { "x": 3.25, "y": 3, "w": 1 },
+                { "x": 4.25, "y": 3, "w": 1 },
+                { "x": 5.25, "y": 3, "w": 1 },
+                { "x": 6.25, "y": 3, "w": 1 },
+                { "x": 7.25, "y": 3, "w": 1 },
+                { "x": 8.25, "y": 3, "w": 1 },
+                { "x": 9.25, "y": 3, "w": 1 },
+                { "x": 10.25, "y": 3, "w": 1 },
+                { "x": 11.25, "y": 3, "w": 1 },
+                { "x": 12.25, "y": 3, "w": 1.75 },
+                { "x": 14.25, "y": 3.25, "w": 1 },
+                { "x": 0, "y": 4, "w": 1.25 },
+                { "x": 1.25, "y": 4, "w": 1.25 },
+                { "x": 2.5, "y": 4, "w": 1.25 },
+                { "x": 3.75, "y": 4, "w": 6.25 },
+                { "x": 10, "y": 4, "w": 1 },
+                { "x": 11, "y": 4, "w": 1 },
+                { "x": 12, "y": 4, "w": 1 },
+                { "x": 13.25, "y": 4.25, "w": 1 },
+                { "x": 14.25, "y": 4.25, "w": 1 },
+                { "x": 15.25, "y": 4.25, "w": 1 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/boardsource/the_mark/keymaps/default/keymap.c b/keyboards/boardsource/the_mark/keymaps/default/keymap.c
new file mode 100644
index 0000000000..ead93baf55
--- /dev/null
+++ b/keyboards/boardsource/the_mark/keymaps/default/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2020 Boardsource
+ *
+ * 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
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_all(
+		KC_ESC,  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, RGB_TOG, 
+		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, RGB_MOD, 
+		KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  MO(_FN), 
+		KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,   
+		KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
+	),
+[_FN] = LAYOUT_all(
+  KC_GRV,      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_HOME,
+  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_MPLY,    KC_VOLD,    KC_VOLU,    KC_MUTE,    KC_END,
+  RESET,                  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,
+  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    
+  _______,    _______,    _______,                _______,                _______,                _______,                _______,    _______,    _______,    _______,    _______,    _______
+)
+
+
+};
+
diff --git a/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c
new file mode 100644
index 0000000000..250ecf7669
--- /dev/null
+++ b/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2020 Boardsource
+ *
+ * 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
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_ansi(
+		KC_ESC,  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,          RGB_TOG, 
+		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, RGB_MOD, 
+		KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           MO(_FN), 
+		         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,   
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
+	),
+[_FN] = LAYOUT_ansi(
+  KC_GRV,      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_HOME,
+  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_MPLY,    KC_VOLD,  KC_VOLU,  _______,        KC_END,
+  RESET,                  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,  KC_MUTE,                  _______,
+              _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,            _______,    
+  _______,    _______,    _______,                                        _______,                                        _______,    _______,    _______,  _______,  _______,    _______
+)
+
+
+};
+
diff --git a/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c
new file mode 100644
index 0000000000..6aeace190a
--- /dev/null
+++ b/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2020 Boardsource
+ *
+ * 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
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_iso(
+		KC_ESC,  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,          RGB_TOG, 
+		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,          RGB_MOD, 
+		KC_LCTL,          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,  MO(_FN), 
+		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_LSFT,          KC_UP,   
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
+	),
+[_FN] = LAYOUT_iso(
+  KC_GRV,      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_HOME,
+  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_MPLY,  KC_VOLD,  KC_VOLU,                  KC_END,
+  RESET,                  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,KC_MUTE,     _______,    _______,
+  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,             _______,    
+  _______,    _______,    _______,                                        _______,                                        _______,    _______,    _______,    _______,  _______,    _______
+)
+
+
+};
+
diff --git a/keyboards/boardsource/the_mark/keymaps/via/keymap.c b/keyboards/boardsource/the_mark/keymaps/via/keymap.c
new file mode 100644
index 0000000000..2b0477f39f
--- /dev/null
+++ b/keyboards/boardsource/the_mark/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2020 Boardsource
+ *
+ * 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] = {
+    /* Base */
+    LAYOUT_all(
+		KC_ESC,  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, RGB_TOG, 
+		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_PGDN, 
+		KC_LCTL,          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_PGUP, 
+		KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,   
+		KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
+	),
+LAYOUT_all(
+  KC_GRV,      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_HOME,
+  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_MPLY,    KC_VOLD,    KC_VOLU,    KC_MUTE,    KC_END,
+  RESET,                  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,
+  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    
+  _______,    _______,    _______,                _______,                _______,                _______,                _______,    _______,    _______,    _______,    _______,    _______
+),
+LAYOUT_all(
+  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
+  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
+  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,
+  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    
+  _______,    _______,    _______,                _______,                _______,                _______,                _______,    _______,    _______,    _______,    _______,    _______
+),
+LAYOUT_all(
+  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
+  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
+  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,
+  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    
+  _______,    _______,    _______,                _______,                _______,                _______,                _______,    _______,    _______,    _______,    _______,    _______
+)
+
+
+
+};
+
diff --git a/keyboards/boardsource/the_mark/keymaps/via/readme.md b/keyboards/boardsource/the_mark/keymaps/via/readme.md
new file mode 100644
index 0000000000..5fda80e18b
--- /dev/null
+++ b/keyboards/boardsource/the_mark/keymaps/via/readme.md
@@ -0,0 +1,3 @@
+# The via keymap for The Mark: 65
+
+This folder contains the VIA configuration for the boardsource's The Mark: 65 
diff --git a/keyboards/boardsource/the_mark/keymaps/via/rules.mk b/keyboards/boardsource/the_mark/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/boardsource/the_mark/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/boardsource/the_mark/readme.md b/keyboards/boardsource/the_mark/readme.md
new file mode 100644
index 0000000000..100466b035
--- /dev/null
+++ b/keyboards/boardsource/the_mark/readme.md
@@ -0,0 +1,19 @@
+# the_mark
+
+![The Mark: 65](https://i.imgur.com/3zC4PKkl.jpg)
+
+The Mark: 65 is a no compromise 65% keyboard designed and produced by Boardsource. 
+
+* Keyboard Maintainer: [Boardsource](https://github.com/boardsource)
+* Hardware Supported: The Mark:65 v1
+* Hardware Availability: [Boardsource](https://boardsource.xyz/store/5fc2eb0b86b9341522d8f7a3)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make boardsource/the_mark:default
+
+Flashing example for this keyboard:
+
+    make boardsource/the_mark:default:flash
+
+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/boardsource/the_mark/rules.mk b/keyboards/boardsource/the_mark/rules.mk
new file mode 100644
index 0000000000..38ce53e309
--- /dev/null
+++ b/keyboards/boardsource/the_mark/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/boardsource/the_mark/the_mark.c b/keyboards/boardsource/the_mark/the_mark.c
new file mode 100644
index 0000000000..9d3dedc085
--- /dev/null
+++ b/keyboards/boardsource/the_mark/the_mark.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 Boardsource
+ *
+ * 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 "the_mark.h"
diff --git a/keyboards/boardsource/the_mark/the_mark.h b/keyboards/boardsource/the_mark/the_mark.h
new file mode 100644
index 0000000000..9d527f9467
--- /dev/null
+++ b/keyboards/boardsource/the_mark/the_mark.h
@@ -0,0 +1,71 @@
+/* Copyright 2020 Boardsource
+ *
+ * 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"
+
+/* 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( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
+	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
+	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314,       \
+	K400, K401,       K403, K404,       K406,       K408,       K410, K411, K412, K413, K414, K415  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
+	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
+	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215 }, \
+	{ K301,  K300,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  KC_NO}, \
+	{ K400,  K401,  KC_NO, K403,  K404,  KC_NO, K406,  KC_NO, K408,  KC_NO, K410,  K411,  K412,  K413,  K414,  K415 }  \
+}
+
+#define LAYOUT_ansi( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
+	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
+	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
+	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314,       \
+	K400, K401,       K403,             K406,                   K410, K411, K412, K413, K414, K415  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO, K015 }, \
+	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
+	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215 }, \
+	{ KC_NO, K300,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  KC_NO}, \
+	{ K400,  K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  K412,  K413,  K414,  K415 }  \
+}
+
+
+#define LAYOUT_iso( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
+	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
+	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K114, K213, K215, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314,       \
+	K400, K401,       K403,             K406,                   K410, K411, K412, K413, K414, K415  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO, K015 }, \
+	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
+	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215 }, \
+	{ K301,  K300,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  KC_NO}, \
+	{ K400,  K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  K412,  K413,  K414,  K415 }  \
+}
+