Some AudioFirmware fixes.

Rewrote MSGEQ7 Algorithm. Removed stdlib.h dependency, thereby reducing
the flash needed by 50%. Interrupts no longer enabled in twislave, but
in main.

AudioFirmware/adc.c

@@ -26,7 +26,6 @@
 #include "adc.h"
 
 void adcInit(void) {
-	DDRC &= ~(3);
 	ADMUX = 0;
 	ADMUX |= (1 << REFS0); // Ref. Voltage: Vcc
 	ADCSRA |= (1 << ADPS2) | (1 << ADPS0); // Prescaler 64

AudioFirmware/eq.c

@@ -22,49 +22,53 @@
  */
 #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 */
+#define Trs 72
+#define Ts 19
+#define To 36
 
-#if ((STROBEDELAY * 2) + READDELAY) < 72
-#error Strobe to Strobe Delay too short
-#endif
+uint8_t result[7] = {128, 128, 128, 128, 128, 128, 128};
 
-void equalizerInit(void) {
-	DDRC |= 12; // Strobe: PC2
-				// Reset: PC3
-				// Out: ADC0
-	PORTC |= (1 << PC3); // Reset enabled
-	_delay_us(RESETDELAY);
+#define RESETPORT PORTC
+#define STROBEPORT PORTC
+#define RESET PC3
+#define STROBE PC2
+
+#define RESETON RESETPORT |= (1 << RESET)
+#define RESETOFF RESETPORT &= ~(1 << RESET)
+#define STROBEON STROBEPORT |= (1 << STROBE)
+#define STROBEOFF STROBEPORT &= ~(1 << STROBE)
 
+void equalizerInit(void) {
+	RESETON;
+	STROBEOFF;
 }
 
 uint8_t *equalizerGet(void) {
-	uint8_t *result = (uint8_t *)malloc(7); // Has to work... If not, were screwed anyway :)
 	uint8_t i, offset = getOffset();
 
-	PORTC &= ~(1 << PC3); // Disable reset
-	_delay_us(RESETSTROBEDELAY); // Wait trs
+	RESETOFF;
+	_delay_us(Trs);
 
 	for (i = 0; i < 7; i++) {
-		PORTC |= (1 << PC2); // Strobe '1'
-		_delay_us(STROBEDELAY); // create minimal pulse width
-		PORTC &= ~(1 << PC2);
-		_delay_us(READDELAY); // Wait for result to appear
-		adcStartConversion(0x00);
+		STROBEON;
+		_delay_us(Ts);
+		STROBEOFF;
+		_delay_us(To); // Wait for result
+
+		// Get result, takes ca. 29ms
+		adcStartConversion(0);
 		result[i] = offset + adcGetByte();
-		_delay_us(STROBEDELAY);
 	}
 
-	PORTC |= (1 << PC3); // Enable reset
-
+	RESETON;
+	asm volatile ("nop");
+	asm volatile ("nop");   // Ensure minimal reset pulse width
+							// 2 NOPs at 16MHz are enough...
 	return result;
 }
 

AudioFirmware/eq.h

@@ -21,6 +21,8 @@
  * along with LED-Cube.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+extern uint8_t result[7];
+
 void equalizerInit(void);
 
 // 7 elements in byte array

AudioFirmware/main.c

@@ -20,10 +20,10 @@
  * 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 <stdlib.h>
-#include <stdint.h>
 #include <avr/io.h>
+#include <stdint.h>
 #include <util/delay.h>
+#include <avr/interrupt.h>
 #include <avr/wdt.h>
 
 #include "adc.h"
@@ -34,50 +34,35 @@
 #define F_CPU 16000000L
 #endif
 
-void blinkStatus(void) {
-	PORTB |= (1 << PB2);
-	PORTB &= ~(1 << PB1);
-	_delay_ms(250);
-	PORTB &= ~(1 << PB2);
-	PORTB |= (1 << PB1);
-	_delay_ms(250);
-}
-
 int main(void) {
-	uint8_t *music;
+	uint8_t *music = result;
 
 	MCUCSR = 0;
 	wdt_disable();
 
-	DDRB = 6;
-	DDRC = 12;
-	DDRD = 0;
+	DDRB = 6; // LEDs as Output
+	DDRC = 12; // MSGEQ7 Pins as Output
+	DDRD = 0; // Nothing on this Port!
 	
 	twiInit(0x42); // All TWI action happens completely in the background.
 	adcInit();
 	equalizerInit();
 
-	blinkStatus();
-	blinkStatus();
+	sei(); // Enable interrupts
 
 	wdt_enable(WDTO_500MS); // Enable watchdog reset after 500ms
 
-	music = equalizerGet();
 	twiSetDataToSend(music);
-	free(music);
 
 	while (1) {
 		if (twiDataWasSent()) {
 			PORTB ^= (1 << PB2); // Toggle for every transaction
 			music = equalizerGet();
 			twiSetDataToSend(music);
-			free(music);
 		}
 
 		// Heartbeat
 		PORTB ^= (1 << PB1);
-		_delay_ms(1); // Everything locks if this is removed :(
-		// still don't know why...
 
 		wdt_reset();
 	}

AudioFirmware/main.hex

@@ -1,82 +1,39 @@
 :1000000012C02CC02BC02AC029C028C027C026C0BF
 :1000100025C024C023C022C021C020C01FC01EC0D4
-:100020001DC0EBC01BC011241FBECFE5D4E0DEBF56
-:10003000CDBF10E0A0E6B0E0E6EFF4E002C005902E
+:100020001DC0A1C01BC011241FBECFE5D4E0DEBFA0
+:10003000CDBF10E0A0E6B0E0EEE4F2E002C0059033
 :100040000D92AE36B107D9F710E0AEE6B0E001C0D0
-:100050001D92A437B107E1F719D04BC2D1CFC29A94
-:10006000C19884EC99E020E931E0F9013197F1F78A
-:100070000197D9F7C298C19A84EC99E020E931E060
-:10008000F9013197F1F70197D9F70895EF92FF92AF
-:100090000F931F93CF93DF9314BE88E10FB6F894AC
-:1000A00081BD11BC0FBE86E087BB8CE084BB11BA5A
-:1000B00082E4F7D042D054D0D2DFD1DF2DE088E106
-:1000C00090E00FB6F894A89581BD0FBE21BD55D024
-:1000D0008C01F1D0C801B5D194E0E92E82E0F82E70
-:1000E000C0EADFE0F9D0882341F088B38E2588BBD1
-:1000F00044D08C01E0D0C801A4D188B38F2588BB3F
-:10010000CE010197F1F7A895EDCF97B1907F97B900
-:1001100097B18F70892B87B9369A089586B18295E9
-:100120008695869583708095817008953699FECF67
-:10013000369824B135B1C901089584B38C7F84BB4E
-:1001400017B83E9A86B1856086B9379A80E0DDDFC0
-:10015000EDDF0895EBDF9695879596958795089541
-:1001600084B38C6084BBAB9A85E08A95F1F70895DF
-:1001700081E0CBDFEFDF86950895BF92CF92DF92CB
-:10018000EF92FF920F931F93CF93DF9387E090E05E
-:10019000ABD0F92E182FC82EEBDFD82EAB9880E20B
-:1001A00091E00197F1F7812F9F2DEC0190E6E92E68
-:1001B00080ECB82E8E01095F1F4FAA9A8E2D8A956A
-:1001C000F1F7AA988B2D8A95F1F780E09EDFC2DFC8
-:1001D0008D0D89938E2D8A95F1F7C017D10769F798
-:1001E000AB9A8C2D9F2DDF91CF911F910F91FF9096
-:1001F000EF90DF90CF90BF9008951F920F920FB6AF
-:100200000F9211248F939F93EF93FF9381B190E00E
-:10021000887F883B9105C1F0893B91053CF4883A81
-:10022000910559F0803B910581F507C0803C91050F
-:1002300031F1883C910549F522C081E080936F003F
-:100240008091600083B915C090916F00963040F0A6
-:1002500010926F008091660083B986B78F7B11C0C2
-:10026000E92FF0E0E05AFF4F808183B99F5F9093C0
-:100270006F0086B7806486BF10926E0006C086B796
-:10028000806486BF81E080936E0086B7806886BFF9
-:10029000FF91EF919F918F910F900FBE0F901F9044
-:1002A0001895882311F481E001C08E7F82B985E41E
-:1002B00086BF78940895AC0120E030E0F901E05A5F
-:1002C000FF4FDA01A20FB31F8C9180832F5F3F4F46
-:1002D0002730310599F7089580916E00882319F031
-:1002E00010926E0081E00895CF93DF93BC018230BD
-:1002F000910510F462E070E0A0917200B09173007B
-:10030000ED01E0E0F0E040E050E021C0888199811B
-:100310008617970769F48A819B81309719F0938338
-:10032000828304C09093730080937200FE0134C0F6
-:100330006817790738F44115510519F084179507A6
-:1003400008F4AC01FE018A819B819C01E9012097A0
-:10035000E9F641155105A9F1CA01861B970B0497CF
-:1003600008F4BA01E0E0F0E02AC08D919C91119769
-:1003700084179507F9F46417750781F412968D9127
-:100380009C911397309719F09383828304C09093C4
-:10039000730080937200FD0132964FC0CA01861B24
-:1003A000970BFD01E80FF91F6193719302978D93ED
-:1003B0009C9343C0FD01828193819C01D9011097D8
-:1003C000A1F68091700090917100892B41F4809189
-:1003D000690090916A009093710080937000409141
-:1003E0006B0050916C004115510541F44DB75EB75B
-:1003F0008091670090916800481B590B2091700014
-:100400003091710024173507B0F4CA01821B930B99
-:100410008617970780F0AB014E5F5F4F84179507F3
-:1004200050F0420F531F5093710040937000F90138
-:100430006193719302C0E0E0F0E0CF01DF91CF91D2
-:100440000895CF93DF93009709F450C0EC012297F1
-:100450001B821A82A0917200B0917300109709F16B
-:1004600040E050E0AC17BD0708F1BB83AA83FE0152
-:1004700021913191E20FF31FAE17BF0779F48D91EF
-:100480009C911197280F391F2E5F3F4F3983288386
-:1004900012968D919C9113979B838A8341155105E8
-:1004A00071F4D0937300C093720020C012968D91A6
-:1004B0009C911397AD01009711F0DC01D3CFFA01A5
-:1004C000D383C28321913191E20FF31FCE17DF074F
-:1004D00069F488819981280F391F2E5F3F4FFA01F7
-:1004E000318320838A819B8193838283DF91CF91A3
-:0604F0000895F894FFCF0F
-:0E04F600424242424242422000740000000096
+:100050001D92A037B107E1F702D0F7C0D1CFCF93FF
+:10006000DF9314BE88E10FB6F89481BD11BC0FBEBA
+:1000700086E087BB8CE084BB11BA82E4C8D032D062
+:1000800041D078942DE088E190E00FB6F894A895DF
+:1000900081BD0FBE21BD80E690E0C2D0D4E0C2E0B9
+:1000A000CDD0882329F088B38D2788BB33D0B8D032
+:1000B00088B38C2788BBA895F3CF97B1907F97B969
+:1000C00097B18F70892B87B9369A089581E0369958
+:1000D00080E00895FBDF8823E9F3369824B135B139
+:1000E000C901089517B83E9A86B1856086B9379AD6
+:1000F00080E0E3DFEFDF0895EDDF96958795969535
+:1001000087950895AB9AAA98089581E0D6DFF4DF29
+:10011000869508951F93CF93DF93F7DF182FAB9841
+:100120008FE191E00197F1F700C00000C0E6D0E058
+:10013000AA9A95E69A95F1F70000AA9880EC8A951C
+:10014000F1F780E0BADFD8DF810F899390E0C736FE
+:10015000D90771F7AB9A00000000CE010797DF9135
+:10016000CF911F9108951F920F920FB60F921124F5
+:100170008F939F93EF93FF9381B190E0887F883BAB
+:100180009105C1F0893B91053CF4883A910559F0FD
+:10019000803B910581F507C0803C910531F1883C99
+:1001A000910549F522C081E080936F00809167003E
+:1001B00083B915C080916F00863040F010926F00B7
+:1001C00080916D0083B986B78F7B11C0E82FF0E076
+:1001D000E959FF4F908193B98F5F80936F0086B785
+:1001E000806486BF10926E0006C086B7806486BFAA
+:1001F00081E080936E0086B7806886BFFF91EF91A3
+:100200009F918F910F900FBE0F901F90189588238C
+:1002100011F481E001C08E7F82B985E486BF089524
+:10022000282F392FD901E7E6F0E08D91819380E006
+:10023000EE36F807D1F710926E00089581E09091A4
+:0E0240006E00992309F480E00895F894FFCF32
+:0E024E00808080808080804242424242424254
 :00000001FF

AudioFirmware/twislave.c

@@ -68,8 +68,6 @@ void twiInit(uint8_t address) {
 		TWAR = address & ~(1);
 	}
 	TWCR = (1 << TWEN) | (1 << TWEA) | (1 << TWIE); // Enable twi, interrupt and acknowledge bit
-	
-	sei(); // Enable interrupts
 }
 
 void twiSetDataToSend(uint8_t *d) { // 7 bytes
@@ -80,11 +78,11 @@ void twiSetDataToSend(uint8_t *d) { // 7 bytes
 	for (i = 0; i < 7; i++) {
 		data[i] = d[i];
 	}
+	dataSent = 0;
 }
 
 uint8_t twiDataWasSent(void) {
 	if (dataSent != 0) {
-		dataSent = 0;
 		return 1;
 	} else {
 		return 0;