Merge branch 'main' of https://github.com/pschatzmann/arduino-simple-tts

Author: pschatzmann

examples/talking-clock/talking-clock.ino

@@ -48,9 +48,11 @@ void setup() {
   ttt.say(timeInfo.time());
 }
 
+
 void loop() {
   // speach output
   if (timeInfo.update()){
     ttt.say(timeInfo.time());
+    tts.say("SILENCE");  // ESP32: prevent noise at end
   }
 }

src/AudioDictionary.h

@@ -54,7 +54,7 @@ AudioDictionaryEntry ExampleAudioDictionaryValues[] = {
     {"FIVE", new MemoryStream(five_mp3, five_mp3_len)},
     {"FOUR", new MemoryStream(four_mp3, four_mp3_len)},
     {"FOURTEEN", new MemoryStream(fourteen_mp3, fourteen_mp3_len)},
-    {"FOURTY", new MemoryStream(fourty_mp3, fourty_mp3_len)},
+    {"FORTY", new MemoryStream(forty_mp3, forty_mp3_len)},
     {"HUNDRED", new MemoryStream(hundred_mp3, hundred_mp3_len)},
     {"MILLION", new MemoryStream(million_mp3, million_mp3_len)},
     {"MINUS", new MemoryStream(minus_mp3, minus_mp3_len)},

src/NumberToText.h

@@ -98,9 +98,10 @@ class NumberToText : public SimpleTTSBase {
     if (dec.toInt()!=0.0){
       const char* ch=decimals;
       add(third[DOT]);
-      while (*++ch){
+      while (*ch){
         int idx = (*ch)-48; // convert to index
         add(first[idx]);
+        ch++;
       }
     }
   }

src/SimpleTTSBase.h

@@ -108,7 +108,7 @@ class Number {
   void set(double value, int digits=2) {
     char format[10];
     // e.g. %0.2f for 2 digits.
-    sprintf(format,"%%0.%d2f", digits);
+    sprintf(format,"%%0.%df", digits);
     LOGD("format: %s", format);
     memset(buffer, 0, buffer_len);
     // convert to string

src/en/all.h

@@ -4,7 +4,7 @@
 #include "and.h"           
 #include "eighteen.h"      
 #include "fifty.h"         
-#include "fourty.h"        
+#include "forty.h"        
 #include "nine.h"          
 #include "one.h"           
 #include "six.h"