Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move Audio drivers from quantum to platform drivers folder #14308

Merged
merged 2 commits into from
Oct 6, 2021
Merged

Move Audio drivers from quantum to platform drivers folder #14308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5b6a8d
Move Audio drivers from quantum to platform drivers folder
drashna Sep 4, 2021
4064473
fix path for audio drivers
drashna Sep 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common_features.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,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
Expand Down
0 quantum/audio/driver_avr_pwm.h → platforms/avr/drivers/audio_pwm.h
View file
Open in desktop
File renamed without changes.
0 quantum/audio/driver_avr_pwm_hardware.c → platforms/avr/drivers/audio_pwm_hardware.c
View file
Open in desktop
File renamed without changes.
0 quantum/audio/driver_chibios_dac.h → platforms/chibios/drivers/audio_dac.h
View file
Open in desktop
File renamed without changes.
0 quantum/audio/driver_chibios_dac_additive.c → ...orms/chibios/drivers/audio_dac_additive.c
View file
Open in desktop
File renamed without changes.
0 quantum/audio/driver_chibios_dac_basic.c → platforms/chibios/drivers/audio_dac_basic.c
View file
Open in desktop
File renamed without changes.
0 quantum/audio/driver_chibios_pwm.h → platforms/chibios/drivers/audio_pwm.h
View file
Open in desktop
File renamed without changes.
0 quantum/audio/driver_chibios_pwm_hardware.c → ...orms/chibios/drivers/audio_pwm_hardware.c
View file
Open in desktop
File renamed without changes.
0 quantum/audio/driver_chibios_pwm_software.c → ...orms/chibios/drivers/audio_pwm_software.c
View file
Open in desktop
File renamed without changes.
13 changes: 4 additions & 9 deletions quantum/audio/audio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down