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

3 files changed, 38 insertions, 0 deletions

diff --git a/keyboards/tronguylabs/m122_3270/blackpill/config.h b/keyboards/tronguylabs/m122_3270/blackpill/config.h
new file mode 100644
index 0000000000..95c94ef318
--- /dev/null
+++ b/keyboards/tronguylabs/m122_3270/blackpill/config.h
@@ -0,0 +1,29 @@
+/* Copyright 2021 James R. Maynard III <jaymaynard@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
+
+// place overrides below
+
+// Blackpill pin assignments: reversed the rows from the Teensy version for easier PCB layout
+// DO NOT USE the following pins: A9 (has pulldown on it), A11/A12 (USB lines), B2 (external pulldown)
+// C13 has an LED, and C13/C14/C15 are best used as inputs (with DIODE_DIRECTION set to ROW2COL, the
+// rows are inputs). Note that every usable I/O pin is used.
+#define MATRIX_COL_PINS { B0, B1, B10, B12, B13, B14, B15, A8, A7, A10, A6, A5, A15, B3, B4, B5, B6, B7, B8, B9 }
+#define MATRIX_ROW_PINS { C13, C14, C15, A0, A1, A2, A3, A4 }
+
+// The BlackPill version is version 2
+#define DEVICE_VER      0x0002
diff --git a/keyboards/tronguylabs/m122_3270/blackpill/readme.md b/keyboards/tronguylabs/m122_3270/blackpill/readme.md
new file mode 100644
index 0000000000..08df795b13
--- /dev/null
+++ b/keyboards/tronguylabs/m122_3270/blackpill/readme.md
@@ -0,0 +1,2 @@
+# BlackPill controller for m122-3270
+This directory contains the BlackPill-specific definitions for the M122-3270 keyboard.
diff --git a/keyboards/tronguylabs/m122_3270/blackpill/rules.mk b/keyboards/tronguylabs/m122_3270/blackpill/rules.mk
new file mode 100644
index 0000000000..d3daefaebe
--- /dev/null
+++ b/keyboards/tronguylabs/m122_3270/blackpill/rules.mk
@@ -0,0 +1,7 @@
+# Overrides for the Blackpill version
+
+# MCU name
+MCU = STM32F411
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu