diff --git a/lib/libmain.remove b/lib/libmain.remove index 35145b3..158fba7 100644 --- a/lib/libmain.remove +++ b/lib/libmain.remove @@ -3,3 +3,4 @@ printf-stdarg.o libc.o xtensa_vectors.o app_main.o +ets_timer.o diff --git a/open_esplibs/libmain/ets_timer.c b/open_esplibs/libmain/ets_timer.c index 27a74ca..44b3196 100644 --- a/open_esplibs/libmain/ets_timer.c +++ b/open_esplibs/libmain/ets_timer.c @@ -27,6 +27,33 @@ #if OPEN_LIBMAIN_ETS_TIMER +#if 0 + +#include "etstimer.h" +#include "espressif/osapi.h" + +void sdk_ets_timer_setfn(ETSTimer *timer, ETSTimerFunc *func, void *parg) { + sdk_os_timer_setfn(timer, func, parg); +} + +void sdk_ets_timer_arm(ETSTimer *timer, uint32_t value, bool repeat_flag) { + sdk_os_timer_arm(timer, value, repeat_flag); +} + +void sdk_ets_timer_arm_ms_us(ETSTimer *timer, uint32_t value, + bool repeat_flag, bool value_in_ms) { + sdk_os_timer_arm(timer, value * 1000 + value_in_ms, repeat_flag); +} + +void sdk_ets_timer_disarm(ETSTimer *timer) { + sdk_os_timer_disarm(timer); +} + +void sdk_ets_timer_init() { +} + +#else + #include "open_esplibs.h" #include #include @@ -73,17 +100,12 @@ void sdk_ets_timer_setfn(ets_timer_t *timer, ets_timer_func_t *func, void *parg) timer->next = ETS_TIMER_NOT_ARMED; } -/** - * .Lfunc004 - */ static inline void set_alarm_value(uint32_t value) { TIMER_FRC2.ALARM = value; } /** - * .Lfunc005 - * * Set timer alarm and make sure the alarm is set in the future * and will not be missed by the timer. */ @@ -103,7 +125,6 @@ static void set_alarm(uint32_t ticks) } /** - * .Lfunc006 * * Pending timer list example: * @@ -314,4 +335,6 @@ void sdk_ets_timer_init() _xt_isr_unmask(BIT(INUM_TIMER_FRC2)); } +#endif + #endif /* OPEN_LIBMAIN_ETS_TIMER */