From c330746b749af7ad3a7df8b599439e6e11e73643 Mon Sep 17 00:00:00 2001
From: bigalex <bigalex@gmx.de>
Date: Mon, 1 Oct 2012 19:22:37 +0200
Subject: [PATCH 1/3] backward compatibility for delay.h

---
 fw_test/main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fw_test/main.c b/fw_test/main.c
index 5b3f951..e3ea38a 100644
--- a/fw_test/main.c
+++ b/fw_test/main.c
@@ -1,6 +1,7 @@
 #include <inttypes.h>
 #include <avr/io.h>
 #include <avr/interrupt.h>
+#define __DELAY_BACKWARD_COMPATIBLE__
 #include <util/delay.h>
 #include <stdlib.h>
 

From 2937adc985fa4d6e55fbf2df5a0ace5793d6e938 Mon Sep 17 00:00:00 2001
From: bigalex <bigalex@gmx.de>
Date: Mon, 1 Oct 2012 19:23:36 +0200
Subject: [PATCH 2/3] some cleanup

---
 firmware/main.c | 119 +-----------------------------------------------
 1 file changed, 1 insertion(+), 118 deletions(-)

diff --git a/firmware/main.c b/firmware/main.c
index a6d9e73..69a9249 100644
--- a/firmware/main.c
+++ b/firmware/main.c
@@ -1,6 +1,7 @@
 #include <inttypes.h>
 #include <avr/io.h>
 #include <avr/interrupt.h>
+#define __DELAY_BACKWARD_COMPATIBLE__
 #include <util/delay.h>
 #include <stdlib.h>
 
@@ -10,76 +11,6 @@
 #include "lib/bughal.h"
 
 
-uint16_t sw_v = 0;
-uint16_t darkness = 0;
-uint16_t darkval  = 0;
-uint16_t last_darkval  = 0;
-
-
-static void init_sampletimer(void)
-{
-	/* 
-	 * Timer 0
-	 */
-
-	/* set timer0 to CTC & prescaler 64 → 125kHz increment */
-	TCCR0A = (1 << WGM01);
-	TCCR0B = (1 << CS00) | (1 << CS01);
-
-	OCR0A = 6; /* TOP */
-	TCNT0 = 0;
-	/*enable interrupt*/
-	TIMSK0 |=  (1<<OCIE0A);
-}
-
-static inline void init_pwm(void)
-{
-	/* set PB2 as output (buzzer pwm port):*/
-	DDRB  |= (1 << PORTB2);
-
-	/* analog value preselection :*/
-	OCR1B  =  0x007F;
-
-	/* Top value. Timer overflows here. Thus we have a resulting 8bit pwm */
-	ICR1   =  0x00FF;
-
-	/* only b-chan , fastpwm (mode 14), no prescale */
-	TCCR1A = (1 << COM1B1) | (1 << WGM11);
-	TCCR1B = (1 << WGM13 ) | (1 << WGM12) | (1 << CS10);
-
-	return;
-}
-
-
-
-void click(void){
-	buzzr_up();
-	_delay_ms(1);
-	buzzr_inv();
-	_delay_ms(1);
-	buzzr_off();
-};
-
-void waitr(int min, int max){
-	int waitms = (rand() % (max-min)) + min;
-	for(int i=0; i <= waitms; i++){
-		_delay_ms(1);
-	};
-	return;
-
-};
-
-void ledr(void){
-	int i = (rand() % 3);
-	switch(i) {
-		case 0  : led_on(LED_L); break;
-		case 1  : led_on(LED_R); break;
-		default : led_on(LED_L|LED_R);
-	};
-	_delay_ms(10);
-	led_off(LED_L|LED_R);	
-}
-
 
 void __attribute__((noreturn)) 
 main(void)
@@ -89,22 +20,13 @@ main(void)
 	init_buzzr();
 	//USART0_Init();
 	// init_motor();
-	//init_pwm();
-	//init_sampletimer();
 	
-	/* syntesizer initialisation */
-	//synth_init();
-
 	/* here the show begins:*/
 	//sei();
 	//set_motor(MOTOR_ON);
 
 	for(;;) /* ever */  {
 	//do something
-	waitr(50,5000);
-	click();
-	ledr();
-
 		//synth_poll();
 		//USART0_put_uint16(0xA09F);
 		//USART0_crlf();
@@ -115,42 +37,3 @@ main(void)
 
 
 
-ISR(TIMER2_COMPA_vect)
-{
-darkval++;
-	switch(sw_v){
-
-	case 0 :	// Set PC0 to 1 and PC1 to 0 - charge LED
-			
-			DDRC  = 0b00000011;
-			PORTC = 0b00000010;
-			
-			darkness = 0;
-			sw_v++;
-			
-			break;
-
-	case 10 : 	// set PC0 to 0 and PC1 as input
-			
-			DDRC  = 0b00000001;
-		 	PORTC = 0b00000000;
-			
-			sw_v++;
-			break;
-	case 5000 :	sw_v = 0;
-			//darkval = darkness;
-			//darkval = 1234;
-			break;
-	default :	//measure if PC1 falls to LOW
-			if ((darkness==0) && ((PINC && 0b00000010)==0)){
-				darkness = sw_v;
-			};
-			sw_v++;
-	
-			
-	}; //end switch
-	
-	//PORTC ^= 0b00001111; //toggle C0, C1, C2,C3
-	//PORTC = 0;
-	
-}

From fa37eab78f7dac5fca4ca40adf1492e1b9faaef3 Mon Sep 17 00:00:00 2001
From: bigalex <bigalex@gmx.de>
Date: Mon, 1 Oct 2012 20:09:51 +0200
Subject: [PATCH 3/3] removed backward compatibility for delay.h

---
 firmware/main.c | 1 -
 fw_test/main.c  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/firmware/main.c b/firmware/main.c
index 69a9249..dcfe79e 100644
--- a/firmware/main.c
+++ b/firmware/main.c
@@ -1,7 +1,6 @@
 #include <inttypes.h>
 #include <avr/io.h>
 #include <avr/interrupt.h>
-#define __DELAY_BACKWARD_COMPATIBLE__
 #include <util/delay.h>
 #include <stdlib.h>
 
diff --git a/fw_test/main.c b/fw_test/main.c
index e3ea38a..5b3f951 100644
--- a/fw_test/main.c
+++ b/fw_test/main.c
@@ -1,7 +1,6 @@
 #include <inttypes.h>
 #include <avr/io.h>
 #include <avr/interrupt.h>
-#define __DELAY_BACKWARD_COMPATIBLE__
 #include <util/delay.h>
 #include <stdlib.h>