Many corrections

pschatzmann · pschatzmann · commit d8542708bcee · 2024-10-22T10:52:25.000+02:00
diff --git a/README.md b/README.md
@@ -75,7 +75,7 @@ If we record the words in mp3 we might even get away with the need for a separat
 
 ```
 #include "SimpleTTS.h"
-#include "AudioCodecs/CodecMP3Helix.h"
+#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
 
 I2SStream i2s;  // audio output via I2S
 MP3DecoderHelix mp3;  // mp3 decoder
@@ -103,7 +103,7 @@ You can also use the text generation classes described above:
 
 ```
 #include "SimpleTTS.h"
-#include "AudioCodecs/CodecMP3Helix.h"
+#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
 
 TimeToText ttt; // Text source
 I2SStream i2s;  // audio output via I2S
@@ -151,5 +151,5 @@ Further information can be found in the [Wiki](https://github.com/pschatzmann/ar
 - [Arduino Audio Tools](https://github.com/pschatzmann/arduino-audio-tools) - mandatory
 - [arduino-libhelix](https://github.com/pschatzmann/arduino-libhelix) A __MP3 and AAC Decoder__ from Realnetworks - mandatory if you use the mp3 of the examles 
 - [SdFat Library](https://github.com/greiman/SdFat) - optional for SD examples (or you can use the SD library instead: see Wiki)
-- [Arduino AudioKit](https://github.com/pschatzmann/arduino-audiokit) - optional if you use the AudioKit (alternatively you can just replace the AudioKitStream in the examples with e.g. an I2SStream)
+- [Arduino AudioKit](https://github.com/pschatzmann/arduino-audiokit) - optional if you use the AudioKit (alternatively you can just replace the AudioBoardStream in the examples with e.g. an I2SStream)
   
diff --git a/docs/html/index.html b/docs/html/index.html
@@ -180,7 +180,7 @@ <h1><a class="anchor" id="autotoc_md8"></a>
 <li><a href="https://github.com/pschatzmann/arduino-audio-tools">Arduino Audio Tools</a> - mandatory</li>
 <li><a href="https://github.com/pschatzmann/arduino-libhelix">arduino-libhelix</a> A <b>MP3 and AAC Decoder</b> from Realnetworks - mandatory if you use the mp3 of the examles</li>
 <li><a href="https://github.com/greiman/SdFat">SdFat Library</a> - optional for SD examples (or you can use the SD library instead: see Wiki)</li>
-<li><a href="https://github.com/pschatzmann/arduino-audiokit">Arduino AudioKit</a> - optional if you use the AudioKit (alternatively you can just replace the AudioKitStream in the examples with e.g. an I2SStream) </li>
+<li><a href="https://github.com/pschatzmann/arduino-audiokit">Arduino AudioKit</a> - optional if you use the AudioKit (alternatively you can just replace the AudioBoardStream in the examples with e.g. an I2SStream) </li>
 </ul>
 </div></div><!-- PageDoc -->
 </div><!-- contents -->
diff --git a/examples/audio-analog/audio-analog.ino b/examples/audio-analog/audio-analog.ino
@@ -10,7 +10,7 @@
  */
 
 #include "SimpleTTS.h"
-#include "AudioCodecs/CodecMP3Helix.h"
+#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
 
 AnalogAudioStream out;
 VolumeStream volume(out);
diff --git a/examples/audio-i2s-nosilence/Desktop.h b/examples/audio-i2s-nosilence/Desktop.h
@@ -7,5 +7,5 @@
 #ifdef IS_DESKTOP
 #include "AudioLibs/PortAudioStream.h"
 #define I2SStream PortAudioStream 
-#define AudioKitStream PortAudioStream
+#define AudioBoardStream PortAudioStream
 #endif
diff --git a/examples/audio-i2s-nosilence/audio-i2s-nosilence.ino b/examples/audio-i2s-nosilence/audio-i2s-nosilence.ino
@@ -10,10 +10,10 @@
  */
 
 #include "SimpleTTS.h"
-#include "AudioCodecs/CodecMP3Helix.h"
+#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
 #include "Desktop.h"
 
-I2SStream i2s;
+I2SStream out;
 VolumeStream volume(i2s);
 SilenceRemovalConverter<int16_t> rem(8, 2);
 ConvertedStream<int16_t,SilenceRemovalConverter<int16_t>> out(volume, rem); 
@@ -29,10 +29,10 @@ void setup(){
     Serial.begin(115200);
     AudioLogger::instance().begin(Serial, AudioLogger::Info);
     // setup out
-    auto cfg = i2s.defaultConfig(); 
+    auto cfg = out.defaultConfig(); 
     cfg.sample_rate = 24000;
     cfg.channels = 1;
-    i2s.begin(cfg);
+    out.begin(cfg);
 
     // define volume
     volume.setVolume(0.6);
diff --git a/examples/audio-i2s-queue/audio-i2s-queue.ino b/examples/audio-i2s-queue/audio-i2s-queue.ino
@@ -10,7 +10,7 @@
  */
 
 #include "SimpleTTS.h"
-#include "AudioCodecs/CodecMP3Helix.h"
+#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
 
 I2SStream out;
 VolumeStream volume(out);
diff --git a/examples/audio-i2s/audio-i2s.ino b/examples/audio-i2s/audio-i2s.ino
@@ -10,7 +10,7 @@
  */
 
 #include "SimpleTTS.h"
-#include "AudioCodecs/CodecMP3Helix.h"
+#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
 
 I2SStream out;
 VolumeStream volume(out);
diff --git a/examples/audio-pwm/audio-pwm.ino b/examples/audio-pwm/audio-pwm.ino
@@ -10,7 +10,7 @@
  */
 
 #include "SimpleTTS.h"
-#include "AudioCodecs/CodecMP3Helix.h"
+#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
 
 PWMAudioStream out;
 VolumeStream volume(out);
diff --git a/examples/example-own-sound/example-own-sound.ino b/examples/example-own-sound/example-own-sound.ino
@@ -1,10 +1,10 @@
 #define NO_AUDIO_EXAMPLES
 #include "SimpleTTS.h"
-#include "AudioCodecs/CodecMP3Helix.h"
+#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
 #include "speechArray.h"
 //#include "Desktop.h" // some special logic for desktop builds
 
-I2SStream i2s;
+I2SStream out;
 VolumeStream volume(i2s);
 //SilenceRemovalConverter<int16_t> rem(8, 2);
 //ConvertedStream<int16_t, SilenceRemovalConverter<int16_t>> out(volume, rem);
@@ -19,11 +19,11 @@ void setup() {
   AudioLogger::instance().begin(Serial, AudioLogger::Info);
 
   // setup out
-  auto cfg = i2s.defaultConfig();
+  auto cfg = out.defaultConfig();
   cfg.i2s_format = I2S_LSB_FORMAT;  //or I2S_STD_FORMAT
   cfg.sample_rate = 24000;
   cfg.channels = 1;
-  i2s.begin(cfg);
+  out.begin(cfg);
 
   // setting the volume
   volume.setVolume(0.2);
diff --git a/examples/number-to-speech/Desktop.h b/examples/number-to-speech/Desktop.h
@@ -7,5 +7,5 @@
 #ifdef IS_DESKTOP
 #include "AudioLibs/PortAudioStream.h"
 #define I2SStream PortAudioStream 
-#define AudioKitStream PortAudioStream
+#define AudioBoardStream PortAudioStream
 #endif
diff --git a/examples/number-to-speech/number-to-speech.ino b/examples/number-to-speech/number-to-speech.ino
@@ -4,7 +4,7 @@
  * @brief Demo that translates numbers into speech
  * I tested the sketch with an AudioKit. If you want to use it with a regular micrcontroller
  * - remove the include "AudioLibs/AudioKit.h"
- * - replace the  AudioKitStream with I2SStream, AnalogAudioStream, PMWAudioStream
+ * - replace the  AudioBoardStream with I2SStream, AnalogAudioStream, PMWAudioStream
  * @version 0.1
  * @date 2022-02-16
  * 
@@ -13,15 +13,15 @@
  */
 
 #include "SimpleTTS.h"
-#include "AudioCodecs/CodecMP3Helix.h"
+#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
 #include "Desktop.h" // some special logic for desktop builds
 
 #ifndef IS_DESKTOP
-#include "AudioLibs/AudioKit.h"
+#include "AudioTools/AudioLibs/AudioBoardStream.h"
 #endif
 
 NumberToText ntt;
-AudioKitStream out; // Replace with desired class e.g. I2SStream
+AudioBoardStream out(AudioKitEs8388V1); // Replace with desired class e.g. I2SStream
 MP3DecoderHelix mp3;
 AudioDictionary dictionary(ExampleAudioDictionaryValues);
 TextToSpeech tts(ntt, out, mp3, dictionary);
diff --git a/examples/talking-clock/talking-clock.ino b/examples/talking-clock/talking-clock.ino
@@ -9,16 +9,16 @@
  * 
  */
 #include "SimpleTTS.h"
-#include "AudioCodecs/CodecMP3Helix.h"
+#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
 #include "time/TimeInfoESP32.h" // or alternative TimeInfoRTC.h
-#include "AudioLibs/AudioKit.h"
+#include "AudioTools/AudioLibs/AudioBoardStream.h"
 
 // Output
 TimeToText ttt;
-AudioKitStream i2s; // replace with alterntive Audio Sink if needed: AnalogAudioStream, I2SStream etc.
+AudioBoardStream out(AudioKitEs8388V1); // replace with alterntive Audio Sink if needed: AnalogAudioStream, I2SStream etc.
 MP3DecoderHelix mp3;
 AudioDictionary dictionary(ExampleAudioDictionaryValues);
-TextToSpeech tts(ttt, i2s, mp3, dictionary);
+TextToSpeech tts(ttt, out, mp3, dictionary);
 
 // Determine Time
 TimeInfo timeInfo;
@@ -30,10 +30,10 @@ void setup() {
   AudioLogger::instance().begin(Serial, AudioLogger::Info);
 
   // setup i2s
-  auto cfg = i2s.defaultConfig();
+  auto cfg = out.defaultConfig();
   cfg.sample_rate = 24000;
   cfg.channels = 1;
-  i2s.begin(cfg);
+  out.begin(cfg);
 
   // We announce the time only every 5 minutes
   timeInfo.setEveryMinutes(5);
diff --git a/examples/time-to-speech-sd/time-to-speech-sd.ino b/examples/time-to-speech-sd/time-to-speech-sd.ino
@@ -5,7 +5,7 @@
  * @brief Test sketch which announces the indicated time. 
  * I tested the sketch with an AudioKit. If you want to use it with a regular micrcontroller
  * - remove the include "AudioLibs/AudioKit.h"
- * - replace the  AudioKitStream with I2SStream, AnalogAudioStream, PMWAudioStream
+ * - replace the  AudioBoardStream with I2SStream, AnalogAudioStream, PMWAudioStream
  * @version 0.1
  * @date 2022-02-16
  * 
@@ -15,17 +15,17 @@
 #include "AudioTools.h"
 #include "SimpleTTS.h"
 #include "AudioDictionarySD.h"
-#include "AudioCodecs/CodecMP3Helix.h"
+#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
 
 #ifndef IS_DESKTOP
-#include "AudioLibs/AudioKit.h" // for AudioKit
+#include "AudioTools/AudioLibs/AudioBoardStream.h" // for AudioKit
 #endif
 
 TimeToText ttt;
 MP3DecoderHelix mp3;
 const char* path = "/tts";
 AudioDictionarySD dictionary(path, "mp3", PIN_AUDIO_KIT_SD_CARD_CS);
-AudioKitStream out;  // Replace with desired output class e.g. I2SStream
+AudioBoardStream out(AudioKitEs8388V1);  // Replace with desired output class e.g. I2SStream
 TextToSpeech tts(ttt, out, mp3, dictionary);
 int hour=0, minute=0;
 
diff --git a/examples/time-to-speech-url/time-to-speech-url.ino b/examples/time-to-speech-url/time-to-speech-url.ino
@@ -13,8 +13,8 @@
 #include "AudioTools.h"
 #include "SimpleTTS.h"
 #include "AudioDictionaryURL.h"
-#include "AudioCodecs/CodecMP3Helix.h"
-#include "AudioLibs/AudioKit.h"
+#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
+#include "AudioTools/AudioLibs/AudioBoardStream.h"
 
 
 const char *ssid = "ssid";
@@ -25,7 +25,7 @@ TimeToText ttt;
 URLStream in(ssid, password); 
 AudioDictionaryURL dictionary(in, url, "mp3");
 MP3DecoderHelix mp3;
-AudioKitStream out; // Replace with desired output class e.g. I2SStream
+AudioBoardStream out(AudioKitEs8388V1); // Replace with desired output class e.g. I2SStream
 TextToSpeech tts(ttt, out, mp3, dictionary);
 int hour=0, minute=0;
 
@@ -35,7 +35,7 @@ void setup(){
  
     // setup in
     auto cfg = out.defaultConfig(); 
-    cfg.sd_active = false; // for AudioKitStream to use all pins
+    cfg.sd_active = false; // for AudioBoardStream to use all pins
     cfg.sample_rate = 24000;
     cfg.channels = 1;
     out.begin(cfg);
diff --git a/examples/time-to-speech/Desktop.h b/examples/time-to-speech/Desktop.h
@@ -7,5 +7,5 @@
 #ifdef IS_DESKTOP
 #include "AudioLibs/PortAudioStream.h"
 #define I2SStream PortAudioStream 
-#define AudioKitStream PortAudioStream
+#define AudioBoardStream PortAudioStream
 #endif
diff --git a/examples/time-to-speech/time-to-speech.ino b/examples/time-to-speech/time-to-speech.ino
@@ -11,15 +11,15 @@
  */
 #include "AudioTools.h"
 #include "SimpleTTS.h"
-#include "AudioCodecs/CodecMP3Helix.h"
+#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
 #include "Desktop.h" // some special logic for desktop builds
 #ifndef IS_DESKTOP
-#include "AudioLibs/AudioKit.h"
+#include "AudioTools/AudioLibs/AudioBoardStream.h"
 #endif
 
 
 TimeToText ttt;
-AudioKitStream out; // Replace with desired class e.g. I2SStream
+AudioBoardStream out(AudioKitEs8388V1); // Replace with desired class e.g. I2SStream
 MP3DecoderHelix mp3;
 AudioDictionary dictionary(ExampleAudioDictionaryValues);
 TextToSpeech tts(ttt, out, mp3, dictionary);
diff --git a/examples/tts-udp-server/tts-udp-server.h b/examples/tts-udp-server/tts-udp-server.h
@@ -10,7 +10,7 @@
  */
 
 #include "SimpleTTS.h"
-#include "AudioCodecs/CodecMP3Helix.h"
+#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
 #include "AudioLibs/Communication.h"
 
 I2SStream out;
diff --git a/examples/unit-to-speech/Desktop.h b/examples/unit-to-speech/Desktop.h
@@ -7,5 +7,5 @@
 #ifdef IS_DESKTOP
 #include "AudioLibs/PortAudioStream.h"
 #define I2SStream PortAudioStream 
-#define AudioKitStream PortAudioStream
+#define AudioBoardStream PortAudioStream
 #endif
diff --git a/examples/unit-to-speech/unit-to-speech.ino b/examples/unit-to-speech/unit-to-speech.ino
@@ -4,7 +4,7 @@
  * @brief Demo that translates numbers with units into speech
  * I used it with an AudioKit. If you want to use it with a regular micrcontroller
  * - remove the include "AudioLibs/AudioKit.h"
- * - replace the  AudioKitStream with I2SStream, AnalogAudioStream, PMWAudioStream
+ * - replace the  AudioBoardStream with I2SStream, AnalogAudioStream, PMWAudioStream
  * @version 0.1
  * @date 2022-02-16
  * 
@@ -13,15 +13,15 @@
  */
 
 #include "SimpleTTS.h"
-#include "AudioCodecs/CodecMP3Helix.h"
+#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
 #include "Desktop.h" // some special logic for desktop builds
 
 #ifndef IS_DESKTOP
-#include "AudioLibs/AudioKit.h" // for AudioKit
+#include "AudioTools/AudioLibs/AudioBoardStream.h" // for AudioKit
 #endif
 
 NumberUnitToText utt;
-AudioKitStream out; // Replace with desired class e.g. I2SStream
+AudioBoardStream out(AudioKitEs8388V1); // Replace with desired class e.g. I2SStream
 MP3DecoderHelix mp3;
 AudioDictionary dictionary(ExampleAudioDictionaryValues);
 TextToSpeech tts(utt, out, mp3, dictionary);
diff --git a/src/AudioDictionary.h b/src/AudioDictionary.h
@@ -45,6 +45,7 @@ AudioDictionaryEntry ExampleAudioDictionaryValues[] = {
     {"AND", new MemoryStream(and_mp3, and_mp3_len)},
     {"BILLION", new MemoryStream(billion_mp3, billion_mp3_len)},
     {"DOT", new MemoryStream(dot_mp3, dot_mp3_len)},
+    {"POINT", new MemoryStream(point_mp3, point_mp3_len)},
     {"EIGHT", new MemoryStream(eight_mp3, eight_mp3_len)},
     {"EIGHTEEN", new MemoryStream(eighteen_mp3, eighteen_mp3_len)},
     {"EIGHTY", new MemoryStream(eighty_mp3, eighty_mp3_len)},
diff --git a/src/NumberToText.h b/src/NumberToText.h
@@ -80,9 +80,9 @@ class NumberToText : public SimpleTTSBase {
   const char* second[10] = {"",      "TEN",   "TWENTY",  "THIRTY", "FORTY",
                             "FIFTY", "SIXTY", "SEVENTY", "EIGHTY", "NINETY"};
 
-  const char* third[7] = {"AND","DOT","MINUS", "HUNDRED", "THOUSAND", "MILLION","BILLION"};
+  const char* third[7] = {"AND","POINT","MINUS", "HUNDRED", "THOUSAND", "MILLION","BILLION"};
   const int AND = 0;
-  const int DOT = 1;
+  const int POINT = 1;
   const int MINUS = 2;
   const int HUNDRED = 3;
   const int THOUSAND = 4;
@@ -97,7 +97,7 @@ class NumberToText : public SimpleTTSBase {
     Str dec(decimals);
     if (dec.toInt()!=0.0){
       const char* ch=decimals;
-      add(third[DOT]);
+      add(third[POINT]);
       while (*ch){
         int idx = (*ch)-48; // convert to index
         add(first[idx]);
diff --git a/src/en/all.h b/src/en/all.h
@@ -37,6 +37,8 @@
 #include "ten.h"           
 #include "three.h"         
 #include "zero.h"
+#include "dot.h"
+#include "point.h"
 // time
 #include "am.h"
 #include "half.h"
diff --git a/src/en/point.h b/src/en/point.h
diff --git a/tools/make-h.py b/tools/make-h.py
diff --git a/tools/make-mp3.py b/tools/make-mp3.py
