From 2772f52fa548c48ae3abbe4784eaadbef063b4f2 Mon Sep 17 00:00:00 2001
From: NCKiser <37519411+NCKiser@users.noreply.github.com>
Date: Mon, 1 Apr 2024 22:57:29 -0500
Subject: [PATCH] Add Suffer V1 and V2 (#706)
* Add Suffer V1 and V2
New Keyboard
* Update copyright, add readme
Need to add Imgur link once Imgur comes back online
---
keyboards/kiserdesigns/suffer/readme.md | 23 ++++
keyboards/kiserdesigns/suffer/v1/info.json | 49 ++++++++
.../suffer/v1/keymaps/default/keymap.c | 26 ++++
.../suffer/v1/keymaps/vial/config.h | 14 +++
.../suffer/v1/keymaps/vial/keymap.c | 26 ++++
.../suffer/v1/keymaps/vial/rules.mk | 7 ++
.../suffer/v1/keymaps/vial/vial.json | 48 ++++++++
keyboards/kiserdesigns/suffer/v1/rules.mk | 1 +
keyboards/kiserdesigns/suffer/v2/info.json | 53 +++++++++
.../suffer/v2/keymaps/default/keymap.c | 12 ++
.../suffer/v2/keymaps/vial/config.h | 14 +++
.../suffer/v2/keymaps/vial/keymap.c | 12 ++
.../suffer/v2/keymaps/vial/rules.mk | 2 +
.../suffer/v2/keymaps/vial/vial.json | 111 ++++++++++++++++++
keyboards/kiserdesigns/suffer/v2/rules.mk | 2 +
15 files changed, 400 insertions(+)
create mode 100644 keyboards/kiserdesigns/suffer/readme.md
create mode 100644 keyboards/kiserdesigns/suffer/v1/info.json
create mode 100644 keyboards/kiserdesigns/suffer/v1/keymaps/default/keymap.c
create mode 100644 keyboards/kiserdesigns/suffer/v1/keymaps/vial/config.h
create mode 100644 keyboards/kiserdesigns/suffer/v1/keymaps/vial/keymap.c
create mode 100644 keyboards/kiserdesigns/suffer/v1/keymaps/vial/rules.mk
create mode 100644 keyboards/kiserdesigns/suffer/v1/keymaps/vial/vial.json
create mode 100644 keyboards/kiserdesigns/suffer/v1/rules.mk
create mode 100644 keyboards/kiserdesigns/suffer/v2/info.json
create mode 100644 keyboards/kiserdesigns/suffer/v2/keymaps/default/keymap.c
create mode 100644 keyboards/kiserdesigns/suffer/v2/keymaps/vial/config.h
create mode 100644 keyboards/kiserdesigns/suffer/v2/keymaps/vial/keymap.c
create mode 100644 keyboards/kiserdesigns/suffer/v2/keymaps/vial/rules.mk
create mode 100644 keyboards/kiserdesigns/suffer/v2/keymaps/vial/vial.json
create mode 100644 keyboards/kiserdesigns/suffer/v2/rules.mk
diff --git a/keyboards/kiserdesigns/suffer/readme.md b/keyboards/kiserdesigns/suffer/readme.md
new file mode 100644
index 0000000000..ebf3480eb4
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/readme.md
@@ -0,0 +1,23 @@
+# Suffer (SVFFER)
+
+
+
+*Suffer is a 12-18 key macropad inspired by the [masochist16 by Zicodia](https://github.com/Z1codia/masochist16), with a case designed by seirin_blu*
+* Keyboard Maintainer: [NCKiser](https://github.com/NCKiser)
+* Hardware Supported: Suffer PCB (V1: 32u4, V2: STM32)
+* Hardware Availability: kiserdesigns.com
+
+Make example for this keyboard (after setting up your build environment):
+
+ make kiserdesigns/suffer/v2:default
+
+Flashing example for this keyboard:
+
+ make kiserdesigns/suffer/v2: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).
+## Bootloader
+Enter the bootloader in 3 ways:
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (the top left key) and plug in the keyboard
+* **Physical reset button**: Briefly double-tap the reset button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/suffer/v1/info.json b/keyboards/kiserdesigns/suffer/v1/info.json
new file mode 100644
index 0000000000..1757e9440e
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v1/info.json
@@ -0,0 +1,49 @@
+{
+ "manufacturer": "Kiser Designs",
+ "keyboard_name": "Suffer",
+ "maintainer": "qmk",
+ "bootloader": "atmel-dfu",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["D5", "D3", "D2", "F4", "D1", "D0"],
+ "rows": ["E6", "B0", "B3"]
+ },
+ "processor": "atmega32u4",
+ "usb": {
+ "device_version": "0.0.1",
+ "pid": "0x5376",
+ "vid": "0x4B44"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 5], "x": 4.25, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2, "w": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/suffer/v1/keymaps/default/keymap.c b/keyboards/kiserdesigns/suffer/v1/keymaps/default/keymap.c
new file mode 100644
index 0000000000..93c2c344ff
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v1/keymaps/default/keymap.c
@@ -0,0 +1,26 @@
+/* Copyright 2024 Noah Kiser
+ *
+ * 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_BSPC, KC_ESC,
+ KC_F5, KC_F6, KC_F7, KC_F8, KC_ENT,
+ KC_TAB, KC_PGUP, LT(1,KC_SPC), KC_PGDN, KC_RCTL
+ )
+
+};
diff --git a/keyboards/kiserdesigns/suffer/v1/keymaps/vial/config.h b/keyboards/kiserdesigns/suffer/v1/keymaps/vial/config.h
new file mode 100644
index 0000000000..455c289efb
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v1/keymaps/vial/config.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0xBE, 0xA2, 0x9B, 0x4C, 0x6E, 0x78, 0xDA, 0x7D}
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
+
+#define VIAL_TAP_DANCE_ENTRIES 12
+
+#define VIAL_COMBO_ENTRIES 48
+
+#define DYNAMIC_KEYMAP_MACRO_COUNT 16
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 1 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 5 }
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/suffer/v1/keymaps/vial/keymap.c b/keyboards/kiserdesigns/suffer/v1/keymaps/vial/keymap.c
new file mode 100644
index 0000000000..b707837269
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v1/keymaps/vial/keymap.c
@@ -0,0 +1,26 @@
+/* Copyright 2024 Noah Kiser
+ *
+ * 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_BSPC,
+ KC_ENT, KC_F5, KC_F6, KC_F7, KC_F8,
+ KC_TAB, KC_LALT, LT(1,KC_SPC), KC_LCTL, KC_F9
+ )
+};
+
diff --git a/keyboards/kiserdesigns/suffer/v1/keymaps/vial/rules.mk b/keyboards/kiserdesigns/suffer/v1/keymaps/vial/rules.mk
new file mode 100644
index 0000000000..5e8837567c
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v1/keymaps/vial/rules.mk
@@ -0,0 +1,7 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+LTO_ENABLE = yes
+TAP_DANCE_ENABLE = no
+QMK_SETTINGS = yes
+COMBO_ENABLE = yes
+KEY_OVERRIDE_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/suffer/v1/keymaps/vial/vial.json b/keyboards/kiserdesigns/suffer/v1/keymaps/vial/vial.json
new file mode 100644
index 0000000000..6ba17c52ed
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v1/keymaps/vial/vial.json
@@ -0,0 +1,48 @@
+{
+ "name": "Suffer",
+ "vendorId": "0x4B44",
+ "productId": "0x5346",
+ "lighting": "none",
+ "matrix": {
+ "rows": 3,
+ "cols": 6
+ },
+ "layouts": {
+ "keymap":
+
+ [
+ [
+ "0,0",
+ "0,1",
+ "0,2",
+ "0,3",
+ "0,4",
+ "0,5"
+ ],
+ [
+ {
+ "w": 1.25
+ },
+ "1,0",
+ "1,1",
+ "1,2",
+ "1,3",
+ {
+ "w": 1.75
+ },
+ "1,5"
+ ],
+ [
+ "2,0",
+ "2,1",
+ {
+ "w": 2
+ },
+ "2,2",
+ "2,4",
+ "2,5"
+ ]
+ ]
+
+ }
+}
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/suffer/v1/rules.mk b/keyboards/kiserdesigns/suffer/v1/rules.mk
new file mode 100644
index 0000000000..7ff128fa69
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v1/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/suffer/v2/info.json b/keyboards/kiserdesigns/suffer/v2/info.json
new file mode 100644
index 0000000000..876bf1677f
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v2/info.json
@@ -0,0 +1,53 @@
+{
+ "manufacturer": "Kiser Designs",
+ "keyboard_name": "Suffer V2",
+ "maintainer": "qmk",
+ "bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "direct": [
+ [ "B14", "B15", "A8", "A14", "A0", "A2" ],
+ [ "B13", "B12", "B11", "B0", "A4", "A3" ],
+ [ "B10", "B2", "B1", "A7", "A6", "A5" ]
+ ]
+ },
+ "processor": "STM32F072",
+ "usb": {
+ "device_version": "0.2.0",
+ "pid": "0x5376",
+ "vid": "0x4B44"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/suffer/v2/keymaps/default/keymap.c b/keyboards/kiserdesigns/suffer/v2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..0064b8120b
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v2/keymaps/default/keymap.c
@@ -0,0 +1,12 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT( \
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, \
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+)
+
+
+};
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/suffer/v2/keymaps/vial/config.h b/keyboards/kiserdesigns/suffer/v2/keymaps/vial/config.h
new file mode 100644
index 0000000000..cd9789b6ef
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v2/keymaps/vial/config.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x0E, 0x2B, 0xCD, 0x9D, 0x2C, 0x60, 0xDC, 0xC5}
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 16
+
+#define VIAL_TAP_DANCE_ENTRIES 24
+
+#define VIAL_COMBO_ENTRIES 64
+
+#define DYNAMIC_KEYMAP_MACRO_COUNT 32
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 1 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 4 }
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/suffer/v2/keymaps/vial/keymap.c b/keyboards/kiserdesigns/suffer/v2/keymaps/vial/keymap.c
new file mode 100644
index 0000000000..0064b8120b
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v2/keymaps/vial/keymap.c
@@ -0,0 +1,12 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT( \
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, \
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+)
+
+
+};
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/suffer/v2/keymaps/vial/rules.mk b/keyboards/kiserdesigns/suffer/v2/keymaps/vial/rules.mk
new file mode 100644
index 0000000000..6bc7063adc
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v2/keymaps/vial/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/suffer/v2/keymaps/vial/vial.json b/keyboards/kiserdesigns/suffer/v2/keymaps/vial/vial.json
new file mode 100644
index 0000000000..d0e7060271
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v2/keymaps/vial/vial.json
@@ -0,0 +1,111 @@
+{
+ "name": "Suffer V2",
+ "vendorId": "4B44",
+ "productId": "5376",
+ "lighting": "none",
+ "matrix": {
+ "rows": 3,
+ "cols": 6
+ },
+ "layouts": {
+ "labels": [
+ ["Middle Row", "Orthogonal", "Staggered"],
+ ["Bottom Left", "1-1-1", "1-2u" ,"3u", "6u", "Centered 2u"],
+ ["Bottom Right", "1-1-1", "2u-1" ,"3u", "6u", "Centered 2u"]
+ ],
+ "keymap": [
+ [
+ "0,0",
+ "0,1",
+ "0,2",
+ "0,3",
+ "0,4",
+ "0,5"
+ ],
+ [
+ "1,0\n\n\n0,0",
+ "1,1\n\n\n0,0",
+ "1,2\n\n\n0,0",
+ "1,3\n\n\n0,0",
+ "1,4\n\n\n0,0",
+ "1,5\n\n\n0,0",
+ {
+ "x": 0.25,
+ "w": 1.25
+ },
+ "1,0\n\n\n0,1",
+ "1,1\n\n\n0,1",
+ "1,2\n\n\n0,1",
+ "1,3\n\n\n0,1",
+ {
+ "w": 1.75
+ },
+ "1,4\n\n\n0,1"
+ ],
+ [
+ "2,0\n\n\n1,0",
+ "2,1\n\n\n1,0",
+ "2,2\n\n\n1,0",
+ "2,3\n\n\n2,0",
+ "2,4\n\n\n2,0",
+ "2,5\n\n\n2,0"
+ ],
+ [
+ {
+ "y": 0.25
+ },
+ "2,0\n\n\n1,1",
+ {
+ "w": 2
+ },
+ "2,1\n\n\n1,1",
+ {
+ "w": 2
+ },
+ "2,4\n\n\n2,1",
+ "2,5\n\n\n2,1"
+ ],
+ [
+ {
+ "w": 3
+ },
+ "2,1\n\n\n1,2",
+ {
+ "w": 3
+ },
+ "2,4\n\n\n2,2"
+ ],
+ [
+ {
+ "w": 6
+ },
+ "2,2\n\n\n1,3"
+ ],
+ [
+ {
+ "x": 3,
+ "w": 3,
+ "d": true
+ },
+ "2,3\n\n\n2,3"
+ ],
+ [
+ "2,0\n\n\n1,4",
+ "2,1\n\n\n1,4",
+ {
+ "w": 2
+ },
+ "2,2\n\n\n1,4"
+ ],
+ [
+ {
+ "x": 3,
+ "d": true
+ },
+ "2,3\n\n\n2,4",
+ "2,4\n\n\n2,4",
+ "2,5\n\n\n2,4"
+ ]
+ ]
+ }
+ }
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/suffer/v2/rules.mk b/keyboards/kiserdesigns/suffer/v2/rules.mk
new file mode 100644
index 0000000000..c36cb32280
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v2/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
\ No newline at end of file