Skip to content

Use unsigned long for representing times. #4

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

Merged
ivanseidel merged 1 commit into from
Jun 11, 2015
Merged

Use unsigned long for representing times. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 10 additions & 15 deletions Thread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "Thread.h"

Thread::Thread(void (*callback)(void), long _interval){
Thread::Thread(void (*callback)(void), unsigned long _interval){
enabled = true;
onRun(callback);
_cached_next_run = 0;
Expand All @@ -15,33 +15,28 @@ Thread::Thread(void (*callback)(void), long _interval){
setInterval(_interval);
};

void Thread::runned(long time){
// If less than 0, than get current ticks
if(time < 0)
time = millis();

void Thread::runned(unsigned long time){
// Saves last_run
last_run = time;

// Cache next run
_cached_next_run = last_run + interval;
}

void Thread::setInterval(long _interval){
// Filter intervals less than 0
interval = (_interval < 0? 0: _interval);
void Thread::setInterval(unsigned long _interval){
// Save interval
interval = _interval;

// Cache the next run based on the last_run
_cached_next_run = last_run + interval;
}

bool Thread::shouldRun(long time){
// If less than 0, than get current ticks
if(time < 0)
time = millis();
bool Thread::shouldRun(unsigned long time){
// If the "sign" bit is set the signed difference would be negative
bool time_remaining = (time - _cached_next_run) & 0x80000000;

// Exceeded the time limit, AND is enabled? Then should run...
return ((time >= _cached_next_run) && enabled);
return !time_remaining && enabled;
}

void Thread::onRun(void (*callback)(void)){
Expand All @@ -54,4 +49,4 @@ void Thread::run(){

// Update last_run and _cached_next_run
runned();
}
}
20 changes: 13 additions & 7 deletions Thread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,24 @@
class Thread{
protected:
// Desired interval between runs
long interval;
unsigned long interval;

// Last runned time in Ms
long last_run;
unsigned long last_run;

// Scheduled run in Ms (MUST BE CACHED)
long _cached_next_run;
unsigned long _cached_next_run;

/*
IMPORTANT! Run after all calls to run()
Updates last_run and cache next run.
NOTE: This MUST be called if extending
this class and implementing run() method
*/
void runned(long time=-1);
void runned(unsigned long time);

// Default is to mark it runned "now"
void runned() { runned(millis()); }

// Callback for run() if not implemented
void (*_onRun)(void);
Expand All @@ -65,13 +68,16 @@ class Thread{
String ThreadName;
#endif

Thread(void (*callback)(void) = NULL, long _interval = 0);
Thread(void (*callback)(void) = NULL, unsigned long _interval = 0);

// Set the desired interval for calls, and update _cached_next_run
virtual void setInterval(long _interval);
virtual void setInterval(unsigned long _interval);

// Return if the Thread should be runned or not
virtual bool shouldRun(long time = -1);
virtual bool shouldRun(unsigned long time);

// Default is to check whether it should run "now"
bool shouldRun() { return shouldRun(millis()); }

// Callback set
void onRun(void (*callback)(void));
Expand Down
6 changes: 3 additions & 3 deletions ThreadController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "Thread.h"
#include "ThreadController.h"

ThreadController::ThreadController(long _interval): Thread(){
ThreadController::ThreadController(unsigned long _interval): Thread(){
cached_size = 0;

clear();
Expand All @@ -22,7 +22,7 @@ void ThreadController::run(){
if(_onRun != NULL)
_onRun();

long time = millis();
unsigned long time = millis();
int checks = 0;
for(int i = 0; i < MAX_THREADS && checks <= cached_size; i++){
// Object exists? Is enabled? Timeout exceeded?
Expand Down Expand Up @@ -112,4 +112,4 @@ Thread* ThreadController::get(int index){
}

return NULL;
}
}
2 changes: 1 addition & 1 deletion ThreadController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ThreadController: public Thread{
Thread* thread[MAX_THREADS];
int cached_size;
public:
ThreadController(long _interval = 0);
ThreadController(unsigned long _interval = 0);

// run() Method is overrided
void run();
Expand Down