Misc changes.

Reversed button scroll direction, removed cruft, linLog Visualization
is now started after boot. Revised filter for audio data.

CubeFirmware/main.c

@@ -52,7 +52,6 @@
 #define IDLELENGTH 48
 
 void init(void);
-uint8_t audioModeSelected(void);
 uint8_t selfTest(void);
 void serialHandler(char c);
 
@@ -136,9 +135,6 @@ int main(void) {
 	uint8_t i;
 	uint8_t imageIndex = 0, imageCount = 0;
 	uint8_t idleIndex = 0, idleCount = 0;
-	uint8_t lastButtonCheck;
-	// uint8_t fpsWasSent = 0;
-	// uint32_t temp;
 	uint8_t *imageData = NULL, *audioData = NULL;
 	uint8_t duration = 0;
 
@@ -155,14 +151,13 @@ int main(void) {
 		disableMemory = 1;
 	serialWriteString(getString(0)); // Print Version
 
-	audioModeSelected(); // Initial button state check
-	lastButtonCheck = getSystemTime(); // Time we checked
-
 	if (disableMemory == 0)
 		imageCount = getAnimationCount(); // Retrieve image count from memory
 	idleCount = numOfAnimations();
 	if (disableAudioData == 0)
 		maxButtonState = numberOfVisualizations() + 1; // Number of toggle steps for button
+		lastButtonState = 1;
+
 
 	while(1) { // Our Mainloop
 		if (!shouldRestart) { // A flag to trigger a watchdog reset
@@ -179,10 +174,13 @@ int main(void) {
 			serialHandler((char)(serialGet()));
 		}
 
-		//if ((getSystemTime() - lastButtonCheck) >= 150) { // Check button state every 150ms
-			audioModeSelected();
-		//	lastButtonCheck = getSystemTime();
-		//}
+		if (debounce(PINB, PB0)) {
+			if (lastButtonState > 0) {
+				lastButtonState--;
+			} else {
+				lastButtonState = maxButtonState - 1;
+			}
+		}
 
 		if (lastButtonState == 0) {
 			// Display animations, stored or built-in
@@ -259,20 +257,6 @@ void init(void) {
 	setImage(defaultImageCube); // Display something
 }
 
-uint8_t audioModeSelected(void) {
-	// Pushbutton: PB0, Low active
-	if (debounce(PINB, PB0)) {
-		// Button pushed
-		if (lastButtonState < (maxButtonState - 1)) {
-			lastButtonState++;
-		} else {
-			lastButtonState = 0;
-		}
-
-	}
-	return lastButtonState;
-}
-
 uint8_t selfTest(void) {
 	uint8_t result = NOERROR;
 	
@@ -393,10 +377,10 @@ void serialHandler(char c) {
 		break;
 
 	case 'm': case 'M':
-		if (lastButtonState < (maxButtonState - 1)) {
-			lastButtonState++;
+		if (lastButtonState > 0) {
+			lastButtonState--;
 		} else {
-			lastButtonState = 0;
+			lastButtonState = maxButtonState - 1;
 		}
 		if (lastButtonState) {
 			serialWriteString(getString(41));

CubeFirmware/visualizer.c

@@ -22,6 +22,7 @@
  */
 #include <avr/io.h>
 #include <stdint.h>
+#include <stdlib.h>
 
 #include <visualizer.h>
 #include <cube.h>
@@ -36,6 +37,7 @@
 uint8_t maxVal(uint8_t data, uint8_t log);
 void setRow(uint8_t x, uint8_t z, uint8_t height, uint8_t *buf);
 uint8_t average(uint8_t *data);
+uint8_t maximum(uint8_t *data);
 void filterData(uint8_t *data, uint8_t log);
 void simpleVisualization(uint8_t *data);
 void fullDepthVisualization(uint8_t *data);
@@ -45,9 +47,9 @@ void fullDepthLog(uint8_t *data);
 void linLog(uint8_t *data);
 
 #define NUMOFVISUALIZATIONS 6
-void (*visualizations[NUMOFVISUALIZATIONS])(uint8_t *data) = { &simpleVisualization,
+void (*visualizations[NUMOFVISUALIZATIONS])(uint8_t *data) = { &linLog, &simpleVisualization,
 													&fullDepthVisualization, &horribleWave,
-													&simpleLog, &fullDepthLog, &linLog };
+													&simpleLog, &fullDepthLog };
 uint8_t logScale[8] = { 2, 4, 8, 16, 31, 63, 125, 250 }; // --> ca. (1 << (led + 1));
 
 uint8_t numberOfVisualizations(void) {
@@ -56,16 +58,25 @@ uint8_t numberOfVisualizations(void) {
 
 void runVisualization(uint8_t *data, uint8_t id) {
 	if (id < NUMOFVISUALIZATIONS) {
-		if ((id <= 5) && (id > 2)) {
+		if ((id == 0) || ((id > 3) && (id <= 5))) {
 			filterData(data, 1);
-			visualizations[id](data);
 		} else {
 			filterData(data, 0);
-			visualizations[id](data);
 		}
+		visualizations[id](data);
 	}
 }
 
+uint8_t maximum(uint8_t *data) {
+	uint8_t i, max = 0;
+	for (i = 0; i < 7; i++) {
+		if (data[i] > max) {
+			max = data[i];
+		}
+	}
+	return max;
+}
+
 uint8_t maxVal(uint8_t data, uint8_t log) {
 	uint8_t max = 0;
 	if (log) {
@@ -90,8 +101,13 @@ uint8_t average(uint8_t *data) {
 void filterData(uint8_t *data, uint8_t log) {
 	uint8_t i;
 	uint8_t max;
+
 	if (log) {
-		max = THRESHOLD / 2;
+		if (average(data) < THRESHOLD) {
+			max = THRESHOLD;
+		} else {
+			max = THRESHOLD / 2;
+		}
 	} else {
 		max = THRESHOLD;
 	}