Removed cruft

AudioFirmware/eq.c

@@ -1,5 +1,9 @@
 /*
  * eq.h
+if (i < 6)
+				PORTD |= (1 << pins[i]);
+			else
+				PORTB |= (1 << pins[i]);
  *
  * Copyright 2011 Thomas Buck <xythobuz@me.com>
  * Copyright 2011 Max Nuding <max.nuding@gmail.com>
@@ -48,10 +52,10 @@ void equalizerInit(void) {
 
 void eqLed(uint8_t *d) {
 	uint8_t pins[7] = { PD2, PD3, PD4, PD5, PD6, PD7, PB0 };
-	uint8_t i;
+	uint8_t i, offset = getOffset();
 
 	for (i = 0; i < 7; i++) {
-		if (d[i] >= 127) {
+		if ((d[i] + offset) >= 127) {
 			if (i < 6)
 				PORTD |= (1 << pins[i]);
 			else
@@ -67,7 +71,7 @@ void eqLed(uint8_t *d) {
 
 uint8_t *equalizerGet(void) {
 	uint8_t *result = (uint8_t *)malloc(7); // Has to work... If not, were screwed anyway :)
-	uint8_t i;
+	uint8_t i, offset = getOffset();
 
 	PORTC &= ~(1 << PC3); // Disable reset
 	_delay_us(RESETSTROBEDELAY); // Wait trs
@@ -78,10 +82,15 @@ uint8_t *equalizerGet(void) {
 		PORTC &= ~(1 << PC2);
 		adcStartConversion(0x00);
 		_delay_us(READDELAY); // Wait for result to appear
-		result[i] = adcGetByte(); // This line hangs
+		result[i] = offset + adcGetByte(); // This line hangs
 		_delay_us(STROBEDELAY);
 	}
 
 	eqLed(result);
 	return result;
 }
+
+uint8_t getOffset(void) {
+	adcStartConversion(0x01);
+	return (adcGetByte() / 2);
+}

AudioFirmware/eq.h

@@ -28,3 +28,4 @@ void equalizerInit(void);
 uint8_t *equalizerGet(void);
 
 void eqLed(uint8_t *d);
+uint8_t getOffset(void);

AudioFirmware/main.c

@@ -48,39 +48,9 @@ void blinkStatus(void) {
 	_delay_ms(250);
 }
 
-void showMusicOnLED(void) {
+int main(void) {
 	uint8_t *music;
-	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;
@@ -91,14 +61,14 @@ int main(void) {
 	blinkStatus();
 	blinkStatus();
 
-	// Blink led :)
-	while (1) {		
-		//showPotOnLED();
-		showMusicOnLED();
-		
+	while (1) {
+		music = equalizerGet();
+
+		free(music);
+
 		// Heartbeat
 		PORTB ^= (1 << PB1);
-		_delay_ms(1);
+		_delay_ms(1); // Everything locks if this is removed :(
 	}
 
 	return 0;

AudioFirmware/main.hex

@@ -0,0 +1,86 @@
+:1000000012C02CC02BC02AC029C028C027C026C0BF
+:1000100025C024C023C022C021C020C01FC01EC0D4
+:100020001DC01CC01BC011241FBECFE5D4E0DEBF25
+:10003000CDBF10E0A0E6B0E0E8E2F5E002C0059038
+:100040000D92A437B107D9F710E0A4E7B0E001C0E2
+:100050001D92A837B107E1F764D064C2D1CF81E027
+:1000600078D09CD08F3710F0C19A0895C198089528
+:100070001F9313D1AC0110E020E030E0FA01E20F51
+:10008000F31F8081180F2F5F3F4F27303105B1F7E5
+:10009000CA01F0D11C3810F0C29A01C0C2981F9159
+:1000A0000895DF93CF93CDB7DEB727970FB6F894B7
+:1000B000DEBF0FBECDBFDE011196E0E6F0E087E0C7
+:1000C00001900D928150E1F7C29AC198CE0101963C
+:1000D00078D084EC99E020E931E0F9013197F1F72B
+:1000E0000197D9F7C298C19AFE013196CE010896C0
+:1000F0001192E817F907E1F7CE01019662D084EC7E
+:1001000099E020E931E0F9013197F1F70197D9F74A
+:1001100027960FB6F894DEBF0FBECDBFCF91DF910B
+:1001200008951F93CF93DF938FE387BB8CE084BB4D
+:100130008FEF81BB26D038D0B4DFB3DF12E0C0EA46
+:10014000DFE096DF88B3812788BBCE010197F1F706
+:10015000F8CF97B1907F97B997B18F70892B87B9F6
+:10016000369A089586B18295869586958370809596
+:10017000817008953699FECF369824B135B1C90102
+:10018000089584B38C7F84BB17B83E9A86B185608E
+:1001900086B9379A80E0DDDFEDDF0895EBDF9695D5
+:1001A000879596958795089584B38C6084BBAB9AA8
+:1001B00085E08A95F1F7089581E0CBDFEFDF869542
+:1001C0000895DF92EF92FF920F931F93DF93CF93E7
+:1001D000CDB7DEB727970FB6F894DEBF0FBECDBF01
+:1001E0007C01DE011196E7E6F0E087E001900D92D8
+:1001F0008150E1F7E1DF21E030E00F8002C0220F03
+:10020000331F0A94E2F7322FD22ED094DE011196DA
+:1002100040E050E0682F70E001E010E0F701E40FEB
+:10022000F51F8081FB01E80FF11DEF37F10584F028
+:10023000463059F022B3C8010C9002C0880F991FB4
+:100240000A94E2F7282B22BB14C088B3832B10C07A
+:10025000463061F022B3C8010C9002C0880F991F8C
+:100260000A94E2F78095822382BB03C088B38D2174
+:1002700088BB4F5F5F4F11964730510579F627963F
+:100280000FB6F894DEBF0FBECDBFCF91DF911F91A7
+:100290000F91FF90EF90DF900895BF92CF92DF9281
+:1002A000EF92FF920F931F93CF93DF9387E090E03D
+:1002B00034D0F92E182FE82E7FDFC82EAB9880E2BD
+:1002C00091E00197F1F7812F9F2DEC0190E6D92E57
+:1002D00080ECB82E8E01095F1F4FAA9A8D2D8A954A
+:1002E000F1F7AA9880E035DF8B2D8A95F1F756DF7C
+:1002F0008C0D89938D2D8A95F1F7C017D10769F779
+:10030000C7015FDFC701DF91CF911F910F91FF9070
+:10031000EF90DF90CF90BF900895CF93DF93BC0113
+:100320008230910510F462E070E0A0917600B09107
+:100330007700ED01E0E0F0E040E050E021C088818E
+:1003400099818617970769F48A819B81309719F004
+:100350009383828304C09093770080937600FE019C
+:1003600034C06817790738F44115510519F084171E
+:10037000950708F4AC01FE018A819B819C01E9018B
+:100380002097E9F641155105A9F1CA01861B970B83
+:10039000049708F4BA01E0E0F0E02AC08D919C9146
+:1003A000119784179507F9F46417750781F412966D
+:1003B0008D919C911397309719F09383828304C099
+:1003C0009093770080937600FD0132964FC0CA016A
+:1003D000861B970BFD01E80FF91F6193719302973C
+:1003E0008D939C9343C0FD01828193819C01D9012F
+:1003F0001097A1F68091740090917500892B41F4BB
+:1004000080917000909171009093750080937400BA
+:1004100040917200509173004115510541F44DB760
+:100420005EB780916E0090916F00481B590B209130
+:1004300074003091750024173507B0F4CA01821B8F
+:10044000930B8617970780F0AB014E5F5F4F8417C1
+:10045000950750F0420F531F50937500409374005E
+:10046000F9016193719302C0E0E0F0E0CF01DF9108
+:10047000CF910895CF93DF93009709F450C0EC011A
+:1004800022971B821A82A0917600B0917700109774
+:1004900009F140E050E0AC17BD0708F1BB83AA8327
+:1004A000FE0121913191E20FF31FAE17BF0779F4DE
+:1004B0008D919C911197280F391F2E5F3F4F3983E3
+:1004C000288312968D919C9113979B838A83411563
+:1004D000510571F4D0937700C093760020C0129636
+:1004E0008D919C911397AD01009711F0DC01D3CF52
+:1004F000FA01D383C28321913191E20FF31FCE170A
+:10050000DF0769F488819981280F391F2E5F3F4FDB
+:10051000FA01318320838A819B8193838283DF91D7
+:08052000CF910895F894FFCF7C
+:10052800FFFFFFFFFFFFFF0203040506070020008F
+:040538007800000047
+:00000001FF

AudioFirmware/twislave.h

@@ -0,0 +1,25 @@
+/*
+ * twislave.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 twiInit(uint8_t adress);
+void twiSetDataToSend(uint8_t *data);