use auto instead of I2SConfig

This commit is contained in:
Phil Schatzmann 2021-10-19 18:18:16 +02:00
parent 4c7ada055d
commit ad3a39c41b
14 changed files with 16 additions and 16 deletions

View File

@ -28,7 +28,7 @@ void setup(void) {
// start i2s input with default configuration
Serial.println("starting I2S...");
I2SConfig config = i2s.defaultConfig(RX_MODE);
auto config = i2s.defaultConfig(RX_MODE);
config.sample_rate = 16000;
i2s.begin(config);
}

View File

@ -48,7 +48,7 @@ void setup() {
AudioLogger::instance().begin(Serial, AudioLogger::Info);
// setup output
I2SConfig cfg = i2s.defaultConfig(TX_MODE);
auto cfg = i2s.defaultConfig(TX_MODE);
i2s.begin(cfg);
// setup player

View File

@ -36,7 +36,7 @@ void setup() {
AudioLogger::instance().begin(Serial, AudioLogger::Debug);
// setup output
I2SConfig cfg = i2s.defaultConfig(TX_MODE);
auto cfg = i2s.defaultConfig(TX_MODE);
i2s.begin(cfg);
// setup player

View File

@ -45,7 +45,7 @@ void setup() {
Serial.begin(115200);
// setup I2S
I2SConfig config = i2s.defaultConfig(RX);
auto config = i2s.defaultConfig(RX);
i2s.begin(config);
// Setup SD and open file

View File

@ -3,8 +3,7 @@
using namespace audio_tools;
I2S<int16_t> i2s; // I2S output destination
I2SStream i2s_stream(i2s); // WAVDecoder neads I2S Output as stream
I2SStream i2s; // WAVDecoder neads I2S Output as stream
WAVDecoder decoder(i2s_stream); // Decoder writing to I2S Stream
URLStream music; // Music Stream
const size_t buffer_size = 512;
@ -22,7 +21,7 @@ void setup(){
}
// start I2S with the default configuration
I2SConfig<int16_t> config = i2s.defaultConfig(TX_MODE);
auto config = i2s.defaultConfig(TX_MODE);
i2s.begin(config);
// open music stream

View File

@ -41,7 +41,7 @@ void setup(void) {
// start i2s input with default configuration
Serial.println("starting I2S...");
I2SConfig config = i2sStream.defaultConfig(RX_MODE);
auto config = i2sStream.defaultConfig(RX_MODE);
config.sample_rate = 44100;
config.channels = 2;
config.bits_per_sample = 16;

View File

@ -26,7 +26,7 @@ StreamCopy copier(dec, in); // copy in to out
// Arduino Setup
void setup(void) {
Serial.begin(115200);
I2SConfig config = i2s.defaultConfig(TX_MODE);
auto config = i2s.defaultConfig(TX_MODE);
i2s.begin(config);
dec.setNotifyAudioChange(i2s);

View File

@ -25,7 +25,7 @@ void setup(void) {
// start the bluetooth
Serial.println("starting I2S...");
I2SConfig config = out.defaultConfig(TX_MODE);
auto config = out.defaultConfig(TX_MODE);
config.sample_rate = sample_rate;
config.channels = channels;
config.bits_per_sample = 16;

View File

@ -32,7 +32,7 @@ void setup(void) {
// start i2s input with default configuration
Serial.println("starting I2S...");
I2SConfig config = i2sStream.defaultConfig(RX_MODE);
auto config = i2sStream.defaultConfig(RX_MODE);
config.sample_rate = 44100;
config.channels = 2;
config.bits_per_sample = 16;

View File

@ -22,7 +22,7 @@ void setup(){
// start i2s input with default configuration
Serial.println("starting I2S...");
I2SConfig config = i2sStream.defaultConfig(RX_MODE);
auto config = i2sStream.defaultConfig(RX_MODE);
config.sample_rate = 22050;
config.channels = 2;
config.bits_per_sample = 16;

View File

@ -24,7 +24,7 @@ StreamCopyT<int16_t> copier(i2s, music); // copies sound into i2s
void setup(){
Serial.begin(115200);
I2SConfig config = i2s.defaultConfig(TX_MODE);
auto config = i2s.defaultConfig(TX_MODE);
config.sample_rate = sample_rate;
config.channels = channels;
config.bits_per_sample = 16;

View File

@ -22,13 +22,14 @@ PWMAudioStream pwm; // PWM output
WAVDecoder decoder(pwm); // decode wav to pcm and send it to printer
AudioOutputStream out(decoder); // output to decoder
StreamCopy copier(out, wav); // copy in to out
PWMConfig config = pwm.defaultConfig();
void setup(){
Serial.begin(115200);
while(!Serial);
AudioLogger::instance().begin(Serial, AudioLogger::Debug);
auto config = pwm.defaultConfig();
// setup pwm output
config.channels = 1;
//config.sample_rate = 11025; // for knghtsng_wav

View File

@ -33,7 +33,7 @@ void setup(){
File audioFile = SD.open("/music.mp3");
// setup i2s
I2SConfig config = i2s.defaultConfig(TX_MODE);
auto config = i2s.defaultConfig(TX_MODE);
i2s.begin(config);
// setup I2S based on sampling rate provided by decoder

View File

@ -25,7 +25,7 @@ void setup(){
AudioLogger::instance().begin(Serial, AudioLogger::Debug);
// setup i2s
I2SConfig config = i2s.defaultConfig(TX_MODE);
auto config = i2s.defaultConfig(TX_MODE);
config.sample_rate = 16000;
config.bits_per_sample = 32;
config.channels = 1;