Merge 5cbcfa2230 into 139fba4116
This commit is contained in:
Hema2
GitHub
commit
e1a1e23af1
|
|
@ -1,4 +1,4 @@
|
|||
# ESP8266Audio - supports ESP8266 & ESP32 & Raspberry Pi Pico RP2040 [](https://gitter.im/ESP8266Audio/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
|
||||
# ESP8266Audio - supports ESP8266 & ESP32 & ESP32-S3 & Raspberry Pi Pico RP2040 [](https://gitter.im/ESP8266Audio/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
|
||||
Arduino library for parsing and decoding MOD, WAV, MP3, FLAC, MIDI, AAC, and RTTL files and playing them on an I2S DAC or even using a software-simulated delta-sigma DAC with dynamic 32x-128x oversampling.
|
||||
|
||||
ESP8266 is fully supported and most mature, but ESP32 is also mostly there with built-in DAC as well as external ones.
|
||||
|
|
@ -142,6 +142,8 @@ AudioOutputI2S: Interface for any I2S 16-bit DAC. Sends stereo or mono signals
|
|||
|
||||
AudioOutputI2SNoDAC: Abuses the I2S interface to play music without a DAC. Turns it into a 32x (or higher) oversampling delta-sigma DAC. Use the schematic below to drive a speaker or headphone from the I2STx pin (i.e. Rx). Note that with this interface, depending on the transistor used, you may need to disconnect the Rx pin from the driver to perform serial uploads. Mono-only output, of course.
|
||||
|
||||
AudioOutputI2SNoDACS3 (experimental): Same as the one above, but (ONLY) supports the ESP32-S3. It also requires a dummy (unused) pin for the clock output.
|
||||
|
||||
AudioOutputSPDIF (experimental): Another way to abuse the I2S peripheral to send out BMC encoded S/PDIF bitstream. To interface with S/PDIF receiver it needs optical or coaxial transceiver, for which some examples can be found at https://www.epanorama.net/documents/audio/spdif.html. It should work even with the simplest form with red LED and current limiting resistor, fed into TOSLINK cable. Minimum sample rate supported by is 32KHz. Due to BMC coding, actual symbol rate on the pin is 4x normal I2S data rate, which drains DMA buffers quickly. See more details inside [AudioOutputSPDIF.cpp](src/AudioOutputSPDIF.cpp#L17)
|
||||
|
||||
AudioOutputSerialWAV: Writes a binary WAV format with headers to the Serial port. If you capture the serial output to a file you can play it back on your development system.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,184 @@
|
|||
/*
|
||||
AudioOutputI2SNoDACS3
|
||||
Class for outputting PDM audio on the ESP32-S3 without an external DAC
|
||||
|
||||
Copyright (C) 2024 Hema2
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "AudioOutputI2SNoDACS3.h"
|
||||
|
||||
#if CONFIG_IDF_TARGET_ESP32S3
|
||||
|
||||
AudioOutputI2SNoDACS3::AudioOutputI2SNoDACS3(int doutPin, int dummyPin, int port, int dma_buf_count)
|
||||
{
|
||||
this->doutPin = (gpio_num_t)doutPin;
|
||||
this->dummyPin = (gpio_num_t)dummyPin;
|
||||
|
||||
this->portNo = port;
|
||||
this->dma_buf_count = dma_buf_count;
|
||||
|
||||
// Set initial I2S state
|
||||
i2sOn = false;
|
||||
|
||||
// Set defaults
|
||||
mono = false;
|
||||
bps = 16;
|
||||
channels = 2;
|
||||
hertz = 44100;
|
||||
SetGain(1.0);
|
||||
}
|
||||
|
||||
AudioOutputI2SNoDACS3::~AudioOutputI2SNoDACS3()
|
||||
{
|
||||
stop();
|
||||
}
|
||||
|
||||
bool AudioOutputI2SNoDACS3::SetRate(int hz)
|
||||
{
|
||||
// TODO - have a list of allowable rates from constructor, check them
|
||||
this->hertz = hz;
|
||||
if (i2sOn)
|
||||
{
|
||||
i2s_set_sample_rates((i2s_port_t)portNo, AdjustI2SRate(hz));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool AudioOutputI2SNoDACS3::SetBitsPerSample(int bits)
|
||||
{
|
||||
if ( (bits != 16) && (bits != 8) ) return false;
|
||||
this->bps = bits;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool AudioOutputI2SNoDACS3::SetChannels(int channels)
|
||||
{
|
||||
if ( (channels < 1) || (channels > 2) ) return false;
|
||||
this->channels = channels;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool AudioOutputI2SNoDACS3::SetOutputModeMono(bool mono)
|
||||
{
|
||||
this->mono = mono;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool AudioOutputI2SNoDACS3::begin()
|
||||
{
|
||||
if (!i2sOn)
|
||||
{
|
||||
i2s_config_t i2s_config = {
|
||||
.mode = (i2s_mode_t)(I2S_MODE_MASTER | I2S_MODE_TX | I2S_MODE_PDM),
|
||||
.sample_rate = 30000, // initial value ?????????
|
||||
.bits_per_sample = i2s_bits_per_sample_t(bps),
|
||||
.channel_format = I2S_CHANNEL_FMT_RIGHT_LEFT,
|
||||
.communication_format = I2S_COMM_FORMAT_STAND_I2S,
|
||||
.intr_alloc_flags = ESP_INTR_FLAG_LEVEL1, // lowest interrupt priority
|
||||
.dma_buf_count = dma_buf_count,
|
||||
.dma_buf_len = 128,
|
||||
.use_apll = true,
|
||||
.tx_desc_auto_clear = true,
|
||||
.fixed_mclk = 0,
|
||||
.mclk_multiple = I2S_MCLK_MULTIPLE_256,
|
||||
.bits_per_chan = I2S_BITS_PER_CHAN_DEFAULT,
|
||||
};
|
||||
|
||||
audioLogger->printf("+%d %p\n", portNo, &i2s_config);
|
||||
if (i2s_driver_install((i2s_port_t)portNo, &i2s_config, 0, NULL) != ESP_OK)
|
||||
{
|
||||
audioLogger->println(F("ERROR: Unable to install I2S drives\n"));
|
||||
return false;
|
||||
}
|
||||
|
||||
// Set pinout
|
||||
i2s_pin_config_t i2s_pinout = {
|
||||
.bck_io_num = I2S_PIN_NO_CHANGE, // no bck
|
||||
.ws_io_num = dummyPin, // dummy pin for LR clock
|
||||
.data_out_num = doutPin, // PDM data out
|
||||
.data_in_num = I2S_PIN_NO_CHANGE // no input
|
||||
};
|
||||
|
||||
if (i2s_set_pin((i2s_port_t)portNo, &i2s_pinout) != ESP_OK)
|
||||
{
|
||||
audioLogger->println(F("ERROR: Unable to set I2S pins\n"));
|
||||
return false;
|
||||
}
|
||||
|
||||
i2s_zero_dma_buffer((i2s_port_t)portNo);
|
||||
i2s_start((i2s_port_t)portNo);
|
||||
}
|
||||
|
||||
i2sOn = true;
|
||||
SetRate(hertz);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool AudioOutputI2SNoDACS3::ConsumeSample(int16_t sample[2])
|
||||
{
|
||||
|
||||
//return if we haven't called ::begin yet
|
||||
if (!i2sOn)
|
||||
return false;
|
||||
|
||||
int16_t ms[2];
|
||||
|
||||
ms[0] = sample[0];
|
||||
ms[1] = sample[1];
|
||||
MakeSampleStereo16( ms );
|
||||
|
||||
if (this->mono) {
|
||||
// Average the two samples and overwrite
|
||||
int32_t ttl = ms[LEFTCHANNEL] + ms[RIGHTCHANNEL];
|
||||
ms[LEFTCHANNEL] = ms[RIGHTCHANNEL] = (ttl>>1) & 0xffff;
|
||||
}
|
||||
|
||||
uint32_t s32 = ((Amplify(ms[RIGHTCHANNEL])) << 16) | (Amplify(ms[LEFTCHANNEL]) & 0xffff);
|
||||
|
||||
size_t i2s_bytes_written;
|
||||
i2s_write((i2s_port_t)portNo, (const char*)&s32, sizeof(uint32_t), &i2s_bytes_written, 0);
|
||||
return i2s_bytes_written;
|
||||
}
|
||||
|
||||
void AudioOutputI2SNoDACS3::flush()
|
||||
{
|
||||
// makes sure that all stored DMA samples are consumed / played
|
||||
int buffersize = 128 * this->dma_buf_count;
|
||||
int16_t samples[2] = {0x0, 0x0};
|
||||
for (int i = 0; i < buffersize; i++)
|
||||
{
|
||||
while (!ConsumeSample(samples))
|
||||
{
|
||||
delay(10);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool AudioOutputI2SNoDACS3::stop()
|
||||
{
|
||||
if (!i2sOn)
|
||||
return false;
|
||||
|
||||
i2s_zero_dma_buffer((i2s_port_t)portNo);
|
||||
|
||||
audioLogger->printf("UNINSTALL I2S\n");
|
||||
i2s_driver_uninstall((i2s_port_t)portNo); //stop & destroy i2s driver
|
||||
|
||||
i2sOn = false;
|
||||
return true;
|
||||
}
|
||||
|
||||
#endif // CONFIG_IDF_TARGET_ESP32S3
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
/*
|
||||
AudioOutputI2SNoDACS3
|
||||
Class for outputting PDM audio on the ESP32-S3 without an external DAC
|
||||
|
||||
Copyright (C) 2024 Hema2
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "AudioOutput.h"
|
||||
#include "driver/i2s.h"
|
||||
#include <Arduino.h>
|
||||
|
||||
#if CONFIG_IDF_TARGET_ESP32S3
|
||||
|
||||
class AudioOutputI2SNoDACS3 : public AudioOutput
|
||||
{
|
||||
public:
|
||||
/// @brief No-DAC Audio Output for ESP32-S3
|
||||
/// @param doutPin Pin to modulate audio on (PDM data)
|
||||
/// @param dummyPin Dummy pin to use for WS/BCLK (PDM clock)
|
||||
/// @param port
|
||||
/// @param dma_buf_count
|
||||
AudioOutputI2SNoDACS3(int doutPin, int dummyPin = GPIO_NUM_3, int port=0, int dma_buf_count = 8);
|
||||
|
||||
virtual ~AudioOutputI2SNoDACS3() override;
|
||||
virtual bool SetRate(int hz) override;
|
||||
virtual bool SetBitsPerSample(int bits) override;
|
||||
virtual bool SetChannels(int channels) override;
|
||||
virtual bool begin() override;
|
||||
virtual bool ConsumeSample(int16_t sample[2]) override;
|
||||
virtual void flush() override;
|
||||
virtual bool stop() override;
|
||||
|
||||
bool SetOutputModeMono(bool mono); // Force mono output no matter the input
|
||||
|
||||
protected:
|
||||
virtual int AdjustI2SRate(int hz) { return (int)((float)hz / 1.0f); }
|
||||
uint8_t portNo;
|
||||
bool mono;
|
||||
bool i2sOn;
|
||||
int dma_buf_count;
|
||||
|
||||
gpio_num_t doutPin;
|
||||
gpio_num_t dummyPin;
|
||||
};
|
||||
|
||||
#endif // CONFIG_IDF_TARGET_ESP32S3
|
||||
|
|
@ -41,6 +41,7 @@
|
|||
#include "AudioOutput.h"
|
||||
#include "AudioOutputI2S.h"
|
||||
#include "AudioOutputI2SNoDAC.h"
|
||||
#include "AudioOutputI2SNoDACS3.h"
|
||||
#include "AudioOutputPWM.h"
|
||||
#include "AudioOutputMixer.h"
|
||||
#include "AudioOutputNull.h"
|
||||
|
|
|
|||
Loading…
Reference in New Issue