Skip to content

Chaining in Ticker - switched arguments [fix] #28

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
merged 1 commit into from
Aug 15, 2013
Merged

Chaining in Ticker - switched arguments [fix] #28

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
4 changes: 2 additions & 2 deletions libraries/mbed/api/Ticker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class Ticker : public TimerEvent {
*/
template<typename T>
pFunctionPointer_t attach(T* tptr, void (T::*mptr)(void), float t) {
return attach_us(tptr, mptr, t * 1000000.0f);
return attach_us(tptr, mptr, t * 1000000.0f);
}

/** Add a function to be called by the Ticker at the end of the call chain
Expand Down Expand Up @@ -158,7 +158,7 @@ class Ticker : public TimerEvent {
*/
template<typename T>
pFunctionPointer_t attach_us(T* tptr, void (T::*mptr)(void), unsigned int t) {
pFunctionPointer_t pf = _chain.add(mptr, tptr);
pFunctionPointer_t pf = _chain.add(tptr, mptr);
setup(t);
return pf;
}
Expand Down