Audio FW complete. New libs for Cube FW.

AudioFirmware/eq.c

@@ -1,9 +1,5 @@
 /*
- * eq.h
-if (i < 6)
-				PORTD |= (1 << pins[i]);
-			else
-				PORTB |= (1 << pins[i]);
+ * eq.c
  *
  * Copyright 2011 Thomas Buck <xythobuz@me.com>
  * Copyright 2011 Max Nuding <max.nuding@gmail.com>
@@ -52,10 +48,10 @@ void equalizerInit(void) {
 
 void eqLed(uint8_t *d) {
 	uint8_t pins[7] = { PD2, PD3, PD4, PD5, PD6, PD7, PB0 };
-	uint8_t i, offset = getOffset();
+	uint8_t i;
 
 	for (i = 0; i < 7; i++) {
-		if ((d[i] + offset) >= 127) {
+		if (d[i] >= 127) {
 			if (i < 6)
 				PORTD |= (1 << pins[i]);
 			else

AudioFirmware/main.c

@@ -63,14 +63,22 @@ int main(void) {
 	blinkStatus();
 	blinkStatus();
 
+	music = equalizerGet();
+	twiSetDataToSend(music);
+	free(music);
+
 	while (1) {
 		music = equalizerGet();
-
+		if (twiDataWasSent()) {
+			twiSetDataToSend(music);
+		}
+		eqLed(music);
 		free(music);
 
 		// Heartbeat
 		PORTB ^= (1 << PB1);
 		_delay_ms(1); // Everything locks if this is removed :(
+		// still don't know why...
 	}
 
 	return 0;

AudioFirmware/makefile

@@ -391,6 +391,7 @@ clean: begin clean_list finished end
 clean_list :
 	@echo
 	@echo $(MSG_CLEANING)
+	$(REMOVE) $(TARGET).hex
 	$(REMOVE) $(TARGET).eep
 	$(REMOVE) $(TARGET).obj
 	$(REMOVE) $(TARGET).cof

AudioFirmware/twislave.c

@@ -1,5 +1,5 @@
 /*
- * twislave.h
+ * twislave.c
  *
  * Copyright 2011 Thomas Buck <xythobuz@me.com>
  * Copyright 2011 Max Nuding <max.nuding@gmail.com>

CubeFirmware/audio.c

@@ -0,0 +1,43 @@
+/*
+ * audio.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 <stdlib.h>
+
+#include "twi.h"
+#include "audio.h"
+
+// free returned memory!
+uint8_t *getAudioData(void) {
+	// We read 7 bytes from our Audio µC
+	uint8_t i;
+	uint8_t *ret = (uint8_t *)malloc(7);
+
+	i2c_start(TWIADDRESSAUDIO | I2C_READ);
+	for (i = 0; i < 6; i++) {
+		ret[i] = i2c_readAck();
+	}
+	ret[6] = i2c_readNak();
+	i2c_stop();
+	return ret;
+}

CubeFirmware/audio.h

@@ -0,0 +1,27 @@
+/*
+ * audio.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/>.
+ */
+
+#define TWIADDRESSAUDIO 0x42
+
+// free returned memory!
+uint8_t *getAudioData(void);

CubeFirmware/makefile

@@ -39,6 +39,8 @@ SRC = $(TARGET).c
 SRC += uart.c # Additional Source-File
 SRC += cube.c
 SRC += twi.c
+SRC += mem.c
+SRC += audio.c
 
 # List Assembler source files here.
 # Make them always end in a capital .S.  Files ending in a lowercase .s

CubeFirmware/mem.c

@@ -0,0 +1,101 @@
+/*
+ * mem.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 <stdlib.h>
+#include <stdint.h>
+#include "twi.h"
+#include "mem.h"
+
+// address is a number between (inclusive) zero and 131071
+uint8_t memGetByte(uint32_t address) {
+	uint8_t addA, addB, memAddress = MEMTWIADDRESS, ret;
+	if (address >= 65536) {
+		// Address needs more than 16 bits, we have to set the PAGE bit in i2c address
+		memAddress |= 2;
+	}
+	addA = memAddress & 0xFF00;
+	addB = memAddress & 0xFF;
+
+	i2c_start(memAddress | I2C_WRITE); // Send start, write address to read
+	i2c_write(addA);
+	i2c_write(addB); // Give address to memory
+	i2c_rep_start(memAddress | I2C_READ); // Start again, this time reading
+	ret = i2c_readNak(); // Read one byte from memory
+	i2c_stop();
+	return ret;
+}
+
+// Free returned memory!
+uint8_t *memGetBytes(uint32_t address, uint8_t length) {
+	// We could use the High-Speed Mode of the FM24V10 here, but we don't, right now...
+	uint8_t addA, addB, memAddress = MEMTWIADDRESS, i;
+	uint8_t *ret;
+	if (address >= 65536) {
+		// Address needs more than 16 bits, we have to set the PAGE bit in i2c address
+		memAddress |= 2;
+	}
+	addA = memAddress & 0xFF00;
+	addB = memAddress & 0xFF;
+	ret = (uint8_t *)malloc(length); // Allocate memory for values read
+
+	i2c_start(memAddress | I2C_WRITE);
+	i2c_write(addA);
+	i2c_write(addB);
+	i2c_rep_start(memAddress | I2C_READ);
+	for (i = 0; i < (length - 1); i++) {
+		ret[i] = i2c_readAck();
+	}
+	ret[length - 1] = i2c_readNak();
+	i2c_stop();
+	return ret;
+}
+
+void memWriteByte(uint32_t address, uint8_t data) {
+	uint8_t addA, addB, memAddress = MEMTWIADDRESS;
+	if (address >= 65536) {
+		// Address needs more than 16 bits, we have to set the PAGE bit in i2c address
+		memAddress |= 2;
+	}
+	addA = memAddress & 0xFF00;
+	addB = memAddress & 0xFF;
+	i2c_write(addA);
+	i2c_write(addB); // Give address to memory
+	i2c_write(data);
+	i2c_stop();
+}
+
+void memWriteBytes(uint32_t address, uint8_t *data, uint8_t length) {
+	uint8_t addA, addB, memAddress = MEMTWIADDRESS, i;
+	if (address >= 65536) {
+		// Address needs more than 16 bits, we have to set the PAGE bit in i2c address
+		memAddress |= 2;
+	}
+	addA = memAddress & 0xFF00;
+	addB = memAddress & 0xFF;
+	i2c_write(addA);
+	i2c_write(addB); // Give address to memory
+	for (i = 0; i < length; i++) {
+		i2c_write(data[i]);
+	}
+	i2c_stop();
+}

CubeFirmware/mem.h

@@ -0,0 +1,34 @@
+/*
+ * mem.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/>.
+ */
+
+#define MEMTWIADDRESS 0xA0
+
+// address is a number between (inclusive) zero and 131071
+uint8_t memGetByte(uint32_t address);
+
+// Free returned memory!
+uint8_t *memGetBytes(uint32_t address, uint8_t length);
+
+void memWriteByte(uint32_t address, uint8_t data);
+
+void memWriteBytes(uint32_t address, uint8_t *data, uint8_t length);

CubeFirmware/twi.h

@@ -10,77 +10,6 @@
 * Usage:    see Doxygen manual
 **************************************************************************/
 
-#ifdef DOXYGEN
-/**
- @defgroup pfleury_ic2master I2C Master library
- @code #include <i2cmaster.h> @endcode
-  
- @brief I2C (TWI) Master Software Library
-
- Basic routines for communicating with I2C slave devices. This single master 
- implementation is limited to one bus master on the I2C bus. 
-
- This I2c library is implemented as a compact assembler software implementation of the I2C protocol 
- which runs on any AVR (i2cmaster.S) and as a TWI hardware interface for all AVR with built-in TWI hardware (twimaster.c).
- Since the API for these two implementations is exactly the same, an application can be linked either against the
- software I2C implementation or the hardware I2C implementation.
-
- Use 4.7k pull-up resistor on the SDA and SCL pin.
- 
- Adapt the SCL and SDA port and pin definitions and eventually the delay routine in the module 
- i2cmaster.S to your target when using the software I2C implementation ! 
- 
- Adjust the  CPU clock frequence F_CPU in twimaster.c or in the Makfile when using the TWI hardware implementaion.
-
- @note 
-    The module i2cmaster.S is based on the Atmel Application Note AVR300, corrected and adapted 
-    to GNU assembler and AVR-GCC C call interface.
-    Replaced the incorrect quarter period delays found in AVR300 with 
-    half period delays. 
-    
- @author Peter Fleury pfleury@gmx.ch  http://jump.to/fleury
-
- @par API Usage Example
-  The following code shows typical usage of this library, see example test_i2cmaster.c
-
- @code
-
- #include <i2cmaster.h>
-
-
- #define Dev24C02  0xA2      // device address of EEPROM 24C02, see datasheet
-
- int main(void)
- {
-     unsigned char ret;
-
-     i2c_init();                             // initialize I2C library
-
-     // write 0x75 to EEPROM address 5 (Byte Write) 
-     i2c_start_wait(Dev24C02+I2C_WRITE);     // set device address and write mode
-     i2c_write(0x05);                        // write address = 5
-     i2c_write(0x75);                        // write value 0x75 to EEPROM
-     i2c_stop();                             // set stop conditon = release bus
-
-
-     // read previously written value back from EEPROM address 5 
-     i2c_start_wait(Dev24C02+I2C_WRITE);     // set device address and write mode
-
-     i2c_write(0x05);                        // write address = 5
-     i2c_rep_start(Dev24C02+I2C_READ);       // set device address and read mode
-
-     ret = i2c_readNak();                    // read one byte from EEPROM
-     i2c_stop();
-
-     for(;;);
- }
- @endcode
-
-*/
-#endif /* DOXYGEN */
-
-/**@{*/
-
 #if (__GNUC__ * 100 + __GNUC_MINOR__) < 304
 #error "This library requires AVR-GCC 3.4 or later, update to newer AVR-GCC compiler !"
 #endif
@@ -173,6 +102,4 @@ extern unsigned char i2c_readNak(void);
 extern unsigned char i2c_read(unsigned char ack);
 #define i2c_read(ack)  (ack) ? i2c_readAck() : i2c_readNak(); 
 
-
-/**@}*/
 #endif