Bumped version to 1.3.2

Author: ArminJo

Diff for: .github/workflows/LibraryBuild.yml

@@ -34,6 +34,7 @@ jobs:
           - SparkFun:avr:promicro
           - esp32:esp32:featheresp32:FlashFreq=80
           - STMicroelectronics:stm32:GenF1:pnum=BLUEPILL_F103C8
+          - STMicroelectronics:stm32:Nucleo_32:pnum=NUCLEO_L432KC
           - stm32duino:STM32F1:genericSTM32F103C
 
         include:
@@ -46,10 +47,13 @@ jobs:
           - arduino-boards-fqbn: esp32:esp32:featheresp32:FlashFreq=80
             platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
 
-          - arduino-boards-fqbn: STMicroelectronics:stm32:GenF1:pnum=BLUEPILL_F103C8 # STM version
+          - arduino-boards-fqbn: STMicroelectronics:stm32:GenF1:pnum=BLUEPILL_F103C8 # STM core
             platform-url: https://raw.githubusercontent.com/stm32duino/BoardManagerFiles/main/package_stmicroelectronics_index.json
 
-          - arduino-boards-fqbn: stm32duino:STM32F1:genericSTM32F103C # Roger Clark version
+          - arduino-boards-fqbn: STMicroelectronics:stm32:Nucleo_32:pnum=NUCLEO_L432KC
+            platform-url: https://raw.githubusercontent.com/stm32duino/BoardManagerFiles/main/package_stmicroelectronics_index.json
+
+          - arduino-boards-fqbn: stm32duino:STM32F1:genericSTM32F103C # Roger Clark core
             platform-url: http://dan.drown.org/stm32duino/package_STM32duino_index.json
 
       # Do not cancel all jobs / architectures if one job fails

Diff for: LICENSE.txt

@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -618,4 +618,57 @@ an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
 
-                     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

Diff for: README.md

