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

5 files changed, 192 insertions, 0 deletions

diff --git a/keyboards/mino/hotswap/config.h b/keyboards/mino/hotswap/config.h
new file mode 100644
index 0000000000..27ec49f379
--- /dev/null
+++ b/keyboards/mino/hotswap/config.h
@@ -0,0 +1,56 @@
+/*
+Copyright 2022 ShandonCodes
+
+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    0x7877
+#define PRODUCT_ID   0x0002
+#define DEVICE_VER   0x0001
+#define MANUFACTURER ShandonCodes
+#define PRODUCT      Mino
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 12
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { D3, C6, D4, D2}
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5, B4, E6, D7}
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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/mino/hotswap/hotswap.c b/keyboards/mino/hotswap/hotswap.c
new file mode 100644
index 0000000000..46f2f9aef0
--- /dev/null
+++ b/keyboards/mino/hotswap/hotswap.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 ShandonCodes
+ *
+ * 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 "hotswap.h"
diff --git a/keyboards/mino/hotswap/hotswap.h b/keyboards/mino/hotswap/hotswap.h
new file mode 100644
index 0000000000..fc55cc8c2b
--- /dev/null
+++ b/keyboards/mino/hotswap/hotswap.h
@@ -0,0 +1,40 @@
+/* Copyright 2022 ShandonCodes
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_default( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k3b, \
+    k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
+    k20,   k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,     \
+    k30,      k31, k32, k33, k35, k37, k38, k39, k3a \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b},  \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b}, \
+    { k30, k31, k32, k33, KC_NO, k35, KC_NO, k37, k38, k39, k3a, k3b}, \
+}
+
diff --git a/keyboards/mino/hotswap/info.json b/keyboards/mino/hotswap/info.json
new file mode 100644
index 0000000000..996dcf3b62
--- /dev/null
+++ b/keyboards/mino/hotswap/info.json
@@ -0,0 +1,60 @@
+{
+    "keyboard_name": "Mino",
+    "url": "https://qmk.fm/keyboards/",
+    "maintainer": "ShandonCodes",
+    "layouts": {
+        "LAYOUT_default": {
+            "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},
+                {"x": 12, "y": 0},
+
+                {"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.75},
+
+                {"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, "w": 1.25},
+
+                {"x": 0, "y": 3, "w": 1.25},
+                {"x": 1.25, "y": 3},
+                {"x": 2.25, "y": 3, "w": 1.25},
+                {"x": 3.5, "y": 3, "w": 2.25},
+                {"x": 5.75, "y": 3},
+                {"x": 6.75, "y": 3, "w": 2.75},
+                {"x": 9.5, "y": 3, "w": 1.25},
+                {"x": 10.75, "y": 3},
+                {"x": 11.75, "y": 3, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mino/hotswap/rules.mk b/keyboards/mino/hotswap/rules.mk
new file mode 100644
index 0000000000..64d04b189b
--- /dev/null
+++ b/keyboards/mino/hotswap/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# 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
+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
+OLED_ENABLE = yes
+WPM_ENABLE = yes