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.

Sign up for GitHub

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

Do not hard set config in CPTC files #11864

Merged
merged 3 commits into from
May 23, 2021
Merged

Do not hard set config in CPTC files #11864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54ca380
Do not hard set config in CPTC files
drashna Feb 12, 2021
0dc1c43
Soft set backlight driver based on platform
drashna Feb 12, 2021
5b75842
Ugh
drashna Feb 14, 2021
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
6 changes: 5 additions & 1 deletion common_features.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,11 @@ endif
VALID_BACKLIGHT_TYPES := pwm timer software custom

BACKLIGHT_ENABLE ?= no
BACKLIGHT_DRIVER ?= pwm
ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes)
BACKLIGHT_DRIVER ?= software
else
BACKLIGHT_DRIVER ?= pwm
endif
ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
ifeq ($(filter $(BACKLIGHT_DRIVER),$(VALID_BACKLIGHT_TYPES)),)
$(error BACKLIGHT_DRIVER="$(BACKLIGHT_DRIVER)" is not a valid backlight type)
Expand Down
7 changes: 2 additions & 5 deletions platforms/chibios/QMK_PROTON_C/convert_to_proton_c.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,5 @@ BOARD := QMK_PROTON_C
OPT_DEFS += -DCONVERT_TO_PROTON_C

# These are defaults based on what has been implemented for ARM boards
AUDIO_ENABLE = yes
WS2812_DRIVER = bitbang

# Force task driven PWM until ARM can provide automatic configuration
BACKLIGHT_DRIVER = software
AUDIO_ENABLE ?= yes
WS2812_DRIVER ?= bitbang