From: simimeie <simimeie>
Date: Sun, 27 Jun 2010 22:19:15 +0000 (+0000)
Subject: compile / init timing code
X-Git-Url: http://git.rrze.uni-erlangen.de/gitweb/?a=commitdiff_plain;h=ed7a0d878cbbe782f2c4f0e91665c119df362c0c;p=moodlight.git

compile / init timing code
---

diff --git a/Makefile b/Makefile
index d78c6e4..5de17a8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2010/06/26 19:08:18 simimeie Exp $
+# $Id: Makefile,v 1.3 2010/06/27 22:19:15 simimeie Exp $
 # Makefile for HaWo Moodlight
 
 CC	= avr-gcc
@@ -27,7 +27,7 @@ CPUFREQ		= 8000000UL
 # desired baudrate of serial debug console
 BAUDRATE	= 9600UL
 
-SRCS	= console.c ledpwm.c ircontrol.c main.c
+SRCS	= console.c ledpwm.c ircontrol.c timers.c main.c
 PROG	= moodlight
 
 # compiler flags
diff --git a/main.c b/main.c
index 3b8e373..7ba7212 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.2 2010/06/26 19:08:18 simimeie Exp $
+/* $Id: main.c,v 1.3 2010/06/27 22:19:15 simimeie Exp $
  * Main file for the HaWo moodlight.
  * This is the main file that glues it all together. It also contains all
  * functionality that is too small to require an extra file.
@@ -18,6 +18,7 @@
 #include "console.h"
 #include "ledpwm.h"
 #include "ircontrol.h"
+#include "timers.h"
 /* #include "eepromdata.h" */
 
 uint8_t mcusr_mirror __attribute__ ((section (".noinit")));
@@ -44,6 +45,7 @@ int main(void)
 
   /* Initialize stuff */
   console_init();
+  timers_init();
   ledpwm_init();
   ircontrol_init();