Refactor CTPC logic to allow future converters

qmk · Apr 6, 2022 · 82fb3e3 · 82fb3e3
1 parent a5e810b
commit 82fb3e3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/builddefs/converters.mk b/builddefs/converters.mk
@@ -2,7 +2,7 @@
 # and should not be replicated for new boards. These will be removed from
 # documentation as well as existing keymaps in due course.
 ifeq ($(strip $(CTPC)), yes)
-    CONVERT_TO_PROTON_C=yes
+    CONVERT_TO=proton_c
 endif
 ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes)
     CONVERT_TO=proton_c
@@ -17,7 +17,7 @@ ctpc_warning: elf
 endif
 
 # TODO: opt in rather than assume everything uses a pro micro
-PIN_COMPATIBLE ?= promicro
+# 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)/)

diff --git a/keyboards/40percentclub/luddite/rules.mk b/keyboards/40percentclub/luddite/rules.mk
@@ -18,3 +18,5 @@ AUDIO_ENABLE = no
 RGBLIGHT_ENABLE = yes
 
 LAYOUTS = 60_ansi
+
+PIN_COMPATIBLE = promicro
diff --git a/keyboards/40percentclub/nori/info.json b/keyboards/40percentclub/nori/info.json
@@ -2,6 +2,7 @@
     "keyboard_name": "The nori Keyboard",
     "manufacturer": "di0ib",
     "url": "",
+    "development_board": "promicro",
     "maintainer": "qmk",
     "usb": {
       "vid": "0x4025",

diff --git a/keyboards/40percentclub/nori/rules.mk b/keyboards/40percentclub/nori/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,5 @@ AUDIO_ENABLE = no
		RGBLIGHT_ENABLE = yes

		LAYOUTS = 60_ansi

		PIN_COMPATIBLE = promicro