Browse Source

AP_Scheduler: all vehicles now use functors

mission-4.1.18
Andrew Tridgell 10 years ago
parent
commit
dd691ae75c
  1. 4
      libraries/AP_Scheduler/AP_Scheduler.cpp
  2. 4
      libraries/AP_Scheduler/AP_Scheduler.h

4
libraries/AP_Scheduler/AP_Scheduler.cpp

@ -87,11 +87,7 @@ void AP_Scheduler::run(uint16_t time_available) @@ -87,11 +87,7 @@ void AP_Scheduler::run(uint16_t time_available)
task_fn_t func;
pgm_read_block(&_tasks[i].function, &func, sizeof(func));
current_task = i;
#if APM_BUILD_FUNCTOR
func();
#else
func();
#endif
current_task = -1;
// record the tick counter when we ran. This drives

4
libraries/AP_Scheduler/AP_Scheduler.h

@ -41,11 +41,7 @@ @@ -41,11 +41,7 @@
class AP_Scheduler
{
public:
#if APM_BUILD_FUNCTOR
FUNCTOR_TYPEDEF(task_fn_t, void);
#else
typedef void (*task_fn_t)(void);
#endif
struct Task {
task_fn_t function;

Loading…
Cancel
Save