Merge pull request #50 from soburi/correct_micros

soburi · web-flow · commit c05a37db4cc7 · 2017-09-13T22:57:45.000+09:00
Correcting the calculation of micros()
diff --git a/cores/arduino/delay.c b/cores/arduino/delay.c
@@ -36,7 +36,7 @@ unsigned long millis( void )
 // values to calculate micros. If there is a pending SysTick, add one to the millis counter in the calculation.
 unsigned long micros( void )
 {
-	return RTIMER_NOW() * 1000000/RTIMER_ARCH_SECOND;
+	return RTIMER_NOW() /(RTIMER_ARCH_SECOND/1000000);
 }
 
 static struct etimer delay_timer;

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ unsigned long millis( void )`
`36`	`36`	`// values to calculate micros. If there is a pending SysTick, add one to the millis counter in the calculation.`
`37`	`37`	`unsigned long micros( void )`
`38`	`38`	`{`
`39`		`- return RTIMER_NOW() * 1000000/RTIMER_ARCH_SECOND;`
	`39`	`+ return RTIMER_NOW() /(RTIMER_ARCH_SECOND/1000000);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`static struct etimer delay_timer;`