From 01d183f70f52effc2226d64f357472d0b5978846 Mon Sep 17 00:00:00 2001
From: Dario Ernst <daddel9@nebuk.de>
Date: Fri, 10 Dec 2010 19:41:08 +0100
Subject: [PATCH] compiles again

---
 firmware/main.c | 14 --------------
 firmware/main.h | 15 ++++++++++++++-
 firmware/usb.c  |  2 ++
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/firmware/main.c b/firmware/main.c
index 2233bba..4e0dda3 100644
--- a/firmware/main.c
+++ b/firmware/main.c
@@ -1,18 +1,4 @@
-#include <avr/io.h>
-#include <avr/interrupt.h>
-#include <avr/pgmspace.h>
-#include <avr/eeprom.h>
-#include <util/delay.h>
-#include <util/atomic.h>
-#include <stdio.h>
-
-#include <usbdrv/usbdrv.h>
-
 #include "main.h"
-#include "display.h"
-#include "spi.h"
-#include "usb.h"
-
 
 #define SOFTTIMERNUMS 4
 uint16_t softtimer_last[SOFTTIMERNUMS];
diff --git a/firmware/main.h b/firmware/main.h
index 800b45e..213c57f 100644
--- a/firmware/main.h
+++ b/firmware/main.h
@@ -11,8 +11,21 @@
 
 #ifndef __MAIN_H
 #define __MAIN_H
-
 #include <stdint.h>
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <avr/pgmspace.h>
+#include <avr/eeprom.h>
+#include <util/delay.h>
+#include <util/atomic.h>
+#include <stdio.h>
+
+#include <usbdrv/usbdrv.h>
+
+#include "display.h"
+#include "spi.h"
+#include "usb.h"
+
 
 static uint8_t newThermoData = 1;
 static uint16_t thermoData[] = {1024, 814, 2475, 2243};
diff --git a/firmware/usb.c b/firmware/usb.c
index 73dc7ef..cbbd7b7 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -1,3 +1,5 @@
+#include "main.h"
+
 usbMsgLen_t usbFunctionSetup(uchar data[8]) {
   usbRequest_t    *rq = (void *)data;
   static uchar    dataBuffer[4];