Can now cycle through different audio visualizations with button.

Also better filtering for audio data in AudioFirmware.

AudioFirmware/eq.c

@@ -46,6 +46,7 @@ uint8_t result[7] = {128, 128, 128, 128, 128, 128, 128};
 void equalizerInit(void);
 uint8_t *equalizerGet(void);
 void calcMultiplicator(uint8_t *d);
+void heightenTreble(uint8_t *d);
 void filterNoise(uint8_t *data);
 uint8_t getOffset(void);
 
@@ -74,8 +75,10 @@ uint8_t *equalizerGet(void) {
 	asm volatile ("nop"); // Ensure minimal reset pulse width
 	asm volatile ("nop"); // 2 NOPs at 16MHz are enough...
 
-	filterNoise(result);
-	calcMultiplicator(result);
+	filterNoise(result); // Filter lower values
+	heightenTreble(result); // Heighten higher frequencies, cause they seem damped
+	calcMultiplicator(result); // Multiply with Poti Position
+	filterNoise(result); // Filter lower values
 
 	return result;
 }
@@ -89,11 +92,15 @@ void calcMultiplicator(uint8_t *d) {
 	}
 }
 
+void heightenTreble(uint8_t *d) {
+	d[6] = d[5] * 10 / 15; // Get practically nothing on this channel. So fake something...
+}
+
 void filterNoise(uint8_t *data) {
 	uint8_t i;
 	for (i = 0; i < 7; i++) {
-		if (data[i] <= 40) {
-			data[i] = 0;
+		if (data[i] < 60) {
+			data[i] = data[i] * 10 / 15; // / 1.5
 		}
 	}
 }

AudioFirmware/main.hex

@@ -1,47 +1,53 @@
 :1000000012C02CC02BC02AC029C028C027C026C0BF
 :1000100025C024C023C022C021C020C01FC01EC0D4
-:100020001DC0CEC01BC011241FBECFE5D4E0DEBF73
-:10003000CDBF10E0A0E6B0E0E0EDF2E002C0059038
+:100020001DC0E9C01BC011241FBECFE5D4E0DEBF58
+:10003000CDBF10E0A0E6B0E0ECE2F3E002C0059036
 :100040000D92AE36B107D9F710E0AEE6B0E001C0D0
-:100050001D92A037B107E1F702D038C1D1CFCF93BD
+:100050001D92A037B107E1F702D066C1D1CFCF938F
 :1000600014BE88E10FB6F89481BD11BC0FBE86E0C6
-:1000700087BB8CE084BB11BA82E4F6D02ED03DD091
+:1000700087BB8CE084BB11BA82E411D12ED03DD075
 :1000800078942DE088E190E00FB6F894A89581BDB2
-:100090000FBE21BD80E690E0F0D0C4E0FCD0882304
-:1000A00029F088B38C2788BB61D0E7D0A895F6CF1C
+:100090000FBE21BD80E690E00BD1C4E017D18823CC
+:1000A00029F088B38C2788BB76D002D1A895F6CFEB
 :1000B00097B1907F97B997B18F70892B87B9369A8E
 :1000C000089581E0369980E00895FBDF8823E9F305
 :1000D000369824B135B1C901089517B83E9A86B152
 :1000E000856086B9379A80E0E3DFEFDF0895EDDFC2
 :1000F00096958795969587950895AB9AAA980895B1
-:10010000E82FF92F87E09081993208F4108281500E
-:1001100031968823C1F7089581E0CADFE8DF0895AA
-:100120001F93CF93DF93D82FC92FF6DF90E08C5920
-:100130009F4F6AE070E0B6D09B01CE01E92FF82F07
-:1001400010E0CAE0D0E0408150E0249FC001259F2C
-:10015000900D349F900D1124BE01A4D061931F5FB8
-:10016000173089F7DF91CF911F910895CF93DF93D7
-:10017000AB988FE191E00197F1F700C00000C0E675
-:10018000D0E0AA9A95E69A95F1F70000AA9880EC3B
-:100190008A95F1F780E08CDFAADF899390E0C7367B
-:1001A000D90779F7AB9A00000000CE010797A8DFC6
-:1001B000CE010797B5DFCE010797DF91CF91089564
-:1001C0001F920F920FB60F9211248F939F93EF936C
-:1001D000FF9381B190E0887F883B9105C1F0893B16
-:1001E00091053CF4883A910559F0803B910581F5E1
-:1001F00007C0803C910531F1883C910549F522C04A
-:1002000081E080936F008091670083B915C0809171
-:100210006F00863040F010926F0080916D0083B9BE
-:1002200086B78F7B11C0E82FF0E0E959FF4F90812E
-:1002300093B98F5F80936F0086B7806486BF1092FA
-:100240006E0006C086B7806486BF81E080936E0032
-:1002500086B7806886BFFF91EF919F918F910F9035
-:100260000FBE0F901F901895882311F481E001C0F4
-:100270008E7F82B985E486BF0895282F392FD90152
-:10028000E7E6F0E08D91819380E0EE36F807D1F754
-:1002900010926E00089581E090916E00992309F408
-:1002A00080E00895AA1BBB1B51E107C0AA1FBB1F1A
-:1002B000A617B70710F0A61BB70B881F991F5A95F2
-:1002C000A9F780959095BC01CD010895F894FFCFD2
-:0E02D0008080808080808042424242424242D2
+:10010000FC0195818AE0989FC00111246FE070E0A6
+:10011000F8D066830895CF93E82FF92F40E0CAE026
+:100120002FE030E080818C3330F48C9FC0011124AB
+:10013000B901E7D060834F5F3196473099F7CF918F
+:10014000089581E0B5DFD3DF08951F93CF93DF9348
+:10015000D82FC92FF6DF90E08C599F4F6AE070E0EE
+:10016000BCD09B01CE01E92FF82F10E0CAE0D0E00F
+:10017000408150E0249FC001259F900D349F900D39
+:100180001124BE01AAD061931F5F173089F7DF9158
+:10019000CF911F910895CF93DF93AB988FE191E0BA
+:1001A0000197F1F700C00000C0E6D0E0AA9A95E6FA
+:1001B0009A95F1F70000AA9880EC8A95F1F780E013
+:1001C00077DF95DF899390E0C736D90779F7AB9A47
+:1001D00000000000CE0107979EDFCE01079790DF59
+:1001E000CE010797B2DFCE01079795DFCE010797C3
+:1001F000DF91CF9108951F920F920FB60F921124A5
+:100200008F939F93EF93FF9381B190E0887F883B1A
+:100210009105C1F0893B91053CF4883A910559F06C
+:10022000803B910581F507C0803C910531F1883C08
+:10023000910549F522C081E080936F0080916700AD
+:1002400083B915C080916F00863040F010926F0026
+:1002500080916D0083B986B78F7B11C0E82FF0E0E5
+:10026000E959FF4F908193B98F5F80936F0086B7F4
+:10027000806486BF10926E0006C086B7806486BF19
+:1002800081E080936E0086B7806886BFFF91EF9112
+:100290009F918F910F900FBE0F901F9018958823FC
+:1002A00011F481E001C08E7F82B985E486BF089594
+:1002B000282F392FD901E7E6F0E08D91819380E076
+:1002C000EE36F807D1F710926E00089581E0909114
+:1002D0006E00992309F480E00895AA1BBB1B51E12D
+:1002E00007C0AA1FBB1FA617B70710F0A61BB70BA6
+:1002F000881F991F5A95A9F780959095BC01CD014B
+:10030000089597FB092E07260AD077FD04D0E5DF74
+:1003100006D000201AF4709561957F4F0895F6F786
+:0C032000909581959F4F0895F894FFCFB1
+:0E032C00808080808080804242424242424275
 :00000001FF

CubeFirmware/animations.c

@@ -195,7 +195,6 @@ void zWave2(void) {
 
 void tinyCube(void) {
 	uint8_t *buff;
-	int8_t x, y, z;
 
 	buff = buffNew();
 
@@ -245,6 +244,7 @@ void smallCube (void){
 	buffClearAllPixels(buff);
 	free(buff);
 }
+
 void bigCube (void) {
 	uint8_t *buff;
 	int8_t x, y, z;
@@ -278,6 +278,7 @@ void bigCube (void) {
 
 	free(buff);
 }
+
 void fullCube (void) {
 	uint8_t *buff;
 	int8_t x, y, z;

CubeFirmware/header/visualizer.h

@@ -20,5 +20,5 @@
  * 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 simpleVisualization(uint8_t *data);
-void wave3DVisualization(uint8_t *data);
+uint8_t numberOfVisualizations(void);
+void runVisualization(uint8_t *data, uint8_t id);

CubeFirmware/main.c

@@ -74,6 +74,7 @@ void printTime(void);
 uint8_t shouldRestart = 0;
 uint8_t refreshAnimationCount = 1;
 uint8_t lastButtonState = 0;
+uint8_t maxButtonState = 0;
 uint8_t mcusr_mirror;
 char buffer[11];
 
@@ -85,7 +86,7 @@ uint8_t DebugDone = 0; // Bit 0: 10s int. count, Bit 1: idle switch
 int main(void) {
 	uint8_t *audioData = NULL;
 	uint8_t *imageData = NULL;
-	uint8_t i, length = 0, lastMode;
+	uint8_t i, length = 0;
 	uint16_t count;
 	uint64_t lastChecked;
 	uint8_t idleCounter = 0;
@@ -147,10 +148,12 @@ int main(void) {
 	}
 #endif
 
-	lastMode = audioModeSelected();
+	maxButtonState = numberOfVisualizations() + 1; // All visualizations and anim mode
+
+	audioModeSelected();
 	lastChecked = getSystemTime();
 
-	i = 0;
+	i = 0; // Image count
 	count = getAnimationCount();
 
 	while (1) {
@@ -159,12 +162,13 @@ int main(void) {
 			wdt_reset();
 		}
 
-		if(lastMode) {
-			// Get Audio Data and visualize it
+		if(lastButtonState >= 1) {
+			// Get Audio Data and visualize it.
+			// Visualization id is in (lastButtonState - 1)
 			if (isFinished()) {
 				audioData = getAudioData(); // Not malloc'ed => Don't free
 				if (audioData != NULL) {
-					simpleVisualization(audioData);
+					runVisualization(audioData, lastButtonState - 1);
 				}
 			}
 		} else {
@@ -237,7 +241,7 @@ int main(void) {
 #endif
 
 		if ((getSystemTime() - lastChecked) > 150) { // Check button state every 150ms
-			lastMode = audioModeSelected();
+			audioModeSelected();
 			lastChecked = getSystemTime();
 		} 
 	}
@@ -246,6 +250,29 @@ int main(void) {
 	return 0;
 }
 
+uint8_t audioModeSelected(void) {
+	// Pushbutton: PB0, Low active
+
+	if (!(PINB & (1 << PB0))) {
+		// Button pushed
+		if (lastButtonState < (maxButtonState - 1)) {
+			lastButtonState++;
+		} else {
+			lastButtonState = 0;
+		}
+
+#ifdef DEBUG
+		if (lastButtonState) {
+			serialWriteString(getString(38));
+		} else {
+			serialWriteString(getString(39));
+		}
+#endif
+
+	}
+	return lastButtonState;
+}
+
 #ifdef DEBUG
 uint8_t selfTest(void) {
 	uint8_t result = NOERROR;
@@ -510,26 +537,3 @@ void printTime(void) {
 	}
 }
 #endif
-
-uint8_t audioModeSelected(void) {
-	// Pushbutton: PB0, Low active
-
-	if (!(PINB & (1 << PB0))) {
-		// Button pushed
-		if (lastButtonState == 0) {
-			lastButtonState = 1;
-		} else {
-			lastButtonState = 0;
-		}
-
-#ifdef DEBUG
-		if (lastButtonState) {
-			serialWriteString(getString(38));
-		} else {
-			serialWriteString(getString(39));
-		}
-#endif
-
-	}
-	return lastButtonState;
-}

CubeFirmware/visualizer.c

@@ -27,30 +27,59 @@
 #include <cube.h>
 #include <buffhelp.h>
 
-void simpleVisualization(uint8_t *data) {
-	uint8_t *buff;
-	int8_t i, h, max, d;
+void simpleVisualization(uint8_t *data);
+void fullDepthVisualization(uint8_t *data);
 
-	buff = buffNew();
+#define NUMOFVISUALIZATIONS 2
 
-	buffClearAllPixels(buff);
+void (*visualizations[NUMOFVISUALIZATIONS])(uint8_t *data) = { &simpleVisualization,
+													&fullDepthVisualization };
+
+uint8_t numberOfVisualizations(void) {
+	return NUMOFVISUALIZATIONS;
+}
 
+void runVisualization(uint8_t *data, uint8_t id) {
+	if (id < NUMOFVISUALIZATIONS)
+		visualizations[id](data);
+}
+
+void simpleVUMeter(uint8_t *data, uint8_t *buff, uint8_t z) {
+	uint8_t i, h, max;
 	for(i = 0; i < 7; i++) {
 		max = data[i] / 31;
-		
-		// d = 7;
-		for (d = 0; d < 8; d++) {
-			// h = max;
-			for (h = 0; h < max; h++) {
-				buffSetPixel(buff, i, h, d);
+		for (h = 0; h < max; h++) {
+			if (i == 0) {
+				buffSetPixel(buff, i, h / 2, z);
 			}
+			buffSetPixel(buff, i + 1, h, z);
 		}
 	}
+}
+
+void simpleVisualization(uint8_t *data) {
+	uint8_t *buff;
+	buff = buffNew();
+
+	buffClearAllPixels(buff);
+
+	simpleVUMeter(data, buff, 7);
 
 	setImage(buff);
 	buffFree(buff);
 }
 
-void wave3DVisualization(uint8_t *data) {
+void fullDepthVisualization(uint8_t *data) {
+	uint8_t *buff;
+	uint8_t i;
+	buff = buffNew();
+
+	buffClearAllPixels(buff);
+
+	for (i = 0; i < 8; i++) {
+		simpleVUMeter(data, buff, i);
+	}
 
+	setImage(buff);
+	buffFree(buff);
 }