diff --git a/src/AudioOutputI2S.cpp b/src/AudioOutputI2S.cpp index 687c6d1..de7836a 100644 --- a/src/AudioOutputI2S.cpp +++ b/src/AudioOutputI2S.cpp @@ -26,24 +26,32 @@ #endif #include "AudioOutputI2S.h" -AudioOutputI2S::AudioOutputI2S(int port) +AudioOutputI2S::AudioOutputI2S(int port, bool builtInDAC) { + portNo = port; #ifdef ESP32 if (!i2sOn) { i2s_config_t i2s_config_dac = { - .mode = (i2s_mode_t)(I2S_MODE_MASTER | I2S_MODE_TX), + .mode = (i2s_mode_t)(I2S_MODE_MASTER | I2S_MODE_TX | (builtInDAC ? I2S_MODE_DAC_BUILT_IN : 0)), .sample_rate = 44100, .bits_per_sample = I2S_BITS_PER_SAMPLE_16BIT, .channel_format = I2S_CHANNEL_FMT_RIGHT_LEFT, - .communication_format = (i2s_comm_format_t)(I2S_COMM_FORMAT_I2S | I2S_COMM_FORMAT_I2S_MSB), + .communication_format = (i2s_comm_format_t)((builtInDAC ? 0 : I2S_COMM_FORMAT_I2S) | I2S_COMM_FORMAT_I2S_MSB), .intr_alloc_flags = ESP_INTR_FLAG_LEVEL1, // high interrupt priority .dma_buf_count = 8, .dma_buf_len = 64, //Interrupt level 1 .use_apll = 1 // Use audio PLL }; - - i2s_driver_install((i2s_port_t)portNo, &i2s_config_dac, 0, NULL); - SetPinout(26, 25, 22); + Serial.printf("+%d %p\n", portNo, &i2s_config_dac); + if (i2s_driver_install((i2s_port_t)portNo, &i2s_config_dac, 0, NULL) != ESP_OK) { + Serial.println("ERROR: Unable to install I2S drives\n"); + } + if (builtInDAC) { + i2s_set_pin((i2s_port_t)portNo, NULL); + i2s_set_dac_mode(I2S_DAC_CHANNEL_BOTH_EN); + } else { + SetPinout(26, 25, 22); + } i2s_zero_dma_buffer((i2s_port_t)portNo); } #else @@ -52,15 +60,16 @@ AudioOutputI2S::AudioOutputI2S(int port) } #endif i2sOn = true; - portNo = port; mono = false; SetGain(1.0); + this->builtInDAC = builtInDAC; } AudioOutputI2S::~AudioOutputI2S() { #ifdef ESP32 - if (!i2sOn) { + if (i2sOn) { + Serial.printf("UNINSTALL I2S\n"); i2s_driver_uninstall((i2s_port_t)portNo); //stop & destroy i2s driver } #else @@ -72,6 +81,8 @@ AudioOutputI2S::~AudioOutputI2S() bool AudioOutputI2S::SetPinout(int bclk, int wclk, int dout) { #ifdef ESP32 + if (builtInDAC) return false; // Not allowed + i2s_pin_config_t pins = { .bck_io_num = bclk, .ws_io_num = wclk, @@ -136,6 +147,11 @@ bool AudioOutputI2S::ConsumeSample(int16_t sample[2]) } uint32_t s32 = ((Amplify(sample[RIGHTCHANNEL]))<<16) | (Amplify(sample[LEFTCHANNEL]) & 0xffff); #ifdef ESP32 + if (builtInDAC) { + int16_t l = Amplify(sample[LEFTCHANNEL]) + 0x8000; + int16_t r = Amplify(sample[RIGHTCHANNEL]) + 0x8000; + s32 = (r<<16) | (l&0xffff); + } return i2s_push_sample((i2s_port_t)portNo, (const char *)&s32, 0); #else return i2s_write_sample_nb(s32); // If we can't store it, return false. OTW true diff --git a/src/AudioOutputI2S.h b/src/AudioOutputI2S.h index 7855429..2025b05 100644 --- a/src/AudioOutputI2S.h +++ b/src/AudioOutputI2S.h @@ -26,7 +26,7 @@ class AudioOutputI2S : public AudioOutput { public: - AudioOutputI2S(int port=0); + AudioOutputI2S(int port=0, bool builtInDAC=false); virtual ~AudioOutputI2S() override; bool SetPinout(int bclkPin, int wclkPin, int doutPin); virtual bool SetRate(int hz) override; @@ -41,6 +41,7 @@ class AudioOutputI2S : public AudioOutput protected: virtual int AdjustI2SRate(int hz) { return hz; } uint8_t portNo; + bool builtInDAC; bool mono; bool i2sOn; }; diff --git a/src/AudioOutputI2SNoDAC.cpp b/src/AudioOutputI2SNoDAC.cpp index f09258c..38c6d9f 100644 --- a/src/AudioOutputI2SNoDAC.cpp +++ b/src/AudioOutputI2SNoDAC.cpp @@ -27,9 +27,9 @@ #include "AudioOutputI2SNoDAC.h" -AudioOutputI2SNoDAC::AudioOutputI2SNoDAC(int port) : AudioOutputI2S(port) +AudioOutputI2SNoDAC::AudioOutputI2SNoDAC(int port) : AudioOutputI2S(port, false) { - oversample = 32; + SetOversampling(32); lastSamp = 0; cumErr = 0; } diff --git a/src/AudioOutputI2SNoDAC.h b/src/AudioOutputI2SNoDAC.h index f122e18..b5f3214 100644 --- a/src/AudioOutputI2SNoDAC.h +++ b/src/AudioOutputI2SNoDAC.h @@ -33,7 +33,7 @@ class AudioOutputI2SNoDAC : public AudioOutputI2S bool SetOversampling(int os); protected: - virtual int AdjustI2SRate(int hz) { return hz * oversample/32; } + virtual int AdjustI2SRate(int hz) override { return hz * oversample/32; } uint8_t oversample; void DeltaSigma(int16_t sample[2], uint32_t dsBuff[4]); typedef int32_t fixed24p8_t;