Fixed button.

Thanks to Peter Dannegger. Also added another visualization, linear and
logarithmic together.

CubeFirmware/main.c

@@ -85,6 +85,43 @@ uint8_t disableAnim = 0;
 
 char buffer[11];
 
+/* Not so powerful Debouncing Example
+ * No Interrupt needed
+ * Author: Peter Dannegger
+ */
+#define debounce(port, pin) ({													\
+	static uint8_t flag = 0;			/* new variable on every macro usage */ \
+	uint8_t i = 0;																\
+	if (flag) {							/* check for key release: */ 			\
+		for(;;) {						/* loop ... */							\
+			if(!(port & 1 << pin)) {	/* ... until key pressed or ... */		\
+				i = 0;															\
+				break;															\
+			}																	\
+			_delay_us(98);				/* * 256 = 25ms */						\
+			if(--i == 0) {				/* ... until key >25ms released */		\
+				flag = 0;				/* clear press flag */					\
+				i = 0;					/* 0 = key release debounced */			\
+				break;															\
+			}																	\
+		}																		\
+	} else {							/* else check for key press: */			\
+		for(;;) {						/* loop ... */							\
+			if ((port & 1<<pin)) {		/* ... until key released or ... */		\
+				i = 0;															\
+				break;															\
+			}																	\
+			_delay_us( 98 );			/* * 256 = 25ms */						\
+			if (--i == 0) {				/* ... until key >25ms pressed */		\
+				flag = 1;				/* set press flag */					\
+				i = 1;					/* 1 = key press debounced */			\
+				break;															\
+			}																	\
+		}																		\
+	}																			\
+	i;									/* return value of Macro */				\
+})
+
 int main(void) {
 	/*
 		Quick Summary of the jobs main has to do:
@@ -142,10 +179,10 @@ int main(void) {
 			serialHandler((char)(serialGet()));
 		}
 
-		if ((getSystemTime() - lastButtonCheck) >= 150) { // Check button state every 150ms
+		//if ((getSystemTime() - lastButtonCheck) >= 150) { // Check button state every 150ms
 			audioModeSelected();
-			lastButtonCheck = getSystemTime();
-		}
+		//	lastButtonCheck = getSystemTime();
+		//}
 
 		if (lastButtonState == 0) {
 			// Display animations, stored or built-in
@@ -224,8 +261,7 @@ void init(void) {
 
 uint8_t audioModeSelected(void) {
 	// Pushbutton: PB0, Low active
-
-	if (!(PINB & (1 << PB0))) {
+	if (debounce(PINB, PB0)) {
 		// Button pushed
 		if (lastButtonState < (maxButtonState - 1)) {
 			lastButtonState++;

CubeFirmware/visualizer.c

@@ -36,17 +36,18 @@
 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);
-void filterData(uint8_t *data);
+void filterData(uint8_t *data, uint8_t log);
 void simpleVisualization(uint8_t *data);
 void fullDepthVisualization(uint8_t *data);
 void horribleWave(uint8_t *audioData);
 void simpleLog(uint8_t *data);
 void fullDepthLog(uint8_t *data);
+void linLog(uint8_t *data);
 
-#define NUMOFVISUALIZATIONS 5
+#define NUMOFVISUALIZATIONS 6
 void (*visualizations[NUMOFVISUALIZATIONS])(uint8_t *data) = { &simpleVisualization,
 													&fullDepthVisualization, &horribleWave,
-													&simpleLog, &fullDepthLog };
+													&simpleLog, &fullDepthLog, &linLog };
 uint8_t logScale[8] = { 2, 4, 8, 16, 31, 63, 125, 250 }; // --> ca. (1 << (led + 1));
 
 uint8_t numberOfVisualizations(void) {
@@ -55,8 +56,13 @@ uint8_t numberOfVisualizations(void) {
 
 void runVisualization(uint8_t *data, uint8_t id) {
 	if (id < NUMOFVISUALIZATIONS) {
-		filterData(data);
-		visualizations[id](data);
+		if ((id <= 5) && (id > 2)) {
+			filterData(data, 1);
+			visualizations[id](data);
+		} else {
+			filterData(data, 0);
+			visualizations[id](data);
+		}
 	}
 }
 
@@ -81,9 +87,15 @@ uint8_t average(uint8_t *data) {
 	return (uint8_t)sum;
 }
 
-void filterData(uint8_t *data) {
+void filterData(uint8_t *data, uint8_t log) {
 	uint8_t i;
-	if (average(data) < THRESHOLD) {
+	uint8_t max;
+	if (log) {
+		max = THRESHOLD / 2;
+	} else {
+		max = THRESHOLD;
+	}
+	if (average(data) < max) {
 		for (i = 0; i < 7; i++) {
 			data[i] = 0;
 		}
@@ -129,6 +141,20 @@ void simpleVisualization(uint8_t *data) {
 	buffFree(buff);
 }
 
+void linLog(uint8_t *data) {
+	uint8_t *buff;
+	buff = buffNew();
+
+	buffClearAllPixels(buff);
+
+	simpleVUMeter(data, buff, 2, 1);
+	filterData(data, 0);
+	simpleVUMeter(data, buff, 5, 0);
+
+	setImage(buff);
+	buffFree(buff);
+}
+
 void fullDepthLog(uint8_t *data) {
 	uint8_t *buff;
 	uint8_t i;