Skip to content

Commit 5d2d684

Browse files
committed
FFT compile errors
1 parent a1ecd88 commit 5d2d684

File tree

5 files changed

+24
-8
lines changed

5 files changed

+24
-8
lines changed

examples/build-examples-log.txt

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
../examples/examples-stream/streams-generator-i2s -> rc=0
2121
../examples/examples-stream/streams-generator-merge-pwm -> rc=0
2222
../examples/examples-stream/streams-generator-pwm -> rc=0
23+
../examples/examples-stream/streams-generator-r2r -> rc=0
2324
../examples/examples-stream/streams-generator-serial -> rc=0
2425
../examples/examples-stream/streams-generator-spdif -> rc=0
2526
../examples/examples-stream/streams-generator-timedstream-serial -> rc=0
@@ -81,8 +82,8 @@
8182
../examples/examples-audiokit/streams-synthstk-audiokit -> rc=0
8283
../examples/examples-audiokit/streams-tf-audiokit -> rc=0
8384
../examples/examples-tts/streams-azure_tts-i2s -> rc=0
84-
../examples/examples-tts/streams-espeak-audiokit -> rc=1
85-
../examples/examples-tts/streams-espeak-i2s -> rc=1
85+
../examples/examples-tts/streams-espeak-audiokit -> rc=0
86+
../examples/examples-tts/streams-espeak-i2s -> rc=0
8687
../examples/examples-tts/streams-flite-audiokit -> rc=1
8788
../examples/examples-tts/streams-flite-i2s -> rc=1
8889
../examples/examples-tts/streams-google-audiokit -> rc=0
@@ -191,7 +192,7 @@
191192
../examples/examples-communication/http-client/player-url_icy-audiokit -> rc=0
192193
../examples/examples-communication/http-client/player-url_icy-i2s -> rc=0
193194
../examples/examples-communication/http-client/player-url_subclass-i2s -> rc=0
194-
../examples/examples-communication/http-client/streams-eth_url_mp3_helix-i2s -> rc=1
195+
../examples/examples-communication/http-client/streams-eth_url_mp3_helix-i2s -> rc=0
195196
../examples/examples-communication/http-client/streams-http_post -> rc=0
196197
../examples/examples-communication/http-client/streams-url_aac-audiokit -> rc=0
197198
../examples/examples-communication/http-client/streams-url_aac-i2s -> rc=0
@@ -232,8 +233,11 @@
232233
../examples/tests/adc/read-speed -> rc=0
233234
../examples/tests/basic/24bits-write -> rc=0
234235
../examples/tests/basic/test-allocator -> rc=0
236+
../examples/tests/basic/test-buffer -> rc=0
237+
../examples/tests/basic/test-queue -> rc=0
235238
../examples/tests/basic/test-vector -> rc=0
236239
../examples/tests/codecs/test-codec-aac-fdk -> rc=0
240+
../examples/tests/codecs/test-codec-aac-fdk-dec -> rc=0
237241
../examples/tests/codecs/test-codec-adpcm -> rc=0
238242
../examples/tests/codecs/test-codec-adpcm-xq -> rc=0
239243
../examples/tests/codecs/test-codec-aptx -> rc=0
@@ -253,6 +257,7 @@
253257
../examples/tests/codecs/test-codec-opus -> rc=0
254258
../examples/tests/codecs/test-codec-opusogg -> rc=0
255259
../examples/tests/codecs/test-codec-sbc -> rc=0
260+
../examples/tests/codecs/test-codec-wav-adpcm -> rc=0
256261
../examples/tests/codecs/test-compile-all -> rc=0
257262
../examples/tests/codecs/test-container-binary -> rc=0
258263
../examples/tests/codecs/test-container-binary-meta -> rc=0
@@ -263,10 +268,12 @@
263268
../examples/tests/codecs/test-mp3-mad -> rc=0
264269
../examples/tests/codecs/test-streaming-adapter -> rc=0
265270
../examples/tests/communications/* -> rc=1
271+
../examples/tests/concurrency/audio-test -> rc=0
272+
../examples/tests/concurrency/BufferRTOS -> rc=0
266273
../examples/tests/concurrency/NBuffer -> rc=0
267-
../examples/tests/concurrency/synchBufferRTOS -> rc=0
268274
../examples/tests/concurrency/synchNBuffer -> rc=0
269275
../examples/tests/concurrency/synchRingBuffer -> rc=0
276+
../examples/tests/concurrency/SynchronizedNBuffer -> rc=0
270277
../examples/tests/conversion/channel-converter-avg -> rc=0
271278
../examples/tests/conversion/channel-converter-bin -> rc=0
272279
../examples/tests/conversion/channel-converter-bindiff -> rc=0

examples/build-examples.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function compile_example {
1919
echo "Processing $f ..."
2020
# take action on each file. $f store current file name
2121
#arduino-cli compile -b "$ARCH" "$f"
22-
arduino-cli compile -b "$ARCH" --build-property "build.partitions=huge_app" --build-property "upload.maximum_size=3145728" "$f"
22+
arduino-cli compile -b "$ARCH" --build-property "build.partitions=rainmaker" --build-property "upload.maximum_size=3145728" "$f"
2323
EC=$?
2424
#if [ $EC -ne 0 ]; then
2525
#break

src/AudioLibs/AudioEspressifFFT.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,13 @@ class FFTDriverEspressifFFT : public FFTDriver {
4545

4646
void setValue(int idx, float value) override {
4747
if (idx<len){
48-
p_data[idx*2 + 0] = value;
48+
p_data[idx*2] = value;
4949
p_data[idx*2 + 1] = 0.0f;
5050
}
5151
}
5252

53+
float getValue(int idx) override { return p_data[idx * 2]; }
54+
5355
void fft() override {
5456
ret = dsps_fft2r_fc32(p_data, len);
5557
if (ret != ESP_OK){
@@ -109,6 +111,9 @@ class FFTDriverEspressifFFT : public FFTDriver {
109111
p_data[pos*2+1] = img;
110112
return true;
111113
}
114+
115+
bool setBin(int pos, FFTBin &bin) { return FFTDriver::setBin(pos, bin);}
116+
112117
bool getBin(int pos, FFTBin &bin) override {
113118
if (pos>=len) return false;
114119
bin.real = p_data[pos*2];

src/AudioLibs/AudioFFT.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ struct FFTBin {
6262
float real;
6363
float img;
6464

65+
FFTBin() = default;
66+
6567
FFTBin(float r, float i) {
6668
real = r;
6769
img = i;

src/AudioLibs/AudioKissFFT.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ class FFTDriverKissFFT : public FFTDriver {
6464

6565
bool isReverseFFT() override {return true;}
6666

67-
float getValue(int idx) override { return p_data[idx].r };
67+
float getValue(int idx) override { return p_data[idx].r; }
68+
69+
bool setBin(int pos, FFTBin &bin) { return FFTDriver::setBin(pos, bin);}
6870

6971
bool setBin(int pos, float real, float img) override {
7072
if (pos>=len) return false;
@@ -74,7 +76,7 @@ class FFTDriverKissFFT : public FFTDriver {
7476
}
7577
bool getBin(int pos, FFTBin &bin) override {
7678
if (pos>=len) return false;
77-
bin.real = p_data[idx].r;
79+
bin.real = p_data[pos].r;
7880
bin.img = p_data[idx].i;
7981
return true;
8082
}

0 commit comments

Comments
 (0)