seniordesign-firmware Changeset - 5a775958ef65

Changeset - 5a775958ef65

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

ethanzonca@CL-SEC241-08.cedarville.edu - 12 years ago 2012-11-20 12:13:06
ethanzonca@CL-SEC241-08.cedarville.edu

Program timer is operational

2 files changed with 7 insertions and 4 deletions:

master/master/lib/looptime.c

master/master/master.c

0 comments (0 inline, 0 general)

master/master/lib/looptime.c

➞

Show inline comments

@@ @@ -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() {

master/master/master.c

➞

Show inline comments

@@ @@ -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);

0 comments (0 inline, 0 general)