-
-
Notifications
You must be signed in to change notification settings - Fork 247
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
6a1ae1b
commit 7226c7d
Showing
6 changed files
with
216 additions
and
130 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| #pragma once | ||
|
|
||
| #include "AudioConfig.h" | ||
| #if defined(USE_ANALOG) && defined(ESP32) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0 , 0) | ||
|
|
||
| # include "driver/i2s.h" | ||
| # include "driver/adc.h" | ||
| # include "soc/dac_channel.h" | ||
| # include "soc/adc_channel.h" | ||
|
|
||
| namespace audio_tools { | ||
|
|
||
| /** | ||
| * @brief ESP32 specific configuration for i2s input via adc. The default input pin is GPIO34. We always use int16_t values. The default | ||
| * output pins are GPIO25 and GPIO26! | ||
| * | ||
| * @author Phil Schatzmann | ||
| * @copyright GPLv3 | ||
| */ | ||
| class AnalogConfigESP32 : public AudioInfo { | ||
| public: | ||
| int buffer_count = PWM_BUFFER_COUNT; | ||
| int buffer_size = PWM_BUFFER_SIZE; | ||
| RxTxMode rx_tx_mode; | ||
| bool is_blocking_write = true; | ||
| bool is_auto_center_read = true; | ||
|
|
||
| // allow ADC to access the protected methods | ||
| friend class AnalogDriverESP32; | ||
| bool use_apll = false; | ||
|
|
||
| // public config parameters | ||
| int port_no = I2S_NUM_0; // Analog input and output only supports 0! | ||
| bool auto_clear = I2S_AUTO_CLEAR; | ||
| bool uninstall_driver_on_end = true; | ||
| int mode_internal; | ||
| int adc_pin; | ||
|
|
||
| /// Default constructor | ||
| AnalogConfigESP32(RxTxMode rxtxMode=TX_MODE) { | ||
| sample_rate = 44100; | ||
| bits_per_sample = 16; | ||
| channels = 2; | ||
| rx_tx_mode = rxtxMode; | ||
| if (rx_tx_mode == RX_MODE) { | ||
| mode_internal = (I2S_MODE_MASTER | I2S_MODE_RX | I2S_MODE_ADC_BUILT_IN); | ||
| adc_pin = PIN_ADC1; | ||
| auto_clear = false; | ||
| LOGI("I2S_MODE_ADC_BUILT_IN"); | ||
| } else { | ||
| mode_internal = (I2S_MODE_MASTER | I2S_MODE_TX | I2S_MODE_DAC_BUILT_IN); | ||
| LOGI("I2S_MODE_DAC_BUILT_IN"); | ||
| } | ||
| } | ||
|
|
||
| /// Copy constructor | ||
| AnalogConfigESP32(const AnalogConfigESP32 &cfg) = default; | ||
|
|
||
| void logInfo() { | ||
| AudioInfo::logInfo(); | ||
| if (rx_tx_mode == TX_MODE){ | ||
| LOGI("analog left output pin: %d", 25); | ||
| LOGI("analog right output pin: %d", 26); | ||
| } | ||
| } | ||
|
|
||
| /// Defines an alternative input pin (for the left channel) | ||
| void setInputPin1(int pin){ | ||
| this->adc_pin = pin; | ||
| } | ||
|
|
||
| }; | ||
|
|
||
| using AnalogConfig = AnalogConfigESP32; | ||
|
|
||
|
|
||
| } // ns | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| #pragma once | ||
|
|
||
| #include "AudioConfig.h" | ||
| #if defined(USE_ANALOG) && defined(ESP32) && ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0 , 0) | ||
|
|
||
| # include "esp_adc/adc_continuous.h" | ||
|
|
||
| #if CONFIG_IDF_TARGET_ESP32 | ||
| #define ADC_CONV_MODE ADC_CONV_SINGLE_UNIT_1 //ESP32 only supports ADC1 DMA mode | ||
| #define ADC_OUTPUT_TYPE ADC_DIGI_OUTPUT_FORMAT_TYPE1 | ||
| #elif CONFIG_IDF_TARGET_ESP32S2 | ||
| #define ADC_CONV_MODE ADC_CONV_BOTH_UNIT | ||
| #define ADC_OUTPUT_TYPE ADC_DIGI_OUTPUT_FORMAT_TYPE2 | ||
| #elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 | ||
| #define ADC_CONV_MODE ADC_CONV_ALTER_UNIT //ESP32C3 only supports alter mode | ||
| #define ADC_OUTPUT_TYPE ADC_DIGI_OUTPUT_FORMAT_TYPE2 | ||
| #elif CONFIG_IDF_TARGET_ESP32S3 | ||
| #define ADC_CONV_MODE ADC_CONV_BOTH_UNIT | ||
| #define ADC_OUTPUT_TYPE ADC_DIGI_OUTPUT_FORMAT_TYPE2 | ||
| #endif | ||
|
|
||
| namespace audio_tools { | ||
|
|
||
| /** | ||
| * @brief ESP32 specific configuration for i2s input via adc using the | ||
| * adc_continuous API | ||
| * | ||
| * @author Phil Schatzmann | ||
| * @copyright GPLv3 | ||
| */ | ||
| class AnalogConfigESP32V1 : public AudioInfo { | ||
| public: | ||
| int buffer_count = PWM_BUFFER_COUNT; | ||
| int buffer_size = PWM_BUFFER_SIZE; | ||
| RxTxMode rx_tx_mode; | ||
| bool is_blocking_write = true; | ||
| bool is_auto_center_read = true; | ||
|
|
||
| // allow ADC to access the protected methods | ||
| friend class AnalogDriverESP32; | ||
| bool use_apll = false; | ||
|
|
||
| // public config parameters | ||
| int adc_conversion_mode = ADC_CONV_MODE; | ||
| int adc_output_type = ADC_OUTPUT_TYPE; | ||
| int adc_attenuation = ADC_ATTEN_DB_0; | ||
| int adc_bit_width = SOC_ADC_DIGI_MAX_BITWIDTH; | ||
| #if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 | ||
| adc_channel_t adc_channels[3] = {ADC_CHANNEL_2, ADC_CHANNEL_3, (ADC_CHANNEL_0 | 1 << 3)}; | ||
| #endif | ||
| #if CONFIG_IDF_TARGET_ESP32S2 | ||
| adc_channel_t adc_channels[3] = {ADC_CHANNEL_2, ADC_CHANNEL_3, (ADC_CHANNEL_0 | 1 << 3)}; | ||
| #endif | ||
| #if CONFIG_IDF_TARGET_ESP32 | ||
| adc_channel_t adc_channels[1] = {ADC_CHANNEL_7}; | ||
| #endif | ||
|
|
||
| /// Default constructor | ||
| AnalogConfigESP32V1(RxTxMode rxtxMode=TX_MODE) { | ||
| sample_rate = 44100; | ||
| bits_per_sample = 16; | ||
| channels = 2; | ||
| rx_tx_mode = rxtxMode; | ||
| if (rx_tx_mode == RX_MODE) { | ||
| LOGI("I2S_MODE_ADC_BUILT_IN"); | ||
| } else { | ||
| LOGI("I2S_MODE_DAC_BUILT_IN"); | ||
| } | ||
| } | ||
|
|
||
| /// Copy constructor | ||
| AnalogConfigESP32V1(const AnalogConfigESP32V1 &cfg) = default; | ||
|
|
||
| void logInfo() { | ||
| AudioInfo::logInfo(); | ||
| if (rx_tx_mode == TX_MODE){ | ||
| LOGI("analog left output pin: %d", 25); | ||
| LOGI("analog right output pin: %d", 26); | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| using AnalogConfig = AnalogConfigESP32V1; | ||
|
|
||
|
|
||
| } // ns | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| #pragma once | ||
| #include "AudioConfig.h" | ||
| #if defined(USE_ANALOG) | ||
|
|
||
| namespace audio_tools { | ||
|
|
||
| /** | ||
| * @brief Generic ADC and DAC configuration | ||
| * | ||
| * @author Phil Schatzmann | ||
| * @copyright GPLv3 | ||
| */ | ||
| class AnalogConfigStd : public AudioInfo { | ||
| public: | ||
| int buffer_count = PWM_BUFFER_COUNT; | ||
| int buffer_size = PWM_BUFFER_SIZE; | ||
| RxTxMode rx_tx_mode; | ||
| bool is_blocking_write = true; | ||
| bool is_auto_center_read = true; | ||
|
|
||
| /// Copy constructor | ||
| AnalogConfigStd(const AnalogConfigStd &cfg) = default; | ||
|
|
||
| AnalogConfigStd() { | ||
| sample_rate = 44100; | ||
| bits_per_sample = 16; | ||
| channels = 2; | ||
| buffer_size = ANALOG_BUFFER_SIZE; | ||
| buffer_count = ANALOG_BUFFERS; | ||
| rx_tx_mode = RX_MODE; | ||
| } | ||
| /// Default constructor | ||
| AnalogConfigStd(RxTxMode rxtxMode) : AnalogConfig() { | ||
| rx_tx_mode = rxtxMode; | ||
| } | ||
| int start_pin = PIN_ANALOG_START; | ||
|
|
||
| }; | ||
|
|
||
| using AnalogConfig = AnalogConfigStd; | ||
|
|
||
| } // ns | ||
| #endif |