Audio detection working

AudioFirmware/adc.c

@@ -26,16 +26,13 @@
 #include "adc.h"
 
 void adcInit(void) {
-	uint16_t tmp;
-	
 	DDRC &= ~(3);
 	ADMUX = 0;
 	ADMUX |= (1 << REFS0); // Ref. Voltage: Vcc
 	ADCSRA |= (1 << ADPS2) | (1 << ADPS0); // Prescaler 64
 	ADCSRA |= (1 << ADEN); // Enable adc
 	adcStartConversion(0);
-	while (adcIsFinished() == 0);
-	tmp = ADCW;
+	adcGetResult();
 }
 
 void adcStartConversion(uint8_t channel) {
@@ -45,11 +42,17 @@ void adcStartConversion(uint8_t channel) {
 }
 
 uint8_t adcIsFinished(void) {
-	return (ADCSRA & (1 << ADSC)); // Return start bit
+	// Return 1 if ADSC is 0
+	if (ADCSRA & (1 << ADSC)) {
+		return 0;
+	} else {
+		return 1;
+	}
 }
 
 uint16_t adcGetResult(void) {
 	while (adcIsFinished() == 0);
+	ADCSRA &= ~(1 << ADSC);
 	return ADCW;
 }
 

AudioFirmware/eq.c

@@ -57,9 +57,9 @@ uint8_t *equalizerGet(void) {
 		PORTC |= (1 << PC2); // Strobe '1'
 		_delay_us(STROBEDELAY); // create minimal pulse width
 		PORTC &= ~(1 << PC2);
-		adcStartConversion(0);
+		adcStartConversion(0x00);
 		_delay_us(READDELAY); // Wait for result to appear
-		result[i] = adcGetByte(); // Blocks for adc
+		result[i] = adcGetByte(); // This line hangs
 		_delay_us(STROBEDELAY);
 	}
 	return result;

AudioFirmware/main.c

@@ -34,43 +34,64 @@
 
 void blinkStatus(void) {
 	PORTB |= (1 << PB2);
+	PORTB &= ~(1 << PB1);
 	_delay_ms(250);
 	PORTB &= ~(1 << PB2);
+	PORTB |= (1 << PB1);
 	_delay_ms(250);
 }
 
-int main(void) {
+void showMusicOnLED(void) {
 	uint8_t *music;
-	uint8_t i;
-	uint16_t val;
+	uint8_t i, val;
+
+	music = equalizerGet();
+	val = 0;
+	for (i = 0; i < 7; i++) {
+		val += music[i];
+	}
+	val /= 7;
+
+	free(music);
+
+	if (val >= 20) {
+		PORTB |= (1 << PB2);
+	} else {
+		PORTB &= ~(1 << PB2);
+	}
+}
 
+void showPotOnLED(void) {
+	uint8_t val = 0;
+	adcStartConversion(0x01); // 0x0E -> 1,3 V Ref.
+	val = adcGetByte();
+
+	if (val >= 127) {
+		PORTB |= (1 << PB1);
+	} else {
+		PORTB &= ~(1 << PB1);
+	}
+}
+
+int main(void) {
 	DDRB = 0x3F;
 	DDRC = 0x0C;
 	DDRD = 0xFF;
 	
 	adcInit();
-	// equalizerInit();
+	equalizerInit();
 
 	blinkStatus();
 	blinkStatus();
 
 	// Blink led :)
-	while (1) {
-		/* music = equalizerGet();
-		val = 0;
-		for (i = 0; i < 7; i++) {
-			val += music[i];
-		}
-		val /= 7; */
-
-		adcStartConversion(0x01); // 0x0E -> 1,3 V Ref.
-		val = adcGetResult();
-
-		if (val >= 512) {
-			PORTB |= (1 << PB2);
-		} else {
-			PORTB &= ~(1 << PB2);
-		}
+	while (1) {		
+		//showPotOnLED();
+		showMusicOnLED();
+		
+		// Heartbeat
+		PORTB ^= (1 << PB1);
+		_delay_ms(1);
 	}
 
 	return 0;

AudioFirmware/makefile

@@ -87,8 +87,8 @@ CINCS =
 #  -Wall...:     warning level
 #  -Wa,...:      tell GCC to pass this to the assembler.
 #    -adhlns...: create assembler listing
-CFLAGS = -g$(DEBUG)
-CFLAGS += $(CDEFS) $(CINCS)
+#CFLAGS = -g$(DEBUG)
+CFLAGS = $(CDEFS) $(CINCS)
 CFLAGS += -O$(OPT)
 CFLAGS += -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
 CFLAGS += -Wall -Wstrict-prototypes

Hardware/LED Cube.sch

@@ -6,7 +6,7 @@
 <setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.05" altunitdist="inch" altunit="inch"/>
+<grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="no" active="no"/>
 <layer number="2" name="Route2" color="1" fill="3" visible="no" active="no"/>
@@ -10800,6 +10800,9 @@ Distributor Buerklin, 11G810</description>
 <part name="R28" library="resistor" deviceset="R-EU_" device="0204/7" value="100k"/>
 <part name="R29" library="resistor" deviceset="R-EU_" device="0204/7" value="100k"/>
 <part name="R30" library="resistor" deviceset="R-EU_" device="0204/7" value="100k"/>
+<part name="LED66" library="led" deviceset="LED" device="5MM"/>
+<part name="R31" library="resistor" deviceset="R-EU_" device="0204/7" value="1k"/>
+<part name="GND38" library="supply1" deviceset="GND" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -10939,6 +10942,9 @@ Distributor Buerklin, 11G810</description>
 <instance part="R28" gate="G$1" x="88.9" y="-33.02"/>
 <instance part="R29" gate="G$1" x="88.9" y="-43.18"/>
 <instance part="R30" gate="G$1" x="88.9" y="-53.34"/>
+<instance part="LED66" gate="G$1" x="-17.78" y="-124.46" rot="R90"/>
+<instance part="R31" gate="G$1" x="-5.08" y="-124.46" rot="R180"/>
+<instance part="GND38" gate="1" x="5.08" y="-124.46" rot="R90"/>
 </instances>
 <busses>
 </busses>
@@ -11301,6 +11307,11 @@ Distributor Buerklin, 11G810</description>
 <pinref part="GND37" gate="1" pin="GND"/>
 <pinref part="R22" gate="G$1" pin="A"/>
 </segment>
+<segment>
+<pinref part="R31" gate="G$1" pin="1"/>
+<pinref part="GND38" gate="1" pin="GND"/>
+<wire x1="0" y1="-124.46" x2="2.54" y2="-124.46" width="0.1524" layer="91"/>
+</segment>
 </net>
 <net name="VCC" class="0">
 <segment>
@@ -12446,6 +12457,20 @@ Distributor Buerklin, 11G810</description>
 <pinref part="IC13" gate="G$1" pin="PB5(SCK)"/>
 </segment>
 </net>
+<net name="N$82" class="0">
+<segment>
+<pinref part="IC13" gate="G$1" pin="PB1(OC1A)"/>
+<pinref part="LED66" gate="G$1" pin="A"/>
+<wire x1="-25.4" y1="-124.46" x2="-20.32" y2="-124.46" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$83" class="0">
+<segment>
+<pinref part="LED66" gate="G$1" pin="C"/>
+<pinref part="R31" gate="G$1" pin="2"/>
+<wire x1="-12.7" y1="-124.46" x2="-10.16" y2="-124.46" width="0.1524" layer="91"/>
+</segment>
+</net>
 </nets>
 </sheet>
 <sheet>