Fixed duration (hutattedonmyarm), fixed playing (hutattedonmyarm), fixed other stuff (xythobuz)

CubeControl/Frame.java

@@ -563,8 +563,9 @@ public class Frame extends JFrame implements ListSelectionListener {
 				} else {
 					for (int i = 0; i < frameList.getModel().getSize(); i++){
 						frameList.setSelectedIndex(i);
-						short time1 = worker.getAnimation(animList.getSelectedIndex()).getFrame(frameList.getSelectedIndex()).getTime();
-						long time = (long) (((time1+1) * 1/24) * 1000);
+						long time1 = (long) worker.getAnimation(animList.getSelectedIndex()).getFrame(frameList.getSelectedIndex()).getTime();
+						long time = (long) (((time1+1) * 1000) / 24);
+						System.out.println("Wert: " + time1 + " Zeit: " + time);
 						try {
 							Thread.sleep(time);
 						} catch (Exception e) {
@@ -623,7 +624,7 @@ public class Frame extends JFrame implements ListSelectionListener {
 						errorMessage("Please select a Frame!");
 						return;
 					}
-					worker.getAnimation(animList.getSelectedIndex()).getFrame(frameList.getSelectedIndex()).setTime((byte)(Integer.parseInt(frameLengthText.getText()) - 1));
+					worker.getAnimation(animList.getSelectedIndex()).getFrame(frameList.getSelectedIndex()).setTime((byte)(Integer.parseInt(frameLengthText.getText())));
 				}
 			}
 		});

CubeFirmware/main.c

@@ -30,8 +30,6 @@
 
 #define VERSION "8^3 LED-Cube v1\n"
 
-#define DEBUG
-
 #include <avr/io.h>
 #include <util/delay.h>
 #include <avr/interrupt.h>
