Skip to content

Commit 7c79670

Browse files
NaguissaNaguissa
committed
Release 1.6.6: Fix ESP32 clearTimer
1 parent 60260aa commit 7c79670

11 files changed

+14
-12
lines changed

‎library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=uTimerLib
2-
version=1.6.5
2+
version=1.6.6
33
author=Naguissa <naguissa@foroelectro.net>
44
maintainer=Naguissa <naguissa@foroelectro.net>
55
sentence=Tiny and cross-device compatible timer library

‎src/hardware/uTimerLib.ATTINY.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @see <a href="https://github.com/Naguissa/uTimerLib">https://github.com/Naguissa/uTimerLib</a>
2828
* @see <a href="https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html">https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html</a>
2929
* @see <a href="mailto:naguissa@foroelectro.net">naguissa@foroelectro.net</a>
30-
* @version 1.6.5
30+
* @version 1.6.6
3131
*/
3232

3333
#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)

‎src/hardware/uTimerLib.AVR.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @see <a href="https://github.com/Naguissa/uTimerLib">https://github.com/Naguissa/uTimerLib</a>
2828
* @see <a href="https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html">https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html</a>
2929
* @see <a href="mailto:naguissa@foroelectro.net">naguissa@foroelectro.net</a>
30-
* @version 1.6.5
30+
* @version 1.6.6
3131
*/
3232

3333
#if (defined(__AVR_ATmega32U4__) || defined(ARDUINO_ARCH_AVR)) && !defined(ARDUINO_attiny) && defined(UTIMERLIB_HW_COMPILE)

‎src/hardware/uTimerLib.DIGISPARK_AVR.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @see <a href="https://github.com/Naguissa/uTimerLib">https://github.com/Naguissa/uTimerLib</a>
2828
* @see <a href="https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html">https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html</a>
2929
* @see <a href="mailto:naguissa@foroelectro.net">naguissa@foroelectro.net</a>
30-
* @version 1.6.5
30+
* @version 1.6.6
3131
*/
3232

3333
#if defined(ARDUINO_ARCH_AVR) && defined(ARDUINO_AVR_DIGISPARK) && defined(UTIMERLIB_HW_COMPILE)

‎src/hardware/uTimerLib.ESP32.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @see <a href="https://github.com/Naguissa/uTimerLib">https://github.com/Naguissa/uTimerLib</a>
2828
* @see <a href="https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html">https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html</a>
2929
* @see <a href="mailto:naguissa@foroelectro.net">naguissa@foroelectro.net</a>
30-
* @version 1.6.5
30+
* @version 1.6.6
3131
*/
3232
#if (defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)) && defined(UTIMERLIB_HW_COMPILE)
3333
#if !defined(_uTimerLib_IMP_) && defined(_uTimerLib_cpp_)
@@ -89,7 +89,9 @@
8989
* Note: This is device-dependant
9090
*/
9191
void uTimerLib::clearTimer() {
92-
esp_timer_delete(_timer);
92+
esp_timer_stop(_timer);
93+
esp_timer_delete(_timer);
94+
_type == UTIMERLIB_TYPE_OFF;
9395
}
9496

9597
/**

‎src/hardware/uTimerLib.ESP8266.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @see <a href="https://github.com/Naguissa/uTimerLib">https://github.com/Naguissa/uTimerLib</a>
2828
* @see <a href="https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html">https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html</a>
2929
* @see <a href="mailto:naguissa@foroelectro.net">naguissa@foroelectro.net</a>
30-
* @version 1.6.5
30+
* @version 1.6.6
3131
*/
3232
#if (defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)) && defined(UTIMERLIB_HW_COMPILE)
3333
#if !defined(_uTimerLib_IMP_) && defined(_uTimerLib_cpp_)

‎src/hardware/uTimerLib.SAM.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @see <a href="https://github.com/Naguissa/uTimerLib">https://github.com/Naguissa/uTimerLib</a>
2828
* @see <a href="https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html">https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html</a>
2929
* @see <a href="mailto:naguissa@foroelectro.net">naguissa@foroelectro.net</a>
30-
* @version 1.6.5
30+
* @version 1.6.6
3131
*/
3232
#if defined(ARDUINO_ARCH_SAM) && defined(UTIMERLIB_HW_COMPILE)
3333
#if !defined(_uTimerLib_IMP_) && defined(_uTimerLib_cpp_)

‎src/hardware/uTimerLib.SAMD21.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @see <a href="https://github.com/Naguissa/uTimerLib">https://github.com/Naguissa/uTimerLib</a>
2828
* @see <a href="https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html">https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html</a>
2929
* @see <a href="mailto:naguissa@foroelectro.net">naguissa@foroelectro.net</a>
30-
* @version 1.6.5
30+
* @version 1.6.6
3131
*/
3232
#if defined(_SAMD21_) && defined(UTIMERLIB_HW_COMPILE)
3333
#ifndef _uTimerLib_IMP_

‎src/hardware/uTimerLib.SAMD51.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @see <a href="https://github.com/Naguissa/uTimerLib">https://github.com/Naguissa/uTimerLib</a>
2828
* @see <a href="https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html">https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html</a>
2929
* @see <a href="mailto:naguissa@foroelectro.net">naguissa@foroelectro.net</a>
30-
* @version 1.6.5
30+
* @version 1.6.6
3131
*/
3232
#if defined(__SAMD51__) && defined(UTIMERLIB_HW_COMPILE)
3333
#if !defined(_uTimerLib_IMP_) && defined(_uTimerLib_cpp_)

‎src/hardware/uTimerLib.STM32.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @see <a href="https://github.com/Naguissa/uTimerLib">https://github.com/Naguissa/uTimerLib</a>
2828
* @see <a href="https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html">https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html</a>
2929
* @see <a href="mailto:naguissa@foroelectro.net">naguissa@foroelectro.net</a>
30-
* @version 1.6.5
30+
* @version 1.6.6
3131
*/
3232
#if (defined(_VARIANT_ARDUINO_STM32_) || defined(ARDUINO_ARCH_STM32)) && defined(UTIMERLIB_HW_COMPILE)
3333
#ifndef _uTimerLib_IMP_

‎src/hardware/uTimerLib.UNSUPPORTED.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @see <a href="https://github.com/Naguissa/uTimerLib">https://github.com/Naguissa/uTimerLib</a>
2828
* @see <a href="https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html">https://www.foroelectro.net/librerias-arduino-ide-f29/utimerlib-libreria-arduino-para-eventos-temporizad-t191.html</a>
2929
* @see <a href="mailto:naguissa@foroelectro.net">naguissa@foroelectro.net</a>
30-
* @version 1.6.5
30+
* @version 1.6.6
3131
*/
3232
#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))
3333
#ifndef _uTimerLib_IMP_

0 commit comments

Comments
 (0)