From 1660b2d2e25f5c43306a043c372255d0f66bb925 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 3 Apr 2022 18:22:52 +0100
Subject: [PATCH] Refactor CTPC logic to allow future converters (#16621)

* Refactor CTPC logic to allow future converters

* Update builddefs/converters.mk

Co-authored-by: Stefan Kerkmann <karlk90@pm.me>

Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
---
 builddefs/build_keyboard.mk                   |   8 +-
 builddefs/converters.mk                       |  26 +
 platforms/chibios/_pin_defs.h                 | 564 ++++++++----------
 .../promicro_to_proton_c/_pin_defs.h          |  41 ++
 .../promicro_to_proton_c/converter.mk}        |   2 -
 5 files changed, 330 insertions(+), 311 deletions(-)
 create mode 100644 builddefs/converters.mk
 create mode 100644 platforms/chibios/converters/promicro_to_proton_c/_pin_defs.h
 rename platforms/chibios/{boards/QMK_PROTON_C/convert_to_proton_c.mk => converters/promicro_to_proton_c/converter.mk} (78%)

diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index 44acd964cc7..4503f018a82 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -172,13 +172,7 @@ generated-files: $(KEYMAP_OUTPUT)/src/config.h $(KEYMAP_OUTPUT)/src/keymap.c
 
 endif
 
-ifeq ($(strip $(CTPC)), yes)
-    CONVERT_TO_PROTON_C=yes
-endif
-
-ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes)
-    include platforms/chibios/boards/QMK_PROTON_C/convert_to_proton_c.mk
-endif
+include $(BUILDDEFS_PATH)/converters.mk
 
 include $(BUILDDEFS_PATH)/mcu_selection.mk
 
