coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-04-30 19:09:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added missing C++11 conditional compilation in callback_timer.h

Browse Source
This commit is contained in:
John Wellbelove 2019-11-27 10:35:41 +00:00
parent 98f1fcef13
commit afeb63575e
5 changed files with 57 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
include/etl/callback_timer.h
View File

@ -132,23 +132,25 @@ namespace etl
{
}
//*******************************************
/// ETL delegate callback
//*******************************************
callback_timer_data(etl::timer::id::type id_,
etl::delegate<void()>& callback_,
uint32_t period_,
bool repeating_)
: p_callback(reinterpret_cast<void*>(&callback_)),
period(period_),
delta(etl::timer::state::INACTIVE),
id(id_),
previous(etl::timer::id::NO_TIMER),
next(etl::timer::id::NO_TIMER),
repeating(repeating_),
cbk_type(DELEGATE)
{
}
#if ETL_CPP11_SUPPORTED
//*******************************************
/// ETL delegate callback
//*******************************************
callback_timer_data(etl::timer::id::type id_,
etl::delegate<void()>& callback_,
uint32_t period_,
bool repeating_)
: p_callback(reinterpret_cast<void*>(&callback_)),
period(period_),
delta(etl::timer::state::INACTIVE),
id(id_),
previous(etl::timer::id::NO_TIMER),
next(etl::timer::id::NO_TIMER),
repeating(repeating_),
cbk_type(DELEGATE)
{
}
#endif
//*******************************************
/// Returns true if the timer is active.
@ -434,38 +436,38 @@ namespace etl
return id;
}
//*******************************************
/// Register a timer.
//*******************************************
//*******************************************
/// Register a timer.
//*******************************************
#if ETL_CPP11_SUPPORTED
etl::timer::id::type register_timer(etl::delegate<void()>& callback_,
uint32_t period_,
bool repeating_)
{
etl::timer::id::type id = etl::timer::id::NO_TIMER;
etl::timer::id::type register_timer(etl::delegate<void()>& callback_,
uint32_t period_,
bool repeating_)
{
etl::timer::id::type id = etl::timer::id::NO_TIMER;
bool is_space = (registered_timers < MAX_TIMERS);
bool is_space = (registered_timers < MAX_TIMERS);
if (is_space)
{
// Search for the free space.
for (uint_least8_t i = 0; i < MAX_TIMERS; ++i)
{
etl::callback_timer_data& timer = timer_array[i];
if (is_space)
{
// Search for the free space.
for (uint_least8_t i = 0; i < MAX_TIMERS; ++i)
{
etl::callback_timer_data& timer = timer_array[i];
if (timer.id == etl::timer::id::NO_TIMER)
{
// Create in-place.
new (&timer) callback_timer_data(i, callback_, period_, repeating_);
++registered_timers;
id = i;
break;
}
}
}
if (timer.id == etl::timer::id::NO_TIMER)
{
// Create in-place.
new (&timer) callback_timer_data(i, callback_, period_, repeating_);
++registered_timers;
id = i;
break;
}
}
}
return id;
}
return id;
}
#endif
//*******************************************
@ -576,11 +578,13 @@ namespace etl
// Call the function wrapper callback.
(*reinterpret_cast<etl::ifunction<void>*>(timer.p_callback))();
}
#if ETL_CPP11_SUPPORTED
else if(timer.cbk_type == callback_timer_data::DELEGATE)
{
// Call the function wrapper callback.
(*reinterpret_cast<etl::delegate<void()>*>(timer.p_callback))();
}
#endif
else
{
ETL_ALWAYS_ASSERT("Callback timer has incorrect callback type stored");
@ -618,7 +622,7 @@ namespace etl
// Registered timer?
if (timer.id != etl::timer::id::NO_TIMER)
{
{
// Has a valid period.
if (timer.period != etl::timer::state::INACTIVE)
{
@ -633,7 +637,7 @@ namespace etl
ETL_ENABLE_TIMER_UPDATES;
result = true;
}
}
}
}

2
include/etl/version.h
View File

@ -39,7 +39,7 @@ SOFTWARE.
#define ETL_VERSION_MAJOR 14
#define ETL_VERSION_MINOR 38
#define ETL_VERSION_PATCH 0
#define ETL_VERSION_PATCH 1
#define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) "." ETL_STRINGIFY(ETL_VERSION_MINOR) "." ETL_STRINGIFY(ETL_VERSION_PATCH)
#define ETL_VERSION_W ETL_STRINGIFY(ETL_VERSION_MAJOR) L"." ETL_STRINGIFY(ETL_VERSION_MINOR) L"." ETL_STRINGIFY(ETL_VERSION_PATCH)

2
library.json
View File

@ -1,6 +1,6 @@
{
"name": "Embedded Template Library",
"version": "14.38.0",
"version": "14.38.1",
"authors": {
"name": "John Wellbelove",
"email": "<john.wellbelove@etlcpp.com>"

2
library.properties
View File

@ -1,5 +1,5 @@
name=Embedded Template Library
version=14.38.0
version=14.38.1
author= John Wellbelove <john.wellbelove@etlcpp.com>
maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
license=MIT

4
support/Release notes.txt
View File

@ -1,3 +1,7 @@
===============================================================================
14.38.1
Added missing C++11 conditional compilation in callback_timer.h
===============================================================================
14.38.0
Added optional to force string and string_view construction from character