Worked at audio firmware

AudioFirmware/adc.c

@@ -0,0 +1,60 @@
+/*
+ * adc.c
+ *
+ * Copyright 2011 Thomas Buck <xythobuz@me.com>
+ * Copyright 2011 Max Nuding <max.nuding@gmail.com>
+ * Copyright 2011 Felix Bäder <baeder.felix@gmail.com>
+ *
+ * This file is part of LED-Cube.
+ *
+ * LED-Cube is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LED-Cube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LED-Cube.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <avr/io.h>
+#include <stdint.h>
+
+#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;
+}
+
+void adcStartConversion(uint8_t channel) {
+	ADMUX &= 0xF0; // Clear channel selection bits
+	ADMUX |= (channel & 0x0F); // Set channel
+	ADCSRA |= (1 << ADSC); // start conversion
+}
+
+uint8_t adcIsFinished(void) {
+	return (ADCSRA & (1 << ADSC)); // Return start bit
+}
+
+uint16_t adcGetResult(void) {
+	while (adcIsFinished() == 0);
+	return ADCW;
+}
+
+uint8_t adcGetByte(void) {
+	uint16_t tmp = adcGetResult();
+	tmp = tmp >> 2;
+	return tmp;
+}

AudioFirmware/adc.h

@@ -0,0 +1,28 @@
+/*
+ * adc.h
+ *
+ * Copyright 2011 Thomas Buck <xythobuz@me.com>
+ * Copyright 2011 Max Nuding <max.nuding@gmail.com>
+ * Copyright 2011 Felix Bäder <baeder.felix@gmail.com>
+ *
+ * This file is part of LED-Cube.
+ *
+ * LED-Cube is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LED-Cube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LED-Cube.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+void adcInit(void);
+void adcStartConversion(uint8_t channel);
+uint8_t adcIsFinished(void);
+uint16_t adcGetResult(void);
+uint8_t adcGetByte(void);

AudioFirmware/eq.c

@@ -0,0 +1,66 @@
+/*
+ * eq.h
+ *
+ * Copyright 2011 Thomas Buck <xythobuz@me.com>
+ * Copyright 2011 Max Nuding <max.nuding@gmail.com>
+ * Copyright 2011 Felix Bäder <baeder.felix@gmail.com>
+ *
+ * This file is part of LED-Cube.
+ *
+ * LED-Cube is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LED-Cube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LED-Cube.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <avr/io.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <util/delay.h>
+
+#include "eq.h"
+#include "adc.h"
+
+#define RESETDELAY 1 /* in µs */
+#define RESETSTROBEDELAY 72 /* in µs */
+#define STROBEDELAY 18 /* in µs */
+#define READDELAY 36 /* in µs */
+
+#if ((STROBEDELAY * 2) + READDELAY) < 72
+#error Strobe to Strobe Delay too short
+#endif
+
+void equalizerInit(void) {
+	DDRC |= 12; // Strobe: PC2
+				// Reset: PC3
+				// Out: ADC0
+	PORTC |= (1 << PC3); // Reset enabled
+	_delay_us(RESETDELAY);
+
+}
+
+uint8_t *equalizerGet(void) {
+	uint8_t *result = (uint8_t *)malloc(7); // Has to work... If not, were screwed anyway :)
+	uint8_t i;
+
+	PORTC &= ~(1 << PC3); // Disable reset
+	_delay_us(RESETSTROBEDELAY); // Wait trs
+
+	for (i = 0; i < 7; i++) {
+		PORTC |= (1 << PC2); // Strobe '1'
+		_delay_us(STROBEDELAY); // create minimal pulse width
+		PORTC &= ~(1 << PC2);
+		adcStartConversion(0);
+		_delay_us(READDELAY); // Wait for result to appear
+		result[i] = adcGetByte(); // Blocks for adc
+		_delay_us(STROBEDELAY);
+	}
+	return result;
+}

AudioFirmware/eq.h

@@ -0,0 +1,28 @@
+/*
+ * eq.h
+ *
+ * Copyright 2011 Thomas Buck <xythobuz@me.com>
+ * Copyright 2011 Max Nuding <max.nuding@gmail.com>
+ * Copyright 2011 Felix Bäder <baeder.felix@gmail.com>
+ *
+ * This file is part of LED-Cube.
+ *
+ * LED-Cube is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LED-Cube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LED-Cube.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+void equalizerInit(void);
+
+// 7 elements in byte array
+// lowest to highest frequency
+uint8_t *equalizerGet(void);

AudioFirmware/main.c

@@ -25,19 +25,52 @@
 #include <avr/io.h>
 #include <util/delay.h>
 
+#include "adc.h"
+#include "eq.h"
+
 #ifndef F_CPU
 #define F_CPU 16000000L
 #endif
 
+void blinkStatus(void) {
+	PORTB |= (1 << PB2);
+	_delay_ms(250);
+	PORTB &= ~(1 << PB2);
+	_delay_ms(250);
+}
+
 int main(void) {
+	uint8_t *music;
 	uint8_t i;
+	uint16_t val;
+
+	DDRB = 0x3F;
+	DDRC = 0x0C;
+	DDRD = 0xFF;
+	
+	adcInit();
+	// equalizerInit();
+
+	blinkStatus();
+	blinkStatus();
 
 	// Blink led :)
 	while (1) {
-		PORTB |= (1 << PB2);
-		_delay_ms(1000);
-		PORTB &= ~(1 << PB2);
-		_delay_ms(1000);
+		/* 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);
+		}
 	}
 
 	return 0;

AudioFirmware/makefile

@@ -36,7 +36,8 @@ TARGET = main
 
 # List C source files here. (C dependencies are automatically generated.)
 SRC = $(TARGET).c
-#SRC += uart.c # Additional Source-File
+SRC += adc.c # Additional Source-File
+SRC += eq.c
 
 # List Assembler source files here.
 # Make them always end in a capital .S.  Files ending in a lowercase .s
@@ -256,7 +257,7 @@ ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
 
 
 # Default target.
-all: begin gccversion sizebefore build sizeafter finished end
+all: begin gccversion sizebefore build sizeafter finished end clean
 
 build: elf hex eep lss sym
 
@@ -389,7 +390,6 @@ clean: begin clean_list finished end
 clean_list :
 	@echo
 	@echo $(MSG_CLEANING)
-	$(REMOVE) $(TARGET).hex
 	$(REMOVE) $(TARGET).eep
 	$(REMOVE) $(TARGET).obj
 	$(REMOVE) $(TARGET).cof