diff --git a/builddefs/converters.mk b/builddefs/converters.mk
new file mode 100644
index 00000000000..1b029e72259
--- /dev/null
+++ b/builddefs/converters.mk
@@ -0,0 +1,26 @@
+ifeq ($(strip $(CTPC)), yes)
+    CONVERT_TO_PROTON_C=yes
+endif
+ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes)
+    CONVERT_TO=proton_c
+endif
+
+# TODO: opt in rather than assume everything uses a pro micro
+PIN_COMPATIBLE ?= promicro
+ifneq ($(CONVERT_TO),)
+    # glob to search each platfrorm and/or check for valid converter
+    CONVERTER := $(wildcard $(PLATFORM_PATH)/*/converters/$(PIN_COMPATIBLE)_to_$(CONVERT_TO)/)
+    ifeq ($(CONVERTER),)
+        $(call CATASTROPHIC_ERROR,Converting from '$(PIN_COMPATIBLE)' to '$(CONVERT_TO)' not possible!)
+    endif
+
+    TARGET := $(TARGET)_$(CONVERT_TO)
+
+    # Configure any defaults
+    OPT_DEFS += -DCONVERT_TO_$(strip $(shell echo $(CONVERT_TO) | tr '[:lower:]' '[:upper:]'))
+    OPT_DEFS += -DCONVERTER_ENABLED
+    VPATH += $(CONVERTER)
+
+    # Finally run any converter specific logic
+    include $(CONVERTER)/converter.mk
+endif
diff --git a/platforms/chibios/_pin_defs.h b/platforms/chibios/_pin_defs.h
index a84d931cc20..0d96e2fc3b8 100644
--- a/platforms/chibios/_pin_defs.h
+++ b/platforms/chibios/_pin_defs.h
@@ -21,309 +21,269 @@
 #    include <hal.h>
 #endif
 
-// Defines mapping for Proton C replacement
-#ifdef CONVERT_TO_PROTON_C
-// Left side (front)
-#    define D3 PAL_LINE(GPIOA, 9)
-#    define D2 PAL_LINE(GPIOA, 10)
-//      GND
-//      GND
-#    define D1 PAL_LINE(GPIOB, 7)
-#    define D0 PAL_LINE(GPIOB, 6)
-#    define D4 PAL_LINE(GPIOB, 5)
-#    define C6 PAL_LINE(GPIOB, 4)
-#    define D7 PAL_LINE(GPIOB, 3)
-#    define E6 PAL_LINE(GPIOB, 2)
-#    define B4 PAL_LINE(GPIOB, 1)
-#    define B5 PAL_LINE(GPIOB, 0)
-
-// Right side (front)
-//      RAW
-//      GND
-//      RESET
-//      VCC
-#    define F4 PAL_LINE(GPIOA, 2)
-#    define F5 PAL_LINE(GPIOA, 1)
-#    define F6 PAL_LINE(GPIOA, 0)
-#    define F7 PAL_LINE(GPIOB, 8)
-#    define B1 PAL_LINE(GPIOB, 13)
-#    define B3 PAL_LINE(GPIOB, 14)
-#    define B2 PAL_LINE(GPIOB, 15)
-#    define B6 PAL_LINE(GPIOB, 9)
-
-// LEDs (only D5/C13 uses an actual LED)
-#    ifdef CONVERT_TO_PROTON_C_RXLED
-#        define D5 PAL_LINE(GPIOC, 14)
-#        define B0 PAL_LINE(GPIOC, 13)
-#    else
-#        define D5 PAL_LINE(GPIOC, 13)
-#        define B0 PAL_LINE(GPIOC, 14)
-#    endif
-#else
-#    define A0 PAL_LINE(GPIOA, 0)
-#    define A1 PAL_LINE(GPIOA, 1)
-#    define A2 PAL_LINE(GPIOA, 2)
-#    define A3 PAL_LINE(GPIOA, 3)
-#    define A4 PAL_LINE(GPIOA, 4)
-#    define A5 PAL_LINE(GPIOA, 5)
-#    define A6 PAL_LINE(GPIOA, 6)
-#    define A7 PAL_LINE(GPIOA, 7)
-#    define A8 PAL_LINE(GPIOA, 8)
-#    define A9 PAL_LINE(GPIOA, 9)
-#    define A10 PAL_LINE(GPIOA, 10)
-#    define A11 PAL_LINE(GPIOA, 11)
-#    define A12 PAL_LINE(GPIOA, 12)
-#    define A13 PAL_LINE(GPIOA, 13)
-#    define A14 PAL_LINE(GPIOA, 14)
-#    define A15 PAL_LINE(GPIOA, 15)
-#    define A16 PAL_LINE(GPIOA, 16)
-#    define A17 PAL_LINE(GPIOA, 17)
-#    define A18 PAL_LINE(GPIOA, 18)
-#    define A19 PAL_LINE(GPIOA, 19)
-#    define A20 PAL_LINE(GPIOA, 20)
-#    define A21 PAL_LINE(GPIOA, 21)
-#    define A22 PAL_LINE(GPIOA, 22)
-#    define A23 PAL_LINE(GPIOA, 23)
-#    define A24 PAL_LINE(GPIOA, 24)
-#    define A25 PAL_LINE(GPIOA, 25)
-#    define A26 PAL_LINE(GPIOA, 26)
-#    define A27 PAL_LINE(GPIOA, 27)
-#    define A28 PAL_LINE(GPIOA, 28)
-#    define A29 PAL_LINE(GPIOA, 29)
-#    define A30 PAL_LINE(GPIOA, 30)
-#    define A31 PAL_LINE(GPIOA, 31)
-#    define A32 PAL_LINE(GPIOA, 32)
-#    define B0 PAL_LINE(GPIOB, 0)
-#    define B1 PAL_LINE(GPIOB, 1)
-#    define B2 PAL_LINE(GPIOB, 2)
-#    define B3 PAL_LINE(GPIOB, 3)
-#    define B4 PAL_LINE(GPIOB, 4)
-#    define B5 PAL_LINE(GPIOB, 5)
-#    define B6 PAL_LINE(GPIOB, 6)
-#    define B7 PAL_LINE(GPIOB, 7)
-#    define B8 PAL_LINE(GPIOB, 8)
-#    define B9 PAL_LINE(GPIOB, 9)
-#    define B10 PAL_LINE(GPIOB, 10)
-#    define B11 PAL_LINE(GPIOB, 11)
-#    define B12 PAL_LINE(GPIOB, 12)
-#    define B13 PAL_LINE(GPIOB, 13)
-#    define B14 PAL_LINE(GPIOB, 14)
-#    define B15 PAL_LINE(GPIOB, 15)
-#    define B16 PAL_LINE(GPIOB, 16)
-#    define B17 PAL_LINE(GPIOB, 17)
-#    define B18 PAL_LINE(GPIOB, 18)
-#    define B19 PAL_LINE(GPIOB, 19)
-#    define B20 PAL_LINE(GPIOB, 20)
-#    define B21 PAL_LINE(GPIOB, 21)
-#    define B22 PAL_LINE(GPIOB, 22)
-#    define B23 PAL_LINE(GPIOB, 23)
-#    define B24 PAL_LINE(GPIOB, 24)
-#    define B25 PAL_LINE(GPIOB, 25)
-#    define B26 PAL_LINE(GPIOB, 26)
-#    define B27 PAL_LINE(GPIOB, 27)
-#    define B28 PAL_LINE(GPIOB, 28)
-#    define B29 PAL_LINE(GPIOB, 29)
-#    define B30 PAL_LINE(GPIOB, 30)
-#    define B31 PAL_LINE(GPIOB, 31)
-#    define B32 PAL_LINE(GPIOB, 32)
-#    define C0 PAL_LINE(GPIOC, 0)
-#    define C1 PAL_LINE(GPIOC, 1)
-#    define C2 PAL_LINE(GPIOC, 2)
-#    define C3 PAL_LINE(GPIOC, 3)
-#    define C4 PAL_LINE(GPIOC, 4)
-#    define C5 PAL_LINE(GPIOC, 5)
-#    define C6 PAL_LINE(GPIOC, 6)
-#    define C7 PAL_LINE(GPIOC, 7)
-#    define C8 PAL_LINE(GPIOC, 8)
-#    define C9 PAL_LINE(GPIOC, 9)
-#    define C10 PAL_LINE(GPIOC, 10)
-#    define C11 PAL_LINE(GPIOC, 11)
-#    define C12 PAL_LINE(GPIOC, 12)
-#    define C13 PAL_LINE(GPIOC, 13)
-#    define C14 PAL_LINE(GPIOC, 14)
-#    define C15 PAL_LINE(GPIOC, 15)
-#    define C16 PAL_LINE(GPIOC, 16)
-#    define C17 PAL_LINE(GPIOC, 17)
-#    define C18 PAL_LINE(GPIOC, 18)
-#    define C19 PAL_LINE(GPIOC, 19)
-#    define C20 PAL_LINE(GPIOC, 20)
-#    define C21 PAL_LINE(GPIOC, 21)
-#    define C22 PAL_LINE(GPIOC, 22)
-#    define C23 PAL_LINE(GPIOC, 23)
-#    define C24 PAL_LINE(GPIOC, 24)
-#    define C25 PAL_LINE(GPIOC, 25)
-#    define C26 PAL_LINE(GPIOC, 26)
-#    define C27 PAL_LINE(GPIOC, 27)
-#    define C28 PAL_LINE(GPIOC, 28)
-#    define C29 PAL_LINE(GPIOC, 29)
-#    define C30 PAL_LINE(GPIOC, 30)
-#    define C31 PAL_LINE(GPIOC, 31)
-#    define C32 PAL_LINE(GPIOC, 32)
-#    define D0 PAL_LINE(GPIOD, 0)
-#    define D1 PAL_LINE(GPIOD, 1)
-#    define D2 PAL_LINE(GPIOD, 2)
-#    define D3 PAL_LINE(GPIOD, 3)
-#    define D4 PAL_LINE(GPIOD, 4)
-#    define D5 PAL_LINE(GPIOD, 5)
-#    define D6 PAL_LINE(GPIOD, 6)
-#    define D7 PAL_LINE(GPIOD, 7)
-#    define D8 PAL_LINE(GPIOD, 8)
-#    define D9 PAL_LINE(GPIOD, 9)
-#    define D10 PAL_LINE(GPIOD, 10)
-#    define D11 PAL_LINE(GPIOD, 11)
-#    define D12 PAL_LINE(GPIOD, 12)
-#    define D13 PAL_LINE(GPIOD, 13)
-#    define D14 PAL_LINE(GPIOD, 14)
-#    define D15 PAL_LINE(GPIOD, 15)
-#    define D16 PAL_LINE(GPIOD, 16)
-#    define D17 PAL_LINE(GPIOD, 17)
-#    define D18 PAL_LINE(GPIOD, 18)
-#    define D19 PAL_LINE(GPIOD, 19)
-#    define D20 PAL_LINE(GPIOD, 20)
-#    define D21 PAL_LINE(GPIOD, 21)
-#    define D22 PAL_LINE(GPIOD, 22)
-#    define D23 PAL_LINE(GPIOD, 23)
-#    define D24 PAL_LINE(GPIOD, 24)
-#    define D25 PAL_LINE(GPIOD, 25)
-#    define D26 PAL_LINE(GPIOD, 26)
-#    define D27 PAL_LINE(GPIOD, 27)
-#    define D28 PAL_LINE(GPIOD, 28)
-#    define D29 PAL_LINE(GPIOD, 29)
-#    define D30 PAL_LINE(GPIOD, 30)
-#    define D31 PAL_LINE(GPIOD, 31)
-#    define D32 PAL_LINE(GPIOD, 32)
-#    define E0 PAL_LINE(GPIOE, 0)
-#    define E1 PAL_LINE(GPIOE, 1)
-#    define E2 PAL_LINE(GPIOE, 2)
-#    define E3 PAL_LINE(GPIOE, 3)
-#    define E4 PAL_LINE(GPIOE, 4)
-#    define E5 PAL_LINE(GPIOE, 5)
-#    define E6 PAL_LINE(GPIOE, 6)
-#    define E7 PAL_LINE(GPIOE, 7)
-#    define E8 PAL_LINE(GPIOE, 8)
-#    define E9 PAL_LINE(GPIOE, 9)
-#    define E10 PAL_LINE(GPIOE, 10)
-#    define E11 PAL_LINE(GPIOE, 11)
-#    define E12 PAL_LINE(GPIOE, 12)
-#    define E13 PAL_LINE(GPIOE, 13)
-#    define E14 PAL_LINE(GPIOE, 14)
-#    define E15 PAL_LINE(GPIOE, 15)
-#    define E16 PAL_LINE(GPIOE, 16)
-#    define E17 PAL_LINE(GPIOE, 17)
-#    define E18 PAL_LINE(GPIOE, 18)
-#    define E19 PAL_LINE(GPIOE, 19)
-#    define E20 PAL_LINE(GPIOE, 20)
-#    define E21 PAL_LINE(GPIOE, 21)
-#    define E22 PAL_LINE(GPIOE, 22)
-#    define E23 PAL_LINE(GPIOE, 23)
-#    define E24 PAL_LINE(GPIOE, 24)
-#    define E25 PAL_LINE(GPIOE, 25)
-#    define E26 PAL_LINE(GPIOE, 26)
-#    define E27 PAL_LINE(GPIOE, 27)
-#    define E28 PAL_LINE(GPIOE, 28)
-#    define E29 PAL_LINE(GPIOE, 29)
-#    define E30 PAL_LINE(GPIOE, 30)
-#    define E31 PAL_LINE(GPIOE, 31)
-#    define E32 PAL_LINE(GPIOE, 32)
-#    define F0 PAL_LINE(GPIOF, 0)
-#    define F1 PAL_LINE(GPIOF, 1)
-#    define F2 PAL_LINE(GPIOF, 2)
-#    define F3 PAL_LINE(GPIOF, 3)
-#    define F4 PAL_LINE(GPIOF, 4)
-#    define F5 PAL_LINE(GPIOF, 5)
-#    define F6 PAL_LINE(GPIOF, 6)
-#    define F7 PAL_LINE(GPIOF, 7)
-#    define F8 PAL_LINE(GPIOF, 8)
-#    define F9 PAL_LINE(GPIOF, 9)
-#    define F10 PAL_LINE(GPIOF, 10)
-#    define F11 PAL_LINE(GPIOF, 11)
-#    define F12 PAL_LINE(GPIOF, 12)
-#    define F13 PAL_LINE(GPIOF, 13)
-#    define F14 PAL_LINE(GPIOF, 14)
-#    define F15 PAL_LINE(GPIOF, 15)
-#    define G0 PAL_LINE(GPIOG, 0)
-#    define G1 PAL_LINE(GPIOG, 1)
-#    define G2 PAL_LINE(GPIOG, 2)
-#    define G3 PAL_LINE(GPIOG, 3)
-#    define G4 PAL_LINE(GPIOG, 4)
-#    define G5 PAL_LINE(GPIOG, 5)
-#    define G6 PAL_LINE(GPIOG, 6)
-#    define G7 PAL_LINE(GPIOG, 7)
-#    define G8 PAL_LINE(GPIOG, 8)
-#    define G9 PAL_LINE(GPIOG, 9)
-#    define G10 PAL_LINE(GPIOG, 10)
-#    define G11 PAL_LINE(GPIOG, 11)
-#    define G12 PAL_LINE(GPIOG, 12)
-#    define G13 PAL_LINE(GPIOG, 13)
-#    define G14 PAL_LINE(GPIOG, 14)
-#    define G15 PAL_LINE(GPIOG, 15)
-#    define H0 PAL_LINE(GPIOH, 0)
-#    define H1 PAL_LINE(GPIOH, 1)
-#    define H2 PAL_LINE(GPIOH, 2)
-#    define H3 PAL_LINE(GPIOH, 3)
-#    define H4 PAL_LINE(GPIOH, 4)
-#    define H5 PAL_LINE(GPIOH, 5)
-#    define H6 PAL_LINE(GPIOH, 6)
-#    define H7 PAL_LINE(GPIOH, 7)
-#    define H8 PAL_LINE(GPIOH, 8)
-#    define H9 PAL_LINE(GPIOH, 9)
-#    define H10 PAL_LINE(GPIOH, 10)
-#    define H11 PAL_LINE(GPIOH, 11)
-#    define H12 PAL_LINE(GPIOH, 12)
-#    define H13 PAL_LINE(GPIOH, 13)
-#    define H14 PAL_LINE(GPIOH, 14)
-#    define H15 PAL_LINE(GPIOH, 15)
-#    define I0 PAL_LINE(GPIOI, 0)
-#    define I1 PAL_LINE(GPIOI, 1)
-#    define I2 PAL_LINE(GPIOI, 2)
-#    define I3 PAL_LINE(GPIOI, 3)
-#    define I4 PAL_LINE(GPIOI, 4)
-#    define I5 PAL_LINE(GPIOI, 5)
-#    define I6 PAL_LINE(GPIOI, 6)
-#    define I7 PAL_LINE(GPIOI, 7)
-#    define I8 PAL_LINE(GPIOI, 8)
-#    define I9 PAL_LINE(GPIOI, 9)
-#    define I10 PAL_LINE(GPIOI, 10)
-#    define I11 PAL_LINE(GPIOI, 11)
-#    define I12 PAL_LINE(GPIOI, 12)
-#    define I13 PAL_LINE(GPIOI, 13)
-#    define I14 PAL_LINE(GPIOI, 14)
-#    define I15 PAL_LINE(GPIOI, 15)
-#    define J0 PAL_LINE(GPIOJ, 0)
-#    define J1 PAL_LINE(GPIOJ, 1)
-#    define J2 PAL_LINE(GPIOJ, 2)
-#    define J3 PAL_LINE(GPIOJ, 3)
-#    define J4 PAL_LINE(GPIOJ, 4)
-#    define J5 PAL_LINE(GPIOJ, 5)
-#    define J6 PAL_LINE(GPIOJ, 6)
-#    define J7 PAL_LINE(GPIOJ, 7)
-#    define J8 PAL_LINE(GPIOJ, 8)
-#    define J9 PAL_LINE(GPIOJ, 9)
-#    define J10 PAL_LINE(GPIOJ, 10)
-#    define J11 PAL_LINE(GPIOJ, 11)
-#    define J12 PAL_LINE(GPIOJ, 12)
-#    define J13 PAL_LINE(GPIOJ, 13)
-#    define J14 PAL_LINE(GPIOJ, 14)
-#    define J15 PAL_LINE(GPIOJ, 15)
+#define A0 PAL_LINE(GPIOA, 0)
+#define A1 PAL_LINE(GPIOA, 1)
+#define A2 PAL_LINE(GPIOA, 2)
+#define A3 PAL_LINE(GPIOA, 3)
+#define A4 PAL_LINE(GPIOA, 4)
+#define A5 PAL_LINE(GPIOA, 5)
+#define A6 PAL_LINE(GPIOA, 6)
+#define A7 PAL_LINE(GPIOA, 7)
+#define A8 PAL_LINE(GPIOA, 8)
+#define A9 PAL_LINE(GPIOA, 9)
+#define A10 PAL_LINE(GPIOA, 10)
+#define A11 PAL_LINE(GPIOA, 11)
+#define A12 PAL_LINE(GPIOA, 12)
+#define A13 PAL_LINE(GPIOA, 13)
+#define A14 PAL_LINE(GPIOA, 14)
+#define A15 PAL_LINE(GPIOA, 15)
+#define A16 PAL_LINE(GPIOA, 16)
+#define A17 PAL_LINE(GPIOA, 17)
+#define A18 PAL_LINE(GPIOA, 18)
+#define A19 PAL_LINE(GPIOA, 19)
+#define A20 PAL_LINE(GPIOA, 20)
+#define A21 PAL_LINE(GPIOA, 21)
+#define A22 PAL_LINE(GPIOA, 22)
+#define A23 PAL_LINE(GPIOA, 23)
+#define A24 PAL_LINE(GPIOA, 24)
+#define A25 PAL_LINE(GPIOA, 25)
+#define A26 PAL_LINE(GPIOA, 26)
+#define A27 PAL_LINE(GPIOA, 27)
+#define A28 PAL_LINE(GPIOA, 28)
+#define A29 PAL_LINE(GPIOA, 29)
+#define A30 PAL_LINE(GPIOA, 30)
+#define A31 PAL_LINE(GPIOA, 31)
+#define A32 PAL_LINE(GPIOA, 32)
+#define B0 PAL_LINE(GPIOB, 0)
+#define B1 PAL_LINE(GPIOB, 1)
+#define B2 PAL_LINE(GPIOB, 2)
+#define B3 PAL_LINE(GPIOB, 3)
+#define B4 PAL_LINE(GPIOB, 4)
+#define B5 PAL_LINE(GPIOB, 5)
+#define B6 PAL_LINE(GPIOB, 6)
+#define B7 PAL_LINE(GPIOB, 7)
+#define B8 PAL_LINE(GPIOB, 8)
+#define B9 PAL_LINE(GPIOB, 9)
+#define B10 PAL_LINE(GPIOB, 10)
+#define B11 PAL_LINE(GPIOB, 11)
+#define B12 PAL_LINE(GPIOB, 12)
+#define B13 PAL_LINE(GPIOB, 13)
+#define B14 PAL_LINE(GPIOB, 14)
+#define B15 PAL_LINE(GPIOB, 15)
+#define B16 PAL_LINE(GPIOB, 16)
+#define B17 PAL_LINE(GPIOB, 17)
+#define B18 PAL_LINE(GPIOB, 18)
+#define B19 PAL_LINE(GPIOB, 19)
+#define B20 PAL_LINE(GPIOB, 20)
+#define B21 PAL_LINE(GPIOB, 21)
+#define B22 PAL_LINE(GPIOB, 22)
+#define B23 PAL_LINE(GPIOB, 23)
+#define B24 PAL_LINE(GPIOB, 24)
+#define B25 PAL_LINE(GPIOB, 25)
+#define B26 PAL_LINE(GPIOB, 26)
+#define B27 PAL_LINE(GPIOB, 27)
+#define B28 PAL_LINE(GPIOB, 28)
+#define B29 PAL_LINE(GPIOB, 29)
+#define B30 PAL_LINE(GPIOB, 30)
+#define B31 PAL_LINE(GPIOB, 31)
+#define B32 PAL_LINE(GPIOB, 32)
+#define C0 PAL_LINE(GPIOC, 0)
+#define C1 PAL_LINE(GPIOC, 1)
+#define C2 PAL_LINE(GPIOC, 2)
+#define C3 PAL_LINE(GPIOC, 3)
+#define C4 PAL_LINE(GPIOC, 4)
+#define C5 PAL_LINE(GPIOC, 5)
+#define C6 PAL_LINE(GPIOC, 6)
+#define C7 PAL_LINE(GPIOC, 7)
+#define C8 PAL_LINE(GPIOC, 8)
+#define C9 PAL_LINE(GPIOC, 9)
+#define C10 PAL_LINE(GPIOC, 10)
+#define C11 PAL_LINE(GPIOC, 11)
+#define C12 PAL_LINE(GPIOC, 12)
+#define C13 PAL_LINE(GPIOC, 13)
+#define C14 PAL_LINE(GPIOC, 14)
+#define C15 PAL_LINE(GPIOC, 15)
+#define C16 PAL_LINE(GPIOC, 16)
+#define C17 PAL_LINE(GPIOC, 17)
+#define C18 PAL_LINE(GPIOC, 18)
+#define C19 PAL_LINE(GPIOC, 19)
+#define C20 PAL_LINE(GPIOC, 20)
+#define C21 PAL_LINE(GPIOC, 21)
+#define C22 PAL_LINE(GPIOC, 22)
+#define C23 PAL_LINE(GPIOC, 23)
+#define C24 PAL_LINE(GPIOC, 24)
+#define C25 PAL_LINE(GPIOC, 25)
+#define C26 PAL_LINE(GPIOC, 26)
+#define C27 PAL_LINE(GPIOC, 27)
+#define C28 PAL_LINE(GPIOC, 28)
+#define C29 PAL_LINE(GPIOC, 29)
+#define C30 PAL_LINE(GPIOC, 30)
+#define C31 PAL_LINE(GPIOC, 31)
+#define C32 PAL_LINE(GPIOC, 32)
+#define D0 PAL_LINE(GPIOD, 0)
+#define D1 PAL_LINE(GPIOD, 1)
+#define D2 PAL_LINE(GPIOD, 2)
+#define D3 PAL_LINE(GPIOD, 3)
+#define D4 PAL_LINE(GPIOD, 4)
+#define D5 PAL_LINE(GPIOD, 5)
+#define D6 PAL_LINE(GPIOD, 6)
+#define D7 PAL_LINE(GPIOD, 7)
+#define D8 PAL_LINE(GPIOD, 8)
+#define D9 PAL_LINE(GPIOD, 9)
+#define D10 PAL_LINE(GPIOD, 10)
+#define D11 PAL_LINE(GPIOD, 11)
+#define D12 PAL_LINE(GPIOD, 12)
+#define D13 PAL_LINE(GPIOD, 13)
+#define D14 PAL_LINE(GPIOD, 14)
+#define D15 PAL_LINE(GPIOD, 15)
+#define D16 PAL_LINE(GPIOD, 16)
+#define D17 PAL_LINE(GPIOD, 17)
+#define D18 PAL_LINE(GPIOD, 18)
+#define D19 PAL_LINE(GPIOD, 19)
+#define D20 PAL_LINE(GPIOD, 20)
+#define D21 PAL_LINE(GPIOD, 21)
+#define D22 PAL_LINE(GPIOD, 22)
+#define D23 PAL_LINE(GPIOD, 23)
+#define D24 PAL_LINE(GPIOD, 24)
+#define D25 PAL_LINE(GPIOD, 25)
+#define D26 PAL_LINE(GPIOD, 26)
+#define D27 PAL_LINE(GPIOD, 27)
+#define D28 PAL_LINE(GPIOD, 28)
+#define D29 PAL_LINE(GPIOD, 29)
+#define D30 PAL_LINE(GPIOD, 30)
+#define D31 PAL_LINE(GPIOD, 31)
+#define D32 PAL_LINE(GPIOD, 32)
+#define E0 PAL_LINE(GPIOE, 0)
+#define E1 PAL_LINE(GPIOE, 1)
+#define E2 PAL_LINE(GPIOE, 2)
+#define E3 PAL_LINE(GPIOE, 3)
+#define E4 PAL_LINE(GPIOE, 4)
+#define E5 PAL_LINE(GPIOE, 5)
+#define E6 PAL_LINE(GPIOE, 6)
+#define E7 PAL_LINE(GPIOE, 7)
+#define E8 PAL_LINE(GPIOE, 8)
+#define E9 PAL_LINE(GPIOE, 9)
+#define E10 PAL_LINE(GPIOE, 10)
+#define E11 PAL_LINE(GPIOE, 11)
+#define E12 PAL_LINE(GPIOE, 12)
+#define E13 PAL_LINE(GPIOE, 13)
+#define E14 PAL_LINE(GPIOE, 14)
+#define E15 PAL_LINE(GPIOE, 15)
+#define E16 PAL_LINE(GPIOE, 16)
+#define E17 PAL_LINE(GPIOE, 17)
+#define E18 PAL_LINE(GPIOE, 18)
+#define E19 PAL_LINE(GPIOE, 19)
+#define E20 PAL_LINE(GPIOE, 20)
+#define E21 PAL_LINE(GPIOE, 21)
+#define E22 PAL_LINE(GPIOE, 22)
+#define E23 PAL_LINE(GPIOE, 23)
+#define E24 PAL_LINE(GPIOE, 24)
+#define E25 PAL_LINE(GPIOE, 25)
+#define E26 PAL_LINE(GPIOE, 26)
+#define E27 PAL_LINE(GPIOE, 27)
+#define E28 PAL_LINE(GPIOE, 28)
+#define E29 PAL_LINE(GPIOE, 29)
+#define E30 PAL_LINE(GPIOE, 30)
+#define E31 PAL_LINE(GPIOE, 31)
+#define E32 PAL_LINE(GPIOE, 32)
+#define F0 PAL_LINE(GPIOF, 0)
+#define F1 PAL_LINE(GPIOF, 1)
+#define F2 PAL_LINE(GPIOF, 2)
+#define F3 PAL_LINE(GPIOF, 3)
+#define F4 PAL_LINE(GPIOF, 4)
+#define F5 PAL_LINE(GPIOF, 5)
+#define F6 PAL_LINE(GPIOF, 6)
+#define F7 PAL_LINE(GPIOF, 7)
+#define F8 PAL_LINE(GPIOF, 8)
+#define F9 PAL_LINE(GPIOF, 9)
+#define F10 PAL_LINE(GPIOF, 10)
+#define F11 PAL_LINE(GPIOF, 11)
+#define F12 PAL_LINE(GPIOF, 12)
+#define F13 PAL_LINE(GPIOF, 13)
+#define F14 PAL_LINE(GPIOF, 14)
+#define F15 PAL_LINE(GPIOF, 15)
+#define G0 PAL_LINE(GPIOG, 0)
+#define G1 PAL_LINE(GPIOG, 1)
+#define G2 PAL_LINE(GPIOG, 2)
+#define G3 PAL_LINE(GPIOG, 3)
+#define G4 PAL_LINE(GPIOG, 4)
+#define G5 PAL_LINE(GPIOG, 5)
+#define G6 PAL_LINE(GPIOG, 6)
+#define G7 PAL_LINE(GPIOG, 7)
+#define G8 PAL_LINE(GPIOG, 8)
+#define G9 PAL_LINE(GPIOG, 9)
+#define G10 PAL_LINE(GPIOG, 10)
+#define G11 PAL_LINE(GPIOG, 11)
+#define G12 PAL_LINE(GPIOG, 12)
+#define G13 PAL_LINE(GPIOG, 13)
+#define G14 PAL_LINE(GPIOG, 14)
+#define G15 PAL_LINE(GPIOG, 15)
+#define H0 PAL_LINE(GPIOH, 0)
+#define H1 PAL_LINE(GPIOH, 1)
+#define H2 PAL_LINE(GPIOH, 2)
+#define H3 PAL_LINE(GPIOH, 3)
+#define H4 PAL_LINE(GPIOH, 4)
+#define H5 PAL_LINE(GPIOH, 5)
+#define H6 PAL_LINE(GPIOH, 6)
+#define H7 PAL_LINE(GPIOH, 7)
+#define H8 PAL_LINE(GPIOH, 8)
+#define H9 PAL_LINE(GPIOH, 9)
+#define H10 PAL_LINE(GPIOH, 10)
+#define H11 PAL_LINE(GPIOH, 11)
+#define H12 PAL_LINE(GPIOH, 12)
+#define H13 PAL_LINE(GPIOH, 13)
+#define H14 PAL_LINE(GPIOH, 14)
+#define H15 PAL_LINE(GPIOH, 15)
+#define I0 PAL_LINE(GPIOI, 0)
+#define I1 PAL_LINE(GPIOI, 1)
+#define I2 PAL_LINE(GPIOI, 2)
+#define I3 PAL_LINE(GPIOI, 3)
+#define I4 PAL_LINE(GPIOI, 4)
+#define I5 PAL_LINE(GPIOI, 5)
+#define I6 PAL_LINE(GPIOI, 6)
+#define I7 PAL_LINE(GPIOI, 7)
+#define I8 PAL_LINE(GPIOI, 8)
+#define I9 PAL_LINE(GPIOI, 9)
+#define I10 PAL_LINE(GPIOI, 10)
+#define I11 PAL_LINE(GPIOI, 11)
+#define I12 PAL_LINE(GPIOI, 12)
+#define I13 PAL_LINE(GPIOI, 13)
+#define I14 PAL_LINE(GPIOI, 14)
+#define I15 PAL_LINE(GPIOI, 15)
+#define J0 PAL_LINE(GPIOJ, 0)
+#define J1 PAL_LINE(GPIOJ, 1)
+#define J2 PAL_LINE(GPIOJ, 2)
+#define J3 PAL_LINE(GPIOJ, 3)
+#define J4 PAL_LINE(GPIOJ, 4)
+#define J5 PAL_LINE(GPIOJ, 5)
+#define J6 PAL_LINE(GPIOJ, 6)
+#define J7 PAL_LINE(GPIOJ, 7)
+#define J8 PAL_LINE(GPIOJ, 8)
+#define J9 PAL_LINE(GPIOJ, 9)
+#define J10 PAL_LINE(GPIOJ, 10)
+#define J11 PAL_LINE(GPIOJ, 11)
+#define J12 PAL_LINE(GPIOJ, 12)
+#define J13 PAL_LINE(GPIOJ, 13)
+#define J14 PAL_LINE(GPIOJ, 14)
+#define J15 PAL_LINE(GPIOJ, 15)
 // Keyboards can `#define KEYBOARD_REQUIRES_GPIOK` if they need to access GPIO-K pins. These conflict with a whole
 // bunch of layout definitions, so it's intentionally left out unless absolutely required -- in that case, the
 // keyboard designer should use a different symbol when defining their layout macros.
-#    ifdef KEYBOARD_REQUIRES_GPIOK
-#        define K0 PAL_LINE(GPIOK, 0)
-#        define K1 PAL_LINE(GPIOK, 1)
-#        define K2 PAL_LINE(GPIOK, 2)
-#        define K3 PAL_LINE(GPIOK, 3)
-#        define K4 PAL_LINE(GPIOK, 4)
-#        define K5 PAL_LINE(GPIOK, 5)
-#        define K6 PAL_LINE(GPIOK, 6)
-#        define K7 PAL_LINE(GPIOK, 7)
-#        define K8 PAL_LINE(GPIOK, 8)
-#        define K9 PAL_LINE(GPIOK, 9)
-#        define K10 PAL_LINE(GPIOK, 10)
-#        define K11 PAL_LINE(GPIOK, 11)
-#        define K12 PAL_LINE(GPIOK, 12)
-#        define K13 PAL_LINE(GPIOK, 13)
-#        define K14 PAL_LINE(GPIOK, 14)
-#        define K15 PAL_LINE(GPIOK, 15)
-#    endif
+#ifdef KEYBOARD_REQUIRES_GPIOK
+#    define K0 PAL_LINE(GPIOK, 0)
+#    define K1 PAL_LINE(GPIOK, 1)
+#    define K2 PAL_LINE(GPIOK, 2)
+#    define K3 PAL_LINE(GPIOK, 3)
+#    define K4 PAL_LINE(GPIOK, 4)
+#    define K5 PAL_LINE(GPIOK, 5)
+#    define K6 PAL_LINE(GPIOK, 6)
+#    define K7 PAL_LINE(GPIOK, 7)
+#    define K8 PAL_LINE(GPIOK, 8)
+#    define K9 PAL_LINE(GPIOK, 9)
+#    define K10 PAL_LINE(GPIOK, 10)
+#    define K11 PAL_LINE(GPIOK, 11)
+#    define K12 PAL_LINE(GPIOK, 12)
+#    define K13 PAL_LINE(GPIOK, 13)
+#    define K14 PAL_LINE(GPIOK, 14)
+#    define K15 PAL_LINE(GPIOK, 15)
 #endif
diff --git a/platforms/chibios/converters/promicro_to_proton_c/_pin_defs.h b/platforms/chibios/converters/promicro_to_proton_c/_pin_defs.h
new file mode 100644
index 00000000000..ad1a81692e5
--- /dev/null
+++ b/platforms/chibios/converters/promicro_to_proton_c/_pin_defs.h
@@ -0,0 +1,41 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Left side (front)
+#define D3 PAL_LINE(GPIOA, 9)
+#define D2 PAL_LINE(GPIOA, 10)
+//      GND
+//      GND
+#define D1 PAL_LINE(GPIOB, 7)
+#define D0 PAL_LINE(GPIOB, 6)
+#define D4 PAL_LINE(GPIOB, 5)
+#define C6 PAL_LINE(GPIOB, 4)
+#define D7 PAL_LINE(GPIOB, 3)
+#define E6 PAL_LINE(GPIOB, 2)
+#define B4 PAL_LINE(GPIOB, 1)
+#define B5 PAL_LINE(GPIOB, 0)
+
+// Right side (front)
+//      RAW
+//      GND
+//      RESET
+//      VCC
+#define F4 PAL_LINE(GPIOA, 2)
+#define F5 PAL_LINE(GPIOA, 1)
+#define F6 PAL_LINE(GPIOA, 0)
+#define F7 PAL_LINE(GPIOB, 8)
+#define B1 PAL_LINE(GPIOB, 13)
+#define B3 PAL_LINE(GPIOB, 14)
+#define B2 PAL_LINE(GPIOB, 15)
+#define B6 PAL_LINE(GPIOB, 9)
+
+// LEDs (only D5/C13 uses an actual LED)
+#ifdef CONVERT_TO_PROTON_C_RXLED
+#    define D5 PAL_LINE(GPIOC, 14)
+#    define B0 PAL_LINE(GPIOC, 13)
+#else
+#    define D5 PAL_LINE(GPIOC, 13)
+#    define B0 PAL_LINE(GPIOC, 14)
+#endif
diff --git a/platforms/chibios/boards/QMK_PROTON_C/convert_to_proton_c.mk b/platforms/chibios/converters/promicro_to_proton_c/converter.mk
similarity index 78%
rename from platforms/chibios/boards/QMK_PROTON_C/convert_to_proton_c.mk
rename to platforms/chibios/converters/promicro_to_proton_c/converter.mk
index 06181546781..406adae32c3 100644
--- a/platforms/chibios/boards/QMK_PROTON_C/convert_to_proton_c.mk
+++ b/platforms/chibios/converters/promicro_to_proton_c/converter.mk
@@ -1,9 +1,7 @@
 # Proton C MCU settings for converting AVR projects
-TARGET := $(TARGET)_proton_c
 MCU := STM32F303
 BOARD := QMK_PROTON_C
 BOOTLOADER := stm32-dfu
-OPT_DEFS += -DCONVERT_TO_PROTON_C
 
 # These are defaults based on what has been implemented for ARM boards
 AUDIO_ENABLE ?= yes