zrzk
/
zr-v4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fixed millis() and micros()

master
Andrew Tridgell 14 years ago
parent
8c8ad0cd55
commit
eebd632967
1 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      libraries/Desktop/support/Arduino.cpp

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

@ -25,8 +25,8 @@ long unsigned int millis(void) @@ -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) @@ -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)

Write Preview
Loading…
Cancel
Save