Fixed (improved, at least) millis(), changed printString to take (char *) instead of (unsigned char *) to work with string literals (e.g. printString("hello");) in C++.

damellis · damellis · commit ddb612029958 · 2006-02-12T16:01:59.000Z
diff --git a/targets/arduino/wiring.c b/targets/arduino/wiring.c
@@ -212,7 +212,7 @@ void printNewline()
 	printByte('\n');
 }
 
-void printString(unsigned char *s)
+void printString(char *s)
 {
 	while (*s)
 		printByte(*s++);
@@ -284,7 +284,9 @@ unsigned long millis()
 	// overflows when it reaches 256.  we calculate the total
 	// number of clock cycles, then divide by the number of clock
 	// cycles per millisecond.
-	return timer0GetOverflowCount() * timer0GetPrescaler() * 256L / (F_CPU / 1000L);
+	//return timer0GetOverflowCount() * timer0GetPrescaler() * 256L / (F_CPU / 1000L);
+	return (unsigned long) timer0GetOverflowCount() * timer0GetPrescaler() * 2UL / (F_CPU / 128000UL);
+	//return (((unsigned long) timer0GetOverflowCount()) / 62UL) * (unsigned long) timer0GetPrescaler();
 }
 
 void delay(unsigned long ms)

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ void printNewline()`
`212`	`212`	`printByte('\n');`
`213`	`213`	`}`
`214`	`214`
`215`		`-void printString(unsigned char *s)`
	`215`	`+void printString(char *s)`
`216`	`216`	`{`
`217`	`217`	`while (*s)`
`218`	`218`	`printByte(*s++);`
`@@ -284,7 +284,9 @@ unsigned long millis()`
`284`	`284`	`// overflows when it reaches 256. we calculate the total`
`285`	`285`	`// number of clock cycles, then divide by the number of clock`
`286`	`286`	`// cycles per millisecond.`
`287`		`- return timer0GetOverflowCount() * timer0GetPrescaler() * 256L / (F_CPU / 1000L);`
	`287`	`+ //return timer0GetOverflowCount() * timer0GetPrescaler() * 256L / (F_CPU / 1000L);`
	`288`	`+ return (unsigned long) timer0GetOverflowCount() * timer0GetPrescaler() * 2UL / (F_CPU / 128000UL);`
	`289`	`+ //return (((unsigned long) timer0GetOverflowCount()) / 62UL) * (unsigned long) timer0GetPrescaler();`
`288`	`290`	`}`
`289`	`291`
`290`	`292`	`void delay(unsigned long ms)`