From 5e6a0b23695a3c4677b1e84ffbc5cd5140e4a491 Mon Sep 17 00:00:00 2001
From: d18c7db <d18c7db@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Date: Sun, 19 Jul 2009 03:47:01 +0000
Subject: [PATCH] Tidy up of SpinDelay

---
 armsrc/util.c | 51 ++++++++++++++++++---------------------------------
 1 file changed, 18 insertions(+), 33 deletions(-)

diff --git a/armsrc/util.c b/armsrc/util.c
index 5af09f88..8a3da63a 100644
--- a/armsrc/util.c
+++ b/armsrc/util.c
@@ -86,7 +86,7 @@ void LED(int led, int ms)
 	if (led & LED_RED2)
 		LED_D_OFF();
 }
-	
+
 
 // Determine if a button is double clicked, single clicked,
 // not clicked, or held down (for ms || 1sec)
@@ -107,14 +107,14 @@ int BUTTON_CLICKED(int ms)
 	PWM_CH_MODE(0) = PWM_CH_MODE_PRESCALER(10);
 	PWM_CH_DUTY_CYCLE(0) = 0;
 	PWM_CH_PERIOD(0) = 0xffff;
-	
+
 	WORD start = (WORD)PWM_CH_COUNTER(0);
-	
+
 	int letoff = 0;
 	for(;;)
 	{
 		WORD now = (WORD)PWM_CH_COUNTER(0);
-		
+
 		// We haven't let off the button yet
 		if (!letoff)
 		{
@@ -163,20 +163,20 @@ int BUTTON_HELD(int ms)
 	// If we're not even pressed, forget about it!
 	if (!BUTTON_PRESS())
 		return BUTTON_NO_CLICK;
-	
+
 	// Borrow a PWM unit for my real-time clock
 	PWM_ENABLE = PWM_CHANNEL(0);
 	// 48 MHz / 1024 gives 46.875 kHz
 	PWM_CH_MODE(0) = PWM_CH_MODE_PRESCALER(10);
 	PWM_CH_DUTY_CYCLE(0) = 0;
 	PWM_CH_PERIOD(0) = 0xffff;
-	
+
 	WORD start = (WORD)PWM_CH_COUNTER(0);
-	
+
 	for(;;)
 	{
 		WORD now = (WORD)PWM_CH_COUNTER(0);
-		
+
 		// As soon as our button let go, we didn't hold long enough
 		if (!BUTTON_PRESS())
 			return BUTTON_SINGLE_CLICK;
@@ -185,7 +185,7 @@ int BUTTON_HELD(int ms)
 		else
 			if (now == (WORD)(start + ticks))
 				return BUTTON_HOLD;
-		
+
 		WDT_HIT();
 	}
 
@@ -193,31 +193,11 @@ int BUTTON_HELD(int ms)
 	return BUTTON_ERROR;
 }
 
+// attempt at high resolution microsecond timer
+// beware: timer counts in 21.3uS increments (1024/48Mhz)
 void SpinDelayUs(int us)
 {
 	int ticks = (48*us) >> 10;
-	
-	// Borrow a PWM unit for my real-time clock
-	PWM_ENABLE = PWM_CHANNEL(0);
-	// 48 MHz / 1024 gives 46.875 kHz
-	PWM_CH_MODE(0) = PWM_CH_MODE_PRESCALER(10);
-	PWM_CH_DUTY_CYCLE(0) = 0;
-	PWM_CH_PERIOD(0) = 0xffff;
-	
-	WORD start = (WORD)PWM_CH_COUNTER(0);
-	
-	for(;;) {
-		WORD now = (WORD)PWM_CH_COUNTER(0);
-		if(now == (WORD)(start + ticks)) {
-			return;
-		}
-		WDT_HIT();
-	}
-}
-
-void SpinDelay(int ms)
-{
-	int ticks = (48000*ms) >> 10;
 
 	// Borrow a PWM unit for my real-time clock
 	PWM_ENABLE = PWM_CHANNEL(0);
@@ -228,8 +208,7 @@ void SpinDelay(int ms)
 
 	WORD start = (WORD)PWM_CH_COUNTER(0);
 
-	for(;;)
-	{
+	for(;;) {
 		WORD now = (WORD)PWM_CH_COUNTER(0);
 		if (now == (WORD)(start + ticks))
 			return;
@@ -237,3 +216,9 @@ void SpinDelay(int ms)
 		WDT_HIT();
 	}
 }
+
+void SpinDelay(int ms)
+{
+  // convert to uS and call microsecond delay function
+	SpinDelayUs(ms*1000);
+}
-- 
2.39.2