Fixed frame counter width.

Only used 8bit vars, while 16bit were required.

AudioFirmware/eq.c

@@ -75,7 +75,7 @@ uint8_t *equalizerGet(void) {
 
 	filterNoise(result); // Filter lower values
 	heightenTreble(result); // Heighten higher frequencies, cause they seem damped
-	// calcMultiplicator(result); // Multiply with Poti Position
+	calcMultiplicator(result); // Multiply with Poti Position
 	filterNoise(result); // Filter lower values
 
 	return result;
@@ -83,10 +83,19 @@ uint8_t *equalizerGet(void) {
 
 void calcMultiplicator(uint8_t *d) {
 	uint8_t i;
-	uint16_t multiplicator = ((uint16_t)getOffset() + 100) / 10;
+	uint16_t multiplicator = ((uint16_t)getOffset() + 100) / 10; // From 10 to 36
+	uint16_t temp;
 
 	for (i = 0; i < 7; i++) {
-		d[i] = (d[i] * multiplicator) / 10;
+		// Had some problems with 8bit and 16bit arithmetic, cutting some numbers.
+		// Thats why it is a bit more verbose than really necessary...
+		temp = d[i];
+		temp = temp * multiplicator / 10; // From 0 to 918
+		if (temp > 255) {
+			d[i] = 255;
+		} else {
+			d[i] = (uint8_t)temp;
+		}
 	}
 }
 
@@ -97,7 +106,7 @@ void heightenTreble(uint8_t *d) {
 void filterNoise(uint8_t *data) {
 	uint8_t i;
 	for (i = 0; i < 7; i++) {
-		if (data[i] < 60) {
+		if (data[i] < 30) {
 			data[i] = data[i] * 10 / 15; // / 1.5
 		}
 	}

AudioFirmware/main.hex

@@ -1,53 +1,54 @@
 :1000000012C02CC02BC02AC029C028C027C026C0BF
 :1000100025C024C023C022C021C020C01FC01EC0D4
-:100020001DC0E6C01BC011241FBECFE5D4E0DEBF5B
-:10003000CDBF10E0A0E6B0E0E6E2F3E002C005903C
+:100020001DC0F3C01BC011241FBECFE5D4E0DEBF4E
+:10003000CDBF10E0A0E6B0E0E0E4F3E002C0059040
 :100040000D92AE36B107D9F710E0AEE6B0E001C0D0
-:100050001D92A037B107E1F702D063C1D1CFCF9392
+:100050001D92A037B107E1F702D070C1D1CFCF9385
 :1000600014BE88E10FB6F89481BD11BC0FBE86E0C6
-:1000700087BB8CE084BB11BA82E40ED12ED03DD078
+:1000700087BB8CE084BB11BA82E41BD12ED03DD06B
 :1000800078942DE088E190E00FB6F894A89581BDB2
-:100090000FBE21BD80E690E008D1C4E014D18823D2
-:1000A00029F088B38C2788BB4CD0FFD0A895F6CF19
+:100090000FBE21BD80E690E015D1C4E021D18823B8
+:1000A00029F088B38C2788BB80D00CD1A895F6CFD7
 :1000B00097B1907F97B997B18F70892B87B9369A8E
 :1000C000089581E0369980E00895FBDF8823E9F305
 :1000D000369824B135B1C901089517B83E9A86B152
 :1000E000856086B9379A80E0E3DFEFDF0895EDDFC2
 :1000F00096958795969587950895AB9AAA980895B1
 :10010000FC0195818AE0989FC00111246FE070E0A6
-:10011000F5D066830895CF93E82FF92F40E0CAE029
-:100120002FE030E080818C3330F48C9FC0011124AB
-:10013000B901E4D060834F5F3196473099F7CF9192
-:100140000895CF93DF93AB988FE191E00197F1F79A
-:1001500000C00000C0E6D0E0AA9A95E69A95F1F7B3
-:100160000000AA9880EC8A95F1F780E0A1DFBFDF5C
-:10017000899390E0C736D90779F7AB9A0000000061
-:10018000CE010797C8DFCE010797BADFCE010797E8
-:10019000C2DFCE010797DF91CF91089581E088DF1C
-:1001A000A6DF08951F93CF93DF93D82FC92FF6DFD3
-:1001B00090E08C599F4F6AE070E08CD09B01CE019B
-:1001C000E92FF82F10E0CAE0D0E0408150E0249FF2
-:1001D000C001259F900D349F900D1124BE017AD04F
-:1001E00061931F5F173089F7DF91CF911F910895B9
-:1001F0001F920F920FB60F9211248F939F93EF933C
-:10020000FF9381B190E0887F883B9105C1F0893BE5
-:1002100091053CF4883A910559F0803B910581F5B0
-:1002200007C0803C910531F1883C910549F522C019
-:1002300081E080936F008091670083B915C0809141
-:100240006F00863040F010926F0080916D0083B98E
-:1002500086B78F7B11C0E82FF0E0E959FF4F9081FE
-:1002600093B98F5F80936F0086B7806486BF1092CA
-:100270006E0006C086B7806486BF81E080936E0002
-:1002800086B7806886BFFF91EF919F918F910F9005
-:100290000FBE0F901F901895882311F481E001C0C4
-:1002A0008E7F82B985E486BF0895282F392FD90122
-:1002B000E7E6F0E08D91819380E0EE36F807D1F724
-:1002C00010926E00089581E090916E00992309F4D8
-:1002D00080E00895AA1BBB1B51E107C0AA1FBB1FEA
-:1002E000A617B70710F0A61BB70B881F991F5A95C2
-:1002F000A9F780959095BC01CD01089597FB092E33
-:1003000007260AD077FD04D0E5DF06D000201AF4D6
-:10031000709561957F4F0895F6F7909581959F4F61
-:060320000895F894FFCFE0
-:0E03260080808080808080424242424242427B
+:1001100002D166830895CF93E82FF92F40E0CAE01B
+:100120002FE030E080818E3130F48C9FC0011124AB
+:10013000B901F1D060834F5F3196473099F7CF9185
+:10014000089581E0B5DFD3DF08950F931F93CF9318
+:10015000DF93D82FC92FF5DF90E08C599F4F6AE0CD
+:1001600070E0C5D09B01CE01E92FF82F10E0CAE066
+:10017000D0E00FEF408150E0249FC001259F900DFB
+:10018000349F900D1124BE01B2D06F3F710519F05C
+:1001900010F0008301C060831F5F3196173051F764
+:1001A000DF91CF911F910F910895CF93DF93AB987B
+:1001B0008FE191E00197F1F700C00000C0E6D0E0C8
+:1001C000AA9A95E69A95F1F70000AA9880EC8A958C
+:1001D000F1F780E06DDF8BDF899390E0C736D907B8
+:1001E00079F7AB9A00000000CE01079794DFCE01AB
+:1001F000079786DFCE010797A8DFCE0107978BDF31
+:10020000CE010797DF91CF9108951F920F920FB6FD
+:100210000F9211248F939F93EF93FF9381B190E0FE
+:10022000887F883B9105C1F0893B91053CF4883A71
+:10023000910559F0803B910581F507C0803C9105FF
+:1002400031F1883C910549F522C081E080936F002F
+:100250008091670083B915C080916F00863040F0AF
+:1002600010926F0080916D0083B986B78F7B11C0AB
+:10027000E82FF0E0E959FF4F908193B98F5F8093A9
+:100280006F0086B7806486BF10926E0006C086B786
+:10029000806486BF81E080936E0086B7806886BFE9
+:1002A000FF91EF919F918F910F900FBE0F901F9034
+:1002B0001895882311F481E001C08E7F82B985E40E
+:1002C00086BF0895282F392FD901E7E6F0E08D91F8
+:1002D000819380E0EE36F807D1F710926E00089512
+:1002E00081E090916E00992309F480E00895AA1BA3
+:1002F000BB1B51E107C0AA1FBB1FA617B70710F011
+:10030000A61BB70B881F991F5A95A9F78095909542
+:10031000BC01CD01089597FB092E07260AD077FD71
+:1003200004D0E5DF06D000201AF4709561957F4F68
+:100330000895F6F7909581959F4F0895F894FFCF13
+:0E034000808080808080804242424242424261
 :00000001FF

CubeFirmware/generator.c

@@ -28,7 +28,7 @@
 
 // Generate 8 frames, store them from index start.
 // data has 8 bytes --> 1 layer. This layer is moved from back to front.
-void generateMovingAnimation(uint8_t *data, uint8_t start, uint8_t duration) {
+void generateMovingAnimation(uint8_t *data, uint16_t start, uint8_t duration) {
 	uint8_t i, j, d;
 	uint8_t *frame = (uint8_t *)malloc(65);
 	frame[64] = duration;
@@ -47,7 +47,7 @@ void generateMovingAnimation(uint8_t *data, uint8_t start, uint8_t duration) {
 	free(frame);
 }
 
-void renderText(char *text, uint8_t start) {
+void renderText(char *text, uint16_t start) {
 	uint8_t *buf;
 
 	while(text[0] != '\0') {
@@ -57,7 +57,7 @@ void renderText(char *text, uint8_t start) {
 	}
 
 	buf = buffNew();
-	buf[64] = 10; // half second pause...
+	buf[64] = 12; // half second empty frame at end of text
 	setFrame(start, buf);
 	free(buf);
 }

CubeFirmware/header/generator.h

@@ -21,5 +21,5 @@
 
 // Generate 8 frames, store them from index start.
 // data has 8 bytes --> 1 layer. This layer is moved from back to front.
-void generateMovingAnimation(uint8_t *data, uint8_t start, uint8_t duration);
-void renderText(char *text, uint8_t start);
+void generateMovingAnimation(uint8_t *data, uint16_t start, uint8_t duration);
+void renderText(char *text, uint16_t start);

CubeFirmware/header/transmit.h

@@ -28,7 +28,7 @@ void sendAudioData(void);
 void printTime(void);
 void dumpFrame(uint8_t *f);
 uint8_t *readLine(void);
-uint8_t readNumber(uint8_t base);
+uint16_t readNumber(uint8_t base);
 void writeNumber(uint8_t num, uint8_t base);
 uint8_t *readAFrame(void);
 void simpleAnimationInput(void);

CubeFirmware/main.c

@@ -131,7 +131,7 @@ int main(void) {
 	*/
 
 	uint8_t i;
-	uint8_t imageIndex = 0, imageCount = 0;
+	uint16_t imageIndex = 0, imageCount = 0;
 	uint8_t idleIndex = 0, idleCount = 0;
 	uint8_t *imageData = NULL, *audioData = NULL;
 	uint8_t duration = 0;
@@ -149,12 +149,21 @@ int main(void) {
 		disableMemory = 1;
 	serialWriteString(getString(0)); // Print Version
 
-	if (disableMemory == 0)
+	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 = 0;
+	} else {
 		lastButtonState = 1;
+	}
+	if (disableAudioData == 0) {
+		maxButtonState = numberOfVisualizations() + 1; // Number of toggle steps for button
+	} else {
+		lastButtonState = 0;
+		maxButtonState = 1;
+		// If both memory and audio are not working, we have nothing to do anyways...
+	}
+
+	idleCount = numOfAnimations();
 
 	serialWriteString(getString(2));
 
@@ -174,10 +183,10 @@ int main(void) {
 		}
 
 		if (debounce(PINB, PB0)) {
-			if (lastButtonState > 0) {
-				lastButtonState--;
+			if (lastButtonState < (maxButtonState - 1)) {
+				lastButtonState++;
 			} else {
-				lastButtonState = maxButtonState - 1;
+				lastButtonState = 0;
 			}
 		}
 
@@ -365,10 +374,10 @@ void serialHandler(char c) {
 		break;
 
 	case 'm': case 'M':
-		if (lastButtonState > 0) {
-			lastButtonState--;
+		if (lastButtonState < (maxButtonState - 1)) {
+			lastButtonState++;
 		} else {
-			lastButtonState = maxButtonState - 1;
+			lastButtonState = 0;
 		}
 		if (lastButtonState) {
 			writeNumber(lastButtonState, 10);
@@ -495,13 +504,13 @@ void serialHandler(char c) {
 
 	case '3':
 		buffClearAllPixels(defaultImageCube);
-		y = 0;
+		y = 0x20;
 		while(1) {
 			tmp = getFont(y);
-			if (y < 255) {
+			if (y < 0x7E) {
 				y++;
 			} else {
-				y = 0;
+				y = 0x20;
 			}
 			for (i = 0; i < 8; i++) {
 				defaultImageCube[i] = tmp[i];

CubeFirmware/transmit.c

@@ -241,9 +241,9 @@ uint8_t *readLine(void) {
 	}
 }
 
-uint8_t readNumber(uint8_t base) {
+uint16_t readNumber(uint8_t base) {
 	uint8_t *s = readLine();
-	uint8_t val = (uint8_t)strtoul((char *)s, NULL, base);
+	uint16_t val = (uint16_t)strtoul((char *)s, NULL, base);
 	return val;
 }
 

CubeFirmware/visualizer.c

@@ -45,10 +45,15 @@ void simpleLog(uint8_t *data);
 void fullDepthLog(uint8_t *data);
 void linLog(uint8_t *data);
 
-#define NUMOFVISUALIZATIONS 7
-void (*visualizations[NUMOFVISUALIZATIONS])(uint8_t *data) = { &linLog, &simpleVisualization,
-													&fullDepthVisualization, &horribleWave,
-													&simpleLog, &fullDepthLog, &simpleSwitch };
+#define LINEARVISUALS 4
+void (*linear[LINEARVISUALS])(uint8_t *data) = { &simpleVisualization, &fullDepthVisualization,
+											&simpleSwitch, &horribleWave };
+
+#define LOGARITHMICVISUALS 3
+void (*logarithmic[LOGARITHMICVISUALS])(uint8_t *data) = { &linLog, &simpleLog, &fullDepthLog };
+
+#define NUMOFVISUALIZATIONS (LINEARVISUALS + LOGARITHMICVISUALS)
+
 uint8_t logScale[8] = { 2, 4, 8, 16, 31, 63, 125, 250 }; // --> ca. (1 << (led + 1));
 
 uint8_t numberOfVisualizations(void) {
@@ -57,12 +62,15 @@ uint8_t numberOfVisualizations(void) {
 
 void runVisualization(uint8_t *data, uint8_t id) {
 	if (id < NUMOFVISUALIZATIONS) {
-		if ((id == 0) || ((id > 3) && (id <= 5))) {
-			filterData(data, 1);
+		if (id < LINEARVISUALS) {
+			filterData(data, 0); // Linear filter
+			linear[id](data); // run it
+		} else if ((id - LINEARVISUALS) < LOGARITHMICVISUALS) {
+			filterData(data, 1); // Logarithmic filter
+			logarithmic[id - LINEARVISUALS](data); // run it
 		} else {
-			filterData(data, 0);
+			// Invalid, do nothing!
 		}
-		visualizations[id](data);
 	}
 }