From f4ca3cefe18786b347e05a3cf75902c51e0d5086 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Mon, 21 Aug 2023 21:33:44 +0100 Subject: [PATCH] Added 'sentence case' versions of constants --- include/etl/callback_timer.h | 16 ++--- include/etl/callback_timer_atomic.h | 12 ++-- include/etl/callback_timer_interrupt.h | 34 ++++++---- include/etl/callback_timer_locked.h | 12 ++-- include/etl/message_timer.h | 12 ++-- include/etl/message_timer_atomic.h | 12 ++-- include/etl/message_timer_interrupt.h | 12 ++-- include/etl/message_timer_locked.h | 12 ++-- include/etl/timer.h | 16 +++-- test/test_callback_timer.cpp | 90 ++++++++++++------------- test/test_callback_timer_atomic.cpp | 90 ++++++++++++------------- test/test_callback_timer_interrupt.cpp | 92 +++++++++++++------------- test/test_callback_timer_locked.cpp | 90 ++++++++++++------------- test/test_message_timer.cpp | 82 +++++++++++------------ test/test_message_timer_atomic.cpp | 82 +++++++++++------------ test/test_message_timer_interrupt.cpp | 84 +++++++++++------------ test/test_message_timer_locked.cpp | 82 +++++++++++------------ 17 files changed, 422 insertions(+), 408 deletions(-) diff --git a/include/etl/callback_timer.h b/include/etl/callback_timer.h index 24f422ff..e4b5596d 100644 --- a/include/etl/callback_timer.h +++ b/include/etl/callback_timer.h @@ -94,7 +94,7 @@ namespace etl callback_timer_data() : p_callback(ETL_NULLPTR), period(0), - delta(etl::timer::state::INACTIVE), + delta(etl::timer::state::Inactive), id(etl::timer::id::NO_TIMER), previous(etl::timer::id::NO_TIMER), next(etl::timer::id::NO_TIMER), @@ -112,7 +112,7 @@ namespace etl bool repeating_) : p_callback(reinterpret_cast(p_callback_)), period(period_), - delta(etl::timer::state::INACTIVE), + delta(etl::timer::state::Inactive), id(id_), previous(etl::timer::id::NO_TIMER), next(etl::timer::id::NO_TIMER), @@ -130,7 +130,7 @@ namespace etl bool repeating_) : p_callback(reinterpret_cast(&callback_)), period(period_), - delta(etl::timer::state::INACTIVE), + delta(etl::timer::state::Inactive), id(id_), previous(etl::timer::id::NO_TIMER), next(etl::timer::id::NO_TIMER), @@ -148,7 +148,7 @@ namespace etl bool repeating_) : p_callback(reinterpret_cast(&callback_)), period(period_), - delta(etl::timer::state::INACTIVE), + delta(etl::timer::state::Inactive), id(id_), previous(etl::timer::id::NO_TIMER), next(etl::timer::id::NO_TIMER), @@ -162,7 +162,7 @@ namespace etl //******************************************* bool is_active() const { - return delta != etl::timer::state::INACTIVE; + return delta != etl::timer::state::Inactive; } //******************************************* @@ -170,7 +170,7 @@ namespace etl //******************************************* void set_inactive() { - delta = etl::timer::state::INACTIVE; + delta = etl::timer::state::Inactive; } void* p_callback; @@ -313,7 +313,7 @@ namespace etl timer.previous = etl::timer::id::NO_TIMER; timer.next = etl::timer::id::NO_TIMER; - timer.delta = etl::timer::state::INACTIVE; + timer.delta = etl::timer::state::Inactive; } //******************************* @@ -631,7 +631,7 @@ namespace etl if (timer.id != etl::timer::id::NO_TIMER) { // Has a valid period. - if (timer.period != etl::timer::state::INACTIVE) + if (timer.period != etl::timer::state::Inactive) { ETL_DISABLE_TIMER_UPDATES; if (timer.is_active()) diff --git a/include/etl/callback_timer_atomic.h b/include/etl/callback_timer_atomic.h index f5c6df84..0d12fc29 100644 --- a/include/etl/callback_timer_atomic.h +++ b/include/etl/callback_timer_atomic.h @@ -220,7 +220,7 @@ namespace etl if (timer.id != etl::timer::id::NO_TIMER) { // Has a valid period. - if (timer.period != etl::timer::state::INACTIVE) + if (timer.period != etl::timer::state::Inactive) { ++process_semaphore; if (timer.is_active()) @@ -319,7 +319,7 @@ namespace etl timer_data() : callback() , period(0U) - , delta(etl::timer::state::INACTIVE) + , delta(etl::timer::state::Inactive) , id(etl::timer::id::NO_TIMER) , previous(etl::timer::id::NO_TIMER) , next(etl::timer::id::NO_TIMER) @@ -336,7 +336,7 @@ namespace etl bool repeating_) : callback(callback_) , period(period_) - , delta(etl::timer::state::INACTIVE) + , delta(etl::timer::state::Inactive) , id(id_) , previous(etl::timer::id::NO_TIMER) , next(etl::timer::id::NO_TIMER) @@ -349,7 +349,7 @@ namespace etl //******************************************* bool is_active() const { - return delta != etl::timer::state::INACTIVE; + return delta != etl::timer::state::Inactive; } //******************************************* @@ -357,7 +357,7 @@ namespace etl //******************************************* void set_inactive() { - delta = etl::timer::state::INACTIVE; + delta = etl::timer::state::Inactive; } callback_type callback; @@ -512,7 +512,7 @@ namespace etl timer.previous = etl::timer::id::NO_TIMER; timer.next = etl::timer::id::NO_TIMER; - timer.delta = etl::timer::state::INACTIVE; + timer.delta = etl::timer::state::Inactive; } //******************************* diff --git a/include/etl/callback_timer_interrupt.h b/include/etl/callback_timer_interrupt.h index a07d6b98..bc3fda5d 100644 --- a/include/etl/callback_timer_interrupt.h +++ b/include/etl/callback_timer_interrupt.h @@ -221,7 +221,7 @@ namespace etl if (timer.id != etl::timer::id::NO_TIMER) { // Has a valid period. - if (timer.period != etl::timer::state::INACTIVE) + if (timer.period != etl::timer::state::Inactive) { TInterruptGuard guard; (void)guard; // Silence 'unused variable warnings. @@ -323,7 +323,7 @@ namespace etl timer_data() : callback() , period(0U) - , delta(etl::timer::state::INACTIVE) + , delta(etl::timer::state::Inactive) , id(etl::timer::id::NO_TIMER) , previous(etl::timer::id::NO_TIMER) , next(etl::timer::id::NO_TIMER) @@ -340,7 +340,7 @@ namespace etl bool repeating_) : callback(callback_) , period(period_) - , delta(etl::timer::state::INACTIVE) + , delta(etl::timer::state::Inactive) , id(id_) , previous(etl::timer::id::NO_TIMER) , next(etl::timer::id::NO_TIMER) @@ -353,7 +353,7 @@ namespace etl //******************************************* bool is_active() const { - return delta != etl::timer::state::INACTIVE; + return delta != etl::timer::state::Inactive; } //******************************************* @@ -361,7 +361,7 @@ namespace etl //******************************************* void set_inactive() { - delta = etl::timer::state::INACTIVE; + delta = etl::timer::state::Inactive; } callback_type callback; @@ -383,11 +383,11 @@ namespace etl /// Constructor. //******************************************* icallback_timer_interrupt(timer_data* const timer_array_, const uint_least8_t MAX_TIMERS_) - : timer_array(timer_array_), - active_list(timer_array_), - enabled(false), - number_of_registered_timers(0U), - MAX_TIMERS(MAX_TIMERS_) + : timer_array(timer_array_) + , active_list(timer_array_) + , enabled(false) + , number_of_registered_timers(0U) + , MAX_TIMERS(MAX_TIMERS_) { } @@ -514,8 +514,8 @@ namespace etl } timer.previous = etl::timer::id::NO_TIMER; - timer.next = etl::timer::id::NO_TIMER; - timer.delta = etl::timer::state::INACTIVE; + timer.next = etl::timer::id::NO_TIMER; + timer.delta = etl::timer::state::Inactive; } //******************************* @@ -524,6 +524,12 @@ namespace etl return ptimers[head]; } + //******************************* + const timer_data& front() const + { + return ptimers[head]; + } + //******************************* etl::timer::id::type begin() { @@ -557,8 +563,8 @@ namespace etl timer.next = etl::timer::id::NO_TIMER; } - head = etl::timer::id::NO_TIMER; - tail = etl::timer::id::NO_TIMER; + head = etl::timer::id::NO_TIMER; + tail = etl::timer::id::NO_TIMER; current = etl::timer::id::NO_TIMER; } diff --git a/include/etl/callback_timer_locked.h b/include/etl/callback_timer_locked.h index e97e674a..bfd6952c 100644 --- a/include/etl/callback_timer_locked.h +++ b/include/etl/callback_timer_locked.h @@ -222,7 +222,7 @@ namespace etl if (timer.id != etl::timer::id::NO_TIMER) { // Has a valid period. - if (timer.period != etl::timer::state::INACTIVE) + if (timer.period != etl::timer::state::Inactive) { lock(); if (timer.is_active()) @@ -331,7 +331,7 @@ namespace etl timer_data() : callback() , period(0U) - , delta(etl::timer::state::INACTIVE) + , delta(etl::timer::state::Inactive) , id(etl::timer::id::NO_TIMER) , previous(etl::timer::id::NO_TIMER) , next(etl::timer::id::NO_TIMER) @@ -348,7 +348,7 @@ namespace etl bool repeating_) : callback(callback_) , period(period_) - , delta(etl::timer::state::INACTIVE) + , delta(etl::timer::state::Inactive) , id(id_) , previous(etl::timer::id::NO_TIMER) , next(etl::timer::id::NO_TIMER) @@ -361,7 +361,7 @@ namespace etl //******************************************* bool is_active() const { - return delta != etl::timer::state::INACTIVE; + return delta != etl::timer::state::Inactive; } //******************************************* @@ -369,7 +369,7 @@ namespace etl //******************************************* void set_inactive() { - delta = etl::timer::state::INACTIVE; + delta = etl::timer::state::Inactive; } callback_type callback; @@ -523,7 +523,7 @@ namespace etl timer.previous = etl::timer::id::NO_TIMER; timer.next = etl::timer::id::NO_TIMER; - timer.delta = etl::timer::state::INACTIVE; + timer.delta = etl::timer::state::Inactive; } //******************************* diff --git a/include/etl/message_timer.h b/include/etl/message_timer.h index 6a3e2602..075b03ad 100644 --- a/include/etl/message_timer.h +++ b/include/etl/message_timer.h @@ -86,7 +86,7 @@ namespace etl : p_message(ETL_NULLPTR), p_router(ETL_NULLPTR), period(0), - delta(etl::timer::state::INACTIVE), + delta(etl::timer::state::Inactive), destination_router_id(etl::imessage_bus::ALL_MESSAGE_ROUTERS), id(etl::timer::id::NO_TIMER), previous(etl::timer::id::NO_TIMER), @@ -105,7 +105,7 @@ namespace etl : p_message(&message_), p_router(&irouter_), period(period_), - delta(etl::timer::state::INACTIVE), + delta(etl::timer::state::Inactive), destination_router_id(destination_router_id_), id(id_), previous(etl::timer::id::NO_TIMER), @@ -119,7 +119,7 @@ namespace etl //******************************************* bool is_active() const { - return delta != etl::timer::state::INACTIVE; + return delta != etl::timer::state::Inactive; } //******************************************* @@ -127,7 +127,7 @@ namespace etl //******************************************* void set_inactive() { - delta = etl::timer::state::INACTIVE; + delta = etl::timer::state::Inactive; } const etl::imessage* p_message; @@ -271,7 +271,7 @@ namespace etl timer.previous = etl::timer::id::NO_TIMER; timer.next = etl::timer::id::NO_TIMER; - timer.delta = etl::timer::state::INACTIVE; + timer.delta = etl::timer::state::Inactive; } //******************************* @@ -512,7 +512,7 @@ namespace etl if (timer.id != etl::timer::id::NO_TIMER) { // Has a valid period. - if (timer.period != etl::timer::state::INACTIVE) + if (timer.period != etl::timer::state::Inactive) { ETL_DISABLE_TIMER_UPDATES; if (timer.is_active()) diff --git a/include/etl/message_timer_atomic.h b/include/etl/message_timer_atomic.h index c8c27519..97fb3183 100644 --- a/include/etl/message_timer_atomic.h +++ b/include/etl/message_timer_atomic.h @@ -225,7 +225,7 @@ namespace etl if (timer.id != etl::timer::id::NO_TIMER) { // Has a valid period. - if (timer.period != etl::timer::state::INACTIVE) + if (timer.period != etl::timer::state::Inactive) { ++process_semaphore; if (timer.is_active()) @@ -325,7 +325,7 @@ namespace etl : p_message(ETL_NULLPTR) , p_router(ETL_NULLPTR) , period(0U) - , delta(etl::timer::state::INACTIVE) + , delta(etl::timer::state::Inactive) , destination_router_id(etl::imessage_bus::ALL_MESSAGE_ROUTERS) , id(etl::timer::id::NO_TIMER) , previous(etl::timer::id::NO_TIMER) @@ -344,7 +344,7 @@ namespace etl : p_message(&message_) , p_router(&irouter_) , period(period_) - , delta(etl::timer::state::INACTIVE) + , delta(etl::timer::state::Inactive) , destination_router_id(destination_router_id_) , id(id_) , previous(etl::timer::id::NO_TIMER) @@ -358,7 +358,7 @@ namespace etl //******************************************* bool is_active() const { - return delta != etl::timer::state::INACTIVE; + return delta != etl::timer::state::Inactive; } //******************************************* @@ -366,7 +366,7 @@ namespace etl //******************************************* void set_inactive() { - delta = etl::timer::state::INACTIVE; + delta = etl::timer::state::Inactive; } const etl::imessage* p_message; @@ -530,7 +530,7 @@ namespace etl timer.previous = etl::timer::id::NO_TIMER; timer.next = etl::timer::id::NO_TIMER; - timer.delta = etl::timer::state::INACTIVE; + timer.delta = etl::timer::state::Inactive; } //******************************* diff --git a/include/etl/message_timer_interrupt.h b/include/etl/message_timer_interrupt.h index bf7da229..c906d8ef 100644 --- a/include/etl/message_timer_interrupt.h +++ b/include/etl/message_timer_interrupt.h @@ -232,7 +232,7 @@ namespace etl if (timer.id != etl::timer::id::NO_TIMER) { // Has a valid period. - if (timer.period != etl::timer::state::INACTIVE) + if (timer.period != etl::timer::state::Inactive) { TInterruptGuard guard; (void)guard; // Silence 'unused variable warnings. @@ -335,7 +335,7 @@ namespace etl : p_message(ETL_NULLPTR) , p_router(ETL_NULLPTR) , period(0) - , delta(etl::timer::state::INACTIVE) + , delta(etl::timer::state::Inactive) , destination_router_id(etl::imessage_bus::ALL_MESSAGE_ROUTERS) , id(etl::timer::id::NO_TIMER) , previous(etl::timer::id::NO_TIMER) @@ -354,7 +354,7 @@ namespace etl : p_message(&message_) , p_router(&irouter_) , period(period_) - , delta(etl::timer::state::INACTIVE) + , delta(etl::timer::state::Inactive) , destination_router_id(destination_router_id_) , id(id_) , previous(etl::timer::id::NO_TIMER) @@ -368,7 +368,7 @@ namespace etl //******************************************* bool is_active() const { - return delta != etl::timer::state::INACTIVE; + return delta != etl::timer::state::Inactive; } //******************************************* @@ -376,7 +376,7 @@ namespace etl //******************************************* void set_inactive() { - delta = etl::timer::state::INACTIVE; + delta = etl::timer::state::Inactive; } const etl::imessage* p_message; @@ -539,7 +539,7 @@ namespace etl timer.previous = etl::timer::id::NO_TIMER; timer.next = etl::timer::id::NO_TIMER; - timer.delta = etl::timer::state::INACTIVE; + timer.delta = etl::timer::state::Inactive; } //******************************* diff --git a/include/etl/message_timer_locked.h b/include/etl/message_timer_locked.h index 1e6a2b4b..cd44702e 100644 --- a/include/etl/message_timer_locked.h +++ b/include/etl/message_timer_locked.h @@ -231,7 +231,7 @@ namespace etl if (timer.id != etl::timer::id::NO_TIMER) { // Has a valid period. - if (timer.period != etl::timer::state::INACTIVE) + if (timer.period != etl::timer::state::Inactive) { lock(); if (timer.is_active()) @@ -341,7 +341,7 @@ namespace etl : p_message(ETL_NULLPTR) , p_router(ETL_NULLPTR) , period(0) - , delta(etl::timer::state::INACTIVE) + , delta(etl::timer::state::Inactive) , destination_router_id(etl::imessage_bus::ALL_MESSAGE_ROUTERS) , id(etl::timer::id::NO_TIMER) , previous(etl::timer::id::NO_TIMER) @@ -360,7 +360,7 @@ namespace etl : p_message(&message_) , p_router(&irouter_) , period(period_) - , delta(etl::timer::state::INACTIVE) + , delta(etl::timer::state::Inactive) , destination_router_id(destination_router_id_) , id(id_) , previous(etl::timer::id::NO_TIMER) @@ -374,7 +374,7 @@ namespace etl //******************************************* bool is_active() const { - return delta != etl::timer::state::INACTIVE; + return delta != etl::timer::state::Inactive; } //******************************************* @@ -382,7 +382,7 @@ namespace etl //******************************************* void set_inactive() { - delta = etl::timer::state::INACTIVE; + delta = etl::timer::state::Inactive; } const etl::imessage* p_message; @@ -545,7 +545,7 @@ namespace etl timer.previous = etl::timer::id::NO_TIMER; timer.next = etl::timer::id::NO_TIMER; - timer.delta = etl::timer::state::INACTIVE; + timer.delta = etl::timer::state::Inactive; } //******************************* diff --git a/include/etl/timer.h b/include/etl/timer.h index 6b9411cf..856413b0 100644 --- a/include/etl/timer.h +++ b/include/etl/timer.h @@ -59,7 +59,10 @@ namespace etl enum { SINGLE_SHOT = false, - REPEATING = true + REPEATING = true, + + Single_Shot = false, + Repeating = true }; typedef bool type; @@ -71,7 +74,10 @@ namespace etl enum { DELAYED = false, - IMMEDIATE = true + IMMEDIATE = true, + + Delayed = false, + Immediate = true }; typedef bool type; @@ -82,7 +88,8 @@ namespace etl { enum { - NO_TIMER = 255 + NO_TIMER = 255, + No_Timer = 255 }; typedef uint_least8_t type; @@ -93,7 +100,8 @@ namespace etl { enum { - INACTIVE = 0xFFFFFFFFUL + INACTIVE = 0xFFFFFFFFUL, + Inactive = 0xFFFFFFFFUL }; }; }; diff --git a/test/test_callback_timer.cpp b/test/test_callback_timer.cpp index 394b022a..1057fc08 100644 --- a/test/test_callback_timer.cpp +++ b/test/test_callback_timer.cpp @@ -114,16 +114,16 @@ namespace { etl::callback_timer<2> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(free_callback2, 11, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(free_callback2, 11, etl::timer::mode::Single_Shot); CHECK(id1 != etl::timer::id::NO_TIMER); CHECK(id2 != etl::timer::id::NO_TIMER); CHECK(id3 == etl::timer::id::NO_TIMER); timer_controller.clear(); - id3 = timer_controller.register_timer(free_callback2, 11, etl::timer::mode::SINGLE_SHOT); + id3 = timer_controller.register_timer(free_callback2, 11, etl::timer::mode::Single_Shot); CHECK(id3 != etl::timer::id::NO_TIMER); } @@ -132,9 +132,9 @@ namespace { etl::callback_timer<4> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(free_callback2, 11, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(free_callback2, 11, etl::timer::mode::Single_Shot); test.tick_list.clear(); free_tick_list1.clear(); @@ -174,7 +174,7 @@ namespace { etl::callback_timer<1> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Single_Shot); test.tick_list.clear(); timer_controller.start(id1); @@ -220,9 +220,9 @@ namespace { etl::callback_timer<3> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -262,9 +262,9 @@ namespace { etl::callback_timer<3> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -308,9 +308,9 @@ namespace { etl::callback_timer<3> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -361,9 +361,9 @@ namespace { etl::callback_timer<3> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback2, 100, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(member_callback, 10, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(member_callback, 22, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback2, 100, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(member_callback, 10, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(member_callback, 22, etl::timer::mode::Single_Shot); (void)id2; (void)id3; @@ -398,9 +398,9 @@ namespace { etl::callback_timer<3> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback2, 100, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(member_callback, 10, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(member_callback, 22, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback2, 100, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(member_callback, 10, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(member_callback, 22, etl::timer::mode::Single_Shot); (void)id2; (void)id3; @@ -436,8 +436,8 @@ namespace etl::callback_timer<3> timer_controller; etl::timer::id::type id1; - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -458,7 +458,7 @@ namespace { timer_controller.unregister_timer(id2); - id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::REPEATING); + id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Repeating); timer_controller.start(id1); } @@ -484,9 +484,9 @@ namespace { etl::callback_timer<3> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -532,9 +532,9 @@ namespace { etl::callback_timer<3> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -545,9 +545,9 @@ namespace ticks = 5; timer_controller.tick(uint32_t(ticks)); - timer_controller.start(id1, etl::timer::start::IMMEDIATE); - timer_controller.start(id2, etl::timer::start::IMMEDIATE); - timer_controller.start(id3, etl::timer::start::DELAYED); + timer_controller.start(id1, etl::timer::start::Immediate); + timer_controller.start(id2, etl::timer::start::Immediate); + timer_controller.start(id3, etl::timer::start::Delayed); const uint32_t step = 1U; @@ -575,8 +575,8 @@ namespace { etl::callback_timer<3> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(free_callback1, 15, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(free_callback2, 5, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(free_callback1, 15, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(free_callback2, 5, etl::timer::mode::Repeating); free_tick_list1.clear(); free_tick_list2.clear(); @@ -611,7 +611,7 @@ namespace { etl::callback_timer<3> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(free_callback1, 5, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(free_callback1, 5, etl::timer::mode::Single_Shot); free_tick_list1.clear(); @@ -651,9 +651,9 @@ namespace { etl::callback_timer<3> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_callback2, 11, etl::timer::mode::Repeating); timer_controller.start(id1); timer_controller.start(id3); @@ -717,7 +717,7 @@ namespace timer_controller.enable(true); - etl::timer::id::type id = timer_controller.register_timer(delegate_callback, 5, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id = timer_controller.register_timer(delegate_callback, 5, etl::timer::mode::Single_Shot); timer_controller.start(id); timer_controller.tick(4); @@ -770,9 +770,9 @@ namespace { FIX_PROCESSOR_AFFINITY; - etl::timer::id::type id1 = controller.register_timer(member_callback, 400, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = controller.register_timer(free_function_callback, 100, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = controller.register_timer(free_callback2, 10, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = controller.register_timer(member_callback, 400, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = controller.register_timer(free_function_callback, 100, etl::timer::mode::Repeating); + etl::timer::id::type id3 = controller.register_timer(free_callback2, 10, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); diff --git a/test/test_callback_timer_atomic.cpp b/test/test_callback_timer_atomic.cpp index 3e96507f..34980b6b 100644 --- a/test/test_callback_timer_atomic.cpp +++ b/test/test_callback_timer_atomic.cpp @@ -121,16 +121,16 @@ namespace { etl::callback_timer_atomic<2, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Single_Shot); CHECK(id1 != etl::timer::id::NO_TIMER); CHECK(id2 != etl::timer::id::NO_TIMER); CHECK(id3 == etl::timer::id::NO_TIMER); timer_controller.clear(); - id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::SINGLE_SHOT); + id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Single_Shot); CHECK(id3 != etl::timer::id::NO_TIMER); } @@ -139,9 +139,9 @@ namespace { etl::callback_timer_atomic<4, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Single_Shot); test.tick_list.clear(); free_tick_list1.clear(); @@ -181,7 +181,7 @@ namespace { etl::callback_timer_atomic<1, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::Single_Shot); test.tick_list.clear(); timer_controller.start(id1); @@ -227,9 +227,9 @@ namespace { etl::callback_timer_atomic<3, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -269,9 +269,9 @@ namespace { etl::callback_timer_atomic<3, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -315,9 +315,9 @@ namespace { etl::callback_timer_atomic<3, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -368,9 +368,9 @@ namespace { etl::callback_timer_atomic<3, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback2, 100, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(member_callback1, 10, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(member_callback1, 22, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback2, 100, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(member_callback1, 10, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(member_callback1, 22, etl::timer::mode::Single_Shot); (void)id2; (void)id3; @@ -405,9 +405,9 @@ namespace { etl::callback_timer_atomic<3, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback2, 100, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(member_callback1, 10, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(member_callback1, 22, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback2, 100, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(member_callback1, 10, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(member_callback1, 22, etl::timer::mode::Single_Shot); (void)id2; (void)id3; @@ -443,8 +443,8 @@ namespace etl::callback_timer_atomic<3, std::atomic_uint32_t> timer_controller; etl::timer::id::type id1; - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -465,7 +465,7 @@ namespace { timer_controller.unregister_timer(id2); - id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::REPEATING); + id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::Repeating); timer_controller.start(id1); } @@ -491,9 +491,9 @@ namespace { etl::callback_timer_atomic<3, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -539,9 +539,9 @@ namespace { etl::callback_timer_atomic<3, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -552,9 +552,9 @@ namespace ticks = 5; timer_controller.tick(uint32_t(ticks)); - timer_controller.start(id1, etl::timer::start::IMMEDIATE); - timer_controller.start(id2, etl::timer::start::IMMEDIATE); - timer_controller.start(id3, etl::timer::start::DELAYED); + timer_controller.start(id1, etl::timer::start::Immediate); + timer_controller.start(id2, etl::timer::start::Immediate); + timer_controller.start(id3, etl::timer::start::Delayed); const uint32_t step = 1U; @@ -582,8 +582,8 @@ namespace { etl::callback_timer_atomic<3, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(free_function_callback1, 15, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback2, 5, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(free_function_callback1, 15, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback2, 5, etl::timer::mode::Repeating); free_tick_list1.clear(); free_tick_list2.clear(); @@ -618,7 +618,7 @@ namespace { etl::callback_timer_atomic<3, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(free_function_callback1, 5, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(free_function_callback1, 5, etl::timer::mode::Single_Shot); free_tick_list1.clear(); @@ -658,9 +658,9 @@ namespace { etl::callback_timer_atomic<3, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating); timer_controller.start(id1); timer_controller.start(id3); @@ -722,7 +722,7 @@ namespace timer_controller.enable(true); - etl::timer::id::type id = timer_controller.register_timer(delegate_callback, 5, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id = timer_controller.register_timer(delegate_callback, 5, etl::timer::mode::Single_Shot); timer_controller.start(id); timer_controller.tick(4); @@ -776,9 +776,9 @@ namespace { FIX_PROCESSOR_AFFINITY; - etl::timer::id::type id1 = controller.register_timer(member_callback1, 400, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = controller.register_timer(free_function_callback1, 100, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = controller.register_timer(free_function_callback2, 10, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = controller.register_timer(member_callback1, 400, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = controller.register_timer(free_function_callback1, 100, etl::timer::mode::Repeating); + etl::timer::id::type id3 = controller.register_timer(free_function_callback2, 10, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); diff --git a/test/test_callback_timer_interrupt.cpp b/test/test_callback_timer_interrupt.cpp index 07268d1e..cbc7d5dd 100644 --- a/test/test_callback_timer_interrupt.cpp +++ b/test/test_callback_timer_interrupt.cpp @@ -134,16 +134,16 @@ namespace { etl::callback_timer_interrupt<2, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Single_Shot); CHECK(id1 != etl::timer::id::NO_TIMER); CHECK(id2 != etl::timer::id::NO_TIMER); CHECK(id3 == etl::timer::id::NO_TIMER); timer_controller.clear(); - id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::SINGLE_SHOT); + id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Single_Shot); CHECK(id3 != etl::timer::id::NO_TIMER); CHECK_EQUAL(0U, ScopedGuard::guard_count); @@ -154,9 +154,9 @@ namespace { etl::callback_timer_interrupt<4, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Single_Shot); test.tick_list.clear(); free_tick_list1.clear(); @@ -198,7 +198,7 @@ namespace { etl::callback_timer_interrupt<1, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Single_Shot); test.tick_list.clear(); timer_controller.start(id1); @@ -246,9 +246,9 @@ namespace { etl::callback_timer_interrupt<3, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -290,9 +290,9 @@ namespace { etl::callback_timer_interrupt<3, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -338,9 +338,9 @@ namespace { etl::callback_timer_interrupt<3, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -393,9 +393,9 @@ namespace { etl::callback_timer_interrupt<3, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback2, 100, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(member_callback, 10, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(member_callback, 22, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback2, 100, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(member_callback, 10, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(member_callback, 22, etl::timer::mode::Single_Shot); (void)id2; (void)id3; @@ -432,9 +432,9 @@ namespace { etl::callback_timer_interrupt<3, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback2, 100, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(member_callback, 10, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(member_callback, 22, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback2, 100, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(member_callback, 10, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(member_callback, 22, etl::timer::mode::Single_Shot); (void)id2; (void)id3; @@ -472,8 +472,8 @@ namespace etl::callback_timer_interrupt<3, ScopedGuard> timer_controller; etl::timer::id::type id1; - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -494,7 +494,7 @@ namespace { timer_controller.unregister_timer(id2); - id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::REPEATING); + id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Repeating); timer_controller.start(id1); } @@ -522,9 +522,9 @@ namespace { etl::callback_timer_interrupt<3, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -572,9 +572,9 @@ namespace { etl::callback_timer_interrupt<3, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -585,9 +585,9 @@ namespace ticks = 5; timer_controller.tick(uint32_t(ticks)); - timer_controller.start(id1, etl::timer::start::IMMEDIATE); - timer_controller.start(id2, etl::timer::start::IMMEDIATE); - timer_controller.start(id3, etl::timer::start::DELAYED); + timer_controller.start(id1, etl::timer::start::Immediate); + timer_controller.start(id2, etl::timer::start::Immediate); + timer_controller.start(id3, etl::timer::start::Delayed); const uint32_t step = 1U; @@ -617,8 +617,8 @@ namespace { etl::callback_timer_interrupt<3, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(free_function_callback, 15, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback2, 5, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(free_function_callback, 15, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback2, 5, etl::timer::mode::Repeating); free_tick_list1.clear(); free_tick_list2.clear(); @@ -655,7 +655,7 @@ namespace { etl::callback_timer_interrupt<3, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(free_function_callback, 5, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(free_function_callback, 5, etl::timer::mode::Single_Shot); free_tick_list1.clear(); @@ -697,9 +697,9 @@ namespace { etl::callback_timer_interrupt<3, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating); timer_controller.start(id1); timer_controller.start(id3); @@ -762,7 +762,7 @@ namespace timer_controller.enable(true); - etl::timer::id::type id = timer_controller.register_timer(delegate_callback, 5, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id = timer_controller.register_timer(delegate_callback, 5, etl::timer::mode::Single_Shot); timer_controller.start(id); timer_controller.tick(4); @@ -820,10 +820,10 @@ namespace constexpr uint32_t T3 = 5U; // Register the timers. - etl::timer::id::type id0 = timer_controller.register_timer(delegate_callback0, T0, etl::timer::mode::REPEATING); - etl::timer::id::type id1 = timer_controller.register_timer(delegate_callback1, T1, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(delegate_callback2, T2, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(delegate_callback3, T3, etl::timer::mode::REPEATING); + etl::timer::id::type id0 = timer_controller.register_timer(delegate_callback0, T0, etl::timer::mode::Repeating); + etl::timer::id::type id1 = timer_controller.register_timer(delegate_callback1, T1, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(delegate_callback2, T2, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(delegate_callback3, T3, etl::timer::mode::Repeating); // Start the repeating timers. timer_controller.start(id0); diff --git a/test/test_callback_timer_locked.cpp b/test/test_callback_timer_locked.cpp index 2d22b94d..4ca6c3a9 100644 --- a/test/test_callback_timer_locked.cpp +++ b/test/test_callback_timer_locked.cpp @@ -161,16 +161,16 @@ namespace etl::callback_timer_locked<2> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Single_Shot); CHECK(id1 != etl::timer::id::NO_TIMER); CHECK(id2 != etl::timer::id::NO_TIMER); CHECK(id3 == etl::timer::id::NO_TIMER); timer_controller.clear(); - id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::SINGLE_SHOT); + id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Single_Shot); CHECK(id3 != etl::timer::id::NO_TIMER); CHECK_EQUAL(0U, locks.lock_count); @@ -186,9 +186,9 @@ namespace etl::callback_timer_locked<4> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Single_Shot); test.tick_list.clear(); free_tick_list1.clear(); @@ -235,7 +235,7 @@ namespace etl::callback_timer_locked<1> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Single_Shot); test.tick_list.clear(); timer_controller.start(id1); @@ -288,9 +288,9 @@ namespace etl::callback_timer_locked<3> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -337,9 +337,9 @@ namespace etl::callback_timer_locked<3> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -390,9 +390,9 @@ namespace etl::callback_timer_locked<3> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -450,9 +450,9 @@ namespace etl::callback_timer_locked<3> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(member_callback2, 100, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(member_callback, 10, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(member_callback, 22, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback2, 100, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(member_callback, 10, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(member_callback, 22, etl::timer::mode::Single_Shot); (void)id2; (void)id3; @@ -494,9 +494,9 @@ namespace etl::callback_timer_locked<3> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(member_callback2, 100, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(member_callback, 10, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(member_callback, 22, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback2, 100, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(member_callback, 10, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(member_callback, 22, etl::timer::mode::Single_Shot); (void)id2; (void)id3; @@ -539,8 +539,8 @@ namespace etl::callback_timer_locked<3> timer_controller(try_lock, lock, unlock); etl::timer::id::type id1; - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -561,7 +561,7 @@ namespace { timer_controller.unregister_timer(id2); - id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::REPEATING); + id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Repeating); timer_controller.start(id1); } @@ -594,9 +594,9 @@ namespace etl::callback_timer_locked<3> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -649,9 +649,9 @@ namespace etl::callback_timer_locked<3> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); @@ -662,9 +662,9 @@ namespace ticks = 5; timer_controller.tick(uint32_t(ticks)); - timer_controller.start(id1, etl::timer::start::IMMEDIATE); - timer_controller.start(id2, etl::timer::start::IMMEDIATE); - timer_controller.start(id3, etl::timer::start::DELAYED); + timer_controller.start(id1, etl::timer::start::Immediate); + timer_controller.start(id2, etl::timer::start::Immediate); + timer_controller.start(id3, etl::timer::start::Delayed); const uint32_t step = 1U; @@ -699,8 +699,8 @@ namespace etl::callback_timer_locked<3> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(free_function_callback, 15, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback2, 5, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(free_function_callback, 15, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback2, 5, etl::timer::mode::Repeating); free_tick_list1.clear(); free_tick_list2.clear(); @@ -742,7 +742,7 @@ namespace etl::callback_timer_locked<3> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(free_function_callback, 5, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(free_function_callback, 5, etl::timer::mode::Single_Shot); free_tick_list1.clear(); @@ -806,7 +806,7 @@ namespace timer_controller.enable(true); - etl::timer::id::type id = timer_controller.register_timer(delegate_callback, 5, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id = timer_controller.register_timer(delegate_callback, 5, etl::timer::mode::Single_Shot); timer_controller.start(id); timer_controller.tick(4); @@ -828,9 +828,9 @@ namespace etl::callback_timer_locked<3> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating); timer_controller.start(id1); timer_controller.start(id3); @@ -953,9 +953,9 @@ namespace { FIX_PROCESSOR_AFFINITY; - etl::timer::id::type id1 = controller.register_timer(member_callback, 400, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = controller.register_timer(free_function_callback, 100, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = controller.register_timer(free_function_callback2, 10, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = controller.register_timer(member_callback, 400, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = controller.register_timer(free_function_callback, 100, etl::timer::mode::Repeating); + etl::timer::id::type id3 = controller.register_timer(free_function_callback2, 10, etl::timer::mode::Repeating); test.tick_list.clear(); free_tick_list1.clear(); diff --git a/test/test_message_timer.cpp b/test/test_message_timer.cpp index e448dad5..3f27e81e 100644 --- a/test/test_message_timer.cpp +++ b/test/test_message_timer.cpp @@ -141,16 +141,16 @@ namespace { etl::message_timer<2> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Single_Shot); CHECK(id1 != etl::timer::id::NO_TIMER); CHECK(id2 != etl::timer::id::NO_TIMER); CHECK(id3 == etl::timer::id::NO_TIMER); timer_controller.clear(); - id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::SINGLE_SHOT); + id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Single_Shot); CHECK(id3 != etl::timer::id::NO_TIMER); } @@ -159,9 +159,9 @@ namespace { etl::message_timer<3> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Single_Shot); router1.clear(); @@ -195,7 +195,7 @@ namespace { etl::message_timer<1> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Single_Shot); router1.clear(); timer_controller.start(id1); @@ -241,9 +241,9 @@ namespace { etl::message_timer<3> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -277,9 +277,9 @@ namespace { etl::message_timer<3> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -317,9 +317,9 @@ namespace { etl::message_timer<3> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -365,8 +365,8 @@ namespace etl::message_timer<3> timer_controller; etl::timer::id::type id1; - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -385,7 +385,7 @@ namespace { timer_controller.unregister_timer(id2); - id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); + id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); timer_controller.start(id1); } @@ -407,9 +407,9 @@ namespace { etl::message_timer<3> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -449,9 +449,9 @@ namespace { etl::message_timer<3> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, bus1, 37, etl::timer::mode::SINGLE_SHOT, ROUTER1); - etl::timer::id::type id2 = timer_controller.register_timer(message2, bus1, 23, etl::timer::mode::SINGLE_SHOT, ROUTER1); - etl::timer::id::type id3 = timer_controller.register_timer(message3, bus1, 11, etl::timer::mode::SINGLE_SHOT, etl::imessage_router::ALL_MESSAGE_ROUTERS); + etl::timer::id::type id1 = timer_controller.register_timer(message1, bus1, 37, etl::timer::mode::Single_Shot, ROUTER1); + etl::timer::id::type id2 = timer_controller.register_timer(message2, bus1, 23, etl::timer::mode::Single_Shot, ROUTER1); + etl::timer::id::type id3 = timer_controller.register_timer(message3, bus1, 11, etl::timer::mode::Single_Shot, etl::imessage_router::ALL_MESSAGE_ROUTERS); bus1.subscribe(router1); @@ -487,9 +487,9 @@ namespace { etl::message_timer<3> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -502,9 +502,9 @@ namespace ticks = 5; timer_controller.tick(uint32_t(ticks)); - timer_controller.start(id1, etl::timer::start::IMMEDIATE); - timer_controller.start(id2, etl::timer::start::IMMEDIATE); - timer_controller.start(id3, etl::timer::start::DELAYED); + timer_controller.start(id1, etl::timer::start::Immediate); + timer_controller.start(id2, etl::timer::start::Immediate); + timer_controller.start(id3, etl::timer::start::Delayed); const uint32_t step = 1UL; @@ -528,8 +528,8 @@ namespace { etl::message_timer<3> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 15, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 5, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 15, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 5, etl::timer::mode::Repeating); router1.clear(); @@ -560,7 +560,7 @@ namespace { etl::message_timer<3> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 5, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 5, etl::timer::mode::Single_Shot); router1.clear(); @@ -598,9 +598,9 @@ namespace { etl::message_timer<3> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -686,9 +686,9 @@ namespace { FIX_PROCESSOR_AFFINITY; - etl::timer::id::type id1 = controller.register_timer(message1, router1, 400, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = controller.register_timer(message2, router1, 100, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = controller.register_timer(message3, router1, 10, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = controller.register_timer(message1, router1, 400, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = controller.register_timer(message2, router1, 100, etl::timer::mode::Repeating); + etl::timer::id::type id3 = controller.register_timer(message3, router1, 10, etl::timer::mode::Repeating); router1.clear(); diff --git a/test/test_message_timer_atomic.cpp b/test/test_message_timer_atomic.cpp index 01d6726c..f8683f50 100644 --- a/test/test_message_timer_atomic.cpp +++ b/test/test_message_timer_atomic.cpp @@ -141,16 +141,16 @@ namespace { etl::message_timer_atomic<2, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Single_Shot); CHECK(id1 != etl::timer::id::NO_TIMER); CHECK(id2 != etl::timer::id::NO_TIMER); CHECK(id3 == etl::timer::id::NO_TIMER); timer_controller.clear(); - id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::SINGLE_SHOT); + id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Single_Shot); CHECK(id3 != etl::timer::id::NO_TIMER); } @@ -159,9 +159,9 @@ namespace { etl::message_timer_atomic<3, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Single_Shot); router1.clear(); @@ -195,7 +195,7 @@ namespace { etl::message_timer_atomic<1, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Single_Shot); router1.clear(); timer_controller.start(id1); @@ -241,9 +241,9 @@ namespace { etl::message_timer_atomic<3, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -277,9 +277,9 @@ namespace { etl::message_timer_atomic<3, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -317,9 +317,9 @@ namespace { etl::message_timer_atomic<3, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -365,8 +365,8 @@ namespace etl::message_timer_atomic<3, std::atomic_uint32_t> timer_controller; etl::timer::id::type id1; - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -385,7 +385,7 @@ namespace { timer_controller.unregister_timer(id2); - id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); + id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); timer_controller.start(id1); } @@ -407,9 +407,9 @@ namespace { etl::message_timer_atomic<3, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -449,9 +449,9 @@ namespace { etl::message_timer_atomic<3, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, bus1, 37, etl::timer::mode::SINGLE_SHOT, ROUTER1); - etl::timer::id::type id2 = timer_controller.register_timer(message2, bus1, 23, etl::timer::mode::SINGLE_SHOT, ROUTER1); - etl::timer::id::type id3 = timer_controller.register_timer(message3, bus1, 11, etl::timer::mode::SINGLE_SHOT, etl::imessage_router::ALL_MESSAGE_ROUTERS); + etl::timer::id::type id1 = timer_controller.register_timer(message1, bus1, 37, etl::timer::mode::Single_Shot, ROUTER1); + etl::timer::id::type id2 = timer_controller.register_timer(message2, bus1, 23, etl::timer::mode::Single_Shot, ROUTER1); + etl::timer::id::type id3 = timer_controller.register_timer(message3, bus1, 11, etl::timer::mode::Single_Shot, etl::imessage_router::ALL_MESSAGE_ROUTERS); bus1.subscribe(router1); @@ -487,9 +487,9 @@ namespace { etl::message_timer_atomic<3, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -502,9 +502,9 @@ namespace ticks = 5; timer_controller.tick(uint32_t(ticks)); - timer_controller.start(id1, etl::timer::start::IMMEDIATE); - timer_controller.start(id2, etl::timer::start::IMMEDIATE); - timer_controller.start(id3, etl::timer::start::DELAYED); + timer_controller.start(id1, etl::timer::start::Immediate); + timer_controller.start(id2, etl::timer::start::Immediate); + timer_controller.start(id3, etl::timer::start::Delayed); const uint32_t step = 1UL; @@ -528,8 +528,8 @@ namespace { etl::message_timer_atomic<3, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 15, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 5, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 15, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 5, etl::timer::mode::Repeating); router1.clear(); @@ -560,7 +560,7 @@ namespace { etl::message_timer_atomic<3, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 5, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 5, etl::timer::mode::Single_Shot); router1.clear(); @@ -598,9 +598,9 @@ namespace { etl::message_timer_atomic<3, std::atomic_uint32_t> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -686,9 +686,9 @@ namespace { FIX_PROCESSOR_AFFINITY; - etl::timer::id::type id1 = controller.register_timer(message1, router1, 400, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = controller.register_timer(message2, router1, 100, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = controller.register_timer(message3, router1, 10, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = controller.register_timer(message1, router1, 400, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = controller.register_timer(message2, router1, 100, etl::timer::mode::Repeating); + etl::timer::id::type id3 = controller.register_timer(message3, router1, 10, etl::timer::mode::Repeating); router1.clear(); diff --git a/test/test_message_timer_interrupt.cpp b/test/test_message_timer_interrupt.cpp index 0b9d9722..d1601bdb 100644 --- a/test/test_message_timer_interrupt.cpp +++ b/test/test_message_timer_interrupt.cpp @@ -164,16 +164,16 @@ namespace { etl::message_timer_interrupt<2, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Single_Shot); CHECK(id1 != etl::timer::id::NO_TIMER); CHECK(id2 != etl::timer::id::NO_TIMER); CHECK(id3 == etl::timer::id::NO_TIMER); timer_controller.clear(); - id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::SINGLE_SHOT); + id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Single_Shot); CHECK(id3 != etl::timer::id::NO_TIMER); CHECK_EQUAL(0U, ScopedGuard::guard_count); @@ -184,9 +184,9 @@ namespace { etl::message_timer_interrupt<3, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Single_Shot); router1.clear(); @@ -222,7 +222,7 @@ namespace { etl::message_timer_interrupt<1, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Single_Shot); router1.clear(); timer_controller.start(id1); @@ -270,9 +270,9 @@ namespace { etl::message_timer_interrupt<3, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -308,9 +308,9 @@ namespace { etl::message_timer_interrupt<3, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -350,9 +350,9 @@ namespace { etl::message_timer_interrupt<3, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -400,8 +400,8 @@ namespace etl::message_timer_interrupt<3, ScopedGuard> timer_controller; etl::timer::id::type id1; - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -420,7 +420,7 @@ namespace { timer_controller.unregister_timer(id2); - id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); + id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); timer_controller.start(id1); } @@ -444,9 +444,9 @@ namespace { etl::message_timer_interrupt<3, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -488,9 +488,9 @@ namespace { etl::message_timer_interrupt<3, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, bus1, 37, etl::timer::mode::SINGLE_SHOT, ROUTER1); - etl::timer::id::type id2 = timer_controller.register_timer(message2, bus1, 23, etl::timer::mode::SINGLE_SHOT, ROUTER1); - etl::timer::id::type id3 = timer_controller.register_timer(message3, bus1, 11, etl::timer::mode::SINGLE_SHOT, etl::imessage_router::ALL_MESSAGE_ROUTERS); + etl::timer::id::type id1 = timer_controller.register_timer(message1, bus1, 37, etl::timer::mode::Single_Shot, ROUTER1); + etl::timer::id::type id2 = timer_controller.register_timer(message2, bus1, 23, etl::timer::mode::Single_Shot, ROUTER1); + etl::timer::id::type id3 = timer_controller.register_timer(message3, bus1, 11, etl::timer::mode::Single_Shot, etl::imessage_router::ALL_MESSAGE_ROUTERS); bus1.subscribe(router1); @@ -528,9 +528,9 @@ namespace { etl::message_timer_interrupt<3, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -543,9 +543,9 @@ namespace ticks = 5; timer_controller.tick(uint32_t(ticks)); - timer_controller.start(id1, etl::timer::start::IMMEDIATE); - timer_controller.start(id2, etl::timer::start::IMMEDIATE); - timer_controller.start(id3, etl::timer::start::DELAYED); + timer_controller.start(id1, etl::timer::start::Immediate); + timer_controller.start(id2, etl::timer::start::Immediate); + timer_controller.start(id3, etl::timer::start::Delayed); const uint32_t step = 1UL; @@ -571,8 +571,8 @@ namespace { etl::message_timer_interrupt<3, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 15, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 5, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 15, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 5, etl::timer::mode::Repeating); router1.clear(); @@ -605,7 +605,7 @@ namespace { etl::message_timer_interrupt<3, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 5, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 5, etl::timer::mode::Single_Shot); router1.clear(); @@ -645,9 +645,9 @@ namespace { etl::message_timer_interrupt<3, ScopedGuard> timer_controller; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -756,10 +756,10 @@ namespace constexpr uint32_t T4 = 5U; // Register the timers. - etl::timer::id::type id1 = timer_controller.register_timer(message1, router, T1, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router, T2, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router, T3, etl::timer::mode::REPEATING); - etl::timer::id::type id4 = timer_controller.register_timer(message4, router, T4, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router, T1, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router, T2, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router, T3, etl::timer::mode::Repeating); + etl::timer::id::type id4 = timer_controller.register_timer(message4, router, T4, etl::timer::mode::Repeating); // Start the repeating timers. timer_controller.start(id1); diff --git a/test/test_message_timer_locked.cpp b/test/test_message_timer_locked.cpp index 18383756..0e866be6 100644 --- a/test/test_message_timer_locked.cpp +++ b/test/test_message_timer_locked.cpp @@ -184,16 +184,16 @@ namespace etl::message_timer_locked<2> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Single_Shot); CHECK(id1 != etl::timer::id::NO_TIMER); CHECK(id2 != etl::timer::id::NO_TIMER); CHECK(id3 == etl::timer::id::NO_TIMER); timer_controller.clear(); - id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::SINGLE_SHOT); + id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Single_Shot); CHECK(id3 != etl::timer::id::NO_TIMER); CHECK_EQUAL(0U, locks.lock_count); @@ -209,9 +209,9 @@ namespace etl::message_timer_locked<3> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Single_Shot); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Single_Shot); router1.clear(); @@ -252,7 +252,7 @@ namespace etl::message_timer_locked<1> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Single_Shot); router1.clear(); timer_controller.start(id1); @@ -305,9 +305,9 @@ namespace etl::message_timer_locked<3> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -348,9 +348,9 @@ namespace etl::message_timer_locked<3> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -395,9 +395,9 @@ namespace etl::message_timer_locked<3> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -450,8 +450,8 @@ namespace etl::message_timer_locked<3> timer_controller(try_lock, lock, unlock); etl::timer::id::type id1; - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -470,7 +470,7 @@ namespace { timer_controller.unregister_timer(id2); - id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); + id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); timer_controller.start(id1); } @@ -499,9 +499,9 @@ namespace etl::message_timer_locked<3> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -548,9 +548,9 @@ namespace etl::message_timer_locked<3> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(message1, bus1, 37, etl::timer::mode::SINGLE_SHOT, ROUTER1); - etl::timer::id::type id2 = timer_controller.register_timer(message2, bus1, 23, etl::timer::mode::SINGLE_SHOT, ROUTER1); - etl::timer::id::type id3 = timer_controller.register_timer(message3, bus1, 11, etl::timer::mode::SINGLE_SHOT, etl::imessage_router::ALL_MESSAGE_ROUTERS); + etl::timer::id::type id1 = timer_controller.register_timer(message1, bus1, 37, etl::timer::mode::Single_Shot, ROUTER1); + etl::timer::id::type id2 = timer_controller.register_timer(message2, bus1, 23, etl::timer::mode::Single_Shot, ROUTER1); + etl::timer::id::type id3 = timer_controller.register_timer(message3, bus1, 11, etl::timer::mode::Single_Shot, etl::imessage_router::ALL_MESSAGE_ROUTERS); bus1.subscribe(router1); @@ -593,9 +593,9 @@ namespace etl::message_timer_locked<3> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -608,9 +608,9 @@ namespace ticks = 5; timer_controller.tick(uint32_t(ticks)); - timer_controller.start(id1, etl::timer::start::IMMEDIATE); - timer_controller.start(id2, etl::timer::start::IMMEDIATE); - timer_controller.start(id3, etl::timer::start::DELAYED); + timer_controller.start(id1, etl::timer::start::Immediate); + timer_controller.start(id2, etl::timer::start::Immediate); + timer_controller.start(id3, etl::timer::start::Delayed); const uint32_t step = 1UL; @@ -641,8 +641,8 @@ namespace etl::message_timer_locked<3> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 15, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 5, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 15, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 5, etl::timer::mode::Repeating); router1.clear(); @@ -680,7 +680,7 @@ namespace etl::message_timer_locked<3> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 5, etl::timer::mode::SINGLE_SHOT); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 5, etl::timer::mode::Single_Shot); router1.clear(); @@ -725,9 +725,9 @@ namespace etl::message_timer_locked<3> timer_controller(try_lock, lock, unlock); - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::REPEATING); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Repeating); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Repeating); router1.clear(); @@ -818,9 +818,9 @@ namespace { FIX_PROCESSOR_AFFINITY; - etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 400, etl::timer::mode::SINGLE_SHOT); - etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 100, etl::timer::mode::REPEATING); - etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 10, etl::timer::mode::REPEATING); + etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 400, etl::timer::mode::Single_Shot); + etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 100, etl::timer::mode::Repeating); + etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 10, etl::timer::mode::Repeating); router1.clear();