From 54ca380443dbc55930e5a3055519580167148545 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Thu, 11 Feb 2021 19:49:48 -0800 Subject: [PATCH 1/3] Do not hard set config in CPTC files --- platforms/chibios/QMK_PROTON_C/convert_to_proton_c.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 3fa73a96e03a..235127bff541 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,8 @@ 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 +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 +BACKLIGHT_DRIVER ?= software From 0dc1c43d5f0e6f78e1bda8679434bb63513ecede Mon Sep 17 00:00:00 2001 From: Drashna Jael're Date: Fri, 12 Feb 2021 14:37:40 -0800 Subject: [PATCH 2/3] Soft set backlight driver based on platform --- common_features.mk | 6 +++++- platforms/chibios/QMK_PROTON_C/convert_to_proton_c.mk | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common_features.mk b/common_features.mk index ecb4f5576bf9..ab0761d0a5f2 100644 --- a/common_features.mk +++ b/common_features.mk @@ -328,7 +328,11 @@ endif VALID_BACKLIGHT_TYPES := pwm timer software custom BACKLIGHT_ENABLE ?= no -BACKLIGHT_DRIVER ?= pwm +ifeq ($(PLATFORM),CHIBIOS) + 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 235127bff541..d0a337bad7fe 100644 --- a/platforms/chibios/QMK_PROTON_C/convert_to_proton_c.mk +++ b/platforms/chibios/QMK_PROTON_C/convert_to_proton_c.mk @@ -7,6 +7,3 @@ 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 From 5b75842a453f0e56ee7672c92fa5a037f5e90f35 Mon Sep 17 00:00:00 2001 From: Drashna Jael're Date: Sun, 14 Feb 2021 14:35:05 -0800 Subject: [PATCH 3/3] Ugh --- common_features.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common_features.mk b/common_features.mk index ab0761d0a5f2..433575551ee1 100644 --- a/common_features.mk +++ b/common_features.mk @@ -328,7 +328,7 @@ endif VALID_BACKLIGHT_TYPES := pwm timer software custom BACKLIGHT_ENABLE ?= no -ifeq ($(PLATFORM),CHIBIOS) +ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes) BACKLIGHT_DRIVER ?= software else BACKLIGHT_DRIVER ?= pwm