From 2e6074c108d857ff186bc4b9e1a2b440a7c38d4f Mon Sep 17 00:00:00 2001 From: Gustavo Jose de Sousa Date: Tue, 28 Jul 2015 11:08:40 -0300 Subject: [PATCH] AP_Scheduler: use designated initializers for tasks structs Makes code less prone to break build and semantics (e.g., when a new field is added). --- .../examples/Scheduler_test/Scheduler_test.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libraries/AP_Scheduler/examples/Scheduler_test/Scheduler_test.cpp b/libraries/AP_Scheduler/examples/Scheduler_test/Scheduler_test.cpp index 3cee72037b..95be088a3a 100644 --- a/libraries/AP_Scheduler/examples/Scheduler_test/Scheduler_test.cpp +++ b/libraries/AP_Scheduler/examples/Scheduler_test/Scheduler_test.cpp @@ -62,7 +62,10 @@ private: static SchedTest schedtest; -#define SCHED_TASK(func) FUNCTOR_BIND(&schedtest, &SchedTest::func, void) +#define SCHED_TASK(func, _interval_ticks, _max_time_micros) {\ + .function = FUNCTOR_BIND(&schedtest, &SchedTest::func, void),\ + .interval_ticks = _interval_ticks,\ + .max_time_micros = _max_time_micros} /* scheduler table - all regular tasks are listed here, along with how @@ -70,9 +73,9 @@ static SchedTest schedtest; they are expected to take (in microseconds) */ const AP_Scheduler::Task SchedTest::scheduler_tasks[] PROGMEM = { - { SCHED_TASK(ins_update), 1, 1000 }, - { SCHED_TASK(one_hz_print), 50, 1000 }, - { SCHED_TASK(five_second_call), 250, 1800 }, + SCHED_TASK(ins_update, 1, 1000), + SCHED_TASK(one_hz_print, 50, 1000), + SCHED_TASK(five_second_call, 250, 1800), };