From 017e966dae958667c160d023f1fb53769266f1b6 Mon Sep 17 00:00:00 2001
From: Dario Ernst <daddel9@nebuk.de>
Date: Fri, 10 Dec 2010 22:40:24 +0100
Subject: [PATCH] fixed softtimer includestuff

---
 firmware/masterchip/Makefile    |  2 +-
 firmware/shared/softtimer.h     | 13 ++++++++++---
 firmware/slavechip/Makefile     |  2 +-
 firmware/slavechip/i2c_simple.c |  3 +++
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/firmware/masterchip/Makefile b/firmware/masterchip/Makefile
index c01fecc..087798e 100644
--- a/firmware/masterchip/Makefile
+++ b/firmware/masterchip/Makefile
@@ -3,7 +3,7 @@ include ../Makefile.inc
 
 COMPILE = avr-gcc $(CFLAGS) $(DEFINES)
 
-OBJECTS = usbdrv/usbdrvasm.o usbdrv/usbdrv.o main.o display.o lcd/lcd.o usb.o
+OBJECTS = usbdrv/usbdrvasm.o usbdrv/usbdrv.o main.o display.o lcd/lcd.o usb.o softtimer.o
 
 # symbolic targets:
 all:	firmware.hex
diff --git a/firmware/shared/softtimer.h b/firmware/shared/softtimer.h
index 417e61b..9df270e 100644
--- a/firmware/shared/softtimer.h
+++ b/firmware/shared/softtimer.h
@@ -1,9 +1,16 @@
-// NOTES:
-// Please #define SOFTTIMERNUMS aNum before including this!
-
 #ifndef __SOFTTIMER_H
 #define __SOFTTIMER_H
 
+#include <stdint.h>
+#include "main.h"
+
+#ifndef SOFTTIMERNUMS
+#define SOFTTIMERNUMS 4 // random value
+#endif
+
+// NOTES:
+// Please #define SOFTTIMERNUMS aNum before including this!
+
 extern volatile uint16_t timer1_acc;
 extern uint16_t softtimer_last[SOFTTIMERNUMS];
 
diff --git a/firmware/slavechip/Makefile b/firmware/slavechip/Makefile
index 848d37d..7b0d7a6 100644
--- a/firmware/slavechip/Makefile
+++ b/firmware/slavechip/Makefile
@@ -2,7 +2,7 @@ include ../Makefile.inc
 
 COMPILE = avr-gcc $(CFLAGS) $(DEFINES)
 
-OBJECTS = main.o mcp_adc.o i2c_simple.o
+OBJECTS = main.o mcp_adc.o i2c_simple.o softtimer.o
 
 # symbolic targets:
 all:	firmware.hex
diff --git a/firmware/slavechip/i2c_simple.c b/firmware/slavechip/i2c_simple.c
index 1965d49..8c5772e 100644
--- a/firmware/slavechip/i2c_simple.c
+++ b/firmware/slavechip/i2c_simple.c
@@ -1,4 +1,7 @@
 #include <stdint.h>
+#include <avr/io.h>
+#include <avr/pgmspace.h>
+#include <util/twi.h>
 
 #include "i2c_simple.h"