diff options
| author | Drashna Jaelre <drashna@live.com> | 2021-05-22 19:43:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-22 19:43:54 -0700 |
| commit | 330fe1d1cc873ee24e7df49041cfa292a7662cb1 (patch) | |
| tree | 1ac40b0a3f0eaf4dbca7b354dbc8d01a30db0808 | |
| parent | f5820059e430da0a4e59000278cf7b64de03ddb3 (diff) | |
| download | qmk_firmware-330fe1d1cc873ee24e7df49041cfa292a7662cb1.tar.gz qmk_firmware-330fe1d1cc873ee24e7df49041cfa292a7662cb1.zip | |
Do not hard set config in CPTC files (#11864)
| -rw-r--r-- | common_features.mk | 6 | ||||
| -rw-r--r-- | 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 5a1231de4..1a9fd46b5 100644 --- a/common_features.mk +++ b/common_features.mk | |||
| @@ -350,7 +350,11 @@ endif | |||
| 350 | VALID_BACKLIGHT_TYPES := pwm timer software custom | 350 | VALID_BACKLIGHT_TYPES := pwm timer software custom |
| 351 | 351 | ||
| 352 | BACKLIGHT_ENABLE ?= no | 352 | BACKLIGHT_ENABLE ?= no |
| 353 | BACKLIGHT_DRIVER ?= pwm | 353 | ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes) |
| 354 | BACKLIGHT_DRIVER ?= software | ||
| 355 | else | ||
| 356 | BACKLIGHT_DRIVER ?= pwm | ||
| 357 | endif | ||
| 354 | ifeq ($(strip $(BACKLIGHT_ENABLE)), yes) | 358 | ifeq ($(strip $(BACKLIGHT_ENABLE)), yes) |
| 355 | ifeq ($(filter $(BACKLIGHT_DRIVER),$(VALID_BACKLIGHT_TYPES)),) | 359 | ifeq ($(filter $(BACKLIGHT_DRIVER),$(VALID_BACKLIGHT_TYPES)),) |
| 356 | $(error BACKLIGHT_DRIVER="$(BACKLIGHT_DRIVER)" is not a valid backlight type) | 360 | $(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 3fa73a96e..d0a337bad 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 | |||
| 5 | OPT_DEFS += -DCONVERT_TO_PROTON_C | 5 | OPT_DEFS += -DCONVERT_TO_PROTON_C |
| 6 | 6 | ||
| 7 | # These are defaults based on what has been implemented for ARM boards | 7 | # These are defaults based on what has been implemented for ARM boards |
| 8 | AUDIO_ENABLE = yes | 8 | AUDIO_ENABLE ?= yes |
| 9 | WS2812_DRIVER = bitbang | 9 | WS2812_DRIVER ?= bitbang |
| 10 | |||
| 11 | # Force task driven PWM until ARM can provide automatic configuration | ||
| 12 | BACKLIGHT_DRIVER = software \ No newline at end of file | ||