Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed millis() and micros()

This commit is contained in:
Andrew Tridgell 2011-10-09 21:21:50 +11:00
parent 8c8ad0cd55
commit eebd632967
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/Desktop/support/Arduino.cpp
View File

@ -25,8 +25,8 @@ long unsigned int millis(void)
extern struct timeval sketch_start_time;
struct timeval tp;
gettimeofday(&tp,NULL);
return 1.0e3*(tp.tv_sec + (tp.tv_usec*1.0e-6)) -
(sketch_start_time.tv_sec + (sketch_start_time.tv_usec*1.0e-6));
return 1.0e3*((tp.tv_sec + (tp.tv_usec*1.0e-6)) -
(sketch_start_time.tv_sec + (sketch_start_time.tv_usec*1.0e-6)));
}
long unsigned int micros(void)
@ -34,8 +34,8 @@ long unsigned int micros(void)
extern struct timeval sketch_start_time;
struct timeval tp;
gettimeofday(&tp,NULL);
return 1.0e6*(tp.tv_sec + (tp.tv_usec*1.0e-6)) -
(sketch_start_time.tv_sec + (sketch_start_time.tv_usec*1.0e-6));
return 1.0e6*((tp.tv_sec + (tp.tv_usec*1.0e-6)) -
(sketch_start_time.tv_sec + (sketch_start_time.tv_usec*1.0e-6)));
}
void delay(long unsigned msec)