Skip to content

Commit 10eabf6

Browse files
authored
Merge pull request adafruit#756 from tannewt/audio3
Add audio output support!
2 parents 0f4a203 + 22194d5 commit 10eabf6

36 files changed

Lines changed: 2961 additions & 730 deletions

ports/atmel-samd/Makefile

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,10 @@ endif
220220
SRC_ASF := $(addprefix asf4/$(CHIP_FAMILY)/, $(SRC_ASF))
221221

222222
SRC_C = \
223+
audio_dma.c \
223224
background.c \
225+
clocks.c \
226+
events.c \
224227
fatfs_port.c \
225228
flash_api.c \
226229
mphalport.c \
@@ -276,7 +279,7 @@ SRC_COMMON_HAL = \
276279
neopixel_write/__init__.c \
277280
os/__init__.c \
278281
storage/__init__.c \
279-
supervisor/__init__.c \
282+
supervisor/__init__.c \
280283
supervisor/Runtime.c \
281284
time/__init__.c \
282285
analogio/__init__.c \
@@ -287,12 +290,11 @@ SRC_COMMON_HAL = \
287290
pulseio/PulseOut.c \
288291
pulseio/PWMOut.c \
289292
usb_hid/__init__.c \
290-
usb_hid/Device.c
291-
# audiobusio/__init__.c \
292-
audiobusio/PDMIn.c \
293+
usb_hid/Device.c \
293294
audioio/__init__.c \
294295
audioio/AudioOut.c \
295-
nvm/__init__.c \
296+
# nvm/__init__.c \
297+
audiobusio/PDMIn.c \
296298
nvm/ByteArray.c \
297299
touchio/__init__.c \
298300
touchio/TouchIn.c \
@@ -338,6 +340,8 @@ SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
338340
$(addprefix common-hal/, $(SRC_COMMON_HAL))
339341

340342
SRC_SHARED_MODULE = \
343+
audioio/RawSample.c \
344+
audioio/WaveFile.c \
341345
bitbangio/__init__.c \
342346
bitbangio/I2C.c \
343347
bitbangio/OneWire.c \
@@ -355,6 +359,19 @@ SRC_SHARED_MODULE = \
355359
uheap/__init__.c \
356360
ustack/__init__.c
357361

362+
ifeq ($(CHIP_FAMILY),samd21)
363+
SRC_COMMON_HAL += \
364+
audiobusio/__init__.c \
365+
audiobusio/I2SOut.c
366+
endif
367+
ifneq ($(CHIP_VARIANT),SAMD51G18A)
368+
ifneq ($(CHIP_VARIANT),SAMD51G19A)
369+
SRC_COMMON_HAL += \
370+
audiobusio/__init__.c \
371+
audiobusio/I2SOut.c
372+
endif
373+
endif
374+
358375
SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_MODULE)) \
359376
$(addprefix shared-module/, $(SRC_SHARED_MODULE))
360377

0 commit comments

Comments
 (0)