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

10 files changed, 448 insertions, 0 deletions

diff --git a/keyboards/trashman/ketch/config.h b/keyboards/trashman/ketch/config.h
new file mode 100644
index 0000000000..93e6479a15
--- /dev/null
+++ b/keyboards/trashman/ketch/config.h
@@ -0,0 +1,44 @@
+/* 
+Copyright 2021 Evan Sailer, Jetpacktuxedo, & QMK Firmware
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#pragma once
+#include "config_common.h"
+
+#define VENDOR_ID     0xFEAE
+#define PRODUCT_ID    0x8947
+#define DEVICE_VER    0x0001
+#define MANUFACTURER  trash man
+#define PRODUCT       Ketch
+
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 8
+#define MATRIX_ROW_PINS { F5, F1, F0, F7, B6, F6 }
+#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7 }
+#define DIODE_DIRECTION COL2ROW
+#define DEBOUNCE 5
+
+#define USB_MAX_POWER_CONSUMPTION 100
+#define RGB_DI_PIN F4
+#define RGBLED_NUM 10
+#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_SLEEP
+#define NO_USB_STARTUP_CHECK
diff --git a/keyboards/trashman/ketch/info.json b/keyboards/trashman/ketch/info.json
new file mode 100644
index 0000000000..bb69106b3d
--- /dev/null
+++ b/keyboards/trashman/ketch/info.json
@@ -0,0 +1,53 @@
+{
+  "keyboard_name": "ketch",
+  "url": "https://trashman.wiki/pcbs/ketch",
+  "maintainer": "jetpacktuxedo",
+  "width": 12.75,
+  "height": 4,
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0, "w":1.75},
+        {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.5},
+	{"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2},
+        {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.5}, {"x":2.75, "y":3, "w":1.25}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.25}, {"x":9.5, "y":3, "w":1.5}, {"x":11, "y":3, "w":1.75}
+      ]
+    },
+
+    "LAYOUT_arrow": {
+      "layout": [
+        {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0, "w":1.75},
+       	{"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.5},
+       	{"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, 
+	{"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.5}, {"x":2.75, "y":3, "w":1.25}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.5}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}
+      ]
+    },
+
+    "LAYOUT_command": {
+      "layout": [
+        {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0, "w":1.75},
+       	{"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.5},
+       	{"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, 
+	{"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.25}, {"x":9.5, "y":3, "w":1.5}, {"x":11, "y":3, "w":1.75}
+      ]
+    },
+
+    "LAYOUT_all": {
+      "layout": [
+        {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0, "w":1.75},
+       	{"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.5},
+       	{"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2},
+       	{"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.5}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}
+      ]
+    },
+    "LAYOUT_jetvan": {
+      "layout": [
+        {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0, "w":1.75},
+       	{"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.5},
+       	{"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2},
+       	{"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3, "w":1.25}, {"x":3.5, "w":6.25, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}
+      ]
+    }
+  }
+}
+
diff --git a/keyboards/trashman/ketch/ketch.c b/keyboards/trashman/ketch/ketch.c
new file mode 100644
index 0000000000..5c38f47664
--- /dev/null
+++ b/keyboards/trashman/ketch/ketch.c
@@ -0,0 +1,23 @@
+/* 
+Copyright 2021 Evan Sailer, Jetpacktuxedo, & QMK Firmware
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#include "ketch.h"
diff --git a/keyboards/trashman/ketch/ketch.h b/keyboards/trashman/ketch/ketch.h
new file mode 100644
index 0000000000..9a20ecf1f1
--- /dev/null
+++ b/keyboards/trashman/ketch/ketch.h
@@ -0,0 +1,96 @@
+/* 
+Copyright 2021 Evan Sailer, Jetpacktuxedo, & QMK Firmware
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#pragma once
+#include "quantum.h"
+
+#define LAYOUT(\
+    K39, K40, K41, K42, K0,  K1,  K2,  K3,  K4,  K5,  K6,  K7,\
+    K32, K33, K34, K35, K8,  K9,  K10, K11, K12, K13, K14, K15,\
+    K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
+    K37,  K43,   K24,      K26,      K27,  K28,  K29,    K31\
+) {\
+    { K0, K1, K2, K3, K4, K5, K6, K7 },\
+    { K8, K9, K10, K11, K12, K13, K14, K15 },\
+    { K16, K17, K18, K19, K20, K21, K22, K23 },\
+    { K24, KC_NO, K26, K27, K28, K29, KC_NO, K31 },\
+    { K32, K33, K34, K35, K36, K37, K38, KC_NO },\
+    { K39, K40, K41, K42, K43, K44, K45, KC_NO }\
+}
+
+#define LAYOUT_arrow(\
+    K39, K40, K41, K42, K0,  K1,  K2,  K3,  K4,  K5,  K6,  K7,\
+    K32, K33, K34, K35, K8,  K9,  K10, K11, K12, K13, K14, K15,\
+    K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
+    K37,  K43,   K24,      K26,      K27,  K28,  K29, K30, K31\
+) {\
+    { K0, K1, K2, K3, K4, K5, K6, K7 }, \
+    { K8, K9, K10, K11, K12, K13, K14, K15 }, \
+    { K16, K17, K18, K19, K20, K21, K22, K23 }, \
+    { K24, KC_NO, K26, K27, K28, K29, K30, K31 }, \
+    { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \
+    { K39, K40, K41, K42, K43, K44, K45, KC_NO } \
+}
+
+#define LAYOUT_command(\
+    K39, K40, K41, K42, K0,  K1,  K2,  K3,  K4,  K5,  K6,  K7,\
+    K32, K33, K34, K35, K8,  K9,  K10, K11, K12, K13, K14, K15,\
+    K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
+    K37, K43, K24, K25,    K26,      K27,  K28,  K29,    K31\
+) {\
+    { K0, K1, K2, K3, K4, K5, K6, K7 }, \
+    { K8, K9, K10, K11, K12, K13, K14, K15 }, \
+    { K16, K17, K18, K19, K20, K21, K22, K23 }, \
+    { K24, K25, K26, K27, K28, K29, KC_NO, K31 }, \
+    { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \
+    { K39, K40, K41, K42, K43, K44, K45, KC_NO } \
+}
+
+// This layout is typically called "southpaw_arrow" or "southpaw + arrow", but
+// using "all" here to match typical qmk conventions
+#define LAYOUT_all(\
+    K39, K40, K41, K42, K0,  K1,  K2,  K3,  K4,  K5,  K6,  K7,\
+    K32, K33, K34, K35, K8,  K9,  K10, K11, K12, K13, K14, K15,\
+    K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
+    K37, K43, K24, K25,    K26,      K27,  K28,  K29, K30, K31\
+) {\
+    { K0, K1, K2, K3, K4, K5, K6, K7 }, \
+    { K8, K9, K10, K11, K12, K13, K14, K15 }, \
+    { K16, K17, K18, K19, K20, K21, K22, K23 }, \
+    { K24, K25, K26, K27, K28, K29, K30, K31 }, \
+    { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \
+    { K39, K40, K41, K42, K43, K44, K45, KC_NO } \
+}
+
+#define LAYOUT_jetvan(\
+    K39, K40, K41, K42, K0,  K1,  K2,  K3,  K4,  K5,  K6,  K7,\
+    K32, K33, K34, K35, K8,  K9,  K10, K11, K12, K13, K14, K15,\
+    K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
+    K37,  K43, K24,               K27,           K29, K30, K31\
+) {\
+    { K0,  K1,  K2,  K3,  K4,  K5,  K6,  K7 }, \
+    { K8,  K9,  K10, K11, K12, K13, K14, K15 }, \
+    { K16, K17, K18, K19, K20, K21, K22, K23 }, \
+    { K24, KC_NO, KC_NO, K27, KC_NO, K29, K30, K31 }, \
+    { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \
+    { K39, K40, K41, K42, K43, K44, K45, KC_NO } \
+}
diff --git a/keyboards/trashman/ketch/keymaps/default/keymap.c b/keyboards/trashman/ketch/keymaps/default/keymap.c
new file mode 100644
index 0000000000..5d2220a4f4
--- /dev/null
+++ b/keyboards/trashman/ketch/keymaps/default/keymap.c
@@ -0,0 +1,44 @@
+/* 
+Copyright 2021 Evan Sailer, Jetpacktuxedo, & QMK Firmware
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_all( /* Qwerty */
+    KC_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   MT(MOD_RSFT, KC_SLSH),
+    KC_LCTL, KC_LGUI, KC_LALT, MO(1),       KC_SPC,           KC_SPC,       MO(2),   KC_LEFT, KC_DOWN, KC_RIGHT
+  ),
+  [1] = LAYOUT_all( /* Number+Symbol Layer */
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+    KC_TRNS, KC_MINS, KC_EQL,  KC_SCLN, KC_QUOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL,  KC_QUOT, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_PGUP, KC_BSLS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_HOME, KC_PGDN, KC_END
+  ),
+  [2] = LAYOUT_all( /* Shifted Layer */
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
+    KC_TRNS, KC_UNDS, KC_PLUS, KC_COLN, KC_DQUO, KC_TRNS, KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_DQUO, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR, KC_PGUP, KC_PIPE,
+    KC_TRNS, RESET,   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_HOME, KC_PGDN, KC_END
+  )
+};
diff --git a/keyboards/trashman/ketch/keymaps/jetpacktuxedo/config.h b/keyboards/trashman/ketch/keymaps/jetpacktuxedo/config.h
new file mode 100644
index 0000000000..64f73ab021
--- /dev/null
+++ b/keyboards/trashman/ketch/keymaps/jetpacktuxedo/config.h
@@ -0,0 +1,26 @@
+/* 
+Copyright 2021 Evan Sailer, Jetpacktuxedo, & QMK Firmware
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#pragma once
+
+#define RGBLIGHT_LAYERS
+#define TAPPING_TERM 150
diff --git a/keyboards/trashman/ketch/keymaps/jetpacktuxedo/keymap.c b/keyboards/trashman/ketch/keymaps/jetpacktuxedo/keymap.c
new file mode 100644
index 0000000000..50b1f7a62e
--- /dev/null
+++ b/keyboards/trashman/ketch/keymaps/jetpacktuxedo/keymap.c
@@ -0,0 +1,113 @@
+/* 
+Copyright 2021 Evan Sailer, Jetpacktuxedo, & QMK Firmware
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#include QMK_KEYBOARD_H
+#include <config.h>
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_jetvan( /* Qwerty */
+        KC_GESC,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,   KC_I,    KC_O,    KC_P,    KC_BSPC,
+        LT(2, KC_TAB), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,   KC_K,    KC_L,    KC_SCLN, LT(2, KC_ENT),
+        KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,   KC_COMM, KC_DOT,  KC_UP,   MT(MOD_RSFT, KC_SLSH),
+        KC_LCTL,       KC_LGUI, KC_LALT,                   LT(1, KC_SPC),                     KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [1] = LAYOUT_jetvan( /* LAYER 1 */
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+        KC_TRNS, KC_MINS, KC_EQL,  KC_SCLN, KC_QUOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL,  KC_QUOT, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_PGUP, KC_BSLS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_HOME, KC_PGDN, KC_END
+    ),
+    [2] = LAYOUT_jetvan( /* LAYER 2 */
+        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
+        KC_TRNS, KC_UNDS, KC_PLUS, KC_COLN, KC_DQUO, KC_TRNS, KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_DQUO, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR, KC_PGUP, KC_PIPE,
+        KC_TRNS, TG(4),   MO(3),                              KC_TRNS,                   KC_HOME, KC_PGDN, KC_END
+    ),
+    [3] = LAYOUT_jetvan( /* LAYER 3 */
+        KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS,   KC_TRNS,                          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [4] = LAYOUT_jetvan( /* Gaming Layer*/
+        KC_ESC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_WH_U, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS,
+        KC_TAB,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LT(5, KC_SLSH),
+        KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [5] = LAYOUT_jetvan( /* RESET Layer*/
+        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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
+
+const rgblight_segment_t PROGMEM layer1[] = RGBLIGHT_LAYER_SEGMENTS(
+    {9, 1, HSV_RED}
+);
+
+const rgblight_segment_t PROGMEM layer2[] = RGBLIGHT_LAYER_SEGMENTS(
+    {9, 1, HSV_GREEN}
+);
+
+const rgblight_segment_t PROGMEM layer3[] = RGBLIGHT_LAYER_SEGMENTS(
+    {8, 1, HSV_CYAN}
+);
+
+const rgblight_segment_t PROGMEM layer4[] = RGBLIGHT_LAYER_SEGMENTS(
+    {8, 1, HSV_MAGENTA}
+);
+
+const rgblight_segment_t PROGMEM layer5[] = RGBLIGHT_LAYER_SEGMENTS(
+    {8, 1, HSV_YELLOW}
+);
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    layer1,
+    layer2,
+    layer3,
+    layer4,
+    layer5
+);
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(0, layer_state_cmp(state, 1));
+    rgblight_set_layer_state(1, layer_state_cmp(state, 2));
+    rgblight_set_layer_state(2, layer_state_cmp(state, 3));
+    rgblight_set_layer_state(3, layer_state_cmp(state, 4));
+    rgblight_set_layer_state(4, layer_state_cmp(state, 5));
+    return state;
+}
+
+void keyboard_post_init_user(void) {
+    #ifdef RGBLIGHT_ENABLE
+        // Litearlly just doing this to lower the brightness. Since I am about to
+        // turn on the rainbow effect which changes the hue I don't actually care
+        // what that gets set to, but I am also lowering the saturation to get more
+        // of a pastel feel
+        rgblight_sethsv_noeeprom(0, 192, 128);
+        // Set LED effects to rainbow
+        rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL);
+        rgblight_layers = my_rgb_layers;
+    #endif //RGBLIGHT_ENABLE
+}
diff --git a/keyboards/trashman/ketch/readme.md b/keyboards/trashman/ketch/readme.md
new file mode 100644
index 0000000000..d6a96183b3
--- /dev/null
+++ b/keyboards/trashman/ketch/readme.md
@@ -0,0 +1,23 @@
+# Ketch
+
+![Ketch](https://i.imgur.com/eCIrvJBl.png)
+
+A pcb designed to be compatible with older minivan cases as well as support most minivan layouts (+ a few new ones).
+The ketch supports the following physical layouts:
+![Image of supported ketch layouts](https://trashman.wiki/layouts/ketch/ketch-all_extra_condensed.png)
+
+Ketch was also explicitly designed to use port D for all column pins in order to support matrix scanning via a portscan rather than individually scanning each pin. This has been implemented here via a custom matrix, so enjoy your slightly more efficient matrix scanning. :P
+
+The PCB has exposed pads for triggering a reset. If you are looking at the bottom of the PCB, the pads are on the left chunk of the board between the usb port and the controller, right next to the bottom of the right-most homerow key (typically enter).
+
+More information can be found on the [trashman wiki](https://trashman.wiki/pcbs/ketch)
+
+* Keyboard Maintainer: [Jetpacktuxedo](https://github.com/jetpacktuxedo)
+* Hardware Supported: Ketch PCB, Sketch PCB
+* Hardware Availability: [Trash Man Keyboards](https://trashman.club/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make trashman/ketch: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/trashman/ketch/rules.mk b/keyboards/trashman/ketch/rules.mk
new file mode 100644
index 0000000000..eeb3847805
--- /dev/null
+++ b/keyboards/trashman/ketch/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 = no       # 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 = yes           # 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/trashman/readme.md b/keyboards/trashman/readme.md
new file mode 100644
index 0000000000..46df88f77d
--- /dev/null
+++ b/keyboards/trashman/readme.md
@@ -0,0 +1,4 @@
+# Trash Man
+Trash Man is the new brand under which Evan Sailer is creating keyboard things following the shut down of TheVan Keyboards in October 2019. Produced boards so far include V4N4G0N, Ketch, Skiff, CaraVan 2, and Garbage Truck. 
+
+For more information see the [trashman website](https://trashman.club/) and the [trashman/van wiki](https://trashman.wiki/).