Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Refactor CTPC logic to allow future converters #16598

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions builddefs/converters.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)/)
Expand Down
2 changes: 2 additions & 0 deletions keyboards/40percentclub/luddite/rules.mk
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
1 change: 1 addition & 0 deletions keyboards/40percentclub/nori/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"keyboard_name": "The nori Keyboard",
"manufacturer": "di0ib",
"url": "",
"development_board": "promicro",
"maintainer": "qmk",
"usb": {
"vid": "0x4025",
Expand Down
6 changes: 0 additions & 6 deletions keyboards/40percentclub/nori/rules.mk
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
# MCU name
MCU = atmega32u4

# Bootloader selection
BOOTLOADER = caterina

# Build Options
# change yes to no to disable
#
Expand Down