Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Do not hard set config in CPTC files (#11864)

Browse source
This commit is contained in:
Drashna Jaelre 2021-05-22 19:43:54 -07:00 committed by GitHub
parent f5820059e4
commit 330fe1d1cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common_features.mk
View file

@ -350,7 +350,11 @@ endif
VALID_BACKLIGHT_TYPES := pwm timer software custom VALID_BACKLIGHT_TYPES := pwm timer software custom
BACKLIGHT_ENABLE ?= no 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 ($(strip $(BACKLIGHT_ENABLE)), yes)
ifeq ($(filter $(BACKLIGHT_DRIVER),$(VALID_BACKLIGHT_TYPES)),) ifeq ($(filter $(BACKLIGHT_DRIVER),$(VALID_BACKLIGHT_TYPES)),)
$(error BACKLIGHT_DRIVER="$(BACKLIGHT_DRIVER)" is not a valid backlight type) $(error BACKLIGHT_DRIVER="$(BACKLIGHT_DRIVER)" is not a valid backlight type)

7
platforms/chibios/QMK_PROTON_C/convert_to_proton_c.mk
View file

@ -5,8 +5,5 @@ BOARD := QMK_PROTON_C
OPT_DEFS += -DCONVERT_TO_PROTON_C OPT_DEFS += -DCONVERT_TO_PROTON_C
# These are defaults based on what has been implemented for ARM boards # These are defaults based on what has been implemented for ARM boards
AUDIO_ENABLE = yes AUDIO_ENABLE ?= yes
WS2812_DRIVER = bitbang WS2812_DRIVER ?= bitbang
# Force task driven PWM until ARM can provide automatic configuration
BACKLIGHT_DRIVER = software