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

Conflicts:
	keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c

1 files changed, 45 insertions, 0 deletions

diff --git a/keyboards/aozora/hotswap/config.h b/keyboards/aozora/hotswap/config.h
new file mode 100644
index 0000000000..60277f2635
--- /dev/null
+++ b/keyboards/aozora/hotswap/config.h
@@ -0,0 +1,45 @@
+/* Copyright 2021 Salmon Cat Studio
+ *
+ * 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       0xCA75
+#define PRODUCT_ID      0x4014
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Salmon Cat Studio
+#define PRODUCT         Aozora
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/*
+ * 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 { F6, F5, F4, F1, F0 }
+#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, D1, D4, D6, D7, B4, B5, B6, C6, C7, F7 }
+
+#define DIODE_DIRECTION COL2ROW