compile / init timing code

diff --git a/Makefile b/Makefile
index d78c6e469758980c953fa0779b75503d4cdb5b01..5de17a8cd6dbfbaea39166d8778fbc9c288e0111 100644 (file)
--- 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
 # Makefile for HaWo Moodlight
 
 CC     = avr-gcc


@@ -27,7 +27,7 @@ CPUFREQ               = 8000000UL
 # desired baudrate of serial debug console
 BAUDRATE       = 9600UL
 
 # 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
 PROG   = moodlight
 
 # compiler flags

diff --git a/main.c b/main.c
index 3b8e373b81f641ceeb7f28873ddbfc123aa22fcd..7ba7212cc28a39aa2c1977e66faeba3a8a6be6d3 100644 (file)
--- 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.
  * 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 "console.h"
 #include "ledpwm.h"
 #include "ircontrol.h"

+#include "timers.h"

 /* #include "eepromdata.h" */
 
 uint8_t mcusr_mirror __attribute__ ((section (".noinit")));
 /* #include "eepromdata.h" */
 
 uint8_t mcusr_mirror __attribute__ ((section (".noinit")));


@@ -44,6 +45,7 @@ int main(void)
 
   /* Initialize stuff */
   console_init();
 
   /* Initialize stuff */
   console_init();

+  timers_init();

   ledpwm_init();
   ircontrol_init();
   
   ledpwm_init();
   ircontrol_init();