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

9 files changed, 606 insertions, 0 deletions

diff --git a/keyboards/handwired/swiftrax/digicarp65/config.h b/keyboards/handwired/swiftrax/digicarp65/config.h
new file mode 100644
index 0000000000..1f11e310d1
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/config.h
@@ -0,0 +1,47 @@
+/*
+Copyright 2022 Swiftrax <swiftrax@gmail.com>
+
+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       0x04D8
+#define PRODUCT_ID      0xE7F1
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Swiftrax
+#define PRODUCT         DigiCarp65
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS { B2, B1, F4, F1, F0 }
+#define MATRIX_COL_PINS { F5, C6, F6, F7, C7, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define ENCODERS_PAD_A { B3 }
+#define ENCODERS_PAD_B { B7 }
diff --git a/keyboards/handwired/swiftrax/digicarp65/digicarp65.c b/keyboards/handwired/swiftrax/digicarp65/digicarp65.c
new file mode 100644
index 0000000000..99823a756c
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/digicarp65.c
@@ -0,0 +1,31 @@
+/*
+Copyright 2022 Swiftrax <swiftrax@gmail.com>
+
+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 "digicarp65.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/handwired/swiftrax/digicarp65/digicarp65.h b/keyboards/handwired/swiftrax/digicarp65/digicarp65.h
new file mode 100644
index 0000000000..2797d771d0
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/digicarp65.h
@@ -0,0 +1,78 @@
+/*
+Copyright 2022 Swiftrax <swiftrax@gmail.com>
+
+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_65_ansi( \
+     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
+     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
+     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
+ ) \
+ { \
+  { K00,   K01, K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A, K0B,   K0C, KC_NO, K0E, K0F }, \
+  { K10, KC_NO, K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A, K1B,   K1C,   K1D, K1E, K1F }, \
+  { K20, KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A, K2B,   K2C,   K2D,KC_NO,K2F }, \
+  { K30, KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A, K3B, KC_NO,   K3D, K3E, K3F }, \
+  { K40,   K41, K42, KC_NO, KC_NO, KC_NO,   K46, KC_NO, KC_NO, KC_NO,   K4A, K4B,   K4C,   K4D, K4E, K4F }, \
+ }
+
+ #define LAYOUT_65_iso( \
+     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
+     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
+     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
+ ) \
+ { \
+     { K00, K01,   K02,   K03,   K04,   K05, K06,   K07,   K08, K09,   K0A, K0B,   K0C,   KC_NO,   K0E, K0F }, \
+     { K10, KC_NO, K12,   K13,   K14,   K15, K16,   K17,   K18, K19,   K1A, K1B,   K1C,     K1D,   K2D, K1F }, \
+     { K20, KC_NO, K22,   K23,   K24,   K25, K26,   K27,   K28, K29,   K2A, K2B,   K2C,   KC_NO,   K2E, K2F }, \
+     { K30,   K31, K32,   K33,   K34,   K35, K36,   K37,   K38, K39,   K3A, K3B, KC_NO,     K3D,   K3E, K3F }, \
+     { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C,     K4D,   K4E, K4F }, \
+ }
+ #define LAYOUT_65_ansi_split_bs( \
+     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
+     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
+ ) \
+ { \
+     { K00, K01,   K02,   K03, K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   K0D,   K0E, K0F }, \
+     { K10, KC_NO, K12,   K13, K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E, K1F }, \
+     { K20, KC_NO, K22,   K23, K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
+     { K30, KC_NO, K32,   K33, K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
+     { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C, K4D,   K4E, K4F }, \
+ }
+#define LAYOUT_65_iso_split_bs( \
+     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
+     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
+ ) \
+ { \
+     { K00, K01,   K02,   K03,   K04,   K05, K06,   K07,   K08, K09,   K0A, K0B,   K0C,   K0D,   K0E, K0F }, \
+     { K10, KC_NO, K12,   K13,   K14,   K15, K16,   K17,   K18, K19,   K1A, K1B,   K1C,   K1D,   K2D, K1F }, \
+     { K20, KC_NO, K22,   K23,   K24,   K25, K26,   K27,   K28, K29,   K2A, K2B,   K2C, KC_NO,   K2E, K2F }, \
+     { K30,   K31, K32,   K33,   K34,   K35, K36,   K37,   K38, K39,   K3A, K3B, KC_NO,   K3D,   K3E, K3F }, \
+     { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C,   K4D,   K4E, K4F }, \
+ }
diff --git a/keyboards/handwired/swiftrax/digicarp65/info.json b/keyboards/handwired/swiftrax/digicarp65/info.json
new file mode 100644
index 0000000000..a5fe908e5d
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/info.json
@@ -0,0 +1,315 @@
+{
+    "keyboard_name": "digicarp65",
+    "url": "https://github.com/swiftrax",
+    "maintainer": "swiftrax",
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"label": "r1_01", "x": 0, "y": 0},
+                {"label": "r1_02", "x": 1, "y": 0},
+                {"label": "r1_03", "x": 2, "y": 0},
+                {"label": "r1_04", "x": 3, "y": 0},
+                {"label": "r1_05", "x": 4, "y": 0},
+                {"label": "r1_06", "x": 5, "y": 0},
+                {"label": "r1_07", "x": 6, "y": 0},
+                {"label": "r1_08", "x": 7, "y": 0},
+                {"label": "r1_09", "x": 8, "y": 0},
+                {"label": "r1_10", "x": 9, "y": 0},
+                {"label": "r1_11", "x": 10, "y": 0},
+                {"label": "r1_12", "x": 11, "y": 0},
+                {"label": "r1_13", "x": 12, "y": 0},
+                {"label": "r1_14", "x": 13, "y": 0, "w":2},
+                {"label": "r1_15", "x": 15, "y": 0},
+
+                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
+                {"label": "r2_02", "x": 1.5, "y": 1},
+                {"label": "r2_03", "x": 2.5, "y": 1},
+                {"label": "r2_04", "x": 3.5, "y": 1},
+                {"label": "r2_05", "x": 4.5, "y": 1},
+                {"label": "r2_06", "x": 5.5, "y": 1},
+                {"label": "r2_07", "x": 6.5, "y": 1},
+                {"label": "r2_08", "x": 7.5, "y": 1},
+                {"label": "r2_09", "x": 8.5, "y": 1},
+                {"label": "r2_10", "x": 9.5, "y": 1},
+                {"label": "r2_11", "x": 10.5, "y": 1},
+                {"label": "r2_12", "x": 11.5, "y": 1},
+                {"label": "r2_13", "x": 12.5, "y": 1},
+                {"label": "r2_14", "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "r2_15", "x": 15, "y": 1},
+
+                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
+                {"label": "r3_02", "x": 1.75, "y": 2},
+                {"label": "r3_03", "x": 2.75, "y": 2},
+                {"label": "r3_04", "x": 3.75, "y": 2},
+                {"label": "r3_05", "x": 4.75, "y": 2},
+                {"label": "r3_06", "x": 5.75, "y": 2},
+                {"label": "r3_07", "x": 6.75, "y": 2},
+                {"label": "r3_08", "x": 7.75, "y": 2},
+                {"label": "r3_09", "x": 8.75, "y": 2},
+                {"label": "r3_10", "x": 9.75, "y": 2},
+                {"label": "r3_11", "x": 10.75, "y": 2},
+                {"label": "r3_12", "x": 11.75, "y": 2},
+                {"label": "r3_13", "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "r3_14", "x": 15, "y": 2},
+
+                {"label": "r4_01", "x": 0, "y": 3, "w": 2.25},
+                {"label": "r4_02", "x": 2.25, "y": 3},
+                {"label": "r4_03", "x": 3.25, "y": 3},
+                {"label": "r4_04", "x": 4.25, "y": 3},
+                {"label": "r4_05", "x": 5.25, "y": 3},
+                {"label": "r4_06", "x": 6.25, "y": 3},
+                {"label": "r4_07", "x": 7.25, "y": 3},
+                {"label": "r4_08", "x": 8.25, "y": 3},
+                {"label": "r4_09", "x": 9.25, "y": 3},
+                {"label": "r4_10", "x": 10.25, "y": 3},
+                {"label": "r4_11", "x": 11.25, "y": 3},
+                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "r4_13", "x": 14, "y": 3},
+                {"label": "r4_14", "x": 15, "y": 3},
+
+                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
+                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
+                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "r4_07", "x": 13, "y": 4},
+                {"label": "r4_08", "x": 14, "y": 4},
+                {"label": "r4_09", "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"label": "r1_01", "x": 0, "y": 0},
+                {"label": "r1_02", "x": 1, "y": 0},
+                {"label": "r1_03", "x": 2, "y": 0},
+                {"label": "r1_04", "x": 3, "y": 0},
+                {"label": "r1_05", "x": 4, "y": 0},
+                {"label": "r1_06", "x": 5, "y": 0},
+                {"label": "r1_07", "x": 6, "y": 0},
+                {"label": "r1_08", "x": 7, "y": 0},
+                {"label": "r1_09", "x": 8, "y": 0},
+                {"label": "r1_10", "x": 9, "y": 0},
+                {"label": "r1_11", "x": 10, "y": 0},
+                {"label": "r1_12", "x": 11, "y": 0},
+                {"label": "r1_13", "x": 12, "y": 0},
+                {"label": "r1_14", "x": 13, "y": 0, "w":2},
+                {"label": "r1_15", "x": 15, "y": 0},
+
+                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
+                {"label": "r2_02", "x": 1.5, "y": 1},
+                {"label": "r2_03", "x": 2.5, "y": 1},
+                {"label": "r2_04", "x": 3.5, "y": 1},
+                {"label": "r2_05", "x": 4.5, "y": 1},
+                {"label": "r2_06", "x": 5.5, "y": 1},
+                {"label": "r2_07", "x": 6.5, "y": 1},
+                {"label": "r2_08", "x": 7.5, "y": 1},
+                {"label": "r2_09", "x": 8.5, "y": 1},
+                {"label": "r2_10", "x": 9.5, "y": 1},
+                {"label": "r2_11", "x": 10.5, "y": 1},
+                {"label": "r2_12", "x": 11.5, "y": 1},
+                {"label": "r2_13", "x": 12.5, "y": 1},
+                {"label": "r2_14", "x": 13.5, "y": 1},
+                {"label": "r2_15", "x": 15, "y": 1},
+
+                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
+                {"label": "r3_02", "x": 1.75, "y": 2},
+                {"label": "r3_03", "x": 2.75, "y": 2},
+                {"label": "r3_04", "x": 3.75, "y": 2},
+                {"label": "r3_05", "x": 4.75, "y": 2},
+                {"label": "r3_06", "x": 5.75, "y": 2},
+                {"label": "r3_07", "x": 6.75, "y": 2},
+                {"label": "r3_08", "x": 7.75, "y": 2},
+                {"label": "r3_09", "x": 8.75, "y": 2},
+                {"label": "r3_10", "x": 9.75, "y": 2},
+                {"label": "r3_11", "x": 10.75, "y": 2},
+                {"label": "r3_12", "x": 11.75, "y": 2},
+                {"label": "r3_13", "x": 12.75, "y": 2},
+                {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
+                {"label": "r3_15", "x": 15, "y": 2},
+
+
+                {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
+                {"label": "r4_02", "x": 1.25, "y": 3},
+                {"label": "r4_03", "x": 2.25, "y": 3},
+                {"label": "r4_04", "x": 3.25, "y": 3},
+                {"label": "r4_05", "x": 4.25, "y": 3},
+                {"label": "r4_06", "x": 5.25, "y": 3},
+                {"label": "r4_07", "x": 6.25, "y": 3},
+                {"label": "r4_08", "x": 7.25, "y": 3},
+                {"label": "r4_09", "x": 8.25, "y": 3},
+                {"label": "r4_10", "x": 9.25, "y": 3},
+                {"label": "r4_11", "x": 10.25, "y": 3},
+                {"label": "r4_11", "x": 11.25, "y": 3},
+                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "r4_13", "x": 14, "y": 3},
+                {"label": "r4_14", "x": 15, "y": 3},
+
+                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
+                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
+                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "r4_07", "x": 13, "y": 4},
+                {"label": "r4_08", "x": 14, "y": 4},
+                {"label": "r4_09", "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_split_bs": {
+            "layout": [
+                {"label": "r1_01", "x": 0, "y": 0},
+                {"label": "r1_02", "x": 1, "y": 0},
+                {"label": "r1_03", "x": 2, "y": 0},
+                {"label": "r1_04", "x": 3, "y": 0},
+                {"label": "r1_05", "x": 4, "y": 0},
+                {"label": "r1_06", "x": 5, "y": 0},
+                {"label": "r1_07", "x": 6, "y": 0},
+                {"label": "r1_08", "x": 7, "y": 0},
+                {"label": "r1_09", "x": 8, "y": 0},
+                {"label": "r1_10", "x": 9, "y": 0},
+                {"label": "r1_11", "x": 10, "y": 0},
+                {"label": "r1_12", "x": 11, "y": 0},
+                {"label": "r1_13", "x": 12, "y": 0},
+                {"label": "r1_14", "x": 13, "y": 0},
+                {"label": "r1_15", "x": 14, "y": 0},
+                {"label": "r1_16", "x": 15, "y": 0},
+
+                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
+                {"label": "r2_02", "x": 1.5, "y": 1},
+                {"label": "r2_03", "x": 2.5, "y": 1},
+                {"label": "r2_04", "x": 3.5, "y": 1},
+                {"label": "r2_05", "x": 4.5, "y": 1},
+                {"label": "r2_06", "x": 5.5, "y": 1},
+                {"label": "r2_07", "x": 6.5, "y": 1},
+                {"label": "r2_08", "x": 7.5, "y": 1},
+                {"label": "r2_09", "x": 8.5, "y": 1},
+                {"label": "r2_10", "x": 9.5, "y": 1},
+                {"label": "r2_11", "x": 10.5, "y": 1},
+                {"label": "r2_12", "x": 11.5, "y": 1},
+                {"label": "r2_13", "x": 12.5, "y": 1},
+                {"label": "r2_14", "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "r2_15", "x": 15, "y": 1},
+
+                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
+                {"label": "r3_02", "x": 1.75, "y": 2},
+                {"label": "r3_03", "x": 2.75, "y": 2},
+                {"label": "r3_04", "x": 3.75, "y": 2},
+                {"label": "r3_05", "x": 4.75, "y": 2},
+                {"label": "r3_06", "x": 5.75, "y": 2},
+                {"label": "r3_07", "x": 6.75, "y": 2},
+                {"label": "r3_08", "x": 7.75, "y": 2},
+                {"label": "r3_09", "x": 8.75, "y": 2},
+                {"label": "r3_10", "x": 9.75, "y": 2},
+                {"label": "r3_11", "x": 10.75, "y": 2},
+                {"label": "r3_12", "x": 11.75, "y": 2},
+                {"label": "r3_13", "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "r3_14", "x": 15, "y": 2},
+
+                {"label": "r4_01", "x": 0, "y": 3, "w": 2.25},
+                {"label": "r4_02", "x": 2.25, "y": 3},
+                {"label": "r4_03", "x": 3.25, "y": 3},
+                {"label": "r4_04", "x": 4.25, "y": 3},
+                {"label": "r4_05", "x": 5.25, "y": 3},
+                {"label": "r4_06", "x": 6.25, "y": 3},
+                {"label": "r4_07", "x": 7.25, "y": 3},
+                {"label": "r4_08", "x": 8.25, "y": 3},
+                {"label": "r4_09", "x": 9.25, "y": 3},
+                {"label": "r4_10", "x": 10.25, "y": 3},
+                {"label": "r4_11", "x": 11.25, "y": 3},
+                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "r4_13", "x": 14, "y": 3},
+                {"label": "r4_14", "x": 15, "y": 3},
+
+                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
+                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
+                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "r4_07", "x": 13, "y": 4},
+                {"label": "r4_08", "x": 14, "y": 4},
+                {"label": "r4_09", "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_split_bs": {
+            "layout": [
+                {"label": "r1_01", "x": 0, "y": 0},
+                {"label": "r1_02", "x": 1, "y": 0},
+                {"label": "r1_03", "x": 2, "y": 0},
+                {"label": "r1_04", "x": 3, "y": 0},
+                {"label": "r1_05", "x": 4, "y": 0},
+                {"label": "r1_06", "x": 5, "y": 0},
+                {"label": "r1_07", "x": 6, "y": 0},
+                {"label": "r1_08", "x": 7, "y": 0},
+                {"label": "r1_09", "x": 8, "y": 0},
+                {"label": "r1_10", "x": 9, "y": 0},
+                {"label": "r1_11", "x": 10, "y": 0},
+                {"label": "r1_12", "x": 11, "y": 0},
+                {"label": "r1_13", "x": 12, "y": 0},
+                {"label": "r1_14", "x": 13, "y": 0},
+                {"label": "r1_15", "x": 14, "y": 0},
+                {"label": "r1_16", "x": 15, "y": 0},
+
+                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
+                {"label": "r2_02", "x": 1.5, "y": 1},
+                {"label": "r2_03", "x": 2.5, "y": 1},
+                {"label": "r2_04", "x": 3.5, "y": 1},
+                {"label": "r2_05", "x": 4.5, "y": 1},
+                {"label": "r2_06", "x": 5.5, "y": 1},
+                {"label": "r2_07", "x": 6.5, "y": 1},
+                {"label": "r2_08", "x": 7.5, "y": 1},
+                {"label": "r2_09", "x": 8.5, "y": 1},
+                {"label": "r2_10", "x": 9.5, "y": 1},
+                {"label": "r2_11", "x": 10.5, "y": 1},
+                {"label": "r2_12", "x": 11.5, "y": 1},
+                {"label": "r2_13", "x": 12.5, "y": 1},
+                {"label": "r2_14", "x": 13.5, "y": 1},
+                {"label": "r2_15", "x": 15, "y": 1},
+
+                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
+                {"label": "r3_02", "x": 1.75, "y": 2},
+                {"label": "r3_03", "x": 2.75, "y": 2},
+                {"label": "r3_04", "x": 3.75, "y": 2},
+                {"label": "r3_05", "x": 4.75, "y": 2},
+                {"label": "r3_06", "x": 5.75, "y": 2},
+                {"label": "r3_07", "x": 6.75, "y": 2},
+                {"label": "r3_08", "x": 7.75, "y": 2},
+                {"label": "r3_09", "x": 8.75, "y": 2},
+                {"label": "r3_10", "x": 9.75, "y": 2},
+                {"label": "r3_11", "x": 10.75, "y": 2},
+                {"label": "r3_12", "x": 11.75, "y": 2},
+                {"label": "r3_13", "x": 12.75, "y": 2},
+                {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
+                {"label": "r3_15", "x": 15, "y": 2},
+
+
+                {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
+                {"label": "r4_02", "x": 1.25, "y": 3},
+                {"label": "r4_03", "x": 2.25, "y": 3},
+                {"label": "r4_04", "x": 3.25, "y": 3},
+                {"label": "r4_05", "x": 4.25, "y": 3},
+                {"label": "r4_06", "x": 5.25, "y": 3},
+                {"label": "r4_07", "x": 6.25, "y": 3},
+                {"label": "r4_08", "x": 7.25, "y": 3},
+                {"label": "r4_09", "x": 8.25, "y": 3},
+                {"label": "r4_10", "x": 9.25, "y": 3},
+                {"label": "r4_11", "x": 10.25, "y": 3},
+                {"label": "r4_11", "x": 11.25, "y": 3},
+                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "r4_13", "x": 14, "y": 3},
+                {"label": "r4_14", "x": 15, "y": 3},
+
+                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
+                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
+                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "r4_07", "x": 13, "y": 4},
+                {"label": "r4_08", "x": 14, "y": 4},
+                {"label": "r4_09", "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/swiftrax/digicarp65/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/digicarp65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..5de5c63144
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+/*
+Copyright 2022 Swiftrax <swiftrax@gmail.com>
+
+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_65_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, KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RGUI,   MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_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_DEL,  KC_INS,
+        KC_TRNS, KC_TRNS, KC_UP,   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_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
+        RESET,   KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
+    ),
+    [2] = LAYOUT_65_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+};
diff --git a/keyboards/handwired/swiftrax/digicarp65/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/digicarp65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d3bffe8c4c
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/*
+Copyright 2022 Swiftrax <swiftrax@gmail.com>
+
+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_65_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, KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RGUI,   MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_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_DEL,  KC_INS,
+        KC_TRNS, KC_TRNS, KC_UP,   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_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
+        RESET,   KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
+    ),
+    [2] = LAYOUT_65_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_65_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+};
+
diff --git a/keyboards/handwired/swiftrax/digicarp65/keymaps/via/rules.mk b/keyboards/handwired/swiftrax/digicarp65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/handwired/swiftrax/digicarp65/readme.md b/keyboards/handwired/swiftrax/digicarp65/readme.md
new file mode 100644
index 0000000000..619ec519f0
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/readme.md
@@ -0,0 +1,21 @@
+# DigiCarp65
+
+A 65% keyboard
+
+* Keyboard Maintainer: Swiftrax
+* Hardware Supported: DigiCarp65
+* Hardware Availability: https://github.com/swiftrax
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/swiftrax/digicarp65: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (top left key)and plug in the keyboard
+* **Physical reset button**: Briefly short the pad on the back of the PCB labeled RESET
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/handwired/swiftrax/digicarp65/rules.mk b/keyboards/handwired/swiftrax/digicarp65/rules.mk
new file mode 100644
index 0000000000..7a15812bc8
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes        # Rotary Encoder
+
+LAYOUTS = 65_ansi 65_ansi_split_bs 65_iso 65_iso_split_bs