Merge pull request #465 from pschatzmann/nov-2022

Nov 2022

Author: pschatzmann

README.md

@@ -153,14 +153,14 @@ Dependent on the example you might need to install some of the following librari
 Get some inspiration [from projects that were using this library](https://github.com/pschatzmann/arduino-audio-tools/discussions/categories/show-and-tell) or share your projects with the community.
 
 
-### Documentation
+## Documentation
 
 - Here is the generated [Class Documentation](https://pschatzmann.github.io/arduino-audio-tools/html/namespaceaudio__tools.html). 
 - Please also check out the [Information in the Wiki](https://github.com/pschatzmann/arduino-audio-tools/wiki)
 - You also might find further information in [one of my Blogs](https://www.pschatzmann.ch/home/category/machine-sound/)
 
 
-### Installation in Arduino
+## Installation in Arduino
 
 You can download the library as zip and call include Library -> zip library. Or you can git clone this project into the Arduino libraries folder e.g. with
 
@@ -170,5 +170,12 @@ git clone pschatzmann/arduino-audio-tools.git
 ```
 
 I recommend to use git because you can easily update to the latest version just by executing the ```git pull``` command in the project folder.
-
 If you want to use the library in PlatformIO, you can find a [detailed description in the Wiki](https://github.com/pschatzmann/arduino-audio-tools/wiki/Working-with-PlatformIO).
+
+
+## Sponsor Me
+
+This software is totally free, but you can make me happy by rewarding me with a treat
+
+- [Buy me a caffee](https://www.buymeacoffee.com/philschatzh)
+- [Paypal me](https://paypal.me/pschatzmann?country.x=CH&locale.x=en_US)

examples/build-examples-log.txt

@@ -1,9 +1,11 @@
 ../examples/examples-basic-api/base-adc-a2dp -> rc=0
 ../examples/examples-basic-api/base-adc-serial -> rc=0
-../examples/examples-basic-api/base-file_raw-serial -> rc=1/0
+../examples/examples-basic-api/base-file_raw-serial -> rc=1
 ../examples/examples-basic-api/base-i2s-a2dp -> rc=0
-../examples/examples-player/player-callback-i2s -> rc=1/0
-../examples/examples-player/player-sdfat-a2dp -> rc=0
+../examples/examples-player/player-callback-i2s -> rc=1
+../examples/examples-player/player-littlefs-i2s -> rc=1
+../examples/examples-player/player-sd-i2s -> rc=1
+../examples/examples-player/player-sdfat-a2dp -> rc=1
 ../examples/examples-player/player-sdfat-analog -> rc=0
 ../examples/examples-player/player-sdfat-i2s -> rc=0
 ../examples/examples-player/player-url-i2s -> rc=0
@@ -12,42 +14,42 @@
 ../examples/examples-webserver/streams-effect-webserver_wav -> rc=0
 ../examples/examples-webserver/streams-flite-webserver_wav -> rc=0
 ../examples/examples-webserver/streams-generator-webserver_wav -> rc=0
-../examples/examples-webserver/streams-generator-webserverex_wav -> rc=1/1
-../examples/examples-webserver/streams-generator-webserverex_wav1 -> rc=1/1
+../examples/examples-webserver/streams-generator-webserverex_wav -> rc=1
+../examples/examples-webserver/streams-generator-webserverex_wav1 -> rc=1
 ../examples/examples-webserver/streams-i2s-webserver_wav -> rc=0
 ../examples/examples-webserver/streams-sam-webserver_wav -> rc=0
 ../examples/examples-webserver/streams-tts-webserver_wav -> rc=0
-../examples/examples-stream/streams-a2dp-serial -> rc=0
+../examples/examples-stream/streams-a2dp-serial -> rc=1
 ../examples/examples-stream/streams-adc-i2s -> rc=0
 ../examples/examples-stream/streams-adc-serial -> rc=0
 ../examples/examples-stream/streams-adsr-i2s -> rc=0
-../examples/examples-stream/streams-generator-a2dp -> rc=0
+../examples/examples-stream/streams-generator-a2dp -> rc=1
 ../examples/examples-stream/streams-generator-analog -> rc=0
 ../examples/examples-stream/streams-generator-i2s -> rc=0
-../examples/examples-stream/streams-generator-pwm -> rc=0
+../examples/examples-stream/streams-generator-pwm -> rc=1
 ../examples/examples-stream/streams-generator-serial -> rc=0
 ../examples/examples-stream/streams-generator-spdif -> rc=0
 ../examples/examples-stream/streams-generator_fromarray-analog -> rc=0
-../examples/examples-stream/streams-i2s-a2dp -> rc=0
+../examples/examples-stream/streams-i2s-a2dp -> rc=1
 ../examples/examples-stream/streams-i2s-filter-i2s -> rc=0
 ../examples/examples-stream/streams-i2s-i2s -> rc=0
 ../examples/examples-stream/streams-i2s-i2s-2 -> rc=0
-../examples/examples-stream/streams-i2s-serial -> rc=1/1
+../examples/examples-stream/streams-i2s-serial -> rc=1
 ../examples/examples-stream/streams-i2s-serial_16bit -> rc=0
 ../examples/examples-stream/streams-i2s-tf -> rc=0
 ../examples/examples-stream/streams-memory_mp3-analog -> rc=0
 ../examples/examples-stream/streams-memory_mp3-metadata -> rc=0
-../examples/examples-stream/streams-memory_mp3-pwm -> rc=0
+../examples/examples-stream/streams-memory_mp3-pwm -> rc=1
 ../examples/examples-stream/streams-memory_mp3_short-i2s -> rc=0
 ../examples/examples-stream/streams-memory_mp3_short-i2s-2 -> rc=0
 ../examples/examples-stream/streams-memory_raw-i2s -> rc=0
-../examples/examples-stream/streams-memory_wav-pwm -> rc=0
+../examples/examples-stream/streams-memory_wav-pwm -> rc=1
 ../examples/examples-stream/streams-memory_wav-serial -> rc=0
 ../examples/examples-stream/streams-mp34dt05-serial -> rc=1
 ../examples/examples-stream/streams-sd_mp3-i2s -> rc=1
 ../examples/examples-stream/streams-sdfat_mp3-metadata -> rc=0
 ../examples/examples-stream/streams-tf-i2s -> rc=0
-../examples/examples-stream/streams-url-file -> rc=1/0
+../examples/examples-stream/streams-url-file -> rc=1
 ../examples/examples-stream/streams-url_aac-i2s -> rc=0
 ../examples/examples-stream/streams-url_flac-i2s -> rc=0
 ../examples/examples-stream/streams-url_mp3-analog -> rc=0
@@ -59,72 +61,20 @@
 ../examples/examples-stream/streams-url_raw-serial -> rc=0
 ../examples/examples-stream/streams-url_vorbis_i2s -> rc=0
 ../examples/examples-stream/streams-url_wav-i2s -> rc=0
+../examples/examples-audiokit/audiokit-effects-audiokit -> rc=0
 ../examples/examples-audiokit/basic-a2dp-audiokit -> rc=0
 ../examples/examples-audiokit/basic-a2dp-eq-audiokit -> rc=0
 ../examples/examples-audiokit/basic-audiokit-a2dp -> rc=0
-../examples/examples-audiokit/player-sd-audiokit -> rc=1/0
+../examples/examples-audiokit/player-sd-audiokit -> rc=1
 ../examples/examples-audiokit/player-sd_a2dp-audiokit -> rc=0
 ../examples/examples-audiokit/player-sdfat-audiokit -> rc=0
 ../examples/examples-audiokit/player-sdmmc-audiokit -> rc=0
 ../examples/examples-audiokit/player-url_icy-audiokit -> rc=0
 ../examples/examples-audiokit/streams-audiokit-audiokit -> rc=0
 ../examples/examples-audiokit/streams-audiokit-fft -> rc=0
-../examples/examples-audiokit/streams-audiokit-fft-frequp -> rc=0
 ../examples/examples-audiokit/streams-audiokit-filter-audiokit -> rc=0
 ../examples/examples-audiokit/streams-audiokit-multioutput -> rc=0
 ../examples/examples-audiokit/streams-audiokit-multioutput-server -> rc=0
 ../examples/examples-audiokit/streams-audiokit-ram-audiokit -> rc=0
-../examples/examples-audiokit/streams-audiokit-sd-audiokit -> rc=1/0
+../examples/examples-audiokit/streams-audiokit-sd-audiokit -> rc=1
 ../examples/examples-audiokit/streams-audiokit-serial -> rc=0
-../examples/examples-audiokit/streams-audiokit-tf -> rc=0
-../examples/examples-audiokit/streams-audiokit-webserver_aac -> rc=0
-../examples/examples-audiokit/streams-audiokit-webserver_mp3 -> rc=0
-../examples/examples-audiokit/streams-audiokit-webserver_wav -> rc=0
-../examples/examples-audiokit/streams-generator-audiokit -> rc=0
-../examples/examples-audiokit/streams-generator_fromarray-audiokit -> rc=0
-../examples/examples-audiokit/streams-generator_inputmixer-audiokit -> rc=0
-../examples/examples-audiokit/streams-generator_outputmixer-audiokit -> rc=0
-../examples/examples-audiokit/streams-generator_sinfromtable-audiokit -> rc=0
-../examples/examples-audiokit/streams-memory_mp3-audiokit -> rc=0
-../examples/examples-audiokit/streams-pins-audiokit -> rc=0
-../examples/examples-audiokit/streams-synth-a2dp -> rc=0
-../examples/examples-audiokit/streams-synth-audiokit -> rc=0
-../examples/examples-audiokit/streams-synthbasic1-audiokit -> rc=0
-../examples/examples-audiokit/streams-synthbasic2-audiokit -> rc=0
-../examples/examples-audiokit/streams-synthbasic3-audiokit -> rc=0
-../examples/examples-audiokit/streams-synthstk-audiokit -> rc=0
-../examples/examples-audiokit/streams-tf-audiokit -> rc=0
-../examples/examples-audiokit/streams-url_aac-audiokit -> rc=0
-../examples/examples-audiokit/streams-url_mp3-audiokit -> rc=0
-../examples/examples-maximilian/01-TestTone -> rc=0
-../examples/examples-maximilian/02-TwoTones -> rc=0
-../examples/examples-maximilian/03-AM1 -> rc=0
-../examples/examples-maximilian/04-AM2 -> rc=0
-../examples/examples-maximilian/05-FM1 -> rc=0
-../examples/examples-maximilian/06-FM2 -> rc=0
-../examples/examples-maximilian/07-Counting1 -> rc=0
-../examples/examples-maximilian/08-Counting2 -> rc=0
-../examples/examples-maximilian/08-Counting3 -> rc=0
-../examples/examples-maximilian/08-Counting4 -> rc=0
-../examples/examples-maximilian/09-Envelopes -> rc=0
-../examples/examples-maximilian/10-Filters -> rc=0
-../examples/examples-maximilian/11-Mixing -> rc=0
-../examples/examples-maximilian/12-SamplePlayer -> rc=0
-../examples/examples-maximilian/13-AdvancedFilters -> rc=0
-../examples/examples-maximilian/14-MonoSynth -> rc=0
-../examples/examples-maximilian/15-PolySynth -> rc=0
-../examples/examples-maximilian/16-Replicant -> rc=0
-../examples/examples-maximilian/17-Compressor -> rc=0
-../examples/examples-maximilian/18-DrumMachine -> rc=0
-../examples/examples-maximilian/19-Enveloping2 -> rc=0
-../examples/examples-maximilian/20-FFT -> rc=0
-../examples/examples-tts/streams-flite-audiokit -> rc=0
-../examples/examples-tts/streams-flite-i2s -> rc=0
-../examples/examples-tts/streams-sam-audiokit -> rc=0
-../examples/examples-tts/streams-sam-i2s -> rc=0
-../examples/examples-tts/streams-simple_tts-i2s -> rc=0
-../examples/examples-tts/streams-tts-i2s -> rc=0
-../examples/examples-faust/streams-faust_flute-i2s -> rc=0
-../examples/examples-faust/streams-faust_noise-i2s -> rc=0
-../examples/examples-faust/streams-generator-faust-i2s -> rc=0
-../examples/examples-faust/streams-i2s-faust_guitarix-i2s -> rc=0

examples/examples-player/player-littlefs-i2s/data/file_example_MP3_700KB.mp3

@@ -0,0 +1,43 @@
+/**
+ * @file player-littlefs-i2s.ino
+ * @brief example using the LittleFS library
+ * 
+ * @author Phil Schatzmann
+ * @copyright GPLv3
+ */
+
+#include "AudioTools.h"
+#include "AudioLibs/AudioSourceLittleFS.h"
+#include "AudioCodecs/CodecMP3Helix.h"
+
+const char *startFilePath="/";
+const char* ext="mp3";
+AudioSourceLittleFS source(startFilePath, ext);
+I2SStream i2s;
+MP3DecoderHelix decoder;
+AudioPlayer player(source, i2s, decoder);
+
+void printMetaData(MetaDataType type, const char* str, int len){
+  Serial.print("==> ");
+  Serial.print(toStr(type));
+  Serial.print(": ");
+  Serial.println(str);
+}
+
+void setup() {
+  Serial.begin(115200);
+  AudioLogger::instance().begin(Serial, AudioLogger::Info);
+
+  // setup output
+  auto cfg = i2s.defaultConfig(TX_MODE);
+  i2s.begin(cfg);
+
+  // setup player
+  //source.setFileFilter("*Bob Dylan*");
+  player.setMetadataCallback(printMetaData);
+  player.begin();
+}
+
+void loop() {
+  player.copy();
+}

examples/examples-player/player-littlefs-i2s/player-littlefs-i2s.ino

@@ -0,0 +1,43 @@
+/**
+ * @file player-littlefs-i2s.ino
+ * @brief example using the SD library
+ * 
+ * @author Phil Schatzmann
+ * @copyright GPLv3
+ */
+
+#include "AudioTools.h"
+#include "AudioLibs/AudioSourceSD.h"
+#include "AudioCodecs/CodecMP3Helix.h"
+
+const char *startFilePath="/";
+const char* ext="mp3";
+AudioSourceSD source(startFilePath, ext);
+I2SStream i2s;
+MP3DecoderHelix decoder;
+AudioPlayer player(source, i2s, decoder);
+
+void printMetaData(MetaDataType type, const char* str, int len){
+  Serial.print("==> ");
+  Serial.print(toStr(type));
+  Serial.print(": ");
+  Serial.println(str);
+}
+
+void setup() {
+  Serial.begin(115200);
+  AudioLogger::instance().begin(Serial, AudioLogger::Info);
+
+  // setup output
+  auto cfg = i2s.defaultConfig(TX_MODE);
+  i2s.begin(cfg);
+
+  // setup player
+  //source.setFileFilter("*Bob Dylan*");
+  player.setMetadataCallback(printMetaData);
+  player.begin();
+}
+
+void loop() {
+  player.copy();
+}

examples/examples-player/player-sd-i2s/player-sd-i2s.ino

@@ -15,7 +15,7 @@
 const char *startFilePath="/";
 const char* ext="mp3";
 AudioSourceSDFAT source(startFilePath, ext);
-A2DPStream out = A2DPStream::instance();  // A2DP input - A2DPStream is a singleton!
+A2DPStream out;
 MP3DecoderHelix decoder;
 AudioPlayer player(source, out, decoder);
 

examples/examples-player/player-sdfat-a2dp/player-sdfat-a2dp.ino

@@ -12,7 +12,7 @@
 #include "AudioLibs/AudioA2DP.h"
 
 
-A2DPStream in = A2DPStream::instance() ; // A2DP input - A2DPStream is a singleton!
+A2DPStream in;
 CsvStream<int16_t> out(Serial, 2); // ASCII stream as csv 
 StreamCopy copier(out, in); // copy in to out
 

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

@@ -16,7 +16,7 @@ uint16_t sample_rate=44100;
 uint8_t channels = 2;                                     // The stream will have 2 channels 
 SineWaveGenerator<sound_t> sineWave(32000);               // subclass of SoundGenerator with max amplitude of 32000
 GeneratedSoundStream<sound_t> in(sineWave);               // Stream generated from sine wave
-A2DPStream out = A2DPStream::instance() ;                 // A2DP input - A2DPStream is a singleton!
+A2DPStream out;                                           // A2DP output
 StreamCopy copier(out, in); // copy in to out
 
 // Arduino Setup

examples/examples-stream/streams-generator-a2dp/streams-generator-a2dp.ino

@@ -11,7 +11,7 @@
 #include "AudioLibs/AudioA2DP.h"
 
 I2SStream i2sStream;                            // Access I2S as stream
-A2DPStream a2dpStream = A2DPStream::instance(); // access A2DP as stream
+A2DPStream a2dpStream;                          // access A2DP as stream
 VolumeStream volume(a2dpStream);
 StreamCopy copier(volume, i2sStream); // copy i2sStream to a2dpStream
 ConverterFillLeftAndRight<int16_t> filler(LeftIsEmpty); // fill both channels

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

@@ -17,7 +17,7 @@ const char *startFilePath="/";
 const char* ext="mp3";
 SdSpiConfig sdcfg(PIN_AUDIO_KIT_SD_CARD_CS, DEDICATED_SPI, SD_SCK_MHZ(10) , &AUDIOKIT_SD_SPI);
 AudioSourceSDFAT source(startFilePath, ext, sdcfg);
-A2DPStream out = A2DPStream::instance();  // A2DP input - A2DPStream is a singleton!
+A2DPStream out;    // A2DP input - A2DPStream is a singleton!
 MP3DecoderHelix decoder;
 AudioPlayer player(source, out, decoder);