diff --git a/library.properties b/library.properties index 30b0080..01e9bf2 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=uTimerLib -version=1.6.7 +version=1.7.0 author=Naguissa maintainer=Naguissa sentence=Tiny and cross-device compatible timer library diff --git a/src/hardware/uTimerLib.ATTINY.cpp b/src/hardware/uTimerLib.ATTINY.cpp index 4f6e1a6..eafeb63 100644 --- a/src/hardware/uTimerLib.ATTINY.cpp +++ b/src/hardware/uTimerLib.ATTINY.cpp @@ -27,7 +27,7 @@ * @see https://github.com/Naguissa/uTimerLib * @see https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html * @see naguissa@foroelectro.net - * @version 1.6.7 + * @version 1.7.0 */ #if (defined(ARDUINO_ARCH_AVR) && (defined(ARDUINO_attiny) || defined(ARDUINO_AVR_ATTINYX4) || defined(ARDUINO_AVR_ATTINYX5) || defined(ARDUINO_AVR_ATTINYX7) || defined(ARDUINO_AVR_ATTINYX8) || defined(ARDUINO_AVR_ATTINYX61) || defined(ARDUINO_AVR_ATTINY43) || defined(ARDUINO_AVR_ATTINY828) || defined(ARDUINO_AVR_ATTINY1634) || defined(ARDUINO_AVR_ATTINYX313))) && defined(UTIMERLIB_HW_COMPILE) diff --git a/src/hardware/uTimerLib.AVR.cpp b/src/hardware/uTimerLib.AVR.cpp index 70f6d27..41fec6e 100644 --- a/src/hardware/uTimerLib.AVR.cpp +++ b/src/hardware/uTimerLib.AVR.cpp @@ -27,7 +27,7 @@ * @see https://github.com/Naguissa/uTimerLib * @see https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html * @see naguissa@foroelectro.net - * @version 1.6.7 + * @version 1.7.0 */ #if (defined(__AVR_ATmega32U4__) || defined(ARDUINO_ARCH_AVR)) && !defined(ARDUINO_attiny) && defined(UTIMERLIB_HW_COMPILE) diff --git a/src/hardware/uTimerLib.DIGISPARK_AVR.cpp b/src/hardware/uTimerLib.DIGISPARK_AVR.cpp index 5eaf542..582e6a4 100644 --- a/src/hardware/uTimerLib.DIGISPARK_AVR.cpp +++ b/src/hardware/uTimerLib.DIGISPARK_AVR.cpp @@ -27,7 +27,7 @@ * @see https://github.com/Naguissa/uTimerLib * @see https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html * @see naguissa@foroelectro.net - * @version 1.6.7 + * @version 1.7.0 */ #if defined(ARDUINO_ARCH_AVR) && defined(ARDUINO_AVR_DIGISPARK) && defined(UTIMERLIB_HW_COMPILE) diff --git a/src/hardware/uTimerLib.ESP32.cpp b/src/hardware/uTimerLib.ESP32.cpp index 9628ea7..c720a7a 100644 --- a/src/hardware/uTimerLib.ESP32.cpp +++ b/src/hardware/uTimerLib.ESP32.cpp @@ -27,7 +27,7 @@ * @see https://github.com/Naguissa/uTimerLib * @see https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html * @see naguissa@foroelectro.net - * @version 1.6.7 + * @version 1.7.0 */ #if (defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)) && defined(UTIMERLIB_HW_COMPILE) #if !defined(_uTimerLib_IMP_) && defined(_uTimerLib_cpp_) diff --git a/src/hardware/uTimerLib.ESP8266.cpp b/src/hardware/uTimerLib.ESP8266.cpp index af7fff1..49e1ee6 100644 --- a/src/hardware/uTimerLib.ESP8266.cpp +++ b/src/hardware/uTimerLib.ESP8266.cpp @@ -27,7 +27,7 @@ * @see https://github.com/Naguissa/uTimerLib * @see https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html * @see naguissa@foroelectro.net - * @version 1.6.7 + * @version 1.7.0 */ #if (defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)) && defined(UTIMERLIB_HW_COMPILE) #if !defined(_uTimerLib_IMP_) && defined(_uTimerLib_cpp_) diff --git a/src/hardware/uTimerLib.SAM.cpp b/src/hardware/uTimerLib.SAM.cpp index dc90c72..98aa850 100644 --- a/src/hardware/uTimerLib.SAM.cpp +++ b/src/hardware/uTimerLib.SAM.cpp @@ -27,7 +27,7 @@ * @see https://github.com/Naguissa/uTimerLib * @see https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html * @see naguissa@foroelectro.net - * @version 1.6.7 + * @version 1.7.0 */ #if defined(ARDUINO_ARCH_SAM) && defined(UTIMERLIB_HW_COMPILE) #if !defined(_uTimerLib_IMP_) && defined(_uTimerLib_cpp_) diff --git a/src/hardware/uTimerLib.SAMD21.cpp b/src/hardware/uTimerLib.SAMD21.cpp index fccab9c..31c8114 100644 --- a/src/hardware/uTimerLib.SAMD21.cpp +++ b/src/hardware/uTimerLib.SAMD21.cpp @@ -27,7 +27,7 @@ * @see https://github.com/Naguissa/uTimerLib * @see https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html * @see naguissa@foroelectro.net - * @version 1.6.7 + * @version 1.7.0 */ #if defined(_SAMD21_) && defined(UTIMERLIB_HW_COMPILE) #ifndef _uTimerLib_IMP_ diff --git a/src/hardware/uTimerLib.SAMD51.cpp b/src/hardware/uTimerLib.SAMD51.cpp index afb22d1..d656aa5 100644 --- a/src/hardware/uTimerLib.SAMD51.cpp +++ b/src/hardware/uTimerLib.SAMD51.cpp @@ -27,7 +27,7 @@ * @see https://github.com/Naguissa/uTimerLib * @see https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html * @see naguissa@foroelectro.net - * @version 1.6.7 + * @version 1.7.0 */ #if defined(__SAMD51__) && defined(UTIMERLIB_HW_COMPILE) #if !defined(_uTimerLib_IMP_) && defined(_uTimerLib_cpp_) diff --git a/src/hardware/uTimerLib.STM32.cpp b/src/hardware/uTimerLib.STM32.cpp index e568f72..e04a95a 100644 --- a/src/hardware/uTimerLib.STM32.cpp +++ b/src/hardware/uTimerLib.STM32.cpp @@ -27,7 +27,7 @@ * @see https://github.com/Naguissa/uTimerLib * @see https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html * @see naguissa@foroelectro.net - * @version 1.6.7 + * @version 1.7.0 */ #if (defined(_VARIANT_ARDUINO_STM32_) || defined(ARDUINO_ARCH_STM32)) && defined(UTIMERLIB_HW_COMPILE) #ifndef _uTimerLib_IMP_ diff --git a/src/hardware/uTimerLib.UNSUPPORTED.cpp b/src/hardware/uTimerLib.UNSUPPORTED.cpp index 30f458e..78273d4 100644 --- a/src/hardware/uTimerLib.UNSUPPORTED.cpp +++ b/src/hardware/uTimerLib.UNSUPPORTED.cpp @@ -27,7 +27,7 @@ * @see https://github.com/Naguissa/uTimerLib * @see https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html * @see naguissa@foroelectro.net - * @version 1.6.7 + * @version 1.7.0 */ #if (!defined(__AVR_ATmega32U4__) && !defined(ARDUINO_ARCH_AVR) && !defined(_VARIANT_ARDUINO_STM32_) && !defined(ARDUINO_ARCH_STM32) && !defined(ARDUINO_ARCH_ESP8266) && !defined(ARDUINO_ARCH_ESP32) && !defined(ARDUINO_ARCH_SAM) && !defined(_SAMD21_) && !defined(__SAMD51__) && !defined(ARDUINO_attiny) && !defined(ARDUINO_AVR_ATTINYX5) && defined(UTIMERLIB_HW_COMPILE)) #ifndef _uTimerLib_IMP_ diff --git a/src/uTimerLib.cpp b/src/uTimerLib.cpp index c6598d7..00bc45a 100644 --- a/src/uTimerLib.cpp +++ b/src/uTimerLib.cpp @@ -27,7 +27,7 @@ * @see https://github.com/Naguissa/uTimerLib * @see https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html * @see naguissa@foroelectro.net - * @version 1.6.7 + * @version 1.7.0 */ // # if !defined(_uTimerLib_cpp_) && defined(_uTimerLib_IMP_) diff --git a/src/uTimerLib.h b/src/uTimerLib.h index 4792976..b9c0ca6 100644 --- a/src/uTimerLib.h +++ b/src/uTimerLib.h @@ -27,7 +27,7 @@ * @see https://github.com/Naguissa/uTimerLib * @see https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html * @see naguissa@foroelectro.net - * @version 1.6.7 + * @version 1.7.0 */ /** \file uTimerLib.h * \brief uTimerLib header file @@ -62,7 +62,7 @@ */ #define UTIMERLIB_TYPE_INTERVAL 2 - #ifdef _VARIANT_ARDUINO_STM32_ + #if defined(_VARIANT_ARDUINO_STM32_) || defined(ARDUINO_ARCH_STM32) #include "HardwareTimer.h" // ST's Arduino Core STM32, https://github.com/stm32duino/Arduino_Core_STM32 @@ -99,7 +99,7 @@ void _interrupt(); - #ifdef _VARIANT_ARDUINO_STM32_ + #if defined(_VARIANT_ARDUINO_STM32_) || defined(ARDUINO_ARCH_STM32) // ST's Arduino Core STM32, https://github.com/stm32duino/Arduino_Core_STM32 #ifdef BOARD_NAME static callback_function_t interrupt(); @@ -147,7 +147,7 @@ void _attachInterrupt_us(unsigned long int); void _attachInterrupt_s(unsigned long int); - #ifdef _VARIANT_ARDUINO_STM32_ + #if defined(_VARIANT_ARDUINO_STM32_) || defined(ARDUINO_ARCH_STM32) bool _toInit = true; // ST's Arduino Core STM32, https://github.com/stm32duino/Arduino_Core_STM32