j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

timers: esp library timer callbacks expect their argument not a xTimerHandle (#221)

Browse source
This commit is contained in:
Our Air Quality 2016-09-22 16:56:06 +10:00 committed by Johan Kanflo
parent 8368929a66
commit a15d1bb002
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
open_esplibs/libmain/timers.c
View file

@ -60,11 +60,17 @@ void sdk_os_timer_setfn(ETSTimer *ptimer, ETSTimerFunc *pfunction, void *parg) {
*tailptr = new_entry; *tailptr = new_entry;
} }
static void timer_tramp(xTimerHandle xTimer)
{
ETSTimer *ptimer = pvTimerGetTimerID(xTimer);
ptimer->timer_func(ptimer->timer_arg);
}
void sdk_os_timer_arm(ETSTimer *ptimer, uint32_t milliseconds, bool repeat_flag) { void sdk_os_timer_arm(ETSTimer *ptimer, uint32_t milliseconds, bool repeat_flag) {
if (!ptimer->timer_handle) { if (!ptimer->timer_handle) {
ptimer->timer_repeat = repeat_flag; ptimer->timer_repeat = repeat_flag;
ptimer->timer_ms = milliseconds; ptimer->timer_ms = milliseconds;
ptimer->timer_handle = xTimerCreate(0, milliseconds/10, repeat_flag, ptimer->timer_arg, ptimer->timer_func); ptimer->timer_handle = xTimerCreate(0, milliseconds/10, repeat_flag, ptimer, timer_tramp);
armed_timer_count++; armed_timer_count++;
if (!ptimer->timer_handle) { if (!ptimer->timer_handle) {
//FIXME: should print an error? (original code doesn't) //FIXME: should print an error? (original code doesn't)