@@ -97,7 +95,7 @@ int main(void) {
 	lastChecked = getSystemTime();
 
 	while (1) {
-		if(lastMode) {
+		//if(lastMode) {
 			// Get Audio Data and visualize it
 			/* audioData = getAudioData();
 			if (audioData != NULL) {
@@ -106,7 +104,7 @@ int main(void) {
 				free(audioData);
 			}
 			while(!isFinished()); // Wait for it to display */
-		} else {
+		//} else {
 			// Look for commands, play from fram
 			// We have 128*1024 bytes
 			// A Frame needs 65 bytes (64 data + duration)
@@ -122,7 +120,7 @@ int main(void) {
 				count = getAnimationCount();
 				refreshAnimationCount = 0;
 			} */
-		}
+		//}
 
 		if ((getSystemTime() - lastChecked) > 100) {
 			lastMode = audioModeSelected();
@@ -136,7 +134,7 @@ int main(void) {
 
 void serialHandler(char c) {
 	// Used letters:
-	// a, c, d, g, s, t, v
+	// a, c, d, g, s, t, v, x
 	switch(c) {
 	case OK:
 		serialWrite(OK);
@@ -190,6 +188,14 @@ void serialHandler(char c) {
 		serialWriteString(" Frames stored\n");
 		break;
 
+	case 'x': case 'X':
+		// Get byte, store as animation count
+		serialWriteString("Send a byte...");
+		while (!serialHasChar());
+		setAnimationCount(serialGet());
+		serialWriteString(" Byte written!\n");
+		break;
+
 	case '\n':
 		serialWriteString(VERSION);
 		serialWriteString("See xythobuz.org for more Infos!\n");

CubeFirmware/makefile

@@ -78,7 +78,7 @@ EXTRAINCDIRS =
 CSTANDARD = -std=gnu99
 
 # Place -D or -U options here
-CDEFS =
+CDEFS = -D DEBUG
 
 # Place -I options here
 CINCS =

CubeFirmware/memLayer.c

@@ -25,6 +25,7 @@
  #include <stdlib.h>
  #include "mem.h"
  #include "memLayer.h"
+ #include "serial.h"
 
 // Free after usage!
 uint8_t *getFrame(uint16_t frameNumber) {

Hardware/Parts.txt

@@ -1,44 +1,40 @@
 Partlist
 
-Quantity Value          Device          Package        Library             Bought?
+Quant.	Value			Device
 
-// Capacitors
-22       100n           C-EUC0603       C0603          resistor            Yes
-4        22p            C-EUC0603       C0603          resistor            Yes
-1        4u7            C-EUC0603       C0603          resistor            Yes
-1        33p            C-EUC0603       C0603          resistor            Yes
-1        10n            C-EUC0603       C0603          resistor            Yes
-1        4u7            CPOL-EUTAP5-80  TAP5-80        resistor            Yes
+22		100nF			0603
+4		22pF			0603
+1		4u7F			0603
+1		33pF			0603
+1		10nF			0603
+1		100uF			CPOL-80
 
-// Resistors
-8        15             R-EU_R0603      R0603          resistor            Yes
-3        10k            R-EU_R0603      R0603          resistor            Yes
-8        100k           R-EU_R0603      R0603          resistor            Yes
-67       1k             R-EU_R0603      R0603          resistor            Yes
-3        200k           R-EU_R0603      R0603          resistor            Yes
-2        2k             R-EU_R0603      R0603          resistor            Yes
-1        4k7            R-EU_R0603      R0603          resistor            Yes
-64       112.5			0603			0603                               Yes
+8		15R				0603
+3		10kR			0603
+8		100kR			0603
+67		1kR				0603
+3		200kR			0603
+2		2kR				0603
+1		4k7R			0603
+64		120R			0603
 
-// IC
-64       PNP            PNP             SOT323         0-xythobuz          Yes
-8        IRF530         IRF530          TO220-3V       0-xythobuz          Yes
-8        74HC573D       74HC573D        SO20W          74xx-eu             Yes
-1        MEGA8-AI       MEGA8-AI        TQFP32-08      atmel               Yes
-1        FT232RL        FT232RL         SSOP28         ftdichip            Yes
-1        FM24V10        FM24V10         SOIC8          0-xythobuz          Yes
-1        MSGEQ7         MSGEQ7          DIP8           0-xythobuz          Yes
-1        7805           78XXS           78XXS          v-reg               Yes
-1        MEGA32-A       MEGA32-A        TQFP44         atmel               Yes
+64		PNP				PNP
+8		IRF530			IRF530
+8		74HC573D		74HC573D
+1		MEGA8-AI		MEGA8-AI
+1		FT232RL			FT232RL
+1		FM24V10			FM24V10
+1		MSGEQ7			MSGEQ7
+1		7805			78XXS
+1		MEGA32-A		MEGA32-A
 
-// Misc
-1        POTI           TRIM_EU-PT10S   PT-10S         pot                 Yes
-1        Connector      ML64            ML64           con-ml              Yes
-1        KLINKENBUCHSE  KLINKENBUCHSE   KLINKEPRINT    0-xythobuz          Yes
-1        TASTER         TASTER          SMDTASTER      0-xythobuz          Yes
-1        DC-Stecker     733980-62       733980-62      con-conrad          Yes
-1        USB-B mini     USB-B-MINI-SMD  USB-B-MINI-SMD 1_USER              Yes
+1		POTI			TRIM_EU-PT
+1		Connector		ML64
+1		Klinkenbuchse	Klinkenbuchse
+1		TASTER			TASTER	SMD
+1		DC-Stecker		733980-62
+1		USB-B mini		USB-B-MINI-SMD
 
-==> Ohne Versand: 48,63€ / 3 = 16,21€ pro Person
-	Gespeichert in myReichelt.
+==>	48,63€
+	Reichelt:
 	https://secure.reichelt.de/index.html?;ACTION=20;AWKID=538158;PROVID=2084