Skip to content

Commit cac91b0

Browse files
committed
Fix complie errors in 2 examples
1 parent eb49f45 commit cac91b0

File tree

5 files changed

+32
-19
lines changed

5 files changed

+32
-19
lines changed

examples/build-examples-log.txt

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11

22

3+
34
../examples/examples-basic-api/base-adc-a2dp -> rc=0
45
../examples/examples-basic-api/base-adc-serial -> rc=0
5-
../examples/examples-basic-api/base-file_mp3-a2dp -> rc=1
6-
../examples/examples-basic-api/base-file_raw-serial -> rc=0
6+
../examples/examples-basic-api/base-file_raw-serial -> rc=1/0
77
../examples/examples-basic-api/base-i2s-a2dp -> rc=0
8-
../examples/examples-player/player-callback-i2s -> rc=0
9-
../examples/examples-player/player-sd-a2dp -> rc=0
10-
../examples/examples-player/player-sd-analog -> rc=0
11-
../examples/examples-player/player-sd-i2s -> rc=0
12-
../examples/examples-player/player-url-i2s -> rc=0
13-
../examples/examples-player/player-sd-i2s -> rc=0
8+
../examples/examples-player/player-callback-i2s -> rc=1/0
9+
../examples/examples-player/player-sdfat-a2dp -> rc=0
10+
../examples/examples-player/player-sdfat-analog -> rc=0
11+
../examples/examples-player/player-sdfat-i2s -> rc=0
1412
../examples/examples-player/player-url-i2s -> rc=0
1513
../examples/examples-player/player-url_icy-i2s -> rc=0
1614
../examples/examples-player/player-url_subclass-i2s -> rc=0
@@ -23,6 +21,7 @@
2321
../examples/examples-stream/streams-a2dp-serial -> rc=0
2422
../examples/examples-stream/streams-adc-i2s -> rc=0
2523
../examples/examples-stream/streams-adc-serial -> rc=0
24+
../examples/examples-stream/streams-adsr-i2s -> rc=0
2625
../examples/examples-stream/streams-generator-a2dp -> rc=0
2726
../examples/examples-stream/streams-generator-analog -> rc=0
2827
../examples/examples-stream/streams-generator-i2s -> rc=0
@@ -34,7 +33,7 @@
3433
../examples/examples-stream/streams-i2s-filter-i2s -> rc=0
3534
../examples/examples-stream/streams-i2s-i2s -> rc=0
3635
../examples/examples-stream/streams-i2s-i2s-2 -> rc=0
37-
../examples/examples-stream/streams-i2s-serial -> rc=0
36+
../examples/examples-stream/streams-i2s-serial -> rc=1/0
3837
../examples/examples-stream/streams-i2s-serial_16bit -> rc=0
3938
../examples/examples-stream/streams-i2s-tf -> rc=0
4039
../examples/examples-stream/streams-memory_mp3-analog -> rc=0
@@ -46,8 +45,8 @@
4645
../examples/examples-stream/streams-memory_wav-pwm -> rc=0
4746
../examples/examples-stream/streams-memory_wav-serial -> rc=0
4847
../examples/examples-stream/streams-mp34dt05-serial -> rc=1
49-
../examples/examples-stream/streams-sd_mp3-i2s -> rc=0
50-
../examples/examples-stream/streams-sd_mp3-metadata -> rc=0
48+
../examples/examples-stream/streams-sd_mp3-i2s -> rc=1
49+
../examples/examples-stream/streams-sdfat_mp3-metadata -> rc=0
5150
../examples/examples-stream/streams-tf-i2s -> rc=0
5251
../examples/examples-stream/streams-url_aac-i2s -> rc=0
5352
../examples/examples-stream/streams-url_flac-i2s -> rc=0
@@ -62,20 +61,31 @@
6261
../examples/examples-stream/streams-url_wav-i2s -> rc=0
6362
../examples/examples-audiokit/basic-a2dp-audiokit -> rc=0
6463
../examples/examples-audiokit/basic-a2dp-eq-audiokit -> rc=0
65-
../examples/examples-audiokit/player-sd-audiokit -> rc=0
64+
../examples/examples-audiokit/basic-audiokit-a2dp -> rc=0
65+
../examples/examples-audiokit/player-sd-audiokit -> rc=1/0
6666
../examples/examples-audiokit/player-sd_a2dp-audiokit -> rc=0
67+
../examples/examples-audiokit/player-sdfat-audiokit -> rc=0
68+
../examples/examples-audiokit/player-sdmmc-audiokit -> rc=0
6769
../examples/examples-audiokit/player-url_icy-audiokit -> rc=0
6870
../examples/examples-audiokit/streams-audiokit-audiokit -> rc=0
6971
../examples/examples-audiokit/streams-audiokit-fft -> rc=0
72+
../examples/examples-audiokit/streams-audiokit-fft-frequp -> rc=0
7073
../examples/examples-audiokit/streams-audiokit-filter-audiokit -> rc=0
74+
../examples/examples-audiokit/streams-audiokit-multioutput -> rc=0
75+
../examples/examples-audiokit/streams-audiokit-multioutput-server -> rc=0
76+
../examples/examples-audiokit/streams-audiokit-ram-audiokit -> rc=0
77+
../examples/examples-audiokit/streams-audiokit-sd-audiokit -> rc=1/0
7178
../examples/examples-audiokit/streams-audiokit-serial -> rc=0
7279
../examples/examples-audiokit/streams-audiokit-tf -> rc=0
7380
../examples/examples-audiokit/streams-audiokit-webserver_aac -> rc=0
81+
../examples/examples-audiokit/streams-audiokit-webserver_mp3 -> rc=0
7482
../examples/examples-audiokit/streams-audiokit-webserver_wav -> rc=0
7583
../examples/examples-audiokit/streams-generator-audiokit -> rc=0
7684
../examples/examples-audiokit/streams-generator_fromarray-audiokit -> rc=0
77-
../examples/examples-audiokit/streams-generator_mixer-audiokit -> rc=0
85+
../examples/examples-audiokit/streams-generator_inputmixer-audiokit -> rc=0
86+
../examples/examples-audiokit/streams-generator_outputmixer-audiokit -> rc=0
7887
../examples/examples-audiokit/streams-generator_sinfromtable-audiokit -> rc=0
88+
../examples/examples-audiokit/streams-memory_mp3-audiokit -> rc=0
7989
../examples/examples-audiokit/streams-pins-audiokit -> rc=0
8090
../examples/examples-audiokit/streams-synth-a2dp -> rc=0
8191
../examples/examples-audiokit/streams-synth-audiokit -> rc=0
@@ -114,3 +124,7 @@
114124
../examples/examples-tts/streams-sam-i2s -> rc=0
115125
../examples/examples-tts/streams-simple_tts-i2s -> rc=0
116126
../examples/examples-tts/streams-tts-i2s -> rc=0
127+
../examples/examples-faust/streams-faust_flute-i2s -> rc=0
128+
../examples/examples-faust/streams-faust_noise-i2s -> rc=0
129+
../examples/examples-faust/streams-generator-faust-i2s -> rc=0
130+
../examples/examples-faust/streams-i2s-faust_guitarix-i2s -> rc=0

