# HG changeset patch
# User ethanzonca@CL-SEC241-08.cedarville.edu
# Date 2012-11-20 12:13:06
# Node ID 5a775958ef6524cce480c52faa243866684ea14a
# Parent  ac84ccb036064189a30e0bf19171e6c4bfac1bb6

Program timer is operational

diff --git a/master/master/lib/looptime.c b/master/master/lib/looptime.c
--- a/master/master/lib/looptime.c
+++ b/master/master/lib/looptime.c
@@ -5,9 +5,11 @@
  *  Author: ethanzonca
  */ 
 
+#include "../config.h"
 #include <avr/io.h>
 #include <avr/interrupt.h>
-volatile uint32_t millis = 0; // Milliseconds since initialization
+#include <avr/delay.h>
+extern volatile uint32_t millis = 0; // Milliseconds since initialization
 
 
 
@@ -25,8 +27,7 @@ void time_setup() {
 
 
 ISR(TIMER0_OVF_vect) {
-	PORTA = 0xff;
-	millis++;
+	millis = millis + 1;
 }
 
 uint32_t time_millis() {
diff --git a/master/master/master.c b/master/master/master.c
--- a/master/master/master.c
+++ b/master/master/master.c
@@ -25,6 +25,7 @@
 #include "lib/logger.h"
 #include "lib/watchdog.h"
 #include "lib/sd/sd_raw_config.h"
+#include "lib/looptime.h"
 
 void micro_setup() {
 
@@ -53,7 +54,8 @@ int main(void)
 	while(1)
     {
 		led_on(STAT);
-		sprintf(logbuf, "%d,%d,%d,%d,%d,%d\n", time_millis(),5*ctr1,ctr2, 12*ctr2,43*ctr1,5*ctr2);
+		//sprintf(logbuf, "%d,%d,%d,%d,%d,%d\n", time_millis(),5*ctr1,ctr2, 12*ctr2,43*ctr1,5*ctr2);
+		sprintf(logbuf, "%d,\n", time_millis());
 		logger_log(logbuf);
 		led_off(STAT);