drashna/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move Audio drivers from quantum to platform drivers folder (#14308)

Browse Source 
* Move Audio drivers from quantum to platform drivers folder

* fix path for audio drivers

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
This commit is contained in:
Drashna Jaelre 2021-10-05 18:01:45 -07:00 committed by GitHub
parent 9f0e74802a
commit ba8f1454f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common_features.mk
View File

@ -83,7 +83,7 @@ ifeq ($(strip $(AUDIO_ENABLE)), yes)
SRC += $(QUANTUM_DIR)/process_keycode/process_audio.c
SRC += $(QUANTUM_DIR)/process_keycode/process_clicky.c
SRC += $(QUANTUM_DIR)/audio/audio.c ## common audio code, hardware agnostic
SRC += $(QUANTUM_DIR)/audio/driver_$(PLATFORM_KEY)_$(strip $(AUDIO_DRIVER)).c
SRC += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/audio_$(strip $(AUDIO_DRIVER)).c
SRC += $(QUANTUM_DIR)/audio/voices.c
SRC += $(QUANTUM_DIR)/audio/luts.c
endif

0
quantum/audio/driver_avr_pwm.h → platforms/avr/drivers/audio_pwm.h
View File

0
quantum/audio/driver_avr_pwm_hardware.c → platforms/avr/drivers/audio_pwm_hardware.c
View File

0
quantum/audio/driver_chibios_dac.h → platforms/chibios/drivers/audio_dac.h
View File

0
quantum/audio/driver_chibios_dac_additive.c → platforms/chibios/drivers/audio_dac_additive.c
View File

0
quantum/audio/driver_chibios_dac_basic.c → platforms/chibios/drivers/audio_dac_basic.c
View File

0
quantum/audio/driver_chibios_pwm.h → platforms/chibios/drivers/audio_pwm.h
View File

0
quantum/audio/driver_chibios_pwm_hardware.c → platforms/chibios/drivers/audio_pwm_hardware.c
View File

0
quantum/audio/driver_chibios_pwm_software.c → platforms/chibios/drivers/audio_pwm_software.c
View File

13
quantum/audio/audio.h
View File

@ -26,17 +26,12 @@
#if defined(__AVR__)
# include <avr/io.h>
# if defined(AUDIO_DRIVER_PWM)
# include "driver_avr_pwm.h"
# endif
#endif
#if defined(PROTOCOL_CHIBIOS)
# if defined(AUDIO_DRIVER_PWM)
# include "driver_chibios_pwm.h"
# elif defined(AUDIO_DRIVER_DAC)
# include "driver_chibios_dac.h"
# endif
#if defined(AUDIO_DRIVER_PWM)
# include "audio_pwm.h"
#elif defined(AUDIO_DRIVER_DAC)
# include "audio_dac.h"
#endif
typedef union {