@@ -152,6 +152,9 @@ If you are using [Sloeber](https://eclipse.baeyens.it) as your IDE, you can easi
 ![Fritzing schematic for voltmeter example](https://github.com/ArminJo/Talkie/blob/master/extras/TalkieVoltmeter_Steckplatine.png)
 
 # Revision History
+### Version 1.3.2
+- Fixed ESP32 timer bug.
+
 ### Version 1.3.1
 - Updated _1_Voltmeter example and renamed example names.
 - Improved SAMD support.

Diff for: examples/USDistanceToVoice/HCSR04.h

@@ -21,8 +21,8 @@
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program. If not, see <http://www.gnu.org/licenses/gpl.html>.

Diff for: examples/USDistanceToVoice/HCSR04.hpp

@@ -45,8 +45,8 @@
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program. If not, see <http://www.gnu.org/licenses/gpl.html>.

Diff for: examples/VoltmeterSayQ/ADCUtils.h

@@ -13,8 +13,8 @@
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program. If not, see <http://www.gnu.org/licenses/gpl.html>.
@@ -24,9 +24,10 @@
 #ifndef _ADC_UTILS_H
 #define _ADC_UTILS_H
 
+#include <Arduino.h>
+
 #if defined(__AVR__) && defined(ADCSRA) && defined(ADATE) && (!defined(__AVR_ATmega4809__))
 #define ADC_UTILS_ARE_AVAILABLE
-#include <Arduino.h>
 
 // PRESCALE4 => 13 * 4 = 52 microseconds per ADC conversion at 1 MHz Clock => 19,2 kHz
 #define ADC_PRESCALE2    1 // 26 microseconds per ADC conversion at 1 MHz

Diff for: examples/VoltmeterSayQ/ADCUtils.hpp

@@ -15,8 +15,8 @@
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program. If not, see <http://www.gnu.org/licenses/gpl.html>.
@@ -599,10 +599,10 @@ float getTemperature(void) {
 #endif
 }
 
-#elif defined(ARDUINO_ARCH_APOLLO3) // defined(__AVR__) && defined(ADATE)
+#elif defined(ARDUINO_ARCH_APOLLO3) // defined(ADC_UTILS_ARE_AVAILABLE)
     void ADCUtilsDummyToAvoidBFDAssertions(){
         ;
     }
-#endif // defined(__AVR__) && defined(ADATE)
+#endif // defined(ADC_UTILS_ARE_AVAILABLE)
 
 #endif // _ADC_UTILS_HPP

Diff for: library.json

@@ -6,7 +6,7 @@
     "type": "git",
     "url": "https://github.com/ArminJo/Talkie"
   },
-  "version": "1.3.1",
+  "version": "1.3.2",
   "exclude": "pictures",
   "authors": {
     "name": "Armin Joachimsmeyer",

Diff for: library.properties

@@ -1,9 +1,9 @@
 name=Talkie
-version=1.3.1
+version=1.3.2
 author=Peter Knight, Armin Joachimsmeyer
 maintainer=Armin Joachimsmeyer <[email protected]>
 sentence=Speech library for Arduino. Generates speech from a fixed vocabulary encoded with LPC.
-paragraph=Talkie comes with over 1000 words of speech data that can be included in your projects. It is a software implementation of the Texas Instruments speech synthesis architecture (Linear Predictive Coding) from the late 1970s / early 1980s.  The voice is familiar from Texas Instruments Speak & Spell family of educational products.<br/>Copyright 2011 Peter Knight.<br/>This library is a reworked version which includes <b>8 MHz operation and non blocking capabilities</b> as well as a few utilities.<br/>The code for the queued non blocking version is based on the fork of Paul Stoffregen. https://github.com/PaulStoffregen/Talkie<br/><br/><b>New: </b>Improved SAMD support. Renamed examples.<br/>
+paragraph=Talkie comes with over 1000 words of speech data that can be included in your projects. It is a software implementation of the Texas Instruments speech synthesis architecture (Linear Predictive Coding) from the late 1970s / early 1980s.  The voice is familiar from Texas Instruments Speak & Spell family of educational products.<br/>Copyright 2011 Peter Knight.<br/>This library is a reworked version which includes <b>8 MHz operation and non blocking capabilities</b> as well as a few utilities.<br/>The code for the queued non blocking version is based on the fork of Paul Stoffregen. https://github.com/PaulStoffregen/Talkie<br/><br/><b>New: </b>Fixed ESP32 timer bug.<br/><a href="https://github.com/ArminJo/Talkie#revision-history">Revision History</a><br/>
 category=Signal Input/Output
 url=https://github.com/ArminJo/Talkie
 architectures=avr,megaavr,samd,esp32,stm32,STM32F1

Diff for: src/Talkie.h

@@ -32,11 +32,20 @@
 
 #include <inttypes.h>
 
-#define VERSION_TALKIE "1.3.1"
+#define VERSION_TALKIE "1.3.2"
 #define VERSION_TALKIE_MAJOR 1
 #define VERSION_TALKIE_MINOR 3
+#define VERSION_TALKIE_PATCH 2
+
 // The change log is at the bottom of the file
 
+/*
+ * Macro to convert 3 version parts into an integer
+ * To be used in preprocessor comparisons, such as #if VERSION_TALKIE_HEX >= VERSION_HEX_VALUE(3, 0, 0)
+ */
+#define VERSION_HEX_VALUE(major, minor, patch) ((major << 16) | (minor << 8) | (patch))
+#define VERSION_TALKIE_HEX  VERSION_HEX_VALUE(VERSION_TALKIE_MAJOR, VERSION_TALKIE_MINOR, VERSION_TALKIE_PATCH)
+
 // If you do not use the Arduino Tone library, then activating can save up to 844 bytes program size :-)
 //#define NO_COMPATIBILITY_FOR_TONE_LIB_REQUIRED
 
@@ -108,6 +117,9 @@ class Talkie {
 };
 
 /*
+ * Version 1.3.2
+ * - Fixed ESP32 timer bug.
+ *
  * Version 1.3.1
  * - Improved SAMD support.
  *

Diff for: src/digitalWriteFast.h

@@ -128,6 +128,13 @@
 (((P) <= 7) ? &DDRB : (((P) >= 8 && (P) <= 15) ? &DDRD : (((P) >= 16 && (P) <= 23) ? &DDRC : &DDRA)))
 #define __digitalPinToPINReg(P) \
 (((P) <= 7) ? &PINB : (((P) >= 8 && (P) <= 15) ? &PIND : (((P) >= 16 && (P) <= 23) ? &PINC : &PINA)))
+# if defined(SANGUINO_PINOUT)
+#define __digitalPinToBit(P) \
+(((P) <= 7) ? (P) : (((P) >= 8 && (P) <= 15) ? (P) - 8 : (((P) >= 16 && (P) <= 23) ? (P) - 16 : (7 - ((P) - 24)))))
+# else //MightyCore Pinout
+#define __digitalPinToBit(P) \
+(((P) <= 7) ? (P) : (((P) >= 8 && (P) <= 15) ? (P) - 8 : (((P) >= 16 && (P) <= 23) ? (P) - 16 : (P) - 24)))
+# endif
 #else
 #define __digitalPinToPortReg(P) \
 (((P) <= 7) ? &PORTB : (((P) >= 8 && (P) <= 15) ? &PORTD : &PORTC))
@@ -278,7 +285,8 @@
 
 
 // --- ATtinyX4 + ATtinyX7 ---
-#elif  defined(__AVR_ATtiny24__) || defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny87__) || defined(__AVR_ATtiny167__)
+#elif  defined(__AVR_ATtiny24__) || defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__) \
+    || defined(__AVR_ATtiny441__) || defined(__AVR_ATtiny841__) || defined(__AVR_ATtiny87__) || defined(__AVR_ATtiny167__)
 # if defined(ARDUINO_AVR_DIGISPARKPRO) || PIN_PA7 == 5
 // Strange enumeration of pins on Digispark board and core library
 #define __digitalPinToPortReg(P) (((P) <= 4) ? &PORTB : &PORTA)
@@ -291,6 +299,11 @@
 #define __digitalPinToPortReg(P) (((P) <= 7) ? &PORTA : &PORTB)
 #define __digitalPinToDDRReg(P)  (((P) <= 7) ? &DDRA : &DDRB)
 #define __digitalPinToPINReg(P)  (((P) <= 7) ? &PINA : &PINB)
+#  if  defined(__AVR_ATtiny24__) || defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny441__) || defined(__AVR_ATtiny841__)
+// https://github.com/SpenceKonde/ATTinyCore/blob/v2.0.0-devThis-is-the-head-submit-PRs-against-this/avr/variants/tinyx41_cw/pins_arduino.h#L334
+// Clockwise layout
+#define __digitalPinToBit(P)     (((P) <= 7) ? (P) : ((P) == 11 ? (3) : 10 - (P)))
+#  endif
 #define __digitalPinToBit(P)     (((P) <= 7) ? (P) : (P) - 8 )
 # endif