examples/build-examples.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ compile_example "esp32:esp32:esp32" "../examples/examples-audiokit/*"
3636
compile_example "esp32:esp32:esp32" "../examples/examples-maximilian/*"
3737
compile_example "esp32:esp32:esp32" "../examples/examples-tts/streams*"
3838
compile_example "esp32:esp32:esp32" "../examples/examples-faust/streams*"
39-
compile_example "esp32:esp32:esp32" "../examples/examples-communication/communication*"
39+
#compile_example "esp32:esp32:esp32" "../examples/examples-communication/*"
4040
#compile_example "esp32:esp32:esp32" "../examples/tests/test*"
4141

examples/examples-basic-api/base-adc-a2dp/base-adc-a2dp.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ ConverterScaler<int16_t> scaler(1.0, -26427, 32700 );
2525
int32_t get_sound_data(Frame* frames, int32_t frameCount) {
2626
uint8_t *data = (uint8_t*)frames;
2727
int frameSize = 4;
28-
size_t len = count * channels * sizeof(int16_t);
2928
size_t resultBytes = adc.readBytes(data, frameCount*frameSize);
3029
scaler.convert(data, resultBytes);
3130
return resultBytes/frameSize;

examples/examples-faust/streams-generator-faust-i2s/streams-generator-faust-i2s.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ SineWaveGenerator<int16_t> sineWave(32000); // subclass of SoundG
1818
GeneratedSoundStream<int16_t> sound(sineWave); // Stream generated from sine wave
1919
mydsp dsp;
2020
AudioKitStream out;
21-
FaustStream faust(dsp, out);
21+
FaustStream<mydsp> faust(out);
2222
StreamCopy copier(faust, sound); // copy mic to tfl
2323

2424
// Arduino Setup

examples/examples-stream/streams-i2s-serial/streams-i2s-serial.ino

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
#include "AudioTools.h"
1212

13-
13+
int channels = 2;
1414
I2SStream i2sStream; // Access I2S as stream
15-
CsvStream<int32_t> csvStream(Serial);
15+
CsvStream<int32_t> csvStream(Serial, channels);
1616
StreamCopy copier(csvStream, i2sStream); // copy i2sStream to csvStream
1717

1818
// Arduino Setup
@@ -23,7 +23,7 @@ void setup(void) {
2323
auto cfg = i2sStream.defaultConfig(RX_MODE);
2424
cfg.i2s_format = I2S_STD_FORMAT; // or try with I2S_LSB_FORMAT
2525
cfg.bits_per_sample = 32;
26-
cfg.channels = 2;
26+
cfg.channels = channels;
2727
cfg.sample_rate = 44100;
2828
cfg.is_master = true;
2929
// this module nees a master clock if the ESP32 is master

0 commit comments

Comments
 (0)