ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #28 from 0xc0170/ticker_chaining_bug 

Chaining in Ticker - switched arguments [fix]
pull/31/merge
Bogdan Marinescu 2013-08-15 00:36:59 -07:00
parent de715aed95 3d9be83e38
commit 092da0d425
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/mbed/api/Ticker.h
View File

@ -104,7 +104,7 @@ public:
*/
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
@ -158,7 +158,7 @@ public:
*/
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;
}