From 9ac3083a8bf94e756b77ba3d8552be270edba40d Mon Sep 17 00:00:00 2001
From: Thammi <thammi@chaossource.net>
Date: Fri, 12 Oct 2012 01:22:37 +0200
Subject: [PATCH] cockroach: Remove code for second led

---
 firmware/apps/cockroach.c | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/firmware/apps/cockroach.c b/firmware/apps/cockroach.c
index ca3a61e..63c7641 100644
--- a/firmware/apps/cockroach.c
+++ b/firmware/apps/cockroach.c
@@ -13,7 +13,6 @@ static void led_sound(void)
 	static bool discharge;
 	static timer_t mytimer;
 	uint16_t led1;
-	uint16_t led2;
 
 	if (mode_uninitialized) {
 		mode_uninitialized = false;
@@ -21,25 +20,19 @@ static void led_sound(void)
 		ADMUX   = (1 << REFS0);                // use VCC reference
 		ADCSRA  = (1 << ADPS1) | (1 << ADPS0); // prescaler F_CPU/8
 		ADCSRA |= (1 << ADEN);                 // ADC enable - turn it on
-		/*do one conversion*/
-		ADCSRA |= (1 << ADSC);
-		while (ADCSRA & (1 << ADSC)) {
-		/*wait for conversion to end */
-		}
-		uint16_t __attribute__ ((unused)) dummy = ADCW;	//read once
+
 		timer_set(&mytimer, 10);
 		discharge = true;
 	}
 	if (timer_expired(&mytimer)) {
 		if (discharge) {
-			DDRC |= (1 << PORTC0) | (1 << PORTC1) |	//set LED Ports  to output:
-			    (1 << PORTC2) | (1 << PORTC3);
+			DDRC |= (1 << PORTC0) | (1 << PORTC1);	//set LED Ports  to output:
 			/*discharge*/
 			PORTC = (PORTC & 0b11110000);
 			/*set C0 and C2 to input (disable pullups)*/
-			DDRC &= ~((1 << PORTC0) | (1 << PORTC2));	//set Led Ports to input
+			DDRC &= ~(1 << PORTC0);	//set Led Ports to input
 			/*pull ups off*/
-			PORTC &= ~((1 << PORTC0) | (1 << PORTC2));
+			PORTC &= ~(1 << PORTC0);
 			discharge = false;
 		} else {
 			/*single measurement*/
@@ -48,16 +41,11 @@ static void led_sound(void)
 			while (ADCSRA & (1 << ADSC)) ; // wait for conversion to end
 			led1 = ADCW;                   // read result
 
-			ADMUX = (ADMUX & ~(0x1F)) | 2; // select channel 2
-			ADCSRA |= (1 << ADSC);         // start single conversion
-			while (ADCSRA & (1 << ADSC)) ; // wait for conversion to end
-			led2 = ADCW;                   // read result
-
 			set_motor(led1 > 0x50 ? MOTOR_ON : MOTOR_OFF);
 
 			discharge = true;
 		}
-		timer_set(&mytimer, 2);	//relaunch timer
+		timer_set(&mytimer, 10);	//relaunch timer
 	}			//end if timer_expired
 }				//end mode5