auto-sync
This commit is contained in:
parent
14d6bbd0cf
commit
9d2eddd419
|
@ -24,8 +24,8 @@
|
||||||
#include "rfiutil.h"
|
#include "rfiutil.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
not used, not sure if we still need it. I guess we will remove it in 2015
|
not used, not sure if we still need it. I guess we will remove it in 2015
|
||||||
int mylog10(int param) {
|
int mylog10(int param) {
|
||||||
if (param < 10)
|
if (param < 10)
|
||||||
return 0;
|
return 0;
|
||||||
if (param < 100)
|
if (param < 100)
|
||||||
|
@ -44,39 +44,30 @@ int mylog10(int param) {
|
||||||
return 7;
|
return 7;
|
||||||
#warning This would be better without recursion
|
#warning This would be better without recursion
|
||||||
return mylog10(param / 10) + 1;
|
return mylog10(param / 10) + 1;
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
char hexChar(int v) {
|
char hexChar(int v) {
|
||||||
v = v & 0xF;
|
v = v & 0xF;
|
||||||
if (v < 10)
|
if (v < 10)
|
||||||
return (char)('0' + v);
|
return (char)('0' + v);
|
||||||
return 'A' - 10 + v;
|
return 'A' - 10 + v;
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void chVTSetAny(virtual_timer_t *vtp, systime_t time, vtfunc_t vtfunc, void *par) {
|
void chVTSetAny(virtual_timer_t *vtp, systime_t time, vtfunc_t vtfunc, void *par) {
|
||||||
if (isIsrContext()) {
|
|
||||||
bool wasLocked = lockAnyContext();
|
bool wasLocked = lockAnyContext();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* todo: this could be simplified once we migrate to ChibiOS 3.0
|
* todo: this could be simplified once we migrate to ChibiOS 3.0
|
||||||
* See http://www.chibios.org/dokuwiki/doku.php?id=chibios:howtos:porting_from_2_to_3
|
* See http://www.chibios.org/dokuwiki/doku.php?id=chibios:howtos:porting_from_2_to_3
|
||||||
*/
|
*/
|
||||||
if (chVTIsArmedI(vtp))
|
if (chVTIsArmedI(vtp)) {
|
||||||
chVTResetI(vtp);
|
chVTResetI(vtp);
|
||||||
|
}
|
||||||
|
|
||||||
chVTSetI(vtp, time, vtfunc, par);
|
chVTSetI(vtp, time, vtfunc, par);
|
||||||
if (!wasLocked)
|
if (!wasLocked) {
|
||||||
chSysUnlockFromIsr()
|
unlockAnyContext();
|
||||||
;
|
|
||||||
} else {
|
|
||||||
chSysLock()
|
|
||||||
;
|
|
||||||
if (chVTIsArmedI(vtp))
|
|
||||||
chVTResetI(vtp);
|
|
||||||
chVTSetI(vtp, time, vtfunc, par);
|
|
||||||
chSysUnlock()
|
|
||||||
;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue