From 330fe1d1cc873ee24e7df49041cfa292a7662cb1 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sat, 22 May 2021 19:43:54 -0700 Subject: [PATCH] Do not hard set config in CPTC files (#11864) --- common_features.mk | 6 +++++- platforms/chibios/QMK_PROTON_C/convert_to_proton_c.mk | 7 ++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/common_features.mk b/common_features.mk index 5a1231de49..1a9fd46b55 100644 --- a/common_features.mk +++ b/common_features.mk @@ -350,7 +350,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) diff --git a/platforms/chibios/QMK_PROTON_C/convert_to_proton_c.mk b/platforms/chibios/QMK_PROTON_C/convert_to_proton_c.mk index 3fa73a96e0..d0a337bad7 100644 --- a/platforms/chibios/QMK_PROTON_C/convert_to_proton_c.mk +++ b/platforms/chibios/QMK_PROTON_C/convert_to_proton_c.mk @@ -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 \ No newline at end of file +AUDIO_ENABLE ?= yes +WS2812_DRIVER ?= bitbang