Skip to content

Commit 3b3df76

Browse files
pschatzmannpschatzmann
committed
USE_LEGACY_I2S
1 parent de5dfa2 commit 3b3df76

File tree

12 files changed

+32
-37
lines changed

12 files changed

+32
-37
lines changed

‎src/AudioTools/CoreAudio/AudioAnalog/AnalogAudioStream.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// Support AnalogAudioStream
55
#if defined(USE_ANALOG)
66
# include "AnalogDriverBase.h"
7-
# include "AnalogDriverESP32V1.h"
87
# include "AnalogDriverESP32.h"
8+
# include "AnalogDriverESP32V1.h"
99
# include "AnalogDriverMBED.h"
1010
# include "AnalogDriverArduino.h"
1111

‎src/AudioTools/CoreAudio/AudioAnalog/AnalogConfigESP32.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
#include "AudioToolsConfig.h"
4-
#if defined(USE_ANALOG) && defined(ESP32) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0 , 0) || defined(DOXYGEN)
4+
#if (defined(ESP32) && defined(USE_ANALOG) && USE_LEGACY_I2S) || defined(DOXYGEN)
55
#include "AudioTools/CoreAudio/AudioTypes.h"
66

77
# include "driver/i2s.h"

‎src/AudioTools/CoreAudio/AudioAnalog/AnalogConfigESP32V1.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
#pragma once
22

33
#include "AudioToolsConfig.h"
4-
#if defined(USE_ANALOG) && defined(ESP32) \
5-
&& ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0) \
6-
|| defined(DOXYGEN)
4+
#if (defined(ESP32) && defined(USE_ANALOG) && !USE_LEGACY_I2S) || defined(DOXYGEN)
75

86
#include "AudioTools/CoreAudio/AudioTypes.h"
97
#include "esp_adc/adc_cali_scheme.h"
@@ -85,7 +83,7 @@
8583
// continuous ADC API should run on ADC1
8684

8785
#define ADC_UNIT ADC_UNIT_1
88-
#ifdef HAS_ESP32_DAC
86+
#ifdef HAS_ESP32_DAC && !USE_LEGACY_I2S
8987
#include "driver/dac_continuous.h"
9088
#endif
9189

‎src/AudioTools/CoreAudio/AudioAnalog/AnalogDriverESP32.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
#include "AudioToolsConfig.h"
4-
#if defined(ESP32) && defined(USE_ANALOG) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0 , 0) || defined(DOXYGEN)
4+
#if (defined(ESP32) && defined(USE_ANALOG) && USE_LEGACY_I2S) || defined(DOXYGEN)
55
#include "AudioTools/CoreAudio/AudioAnalog/AnalogDriverBase.h"
66
#include "driver/i2s.h"
77
#include "driver/adc.h"
@@ -221,35 +221,35 @@ class AnalogDriverESP32 : public AnalogDriverBase {
221221
switch(gpio){
222222
case 32:
223223
adc_unit = ADC_UNIT_1;
224-
adc_channel = ADC1_GPIO32_CHANNEL;
224+
adc_channel = (adc1_channel_t)ADC1_GPIO32_CHANNEL;
225225
break;
226226
case 33:
227227
adc_unit = ADC_UNIT_1;
228-
adc_channel = ADC1_GPIO33_CHANNEL;
228+
adc_channel = (adc1_channel_t)ADC1_GPIO33_CHANNEL;
229229
break;
230230
case 34:
231231
adc_unit = ADC_UNIT_1;
232-
adc_channel = ADC1_GPIO34_CHANNEL;
232+
adc_channel = (adc1_channel_t)ADC1_GPIO34_CHANNEL;
233233
break;
234234
case 35:
235235
adc_unit = ADC_UNIT_1;
236-
adc_channel = ADC1_GPIO35_CHANNEL;
236+
adc_channel = (adc1_channel_t)ADC1_GPIO35_CHANNEL;
237237
break;
238238
case 36:
239239
adc_unit = ADC_UNIT_1;
240-
adc_channel = ADC1_GPIO36_CHANNEL;
240+
adc_channel = (adc1_channel_t)ADC1_GPIO36_CHANNEL;
241241
break;
242242
case 37:
243243
adc_unit = ADC_UNIT_1;
244-
adc_channel = ADC1_GPIO37_CHANNEL;
244+
adc_channel = (adc1_channel_t)ADC1_GPIO37_CHANNEL;
245245
break;
246246
case 38:
247247
adc_unit = ADC_UNIT_1;
248-
adc_channel = ADC1_GPIO38_CHANNEL;
248+
adc_channel = (adc1_channel_t)ADC1_GPIO38_CHANNEL;
249249
break;
250250
case 39:
251251
adc_unit = ADC_UNIT_1;
252-
adc_channel = ADC1_GPIO39_CHANNEL;
252+
adc_channel = (adc1_channel_t)ADC1_GPIO39_CHANNEL;
253253
break;
254254

255255
default:

‎src/AudioTools/CoreAudio/AudioAnalog/AnalogDriverESP32V1.h‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
#include "AudioToolsConfig.h"
44

5-
#if defined(ESP32) && defined(USE_ANALOG) && \
6-
ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0) || defined(DOXYGEN)
5+
#if (defined(ESP32) && defined(USE_ANALOG) && !USE_LEGACY_I2S) || defined(DOXYGEN)
76

87
#ifdef ARDUINO
98
#ifndef perimanClearPinBus
@@ -573,7 +572,7 @@ class AnalogDriverESP32V1 : public AnalogDriverBase {
573572
}
574573

575574
// Attach the pins to the ADC unit
576-
#ifdef ARDUINO
575+
#ifdef ARDUINO
577576
for (int i = 0; i < cfg.channels; i++) {
578577
adc_channel = cfg.adc_channels[i];
579578
adc_continuous_channel_to_io(cfg.adc_unit, adc_channel, &io_pin);
@@ -583,7 +582,7 @@ class AnalogDriverESP32V1 : public AnalogDriverBase {
583582
return false;
584583
}
585584
}
586-
#endif
585+
#endif
587586

588587
// Start ADC
589588
err = adc_continuous_start(adc_handle);

‎src/AudioTools/CoreAudio/AudioAnalog/AnalogDriverESP32V2.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "AudioToolsConfig.h"
44

55
#if defined(ESP32) && defined(USE_ANALOG) && \
6-
ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0) || defined(DOXYGEN)
6+
!USE_LEGACY_I2S || defined(DOXYGEN)
77

