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

12 files changed, 576 insertions, 0 deletions

diff --git a/keyboards/bacca70/bacca70.c b/keyboards/bacca70/bacca70.c
new file mode 100644
index 0000000000..174b4d97e7
--- /dev/null
+++ b/keyboards/bacca70/bacca70.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 keebnewb
+ *
+ * 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 "bacca70.h"
diff --git a/keyboards/bacca70/bacca70.h b/keyboards/bacca70/bacca70.h
new file mode 100644
index 0000000000..0583fd8043
--- /dev/null
+++ b/keyboards/bacca70/bacca70.h
@@ -0,0 +1,65 @@
+/* Copyright 2022 keebnewb
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+ #pragma once
+
+ #include "quantum.h"
+
+ #define ___ KC_NO
+
+#define LAYOUT_default( \
+    k00, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k17, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27,  \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k67,  \
+    k80, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k96, k87,  \
+    ka0, ka1, ka3, kb5, ka7 \
+){ \
+    { k00, k01, k02, k03, k04, k05, k06, ___ }, \
+    { ___, k11, k12, k13, k14, k15, k16, k17 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
+    { k30, k31, k32, k33, k34, k35, k36, ___ }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
+    { k50, k51, k52, k53, k54, k55, ___, ___ }, \
+    { k60, k61, k62, k63, k64, k65, ___, k67 }, \
+    { k70, k71, k72, k73, k74, k75, ___, ___ }, \
+    { k80, k81, k82, k83, k84, k85, ___, k87 }, \
+    { ___, k91, k92, k93, k94, k95, k96, ___ }, \
+    { ka0, ka1, ___, ka3, ___, ___, ___, ka7 }, \
+    { ___, ___, ___, ___, ___, kb5, ___, ___ }  \
+}
+
+#define LAYOUT_debaccabean( \
+    k00, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k17, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27,  \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47,  \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67,  \
+    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k96, k87,  \
+    ka0, ka1, ka2, ka3, ka4, kb5, ka7 \
+){ \
+    { k00, k01, k02, k03, k04, k05, k06, ___ }, \
+    { ___, k11, k12, k13, k14, k15, k16, k17 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
+    { k30, k31, k32, k33, k34, k35, k36, ___ }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
+    { k50, k51, k52, k53, k54, k55, k56, ___ }, \
+    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
+    { k70, k71, k72, k73, k74, k75, k76, ___ }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87 }, \
+    { k90, k91, k92, k93, k94, k95, k96, ___ }, \
+    { ka0, ka1, ka2, ka3, ka4, ___, ___, ka7 }, \
+    { ___, ___, ___, ___, ___, kb5, ___, ___ }  \
+}
diff --git a/keyboards/bacca70/chconf.h b/keyboards/bacca70/chconf.h
new file mode 100644
index 0000000000..9fee9bb49d
--- /dev/null
+++ b/keyboards/bacca70/chconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2022 keebnewb
+ *
+ * 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
+
+#define CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_OPTIMIZE_SPEED FALSE
+
+#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
+
+#include_next <chconf.h>
diff --git a/keyboards/bacca70/config.h b/keyboards/bacca70/config.h
new file mode 100644
index 0000000000..703baaaf3a
--- /dev/null
+++ b/keyboards/bacca70/config.h
@@ -0,0 +1,49 @@
+/*
+Copyright 2022 keebnewb
+
+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       0xBACA
+#define PRODUCT_ID      0x6970
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Viktus Design LLC
+#define PRODUCT         Bacca70
+
+/* key matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 8
+
+//                         0   1   2   3   4   5   6   7   8    9   A    B
+#define MATRIX_ROW_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, A9, A10 }
+#define MATRIX_COL_PINS { A0, A1, A2, B12, B13, B14, B15, A8 }
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't 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/bacca70/info.json b/keyboards/bacca70/info.json
new file mode 100644
index 0000000000..ddc2f894ac
--- /dev/null
+++ b/keyboards/bacca70/info.json
@@ -0,0 +1,170 @@
+{
+    "keyboard_name": "Bacca70",
+    "url": "https://3dkeebs.com/",
+    "maintainer": "keebnewb",
+    "layouts": {
+        "LAYOUT_default": {
+          "layout": [
+            {"x":0, "y":0},
+            {"x":1.25, "y":0},
+            {"x":2.25, "y":0},
+            {"x":3.25, "y":0},
+            {"x":4.25, "y":0},
+            {"x":5.5, "y":0},
+            {"x":6.5, "y":0},
+            {"x":7.5, "y":0},
+            {"x":8.5, "y":0},
+            {"x":9.75, "y":0},
+            {"x":10.75, "y":0},
+            {"x":11.75, "y":0},
+            {"x":12.75, "y":0},
+            {"x":14, "y":0},
+            {"x":0, "y":1.25},
+            {"x":1, "y":1.25},
+            {"x":2, "y":1.25},
+            {"x":3, "y":1.25},
+            {"x":4, "y":1.25},
+            {"x":5, "y":1.25},
+            {"x":6, "y":1.25},
+            {"x":7, "y":1.25},
+            {"x":8, "y":1.25},
+            {"x":9, "y":1.25},
+            {"x":10, "y":1.25},
+            {"x":11, "y":1.25},
+            {"x":12, "y":1.25},
+            {"x":13, "y":1.25},
+            {"x":14, "y":1.25},
+            {"x":0, "y":2.25, "w":1.5},
+            {"x":1.5, "y":2.25},
+            {"x":2.5, "y":2.25},
+            {"x":3.5, "y":2.25},
+            {"x":4.5, "y":2.25},
+            {"x":5.5, "y":2.25},
+            {"x":6.5, "y":2.25},
+            {"x":7.5, "y":2.25},
+            {"x":8.5, "y":2.25},
+            {"x":9.5, "y":2.25},
+            {"x":10.5, "y":2.25},
+            {"x":11.5, "y":2.25},
+            {"x":12.5, "y":2.25},
+            {"x":13.5, "y":2.25, "w":1.5},
+            {"x":0, "y":3.25, "w":1.75},
+            {"x":1.75, "y":3.25},
+            {"x":2.75, "y":3.25},
+            {"x":3.75, "y":3.25},
+            {"x":4.75, "y":3.25},
+            {"x":5.75, "y":3.25},
+            {"x":6.75, "y":3.25},
+            {"x":7.75, "y":3.25},
+            {"x":8.75, "y":3.25},
+            {"x":9.75, "y":3.25},
+            {"x":10.75, "y":3.25},
+            {"x":11.75, "y":3.25},
+            {"x":12.75, "y":3.25, "w":2.25},
+            {"x":0, "y":4.25, "w":2.25},
+            {"x":2.25, "y":4.25},
+            {"x":3.25, "y":4.25},
+            {"x":4.25, "y":4.25},
+            {"x":5.25, "y":4.25},
+            {"x":6.25, "y":4.25},
+            {"x":7.25, "y":4.25},
+            {"x":8.25, "y":4.25},
+            {"x":9.25, "y":4.25},
+            {"x":10.25, "y":4.25},
+            {"x":11.25, "y":4.25},
+            {"x":12.25, "y":4.25, "w":1.75},
+            {"x":14, "y":4.25},
+            {"x":0, "y":5.25, "w":1.5},
+            {"x":2.5, "y":5.25, "w":1.5},
+            {"x":4, "y":5.25, "w":7},
+            {"x":11, "y":5.25, "w":1.5},
+            {"x":13.5, "y":5.25, "w":1.5}
+          ]
+        },
+        "LAYOUT_debaccabean": {
+          "layout": [
+            {"x":0, "y":0},
+            {"x":1.25, "y":0},
+            {"x":2.25, "y":0},
+            {"x":3.25, "y":0},
+            {"x":4.25, "y":0},
+            {"x":5.5, "y":0},
+            {"x":6.5, "y":0},
+            {"x":7.5, "y":0},
+            {"x":8.5, "y":0},
+            {"x":9.75, "y":0},
+            {"x":10.75, "y":0},
+            {"x":11.75, "y":0},
+            {"x":12.75, "y":0},
+            {"x":14, "y":0},
+            {"x":0, "y":1.25},
+            {"x":1, "y":1.25},
+            {"x":2, "y":1.25},
+            {"x":3, "y":1.25},
+            {"x":4, "y":1.25},
+            {"x":5, "y":1.25},
+            {"x":6, "y":1.25},
+            {"x":7, "y":1.25},
+            {"x":8, "y":1.25},
+            {"x":9, "y":1.25},
+            {"x":10, "y":1.25},
+            {"x":11, "y":1.25},
+            {"x":12, "y":1.25},
+            {"x":13, "y":1.25},
+            {"x":14, "y":1.25},
+            {"x":0, "y":2.25},
+            {"x":1, "y":2.25},
+            {"x":2, "y":2.25},
+            {"x":3, "y":2.25},
+            {"x":4, "y":2.25},
+            {"x":5, "y":2.25},
+            {"x":6, "y":2.25},
+            {"x":7, "y":2.25},
+            {"x":8, "y":2.25},
+            {"x":9, "y":2.25},
+            {"x":10, "y":2.25},
+            {"x":11, "y":2.25},
+            {"x":12, "y":2.25},
+            {"x":13, "y":2.25},
+            {"x":14, "y":2.25},
+            {"x":0, "y":3.25},
+            {"x":1, "y":3.25},
+            {"x":2, "y":3.25},
+            {"x":3, "y":3.25},
+            {"x":4, "y":3.25},
+            {"x":5, "y":3.25},
+            {"x":6, "y":3.25},
+            {"x":7, "y":3.25},
+            {"x":8, "y":3.25},
+            {"x":9, "y":3.25},
+            {"x":10, "y":3.25},
+            {"x":11, "y":3.25},
+            {"x":12, "y":3.25},
+            {"x":13, "y":3.25},
+            {"x":14, "y":3.25},
+            {"x":0, "y":4.25},
+            {"x":1, "y":4.25},
+            {"x":2, "y":4.25},
+            {"x":3, "y":4.25},
+            {"x":4, "y":4.25},
+            {"x":5, "y":4.25},
+            {"x":6, "y":4.25},
+            {"x":7, "y":4.25},
+            {"x":8, "y":4.25},
+            {"x":9, "y":4.25},
+            {"x":10, "y":4.25},
+            {"x":11, "y":4.25},
+            {"x":12, "y":4.25},
+            {"x":13, "y":4.25},
+            {"x":14, "y":4.25},
+            {"x":0, "y":5.25, "w":1.5},
+            {"x":2.5, "y":5.25, "w":1.5},
+            {"x":4, "y":5.25, "w":3},
+            {"x":7, "y":5.25},
+            {"x":8, "y":5.25, "w":3},
+            {"x":11, "y":5.25, "w":1.5},
+            {"x":13.5, "y":5.25, "w":1.5}
+          ]
+        }
+      }
+}
diff --git a/keyboards/bacca70/keymaps/debaccabean/keymap.c b/keyboards/bacca70/keymaps/debaccabean/keymap.c
new file mode 100644
index 0000000000..66e3ec0b5f
--- /dev/null
+++ b/keyboards/bacca70/keymaps/debaccabean/keymap.c
@@ -0,0 +1,40 @@
+/*
+Copyright 2022 keebnewb
+
+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
+
+#define CAP_GUI MT(MOD_LGUI, KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_debaccabean(
+        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_DEL,
+        KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_LBRC,KC_INS, KC_RBRC,KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_BSPC,
+        KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_P7,  KC_P8,  KC_P9,  KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_BSLS,
+        CAP_GUI,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_P4,  KC_P5,  KC_P6,  KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,
+        KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_P1,  KC_P2,  KC_P3,  KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_ENT,
+        KC_LCTL,        KC_LALT,                                KC_SPC, KC_SPC, KC_SPC,                 MO(1),          KC_RCTL
+    ),
+
+    [1] = LAYOUT_debaccabean(
+        RESET,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_UP,  KC_PGUP,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_MPLY,KC_MUTE,KC_VOLD,KC_VOLU,KC_MPRV,KC_MNXT,KC_TRNS,KC_TRNS,KC_TRNS,KC_LEFT,KC_DOWN,KC_RGHT,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_HOME,KC_END, KC_PGDN,KC_TRNS,KC_TRNS,
+        KC_TRNS,        KC_TRNS,                                KC_TRNS,KC_TRNS,KC_TRNS,                KC_TRNS,        KC_TRNS
+    )
+};
diff --git a/keyboards/bacca70/keymaps/dede-special/keymap.c b/keyboards/bacca70/keymaps/dede-special/keymap.c
new file mode 100644
index 0000000000..1c7514e81b
--- /dev/null
+++ b/keyboards/bacca70/keymaps/dede-special/keymap.c
@@ -0,0 +1,74 @@
+/*
+Copyright 2022 keebnewb
+
+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
+
+// Windows mods
+#define GRV_CTL MT(MOD_LCTL, KC_GRV)
+#define BLS_CTL MT(MOD_RCTL, KC_BSLS)
+#define TAB_ALT MT(MOD_LALT, KC_TAB)
+
+// MacOS mods
+#define GRV_GUI MT(MOD_LGUI, KC_GRV)
+#define BLS_GUI MT(MOD_RGUI, KC_BSLS)
+#define TAB_CTL MT(MOD_LCTL, KC_TAB)
+
+// mod tap bracket shifts
+#define LBR_SFT MT(MOD_LSFT, KC_LBRC)
+#define RBR_SFT MT(MOD_RSFT, KC_RBRC)
+
+// Arrow/TenKey/Media Keys/Reset hold with Backspace tap
+#define BSPC_LR LT(3, KC_BSPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_debaccabean(
+        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_F13,
+        KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_LBRC,KC_GRV, KC_RBRC,KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_DEL,
+        KC_ESC, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_P7,  KC_P8,  KC_P9,  KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_ENT,
+        TAB_ALT,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_P4,  KC_P5,  KC_P6,  KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,
+        LBR_SFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_P1,  KC_P2,  KC_P3,  KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,RBR_SFT,
+        KC_LGUI,        GRV_CTL,                                BSPC_LR,MO(2),  KC_SPC,                 BLS_CTL,        KC_RGUI
+    ),
+
+    // MacOS layer
+    [1] = LAYOUT_debaccabean(
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        TAB_CTL,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_LALT,        GRV_GUI,                                KC_TRNS,KC_TRNS,KC_TRNS,                BLS_GUI,        KC_RALT
+    ),
+
+    [2] = LAYOUT_debaccabean(
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_UNDS,KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_DLR, KC_TRNS,KC_TRNS,KC_TRNS,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_PLUS,
+        KC_MINS,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_TRNS,KC_TRNS,KC_TRNS,KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_EQL,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,        KC_TRNS,                                KC_TRNS,KC_TRNS,KC_TRNS,                KC_TRNS,        KC_TRNS
+    ),
+
+    [3] = LAYOUT_debaccabean(
+        RESET,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,TG(1),
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS,KC_TRNS,KC_TRNS,
+        KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_UP,  KC_PGUP,KC_TRNS,KC_TRNS,
+        KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_MNXT,KC_TRNS,KC_TRNS,KC_TRNS,KC_LEFT,KC_DOWN,KC_RGHT,KC_TRNS,
+        KC_MPLY,KC_MUTE,KC_VOLD,KC_VOLU,KC_MPRV,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_HOME,KC_END, KC_PGDN,KC_TRNS,KC_TRNS,
+        KC_TRNS,        KC_TRNS,                                KC_TRNS,KC_TRNS,KC_TRNS,                KC_TRNS,        KC_TRNS
+    )
+};
diff --git a/keyboards/bacca70/keymaps/default/keymap.c b/keyboards/bacca70/keymaps/default/keymap.c
new file mode 100644
index 0000000000..65f1252ba6
--- /dev/null
+++ b/keyboards/bacca70/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/*
+Copyright 2022 keebnewb
+
+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] = {
+
+    [0] = LAYOUT_default(
+        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_DEL,
+        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_BSLS,KC_BSPC,
+        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_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,        KC_ENT,
+        KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,        KC_RSFT,KC_RSFT,
+        KC_LCTL,        KC_LALT,                KC_SPC,                                         MO(1),          KC_RCTL
+    ),
+
+    [1] = LAYOUT_default(
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,KC_TRNS,
+        KC_TRNS,        KC_TRNS,                KC_TRNS,                                        RESET,          KC_TRNS
+    )
+};
diff --git a/keyboards/bacca70/keymaps/via/keymap.c b/keyboards/bacca70/keymaps/via/keymap.c
new file mode 100644
index 0000000000..a4a74b7252
--- /dev/null
+++ b/keyboards/bacca70/keymaps/via/keymap.c
@@ -0,0 +1,56 @@
+/*
+Copyright 2022 keebnewb
+
+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] = {
+
+    [0] = LAYOUT_default(
+        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_DEL,
+        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_BSLS,KC_BSPC,
+        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_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,        KC_ENT,
+        KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,        KC_RSFT,KC_RSFT,
+        KC_LCTL,        KC_LALT,                KC_SPC,                                         MO(1),          KC_RCTL
+    ),
+
+    [1]=LAYOUT_default(
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,KC_TRNS,
+        KC_TRNS,        KC_TRNS,                KC_TRNS,                                        RESET,          KC_TRNS
+    ),
+
+    [2] = LAYOUT_default(
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,KC_TRNS,
+        KC_TRNS,        KC_TRNS,                KC_TRNS,                                        RESET,          KC_TRNS
+    ),
+
+    [3] = LAYOUT_default(
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,KC_TRNS,
+        KC_TRNS,        KC_TRNS,                KC_TRNS,                                        RESET,          KC_TRNS
+    )
+};
diff --git a/keyboards/bacca70/keymaps/via/rules.mk b/keyboards/bacca70/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/bacca70/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/bacca70/readme.md b/keyboards/bacca70/readme.md
new file mode 100644
index 0000000000..2141138b8f
--- /dev/null
+++ b/keyboards/bacca70/readme.md
@@ -0,0 +1,23 @@
+# Bacca70
+
+![Bacca70](https://imgur.com/TQMALjwh.png)
+
+The Bacca70 is a winkeyless (WKL) 60% layout that includes a F-row. It's classy, hefty and it was designed by Chewwy (of MechsOnDeck) and BlindAssassin.
+
+* Keyboard Maintainer: [keebnewb](https://github.com/thompson-ele)  
+* Hardware Supported: Bacca70 PCB and the ortholinear variant the DeBaccaBean PCB
+* Hardware Availability: [3DKeebs](https://3dkeebs.com/)
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key (Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB. The button is next to the MCU.
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available. For the default keymap it is on the right alt key on the second layer.
+
+## Make example for this keyboard (after setting up your build environment):
+
+    make bacca70: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/bacca70/rules.mk b/keyboards/bacca70/rules.mk
new file mode 100644
index 0000000000..a0b213f847
--- /dev/null
+++ b/keyboards/bacca70/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output