From 08ff317b14ed6a43b6cf0a4192e12f0542be96a0 Mon Sep 17 00:00:00 2001
From: bigalex <bigalex@gmx.de>
Date: Sun, 2 Sep 2012 23:49:57 +0200
Subject: [PATCH] consolidated build

---
 firmware/lib/bughal.c | 13 +++++++++----
 firmware/main.c       | 24 ++++++++----------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/firmware/lib/bughal.c b/firmware/lib/bughal.c
index ba09cc6..a12c8ae 100644
--- a/firmware/lib/bughal.c
+++ b/firmware/lib/bughal.c
@@ -1,4 +1,5 @@
 #include <inttypes.h>
+#include <avr/io.h>
 #include "bughal.h"
 
 /* Hardware abstraction layer for Pentabug hardware */
@@ -21,15 +22,19 @@ void init_leds(void){
 	  //	TIMSK2 |=  (1<<OCIE2A);
 
 
-  return;
+  	return;
 };
 
-void init_buzzr(int mode);
+void init_buzzr(int mode){
+ 	return;
+};
 
 
-void init_switch();
+void init_switch(){
+	return;
+};
 
-static void init_motor(void)
+void init_motor(void)
 {
 	/* vibration motor on B1, initially off: */
 	DDRB  |= (1 << PORTB1);
diff --git a/firmware/main.c b/firmware/main.c
index 6a178c4..e543ae9 100644
--- a/firmware/main.c
+++ b/firmware/main.c
@@ -7,6 +7,7 @@
 #include "main.h"
 #include "lib/synth.h"
 #include "lib/usart.h"
+#include "lib/bughal.h"
 
 
 uint16_t sw_v = 0;
@@ -65,30 +66,21 @@ void __attribute__((noreturn))
 main(void)
 {
 	/* hardware initialisation: */
-	//init_leds();
-	USART0_Init();
+	init_leds();
+	//USART0_Init();
 	// init_motor();
-	init_pwm();
-	init_sampletimer();
+	//init_pwm();
+	//init_sampletimer();
 	
 	/* syntesizer initialisation */
-	synth_init();
+	//synth_init();
 
 	/* here the show begins:*/
-	sei();
-			DDRC  = 0b00000011;
-			PORTC = 0b00000001;
-			PORTC = 0b00000000;
+	//sei();
 	for(;;) /* ever */  {
 
 		//do something
-		synth_poll();
-		if (10 == 1){
-			uint16_t out = darkval;
-			USART0_put_uint16(out);
-			USART0_crlf();
-			//last_darkval=darkval;
-		};
+		//synth_poll();
 		//USART0_put_uint16(0xA09F);
 		//USART0_crlf();
 	}