88
#ifdef ARDUINO
99
#ifndef perimanClearPinBus

‎src/AudioTools/CoreAudio/AudioI2S/I2SConfig.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#ifdef USE_I2S
44

55
#if defined(ESP32)
6-
# if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0 , 0)
6+
# if USE_LEGACY_I2S
77
# include "I2SConfigESP32.h"
88
# else
99
# include "I2SConfigESP32V1.h"

‎src/AudioTools/CoreAudio/AudioI2S/I2SConfigESP32.h‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
# define PIN_I2S_MCK -1
77
#endif
88

9-
#if defined(ESP32) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0 , 0)
10-
# include "driver/i2s.h" // for I2S_CHANNEL_FMT_RIGHT_LEFT
9+
#if !USE_LEGACY_I2S
10+
#error "USE_LEGACY_I2S not true"
1111
#endif
12+
// legacy i2s driver
13+
#include "driver/i2s.h" // for I2S_CHANNEL_FMT_RIGHT_LEFT
1214

1315
namespace audio_tools {
1416

1517

16-
1718
/**
1819
* @brief Configuration for ESP32 legacy i2s
1920
* @ingroup platform
@@ -71,9 +72,7 @@ class I2SConfigESP32 : public AudioInfo {
7172
bool auto_clear = I2S_AUTO_CLEAR;
7273
bool use_apll = I2S_USE_APLL;
7374
uint32_t fixed_mclk = 0;
74-
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0 , 0)
7575
int channel_format = I2S_CHANNEL_FMT_RIGHT_LEFT;
76-
#endif
7776

7877
void logInfo(const char* source="") {
7978
AudioInfo::logInfo(source);

‎src/AudioTools/CoreAudio/AudioI2S/I2SConfigESP32V1.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#endif
88

99

10-
1110
namespace audio_tools {
1211

1312
/// Select left or right channel when number of channels = 1

‎src/AudioTools/CoreAudio/AudioI2S/I2SESP32.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
#pragma once
22

33
#include "AudioToolsConfig.h"
4-
#if defined(ESP32) && defined(USE_I2S) && \
5-
ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0) || \
6-
defined(DOXYGEN)
4+
#if defined(ESP32) && USE_LEGACY_I2S || defined(DOXYGEN)
75

86
#include "AudioTools/CoreAudio/AudioI2S/I2SConfig.h"
97
#include "driver/i2s.h"

0 commit comments

Comments
 (0)