Skip to content

Fix ESP8266 Arduino Core compatibility #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bozont wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix ESP8266 Arduino Core compatibility #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a841ae4
Fix ESP8266 Arduino Core compatibility
bozont Jan 27, 2020
62fd912
Correct formatting to avoid compiler warning for misleading identation
bozont Jun 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions TickerScheduler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ TickerScheduler::~TickerScheduler()
this->size = 0;
}

void TickerScheduler::handleTickerFlag(volatile bool * flag)
void TickerScheduler::handleTickerFlag(bool * flag)
{
if (!*flag)
*flag = true;
}

void TickerScheduler::handleTicker(tscallback_t f, void * arg, volatile bool * flag)
void TickerScheduler::handleTicker(tscallback_t f, void * arg, bool * flag)
{
if (*flag)
{
Expand Down Expand Up @@ -78,11 +78,10 @@ bool TickerScheduler::disable(uint8_t i)

bool TickerScheduler::enable(uint8_t i)
{
if (i >= this->size || !this->items[i].is_used)
return false;
if (i >= this->size || !this->items[i].is_used) return false;

volatile bool * flag = &this->items[i].flag;
this->items[i].t.attach_ms(this->items[i].period, TickerScheduler::handleTickerFlag, flag);
bool * flag = &this->items[i].flag;
this->items[i].t.attach_ms(this->items[i].period, TickerScheduler::handleTickerFlag, flag);

return true;
}
Expand Down
6 changes: 3 additions & 3 deletions TickerScheduler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ typedef void(*tscallback_t)(void*);
struct TickerSchedulerItem
{
Ticker t;
volatile bool flag = false;
bool flag = false;
tscallback_t cb;
void * cb_arg;
uint32_t period;
Expand All @@ -72,8 +72,8 @@ class TickerScheduler
uint8_t size;
TickerSchedulerItem *items = NULL;

void handleTicker(tscallback_t, void *, volatile bool * flag);
static void handleTickerFlag(volatile bool * flag);
void handleTicker(tscallback_t, void *, bool * flag);
static void handleTickerFlag(bool * flag);

public:
TickerScheduler(uint8_t size);
Expand Down